zhaogongxue 2 年之前
父节点
当前提交
554b512a90
共有 100 个文件被更改,包括 1803 次插入1199 次删除
  1. 2 1
      common/config.js
  2. 11 0
      pages.json
  3. 14 2
      pages/activity/activityInfo.vue
  4. 25 0
      pages/activity/webview.vue
  5. 328 47
      pages/auth/auth.vue
  6. 196 26
      pages/index/base.vue
  7. 1 1
      pages/index/videoInfo.vue
  8. 1066 1021
      pages/profile/myPage.vue
  9. 153 97
      pages/profile/otherPage.vue
  10. 6 0
      pages/profile/zixunList.vue
  11. 二进制
      unpackage/dist/build/h5.zip
  12. 1 1
      unpackage/dist/build/h5/index.html
  13. 0 0
      unpackage/dist/build/h5/static/index.b0707a6a.css
  14. 0 0
      unpackage/dist/build/h5/static/js/chunk-vendors.3545db87.js
  15. 0 0
      unpackage/dist/build/h5/static/js/index.205be48c.js
  16. 0 0
      unpackage/dist/build/h5/static/js/pages-activity-activity.375e09a5.js
  17. 0 0
      unpackage/dist/build/h5/static/js/pages-activity-activityInfo.7b759783.js
  18. 0 0
      unpackage/dist/build/h5/static/js/pages-activity-activityInfo~pages-auth-auth~pages-index-base~pages-index-indexjubao~pages-index-reco~7d78533e.2f50d3d6.js
  19. 0 0
      unpackage/dist/build/h5/static/js/pages-activity-activityInfo~pages-auth-auth~pages-index-base~pages-index-index~pages-index-indexjuba~e41a5659.8734e77c.js
  20. 0 0
      unpackage/dist/build/h5/static/js/pages-activity-activityLIst.9d5c2acd.js
  21. 0 0
      unpackage/dist/build/h5/static/js/pages-activity-activity~pages-activity-activityInfo~pages-auth-auth~pages-index-base~pages-index-ind~95495b57.ca5b73eb.js
  22. 0 0
      unpackage/dist/build/h5/static/js/pages-auth-auth.a31834b2.js
  23. 0 0
      unpackage/dist/build/h5/static/js/pages-auth-auth~pages-index-base~pages-index-indexjubao~pages-index-pipei~pages-index-registerVip~pa~28fb10c1.75c90fdc.js
  24. 0 0
      unpackage/dist/build/h5/static/js/pages-auth-dengjibiao.6122943d.js
  25. 0 0
      unpackage/dist/build/h5/static/js/pages-index-base.9e55294c.js
  26. 0 0
      unpackage/dist/build/h5/static/js/pages-index-base1.6bec4b0f.js
  27. 0 1
      unpackage/dist/build/h5/static/js/pages-index-contactour.ac28bb70.js
  28. 0 0
      unpackage/dist/build/h5/static/js/pages-index-gonglue.f285d7d9.js
  29. 0 0
      unpackage/dist/build/h5/static/js/pages-index-index.626426bd.js
  30. 0 0
      unpackage/dist/build/h5/static/js/pages-index-indexjubao.3877f40c.js
  31. 0 1
      unpackage/dist/build/h5/static/js/pages-index-message.2f9da6ea.js
  32. 0 0
      unpackage/dist/build/h5/static/js/pages-index-pipei.0e50cfb0.js
  33. 0 0
      unpackage/dist/build/h5/static/js/pages-index-pipeizhong.523d6927.js
  34. 0 0
      unpackage/dist/build/h5/static/js/pages-index-recommend.a039a2fd.js
  35. 0 0
      unpackage/dist/build/h5/static/js/pages-index-registerVip.a2d4e380.js
  36. 0 0
      unpackage/dist/build/h5/static/js/pages-index-renzhengVip.add43718.js
  37. 0 0
      unpackage/dist/build/h5/static/js/pages-index-renzhengVip~pages-index-talkLove~pages-index-videoList~pages-profile-login.c9dca605.js
  38. 0 1
      unpackage/dist/build/h5/static/js/pages-index-talkInfo.c860a9d4.js
  39. 0 0
      unpackage/dist/build/h5/static/js/pages-index-talkLove.1fad7d57.js
  40. 0 0
      unpackage/dist/build/h5/static/js/pages-index-twoHappy.489a6fc5.js
  41. 0 0
      unpackage/dist/build/h5/static/js/pages-index-twoHappyInfo.045dd52f.js
  42. 0 0
      unpackage/dist/build/h5/static/js/pages-index-videoInfo.69fd64ba.js
  43. 0 0
      unpackage/dist/build/h5/static/js/pages-index-videoList.1a75ccdc.js
  44. 0 0
      unpackage/dist/build/h5/static/js/pages-index-zixun.7caf96c8.js
  45. 0 0
      unpackage/dist/build/h5/static/js/pages-profile-bangding.4a57a08d.js
  46. 0 0
      unpackage/dist/build/h5/static/js/pages-profile-changephone.8aba231f.js
  47. 0 0
      unpackage/dist/build/h5/static/js/pages-profile-dianzan.5d9296c4.js
  48. 0 0
      unpackage/dist/build/h5/static/js/pages-profile-fankuiList.2125dda1.js
  49. 0 0
      unpackage/dist/build/h5/static/js/pages-profile-fankuiinfo.0765ab97.js
  50. 0 0
      unpackage/dist/build/h5/static/js/pages-profile-fankuiinfo~pages-profile-lifePhoto~pages-profile-personPhoto.63b8e332.js
  51. 0 0
      unpackage/dist/build/h5/static/js/pages-profile-fensi.47158206.js
  52. 0 0
      unpackage/dist/build/h5/static/js/pages-profile-ganxingqu.a7f29f0d.js
  53. 0 0
      unpackage/dist/build/h5/static/js/pages-profile-guanzhu.bac54a4f.js
  54. 0 0
      unpackage/dist/build/h5/static/js/pages-profile-jubao.a02f4ebd.js
  55. 0 0
      unpackage/dist/build/h5/static/js/pages-profile-lifePhoto.c260b09e.js
  56. 0 0
      unpackage/dist/build/h5/static/js/pages-profile-login.59eff66d.js
  57. 0 0
      unpackage/dist/build/h5/static/js/pages-profile-myPage.98c007c6.js
  58. 0 0
      unpackage/dist/build/h5/static/js/pages-profile-mydongtai.c7a05d28.js
  59. 0 0
      unpackage/dist/build/h5/static/js/pages-profile-newphone.01eb42c6.js
  60. 0 0
      unpackage/dist/build/h5/static/js/pages-profile-otherPage.cb88ab56.js
  61. 0 0
      unpackage/dist/build/h5/static/js/pages-profile-personPhoto.b70dc93c.js
  62. 0 0
      unpackage/dist/build/h5/static/js/pages-profile-personStatus.11ff98ef.js
  63. 0 0
      unpackage/dist/build/h5/static/js/pages-profile-profile.3ad03073.js
  64. 0 0
      unpackage/dist/build/h5/static/js/pages-profile-reportInfo.c196d63f.js
  65. 0 0
      unpackage/dist/build/h5/static/js/pages-profile-reportList.cc3665ec.js
  66. 0 0
      unpackage/dist/build/h5/static/js/pages-profile-set.fbaff999.js
  67. 0 0
      unpackage/dist/build/h5/static/js/pages-profile-suqiu.8c6eb381.js
  68. 0 0
      unpackage/dist/build/h5/static/js/pages-profile-zhuxiao.2aa413b8.js
  69. 0 0
      unpackage/dist/build/h5/static/js/pages-profile-zixunInfo.1ed6541b.js
  70. 0 0
      unpackage/dist/build/h5/static/js/pages-profile-zixunList.ffddfe87.js
  71. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
  72. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map
  73. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
  74. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/activity/activity.js.map
  75. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/activity/activityInfo.js.map
  76. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/activity/activityLIst.js.map
  77. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/auth/auth.js.map
  78. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/auth/dengjibiao.js.map
  79. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/base.js.map
  80. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/base1.js.map
  81. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/gonglue.js.map
  82. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
  83. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/indexjubao.js.map
  84. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/pipei.js.map
  85. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/pipeizhong.js.map
  86. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/recommend.js.map
  87. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/registerVip.js.map
  88. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/renzhengVip.js.map
  89. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/talkLove.js.map
  90. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/twoHappy.js.map
  91. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/twoHappyInfo.js.map
  92. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/videoInfo.js.map
  93. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/videoList.js.map
  94. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/profile/bangding.js.map
  95. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/profile/changephone.js.map
  96. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/profile/dianzan.js.map
  97. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/profile/fankuiList.js.map
  98. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/profile/fankuiinfo.js.map
  99. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/profile/fensi.js.map
  100. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/profile/ganxingqu.js.map

+ 2 - 1
common/config.js

@@ -1,3 +1,4 @@
 module.exports = {
-    baseUrl: 'https://xiangqin.zhousi.hdlkeji.com'
+    baseUrl: 'https://xiangqin.zhousi.hdlkeji.com'//正式
+    // baseUrl: 'http://ceshixq.zhousi.hdlkeji.com'//测试
 }

+ 11 - 0
pages.json

@@ -8,6 +8,7 @@
 				"navigationStyle": "custom"
 			}
 		},
+		
 		{
 		    "path" : "pages/index/base",
 		    "style" :                                                                                    
@@ -19,6 +20,7 @@
 		    
 		}
 		
+		
 	    ,{
             "path" : "pages/activity/activity",
             "style" :                                                                                    
@@ -480,6 +482,15 @@
             }
             
         }
