5-22

pages/user/model/model.vue

@@ -6,6 +6,9 @@
 			<button class="share" type="default" open-type="share">
 				分享名片
 			</button>
+			<view class="nav-model" @click="navto('/pages/user/model/model?mtype=' + mtype+'&type=0')" v-if="mtype != 3">
+				生成我的名片
+			</view>
 		</view>
 		<view class="fxmp flex bottom" v-if="type==3">
 			<button class="share" type="default" open-type="share">

pages/user/model/modelrz.vue

@@ -56,12 +56,16 @@
 					<view class="flex titleBox">
 						<text class="title">籍贯</text>
 					</view>
-					<view class="right flex">
+					<!-- <view class="right flex">
 						<pickerAddress @change="changeAncestralPlace">
 							{{
 								updata.ancestral_place||'请选择籍贯'
 							}}
 						</pickerAddress>
+					</view> -->
+					<view class="right flex">
+						<input class="input" v-model="updata.ancestral_place" type="text" placeholder="请填写籍贯"
+							placeholder-class="placeholder" />
 					</view>
 				</view>
 				<view class="flex listItem">
@@ -457,6 +461,7 @@
 				)
 				console.log(that.updata);
 				let data = {
+					is_china: that.updata.is_wm == '是'?0:1,
 					name: that.updata.name,
 					avatar: that.updata.avatar,
 					age: IdCard(that.updata.cardId, 3),
@@ -466,11 +471,11 @@
 					ancestral_place: that.updata.ancestral_place,
 					minority: that.updata.minority,
 					education: that.updata.education,
-					service_area_all: that.updata.onCity.map(
+					service_area_all: that.updata.is_wm == '否'?that.updata.onCity.map(
 						(item) => {
 							return item.province + item.city + item.district
 						}
-					),
+					):['海外,海外,海外'],
 					service_min_price: that.updata.minMoney,
 					service_max_price: that.updata.maxMoney,
 					service_time_type_title: that.updata.timetype.title,
@@ -483,7 +488,7 @@
 					user_work_type_title: that.updata.word.title,
 					service_count: that.updata.service_count
 				}
-				console.log('baocun');
+				console.log('baocun',data);
 				uni.setStorageSync('modeldata', data)
 				uni.navigateTo({
 					url: '/pages/user/model/model?mtype=' + that.modelid + '&type=1'