lhl 1 year ago
parent
commit
b762c5e986

+ 8 - 2
pages/modelData/modeltemplate/model_1.vue

@@ -67,11 +67,16 @@
 							</view>
 							<view class="info-item-q flex" style="align-items: flex-start;">
 								<text style="flex-shrink: 0;">服务地区:</text>
-								<view class="fwdz flex">
+								<view class="fwdz flex" v-if="cardInfo.is_china == 1">
 									<view v-for="(fwitem,fwindex) in cardInfo.service_area_all">
 										{{fwitem}}{{fwindex ==(cardInfo.service_area_all.length -1) ?'': '、'  }}
 									</view>
 								</view>
+								<view class="fwdz flex" v-if="cardInfo.is_china == 0">
+									<view >
+										海外
+									</view>
+								</view>
 							</view>
 							<view class="info-item-q flex" style="align-items: flex-start;">
 								<text style="flex-shrink: 0;">服务价格: </text>
@@ -240,7 +245,8 @@
 						'https://api.myjie.cn/resource/user/user1/fw4.png'
 					],
 					is_type_audit: 1,
-					service_count: 0
+					service_count: 0,
+					is_china: 1
 				}
 			}
 		},

+ 8 - 2
pages/modelData/modeltemplate/model_2.vue

@@ -69,11 +69,16 @@
 						<view class="user-info flex">
 							<view class="info-item-q flex" style="align-items: flex-start;">
 								<text style="flex-shrink: 0;">服务地区:</text>
-								<view class="fwdz flex">
+								<view class="fwdz flex" v-if="cardInfo.is_china == 1">
 									<view v-for="(fwitem,fwindex) in cardInfo.service_area_all">
 										{{fwitem}}{{fwindex ==(cardInfo.service_area_all.length -1) ?'': '、'  }}
 									</view>
 								</view>
+								<view class="fwdz flex" v-if="cardInfo.is_china == 0">
+									<view>
+										海外
+									</view>
+								</view>
 							</view>
 							<view class="info-item-q flex" style="align-items: flex-start;height: 110rpx;">
 								<text style="flex-shrink: 0;">服务价格: </text>
@@ -250,7 +255,8 @@
 						'https://api.myjie.cn/resource/user/user2/fw8.png'
 					],
 					is_type_audit: 1,
-					service_count: 0
+					service_count: 0,
+					is_china: 1
 				}
 			}
 		},

+ 6 - 2
pages/modelData/modeltemplate/model_3.vue

@@ -77,8 +77,11 @@
 			</view>
 			<view class="list-item padding-l-30 margin-b-30">
 				服务地区:
-				<block v-for="(fwitem,fwindex) in cardInfo.service_area_all">
+				<block v-for="(fwitem,fwindex) in cardInfo.service_area_all" v-if="cardInfo.is_china == 1">
 					{{fwitem}}{{fwindex ==(cardInfo.service_area_all.length -1) ?'': '、'  }}
+				</block>
+				<block v-if="cardInfo.is_china == 0">
+					海外
 				</block>
 			</view>
 			<view class="info-item-q flex-start ">
@@ -263,7 +266,8 @@
 						'https://api.myjie.cn/resource/user/user3/fw6.png',
 					],
 					is_type_audit: 1,
-					service_count: 0
+					service_count: 0,
+					is_china: 1
 				}
 			}
 		},

+ 52 - 20
pages/user/model/modelrz.vue

@@ -151,6 +151,18 @@
 					</view>
 				</view>
 				<view class="flex listItem">
+					<view class="flex titleBox">
+						<text class="font-color-red font-size-sm">✲</text><text class="title">服务区域是否海外</text>
+					</view>
+					<view class="right flex">
+						<picker class="input" :range='areaList' mode="selector" @change="changeAreaList">
+							<view>
+								{{updata.is_wm||'请选择是否海外'}}
+							</view>
+						</picker>
+					</view>
+				</view>
+				<view class="flex listItem" v-if="updata.is_wm == '否'">
 					<view class="flex titleBox">
 						<text class="font-color-red font-size-sm">✲</text><text class="title">服务区域</text>
 					</view>
@@ -196,7 +208,9 @@
 		<view class="listBox">
 			<view class="list">
 				<view class="listItem">
-					<textarea class="textarea" auto-height :maxlength='-1' v-model="updata.mymask" type="text" placeholder="自我评价\n\n本人从业***年,已经服务***名客户\n成长经历:\n从事母婴工作之前是做***行业的,于***年经过专业培训后进入母婴行业;先后学习了***\n性格特征:\n本人性格直爽,具有很强的服务意识,做事认真负责,擅长……类工作\n服务格言:\n全心全意服务好每一位客户"	placeholder-class="textareaplaceholder" />
+					<textarea class="textarea" auto-height :maxlength='-1' v-model="updata.mymask" type="text"
+						placeholder="自我评价\n\n本人从业***年,已经服务***名客户\n成长经历:\n从事母婴工作之前是做***行业的,于***年经过专业培训后进入母婴行业;先后学习了***\n性格特征:\n本人性格直爽,具有很强的服务意识,做事认真负责,擅长……类工作\n服务格言:\n全心全意服务好每一位客户"
+						placeholder-class="textareaplaceholder" />
 				</view>
 			</view>
 			<view class="con_box">
@@ -283,6 +297,7 @@
 			return {
 				// 上传数据
 				updata: {
+					is_wm: '', //是否海外
 					avatar: '', //用户头像
 					name: '', //用户名称
 					phone: '', //手机号
@@ -309,7 +324,7 @@
 					},
 					service_audit_imgs: [], //我的证书
 					service_imgs: [], //服务展示
-					no:''
+					no: ''
 				},
 				typeList: [], //服务类型
 				timeTypeList: [], //时间类型
