12/12

App.vue

@@ -68,13 +68,27 @@
 					onTextMessage: function ( message ) {
 						console.log("收到文本消息",message);
 					},    //收到文本消息
-					onEmojiMessage: function ( message ) {},   //收到表情消息
-					onPictureMessage: function ( message ) {}, //收到图片消息
-					onCmdMessage: function ( message ) {},     //收到命令消息
-					onAudioMessage: function ( message ) {},   //收到音频消息
-					onLocationMessage: function ( message ) {},//收到位置消息
-					onFileMessage: function ( message ) {},    //收到文件消息
-					onCustomMessage: function ( message ) {},  //收到自定义消息
+					onEmojiMessage: function ( message ) {
+						console.log("收到表情消息",message);
+					},   //收到表情消息
+					onPictureMessage: function ( message ) {
+						console.log("收到图片消息",message);
+					}, //收到图片消息
+					onCmdMessage: function ( message ) {
+						console.log("收到命令消息",message);
+					},     //收到命令消息
+					onAudioMessage: function ( message ) {
+						console.log("收到音频消息",message);
+					},   //收到音频消息
+					onLocationMessage: function ( message ) {
+						console.log("收到位置消息",message);
+					},//收到位置消息
+					onFileMessage: function ( message ) {
+						console.log("收到文件消息",message);
+					},    //收到文件消息
+					onCustomMessage: function ( message ) {
+						console.log("收到自定义消息",message);
+					},  //收到自定义消息
 					onVideoMessage: function (message) {
 						var node = document.getElementById('privateVideo');
 						var option = {
@@ -92,11 +106,15 @@
 						};
 						uni.WebIM.utils.download.call(conn, option);
 					},   //收到视频消息
-					onPresence: function ( message ) {},       //处理“广播”或“发布-订阅”消息，如联系人订阅请求、处理群组、聊天室被踢解散等消息
+					onPresence: function ( message ) {
+						console.log('处理“广播”或“发布-订阅”消息',message);
+					},       //处理“广播”或“发布-订阅”消息，如联系人订阅请求、处理群组、聊天室被踢解散等消息
 					onRoster: function ( message ) {
 						console.log('处理好友申请',message);
 					},         //处理好友申请
-					onInviteMessage: function ( message ) {},  //处理群组邀请
+					onInviteMessage: function ( message ) {
+						console.log('处理群组邀请',message);
+					},  //处理群组邀请
 					onOnline: function () {
 						console.log('本机网络连接成功');
 					},                  //本机网络连接成功
@@ -110,7 +128,9 @@
 						// 查询黑名单，将好友拉黑，将好友从黑名单移除都会回调这个函数，list则是黑名单现有的所有好友信息
 						console.log(list);
 					},
-					onRecallMessage: function(message){},      //收到撤回消息回调
+					onRecallMessage: function(message){
+						console.log("收到撤回消息回调",message);
+					},      //收到撤回消息回调
 					onReceivedMessage: function(message){
 						console.log("收到消息送达服务器回执",message);
 					},    //收到消息送达服务器回执
@@ -120,9 +140,15 @@
 					onReadMessage: function(message){
 						console.log("收到消息已读回执",message);
 					},        //收到消息已读回执
