Merge branch 'master' of http://47.115.223.229:8888/yangjun/sadjv3_user

pages.json

@@ -711,7 +711,7 @@
 		{
 			"path": "pages/my/hehuo",
 			"style": {
-				"navigationBarTitleText": "应聘技师",
+				"navigationBarTitleText": "申请合作技师",
 				"enablePullDownRefresh": false,
 				"app-plus": {
 					"bounce": "none",

pages/cooperate/index.vue

@@ -5,11 +5,11 @@
 				<image class="cop-img" src="../../static/seckill5.png" mode=""></image>
 			</view>
 			<view class="cooperate-line" @click="goNav('/pages/my/hehuo')">
-				<span>应聘技师</span>
+				<span>申请合作技师</span>
 				<span>点击申请</span>
 			</view>
 			<view class="cooperate-line1" @click="goNav('/pages/my/cooperation')">
-				<span>申请合作技师</span>
+				<span>城市合伙人</span>
 				<span>点击申请</span>
 			</view>
 			<view class="cooperate-line2" @click="goNav('/pages/cooperate/hehuo')">

pages/my/hehuo.vue

@@ -9,6 +9,7 @@
 				<u-input @click="goCity" type="text" v-model="city" placeholder="请输入服务城市 " />
 				<view class="xian"></view>
 			</view> -->
+			
 			<uni-forms ref="baseForm" :disabled="true" v-if="city">
 				<uni-forms-item label="选择城市" required :disabled="true">
 					<picker class="addRess" :disabled="true" range-key="AreaName" mode="multiSelector">
@@ -46,8 +47,8 @@
 			</view>
 			<view class="item_view">
 				<view class="item_title" style="margin-bottom: 10px;">上传身份证正面</view>
-				<view class="flex" v-if="bb=='1'" style="overflow: hidden;flex-direction: initial;">
+				<view class="flex" style="overflow: hidden;flex-direction: initial;">
-					<view v-if="front!=''||front!=null">
+					<view  v-if="front.length">
 						<view class="margin-top flex margin-right-sm">
 							<view class="flex"
 								style="width: 150upx;height: 150upx;margin-right: 10rpx;position: relative;">
@@ -59,7 +60,7 @@
 							</view>
 						</view>
 					</view>
-					<view class="margin-top" @click="addImage()"  v-if="front==''||front==null">
+					<view class="margin-top" @click="addImage()" v-else>
 						<view class="flex justify-center align-center margin-top-view">
 							<view>
 								<view class="text-center">
@@ -70,20 +71,11 @@
 						</view>
 					</view>
 				</view>
-				<view class="flex" v-if="bb=='0'" style="overflow: hidden;flex-direction: initial;">
+				
-					<view  v-if="front!=''||front!=null">
-						<view class="margin-top flex margin-right-sm">
-							<view class="flex"
-								style="width: 150upx;height: 150upx;margin-right: 10rpx;position: relative;">
-								<image :src="front" style="width: 100%;height: 100%;"></image>
-							</view>
-						</view>
-					</view>
-				</view>
 			</view>
 			<view class="item_view">
 				<view class="item_title" style="margin-bottom: 10px;">上传身份证反面</view>
-				<view class="flex" v-if="bb=='1'" style="overflow: hidden;flex-direction: initial;">
+				<view class="flex" style="overflow: hidden;flex-direction: initial;">
 					<view v-if="back.length">
 						<view class="margin-top flex margin-right-sm">
 							<view class="flex"
@@ -96,7 +88,7 @@
 							</view>
 						</view>
 					</view>
-					<view class="margin-top" @click="addImageBack()" v-if="back.length<=0">
+					<view class="margin-top" @click="addImageBack()" v-else>
 						<view class="flex justify-center align-center margin-top-view">
 							<view>
 								<view class="text-center">
@@ -107,20 +99,11 @@
 						</view>
 					</view>
 				</view>
-				<view class="flex" v-if="bb=='0'" style="overflow: hidden;flex-direction: initial;">
+				
-					<view v-if="back.length">
-						<view class="margin-top flex margin-right-sm">
-							<view class="flex"
-								style="width: 150upx;height: 150upx;margin-right: 10rpx;position: relative;">
-								<image :src="back" style="width: 100%;height: 100%;"></image>
-							</view>
-						</view>
-					</view>
-				</view>
 			</view>
 			<view class="item_view">
 				<view class="item_title" style="margin-bottom: 10px;">上传资格证书（可多张）</view>
-				<view class="flex" v-if="bb=='1'" style="overflow: hidden;flex-direction: initial;">
+				<view class="flex" style="overflow: hidden;flex-direction: initial;">
 					<view class="margin-top flex margin-right-sm flex-wrap" v-if="certification.length">
 						<view class="flex" style="width: 150upx;height: 150upx;margin-right: 10rpx;position: relative;"
 							v-for="(image,index) in  certification" :key="index">
@@ -142,16 +125,6 @@
 						</view>
 					</view>
 				</view>
-				<view class="flex" v-if="bb=='0'" style="overflow: hidden;flex-direction: initial;">
-					<view v-if="certification.length">
-						<view class="margin-top flex margin-right-sm">
-							<view class="flex" v-for="(image,index) in  certification" :key="index"
-								style="width: 150upx;height: 150upx;margin-right: 10rpx;position: relative;">
-								<image :src="image" style="width: 100%;height: 100%;"></image>
-							</view>
-						</view>
-					</view>
-				</view>
 			</view>
 		
 		</view>
@@ -250,6 +223,7 @@
 			bindPickerChange(data) {
 				this.pickVal=data.target.value;
 				this.pickVal2=data.target.value;
+				console.log("data====",this.pickVal2)
 				this.cityData=this.cityArr[0][this.pickVal2[0]].AreaName+'-'+this.cityArr[1][this.pickVal2[1]].AreaName+'-'+this.cityArr[2][this.pickVal2[2]].AreaName
 				
 			},
@@ -284,11 +258,17 @@
 							this.bb = res.data.status;
 							this.city = res.data.city;
 							this.age = res.data.age;
-							this.front = res.data.front;
 							this.userName = res.data.name;
 							this.phone = res.data.phone;
-							this.back=res.data.back;
+							if(res.data.certification!=null){
 								this.certification = res.data.certification.split(',')
+							}
+							if(res.data.front!=null){
+								this.front = res.data.front;
+							}
+							if(res.data.back!=null){
+								this.back=res.data.back;
+							}
 							console.log('111111111',this.certification)
 						}
 						// this.auditContent = res.data.auditContent;
@@ -507,7 +487,7 @@
 		width:100% !important;
 		font-size: 14px;
 		color: #333333;
-		font-weight: 800;
+		font-weight: 400;
 		margin-bottom: 4px;
 	}
 	/deep/.uni-forms-item{