@@ -318,7 +333,8 @@
 				type: 0, //0为新增,1为修改2为商品页进入注册
 				userModelData: {}, //保存获取的用户模板
 				modelid: '', //保存要预览的模板id
-				educationList: ['小学', '初中', '高中', '大专', '本科', '研究生', '博士'] //学历列表
+				educationList: ['小学', '初中', '高中', '大专', '本科', '研究生', '博士'], //学历列表
+				areaList: ['是', '否']
 			};
 		},
 		async onLoad(options) {
@@ -343,6 +359,10 @@
 				this.updata.education = this.educationList[res.detail.value];
 				console.log(res);
 			},
+			changeAreaList(res) {
+				this.updata.is_wm = this.areaList[res.detail.value];
+				console.log(res);
+			},
 			// 初始化
 			init() {
 				const that = this;
@@ -458,10 +478,10 @@
 					service_intro_imgs: that.updata.imageList,
 					service_audit_imgs: that.updata.service_audit_imgs,
 					service_project_ar: pushar,
-					service_imgs:that.updata.service_imgs,
-					no:that.updata.no,
-					user_work_type_title:that.updata.word.title,
-					service_count:that.updata.service_count
+					service_imgs: that.updata.service_imgs,
+					no: that.updata.no,
+					user_work_type_title: that.updata.word.title,
+					service_count: that.updata.service_count
 				}
 				console.log('baocun');
 				uni.setStorageSync('modeldata', data)
@@ -476,10 +496,11 @@
 					getUserCardInfo().then(
 						(data) => {
 							const res = data.data;
-							console.log(res,'返回');
+							console.log(res, '返回');
 							// 存储返回用户数据
 							that.userModelData = res;
 							that.updata = Object.assign(that.updata, {
+								is_wm: res.is_china == 1 ? '否' : '是',
 								avatar: res.avatar, //用户头像
 								name: res.name, //用户名称
 								phone: res.mobile, //手机号
@@ -487,13 +508,13 @@
 								minMoney: res.service_min_price, //最低价
 								maxMoney: res.service_max_price, //最高价
 								time: res.birthday, //出生日期
-								onCity: res.service_area_all.map((arr) => {
+								onCity:res.is_china == 1 ?  res.service_area_all.map((arr) => {
 									return {
 										province: arr[0].name,
 										city: arr[1].name,
 										district: arr[2].name
 									}
-								}), //选中的城市
+								}): [], //选中的城市
 								mymask: res.service_intro_content, //自评
 								imageList: res.service_intro_imgs, //自评上传图片列表
 								ancestral_place: res.ancestral_place, //籍贯
@@ -503,8 +524,8 @@
 								work_year: res.work_year, //从业时长
 								service_audit_imgs: res.service_audit_imgs, //我的证书
 								service_imgs: res.service_imgs, //服务展示
-								no:res.no,
-								service_count:res.service_count
+								no: res.no,
+								service_count: res.service_count
 							})
 							console.log(that.updata, 'that.updata');
 							resolve('初始化数据成功')
@@ -690,6 +711,7 @@
 				}
 				that.loding = true;
 				subInfoAudit({
+						is_china: that.updata.is_wm == '是'?0:1,
 						avatar: that.updata.avatar,
 						name: that.updata.name,
 						mobile: that.updata.phone,
@@ -697,8 +719,8 @@
 						service_type: that.updata.timetype.code,
 						service_min_price: that.updata.minMoney,
 						service_max_price: that.updata.maxMoney,
-						service_area: that.updata.onCity.map((item) => {
-							return item.province +','+item.city+','+item.district;
+						service_area: that.updata.is_wm == '是' ? ["海外,海外1,海外2"] : that.updata.onCity.map((item) => {
+							return item.province + ',' + item.city + ',' + item.district;
 						}),
 						service_project: that.updata.checkedType,
 						service_intro_content: that.updata.mymask,
@@ -710,7 +732,7 @@
 						service_audit_imgs: that.updata.service_audit_imgs,
 						service_imgs: that.updata.service_imgs,
 						user_work_type_id: that.updata.word.id,
-						service_count:that.updata.service_count
+						service_count: that.updata.service_count
 					})
 					.then((e) => {
 						that.loding = false;
@@ -788,7 +810,15 @@
 					});
 					return false
 				}
-				if (that.updata.onCity.length == 0) {
+				if(!that.updata.is_wm) {
+					uni.showModal({
+						title: '错误',
+						content: '请选择服务区域是否海外',
+						showCancel: false,
+					});
+					return 
+				}
+				if ( that.updata.is_wm == '否'&&that.updata.onCity.length == 0) {
 					uni.showModal({
 						title: '错误',
 						content: '请选择服务区域',
@@ -873,15 +903,17 @@
 		.listItem {
 			padding: 35rpx 40rpx;
 			border-bottom: 1px solid $page-color-light;
-			.textarea{
+
+			.textarea {
 				font-size: $font-base;
 				width: 100%;
 				word-wrap: break-word;
 				white-space: pre-line;
 				min-height: 9rem;
-				
+
 			}
-			/deep/ .textareaplaceholder{
+
+			/deep/ .textareaplaceholder {
 				word-wrap: break-word;
 				white-space: pre-line;
 			}
@@ -960,4 +992,4 @@
 			color: $font-color-dark;
 		}
 	}
-</style>
+</style>

+ 2 - 2
pages/user/myteam.vue

@@ -35,9 +35,9 @@
 						<view class="title">
 							<view class="title-name clamp">{{ item.nickname }}</view>
 						</view>
-						<view class="time">
+						<!-- <view class="time">
 							<text>{{ item.mobile }}</text>
-						</view>
+						</view> -->
 					</view>
 				</view>
 			</view>