-					onCreateGroup: function(message){},        //创建群组成功回执（需调用createGroupNew）
-					onMutedMessage: function(message){},       //如果用户在A群组被禁言，在A群发消息会走这个回调并且消息不会传递给群其它成员
-					onChannelMessage: function(message){}      //收到整个会话已读的回执，在对方发送channel ack时会在这个回调里收到消息
+					onCreateGroup: function(message){
+						console.log("创建群组成功回执",message);
+					},        //创建群组成功回执（需调用createGroupNew）
+					onMutedMessage: function(message){
+						console.log("禁言",message);
+					},       //如果用户在A群组被禁言，在A群发消息会走这个回调并且消息不会传递给群其它成员
+					onChannelMessage: function(message){
+						console.log("收到整个会话已读的回执",message);
+					}      //收到整个会话已读的回执，在对方发送channel ack时会在这个回调里收到消息
 				});
 			},
 			HXlogin() {

components/evils-el-poster

@@ -1 +1 @@
-Subproject commit a57f419110140b0c54548691d870699d65059cf9
+Subproject commit d649b3d8b180733ddc5596be4b86ae36e06ef845

components/my-order/my-order.vue

@@ -26,10 +26,10 @@
 				</block>
 				<block v-else>
 					<view class="box">
-						<view class="hflex fwrap" >
-							<view class="urgent1" v-if="item.is_urgent == '1'">快修</view>
-							<view class="urgent" v-else>普修</view>
-							<view class="text_style1">{{item.name}}</view>
+						<view class="text_style1" >
+							<span class="urgent1" v-if="item.is_urgent == '1'">快修</span>
+							<span class="urgent" v-else>普修</span>
+							{{item.name}}
 						</view>
 						<view class="box_cell text_style2">维修时间：{{item.repair_date}}</view>
 						<view class="box_cell text_style2">维修地点：{{item.address}}</view>
@@ -137,6 +137,7 @@
 				text-align: center;
 				line-height: 32rpx;
 				display: inline-block;
+				margin-right: 8rpx;
 			}
 			.urgent {
 				width: 72rpx;
@@ -147,6 +148,8 @@
 				font-size: 24rpx;
 				text-align: center;
 				line-height: 32rpx;
+				display: inline-block;
+				margin-right: 8rpx;
 			}
 			.box_norm {
 				width: auto;

page_index/pages/demand/collect.vue

@@ -1,6 +1,11 @@
 <template>
 	<view class="content">
-		<view class="list">
+		 <view class="top hflex acenter jcenter">
+			 <block v-for="(item,index) in top" :key="index">
+				<view class="top_item" :class="active == index ? 'active' :''" @click="changeTop(index)">{{item.name}}</view>
+			 </block>
+		 </view>
+		<view class="list" v-if="active == 0">
 			<block v-for="(item,index) in pageList" :key="index">
 				<view class="list_item">
 					<view class="hflex acenter jbetween">
@@ -23,6 +28,29 @@
 				</view>
 			</block>
 		</view>
+		<view class="list" v-if="active == 1">
+			<block v-for="(item,index) in pageList" :key="index">
+				<view class="list_item hflex jbetween" @click="toDetail2(item.id)">
+					<view class="hflex">
+						<image class="item_avatar1" :src="item.avatar"></image>
+						<view class="item_right1 vflex">
+							<u--text class="item_title" mode="name" :text="item.name" format="encrypt"></u--text>
+							<view class="hflex acenter">
+								<view class="text_style1">{{item.city}}</view>
+								<view style="padding: 0 8rpx;">|</view>
+								<view class="text_style1">{{item.age}}</view>
+								<view style="padding: 0 8rpx;">|</view>
+								<view class="text_style1">{{item.year}}</view>
+								<view style="padding: 0 8rpx;">|</view>
+								<view class="text_style1">{{item.education}}</view>
+							</view>
+							<view class="item_box1 hflex acenter">应聘岗位<view style="padding: 0 8rpx;">|</view>{{item.postion}}</view>
+						</view>
+					</view>
+					<view class="item_btn1">打招呼</view>
+				</view>
+			</block>
+		</view>
 	</view>
 </template>
 
@@ -32,6 +60,15 @@
 	export default {
 		data() {
 			return {
+				top: [
+					{
+						name: '招聘信息',
+					},
+					{
+						name: '求职信息'
+					}
+				],
+				active: 0,
 				pageList: [
 					{
 						id: 0,
@@ -42,12 +79,18 @@
 						education: '本科',
 						experience: '经验不限',
 						company_name: '北京文化旅游产业发展集团有限公司',
-						date: '05月12日',
 						user: {
 							avatar: '/static/images/mine/avatar1.jpg',
 							name: '江女士',
 							position: '行政总监',
-						}
+							city: '北京市',
+							area: '东城区',
+						},
+						avatar: '/static/images/mine/avatar1.jpg',
+						name: '张三',
+						age: '27',
+						year: '5年',
+						postion: '船舶工程师',
 					},
 					{
 						id: 1,
@@ -58,21 +101,29 @@
 						education: '本科',
 						experience: '经验不限',
 						company_name: '北京文化旅游产业发展集团有限公司',
-						date: '05月12日',
 						user: {
-							avatar: '/static/images/mine/avatar1.jpg',
+							avatar: '/static/images/mine/avatar2.jpg',
 							name: '江女士',
 							position: '行政总监',
-						}
+							city: '北京市',
+							area: '东城区',
+						},
+						avatar: '/static/images/mine/avatar2.jpg',
+						name: '李四',
+						age: '27',
+						year: '5年',
+						postion: '船舶工程师',
 					}
-				]
+				],
 			}
 		},
 		onLoad() {
 			that = this
 		},
 		methods: {
-			
+			changeTop(index) {
+				that.active = index
+			}
 		},
 	}
 </script>