+        ,{
+            "path" : "pages/activity/webview",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",

+ 14 - 2
pages/activity/activityInfo.vue

@@ -50,8 +50,9 @@
 				<view class="content_title">
 					活动内容
 				</view>
-				<view class="content_info">
+				<view class="content_info" >
 					<rich-text :nodes="info.content"></rich-text>
+					<button type="warn" v-if="info.link" @click="toWeb">点击跳转</button>
 				</view>
 				<view class="btn">
 					<u-button text="立即报名" shape="circle" color="linear-gradient(270deg, #A890FE 0%, #FFAEAE 100%)"
@@ -95,7 +96,7 @@ border-image: linear-gradient(270deg, rgba(178, 148, 246, 1), rgba(248, 172, 182
 					<image :src="info.show_image" mode="" style="width: 650rpx;height: 368rpx;"></image>
 				</view>
 				<view class="" style="width: 650rpx;height: 432rpx;border-radius: 0 0 28rpx 28rpx;background-color: #fff;padding: 32rpx 40rpx;box-sizing: border-box;">
-					<view class="" style="font-size: 32rpx;color: #222;font-weight: 600;margin-bottom: 180rpx;">
+					<view class="" style="font-size: 32rpx;color: #222;font-weight: 600;margin-bottom: 120rpx;">
 						{{info.title}}
 					</view>
 					<view class="u-flex u-row-between">
@@ -196,6 +197,11 @@ border-image: linear-gradient(270deg, rgba(178, 148, 246, 1), rgba(248, 172, 182
 			}
 		},
 		methods: {
+			toWeb(){
+				uni.navigateTo({
+					url:'/pages/activity/webview?url='+encodeURIComponent(JSON.stringify(this.info.link))
+				})	
+			},
 			canceltoast(){
 					this.showtoast=false
 			},
@@ -460,12 +466,18 @@ border-image: linear-gradient(270deg, rgba(178, 148, 246, 1), rgba(248, 172, 182
 	}
 
 	.title {
+		overflow: hidden;
+		
 		background-color: #fff;
 		height: 108rpx;
 		line-height: 108rpx;
 		padding: 0 30rpx;
 
 		text {
+			overflow: hidden;
+			white-space: nowrap;
+			text-overflow: ellipsis;
+			width: 660rpx;
 			font-size: 32rpx;
 			color: #222222;
 			font-weight: 600;

+ 25 - 0
pages/activity/webview.vue

@@ -0,0 +1,25 @@
+<template>
+	<view>
+		<web-view :src="url"></web-view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				url:''
+			}
+		},
+		onLoad(e) {
+			this.url=JSON.parse(decodeURIComponent(e.url))
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>

+ 328 - 47
pages/auth/auth.vue

@@ -9,25 +9,187 @@
 			<image src="../../static/auth/5@2x.png" mode=""></image>
 		</view>
 		<view class="form" v-if="type==1">
-			<view class="">
-				<view class="item u-flex u-row-between">
+			<view class="" style="padding-bottom: 50rpx;">
+				<!-- <view class="item u-flex u-row-between">
 					<text style="white-space: nowrap;">姓名</text>
 					<input type="text" v-model="name" placeholder="请输入姓名">
 				</view>
 				<view class="item u-flex u-row-between">
 					<text style="white-space: nowrap;">手机号</text>
 					<input type="number" v-model="phone" placeholder="请输入手机号">
-				</view>
-				<view class="item u-flex u-row-between" @click="show=true">
-					<text style="white-space: nowrap;">工会(选填)</text>
-					<view class="u-flex" style="text-align: right;justify-content: flex-end;flex: 1;">
-						<text style="color: #FF5B5B;">{{current!=null?current.name:'请选择工会'}}</text>
+				</view> -->
+				<!-- <view class="item u-flex u-row-between">
+					<text style="white-space: nowrap;">工作单位</text>
+					<input type="text" v-model="workUnit" placeholder="请输入工作单位">
+				</view> -->
+				<view class="item u-flex u-row-between" >
+					<text style="white-space: nowrap;">工作单位</text>
+					<input type="text" v-model="c_id" placeholder="请输入工作单位">
+					<!-- <view class="u-flex" style="text-align: right;justify-content: flex-end;flex: 1;">
+						<text style="color: #FF5B5B;">{{current!=null?current.name:'请选择工作单位'}}</text>
 						<u-icon name="arrow-right" color="#FF5B5B"></u-icon>
+					</view> -->
+				</view> 
+				<view class="item u-flex u-row-between">
+					<text style="white-space: nowrap;">工作性质</text>
+					<view class="u-flex" style="text-align: right;justify-content: flex-end;flex: 1;"  @click="showwork=true">
+						<text >{{workStatus!=null?workStatus.name:'请选择工作性质'}}</text>
+						<u-icon name="arrow-right" ></u-icon>
+					</view>
+				</view> 
+				<view class="item u-flex u-row-between">
+					<text style="white-space: nowrap;">职务</text>
+					<input type="text" v-model="position" placeholder="请输入工作职务">
+				</view>
+				<view class="item u-flex u-row-between">
+					<text style="white-space: nowrap;">月收入(元)</text>
+					<input type="text" v-model="income" placeholder="请输入月收入">
+				</view>
+				<view class="item u-flex u-row-between">
+					<text style="white-space: nowrap;">单位工会主席</text>
+					<input type="text" v-model="chairman" placeholder="请输入工会主席姓名">
+				</view>
+				<view class="item u-flex u-row-between">
+					<text style="white-space: nowrap;">单位工会主席电话</text>
+					<input type="number" v-model="chairmanPhone" placeholder="请输入工会主席电话">
+				</view>
+				<view class="item u-flex u-row-between">
+					<text style="white-space: nowrap;">星座</text>
+					<view class="u-flex" style="text-align: right;justify-content: flex-end;flex: 1;"  @click="showxingzuo=true">
+						<text >{{xingzuo!=null?xingzuo:'请选择星座'}}</text>
+						<u-icon name="arrow-right" ></u-icon>
 					</view>
 				</view> 
 				<view class="item u-flex u-row-between">
-					<text style="white-space: nowrap;margin-right: 240rpx;">是否为职工APP会员</text>
+					<text style="white-space: nowrap;">婚史</text>
+					<view class="u-flex" style="text-align: right;justify-content: flex-end;flex: 1;"  @click="showhunshi=true">
+						<text >{{hunshi!=null?hunshi:'请选择婚史'}}</text>
+						<u-icon name="arrow-right" ></u-icon>
+					</view>
+				</view> 
+				<view class="item u-flex u-row-between">
+					<text style="white-space: nowrap;margin-right: 408rpx;">有无子女</text>
+					<u-radio-group 
+					activeColor="#B997EF"
+					    v-model="isChild"
+					    placement="row"
+					  >
+					    <u-radio
+					      :customStyle="{marginBottom: '8px'}"
+					      v-for="(item, index) in radiolist1"
+					      :key="index"
+					      :label="item.name"
+					      :name="item.value"
+					    >
+					    </u-radio>
+					  </u-radio-group>
+				</view>
+				<view class="item u-flex u-row-between" v-if="isChild==1">
+					<text style="white-space: nowrap;margin-right: 408rpx;">子女情况</text>
+					<u-radio-group 
+					activeColor="#B997EF"
+					    v-model="isSex"
+					    placement="row"
+					  >
+					    <u-radio
+					      :customStyle="{marginBottom: '8px'}"
+					      v-for="(item, index) in sexList"
+					      :key="item.id"
+					      :label="item.name"
+					      :name="item.id"
+					    >
+					    </u-radio>
+					  </u-radio-group>
+				</view>
+				<view class="item u-flex u-row-between">
+					<text style="white-space: nowrap;margin-right: 348rpx;">是否独生子女</text>
+					<u-radio-group 
+					activeColor="#B997EF"
+					    v-model="isOne"
+					    placement="row"
+					  >
+					    <u-radio
+					      :customStyle="{marginBottom: '8px'}"
+					      v-for="(item, index) in radiolist1"
+					      :key="index"
+					      :label="item.name"
+					      :name="item.value"
+					    >
+					    </u-radio>
+					  </u-radio-group>
+				</view>
+				<view class="item u-flex u-row-between" v-if="isOne==2">
+					<text style="white-space: nowrap;">兄弟姊妹几人</text>
+					<input type="number" v-model="children" placeholder="请输入人数">
+				</view>
+				<view class="item u-flex u-row-between" >
+					<text style="white-space: nowrap;margin-right: 66rpx;">居住情况</text>
+					<u-radio-group 
+					activeColor="#B997EF"
+					    v-model="isHouse"
+					    placement="row"
+					  >
+					    <u-radio
+					      :customStyle="{marginBottom: '8px'}"
+					      v-for="(item, index) in houseList"
+					      :key="item.id"
+					      :label="item.name"
+					      :name="item.id"
+					    >
+					    </u-radio>
+					  </u-radio-group>
+				</view>
+				<view class="item u-flex u-row-between">
+					<text style="white-space: nowrap;margin-right: 410rpx;">是否有车</text>
+					<u-radio-group 
+					activeColor="#B997EF"
+					    v-model="isCar"
+					    placement="row"
+					  >
+					    <u-radio
+					      :customStyle="{marginBottom: '8px'}"
+					      v-for="(item, index) in radiolist1"
+					      :key="index"
+					      :label="item.name"
+					      :name="item.value"
+					    >
+					    </u-radio>
+					  </u-radio-group>
+				</view>
+				<view class="item u-flex u-row-between" v-if="isCar==1">
+					<text style="white-space: nowrap;">车辆型号</text>
+					<input type="text" v-model="car_model" placeholder="请输入车辆型号">
+				</view>
+				<view class="item u-flex u-row-between">
+					<text style="white-space: nowrap;">父亲工作情况</text>
+					<view class="u-flex" style="text-align: right;justify-content: flex-end;flex: 1;"  @click="showfather=true">
+						<text >{{father!=''?father:'请选择工作情况'}}</text>
+						<u-icon name="arrow-right" ></u-icon>
+					</view>
+				</view> 
+				<view class="item u-flex u-row-between">
+					<text style="white-space: nowrap;">母亲工作情况</text>
+					<view class="u-flex" style="text-align: right;justify-content: flex-end;flex: 1;"  @click="showmather=true">
+						<text >{{mather!=''?mather:'请选择工作情况'}}</text>
+						<u-icon name="arrow-right" ></u-icon>
+					</view>
+				</view> 
+				<view class="item u-flex u-row-between">
+					<text style="white-space: nowrap;">个人爱好</text>
+					<input type="text" v-model="hobby" placeholder="请输入个人爱好">
+				</view>
+				<view class="item u-flex u-row-between">
+					<text style="white-space: nowrap;">毕业院校</text>
+					<input type="text" v-model="school" placeholder="请输入毕业院校">
+				</view>
+				<view class="item u-flex u-row-between">
+					<text style="white-space: nowrap;">关于TA</text>
+					<input type="text" v-model="aboutIt" placeholder="择偶要求">
+				</view>
+				<view class="item u-flex u-row-between">
+					<text style="white-space: nowrap;margin-right: 200rpx;">是否为齐鲁工会APP会员</text>
 					<u-radio-group
+					
 					activeColor="#B997EF"
 					    v-model="radiovalue1"
 					    placement="row"
@@ -44,14 +206,14 @@
 					    </u-radio>
 					  </u-radio-group>
 				</view>
-				<view class="item u-flex u-row-between">
+				<!-- <view class="item u-flex u-row-between">
 					<text style="white-space: nowrap;">会员号</text>
 					<input v-model="uuid" type="text" placeholder="请填写会员号">
 					
-				</view>
+				</view> -->
 				<view class="upload">
 					<view class="title">
-						<text>*</text>上传单位证明
+						<text>*</text>上传电子会员卡
 					</view>
 					<view class="uploadContent" @click="uploadImg">
 						<image :src="workImg" mode="" style="position: absolute;top: 0;right: 0;bottom: 40rpx;left: 0;z-index: 999;width: 100%;height: 400rpx;" v-show="workImg"></image>
@@ -63,17 +225,17 @@
 							请至齐鲁工惠-我的-个人资料-电子会员卡页面截图
 						</view>
 					</view>
-					<view class="lookvip" @click="toVip">
+					<!-- <view class="lookvip" @click="toVip">
 						<image src="../../static/auth/3@2x.png" mode=""
 							style="width: 28rpx;height: 28rpx;vertical-align: middle;"></image>
 						<text>查看会员登记表</text>
 						<image src="../../static/auth/4@2x.png" mode=""
 							style="width: 12rpx;height: 12rpx;vertical-align: middle;"></image>
-					</view>
+					</view> -->
 				</view>
 				<view class="upload">
 					<view class="title">
-						<text>*</text>上传电子会员卡
+						<text>*</text>上传单身职工信息登记表
 					</view>
 					<view class="uploadContent" @click="uploadImg1">
 						<image :src="workImg1" mode="" style="position: absolute;top: 0;right: 0;bottom: 40rpx;left: 0;z-index: 999;width: 100%;height: 400rpx;" v-show="workImg1"></image>
@@ -82,23 +244,28 @@
 							<image src="../../static/auth/2@2x.png" mode="" class="smallImg"></image>
 						</view>
 						<view class="contentBottom" >
-							上传电子会员卡
+							上传单身职工信息登记表
 						</view>
 					</view>
-					<!-- <view class="lookvip" @click="toVip">
+					<view class="lookvip" @click="toVip">
 						<image src="../../static/auth/3@2x.png" mode=""
 							style="width: 28rpx;height: 28rpx;vertical-align: middle;"></image>
 						<text>查看会员登记表</text>
 						<image src="../../static/auth/4@2x.png" mode=""
 							style="width: 12rpx;height: 12rpx;vertical-align: middle;"></image>
-					</view> -->
+					</view>
 				</view>
 				<view class="upload">
 					<view class="title" style="margin-bottom: 18rpx;">
-						<text>*</text>上传个人照片<text style="font-size: 20rpx;color: #D2D2D2;">(至少上传一张照片)</text>
+						上传工作证明(选填)
+						<!-- <text style="font-size: 20rpx;color: #D2D2D2;">(个人信息表未盖章需提供工作相关佐证)</text> -->
+					</view>
+					<view class="" style="font-size: 20rpx;color: #D2D2D2;">
+						个人信息表未盖章需提供工作相关佐证,如:支付宝全国住房公积金个人缴费信息截图(具体流程:支付宝搜索全国住房公积金查询→账户信息查询→点击查看详情后截图上传)
+
 					</view>
 					<u-upload :fileList="fileList1"  @afterRead="afterRead" @delete="deletePic" name="1" :multiple='false'
-						:maxCount="3">
+						:maxCount="1">
 						
 						</u-upload>
 				</view>
@@ -148,6 +315,16 @@
 		</view>
 		<u-picker :show="show" :columns="columns" keyName="name" @confirm='change' @cancel='cancel' :closeOnClickOverlay='true'>
 		</u-picker>
+		<u-picker :show="showwork" @cancel='showwork=false' title="工作性质" @confirm='confirmWork' keyName="name"
+			:columns="workColumns"></u-picker>
+			<u-picker :show="showxingzuo" @cancel='showxingzuo=false' title="星座" @confirm='confirmshowxingzuo' keyName="name"
+				:columns="xingzuoColumns"></u-picker>
+				<u-picker :show="showhunshi" @cancel='showhunshi=false' title="婚史" @confirm='confirmshowhunshi' keyName="name"
+					:columns="hunshiColumns"></u-picker>
+					<u-picker :show="showfather" @cancel='showfather=false' title="工作情况" @confirm='confirmshowfather' keyName="name"
+						:columns="fatherColumns"></u-picker>
+						<u-picker :show="showmather" @cancel='showmather=false' title="工作情况" @confirm='confirmshowmather' keyName="name"
+							:columns="matherColumns"></u-picker>
 	</view>
 	</view>
 </template>
@@ -162,6 +339,7 @@
 			},
 		onLoad() {
 				this.getWorking()
+				this.getWorkStatus()
 		},
 		onShow() {
 			if (!uni.getStorageSync('token')) {
@@ -183,6 +361,42 @@
 		},
 		data() {
 			return {
+				children:'',
+				school:'',
+				showfather:false,
+				father:'',
+				position:'',
+				income:'',
+				fatherColumns:[[{name:'退休职工'},{name:'在职职工'},{name:'个体'},{name:'务农'},{name:'其他'}]],
+				showmather:false,
+				matherColumns:[[{name:'退休职工'},{name:'在职职工'},{name:'个体'},{name:'务农'},{name:'其他'}]],
+				mather:'',
+				car_model:'',
+				isCar:'',
+				isHouse:'',
+				isOne:'',
+				isSex:'',
+				houseList:[{
+				            name: '自有产权房',
+				            id: 1
+				          },
+				            {
+				              name: '租住',
+				              id: 2
+				            },{
+				              name: '与父母同住',
+				              id: 3
+				            }],
+				sexList: [{
+				            name: '男',
+				            id: 1
+				          },
+				            {
+				              name: '女',
+				              id: 2
+				            }
+				          ],
+				isChild:'',
 				radiolist1: [{
 				            name: '是',value:1
 				          },
@@ -207,10 +421,32 @@
 				workImg1:'',
 				type:'',
 				reason:'',
-				uuid:''
+				// uuid:'',
+				workUnit:'',
+				showwork:false,
+				workColumns:[],
+				workStatus:null,
+				chairman:'',
+				chairmanPhone:'',
+				showxingzuo:false,
+				showhunshi:false,
+				xingzuoColumns:[[{name:"白羊座"},{name:"金牛座"},{name:"双子座"},{name:"巨蟹座"},{name:"狮子座"},{name:"处女座"},{name:"天秤座"},{name:"天蝎座"},{name:"射手座"},{name:"摩羯座"},{name:"水瓶座"},{name:"双鱼座"}]],
+				hunshiColumns:[[{name:"未婚"},{name:"离异"},{name:"丧偶"}]],
+				xingzuo:null,
+				hunshi:null,
+				hobby:'',
+				aboutIt:'',
+				c_id:''
+				
+				
 			}
 		},
 		methods: {
+			getWork() {
+				uni.$u.http.post('/api/index/WorkNature').then(res => {
+					this.columns1 = [res.data]
+				})
+			},
 			toVip(){
 					uni.navigateTo({
 						url:'./dengjibiao'
@@ -249,48 +485,68 @@
 					
 					return
 				}
-				if(!this.name){
-					this.$u.toast('请输入姓名')
-					return
-				}
-				if(!this.phone){
-					this.$u.toast('请输入手机号')
-					return
-				}
-				if(!this.uuid){
-					this.$u.toast('请输入会员号')
-					return
-				}
+				// if(!this.name){
+				// 	this.$u.toast('请输入姓名')
+				// 	return
+				// }
+				// if(!this.phone){
+				// 	this.$u.toast('请输入手机号')
+				// 	return
+				// }
+				// if(!this.uuid){
+				// 	this.$u.toast('请输入会员号')
+				// 	return
+				// }
 				if(!this.radiovalue1){
 					this.$u.toast('请选择是否为职工App会员')
 					return
 				}
-				if(!this.workImg){
+				if(!this.workImg1){
 					this.$u.toast('上传单位证明')
 					return
 				}
-				if(!this.workImg1){
+				if(!this.workImg){
 					this.$u.toast('上传电子会员卡')
 					return
 				}
-				if(this.fileList1.length==0){
-					this.$u.toast('上传个人照片')
-					return
-				}
+				// if(this.fileList1.length==0){
+				// 	this.$u.toast('上传个人照片')
+				// 	return
+				// }
 				var arr=[]
 				this.fileList1.forEach(item=>{
 					arr.push(item.url)
 				})
 				let data={
-					is_vip:this.radiovalue1,
-					n_image:this.workImg1,
-					name:this.name,
-					phone:this.phone,
-					c_id:this.current?this.current.id:'',
-					uuid:this.uuid,
-					c_image:this.workImg,
-					m_images:arr.toString()
-					
+					type:1,
+					mid:uni.getStorageSync('userId'),//用户id
+					n_id:this.workStatus.id,//工作性质
+					is_vip:this.radiovalue1,//是否会员
+					n_image:this.workImg,//电子会员卡
+					// name:this.name,//姓名
+					// phone:this.phone,手机号
+					c_id:this.c_id,//工会单位
+					// uuid:this.uuid,//会员号
+					c_image:this.workImg1,//单位证明
+					zhuxi:this.chairman,//主席
+					zhuxi_phone:this.chairmanPhone,//主席电话
+					constellation:this.xingzuo,//星座
+					hunshi:this.hunshi=='未婚'?1:this.hunshi=='离异'?2:3,
+					hobby:this.hobby,//爱好
+					children:this.children,//兄弟几人
+					appeals:this.aboutIt,//择偶要求
+					image:arr.length==0?'':arr.toString(),//公积金缴费截图
+					is_zinv:this.isChild,
+					zinv_sex:this.isSex,
+					is_du:this.isOne,
+					home:this.isHouse,
+					is_car:this.isCar,
+					car_model:this.car_model,
+					fa_work:this.father,
+					ma_work:this.mather,
+					graduaction_school:this.school,
+					position:this.position,
+					income:this.income
 					
 				}
 				uni.$u.http.post('/api/Authentication/authentication',data).then(res => {
@@ -338,6 +594,31 @@
 					this.columns=[res.data]
 				})
 			},
+			getWorkStatus(){
+				uni.$u.http.post('/api/index/WorkNature').then(res => {
+					this.workColumns=[res.data]
+				})
+			},
+			confirmWork(e) {
+				this.workStatus = e.value[0]
+				this.showwork = false
+			},
+			confirmshowxingzuo(e) {
+				this.xingzuo = e.value[0].name
+				this.showxingzuo = false
+			},
+			confirmshowhunshi(e) {
+				this.hunshi = e.value[0].name
+				this.showhunshi = false
+			},
+			confirmshowfather(e) {
+				this.father = e.value[0].name
+				this.showfather = false
+			},
+			confirmshowmather(e) {
+				this.mather = e.value[0].name
+				this.showmather = false
+			},
 			change(e) {
 				this.current = e.value[0]
 				// console.log(this.columns[0][this.current])

+ 196 - 26
pages/index/base.vue

@@ -12,15 +12,19 @@
 		<view class="form" >
 			<view class="">
 				<view class="item u-flex u-row-between">
-					<text style="white-space: nowrap;">单位名称</text>
-					<input type="text" v-model="unit" placeholder="请输入您的单位名称">
+					<text class="itemText" style="white-space: nowrap;">昵称</text>
+					<input type="text" v-model="nickname" placeholder="请输入您的昵称">
 				</view>
+				<!-- <view class="item u-flex u-row-between">
+					<text class="itemText" style="white-space: nowrap;">单位名称</text>
+					<input type="text" v-model="unit" placeholder="请输入您的单位名称">
+				</view> -->
 				<view class="item u-flex u-row-between">
-					<text style="white-space: nowrap;">姓名</text>
+					<text class="itemText" style="white-space: nowrap;">姓名</text>
 					<input type="text" v-model="name" placeholder="请输入姓名">
 				</view>
 				<view class="item u-flex u-row-between">
-					<text style="white-space: nowrap;">性别</text>
+					<text class="itemText" style="white-space: nowrap;">性别</text>
 					<u-radio-group 
 					    v-model="radiovalue1"
 					    placement="row"
@@ -36,43 +40,75 @@
 					  </u-radio-group>
 				</view>
 				<view class="item u-flex u-row-between">
-					<text style="white-space: nowrap;">身份证号</text>
+					<text class="itemText" style="white-space: nowrap;">身份证号</text>
 					<input type="text" v-model="idcard" placeholder="请输入您的身份证号">
 				</view>
 				<view class="item u-flex u-row-between">
-					<text style="white-space: nowrap;">年龄</text>
+					<text class="itemText" style="white-space: nowrap;">年龄</text>
 					<input type="number" v-model="age" placeholder="请输入您的年龄">
-				</view>
+				</view> 
 				<view class="item u-flex u-row-between" @click="show=true">
-					<text style="white-space: nowrap;">学历</text>
+					<text class="itemText" style="white-space: nowrap;">学历</text>
 					<view class="u-flex" style="text-align: right;justify-content: flex-end;flex: 1;">
 						<text >{{current!=null?current:'请选择您的学历'}}</text>
 						<u-icon name="arrow-right" ></u-icon>
 					</view>
 				</view> 
 				<view class="item u-flex u-row-between">
-					<text style="white-space: nowrap;">手机号</text>
+					<text class="itemText" style="white-space: nowrap;">身高</text>
+					<input type="number" v-model="height" placeholder="请输入您的身高(cm)">
+				</view>
+				<view class="item u-flex u-row-between">
+					<text class="itemText" style="white-space: nowrap;">体重</text>
+					<input type="number" v-model="weight" placeholder="请输入您的体重(kg)">
+				</view>
+				<view class="item u-flex  u-row-between">
+					<text class="itemText" style="white-space: nowrap;">现居地</text>
+					<view class=" u-flex">
+						<input type="text" @click="showaddress=true" :disabled="true" placeholder="请选择现居地" style="flex: 1;"
+							v-model="address.length==0?'':address[0].name+'-'+address[1].name">
+						<u-icon name="arrow-down"></u-icon>
+						
+					</view>
+				</view>
+				<view class="item u-flex u-row-between">
+					<text class="itemText" style="white-space: nowrap;">手机号</text>
 					<input type="number" v-model="phone" placeholder="请输入手机号">
 				</view>
 				
 				<view class="item u-flex u-row-between">
-					<text style="white-space: nowrap;">验证码</text>
+					<text class="itemText" style="white-space: nowrap;">验证码</text>
 					<view class="u-flex" >
 						<input v-model="code" type="text" placeholder=" ">
 						<text style="color: #2A63F3;background: linear-gradient(270deg, #A890FE 0%, #FFAEAE 100%);-webkit-background-clip: text;-webkit-text-fill-color: transparent;" @click="getCode">{{count}}</text>
 					</view>
 				</view>
-				
+				<view class="item1  u-col-center">
+					<text class="itemText" style="white-space: nowrap;margin-bottom: 28rpx;">个人生活照</text>
+					<u-upload
+						:fileList="fileList"
+						@afterRead="afterRead"
+						@delete="deletePic"
+						name="3"
+						:multiple='false'
+						:maxCount=1
+						:previewFullImage="true"
+						width="110"
+							height="110"
+							
+					></u-upload>
+				</view>
 				
 				
 			</view>
 		</view>
-		<view class="" style="margin: 106rpx 30rpx 0;">
+		<view class="" style="margin: 60rpx 30rpx 0;padding-bottom: 50rpx;">
 			<u-button text="确定" @click="gorenzheng" shape="circle" color="linear-gradient(270deg, #A890FE 0%, #FFAEAE 100%)"
 				></u-button>
 		</view>
 		
-		
+		<u-picker :show="showaddress" @cancel='showaddress=false' keyName="name" title="居住地" ref="uPicker"
+			:columns="addresscolumns" @confirm="addressconfirm"></u-picker>
 		<u-picker :show="show" :columns="columns" keyName="name" @confirm='change' @cancel='cancel' :closeOnClickOverlay='true'>
 		</u-picker>
 	</view>
@@ -102,7 +138,11 @@
 </template>
 
 <script>
+	import AddressPicker from "@/components/lingdang-AddressPicker/AddressPicker.vue"
 	export default {
+		components:{
+			AddressPicker
+		},
 		onPullDownRefresh() {
 				
 				setTimeout(function () {
@@ -110,14 +150,18 @@
 				}, 1000);
 			},
 		onLoad() {
-				
+				this.getInfo()
 		},
 		onShow() {
-				this.getInfo()
+				
 				
 		},
 		data() {
 			return {
+				fileList:[],
+				address:[],
+				showaddress:false,
+				nickname:'',
 				radiolist1: [{
 				            name: '男',
 				            id: 1
@@ -133,6 +177,8 @@
 				count:'获取验证码',
 				code:'',
 				age:'',
+				height:'',
+				weight:'',
 				unit:'',
 				idcard:'',
 				working:{},
@@ -148,10 +194,75 @@
 				workImg:'',
 				type:'',
 				reason:'',
-				uuid:''
+				uuid:'',
+				addresscolumns: [
+					[{"id": 1,
+						"name": "临沂市"}
+					],
+					[{"id":1480,"name":"兰山区"},{"id":1481,"name":"罗庄区"},{"id":1482,"name":"河东区"},{"id":1483,"name":"沂南县"},{"id":1484,"name":"郯城县"},{"id":1485,"name":"沂水县"},{"id":1486,"name":"兰陵县"},{"id":1487,"name":"费县"},{"id":1488,"name":"平邑县"},{"id":1489,"name":"莒南县"},{"id":1490,"name":"蒙阴县"},{"id":1491,"name":"临沭县"}]
+				],
 			}
 		},
 		methods: {
+			// 删除图片
+						deletePic(event) {
+							console.log(event)
+							var that=this
+							this.fileList=[]
+			
+						},
+						// 新增图片
+						async afterRead(event) {
+							console.log('event',event)
+							// 当设置 mutiple 为 true 时, file 为数组格式,否则为对象格式
+							let lists = [].concat(event.file)
+							// let fileListLen = this.fileList.length
+							lists.map((item) => {
+								this.fileList.push({
+									...item,
+									status: 'uploading',
+									message: '上传中'
+								})
+							})
+							for (let i = 0; i < lists.length; i++) {
+								const result = await this.uploadFilePromise(lists[i].url)
+								console.log('result',result)
+								uni.$u.http.post('/api/user/upload_album',{image:result,type:1}).then(res => {
+									if(res.code==1){
+										this.getpersonPhoto()
+									}
+								})
+								// let item = this.fileList[fileListLen]
+								// this.fileList.splice(fileListLen, 1, Object.assign(item, {
+								// 	status: 'success',
+								// 	message: '',
+								// 	url: result
+								// }))
+								// fileListLen++
+							}
+						},
+						uploadFilePromise(url) {
+							return new Promise((resolve, reject) => {
+								let a = uni.uploadFile({
+									url: this.$url+'/api/Publics/uploadLocality', // 仅为示例,非真实的接口地址
+									filePath: url,
+									name: 'file',
+									formData: {
+										user: 'test'
+									},
+									success: (res) => {
+										setTimeout(() => {
+											resolve(JSON.parse(res.data).data.url)
+										}, 1000)
+									}
+								});
+							})
+						},
+			addressconfirm(e){
+				console.log(e)
+				this.address = e.value
+				this.showaddress = false
+			},
 			goback(){
 					uni.switchTab({
 						url:'./index'
@@ -202,9 +313,23 @@
 				});
 				}
 			},
+			changeAddress(result) {
+					// this.info.province_id=result.data[0].id
+					// this.info.city_id=result.data[1].id
+					this.area_id=result.data[2].id
+				this.address = '';
+				result.data.forEach((item, index) => {
+					if (index === 0) {
+						this.address += item.name
+					} else {
+						this.address += '-' + item.name
+					}
+				});
+				let arr = this.info.address.split('-');
+			},
 			gorenzheng(){
-				if(!this.unit){
-					this.$u.toast('请输入单位名称')
+				if(!this.nickname){
+					this.$u.toast('请输入称')
 					return
 				}
 				if(!this.name){
@@ -223,10 +348,26 @@
 					this.$u.toast('请输入年龄')
 					return
 				}
+				if(!this.height){
+					this.$u.toast('请输入身高')
+					return
+				}
+				if(!this.weight){
+					this.$u.toast('请输入体重')
+					return
+				}
+				if(this.address.length==0){
+					this.$u.toast('请选择现居地')
+					return
+				}
 				if(this.current==null){
 					this.$u.toast('请选择学历')
 					return
 				}
+				if(this.fileList.length==0){
+					this.$u.toast('请上传个人生活照')
+					return
+				}
 				if(!this.phone){
 					this.$u.toast('请输入手机号')
 					return
@@ -249,14 +390,21 @@
 				// }
 				
 				let data={
-					working:this.unit,
+					type:1,
+					nickname:this.nickname,
+					// working:this.unit,
 					username:this.name,
+					sex:this.radiovalue1,
 					ID_car:this.idcard,
 					age:this.age,
 					education:this.current,
+					height:this.height,
+					weight:this.weight,
+					area_id:this.address[1].id,
+					headimg:this.fileList[0].url,
 					phone:this.phone,
 					code:this.code,
-					sex:this.radiovalue1
+					
 				}
 				uni.$u.http.post('/api/index/member_basic',data).then(res => {
 									if(res.code==1){
@@ -293,15 +441,15 @@
 			},
 			// 删除图片
 			deletePic(event) {
-				this[`fileList${event.name}`].splice(event.index, 1)
+				this.fileList.splice(event.index, 1)
 			},
 			// 新增图片
 			async afterRead(event) {
 				// 当设置 mutiple 为 true 时, file 为数组格式,否则为对象格式
 				let lists = [].concat(event.file)
-				let fileListLen = this[`fileList${event.name}`].length
+				let fileListLen = this.fileList.length
 				lists.map((item) => {
-					this[`fileList${event.name}`].push({
+					this.fileList.push({
 						...item,
 						status: 'uploading',
 						message: '上传中'
@@ -309,8 +457,8 @@
 				})
 				for (let i = 0; i < lists.length; i++) {
 					const result = await this.uploadFilePromise(lists[i].url)
-					let item = this[`fileList${event.name}`][fileListLen]
-					this[`fileList${event.name}`].splice(fileListLen, 1, Object.assign(item, {
+					let item = this.fileList[fileListLen]
+					this.fileList.splice(fileListLen, 1, Object.assign(item, {
 						status: 'success',
 						message: '',
 						url: result
@@ -558,16 +706,38 @@
 			height: 94rpx;
 			line-height: 94rpx;
 			border-bottom: 2rpx solid #F5F5F5;
-
+			
 			text {
 				font-size: 30rpx;
 				color: #222222;
+				position: relative;
+			}
+			.itemText::after{
+				content: "*";
+				position: absolute;
+				color: #E02020;
 			}
 
 			input {
 				text-align: right;
 			}
 		}
+		.item1{
+			text {
+				font-size: 30rpx;
+				color: #222222;
+				position: relative;
+			}
+			.itemText::after{
+				content: "*";
+				position: absolute;
+				color: #E02020;
+			}
+			
+			input {
+				text-align: right;
+			}
+		}
 	}
 
 	.top {

+ 1 - 1
pages/index/videoInfo.vue

@@ -4,7 +4,7 @@
 			<image src="../../static/index/back.png" mode="" style="width: 64rpx;height: 64rpx;" @click="back"></image>
 		</view>
 		<view class="" style="position: absolute;top: 50%;transform: translateY(-50%);">
-			<video :src="info.video" style="width: 750rpx;height: 440rpx;" :controls="true" ></video>
+			<video v-if="info.video" :src="info.video" style="width: 750rpx;height: 440rpx;" :controls="true" ></video>
 		</view>
 		<view class="" style="position: fixed;bottom: 240rpx;left:30rpx;right: 30rpx;color: #fff;font-size: 30rpx;">
 			{{info.title}}

+ 1066 - 1021
pages/profile/myPage.vue

@@ -1,1035 +1,1080 @@
 <template>
-  <view class="page flex-col">
-    <view class="group_1 flex-col justify-between">
-      <view class="box_37 flex-col">
-		  
-       
-        <view class="box_3 flex-col">
-          <view class="text-wrapper_25 flex-row">
-            <text class="text_29">{{info.fans}}</text>
-            <text class="text_30">粉丝</text>
-            <text class="text_31">{{info.follow}}</text>
-            <text class="text_32">关注</text>
-          </view>
-          <view class="box_38 flex-row">
-            <view class="image-text_45 flex-row">
-              <text class="text_4">{{info.nickname}}</text>
-              <view class="box_20 flex-row u-row-around" style="align-items: center;">
-                <view class="image-text_46 flex-row justify-between">
-                 <!-- <view class="box_21 flex-col"></view>
-                  <text class="text-group_20">已认证</text> -->
-				  <image src="../../static/profile/8@2x.png" mode="" style="width: 96rpx;height: 32rpx" v-show="info.vip_level==0"></image>
-                </view>
-                <!-- <view class="image-text_47 flex-row justify-between">
-                  <view class="box_21 flex-col"></view>
-                  <text class="text-group_20">已认证</text>
-                </view> -->
-				<!-- <image src="../../static/profile/ganxingqu@2x.png" mode="" style="width: 152rpx;height: 52rpx;"></image> -->
-              </view>
-            </view>
-          </view>
-          <image
-            class="image_1"
-            referrerpolicy="no-referrer"
-            :src="info.headimg"
-          />
-        </view>
-      </view>
-      <view class="box_22 flex-col">
-        <view class="text-wrapper_26 flex-row justify-between">
-          <text class="text_33" @click="itemclick(index)" :class="{'select':current==index}" :key="index" v-for="(item,index) in list">{{item}}</text>
-         <!-- <text class="text_34">工作职业</text>
-          <text class="text_35">家庭情况</text>
-          <text class="text_36">相册</text> -->
-        </view>
-      
-       <view class="" v-show="current==0">
-       	<view class="group_50 flex-row  justify-between">
-       	  <text class="text_49">性别</text>
-       	  <view class="flex-row" @click="showsex=true">
-       	  	<text class="text_50" >{{info.sex==1?'男':'女'}}</text>
-       	  	<u-icon name="arrow-right"></u-icon>
-       	  </view>
-       	</view>
-		<view class="group_50 flex-row  justify-between">
-		  <text class="text_49">年龄</text>
-		  <view class="flex-row">
-					 <input type="text" placeholder="请输入年龄" v-model='info.age' style="text-align: right;">
-		  	<!-- <text class="text_50">岁</text> -->
-		  </view>
+	<view class="page flex-col">
+		<view class="group_1 flex-col justify-between">
+			 <view class="box_37 flex-col">
+					  
+			       
+			        <view class="box_3 flex-col">
+			          <view class="text-wrapper_25 flex-row">
+			            <text class="text_29">{{info.fans}}</text>
+			            <text class="text_30">粉丝</text>
+			            <text class="text_31">{{info.follow}}</text>
+			            <text class="text_32">关注</text>
+			          </view>
+			          <view class="box_38 flex-row">
+			            <view class="image-text_45 flex-row">
+			              <text class="text_4">{{info.nickname}}</text>
+			              <view class="box_20 flex-row u-row-around" style="align-items: center;">
+			                <view class="image-text_46 flex-row justify-between">
+			                 <!-- <view class="box_21 flex-col"></view>
+			                  <text class="text-group_20">已认证</text> -->
+							  <image src="../../static/profile/8@2x.png" mode="" style="width: 96rpx;height: 32rpx" v-show="info.vip_level==0"></image>
+			                </view>
+			                <!-- <view class="image-text_47 flex-row justify-between">
+			                  <view class="box_21 flex-col"></view>
+			                  <text class="text-group_20">已认证</text>
+			                </view> -->
+							<!-- <image src="../../static/profile/ganxingqu@2x.png" mode="" style="width: 152rpx;height: 52rpx;"></image> -->
+			              </view>
+			            </view>
+			          </view>
+			          <image
+			            class="image_1"
+			            referrerpolicy="no-referrer"
+			            :src="info.headimg"
+			          />
+			        </view>
+			      </view>
+			<view class="box_22 flex-col">
+				<view class="text-wrapper_26 flex-row justify-between">
+					<text class="text_33" @click="itemclick(index)" :class="{'select':current==index}" :key="index"
+						v-for="(item,index) in list">{{item}}</text>
+					
+				</view>
+
+				<view class="" v-show="current==0">
+					<view class="group_50 flex-row  justify-between">
+						<text class="text_49">性别</text>
+						<view class="flex-row">
+							<text class="text_50">{{info.sex==1?'男':'女'}}</text>
+						</view>
+					</view>
+					<view class="group_50 flex-row  justify-between">
+						<text class="text_49">年龄</text>
+						<view class="flex-row">
+							<input type="text" disabled v-model='info.age' style="text-align: right;">
+						</view>
+					</view>
+					<view class="group_50 flex-row  justify-between">
+						<text class="text_49">星座</text>
+						<view class="flex-row">
+							<input type="text" disabled v-model='info.constellation' style="text-align: right;">
+						</view>
+					</view>
+					<view class="group_50 flex-row  justify-between">
+						<text class="text_49">身高</text>
+						<view class="flex-row">
+							<text class="text_50">{{info.height?info.height+'cm':''}}</text>
+							<!-- <input type="text" disabled v-model='info.height' style="text-align: right;"> -->
+						</view>
+					</view>
+					<view class="group_50 flex-row  justify-between">
+						<text class="text_49">体重</text>
+						<view class="flex-row">
+							<text class="text_50">{{info.weight?info.weight+'kg':''}}</text>
+							<!-- <input type="text" disabled v-model='info.weight' style="text-align: right;"> -->
+						</view>
+					</view>
+					<view class="group_50 flex-row  justify-between">
+						<text class="text_49">学历</text>
+						<view class="flex-row">
+							<text class="text_50">{{info.graduation_school||''}}</text>
+						</view>
+					</view>
+
+					<view class="group_50 flex-row  justify-between">
+						<text class="text_49">毕业院校</text>
+						<view class="flex-row">
+							<input type="text" disabled v-model='info.graduation_school' style="text-align: right;">
+						</view>
+					</view>
+					<view class="group_50 flex-row  justify-between">
+						<text class="text_49">兴趣爱好</text>
+						<view class="flex-row">
+							<text class="text_50">{{info.hobby||''}}</text>
+							<!-- <input type="text" disabled v-model='info.hobby' style="text-align: right;"> -->
+						</view>
+					</view>
+				
+				</view>
+				<view class="" v-show="current==1">
+					<view class="group_50 flex-row  justify-between">
+						<text class="text_49">姓名</text>
+						<view class="flex-row">
+							<text class="text_50">{{info.username}}</text>
+						</view>
+					</view>
+					<view class="group_50 flex-row  justify-between">
+						<text class="text_49">工作单位</text>
+						<view class="flex-row">
+							<text class="text_50">{{info.danwei||''}}</text>
+						</view>
+					</view>
+					<view class="group_50 flex-row  justify-between">
+						<text class="text_49">工作性质</text>
+						<view class="flex-row">
+							<text class="text_50">{{info.xingzhi||''}}</text>
+						</view>
+					</view>
+					<view class="group_50 flex-row  justify-between">
+						<text class="text_49">职务</text>
+						<view class="flex-row">
+							<input type="text" disabled v-model='info.position' style="text-align: right;">
+						</view>
+					</view>
+					<view class="group_50 flex-row  justify-between">
+						<text class="text_49">月收入</text>
+						<view class="flex-row">
+							<input type="text" disabled v-model='info.income' style="text-align: right;">
+						</view>
+					</view>
+				</view>
+				<view class="" v-show="current==2">
+					<view class="group_50 flex-row  justify-between">
+						<text class="text_49">婚史</text>
+						<view class="flex-row">
+							<!-- <input type="text" disabled v-model='info.hunshi' style="text-align: right;"> -->
+							<text>{{info.status==1?'未婚':info.status==2?'离异':info.status==3?'丧偶':''}}</text>
+						</view>
+					</view>
+					<view class="group_50 flex-row  justify-between">
+						<text class="text_49">有无子女</text>
+						<view class="flex-row">
+							<text>{{info.is_zinv==1?'有':info.is_zinv==2?'无':''}}</text>
+						</view>
+					</view>
+					<view class="group_50 flex-row  justify-between" v-if="info.is_zinv==1">
+						<text class="text_49">子女性别</text>
+						<view class="flex-row">
+							<text>{{info.zinv_sex==1?'男':info.zinv_sex==2?'女':''}}</text>
+						</view>
+					</view>
+					<view class="group_50 flex-row  justify-between">
+						<text class="text_49">是否独生子女</text>
+						<view class="flex-row">
+							<text>{{info.is_du==1?'是':info.is_du==2?'否':''}}</text>
+						</view>
+					</view>
+					<view class="group_50 flex-row  justify-between" v-if="info.is_du==2">
+						<text class="text_49">兄弟姊妹几人</text>
+						<view class="flex-row">
+							<text>{{info.children||0}}</text>
+						</view>
+					</view>
+					<view class="group_50 flex-row  justify-between">
+						<text class="text_49">居住情况</text>
+						<view class="flex-row">
+							<text>{{info.home==1?'自有产权房':info.home==2?'租住':info.home==3?'与父母同住':''}}</text>
+						</view>
+					</view>
+					<view class="group_50 flex-row  justify-between">
+						<text class="text_49">是否有车</text>
+						<view class="flex-row">
+							<text>{{info.is_car==1?'是':info.is_car==2?'否':''}}</text>
+						</view>
+					</view>
+					<view class="group_50 flex-row  justify-between" v-if="info.is_car==1">
+						<text class="text_49">车辆型号</text>
+						<view class="flex-row">
+							<text>{{info.car_model||''}}</text>
+						</view>
+					</view>
+					<view class="group_50 flex-row  justify-between">
+						<text class="text_49">父亲工作</text>
+						<view class="flex-row">
+							<text class="text_50">{{info.fa_work||''}}</text>
+							<!-- <input type="text" disabled placeholder="" v-model='info.fa_work'
+								style="text-align: right;"> -->
+						</view>
+					</view>
+					<view class="group_50 flex-row  justify-between">
+						<text class="text_49">母亲工作</text>
+						<view class="flex-row">
+							<text class="text_50">{{info.ma_work||''}}</text>
+							<!-- <input type="text" disabled placeholder="" v-model='info.ma_work'
+								style="text-align: right;"> -->
+						</view>
+					</view>
+				</view>
+				<view class="" v-show="current==3">
+					<view class="person" @click="toPerson">
+						<image :src="personPhoto[0].url" mode="aspectFill" v-if="personPhoto.length!=0"
+							style="position: absolute;top: 0;right: 0;bottom: 0;left: 0;z-index: 1;width: 690rpx;height: 400rpx;">
+						</image>
+						<view class="bag">
+							个人照片
+						</view>
+						<view class="u-flex-col" style="margin-top: 98rpx;" v-show="personPhoto.length==0">
+							<image src="../../static/auth/2@2x.png" mode="" style="width: 55rpx;height: 55rpx;"></image>
+							<text style="font-size: 20rpx;color: #666666;margin-top: 28rpx;">还未上传照片,去上传</text>
+						</view>
+					</view>
+					<view class="person" @click="toLife">
+						<image :src="lifePhoto[0].url" mode="aspectFill" v-if="lifePhoto.length!=0"
+							style="position: absolute;top: 0;right: 0;bottom: 0;left: 0;z-index: 1;width: 690rpx;height: 400rpx;">
+						</image>
+						<view class="bag">
+							生活照片
+						</view>
+						<view class="u-flex-col" style="margin-top: 98rpx;" v-show="lifePhoto.length==0">
+							<image src="../../static/auth/2@2x.png" mode="" style="width: 55rpx;height: 55rpx;"></image>
+							<text style="font-size: 20rpx;color: #666666;margin-top: 28rpx;">还未上传照片,去上传</text>
+						</view>
+					</view>
+				</view>
+				<!-- <view class="text-wrapper_13 flex-col" v-show="current!=4" @click="storage">
+					<text class="text_46">保存修改</text>
+				</view> -->
 		</view>
-       <view class="group_50 flex-row  justify-between">
-         <text class="text_49">星座</text>
-         <view class="flex-row">
-			 <input type="text" placeholder="请输入星座" v-model='info.constellation' style="text-align: right;">
-         </view>
-       </view>
-	   <view class="group_50 flex-row  justify-between">
-	     <text class="text_49">身高</text>
-	     <view class="flex-row">
-			 <input type="text" placeholder="请输入身高(cm)" v-model='info.height' style="text-align: right;">
-	     	<!-- <text class="text_50">cm</text> -->
-	     </view>
-	   </view>
-	   <view class="group_50 flex-row  justify-between">
-	     <text class="text_49">体重</text>
-	     <view class="flex-row">
-			 <input type="text" placeholder="请输入体重{kg}" v-model='info.weight' style="text-align: right;">
-	     	<!-- <text class="text_50">kg</text> -->
-	     </view>
-	   </view>
-	   <view class="group_50 flex-row  justify-between">
-	     <text class="text_49">学历</text>
-	     <view class="flex-row" @click="showEducation=true">
-	     	<text class="text_50">{{info.education||'请选择学历'}}</text>
-	     	<u-icon name="arrow-right"></u-icon>
-	     </view>
-	   </view>
-	   
-	   <view class="group_50 flex-row  justify-between">
-	     <text class="text_49">毕业院校</text>
-	     <view class="flex-row">
-			 <input type="text" placeholder="请输入毕业院校" v-model='info.graduation_school' style="text-align: right;">
-	     </view>
-	   </view>
-	   <view class="group_50 flex-row  justify-between">
-	     <text class="text_49">所在城市</text>
-	     <view class="flex-row">
-			 <AddressPicker  @change="change" :level="3">{{info.address||'请选择所在城市'}} </AddressPicker>
-	     	<!-- <text class="text_50">广东省深圳市</text> -->
-	     	<u-icon name="arrow-right"></u-icon>
-	     </view>
-	   </view>
-       </view>
-	   <view class="" v-show="current==1">
-	   		<view class="group_50 flex-row  justify-between">
-	   		  <text class="text_49">工作单位</text>
-	   		  <view class="flex-row" @click="showunit=true">
-	   		  	<text class="text_50">{{info.danwei||'请选择工作单位'}}</text>
-	   		  	<u-icon name="arrow-right"></u-icon>
-	   		  </view>
-	   		</view>
-			<view class="group_50 flex-row  justify-between">
-				     <text class="text_49">工作性质</text>
-				     <view class="flex-row"  @click="shownature=true">
-				     	<text class="text_50">{{info.xingzhi||'请选择工作性质'}}</text>
-				     	<u-icon name="arrow-right"></u-icon>
-				     </view>
-				   </view>
-				   <view class="group_50 flex-row  justify-between">
-				   	     <text class="text_49">职位</text>
-				   	     <view class="flex-row">
-							 <input type="text" placeholder="请输入职位" v-model='info.position' style="text-align: right;">
-				   	     </view>
-				   	   </view>
-					   <view class="group_50 flex-row  justify-between">
-					   	     <text class="text_49">月收入</text>
-					   	     <view class="flex-row">
-					   							 <input type="text" placeholder="请输入职位" v-model='info.income' style="text-align: right;">
-					   	     </view>
-					   	   </view>
-	   </view>
-	   <view class="" v-show="current==2">
-	   		<view class="group_50 flex-row  justify-between">
-	   		  <text class="text_49">兄弟姐妹</text>
-	   		  <view class="flex-row">
-	   		  <u-switch v-model="info.is_du" :activeValue="2" :inactiveValue="1"  size="18"></u-switch>
-	   		  </view>
-	   		</view>
-	   			<view class="group_50 flex-row  justify-between">
-	   				     <text class="text_49">父亲工作</text>
-	   				     <view class="flex-row">
-							 <input type="text" placeholder="请输入父亲工作职位" v-model='info.fa_work' style="text-align: right;">
-	   				     </view>
-	   				   </view>
-	   				   <view class="group_50 flex-row  justify-between">
-	   				   	     <text class="text_49">母亲工作</text>
-	   				   	     <view class="flex-row">
-	   				   	     	<input type="text" placeholder="请输入母亲工作职位" v-model='info.ma_work' style="text-align: right;">
-	   				   	     </view>
-	   				   	   </view>
-						   <view class="group_50 flex-row  justify-between">
-						   	     <text class="text_49">现在与谁居住</text>
-						   	     <view class="flex-row">
-									 <input type="text" placeholder="请输入" v-model='info.home' style="text-align: right;">
-						   	     </view>
-						   	   </view>
-	   </view>
-	   <view class="" v-show="current==3">
-	   	<view class="person" @click="toPerson">
-			<image :src="personPhoto[0].url" mode="aspectFill" v-if="personPhoto.length!=0" style="position: absolute;top: 0;right: 0;bottom: 0;left: 0;z-index: 1;width: 690rpx;height: 400rpx;"></image>
-	   		<view class="bag">
-	   			个人照片
-	   		</view>
-			<view class="u-flex-col" style="margin-top: 98rpx;" v-show="personPhoto.length==0">
-				<image src="../../static/auth/2@2x.png" mode="" style="width: 55rpx;height: 55rpx;"></image>
-				<text style="font-size: 20rpx;color: #666666;margin-top: 28rpx;">还未上传照片,去上传</text>
-			</view>
-	   	</view>
-		<view class="person"  @click="toLife">
-			<image :src="lifePhoto[0].url" mode="aspectFill" v-if="lifePhoto.length!=0" style="position: absolute;top: 0;right: 0;bottom: 0;left: 0;z-index: 1;width: 690rpx;height: 400rpx;"></image>
-			<view class="bag">
-				生活照片
-			</view>
-			<view class="u-flex-col" style="margin-top: 98rpx;"  v-show="lifePhoto.length==0"> 
-				<image src="../../static/auth/2@2x.png" mode="" style="width: 55rpx;height: 55rpx;"></image>
-				<text style="font-size: 20rpx;color: #666666;margin-top: 28rpx;">还未上传照片,去上传</text>
-			</view>
 		</view>
-	   </view>
-       <view class="text-wrapper_13 flex-col" v-show="current!=3" @click="storage">
-          <text class="text_46" >保存修改</text>
-        </view>
-	<!-- 	<view  v-show="current!=3" style="position: fixed;bottom: 84rpx;width: 690rpx;left: 50%;transform: translateX(-50%);" class="u-flex u-row-between">
-		  <image @click="tojubao" src="../../static/profile/jubao@2x.png" mode="" style="width: 210rpx;height: 100rpx;"></image>
-		  <image src="../../static/profile/dazhaohu@2x.png" mode="" style="width: 450rpx;height: 100rpx;"></image>
-		</view> -->
-      </view>
-    </view>
-	<u-picker :show="showsex" :columns="sexcolumns" keyName="name" @confirm='changesex' @cancel='showsex=false' :closeOnClickOverlay='true'>
-	</u-picker>
-	<u-picker :show="showEducation" @cancel='showEducation=false' title="学历" ref="uPicker" :columns="educationcolumns" @confirm="confirmEducation">
-	</u-picker>
-	<u-picker :show="showunit" :columns="unitcolumns" keyName="name" @confirm='changeunit' @cancel='showunit=false' :closeOnClickOverlay='true'>
-	</u-picker>
-	<u-picker :show="shownature" @cancel='shownature=false' title="工作性质" @confirm='confirmWork' keyName="name"  :columns="naturecolumns"></u-picker>
-  </view>
+		<u-picker :show="showsex" :columns="sexcolumns" keyName="name" @confirm='changesex' @cancel='showsex=false'
+			:closeOnClickOverlay='true'>
+		</u-picker>
+		<u-picker :show="showEducation" @cancel='showEducation=false' title="学历" ref="uPicker"
+			:columns="educationcolumns" @confirm="confirmEducation">
+		</u-picker>
+		<u-picker :show="showunit" :columns="unitcolumns" keyName="name" @confirm='changeunit' @cancel='showunit=false'
+			:closeOnClickOverlay='true'>
+		</u-picker>
+		<u-picker :show="shownature" @cancel='shownature=false' title="工作性质" @confirm='confirmWork' keyName="name"
+			:columns="naturecolumns"></u-picker>
+	</view>
 </template>
 <script>
 	import AddressPicker from "@/components/lingdang-AddressPicker/AddressPicker.vue"
-export default {
-	components: {
-		AddressPicker
-	},
-  data() {
-    return {
-		shownature:false,
-		showunit:false,
-		showEducation:false,
-		showsex:false,
-      list: ['个人档案','工作职业','家庭情况','相册'],
-	  current:0,
-	  value:false,
-	  info:{},
-	  personPhoto:[],
-	  lifePhoto:[],
-	  sexcolumns: [
-	  	['男','女']
-	  ],
-	  educationcolumns:[['高中','大专','本科','硕士','博士']],
-	  unitcolumns: [
-	  	[]
-	  ],
-	  naturecolumns: [
-	  	[]
-	  ],
-    };
-  },
-  onLoad() {
-  	this.getWorking()
-  	this.getWork()
-  },
-  onShow() {
-  	this.getInfo()
-	this.getpersonPhoto()
-	this.getlifePhoto()
-  },
-  methods: {
-	  storage(){
-		  uni.showLoading({
-		  	
-		  })
-		  let data1={
-			 sex:this.info.sex,
-			 constellation:this.info.constellation,
-			 height:this.info.height,
-			 age:this.info.age,
-			 weight:this.info.weight,
-			 education:this.info.education,
-			 graduation_school:this.info.graduation_school,
-			 province_id:this.info.province_id,
-			 city_id:this.info.city_id,
-			 area_id:this.info.area_id
-			 
-		  }
-		  
-		  let data2={
-			  working:this.info.working,
-			  nature:this.info.nature,
-			  position:this.info.position,
-			  income:this.info.income
-		  }
-		  let data3={
-		  			  is_du:this.info.is_du,
-		  			  fa_work:this.info.fa_work,
-		  			  ma_work:this.info.ma_work,
-		  			  home:this.info.home,
-		  }
-		uni.$u.http.post('/api/user/user_info',data1).then(res => {
-		if(res.code==1){
-			uni.$u.http.post('/api/user/user_work',data2).then(res => {
-			if(res.code==1){
-				uni.$u.http.post('/api/user/user_home',data3).then(res => {
-					uni.hideLoading()
-					this.$u.toast('个人信息已更新')
-			})
+	export default {
+		components: {
+			AddressPicker
+		},
+		data() {
+			return {
+				shownature: false,
+				showunit: false,
+				showEducation: false,
+				showsex: false,
+				list: ['个人档案', '工作职业', '家庭情况', '相册'],
+				current: 0,
+				value: false,
+				info: {},
+				personPhoto: [],
+				lifePhoto: [],
+				sexcolumns: [
+					['男', '女']
+				],
+				educationcolumns: [
+					['高中', '大专', '本科', '硕士', '博士']
+				],
+				unitcolumns: [
+					[]
+				],
+				naturecolumns: [
+					[]
+				],
+			};
+		},
+		onLoad() {
+			this.getWorking()
+			this.getWork()
+		},
+		onShow() {
+			this.getInfo()
+			this.getpersonPhoto()
+			this.getlifePhoto()
+		},
+		methods: {
+			storage() {
+				uni.showLoading({
+
+				})
+				let data1 = {
+					sex: this.info.sex,
+					constellation: this.info.constellation,
+					height: this.info.height,
+					age: this.info.age,
+					weight: this.info.weight,
+					education: this.info.education,
+					graduation_school: this.info.graduation_school,
+					province_id: this.info.province_id,
+					city_id: this.info.city_id,
+					area_id: this.info.area_id
+
+				}
+
+				let data2 = {
+					working: this.info.working,
+					nature: this.info.nature,
+					position: this.info.position,
+					income: this.info.income
+				}
+				let data3 = {
+					is_du: this.info.is_du,
+					fa_work: this.info.fa_work,
+					ma_work: this.info.ma_work,
+					home: this.info.home,
+				}
+				uni.$u.http.post('/api/user/user_info', data1).then(res => {
+					if (res.code == 1) {
+						uni.$u.http.post('/api/user/user_work', data2).then(res => {
+							if (res.code == 1) {
+								uni.$u.http.post('/api/user/user_home', data3).then(res => {
+									uni.hideLoading()
+									this.$u.toast('个人信息已更新')
+								})
+							}
+						})
+					}
+				})
+			},
+			confirmWork(e) {
+				console.log(e)
+				this.info.xingzhi = e.value[0].name
+				this.info.nature = e.value[0].id
+				this.shownature = false
+			},
+			getWork() {
+				uni.$u.http.post('/api/index/WorkNature').then(res => {
+					this.naturecolumns = [res.data]
+				})
+			},
+			getWorking() {
+				uni.$u.http.post('/api/Publics/working').then(res => {
+					this.unitcolumns = [res.data]
+				})
+			},
+			changeunit(e) {
+				// this.current = e.value[0]
+				this.info.danwei = e.value[0].name
+				this.info.working = e.value[0].id
+				this.showunit = false
+			},
+			change(result) {
+				this.info.province_id = result.data[0].id
+				this.info.city_id = result.data[1].id
+				this.info.area_id = result.data[2].id
+				this.info.address = '';
+				result.data.forEach((item, index) => {
+					if (index === 0) {
+						this.info.address += item.name
+					} else {
+						this.info.address += '-' + item.name
+					}
+				});
+				let arr = this.info.address.split('-');
+			},
+			confirmEducation(e) {
+				this.info.education = e.value[0]
+				this.showEducation = false
+			},
+			changesex(e) {
+				this.info.sex = e.indexs[0] * 1 + 1
+				this.showsex = false
+			},
+			getpersonPhoto() {
+				uni.$u.http.post('/api/user/personal_album', {
+					id: uni.getStorageSync('userId')
+				}).then(res => {
+					if (res.code == 1) {
+						this.personPhoto = res.data
+					}
+				})
+			},
+			getlifePhoto() {
+				uni.$u.http.post('/api/user/life_album', {
+					id: uni.getStorageSync('userId')
+				}).then(res => {
+					if (res.code == 1) {
+						this.lifePhoto = res.data
+					}
+				})
+			},
+			getInfo() {
+				uni.$u.http.post('/api/user/userinfo').then(res => {
+					if (res.code == 1) {
+						this.info = res.data
+					}
+				})
+			},
+			itemclick(index) {
+				if (this.current != index) {
+					this.current = index
+				}
+			},
+			tojubao() {
+				uni.navigateTo({
+					url: './jubao'
+				})
+			},
+			toPerson() {
+				uni.navigateTo({
+					url: './personPhoto'
+				})
+			},
+			toLife() {
+				uni.navigateTo({
+					url: './lifePhoto'
+				})
 			}
-			})
-		}
-		})
-	  },
-	  confirmWork(e){
-		  console.log(e)
-		  this.info.xingzhi=e.value[0].name
-		  this.info.nature=e.value[0].id
-	  	this.shownature=false
-	  },
-	  getWork(){
-	  	uni.$u.http.post('/api/index/WorkNature').then(res => {
-	  	this.naturecolumns=[res.data]
-	  	})
-	  },
-	  getWorking(){
-	  	uni.$u.http.post('/api/Publics/working').then(res => {
-	  		this.unitcolumns=[res.data]
-	  	})
-	  },
-	  changeunit(e) {
-	  	// this.current = e.value[0]
-		this.info.danwei=e.value[0].name
-		this.info.working=e.value[0].id
-	  	this.showunit = false
-	  },
-	  change(result) {
-		this.info.province_id=result.data[0].id
-		this.info.city_id=result.data[1].id
-		this.info.area_id=result.data[2].id
-	  	this.info.address = '';
-	  	result.data.forEach((item, index) => {
-	  		if (index === 0) {
-	  			this.info.address += item.name
-	  		} else {
-	  			this.info.address += '-' + item.name
-	  		}
-	  	});
-	  	let arr = this.info.address.split('-');
-	  },
-	  confirmEducation(e){
-	  	this.info.education=e.value[0]
-	  	this.showEducation=false
-	  },
-	  changesex(e){
-		  this.info.sex=e.indexs[0]*1+1
-		  this.showsex=false
-	  },
-	  getpersonPhoto(){
-	  	uni.$u.http.post('/api/user/personal_album',{id:uni.getStorageSync('userId')}).then(res => {
-	  		if(res.code==1){
-	  			this.personPhoto=res.data
-	  		}
-	  	})
-	  },
-	  getlifePhoto(){
-	  	uni.$u.http.post('/api/user/life_album',{id:uni.getStorageSync('userId')}).then(res => {
-	  		if(res.code==1){
-	  			this.lifePhoto=res.data
-	  		}
-	  	})
-	  },
-	  getInfo(){
-	  	uni.$u.http.post('/api/user/userinfo').then(res => {
-	  		if(res.code==1){
-	  			this.info=res.data
-	  		}
-	  	})
-	  },
-	  itemclick(index){
-	  		  if(this.current!=index){
-	  			  this.current=index
-	  		  }
-	  },
-	  tojubao(){
-		  uni.navigateTo({
-		  	url:'./jubao'
-		  })
-	  },
-	  toPerson(){
-		  uni.navigateTo({
-		  	url:'./personPhoto'
-		  })
-	  },
-	  toLife(){
-		  uni.navigateTo({
-		  	url:'./lifePhoto'
-		  })
-	  }
-  },
-};
+		},
+	};
 </script>
 <style lang="scss">
-@import '@/common/common.css';
-page{
-	
-}
-.person{
-	position: relative;
-	padding: 26rpx 20rpx;
-	margin: 0 auto 20rpx;
-	width: 690rpx;
-	height: 400rpx;
-	background: #F3F4F6;
-	border-radius: 20rpx;
-	.bag{
+	@import '@/common/common.css';
+
+	page {}
+
+	.person {
+		position: relative;
+		padding: 26rpx 20rpx;
+		margin: 0 auto 20rpx;
+		width: 690rpx;
+		height: 400rpx;
+		background: #F3F4F6;
+		border-radius: 20rpx;
+
+		.bag {
+			position: relative;
+			z-index: 11;
+			text-align: center;
+			width: 140rpx;
+			height: 52rpx;
+			line-height: 52rpx;
+			background: #000000;
+			border-radius: 26rpx;
+			font-size: 24rpx;
+			color: #fff;
+		}
+	}
+
+	.page {
+		background-color: #FBF8FD;
 		position: relative;
-		z-index: 11;
+		width: 750rpx;
+		overflow: hidden;
+	}
+
+	.group_1 {
+		width: 750rpx;
+		/* height: 1624rpx; */
+
+	}
+
+	.box_37 {
+		width: 750rpx;
+		/* height: 514rpx; */
+	}
+
+	.group_45 {
+		width: 680rpx;
+		height: 34rpx;
+		margin: 30rpx 0 0 42rpx;
+	}
+
+	.text-wrapper_24 {
+		width: 108rpx;
+		height: 34rpx;
+		overflow-wrap: break-word;
+		font-size: 0;
+		letter-spacing: -0.2800000011920929px;
+		font-family: Helvetica;
 		text-align: center;
-		width: 140rpx;
-		height: 52rpx;
-		line-height: 52rpx;
-		background: #000000;
-		border-radius: 26rpx;
+		white-space: nowrap;
+		line-height: 34rpx;
+	}
+
+	.text_56 {
+		width: 108rpx;
+		height: 34rpx;
+		overflow-wrap: break-word;
+		color: rgba(0, 0, 0, 1);
+		font-size: 28rpx;
+		font-family: Helvetica;
+		text-align: left;
+		white-space: nowrap;
+		line-height: 34rpx;
+	}
+
+	.text_57 {
+		width: 108rpx;
+		height: 34rpx;
+		overflow-wrap: break-word;
+		color: rgba(0, 0, 0, 1);
+		font-size: 28rpx;
+		font-family: Helvetica;
+		text-align: left;
+		white-space: nowrap;
+		line-height: 34rpx;
+	}
+
+	.group_46 {
+		width: 34rpx;
+		height: 22rpx;
+		background: url(https://oss.wdmeta.art/a7835b5dd05ecd99/011781dfdfb589a0.png) -2rpx -2rpx no-repeat;
+		background-size: 36rpx 24rpx;
+		margin: 6rpx 0 0 438rpx;
+	}
+
+	.group_47 {
+		width: 30rpx;
+		height: 22rpx;
+		background: url(https://oss.wdmeta.art/a7835b5dd05ecd99/011781dfdfb589a0.png) -2rpx 0rpx no-repeat;
+		background-size: 32rpx 24rpx;
+		margin: 4rpx 0 0 10rpx;
+	}
+
+	.group_48 {
+		width: 50rpx;
+		height: 24rpx;
+		background: url(https://oss.wdmeta.art/a7835b5dd05ecd99/011781dfdfb589a0.png) 100% no-repeat;
+		background-size: 100% 100%;
+		margin: 4rpx 0 0 10rpx;
+	}
+
+	.group_49 {
+		width: 706rpx;
+		height: 74rpx;
+		margin: 24rpx 0 0 30rpx;
+	}
+
+	.section_4 {
+		width: 64rpx;
+		height: 64rpx;
+		background: url(https://oss.wdmeta.art/a7835b5dd05ecd99/011781dfdfb589a0.png) 100% no-repeat;
+		background-size: 100% 100%;
+	}
+
+	.text_3 {
+		width: 146rpx;
+		height: 50rpx;
+		overflow-wrap: break-word;
+		color: rgba(34, 34, 34, 1);
+		font-size: 36rpx;
+		letter-spacing: 0.2266666740179062px;
+		font-family: PingFangSC-Medium;
+		text-align: right;
+		white-space: nowrap;
+		line-height: 50rpx;
+		margin: 22rpx 0 0 208rpx;
+	}
+
+	.section_33 {
+		width: 168rpx;
+		height: 60rpx;
+		background: url(https://oss.wdmeta.art/a7835b5dd05ecd99/011781dfdfb589a0.png) 100% no-repeat;
+		background-size: 100% 100%;
+		margin: 14rpx 0 0 120rpx;
+	}
+
+	.box_3 {
+		background-color: rgba(255, 255, 255, 1);
+		border-radius: 14px 14px 0px 0px;
+		height: 232rpx;
+		width: 750rpx;
+		position: relative;
+		margin: 98rpx 0 22rpx 0;
+	}
+
+	.text-wrapper_25 {
+		width: 318rpx;
+		height: 60rpx;
+		margin: 48rpx 0 0 336rpx;
+	}
+
+	.text_29 {
+		width: 54rpx;
+		height: 60rpx;
+		overflow-wrap: break-word;
+		color: rgba(34, 34, 34, 1);
+		font-size: 52rpx;
+		letter-spacing: 0.7607405185699463px;
+		font-family: DINAlternate-Bold;
+		text-align: left;
+		white-space: nowrap;
+		line-height: 60rpx;
+	}
+
+	.text_30 {
+		width: 50rpx;
+		height: 34rpx;
+		overflow-wrap: break-word;
+		color: rgba(34, 34, 34, 1);
+		font-size: 24rpx;
+		letter-spacing: 0.3511109948158264px;
+		text-align: left;
+		white-space: nowrap;
+		line-height: 34rpx;
+		margin: 20rpx 0 0 8rpx;
+	}
+
+	.text_31 {
+		width: 28rpx;
+		height: 60rpx;
+		overflow-wrap: break-word;
+		color: rgba(34, 34, 34, 1);
+		font-size: 52rpx;
+		letter-spacing: 0.7607405185699463px;
+		font-family: DINAlternate-Bold;
+		text-align: left;
+		white-space: nowrap;
+		line-height: 60rpx;
+		margin-left: 120rpx;
+	}
+
+	.text_32 {
+		width: 50rpx;
+		height: 34rpx;
+		overflow-wrap: break-word;
+		color: rgba(34, 34, 34, 1);
 		font-size: 24rpx;
-		color: #fff;
-	}
-}
-.page {
-  background-color: #FBF8FD;
-  position: relative;
-  width: 750rpx;
-  overflow: hidden;
-}
-
-.group_1 {
-  width: 750rpx;
-  /* height: 1624rpx; */
-  
-}
-
-.box_37 {
-  width: 750rpx;
-  /* height: 514rpx; */
-}
-
-.group_45 {
-  width: 680rpx;
-  height: 34rpx;
-  margin: 30rpx 0 0 42rpx;
-}
-
-.text-wrapper_24 {
-  width: 108rpx;
-  height: 34rpx;
-  overflow-wrap: break-word;
-  font-size: 0;
-  letter-spacing: -0.2800000011920929px;
-  font-family: Helvetica;
-  text-align: center;
-  white-space: nowrap;
-  line-height: 34rpx;
-}
-
-.text_56 {
-  width: 108rpx;
-  height: 34rpx;
-  overflow-wrap: break-word;
-  color: rgba(0, 0, 0, 1);
-  font-size: 28rpx;
-  font-family: Helvetica;
-  text-align: left;
-  white-space: nowrap;
-  line-height: 34rpx;
-}
-
-.text_57 {
-  width: 108rpx;
-  height: 34rpx;
-  overflow-wrap: break-word;
-  color: rgba(0, 0, 0, 1);
-  font-size: 28rpx;
-  font-family: Helvetica;
-  text-align: left;
-  white-space: nowrap;
-  line-height: 34rpx;
-}
-
-.group_46 {
-  width: 34rpx;
-  height: 22rpx;
-  background: url(https://oss.wdmeta.art/a7835b5dd05ecd99/011781dfdfb589a0.png) -2rpx -2rpx
-    no-repeat;
-  background-size: 36rpx 24rpx;
-  margin: 6rpx 0 0 438rpx;
-}
-
-.group_47 {
-  width: 30rpx;
-  height: 22rpx;
-  background: url(https://oss.wdmeta.art/a7835b5dd05ecd99/011781dfdfb589a0.png) -2rpx
-    0rpx no-repeat;
-  background-size: 32rpx 24rpx;
-  margin: 4rpx 0 0 10rpx;
-}
-
-.group_48 {
-  width: 50rpx;
-  height: 24rpx;
-  background: url(https://oss.wdmeta.art/a7835b5dd05ecd99/011781dfdfb589a0.png)
-    100% no-repeat;
-  background-size: 100% 100%;
-  margin: 4rpx 0 0 10rpx;
-}
-
-.group_49 {
-  width: 706rpx;
-  height: 74rpx;
-  margin: 24rpx 0 0 30rpx;
-}
-
-.section_4 {
-  width: 64rpx;
-  height: 64rpx;
-  background: url(https://oss.wdmeta.art/a7835b5dd05ecd99/011781dfdfb589a0.png)
-    100% no-repeat;
-  background-size: 100% 100%;
-}
-
-.text_3 {
-  width: 146rpx;
-  height: 50rpx;
-  overflow-wrap: break-word;
-  color: rgba(34, 34, 34, 1);
-  font-size: 36rpx;
-  letter-spacing: 0.2266666740179062px;
-  font-family: PingFangSC-Medium;
-  text-align: right;
-  white-space: nowrap;
-  line-height: 50rpx;
-  margin: 22rpx 0 0 208rpx;
-}
-
-.section_33 {
-  width: 168rpx;
-  height: 60rpx;
-  background: url(https://oss.wdmeta.art/a7835b5dd05ecd99/011781dfdfb589a0.png)
-    100% no-repeat;
-  background-size: 100% 100%;
-  margin: 14rpx 0 0 120rpx;
-}
-
-.box_3 {
-  background-color: rgba(255, 255, 255, 1);
-  border-radius: 14px 14px 0px 0px;
-  height: 232rpx;
-  width: 750rpx;
-  position: relative;
-  margin: 98rpx 0 22rpx 0;
-}
-
-.text-wrapper_25 {
-  width: 318rpx;
-  height: 60rpx;
-  margin: 48rpx 0 0 336rpx;
-}
-
-.text_29 {
-  width: 54rpx;
-  height: 60rpx;
-  overflow-wrap: break-word;
-  color: rgba(34, 34, 34, 1);
-  font-size: 52rpx;
-  letter-spacing: 0.7607405185699463px;
-  font-family: DINAlternate-Bold;
-  text-align: left;
-  white-space: nowrap;
-  line-height: 60rpx;
-}
-
-.text_30 {
-  width: 50rpx;
-  height: 34rpx;
-  overflow-wrap: break-word;
-  color: rgba(34, 34, 34, 1);
-  font-size: 24rpx;
-  letter-spacing: 0.3511109948158264px;
-  text-align: left;
-  white-space: nowrap;
-  line-height: 34rpx;
-  margin: 20rpx 0 0 8rpx;
-}
-
-.text_31 {
-  width: 28rpx;
-  height: 60rpx;
-  overflow-wrap: break-word;
-  color: rgba(34, 34, 34, 1);
-  font-size: 52rpx;
-  letter-spacing: 0.7607405185699463px;
-  font-family: DINAlternate-Bold;
-  text-align: left;
-  white-space: nowrap;
-  line-height: 60rpx;
-  margin-left: 120rpx;
-}
-
-.text_32 {
-  width: 50rpx;
-  height: 34rpx;
-  overflow-wrap: break-word;
-  color: rgba(34, 34, 34, 1);
-  font-size: 24rpx;
-  letter-spacing: 0.3511109948158264px;
-  text-align: left;
-  white-space: nowrap;
-  line-height: 34rpx;
-  margin: 20rpx 0 0 8rpx;
-}
-
-.box_38 {
-  width: 100%;
-  height: 44rpx;
-  margin: 50rpx 0 30rpx 40rpx;
-}
-
-.image-text_45 {
-  width: 100%;
-  height: 44rpx;
-}
-
-.text_4 {
-  height: 44rpx;
-  overflow-wrap: break-word;
-  color: rgba(34, 34, 34, 1);
-  font-size: 32rpx;
-  letter-spacing: 0.46814799308776855px;
-  font-family: PingFangSC-Medium;
-  text-align: left;
-  white-space: nowrap;
-  line-height: 44rpx;
-}
-
-.box_20 {
-  position: relative;
-  height: 32rpx;
-  background-size: 100% 100%;
-  margin-top: 6rpx;
-}
-
-.image-text_46 {
-  width: 86rpx;
-  height: 28rpx;
-  margin-left: 4rpx;
-}
-
-.box_21 {
-  width: 24rpx;
-  height: 24rpx;
-  background: url(https://oss.wdmeta.art/a7835b5dd05ecd99/011781dfdfb589a0.png)
-    100% no-repeat;
-  background-size: 100% 100%;
-  margin-top: 4rpx;
-}
-
-.text-group_20 {
-  width: 62rpx;
-  height: 28rpx;
-  overflow-wrap: break-word;
-  color: rgba(255, 255, 255, 1);
-  font-size: 20rpx;
-  letter-spacing: 0.29259249567985535px;
-  font-family: PingFangSC-Medium;
-  text-align: left;
-  white-space: nowrap;
-  line-height: 28rpx;
-}
-
-.image-text_47 {
-  position: absolute;
-  left: 4rpx;
-  top: 0;
-  width: 86rpx;
-  height: 28rpx;
-}
-
-.image_1 {
-	border-radius: 50%;
-  position: absolute;
-  left: 40rpx;
-  top: -60rpx;
-  width: 200rpx;
-  height: 200rpx;
-}
-
-.box_22 {
-  background-color: rgba(255, 255, 255, 1);
-  width: 750rpx;
-  margin-top: -2rpx;
-}
-
-.text-wrapper_26 {
-  width: 690rpx;
-  height: 44rpx;
-  margin: 36rpx 0 28rpx 30rpx;
-}
-
-.text_33 {
-	position: relative;
-  width: 130rpx;
-  height: 44rpx;
-  overflow-wrap: break-word;
-  color: #999999;
-  font-size: 32rpx;
-  letter-spacing: 0.20148147642612457px;
-  font-family: PingFangSC-Medium;
-  text-align: center;
-  white-space: nowrap;
-  line-height: 44rpx;
-  padding-bottom: 12rpx;
-}
-.select{
-	position: relative;
-	color: #222222;
-}
-.select::before{
-	content: '';
-	position: absolute;
-	left: 50%;
-	transform: translateX(-50%);
-	bottom: 0;
-	width: 40rpx;
-	height: 8rpx;
-	background: linear-gradient(270deg, #A890FE 0%, #FFAEAE 100%);
-	border-radius: 4rpx;
-}
-.text_34 {
-  width: 122rpx;
-  height: 42rpx;
-  overflow-wrap: break-word;
-  color: rgba(153, 153, 153, 1);
-  font-size: 30rpx;
-  letter-spacing: 0.18888889253139496px;
-  font-family: PingFangSC-Medium;
-  text-align: left;
-  white-space: nowrap;
-  line-height: 42rpx;
-  margin: 2rpx 0 0 84rpx;
-}
-
-.text_35 {
-  width: 122rpx;
-  height: 42rpx;
-  overflow-wrap: break-word;
-  color: rgba(153, 153, 153, 1);
-  font-size: 30rpx;
-  letter-spacing: 0.18888889253139496px;
-  font-family: PingFangSC-Medium;
-  text-align: left;
-  white-space: nowrap;
-  line-height: 42rpx;
-  margin: 2rpx 0 0 86rpx;
-}
-
-.text_36 {
-  width: 62rpx;
-  height: 42rpx;
-  overflow-wrap: break-word;
-  color: rgba(153, 153, 153, 1);
-  font-size: 30rpx;
-  letter-spacing: 0.18888889253139496px;
-  font-family: PingFangSC-Medium;
-  text-align: left;
-  white-space: nowrap;
-  line-height: 42rpx;
-  margin: 2rpx 0 0 84rpx;
-}
-
-.box_23 {
-  width: 40rpx;
-  height: 8rpx;
-  background: url(https://oss.wdmeta.art/a7835b5dd05ecd99/011781dfdfb589a0.png)
-    100% no-repeat;
-  background-size: 100% 100%;
-  margin: 2rpx 0 0 76rpx;
-}
-
-.box_24 {
-  background-color: rgba(242, 242, 242, 1);
-  width: 690rpx;
-  height: 2rpx;
-  margin: 28rpx 0 0 30rpx;
-}
-
-.group_50 {
-  width: 690rpx;
-  height: 42rpx;
-  margin: 20rpx 0 0 30rpx;
-}
-
-.text_49 {
-  height: 42rpx;
-  overflow-wrap: break-word;
-  color: rgba(136, 136, 136, 1);
-  font-size: 30rpx;
-  letter-spacing: 0.18888889253139496px;
-  text-align: right;
-  white-space: nowrap;
-  line-height: 42rpx;
-}
-
-.text_50 {
-  height: 42rpx;
-  overflow-wrap: break-word;
-  color: rgba(34, 34, 34, 1);
-  font-size: 30rpx;
-  letter-spacing: 0.18888889253139496px;
-  text-align: right;
-  white-space: nowrap;
-  line-height: 42rpx;
-}
-
-.section_32 {
-  width: 28rpx;
-  height: 28rpx;
-  background: url(https://oss.wdmeta.art/a7835b5dd05ecd99/011781dfdfb589a0.png)
-    100% no-repeat;
-  background-size: 100% 100%;
-  margin: 8rpx 0 0 4rpx;
-}
-
-.group_51 {
-  width: 690rpx;
-  height: 112rpx;
-  margin: 36rpx 0 0 30rpx;
-}
-
-.text-group_32 {
-  width: 62rpx;
-  height: 112rpx;
-}
-
-.text_44 {
-  width: 62rpx;
-  height: 42rpx;
-  overflow-wrap: break-word;
-  color: rgba(136, 136, 136, 1);
-  font-size: 30rpx;
-  letter-spacing: 0.18888889253139496px;
-  text-align: right;
-  white-space: nowrap;
-  line-height: 42rpx;
-}
-
-.text_38 {
-  width: 62rpx;
-  height: 42rpx;
-  overflow-wrap: break-word;
-  color: rgba(136, 136, 136, 1);
-  font-size: 30rpx;
-  letter-spacing: 0.18888889253139496px;
-  text-align: right;
-  white-space: nowrap;
-  line-height: 42rpx;
-  margin-top: 28rpx;
-}
-
-.text-group_33 {
-  width: 92rpx;
-  height: 112rpx;
-}
-
-.text_45 {
-  width: 92rpx;
-  height: 42rpx;
-  overflow-wrap: break-word;
-  color: rgba(34, 34, 34, 1);
-  font-size: 30rpx;
-  letter-spacing: 0.18888889253139496px;
-  text-align: right;
-  white-space: nowrap;
-  line-height: 42rpx;
-}
-
-.text-group_21 {
-  width: 92rpx;
-  height: 42rpx;
-  overflow-wrap: break-word;
-  color: rgba(34, 34, 34, 1);
-  font-size: 30rpx;
-  letter-spacing: 0.18888889253139496px;
-  text-align: right;
-  white-space: nowrap;
-  line-height: 42rpx;
-  margin-top: 28rpx;
-}
-
-.text-wrapper_27 {
-  width: 690rpx;
-  height: 42rpx;
-  margin: 36rpx 0 0 30rpx;
-}
-
-.text_39 {
-  width: 62rpx;
-  height: 42rpx;
-  overflow-wrap: break-word;
-  color: rgba(136, 136, 136, 1);
-  font-size: 30rpx;
-  letter-spacing: 0.18888889253139496px;
-  text-align: right;
-  white-space: nowrap;
-  line-height: 42rpx;
-}
-
-.text-group_22 {
-  width: 72rpx;
-  height: 42rpx;
-  overflow-wrap: break-word;
-  color: rgba(34, 34, 34, 1);
-  font-size: 30rpx;
-  letter-spacing: 0.18888889253139496px;
-  text-align: right;
-  white-space: nowrap;
-  line-height: 42rpx;
-}
-
-.group_52 {
-  width: 690rpx;
-  height: 42rpx;
-  margin: 36rpx 0 0 30rpx;
-}
-
-.text_41 {
-  width: 62rpx;
-  height: 42rpx;
-  overflow-wrap: break-word;
-  color: rgba(136, 136, 136, 1);
-  font-size: 30rpx;
-  letter-spacing: 0.18888889253139496px;
-  text-align: right;
-  white-space: nowrap;
-  line-height: 42rpx;
-}
-
-.text-group_24 {
-  width: 92rpx;
-  height: 42rpx;
-  overflow-wrap: break-word;
-  color: rgba(34, 34, 34, 1);
-  font-size: 30rpx;
-  letter-spacing: 0.18888889253139496px;
-  text-align: right;
-  white-space: nowrap;
-  line-height: 42rpx;
-  margin-left: 504rpx;
-}
-
-.group_39 {
-  width: 28rpx;
-  height: 28rpx;
-  background: url(https://oss.wdmeta.art/a7835b5dd05ecd99/011781dfdfb589a0.png)
-    100% no-repeat;
-  background-size: 100% 100%;
-  margin: 8rpx 0 0 4rpx;
-}
-
-.text-wrapper_28 {
-  width: 690rpx;
-  height: 42rpx;
-  margin: 36rpx 0 0 30rpx;
-}
-
-.text_51 {
-  width: 122rpx;
-  height: 42rpx;
-  overflow-wrap: break-word;
-  color: rgba(136, 136, 136, 1);
-  font-size: 30rpx;
-  letter-spacing: 0.18888889253139496px;
-  text-align: right;
-  white-space: nowrap;
-  line-height: 42rpx;
-}
-
-.text_52 {
-  width: 122rpx;
-  height: 42rpx;
-  overflow-wrap: break-word;
-  color: rgba(34, 34, 34, 1);
-  font-size: 30rpx;
-  letter-spacing: 0.18888889253139496px;
-  text-align: right;
-  white-space: nowrap;
-  line-height: 42rpx;
-}
-
-.group_53 {
-  width: 690rpx;
-  height: 42rpx;
-  margin: 36rpx 0 0 30rpx;
-}
-
-.text_53 {
-  width: 122rpx;
-  height: 42rpx;
-  overflow-wrap: break-word;
-  color: rgba(136, 136, 136, 1);
-  font-size: 30rpx;
-  letter-spacing: 0.18888889253139496px;
-  text-align: right;
-  white-space: nowrap;
-  line-height: 42rpx;
-}
-
-.image-text_48 {
-  width: 216rpx;
-  height: 42rpx;
-}
-
-.text-group_29 {
-  width: 184rpx;
-  height: 42rpx;
-  overflow-wrap: break-word;
-  color: rgba(34, 34, 34, 1);
-  font-size: 30rpx;
-  letter-spacing: 0.18888889253139496px;
-  text-align: right;
-  white-space: nowrap;
-  line-height: 42rpx;
-}
-
-.group_41 {
-  width: 28rpx;
-  height: 28rpx;
-  background: url(https://oss.wdmeta.art/a7835b5dd05ecd99/011781dfdfb589a0.png)
-    100% no-repeat;
-  background-size: 100% 100%;
-  margin-top: 8rpx;
-}
-
-.text-wrapper_13 {
-	position: fixed;
-	bottom: 84rpx;
-	left: 50%;
-	transform: translateX(-50%);
-  height: 92rpx;
-  
-border-radius: 46rpx;
-background: linear-gradient(270deg, #A890FE 0%, #FFAEAE 100%);
-  background-size: 100% 100%;
-  width: 650rpx;
-}
-
-.text_46 {
-  width: 146rpx;
-  height: 50rpx;
-  overflow-wrap: break-word;
-  color: rgba(255, 255, 255, 1);
-  font-size: 36rpx;
-  letter-spacing: 0.2266666740179062px;
-  font-family: PingFangSC-Medium;
-  text-align: right;
-  white-space: nowrap;
-  line-height: 50rpx;
-  margin: 22rpx 0 0 252rpx;
-}
+		letter-spacing: 0.3511109948158264px;
+		text-align: left;
+		white-space: nowrap;
+		line-height: 34rpx;
+		margin: 20rpx 0 0 8rpx;
+	}
+
+	.box_38 {
+		width: 100%;
+		height: 44rpx;
+		margin: 50rpx 0 30rpx 40rpx;
+	}
+
+	.image-text_45 {
+		width: 100%;
+		height: 44rpx;
+	}
+
+	.text_4 {
+		height: 44rpx;
+		overflow-wrap: break-word;
+		color: rgba(34, 34, 34, 1);
+		font-size: 32rpx;
+		letter-spacing: 0.46814799308776855px;
+		font-family: PingFangSC-Medium;
+		text-align: left;
+		white-space: nowrap;
+		line-height: 44rpx;
+	}
+
+	.box_20 {
+		position: relative;
+		height: 32rpx;
+		background-size: 100% 100%;
+		margin-top: 6rpx;
+	}
+
+	.image-text_46 {
+		width: 86rpx;
+		height: 28rpx;
+		margin-left: 4rpx;
+	}
+
+	.box_21 {
+		width: 24rpx;
+		height: 24rpx;
+		background: url(https://oss.wdmeta.art/a7835b5dd05ecd99/011781dfdfb589a0.png) 100% no-repeat;
+		background-size: 100% 100%;
+		margin-top: 4rpx;
+	}
+
+	.text-group_20 {
+		width: 62rpx;
+		height: 28rpx;
+		overflow-wrap: break-word;
+		color: rgba(255, 255, 255, 1);
+		font-size: 20rpx;
+		letter-spacing: 0.29259249567985535px;
+		font-family: PingFangSC-Medium;
+		text-align: left;
+		white-space: nowrap;
+		line-height: 28rpx;
+	}
+
+	.image-text_47 {
+		position: absolute;
+		left: 4rpx;
+		top: 0;
+		width: 86rpx;
+		height: 28rpx;
+	}
+
+	.image_1 {
+		border-radius: 50%;
+		position: absolute;
+		left: 40rpx;
+		top: -60rpx;
+		width: 200rpx;
+		height: 200rpx;
+	}
+
+	.box_22 {
+		background-color: rgba(255, 255, 255, 1);
+		width: 750rpx;
+		margin-top: -2rpx;
+	}
+
+	.text-wrapper_26 {
+		width: 690rpx;
+		height: 44rpx;
+		margin: 36rpx 0 28rpx 30rpx;
+	}
+
+	.text_33 {
+		position: relative;
+		width: 130rpx;
+		height: 44rpx;
+		overflow-wrap: break-word;
+		color: #999999;
+		font-size: 32rpx;
+		letter-spacing: 0.20148147642612457px;
+		font-family: PingFangSC-Medium;
+		text-align: center;
+		white-space: nowrap;
+		line-height: 44rpx;
+		padding-bottom: 12rpx;
+	}
+
+	.select {
+		position: relative;
+		color: #222222;
+	}
+
+	.select::before {
+		content: '';
+		position: absolute;
+		left: 50%;
+		transform: translateX(-50%);
+		bottom: 0;
+		width: 40rpx;
+		height: 8rpx;
+		background: linear-gradient(270deg, #A890FE 0%, #FFAEAE 100%);
+		border-radius: 4rpx;
+	}
+
+	.text_34 {
+		width: 122rpx;
+		height: 42rpx;
+		overflow-wrap: break-word;
+		color: rgba(153, 153, 153, 1);
+		font-size: 30rpx;
+		letter-spacing: 0.18888889253139496px;
+		font-family: PingFangSC-Medium;
+		text-align: left;
+		white-space: nowrap;
+		line-height: 42rpx;
+		margin: 2rpx 0 0 84rpx;
+	}
 
+	.text_35 {
+		width: 122rpx;
+		height: 42rpx;
+		overflow-wrap: break-word;
+		color: rgba(153, 153, 153, 1);
+		font-size: 30rpx;
+		letter-spacing: 0.18888889253139496px;
+		font-family: PingFangSC-Medium;
+		text-align: left;
+		white-space: nowrap;
+		line-height: 42rpx;
+		margin: 2rpx 0 0 86rpx;
+	}
+
+	.text_36 {
+		width: 62rpx;
+		height: 42rpx;
+		overflow-wrap: break-word;
+		color: rgba(153, 153, 153, 1);
+		font-size: 30rpx;
+		letter-spacing: 0.18888889253139496px;
+		font-family: PingFangSC-Medium;
+		text-align: left;
+		white-space: nowrap;
+		line-height: 42rpx;
+		margin: 2rpx 0 0 84rpx;
+	}
+
+	.box_23 {
+		width: 40rpx;
+		height: 8rpx;
+		background: url(https://oss.wdmeta.art/a7835b5dd05ecd99/011781dfdfb589a0.png) 100% no-repeat;
+		background-size: 100% 100%;
+		margin: 2rpx 0 0 76rpx;
+	}
+
+	.box_24 {
+		background-color: rgba(242, 242, 242, 1);
+		width: 690rpx;
+		height: 2rpx;
+		margin: 28rpx 0 0 30rpx;
+	}
+
+	.group_50 {
+		width: 690rpx;
+		height: 42rpx;
+		margin: 20rpx 0 0 30rpx;
+	}
+
+	.text_49 {
+		height: 42rpx;
+		overflow-wrap: break-word;
+		color: rgba(136, 136, 136, 1);
+		font-size: 30rpx;
+		letter-spacing: 0.18888889253139496px;
+		text-align: right;
+		white-space: nowrap;
+		line-height: 42rpx;
+	}
+
+	.text_50 {
+		height: 42rpx;
+		overflow-wrap: break-word;
+		color: rgba(34, 34, 34, 1);
+		font-size: 30rpx;
+		letter-spacing: 0.18888889253139496px;
+		text-align: right;
+		white-space: nowrap;
+		line-height: 42rpx;
+	}
+
+	.section_32 {
+		width: 28rpx;
+		height: 28rpx;
+		background: url(https://oss.wdmeta.art/a7835b5dd05ecd99/011781dfdfb589a0.png) 100% no-repeat;
+		background-size: 100% 100%;
+		margin: 8rpx 0 0 4rpx;
+	}
+
+	.group_51 {
+		width: 690rpx;
+		height: 112rpx;
+		margin: 36rpx 0 0 30rpx;
+	}
+
+	.text-group_32 {
+		width: 62rpx;
+		height: 112rpx;
+	}
+
+	.text_44 {
+		width: 62rpx;
+		height: 42rpx;
+		overflow-wrap: break-word;
+		color: rgba(136, 136, 136, 1);
+		font-size: 30rpx;
+		letter-spacing: 0.18888889253139496px;
+		text-align: right;
+		white-space: nowrap;
+		line-height: 42rpx;
+	}
+
+	.text_38 {
+		width: 62rpx;
+		height: 42rpx;
+		overflow-wrap: break-word;
+		color: rgba(136, 136, 136, 1);
+		font-size: 30rpx;
+		letter-spacing: 0.18888889253139496px;
+		text-align: right;
+		white-space: nowrap;
+		line-height: 42rpx;
+		margin-top: 28rpx;
+	}
+
+	.text-group_33 {
+		width: 92rpx;
+		height: 112rpx;
+	}
+
+	.text_45 {
+		width: 92rpx;
+		height: 42rpx;
+		overflow-wrap: break-word;
+		color: rgba(34, 34, 34, 1);
+		font-size: 30rpx;
+		letter-spacing: 0.18888889253139496px;
+		text-align: right;
+		white-space: nowrap;
+		line-height: 42rpx;
+	}
+
+	.text-group_21 {
+		width: 92rpx;
+		height: 42rpx;
+		overflow-wrap: break-word;
+		color: rgba(34, 34, 34, 1);
+		font-size: 30rpx;
+		letter-spacing: 0.18888889253139496px;
+		text-align: right;
+		white-space: nowrap;
+		line-height: 42rpx;
+		margin-top: 28rpx;
+	}
+
+	.text-wrapper_27 {
+		width: 690rpx;
+		height: 42rpx;
+		margin: 36rpx 0 0 30rpx;
+	}
+
+	.text_39 {
+		width: 62rpx;
+		height: 42rpx;
+		overflow-wrap: break-word;
+		color: rgba(136, 136, 136, 1);
+		font-size: 30rpx;
+		letter-spacing: 0.18888889253139496px;
+		text-align: right;
+		white-space: nowrap;
+		line-height: 42rpx;
+	}
+
+	.text-group_22 {
+		width: 72rpx;
+		height: 42rpx;
+		overflow-wrap: break-word;
+		color: rgba(34, 34, 34, 1);
+		font-size: 30rpx;
+		letter-spacing: 0.18888889253139496px;
+		text-align: right;
+		white-space: nowrap;
+		line-height: 42rpx;
+	}
+
+	.group_52 {
+		width: 690rpx;
+		height: 42rpx;
+		margin: 36rpx 0 0 30rpx;
+	}
+
+	.text_41 {
+		width: 62rpx;
+		height: 42rpx;
+		overflow-wrap: break-word;
+		color: rgba(136, 136, 136, 1);
+		font-size: 30rpx;
+		letter-spacing: 0.18888889253139496px;
+		text-align: right;
+		white-space: nowrap;
+		line-height: 42rpx;
+	}
+
+	.text-group_24 {
+		width: 92rpx;
+		height: 42rpx;
+		overflow-wrap: break-word;
+		color: rgba(34, 34, 34, 1);
+		font-size: 30rpx;
+		letter-spacing: 0.18888889253139496px;
+		text-align: right;
+		white-space: nowrap;
+		line-height: 42rpx;
+		margin-left: 504rpx;
+	}
+
+	.group_39 {
+		width: 28rpx;
+		height: 28rpx;
+		background: url(https://oss.wdmeta.art/a7835b5dd05ecd99/011781dfdfb589a0.png) 100% no-repeat;
+		background-size: 100% 100%;
+		margin: 8rpx 0 0 4rpx;
+	}
+
+	.text-wrapper_28 {
+		width: 690rpx;
+		height: 42rpx;
+		margin: 36rpx 0 0 30rpx;
+	}
+
+	.text_51 {
+		width: 122rpx;
+		height: 42rpx;
+		overflow-wrap: break-word;
+		color: rgba(136, 136, 136, 1);
+		font-size: 30rpx;
+		letter-spacing: 0.18888889253139496px;
+		text-align: right;
+		white-space: nowrap;
+		line-height: 42rpx;
+	}
+
+	.text_52 {
+		width: 122rpx;
+		height: 42rpx;
+		overflow-wrap: break-word;
+		color: rgba(34, 34, 34, 1);
+		font-size: 30rpx;
+		letter-spacing: 0.18888889253139496px;
+		text-align: right;
+		white-space: nowrap;
+		line-height: 42rpx;
+	}
+
+	.group_53 {
+		width: 690rpx;
+		height: 42rpx;
+		margin: 36rpx 0 0 30rpx;
+	}
+
+	.text_53 {
+		width: 122rpx;
+		height: 42rpx;
+		overflow-wrap: break-word;
+		color: rgba(136, 136, 136, 1);
+		font-size: 30rpx;
+		letter-spacing: 0.18888889253139496px;
+		text-align: right;
+		white-space: nowrap;
+		line-height: 42rpx;
+	}
+
+	.image-text_48 {
+		width: 216rpx;
+		height: 42rpx;
+	}
+
+	.text-group_29 {
+		width: 184rpx;
+		height: 42rpx;
+		overflow-wrap: break-word;
+		color: rgba(34, 34, 34, 1);
+		font-size: 30rpx;
+		letter-spacing: 0.18888889253139496px;
+		text-align: right;
+		white-space: nowrap;
+		line-height: 42rpx;
+	}
+
+	.group_41 {
+		width: 28rpx;
+		height: 28rpx;
+		background: url(https://oss.wdmeta.art/a7835b5dd05ecd99/011781dfdfb589a0.png) 100% no-repeat;
+		background-size: 100% 100%;
+		margin-top: 8rpx;
+	}
+
+	.text-wrapper_13 {
+		position: fixed;
+		bottom: 84rpx;
+		left: 50%;
+		transform: translateX(-50%);
+		height: 92rpx;
+
+		border-radius: 46rpx;
+		background: linear-gradient(270deg, #A890FE 0%, #FFAEAE 100%);
+		background-size: 100% 100%;
+		width: 650rpx;
+	}
+
+	.text_46 {
+		width: 146rpx;
+		height: 50rpx;
+		overflow-wrap: break-word;
+		color: rgba(255, 255, 255, 1);
+		font-size: 36rpx;
+		letter-spacing: 0.2266666740179062px;
+		font-family: PingFangSC-Medium;
+		text-align: right;
+		white-space: nowrap;
+		line-height: 50rpx;
+		margin: 22rpx 0 0 252rpx;
+	}
 </style>

+ 153 - 97
pages/profile/otherPage.vue

@@ -51,103 +51,159 @@
           <text class="text_36">相册</text> -->
         </view>
       
-       <view class="" v-show="current==0">
-       	<view class="group_50 flex-row  justify-between">
-       	  <text class="text_49">性别</text>
-       	  <view class="flex-row">
-       	  	<text class="text_50">{{info.sex==1?'男':'女'}}</text>
-       	  </view>
-       	</view>
-       <view class="group_50 flex-row  justify-between">
-         <text class="text_49">星座</text>
-         <view class="flex-row">
-         	<text class="text_50">{{info.constellation||'暂无'}}</text>
-         </view>
-       </view>
-	   <view class="group_50 flex-row  justify-between">
-	     <text class="text_49">身高</text>
-	     <view class="flex-row">
-	     	<text class="text_50">{{info.height?info.height+'cm':'暂无'}}</text>
-	     </view>
-	   </view>
-	   <view class="group_50 flex-row  justify-between">
-	     <text class="text_49">体重</text>
-	     <view class="flex-row">
-	     	<text class="text_50">{{info.weight?info.weight+'kg':'暂无'}}</text>
-	     </view>
-	   </view>
-	   <view class="group_50 flex-row  justify-between">
-	     <text class="text_49">学历</text>
-	     <view class="flex-row">
-	     	<text class="text_50">{{info.education||'暂无'}}</text>
-	     </view>
-	   </view>
-	   
-	   <view class="group_50 flex-row  justify-between">
-	     <text class="text_49">毕业院校</text>
-	     <view class="flex-row">
-	     	<text class="text_50">{{info.graduation_school||'暂无'}}</text>
-	     </view>
-	   </view>
-	   <view class="group_50 flex-row  justify-between">
-	     <text class="text_49">所在城市</text>
-	     <view class="flex-row">
-	     	<text class="text_50">{{info.address||'暂无'}}</text>
-	     </view>
-	   </view>
-       </view>
-	   <view class="" v-show="current==1">
-	   		<view class="group_50 flex-row  justify-between">
-	   		  <text class="text_49">工作单位</text>
-	   		  <view class="flex-row">
-	   		  	<text class="text_50">{{info.danwei||'暂无'}}</text>
-	   		  </view>
-	   		</view>
-			<view class="group_50 flex-row  justify-between">
-				     <text class="text_49">工作性质</text>
-				     <view class="flex-row">
-				     	<text class="text_50">{{info.xingzhi||'暂无'}}</text>
-				     </view>
-				   </view>
-				   <view class="group_50 flex-row  justify-between">
-				   	     <text class="text_49">职位</text>
-				   	     <view class="flex-row">
-				   	     	<text class="text_50">{{info.position||'暂无'}}</text>
-				   	     </view>
-				   	   </view>
-					   <view class="group_50 flex-row  justify-between">
-					   	     <text class="text_49">月收入</text>
-					   	     <view class="flex-row">
-					   	     	<text class="text_50">{{info.income||'暂无'}}</text>
-					   	     </view>
-					   	   </view>
-	   </view>
-	   <view class="" v-show="current==2">
-	   		<view class="group_50 flex-row  justify-between">
-	   		  <text class="text_49">兄弟姐妹</text>
-	   		  <view class="flex-row">
-	   		  <u-switch v-model="info.is_du==2" :disabled="true" size="18"></u-switch>
-	   		  </view>
-	   		</view>
-	   			<view class="group_50 flex-row  justify-between">
-	   				     <text class="text_49">父亲工作</text>
-	   				     <view class="flex-row">
-	   				     	<text class="text_50">{{info.fa_work||'暂无'}}</text>
-	   				     </view>
-	   				   </view>
-	   				   <view class="group_50 flex-row  justify-between">
-	   				   	     <text class="text_49">母亲工作</text>
-	   				   	     <view class="flex-row">
-								 <text class="text_50">{{info.ma_work||'暂无'}}</text>
-	   				   	     </view>
-	   				   	   </view>
-						   <view class="group_50 flex-row  justify-between">
-						   	     <text class="text_49">现在与谁居住</text>
-						   	     <view class="flex-row">
-						   	     	<text class="text_50">{{info.home||'暂无'}}</text>
-						   	     </view>
-						   	   </view>
-	   </view>
+      <view class="" v-show="current==0">
+      					<view class="group_50 flex-row  justify-between">
+      						<text class="text_49">性别</text>
+      						<view class="flex-row">
+      							<text class="text_50">{{info.sex==1?'男':'女'}}</text>
+      						</view>
+      					</view>
+      					<view class="group_50 flex-row  justify-between">
+      						<text class="text_49">年龄</text>
+      						<view class="flex-row">
+      							<input type="text" disabled v-model='info.age' style="text-align: right;">
+      						</view>
+      					</view>
+      					<view class="group_50 flex-row  justify-between">
+      						<text class="text_49">星座</text>
+      						<view class="flex-row">
+      							<input type="text" disabled v-model='info.constellation' style="text-align: right;">
+      						</view>
+      					</view>
+      					<view class="group_50 flex-row  justify-between">
+      						<text class="text_49">身高</text>
+      						<view class="flex-row">
+      							<text class="text_50">{{info.height?info.height+'cm':''}}</text>
+      							<!-- <input type="text" disabled v-model='info.height' style="text-align: right;"> -->
+      						</view>
+      					</view>
+      					<view class="group_50 flex-row  justify-between">
+      						<text class="text_49">体重</text>
+      						<view class="flex-row">
+      							<text class="text_50">{{info.weight?info.weight+'kg':''}}</text>
+      							<!-- <input type="text" disabled v-model='info.weight' style="text-align: right;"> -->
+      						</view>
+      					</view>
+      					<view class="group_50 flex-row  justify-between">
+      						<text class="text_49">学历</text>
+      						<view class="flex-row">
+      							<text class="text_50">{{info.graduation_school||''}}</text>
+      						</view>
+      					</view>
+      
+      					<view class="group_50 flex-row  justify-between">
+      						<text class="text_49">毕业院校</text>
+      						<view class="flex-row">
+      							<input type="text" disabled v-model='info.graduation_school' style="text-align: right;">
+      						</view>
+      					</view>
+      					<view class="group_50 flex-row  justify-between">
+      						<text class="text_49">兴趣爱好</text>
+      						<view class="flex-row">
+      							<text class="text_50">{{info.hobby||''}}</text>
+      							<!-- <input type="text" disabled v-model='info.hobby' style="text-align: right;"> -->
+      						</view>
+      					</view>
+      				
+      				</view>
+	  <view class="" v-show="current==1">
+	  	<view class="group_50 flex-row  justify-between">
+	  		<text class="text_49">姓名</text>
+	  		<view class="flex-row">
+	  			<text class="text_50">{{info.username}}</text>
+	  		</view>
+	  	</view>
+	  	<view class="group_50 flex-row  justify-between">
+	  		<text class="text_49">工作单位</text>
+	  		<view class="flex-row">
+	  			<text class="text_50">{{info.danwei||''}}</text>
+	  		</view>
+	  	</view>
+	  	<view class="group_50 flex-row  justify-between">
+	  		<text class="text_49">工作性质</text>
+	  		<view class="flex-row">
+	  			<text class="text_50">{{info.xingzhi||''}}</text>
+	  		</view>
+	  	</view>
+	  	<view class="group_50 flex-row  justify-between">
+	  		<text class="text_49">职务</text>
+	  		<view class="flex-row">
+	  			<input type="text" disabled v-model='info.position' style="text-align: right;">
+	  		</view>
+	  	</view>
+	  	<view class="group_50 flex-row  justify-between">
+	  		<text class="text_49">月收入</text>
+	  		<view class="flex-row">
+	  			<input type="text" disabled v-model='info.income' style="text-align: right;">
+	  		</view>
+	  	</view>
+	  </view>
+	  <view class="" v-show="current==2">
+	  	<view class="group_50 flex-row  justify-between">
+	  		<text class="text_49">婚史</text>
+	  		<view class="flex-row">
+	  			<!-- <input type="text" disabled v-model='info.hunshi' style="text-align: right;"> -->
+	  			<text>{{info.status==1?'未婚':info.status==2?'离异':info.status==3?'丧偶':''}}</text>
+	  		</view>
+	  	</view>
+	  	<view class="group_50 flex-row  justify-between">
+	  		<text class="text_49">有无子女</text>
+	  		<view class="flex-row">
+	  			<text>{{info.is_zinv==1?'有':info.is_zinv==2?'无':''}}</text>
+	  		</view>
+	  	</view>
+	  	<view class="group_50 flex-row  justify-between" v-if="info.is_zinv==1">
+	  		<text class="text_49">子女性别</text>
+	  		<view class="flex-row">
+	  			<text>{{info.zinv_sex==1?'男':info.zinv_sex==2?'女':''}}</text>
+	  		</view>
+	  	</view>
+	  	<view class="group_50 flex-row  justify-between">
+	  		<text class="text_49">是否独生子女</text>
+	  		<view class="flex-row">
+	  			<text>{{info.is_du==1?'是':info.is_du==2?'否':''}}</text>
+	  		</view>
+	  	</view>
+	  	<view class="group_50 flex-row  justify-between" v-if="info.is_du==2">
+	  		<text class="text_49">兄弟姊妹几人</text>
+	  		<view class="flex-row">
+	  			<text>{{info.children||0}}</text>
+	  		</view>
+	  	</view>
+	  	<view class="group_50 flex-row  justify-between">
+	  		<text class="text_49">居住情况</text>
+	  		<view class="flex-row">
+	  			<text>{{info.home==1?'自有产权房':info.home==2?'租住':info.home==3?'与父母同住':''}}</text>
+	  		</view>
+	  	</view>
+		<view class="group_50 flex-row  justify-between">
+			<text class="text_49">是否有车</text>
+			<view class="flex-row">
+				<text>{{info.is_car==1?'是':info.is_car==2?'否':''}}</text>
+			</view>
+		</view>
+		<view class="group_50 flex-row  justify-between" v-if="info.is_car==1">
+			<text class="text_49">车辆型号</text>
+			<view class="flex-row">
+				<text>{{info.car_model||''}}</text>
+			</view>
+		</view>
+		<view class="group_50 flex-row  justify-between">
+			<text class="text_49">父亲工作</text>
+			<view class="flex-row">
+				<input type="text" placeholder="请输入父亲工作职位" v-model='info.fa_work'
+					style="text-align: right;">
+			</view>
+		</view>
+		<view class="group_50 flex-row  justify-between">
+			<text class="text_49">母亲工作</text>
+			<view class="flex-row">
+				<input type="text" placeholder="请输入母亲工作职位" v-model='info.ma_work'
+					style="text-align: right;">
+			</view>
+		</view>
+	  </view>
+	 
 	   <view class="" v-show="current==3">
 	   	<view class="person" @click="toPerson">
 			<image :src="personPhoto[0].url" mode="aspectFill" v-if="personPhoto.length!=0" style="position: absolute;top: 0;right: 0;bottom: 0;left: 0;z-index: 1;width: 690rpx;height: 400rpx;"></image>

+ 6 - 0
pages/profile/zixunList.vue

@@ -16,6 +16,12 @@ border: 1px solid #979797;line-height: 52rpx;text-align: center;" @click.stop="d
 			</view>
 		</view>
 		</view>
+		<u-empty
+		v-if="list.length==0"
+		        mode="list"
+		        icon="http://cdn.uviewui.com/uview/empty/list.png"
+		>
+		</u-empty>
 	</view>
 </template>
 

二进制
unpackage/dist/build/h5.zip


+ 1 - 1
unpackage/dist/build/h5/index.html

@@ -1,2 +1,2 @@
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>love</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
-            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/h5/static/index.b0707a6a.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/h5/static/js/chunk-vendors.3545db87.js></script><script src=/h5/static/js/index.205be48c.js></script></body></html>
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/h5/static/index.5841170f.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/h5/static/js/chunk-vendors.1c833a36.js></script><script src=/h5/static/js/index.dac340b6.js></script></body></html>

文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/h5/static/index.b0707a6a.css


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/h5/static/js/chunk-vendors.3545db87.js


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/h5/static/js/index.205be48c.js


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-activity-activity.375e09a5.js


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-activity-activityInfo.7b759783.js


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-activity-activityInfo~pages-auth-auth~pages-index-base~pages-index-indexjubao~pages-index-reco~7d78533e.2f50d3d6.js


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-activity-activityInfo~pages-auth-auth~pages-index-base~pages-index-index~pages-index-indexjuba~e41a5659.8734e77c.js


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-activity-activityLIst.9d5c2acd.js


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-activity-activity~pages-activity-activityInfo~pages-auth-auth~pages-index-base~pages-index-ind~95495b57.ca5b73eb.js


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-auth-auth.a31834b2.js


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-auth-auth~pages-index-base~pages-index-indexjubao~pages-index-pipei~pages-index-registerVip~pa~28fb10c1.75c90fdc.js


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-auth-dengjibiao.6122943d.js


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-index-base.9e55294c.js


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-index-base1.6bec4b0f.js


+ 0 - 1
unpackage/dist/build/h5/static/js/pages-index-contactour.ac28bb70.js

@@ -1 +0,0 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["pages-index-contactour"],{2953:function(t,n,u){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var e={onLoad:function(){this.getInfo()},data:function(){return{about_us:""}},methods:{getInfo:function(){var t=this;uni.$u.http.post("/api/Publics/config_info").then((function(n){1==n.code&&(t.about_us=n.data.about_us)}))}}};n.default=e},cb67:function(t,n,u){"use strict";var e;u.d(n,"b",(function(){return o})),u.d(n,"c",(function(){return i})),u.d(n,"a",(function(){return e}));var o=function(){var t=this,n=t.$createElement,u=t._self._c||n;return u("v-uni-view",[u("v-uni-rich-text",{attrs:{nodes:t.about_us}})],1)},i=[]},d5b2:function(t,n,u){"use strict";u.r(n);var e=u("cb67"),o=u("ed6d");for(var i in o)"default"!==i&&function(t){u.d(n,t,(function(){return o[t]}))}(i);var r,a=u("f0c5"),c=Object(a["a"])(o["default"],e["b"],e["c"],!1,null,"7c0e063d",null,!1,e["a"],r);n["default"]=c.exports},ed6d:function(t,n,u){"use strict";u.r(n);var e=u("2953"),o=u.n(e);for(var i in e)"default"!==i&&function(t){u.d(n,t,(function(){return e[t]}))}(i);n["default"]=o.a}}]);

文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-index-gonglue.f285d7d9.js


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-index-index.626426bd.js


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-index-indexjubao.3877f40c.js


+ 0 - 1
unpackage/dist/build/h5/static/js/pages-index-message.2f9da6ea.js

@@ -1 +0,0 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["pages-index-message"],{"234c":function(t,i,n){"use strict";n("99af"),Object.defineProperty(i,"__esModule",{value:!0}),i.default=void 0;var e={onLoad:function(t){this.id=uni.getStorageSync("userId"),console.log("wx",t),t.otherid?(this.otherid=t.otherid,this.http="https://xiangqinim.zhousi.hdlkeji.com/h5?id=".concat(this.id,"&&otherid=").concat(this.otherid)):this.http="https://xiangqinim.zhousi.hdlkeji.com/h5?id=".concat(this.id)},data:function(){return{id:"",http:"",otherid:""}},methods:{}};i.default=e},"98ea":function(t,i,n){"use strict";n.r(i);var e=n("f9e6"),r=n("b4e3");for(var o in r)"default"!==o&&function(t){n.d(i,t,(function(){return r[t]}))}(o);var u,c=n("f0c5"),a=Object(c["a"])(r["default"],e["b"],e["c"],!1,null,"0d9d9bf1",null,!1,e["a"],u);i["default"]=a.exports},b4e3:function(t,i,n){"use strict";n.r(i);var e=n("234c"),r=n.n(e);for(var o in e)"default"!==o&&function(t){n.d(i,t,(function(){return e[t]}))}(o);i["default"]=r.a},f9e6:function(t,i,n){"use strict";var e;n.d(i,"b",(function(){return r})),n.d(i,"c",(function(){return o})),n.d(i,"a",(function(){return e}));var r=function(){var t=this,i=t.$createElement,n=t._self._c||i;return n("v-uni-view",[n("v-uni-web-view",{attrs:{src:t.http}})],1)},o=[]}}]);

文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-index-pipei.0e50cfb0.js


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-index-pipeizhong.523d6927.js


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-index-recommend.a039a2fd.js


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-index-registerVip.a2d4e380.js


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-index-renzhengVip.add43718.js


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-index-renzhengVip~pages-index-talkLove~pages-index-videoList~pages-profile-login.c9dca605.js


+ 0 - 1
unpackage/dist/build/h5/static/js/pages-index-talkInfo.c860a9d4.js

@@ -1 +0,0 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["pages-index-talkInfo"],{"5d6e":function(t,n,e){"use strict";e.r(n);var i=e("9095"),u=e("6198");for(var r in u)"default"!==r&&function(t){e.d(n,t,(function(){return u[t]}))}(r);var a,o=e("f0c5"),c=Object(o["a"])(u["default"],i["b"],i["c"],!1,null,"0213adc8",null,!1,i["a"],a);n["default"]=c.exports},6198:function(t,n,e){"use strict";e.r(n);var i=e("8cbe"),u=e.n(i);for(var r in i)"default"!==r&&function(t){e.d(n,t,(function(){return i[t]}))}(r);n["default"]=u.a},"8cbe":function(t,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var i={onLoad:function(t){this.getinfo(t.id)},data:function(){return{info:{}}},methods:{getinfo:function(t){var n=this;uni.$u.http.post("/api/index/articlederail",{id:t}).then((function(t){n.info=t.data}))}}};n.default=i},9095:function(t,n,e){"use strict";var i;e.d(n,"b",(function(){return u})),e.d(n,"c",(function(){return r})),e.d(n,"a",(function(){return i}));var u=function(){var t=this,n=t.$createElement,e=t._self._c||n;return e("v-uni-view",{staticStyle:{padding:"0 30rpx"}},[e("v-uni-view",{staticStyle:{"font-size":"40rpx","text-align":"center"}},[t._v(t._s(t.info.title))]),e("v-uni-rich-text",{attrs:{nodes:t.info.content}})],1)},r=[]}}]);

文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-index-talkLove.1fad7d57.js


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-index-twoHappy.489a6fc5.js


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-index-twoHappyInfo.045dd52f.js


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-index-videoInfo.69fd64ba.js


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-index-videoList.1a75ccdc.js


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-index-zixun.7caf96c8.js


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-profile-bangding.4a57a08d.js


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-profile-changephone.8aba231f.js


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-profile-dianzan.5d9296c4.js


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-profile-fankuiList.2125dda1.js


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-profile-fankuiinfo.0765ab97.js


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-profile-fankuiinfo~pages-profile-lifePhoto~pages-profile-personPhoto.63b8e332.js


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-profile-fensi.47158206.js


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-profile-ganxingqu.a7f29f0d.js


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-profile-guanzhu.bac54a4f.js


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-profile-jubao.a02f4ebd.js


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-profile-lifePhoto.c260b09e.js


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-profile-login.59eff66d.js


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-profile-myPage.98c007c6.js


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-profile-mydongtai.c7a05d28.js


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-profile-newphone.01eb42c6.js


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-profile-otherPage.cb88ab56.js


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-profile-personPhoto.b70dc93c.js


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-profile-personStatus.11ff98ef.js


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-profile-profile.3ad03073.js


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-profile-reportInfo.c196d63f.js


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-profile-reportList.cc3665ec.js


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-profile-set.fbaff999.js


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-profile-suqiu.8c6eb381.js


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-profile-zhuxiao.2aa413b8.js


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-profile-zixunInfo.1ed6541b.js


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-profile-zixunList.ffddfe87.js


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/activity/activity.js.map


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/activity/activityInfo.js.map


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/activity/activityLIst.js.map


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/auth/auth.js.map


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/auth/dengjibiao.js.map


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/base.js.map


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/base1.js.map


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/gonglue.js.map


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/indexjubao.js.map


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/pipei.js.map


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/pipeizhong.js.map


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/recommend.js.map


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/registerVip.js.map


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/renzhengVip.js.map


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/talkLove.js.map


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/twoHappy.js.map


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/twoHappyInfo.js.map


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/videoInfo.js.map


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/videoList.js.map


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/profile/bangding.js.map


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/profile/changephone.js.map


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/profile/dianzan.js.map


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/profile/fankuiList.js.map


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/profile/fankuiinfo.js.map


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/profile/fensi.js.map


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/profile/ganxingqu.js.map


部分文件因为文件数量过多而无法显示