@@ -81,14 +132,39 @@
 	.content {
 		padding: 0 30rpx;
 		background: #F4F4F4;
+		.top {
+			width: 100%;
+			height: 80rpx;
+			background: #FFFFFF;
+			border-radius: 40rpx;
+			font-size: 30rpx;
+			font-weight: 500;
+			color: #222222;
+			margin-top: 20rpx;
+			.top_item {
+				width: 50%;
+				text-align: center;
+			}
+			.active {
+				width: 340rpx;
+				height: 68rpx;
+				background: #506DFF;
+				border-radius: 36px;
+				color: #FFFFFF;
+				line-height: 68rpx;
+			}
+		}
 		.list {
+			width: 100%;
 			.list_item {
-				margin-top: 20rpx;
+				background-color: #fff;
 				width: 100%;
-				background: #FFFFFF;
-				border-radius: 20rpx;
+				padding: 28rpx 0 20rpx;
 				box-sizing: border-box;
 				padding: 20rpx;
+				border-radius: 20rpx;
+				// border-top: 1rpx solid #F4F4F4;
+				margin-top: 20rpx;
 				.item_title {
 					font-size: 32rpx;
 					font-weight: 600;
@@ -121,6 +197,42 @@
 					border-radius: 50%;
 					margin-right: 12rpx;
 				}
+				.item_avatar1 {
+					width: 88rpx;
+					height: 88rpx;
+					border-radius: 50%;
+					margin-right: 20rpx;
+				}
+				.item_right1 {
+					
+				}
+				.text_style1 {
+					font-size: 22rpx;
+					font-weight: 400;
+					color: #666666;
+					padding: 12rpx 0;
+				}
+				.item_box1 {
+					margin-top: 8rpx;
+					background: #EDF0FF;
+					border-radius: 8rpx;
+					box-sizing: border-box;
+					padding: 4rpx 16rpx;
+					font-size: 24rpx;
+					font-weight: 400;
+					color: #506DFF;
+				}
+				.item_btn1 {
+					width: 140rpx;
+					height: 52rpx;
+					background: #F1F3FF;
+					border-radius: 28rpx;
+					font-size: 26rpx;
+					font-weight: 500;
+					color: #506DFF;
+					line-height: 52rpx;
+					text-align: center;
+				}
 				.user_name {
 					font-size: 20rpx;
 					font-weight: 400;

page_index/pages/demand/demand.vue

@@ -10,7 +10,7 @@
 		</view>
 		<view class="box hflex acenter jbetween">
 			<block v-for="(item,index) in tabs" :key="index">
-				<view class="vflex acenter jcenter" @click="toTab(item.url)">
+				<view class="tab_item hflex acenter jcenter" @click="toTab(item.url)">
 					<image :src="item.src" mode="aspectFill" class="tab_img"></image>
 					<view class="tab_text">{{item.text}}</view>
 				</view>
@@ -20,10 +20,10 @@
 			<view class="hflex acenter jbetween box1_top">
 				<view class="hflex acenter">
 					<block v-for="(item,index) in tabs2" :key="index">
-						<view class="tabs_item" :class="tab_active == item.id? 'tabs_active' : ''" @click="changeTab(item.id)">{{item.text}}</view>
+						<view class="tabs_item" :class="tab_active == index? 'tabs_active' : ''" @click="changeTab(index)">{{item.text}}</view>
 					</block>
 				</view>
-				<view class="screen hflex acenter jcenter" @click="open">
+				<view class="screen hflex acenter jcenter" @click="open" v-show="tab_active == 0">
 					<view class="screen_text">筛选</view>
 					<u-icon name="arrow-down-fill" color="#666666" size="6"></u-icon>
 				</view>
@@ -123,11 +123,6 @@
 						text: '发布应聘',
 					},
 					{
-						url: '/page_index/pages/demand/delivery',
-						src: '/static/images/index/demand/tab2.png',
-						text: '投递记录',
-					},
-					{
 						url: '/page_index/pages/demand/collect',
 						src: '/static/images/index/demand/tab3.png',
 						text: '我的收藏',
@@ -272,8 +267,8 @@
 				$api.jump(url)
 			},
 			// 切换tabs
-			changeTab(id) {
-				that.tab_active = id
+			changeTab(index) {
+				that.tab_active = index
 			},
 			// 打开弹出层
 			open() {
@@ -343,21 +338,29 @@
 		}
 		.box {
 			width: 100%;
-			background: #FFFFFF;
+			// background: #FFFFFF;
 			border-radius: 20rpx;
 			box-sizing: border-box;
-			padding: 16rpx 60rpx 30rpx;
+			// padding: 16rpx 60rpx 30rpx;
 			margin-top: 24rpx;
-			.tab_img {
-				width: 84rpx;
-				height: 84rpx;
-				margin-bottom: 8rpx;
-			}
-			.tab_text {
-				font-size: 24rpx;
-				font-weight: 400;
-				color: #444444;
+			.tab_item {
+				width: 336rpx;
+				height: 132rpx;
+				background: #FFFFFF;
+				border-radius: 20rpx;
+				padding: 24rpx 0;
+				.tab_img {
+					width: 84rpx;
+					height: 84rpx;
+				}
+				.tab_text {
+					font-size: 30rpx;
+					font-weight: 400;
+					color: #444444;
+					padding-left: 28rpx;
+				}
 			}
+			
 		}
 		.box1 {
 			width: 100%;

page_index/pages/demand/recruitDetail.vue

@@ -6,7 +6,7 @@
 				<view class="text_blue">{{pageData.salary}}</view>
 			</view>
 			<view class="hflex acenter fwrap">
-				<block v-for="(item,index) in pageData.requirement">
+				<block v-for="(item,index) in pageData.requirement" :key="index">
 					<view class="box_item">{{item.name}}</view>
 				</block>
 			</view>

page_mine/pages/message/detail.vue

@@ -1,5 +1,8 @@
 <template>
 	<view class="content">
+		<view class="top hflex acenter jcenter">
+			<view class="time">{{time}}</view>
+		</view>
 		<view class="box">
 			<view class="hflex acenter">
 				<view class="dian" v-if="is_read"></view>
@@ -17,6 +20,7 @@
 		data() {
 			return {
 				id: '',
+				time: '08-12 23:19:34',
 				title: '第一批00后，已经被找工作难哭了？',
 				text: '大厂CEO+北大教授+职场培训师教你求职拿offer！还有好礼送不停！大厂CEO+北大教授+职场培训师教你求职拿offer！还有好礼送不停！大厂CEO+北大教授+职场培训师教你求职拿offer！还有好礼送不停！',
 				is_read: 1
@@ -35,7 +39,22 @@
 <style lang="scss" scoped>
 	.content {
 		background-color: #F4f4f4;
-		padding: 20rpx 30rpx 0;
+		padding: 0 30rpx 0;
+		.top {
+			width: 100%;
+			padding: 24rpx 0;
+			.time {
+				height: 32rpx;
+				background: #D8D8D8;
+				border-radius: 20rpx;
+				box-sizing: border-box;
+				padding: 0 20rpx;
+				font-size: 24rpx;
+				font-weight: 300;
+				color: #FFFFFF;
+				line-height: 32rpx;
+			}
+		}
 		.box {
 			width: 100%;
 			box-sizing: border-box;

page_mine/pages/service/feed/feedback.vue

@@ -7,7 +7,7 @@
 				</view>
 				<view class="left">图片（选填）</view>
 				<view class="upload">
-					<u-upload :fileList="fileList1" @afterRead="afterRead" @delete="deletePic" :maxCount="1" name="1" multiple :previewFullImage="true" width="204rpx" height="204rpx">
+					<u-upload :fileList="fileList1" @afterRead="afterRead" @delete="deletePic" :maxCount="9" name="1" multiple :previewFullImage="true" width="204rpx" height="204rpx">
 					</u-upload>
 				</view>
 			</view>

page_mine/pages/service/release.vue

@@ -10,7 +10,7 @@
 				<news-module :pageList="pageList"></news-module>
 			</view>
 		</block> -->
-		<block v-if="tab_active == 2 && is_write == 0">
+		<block v-if="state == 0">
 			<view class="box vflex acenter jcenter">
 				<view class="img_box vflex acenter jcenter">
 					<u-icon name="info-circle-fill" color="#506dff" size="50"></u-icon>
@@ -19,7 +19,7 @@
 				<view class="release" @click="release">发布</view>
 			</view>
 		</block>
-		<block v-if="tab_active == 2 && is_write == 1">
+		<block v-if="state == 1">
 			<view class="box hflex jbetween">
 				<view class="">
 					<view class="hflex acenter">
@@ -77,7 +77,7 @@
 					<view class="text_style1">{{application.job_inte.job_type}}</view>
 				</view>
 			</view>
-			<!-- <view class="box"  >
+			<view class="box"  >
 				<view class="hflex acenter jbetween">
 					<view class="box_title">工作经历</view>
 					<view class="hflex acenter" @click="perfect(3)">
@@ -98,7 +98,7 @@
 						<view class="hflex fwrap padT-26 text_style2">工作内容：{{item.company_content}}</view>
 					</view>
 				</block>
-			</view> -->
+			</view>
 			<view class="box"  >
 				<view class="hflex acenter jbetween">
 					<view class="box_title">专业技能</view>
@@ -150,6 +150,24 @@
 			</view>
 			<view class="btn">立即修改</view>
 		</block>
+		<block v-if="state == 2">
+			<view class="box1 vflex acenter">
+				<image src="/static/images/comment/wait.png" class="box1_img"></image>
+				<view class="box1_title">审核中</view>
+				<view class="box1_subTitle">预计审核时间3个工作日</view>
+				<view class="box1_subTitle">请留意当前页面变动</view>
+				<view class="btn" @click="toEdit">去修改</view>
+			</view>
+		</block>
+		<block v-if="state == 3">
+			<view class="box1 vflex acenter">
+				<image src="/static/images/comment/wait.png" class="box1_img"></image>
+				<view class="box1_title">审核失败</view>
+				<view class="box1_subTitle">驳回原因</view>
+				<view class="box1_subTitle">{{reason}}</view>
+				<view class="btn" @click="toEdit">去修改</view>
+			</view>
+		</block>
 	</view>
 </template>
 
@@ -189,7 +207,7 @@
 						}
 					}
 				],
-				is_write: 0,
+				state: 2,
 				application: {
 					base_info: {
 						name: '张三',
@@ -232,19 +250,30 @@
 					remarks: '',
 				},
 				is_hide: false,
+				reason: '',
 			}
 		},
 		onLoad() {
 			that = this
-			that.getList()
+			// that.getList()
 		},
 		methods: {
 			getList() {
 				$api.req({
 					url: '/data/api.auth.Center/myrelease',
-					method: 'POST'
+					method: 'POST',
+					data: {
+						type: '3'
+					}
 				}, function(res) {
-					console.log(res);
+					if(res.code == 1) {
+						that.application = res.data
+						if($api.isEmpty(that.application)) {
+							that.state = 0
+						} else {
+							that.state = 1
+						}
+					}
 				})
 			},
 			// 切换tabs
@@ -258,6 +287,7 @@
 			// 显示隐藏招聘
 			changeHide(e) {
 				console.log(e);
+				that.is_hide = e
 			}
 		},
 	}
@@ -462,5 +492,36 @@
 			color: #FFFFFF;
 			line-height: 84rpx;
 		}
+		.box1 {
+			width: 100%;
+			height: 100vh;
+			background-color: #fff;
+			.box1_img {
+				width: 124rpx;
+				height: 124rpx;
+				margin: 108rpx 0 40rpx;
+			}
+			.box1_title {
+				font-size: 32rpx;
+				color: #222;
+				margin-bottom: 24rpx;
+			}
+			.box1_subTitle {
+				margin: 12rpx 0;
+				font-size: 26rpx;
+				color: #595959;
+			}
+			.btn {
+				width: 530rpx;
+				height: 88rpx;
+				background-color: #506dff;
+				color: #fff;
+				text-align: center;
+				line-height: 88rpx;
+				border-radius: 44rpx;
+				font-size: 36rpx;
+				margin-top: 122rpx;
+			}
+		}
 	}
 </style>

page_mine/pages/setting/setting.vue

@@ -58,6 +58,8 @@
 			// 退出登录
 			quit() {
 				uni.removeStorageSync("token")
+				uni.removeStorageSync("HXtoken")
+				uni.removeStorageSync("id")
 				uni.WebIM.conn.close();
 				$api.jump('/pages/tabbar/mine/mine',3)
 			}

page_mine/pages/wallet/bankList.vue

@@ -21,7 +21,7 @@
 			<u-icon name="plus-circle" color="#506DFF" size="19"></u-icon>
 			<view class="add_text">去添加</view>
 		</view>
-		<u-popup :show="show" :round="10" mode="top" @close="close" @open="open">
+		<u-popup :show="show" :round="10" mode="bottom" @close="close" @open="open">
 			<view class="popu">
 				<view class="popu_text hflex acenter jcenter">解除绑定</view>
 				<view class="popu_btn hflex acenter jcenter" @click="close">取消</view>

page_shop/pages/address/add.vue

@@ -97,6 +97,7 @@
 				if($api.formCheck(that.name,'required') && $api.formCheck(that.phone,'phone') && $api.formCheck(that.area,'required') && $api.formCheck(that.address,'required')) {
 					$api.req({
 						url: '/data/api.User/add_address',
+						method: 'POST',
 						data: {
 							type: that.is_active?1:0,
 							name: that.name,
@@ -120,6 +121,7 @@
 				if($api.formCheck(that.name,'required') && $api.formCheck(that.phone,'phone') && $api.formCheck(that.area,'required') && $api.formCheck(that.address,'required')) {
 					$api.req({
 						url: '/data/api.User/save_address',
+						method: 'POST',
 						data: {
 							type: that.is_active?1:0,
 							name: that.name,
@@ -140,6 +142,7 @@
 			deleteAdd() {
 				$api.req({
 					url: '/data/api.User/del_address',
+					method: 'POST',
 					data: {
 						id: that.id
 					}

page_shop/pages/address/list.vue

@@ -104,6 +104,7 @@
 			sure() {
 				$api.req({
 					url: '/data/api.User/del_address',
+					method: 'POST',
 					data: {
 						id: that.del_id
 					}

page_shop/pages/good/detail.vue

@@ -103,7 +103,7 @@
 				<view class="hflex acenter jcenter popu_title">配送地址</view>
 				<view>
 					<block v-for="(item,index) in pageData.delivery" :key="index">
-						<view class="box_bg hflex acenter" @click="selectAddr(item.index)">
+						<view class="box_bg hflex acenter" @click="selectAddr(index)">
 							<image v-if="item.checked == 1" src="/static/images/shop/checked.png" class="check_img"></image>
 							<u-icon v-else name="map-fill" color="#b2b2b2" size="12"></u-icon>
 							<view class="popu_right2">
@@ -111,7 +111,7 @@
 									<view class="popu_name">{{item.name}}</view>
 									<view class="popu_phone">{{item.phone}}</view>
 								</view>
-								<view class="popu_addr">{{item.address}}</view>
+								<view class="popu_addr">{{item.province}} {{item.city}} {{item.area}} {{item.address}}</view>
 							</view>
 						</view>
 					</block>
@@ -235,8 +235,8 @@
 		},
 		onLoad() {
 			that = this
-			that.delivery = that.pageData.delivery[0].delivery
-			that.pageData.delivery[0].checked = true
+			that.getAddr()
+			
 		},
 		onPageScroll(e) {
 			if(e.scrollTop < 530) {
@@ -246,6 +246,25 @@
 			}
 		},
 		methods: {
+			getAddr() {
+				$api.req({
+					url: '/data/api.User/address_list'
+				}, function(res) {
+					if(res.code == 1) {
+						console.log(res);
+						that.pageData.delivery = res.data.data
+						for(var i=0;i<that.pageData.delivery.length;i++) {
+							if(that.pageData.delivery[i].type == 1) {
+								that.delivery = that.pageData.delivery[i].province+that.pageData.delivery[i].city+that.pageData.delivery[i].area
+								that.$set(that.pageData.delivery[i],'checked',true)
+							} else {
+								that.$set(that.pageData.delivery[i],'checked',true)
+							}
+						} 
+						
+					}
+				})
+			},
 			// 返回
 			leftClick() {
 				$api.jump(-1)

page_shop/pages/mine/search.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="content">
 		<view class="top">
-			<u-search placeholder="热门搜索" v-model="searchValue" :showAction="true" @search="search" actionText="取消" @custom="clear" @change="change"></u-search>
+			<u-search placeholder="热门搜索" v-model="searchValue" :showAction="true" @search="search" actionText="取消" @custom="custom" @change="change"></u-search>
 		</view>
 		<view v-if="is_search == 0">
 			<view class="hflex acenter jbetween">
@@ -105,8 +105,13 @@
 				],
 			}
 		},
-		onLoad() {
+		onLoad(options) {
 			that = this
+			if(options.value) {
+				that.searchValue = options.value
+				that.search(that.searchValue)
+				that.change(that.searchValue)
+			}
 			that.history = uni.getStorageSync('historySC')
 			if(!that.history) {
 				that.history = []
@@ -140,9 +145,8 @@
 					that.is_search = 0
 				}
 			},
-			clear(e) {
-				that.is_search = 0,
-				that.searchValue = ''
+			custom() {
+				$api.jump(-1)
 			}
 		},
 	}

page_shop/pages/order/list.vue

@@ -65,7 +65,7 @@
 							<view class="btn1 btn2">确认收货</view>
 						</block>
 						<block v-if="item.state == 3">
-							<view class="btn1">发表评价</view>
+							<!-- <view class="btn1">发表评价</view> -->
 							<view class="btn1 btn2">再次购买</view>
 						</block>
 					</view>

pages/login/code_login.vue

@@ -132,7 +132,8 @@
 									wx.setStorageSync("HXtoken",res2.access_token)
 									$api.jump('/pages/tabbar/mine/mine',3)
 								  },
-								  error: function(){
+								  error: function(error){
+									  console.log(error);
 								  }
 								};
 								uni.WebIM.conn.open(options);

pages/tabbar/index/index.vue

@@ -16,9 +16,9 @@
 					<view class="city">{{city}}</view>
 					<u-icon name="arrow-down-fill" color="#000" size="10"></u-icon>
 				</view>
-				<u-input v-model="serach_value" type="text" :border="true" placeholder="搜索关键词" shape="circle"
-					prefixIcon="search" prefixIconStyle="font-size: 22px;color: #909399" @focus="focus">
-				</u-input>
+				<u-search v-model="serach_value" borderColor="#506dff" placeholder="搜索关键词" shape="round" :showAction="false"
+					@click="focus" disabled bgColor="#fff">
+				</u-search>
 			</view>
 		</view>
 		
@@ -204,6 +204,7 @@
 			},
 			// 点击输入框
 			focus() {
+				console.log('111111111');
 				$api.jump('/page_index/pages/index/search')
 			},
 			// 公告列表

pages/tabbar/shipyard/detail.vue

@@ -75,15 +75,17 @@
 			<view class="bottom_btn">私信聊聊</view>
 		</view>
 		<scroll-view class="share_content" :scroll-y="true" :class="share_show?'':'share_content1'">
+			<!-- <view style="width: 100%;height: 168rpx;"></view> -->
 			<view class="share_box vflex">
 				<text class="share_name Poster1" style="margin: 40rpx 0 28rpx;" :data-enode="pageData.name">{{pageData.name}}</text>
 				<text class="share_label Poster1" style="margin: 0 0 16rpx;" data-enode="船厂简介">船厂简介</text>
 				<view class="share_text Poster1" style="margin: 0 0 24rpx;" data-etype="textarea" :data-enode="pageData.company.company_info">{{pageData.company.company_info}}</view>
 				<text class="share_label Poster1" style="margin: 0 0 16rpx;" data-enode="船厂介绍">船厂介绍</text>
 				<view class="share_text Poster1" style="margin: 0 0 42rpx;" data-etype="textarea" :data-enode="pageData.company.company_product">{{pageData.company.company_product}}</view>
-				<view class="hflex acenter share_text jcenter Poster1" style="text-align: center; margin: 0 0 12rpx;" data-enode="长按或扫码查看">长按或扫码查看</view>
-				<view style="width: 100%;" class="hflex acenter jcenter">
-					<image class="Poster1" style="width: 25rpx;height: 20rpx;" data-enode="/static/images/comment/down2.png" data-etype="image" src="/static/images/comment/down2.png"></image>
+				<view class="hflex acenter share_text jcenter Poster1" style=" margin: 0 190rpx 12rpx;" data-enode="长按或扫码查看">长按或扫码查看</view>
+				<view style="width: 100%;" class="vflex acenter jcenter">
+					<image class="Poster1" style="width: 25rpx;height: 20rpx;" :data-enode="style.img1" data-etype="image" :src="style.img1"></image>
+					<image class="Poster1" style="width: 100%;height: 2rpx;margin: 30rpx 0;" :data-enode="style.img2" data-etype="image" :src="style.img2"></image>
 				</view>
 				<view class="hflex acenter jbetween">
 					<view class="vflex">
@@ -93,7 +95,7 @@
 					<image class="Poster1" data-etype="image" :data-enode="pageData.img" :src="pageData.img" style="width: 136rpx;height: 136rpx;"></image>
 				</view>
 			</view>
-			<evils-el-poster width="750" height="1150" @on-error="onError" :list="list" backgroundColor="rgb(255, 255, 255)" @on-success="onSuccess" ref="Eposter"></evils-el-poster>
+			<evils-el-poster width="325" height="467" @on-error="onError" :list="list" backgroundColor="rgb(255, 255, 255)" @on-success="onSuccess" ref="Eposter"></evils-el-poster>
 			<view class="share_bottom">
 				<view class="hflex acenter jbetween">
 					<button class="vflex acenter jcenter bottom_item" open-type="share">
@@ -122,8 +124,12 @@
 		data() {
 			return {
 				list: [],
+				style: {
+					img1: '/static/images/comment/down2.png',
+					img2: '/static/images/comment/line.png',
+				},
 				pageData: {
-					img: require('@/static/images/mine/avatar1.jpg'),
+					img: '/static/images/mine/avatar1.jpg',
 					name: '江南造船厂',
 					scale: '20-99人',
 					company: {
@@ -262,6 +268,7 @@
 				that.tempImage = e
 			},
 			onError(err) {
+				console.log('发生错误');
 				console.log(err);
 			},
 			saveImg() {
@@ -513,7 +520,7 @@
 			
 		}
 		.share_content {
-			position: absolute;
+			position: fixed;
 			top: 0;
 			left: 0;
 			z-index: 99;
@@ -521,8 +528,9 @@
 			height: 100vh;
 			background: rgba(0,0,0,0.5);
 			backdrop-filter: blur(5px);
+			padding: 0 0 0;
 			.share_box {
-				margin: 168rpx auto;
+				margin: 130rpx auto 0;
 				width: 650rpx;
 				background: #FFFFFF;
 				border-radius: 20rpx;

pages/tabbar/shipyard/news.vue

@@ -69,8 +69,9 @@
 				],
 			}
 		},
-		onLoad() {
+		onLoad(options) {
 			that = this
+			that.keyword = options.value
 		},
 		methods: {
 			// 返回

pages/tabbar/shipyard/shipyard.vue

@@ -2,11 +2,11 @@
 	<view class="content">
 		<view class="search">
 			<u-input v-model="serach_value" type="text" :border="true" placeholder="输入搜索关键词" shape="circle"
-				prefixIcon="search" prefixIconStyle="font-size: 22px;color: #909399" @focus="search">
+				prefixIcon="search" prefixIconStyle="font-size: 22px;color: #909399" @confirm="search">
 				<template slot="suffix">
 					<view @click="search">搜索</view>
 				</template>
-			</u-input>
+			</u-input>	
 		</view>
 		<view class="swiper">
 			<u-swiper :list="bannerList" radius="20rpx" @click="toBanner"></u-swiper>
@@ -105,7 +105,7 @@
 				$api.jump('/pages/tabbar/shipyard/detail?id=' + id)
 			},
 			search() {
-				$api.jump('/pages/tabbar/shipyard/news')
+				$api.jump('/pages/tabbar/shipyard/news?value=' + that.serach_value)
 			}
 		}
 	}

pages/tabbar/shop/shop.vue

@@ -8,7 +8,7 @@
 		</u-navbar>
 		<view class="search">
 			<u-input v-model="serach_value" type="text" :border="true" placeholder="热搜榜单" shape="circle"
-				prefixIcon="search" prefixIconStyle="font-size: 22px;color: #909399" @focus="search">
+				prefixIcon="search" prefixIconStyle="font-size: 22px;color: #909399" @confirm="search">
 				<template slot="suffix">
 					<view @click="search">搜索</view>
 				</template>
@@ -169,7 +169,7 @@
 				$api.jump('/page_shop/pages/mine/mine')
 			},
 			search() {
-				$api.jump('/page_shop/pages/mine/search')
+				$api.jump('/page_shop/pages/mine/search?value=' + that.serach_value)
 			}
 		},
 	}