2 years ago · 58a517eacc
--- a/App.vue
+++ b/App.vue
@@ -4,7 +4,12 @@
 
				 		            isShow: 0 
			
 
				 		        },
			
 
				 		onLaunch: function() {
			
 
				-			console.log('App Launch')
			
 
				+			// #ifdef H5
			
 
				+			var script = document.createElement('script');
			
 
				+					 // script.src = "http://117.73.3.171:88/qlgh/static/js/qlgh_client_sdk.js";//测试
			
 
				+					 script.src = "https://qlgh.sdgh.org.cn/qlgh/static/js/qlgh_client_sdk.js";//正式
			
 
				+					 document.head.appendChild(script);
			
 
				+			// #endif
			
 
				 				uni.$u.http.post('/api/Publics/config_info').then(res => {
			
 
				 					if(res.code==1){
			
 
				 						this.globalData.isShow=res.data.applet_switch
			
--- a/common/common.css
+++ b/common/common.css
@@ -0,0 +1,10 @@
 
				+.flex-row{
			
 
				+	display: flex;
			
 
				+} 
			
 
				+.justify-between{
			
 
				+	justify-content: space-between;
			
 
				+}
			
 
				+.flex-col{
			
 
				+	display: flex;
			
 
				+	flex-direction: column;
			
 
				+}
			
--- a/index.html
+++ b/index.html
@@ -9,12 +9,15 @@
 
				         '<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>
			
 
				+	
			
 
				     <title></title>
			
 
				     <!--preload-links-->
			
 
				     <!--app-context-->
			
 
				+	<script src="http://117.73.3.171:88/qlgh/static/js/qlgh_client_sdk.js" ></script>
			
 
				   </head>
			
 
				   <body>
			
 
				     <div id="app"><!--app-html--></div>
			
 
				     <script type="module" src="/main.js"></script>
			
 
				+	
			
 
				   </body>
			
 
				 </html>
			
--- a/manifest.json
+++ b/manifest.json
@@ -69,5 +69,10 @@
 
				     "uniStatistics" : {
			
 
				         "enable" : false
			
 
				     },
			
 
				-    "vueVersion" : "2"
			
 
				+    "vueVersion" : "2",
			
 
				+    "h5" : {
			
 
				+        "router" : {
			
 
				+            "base" : "/h5/"
			
 
				+        }
			
 
				+    }
			
 
				 }
			
--- a/pages.json
+++ b/pages.json
@@ -3,7 +3,7 @@
 
				 		{
			
 
				 			"path": "pages/index/index",
			
 
				 			"style": {
			
 
				-				"navigationBarTitleText": "uni-app",
			
 
				+				"navigationBarTitleText": "职恋沂蒙",
			
 
				 				"enablePullDownRefresh": true,
			
 
				 				"navigationStyle": "custom"
			
 
				 			}
			
@@ -12,9 +12,9 @@
 
				 		    "path" : "pages/index/base",
			
 
				 		    "style" :                                                                                    
			
 
				 		    {
			
 
				-		        "navigationBarTitleText": "",
			
 
				-		        "enablePullDownRefresh": false,
			
 
				-				"navigationStyle": "custom"
			
 
				+		        "navigationBarTitleText": "注册会员",
			
 
				+		        "enablePullDownRefresh": false
			
 
				+				// "navigationStyle": "custom"
			
 
				 		    }
			
 
				 		    
			
 
				 		}
			
@@ -90,7 +90,7 @@
 
				             "path" : "pages/profile/suqiu",
			
 
				             "style" :                                                                                    
			
 
				             {
			
 
				-                "navigationBarTitleText": "个人诉求",
			
 
				+                "navigationBarTitleText": "择偶条件",
			
 
				                 "enablePullDownRefresh": false
			
 
				             }
			
 
				             
			
@@ -262,7 +262,7 @@
 
				             "path" : "pages/index/pipei",
			
 
				             "style" :                                                                                    
			
 
				             {
			
 
				-                "navigationBarTitleText": "智能匹配",
			
 
				+                "navigationBarTitleText": "精准配对",
			
 
				                 "enablePullDownRefresh": false
			
 
				             }
			
 
				             
			
@@ -362,7 +362,7 @@
 
				             "path" : "pages/index/renzhengVip",
			
 
				             "style" :                                                                                    
			
 
				             {
			
 
				-                "navigationBarTitleText": "认证会员",
			
 
				+                "navigationBarTitleText": "会员列表",
			
 
				                 "enablePullDownRefresh": false
			
 
				             }
			
 
				             
			
--- a/pages/activity/activity.vue
+++ b/pages/activity/activity.vue
@@ -28,6 +28,12 @@
 
				 				</view>
			
 
				 			</view>
			
 
				 		</view>
			
 
				+		<u-empty v-if="activityList.length==0"
			
 
				+		        mode="list"
			
 
				+		        icon="http://cdn.uviewui.com/uview/empty/list.png"
			
 
				+				marginTop="100"
			
 
				+		>
			
 
				+		</u-empty>
			
 
				 	</view>
			
 
				 </template>
			
 
				 
			
@@ -48,10 +54,19 @@
 
				 			// 	})
			
 
				 			// 	return
			
 
				 			// }
			
 
				+			if(uni.getStorageSync('type')){
			
 
				+				this.current=uni.getStorageSync('type')
			
 
				+				this.page=1
			
 
				+				this.getList()
			
 
				+				uni.removeStorageSync('type')
			
 
				+			}else{
			
 
				+				this.page=1
			
 
				+				this.getList()
			
 
				+			}
			
 
				+			
			
 
				 		},
			
 
				 		onLoad() {
			
 
				 			
			
 
				-				this.getList()
			
 
				 		},
			
 
				 		onReachBottom() {
			
 
				 			this.page++
			
@@ -104,6 +119,11 @@
 
				 </script>
			
 
				 
			
 
				 <style lang="scss">
			
 
				+	// #ifdef H5
			
 
				+	page{
			
 
				+		background: url(/static/bg.png) no-repeat;
			
 
				+	}
			
 
				+	//#endif
			
 
				 	.list{
			
 
				 		margin: 24rpx 30rpx 0;
			
 
				 		.applyItem{
			
--- a/pages/activity/activityInfo.vue
+++ b/pages/activity/activityInfo.vue
@@ -109,15 +109,26 @@ border-image: linear-gradient(270deg, rgba(178, 148, 246, 1), rgba(248, 172, 182
 
				 						</view>
			
 
				 					</view>
			
 
				 				</view>
			
 
				+				<!-- #ifdef MP-WEIXIN -->
			
 
				 				<view class="u-flex u-row-between" style="margin-top: 80rpx;width: 100%;">
			
 
				 					<view class="" style="width: 230rpx;">
			
 
				 						<u-button text="保存图片" :plain="true" shape="circle" color="linear-gradient(270deg, #A890FE 0%, #FFAEAE 100%)"
			
 
				 							@click="storageImg"></u-button>
			
 
				 					</view>
			
 
				+					
			
 
				 					<view class=""  style="width: 390rpx;">
			
 
				 						<u-button text="马上邀请好友" open-type="share" shape="circle" color="linear-gradient(270deg, #A890FE 0%, #FFAEAE 100%)"
			
 
				 							@click="showShare=false"></u-button>
			
 
				 					</view>
			
 
				+					<!-- #endif -->
			
 
				+					<!-- #ifdef H5 -->
			
 
				+					<view class="u-flex u-row-center" style="margin-top: 80rpx;width: 100%;">
			
 
				+						
			
 
				+						<view class=""  style="width: 390rpx;">
			
 
				+							<u-button text="保存图片"  shape="circle" color="linear-gradient(270deg, #A890FE 0%, #FFAEAE 100%)"
			
 
				+								@click="storageImg"></u-button>
			
 
				+						</view>
			
 
				+						<!-- #endif -->
			
 
				 				</view>
			
 
				 
			
 
				 				
			
@@ -163,7 +174,10 @@ border-image: linear-gradient(270deg, rgba(178, 148, 246, 1), rgba(248, 172, 182
 
				 		// 	Showtoast
			
 
				 		// },
			
 
				 		onLoad(option) {
			
 
				+			// #ifdef MP-WEIXIN
			
 
				 			uni.$u.mpShare.path='/pages/index/index'
			
 
				+			// #endif
			
 
				+			
			
 
				 			this.id=option.id
			
 
				 			this.getInfo(option.id)
			
 
				 		},
			
@@ -186,8 +200,12 @@ border-image: linear-gradient(270deg, rgba(178, 148, 246, 1), rgba(248, 172, 182
 
				 					this.showtoast=false
			
 
				 			},
			
 
				 			storageImg(){
			
 
				-					
			
 
				+					// #ifdef H5
			
 
				+					this.$u.toast('长按图片保存')
			
 
				+					// #endif
			
 
				+					// #ifdef MP-WEIXIN
			
 
				 					this.drawCanvas()
			
 
				+					// #endif
			
 
				 			},
			
 
				 			 // 封装的下载图片函数
			
 
				 			    downLoadImage(url) {
			
--- a/pages/auth/auth.vue
+++ b/pages/auth/auth.vue
@@ -170,13 +170,13 @@
 
				 				})
			
 
				 				return
			
 
				 			}
			
 
				-			var is_info=uni.getStorageSync('is_info')
			
 
				-			if (is_info != 2) {
			
 
				-				uni.navigateTo({
			
 
				-					url: '/pages/index/base'
			
 
				-				})
			
 
				-				return
			
 
				-			}
			
 
				+			// var is_info=uni.getStorageSync('is_info')
			
 
				+			// if (is_info != 2) {
			
 
				+			// 	uni.navigateTo({
			
 
				+			// 		url: '/pages/index/base'
			
 
				+			// 	})
			
 
				+			// 	return
			
 
				+			// }
			
 
				 				this.getType()
			
 
				 				
			
 
				 				
			
@@ -235,6 +235,20 @@
 
				 								})
			
 
				 			},
			
 
				 			gorenzheng(){
			
 
				+				var is_info=uni.getStorageSync('is_info')
			
 
				+				if (is_info != 2) {
			
 
				+					uni.showToast({
			
 
				+						title:'注册审核通过后才可以认证',
			
 
				+						icon:'none'
			
 
				+					})
			
 
				+					setTimeout(()=>{
			
 
				+						uni.navigateTo({
			
 
				+							url: '/pages/index/base'
			
 
				+						})
			
 
				+					},1000)
			
 
				+					
			
 
				+					return
			
 
				+				}
			
 
				 				if(!this.name){
			
 
				 					this.$u.toast('请输入姓名')
			
 
				 					return
			
@@ -272,7 +286,7 @@
 
				 					n_image:this.workImg1,
			
 
				 					name:this.name,
			
 
				 					phone:this.phone,
			
 
				-					c_id:this.current.id,
			
 
				+					c_id:this.current?this.current.id:'',
			
 
				 					uuid:this.uuid,
			
 
				 					c_image:this.workImg,
			
 
				 					m_images:arr.toString()
			
@@ -381,6 +395,11 @@
 
				 </script>
			
 
				 
			
 
				 <style lang="scss">
			
 
				+	// #ifdef H5
			
 
				+	page{
			
 
				+		background: url(/static/bg.png) no-repeat;
			
 
				+	}
			
 
				+	//#endif
			
 
				 	.success{
			
 
				 		box-sizing: border-box;
			
 
				 		padding: 0 40rpx;
			
--- a/pages/index/base.vue
+++ b/pages/index/base.vue
@@ -6,7 +6,7 @@
 
				 	<view  v-if="status!=3&&status!=1">
			
 
				 		<image src="../../static/bg.png" mode="" class="bg"></image>
			
 
				 		<view class="top">
			
 
				-			基础资料
			
 
				+			注册会员
			
 
				 			<image src="../../static/index/goback.png" mode="" @click="goback"></image>
			
 
				 		</view>
			
 
				 		<view class="form" >
			
@@ -20,6 +20,22 @@
 
				 					<input type="text" v-model="name" placeholder="请输入姓名">
			
 
				 				</view>
			
 
				 				<view class="item u-flex u-row-between">
			
 
				+					<text style="white-space: nowrap;">性别</text>
			
 
				+					<u-radio-group 
			
 
				+					    v-model="radiovalue1"
			
 
				+					    placement="row"
			
 
				+					  >
			
 
				+					    <u-radio
			
 
				+					      :customStyle="{marginBottom: '8px'}"
			
 
				+					      v-for="(item, index) in radiolist1"
			
 
				+					      :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;">身份证号</text>
			
 
				 					<input type="text" v-model="idcard" placeholder="请输入您的身份证号">
			
 
				 				</view>
			
@@ -64,9 +80,9 @@
 
				 		<image src="../../static/auth/error@2x.png" mode=""></image>
			
 
				 		<text style="font-size: 40rpx;font-weight: 600;margin: 48rpx 0 16rpx;">认证失败</text>
			
 
				 		<text>您的账号注册审核没有通过</text>
			
 
				-		<!-- <view class="reason">
			
 
				+		<view class="reason">
			
 
				 			{{reason}}
			
 
				-		</view> -->
			
 
				+		</view>
			
 
				 		<view class="u-flex u-row-around btnlist">
			
 
				 			<view class="btn1" @click="reset">
			
 
				 				重新注册
			
@@ -102,6 +118,16 @@
 
				 		},
			
 
				 		data() {
			
 
				 			return {
			
 
				+				radiolist1: [{
			
 
				+				            name: '男',
			
 
				+				            id: 1
			
 
				+				          },
			
 
				+				            {
			
 
				+				              name: '女',
			
 
				+				              id: 2
			
 
				+				            }
			
 
				+				          ],
			
 
				+				radiovalue1:'',
			
 
				 				status:0,
			
 
				 				s:60,
			
 
				 				count:'获取验证码',
			
@@ -138,6 +164,9 @@
 
				 				uni.$u.http.post('/api/user/userinfo').then(res => {
			
 
				 					if (res.code == 1) {
			
 
				 						this.status=res.data.is_info
			
 
				+						if(res.data.is_info==3){
			
 
				+							this.reason=res.data.reason
			
 
				+						}
			
 
				 					}
			
 
				 				})
			
 
				 			},
			
@@ -182,6 +211,10 @@
 
				 					this.$u.toast('请输入姓名')
			
 
				 					return
			
 
				 				}
			
 
				+				if(!this.radiovalue1){
			
 
				+					this.$u.toast('请选择性别')
			
 
				+					return
			
 
				+				}
			
 
				 				if(!this.idcard){
			
 
				 					this.$u.toast('请输入身份证号')
			
 
				 					return
			
@@ -223,6 +256,7 @@
 
				 					education:this.current,
			
 
				 					phone:this.phone,
			
 
				 					code:this.code,
			
 
				+					sex:this.radiovalue1
			
 
				 				}
			
 
				 				uni.$u.http.post('/api/index/member_basic',data).then(res => {
			
 
				 									if(res.code==1){
			
@@ -306,6 +340,14 @@
 
				 </script>
			
 
				 
			
 
				 <style lang="scss">
			
 
				+	.u-radio-group{
			
 
				+		justify-content: flex-end;
			
 
				+	}
			
 
				+	// #ifdef H5
			
 
				+	page{
			
 
				+		background: url(/static/bg.png) no-repeat;
			
 
				+	}
			
 
				+	//#endif
			
 
				 	.btnlist{
			
 
				 		width: 100%;
			
 
				 	}
			
--- a/pages/index/gonglue.vue
+++ b/pages/index/gonglue.vue
@@ -1,11 +1,11 @@
 
				 <template>
			
 
				 	<view class="index">
			
 
				-		<image src="https://xiangqin.zhousi.hdlkeji.com/main/gonglue.png" mode="" style="width: 750rpx;height: 1624rpx;position: absolute;top: 0;left: 0;right: 0;z-index: -1;"></image>
			
 
				+		<!-- <image src="https://xiangqin.zhousi.hdlkeji.com/main/gonglue.png" mode="" style="width: 750rpx;height: 1624rpx;position: absolute;top: 0;left: 0;right: 0;z-index: -1;"></image>
			
 
				 	<view class="title">
			
 
				 		入会攻略
			
 
				-	</view>
			
 
				-	<view class="content">
			
 
				-		<rich-text :nodes="introduction_to"></rich-text>
			
 
				+	</view> -->
			
 
				+	<view  v-html="introduction_to">
			
 
				+		<!-- <rich-text :nodes="introduction_to"></rich-text> -->
			
 
				 	</view>
			
 
				 	</view>
			
 
				 </template>
			
@@ -33,6 +33,11 @@
 
				 </script>
			
 
				 
			
 
				 <style lang="scss">
			
 
				+	// #ifdef H5
			
 
				+	page{
			
 
				+		// background: url(/static/bg.png) no-repeat;
			
 
				+	}
			
 
				+	//#endif
			
 
				 .index{
			
 
				 	position: relative;
			
 
				 	.title{
			
@@ -47,10 +52,11 @@
 
				 		-webkit-text-fill-color: transparent;
			
 
				 	}
			
 
				 	.content{
			
 
				+		box-sizing: border-box;
			
 
				 		padding: 20rpx;
			
 
				 		margin: 40rpx auto 0;
			
 
				 		width: 690rpx;
			
 
				-		height: 1228rpx;
			
 
				+		height: auto;
			
 
				 		background: #FFFFFF;
			
 
				 		border-radius: 40rpx;
			
 
				 	}
			
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -15,7 +15,8 @@
 
				 				</swiper>
			
 
				 			</view>
			
 
				 			<view class=""
			
 
				-				style="border-radius: 20rpx;box-shadow: 0px 2px 12px 4px rgba(0,0,0,0.04);overflow: hidden;margin: 0 0 20rpx 0;width: 690rpx;">
			
 
				+				style="border-radius: 20rpx;box-shadow: 0px 2px 12px 4px rgba(0,0,0,0.04);overflow: hidden;margin: 0 0 20rpx 0;width: 690rpx;"
			
 
				+				v-if="start">
			
 
				 				<u-notice-bar :text="notice.title" color="#777777" bgColor="#fff" url="/pages/auth/auth"></u-notice-bar>
			
 
				 			</view>
			
 
				 			<view class="list u-flex u-row-between u-warp">
			
@@ -25,7 +26,7 @@
 
				 					<text>{{item.name}}</text>
			
 
				 				</view>
			
 
				 			</view>
			
 
				-			<view class="recommend">
			
 
				+			<view class="recommend" v-if="member.length!=0">
			
 
				 				<view class="recommendImg">
			
 
				 					<image src="../../static/index/14@2x.png" mode=""></image>
			
 
				 				</view>
			
@@ -97,37 +98,48 @@
 
				 		},
			
 
				 		data() {
			
 
				 			return {
			
 
				-				is_login:false,
			
 
				+				start: false,
			
 
				+				is_login: false,
			
 
				 				is_info: null,
			
 
				 				showtoast: false,
			
 
				 				info: {},
			
 
				 				banner: [],
			
 
				-				notice: {},
			
 
				+				notice: {
			
 
				+
			
 
				+				},
			
 
				 				video: [],
			
 
				 				member: [],
			
 
				 				article: [],
			
 
				-				list: [{
			
 
				-						img: '/static/index/4@2x.png',
			
 
				-						name: '注册会员',
			
 
				-						path: '/pages/index/registerVip',
			
 
				-						isWhite: true
			
 
				-					},
			
 
				+				list: [
			
 
				+					// {
			
 
				+					// 	img: '/static/index/4@2x.png',
			
 
				+					// 	name: '注册会员',
			
 
				+					// 	path: '/pages/index/registerVip',
			
 
				+					// 	isWhite: true
			
 
				+					// },
			
 
				 					{
			
 
				 						img: '/static/index/5@2x.png',
			
 
				-						name: '认证会员',
			
 
				+						name: '会员列表',
			
 
				 						path: '/pages/index/renzhengVip',
			
 
				 						isWhite: true
			
 
				 					},
			
 
				 					{
			
 
				+						img: '/static/index/yugao.png',
			
 
				+						name: '活动预告',
			
 
				+						path: '/pages/activity/activity',
			
 
				+						isWhite: false,
			
 
				+						tabbar:true
			
 
				+					},
			
 
				+					{
			
 
				 						img: '/static/index/6@2x.png',
			
 
				-						name: '智能匹配',
			
 
				+						name: '精准配对',
			
 
				 						path: '/pages/index/pipei',
			
 
				 						isWhite: false
			
 
				 					},
			
 
				 					{
			
 
				-						img: '/static/index/7@2x.png',
			
 
				-						name: '推荐分享',
			
 
				-						path: '/pages/index/recommend',
			
 
				+						img: '/static/index/11@2x.png',
			
 
				+						name: '情感咨询',
			
 
				+						path: '/pages/index/zixun',
			
 
				 						isWhite: true
			
 
				 					},
			
 
				 					{
			
@@ -142,16 +154,18 @@
 
				 						path: '/pages/index/twoHappy',
			
 
				 						isWhite: false
			
 
				 					},
			
 
				+					
			
 
				 					{
			
 
				 						img: '/static/index/10@2x.png',
			
 
				 						name: '入会攻略',
			
 
				 						path: '/pages/index/gonglue',
			
 
				 						isWhite: true
			
 
				 					},
			
 
				+
			
 
				 					{
			
 
				-						img: '/static/index/11@2x.png',
			
 
				-						name: '情感咨询',
			
 
				-						path: '/pages/index/zixun',
			
 
				+						img: '/static/index/111@2x.png',
			
 
				+						name: '联系我们',
			
 
				+						path: '/pages/index/contactour',
			
 
				 						isWhite: true
			
 
				 					}
			
 
				 				]
			
@@ -167,29 +181,51 @@
 
				 			}, 1000);
			
 
				 		},
			
 
				 		onLoad() {
			
 
				-			
			
 
				 			this.getBanner()
			
 
				 			this.getArticle()
			
 
				+			// #ifdef H5
			
 
				+			var that=this
			
 
				+			setTimeout(()=>{
			
 
				+				labor.getUserInfo(function(e){
			
 
				+					if(e.error){
			
 
				+						return 
			
 
				+					}else{
			
 
				+						uni.$u.http.post('/api/Login/Hflogin',{phone:e.userPhone}).then(res => {
			
 
				+							if (res.code == 1) {
			
 
				+								uni.setStorageSync('token',res.data.token)
			
 
				+								that.getInfo()
			
 
				+							}
			
 
				+						})
			
 
				+					}
			
 
				+				})
			
 
				+			},500)
			
 
				+			
			
 
				+			// labor.b.getScore().then(res=>{
			
 
				+			// 	console.log('res',res)
			
 
				+			// })
			
 
				+			// #endif
			
 
				+			
			
 
				+			
			
 
				 		},
			
 
				 		onShow() {
			
 
				 			if (!uni.getStorageSync('token')) {
			
 
				-				this.is_login=false
			
 
				+				this.is_login = false
			
 
				 				// uni.reLaunch({
			
 
				 				// 	url: '../profile/login'
			
 
				 				// })
			
 
				 			} else {
			
 
				-				this.is_login=true
			
 
				+				this.is_login = true
			
 
				 				this.getNotice()
			
 
				 				this.getInfo()
			
 
				 			}
			
 
				 		},
			
 
				 		methods: {
			
 
				-			toLogin(){
			
 
				+			toLogin() {
			
 
				 				if (!uni.getStorageSync('token')) {
			
 
				 					uni.navigateTo({
			
 
				-						url:'/pages/profile/login'
			
 
				+						url: '/pages/profile/login'
			
 
				 					})
			
 
				-				} 
			
 
				+				}
			
 
				 			},
			
 
				 			canceltoast() {
			
 
				 				this.showtoast = false
			
@@ -221,7 +257,7 @@
 
				 							return
			
 
				 						}
			
 
				 						this.is_info = res.data.is_info
			
 
				-						uni.setStorageSync('is_info',res.data.is_info)
			
 
				+						uni.setStorageSync('is_info', res.data.is_info)
			
 
				 						// if(res.data.is_info!=2){
			
 
				 						// 	uni.reLaunch({
			
 
				 						// 		url:'./base'
			
@@ -235,7 +271,7 @@
 
				 				})
			
 
				 			},
			
 
				 			torecommendinfo(item) {
			
 
				-				if(!this.is_login){
			
 
				+				if (!this.is_login) {
			
 
				 					this.toLogin()
			
 
				 					return
			
 
				 				}
			
@@ -257,6 +293,7 @@
 
				 					this.notice = res.data.notice
			
 
				 					this.video = res.data.video
			
 
				 					this.member = res.data.member
			
 
				+					this.start = true
			
 
				 					// this.article = res.data.article
			
 
				 				})
			
 
				 			},
			
@@ -268,7 +305,7 @@
 
				 				})
			
 
				 			},
			
 
				 			toinfo(item) {
			
 
				-				if(!this.is_login){
			
 
				+				if (!this.is_login) {
			
 
				 					this.toLogin()
			
 
				 					return
			
 
				 				}
			
@@ -288,7 +325,7 @@
 
				 
			
 
				 			},
			
 
				 			tomore() {
			
 
				-				if(!this.is_login){
			
 
				+				if (!this.is_login) {
			
 
				 					this.toLogin()
			
 
				 					return
			
 
				 				}
			
@@ -306,7 +343,7 @@
 
				 				})
			
 
				 			},
			
 
				 			toitem(item) {
			
 
				-				if(!this.is_login){
			
 
				+				if (!this.is_login) {
			
 
				 					this.toLogin()
			
 
				 					return
			
 
				 				}
			
@@ -314,6 +351,12 @@
 
				 					this.tozhuce()
			
 
				 					return
			
 
				 				}
			
 
				+				if((item.isWhite || this.info.vip_level == 1)&&item.tabbar){
			
 
				+					uni.setStorageSync('type',1)
			
 
				+					uni.switchTab({
			
 
				+						url:item.path
			
 
				+					})
			
 
				+				}
			
 
				 				if (item.isWhite || this.info.vip_level == 1) {
			
 
				 					uni.navigateTo({
			
 
				 						url: item.path
			
@@ -343,6 +386,12 @@
 
				 </script>
			
 
				 
			
 
				 <style lang="scss">
			
 
				+	// #ifdef H5
			
 
				+	page {
			
 
				+		background: url(/static/bg.png) no-repeat;
			
 
				+	}
			
 
				+
			
 
				+	//#endif
			
 
				 	.home {
			
 
				 		padding: 0 30rpx 20rpx;
			
 
				 	}
			
--- a/pages/index/pipei.vue
+++ b/pages/index/pipei.vue
@@ -138,7 +138,7 @@
 
				 					[{"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":"临沭县"}]
			
 
				 				],
			
 
				 				moneycolumns: [
			
 
				 					['不限', '3000元', '5000元', '7000元', '9000元', '11000元', '13000元', '15000元', '17000元', '20000元'],
			
--- a/pages/index/recommend.vue
+++ b/pages/index/recommend.vue
@@ -8,10 +8,12 @@
 
				 		 <view class="" style="margin: 30rpx auto 40rpx;width: 610rpx;" @click="storageImg">
			
 
				 		 	<u-button text="保存图片"  shape="circle" color="linear-gradient(270deg, #A890FE 0%, #FFAEAE 100%)"></u-button>
			
 
				 		 </view>
			
 
				+		 <!-- #ifdef MP-WEIXIN -->
			
 
				 		 <view class="" style="margin:0 auto;width: 610rpx;">
			
 
				 			 <u-button type="error" :plain="true" openType="share" shape="circle" text="马上邀请好友"></u-button>
			
 
				 		 	
			
 
				 		 </view>
			
 
				+		 <!-- #endif -->
			
 
				 		 <canvas canvas-id="shareCanvas" style="width: 690px;height: 920px;position: fixed;top: -1000px;left: 1000px;z-index: 99;"></canvas>
			
 
				 	</view>
			
 
				 </template>
			
@@ -30,8 +32,12 @@
 
				 		},
			
 
				 		methods: {
			
 
				 			storageImg(){
			
 
				-					
			
 
				+					// #ifdef H5
			
 
				+					this.$u.toast('长按图片保存')
			
 
				+					// #endif
			
 
				+					// #ifdef MP-WEIXIN
			
 
				 					this.drawCanvas()
			
 
				+					// #endif
			
 
				 			},
			
 
				 			// 封装的下载图片函数
			
 
				 			    downLoadImage(url) {
			
@@ -175,8 +181,14 @@
 
				 	}
			
 
				 </script>
			
 
				 
			
 
				-<style>
			
 
				+<style lang="scss">
			
 
				+	// #ifdef H5
			
 
				+	page{
			
 
				+		background: url(/static/bg.png) no-repeat;
			
 
				+	}
			
 
				+	//#endif
			
 
				 page{
			
 
				 	padding-bottom: 50rpx;
			
 
				 }
			
 
				+
			
 
				 </style>
			
--- a/pages/index/renzhengVip.vue
+++ b/pages/index/renzhengVip.vue
@@ -1,39 +1,88 @@
 
				 <template>
			
 
				 	<view>
			
 
				-		<view class="u-flex u-row-between" style="height: 80rpx;background-color: #fff;position:fixed;top:0;width: 750rpx;line-height: 80rpx;padding: 0 30rpx;box-sizing: border-box;color: #666666;font-size: 26rpx;">
			
 
				-			<view class="u-flex"  >
			
 
				+		<view class="u-flex u-row-between" style="height: 80rpx;background-color: #fff;position:fixed;width: 750rpx;line-height: 80rpx;padding: 0 30rpx;box-sizing: border-box;color: #666666;font-size: 26rpx;z-index: 999;" :style="{'top':navBarHeight+'px'}">
			
 
				+			<view class="tab_item" :class="{'select_tab':current==index}" v-for="(item,index) in tabList" :key="index" @click="tabClick(index)">
			
 
				+				{{item}}
			
 
				+			</view>
			
 
				+			<!-- <view class="u-flex"  >
			
 
				 				<view class="u-flex" @click="showsex=true">
			
 
				 					性别 <u-icon name="arrow-down-fill" size="10" color="#000"></u-icon>
			
 
				 				</view>
			
 
				 				<view class="u-flex" style="margin-left: 30rpx;" @click="showage=true">
			
 
				 					年龄 <u-icon name="arrow-down-fill"  size="10" color="#000"></u-icon>
			
 
				 				</view>
			
 
				-			</view>
			
 
				-			<view class="u-flex" @click="popup=true">
			
 
				-				筛选 <u-icon name="hourglass"  size="20" color="#000"></u-icon>
			
 
				+			</view> -->
			
 
				+			<view class="u-flex" @click="popup=true" style="font-size: 26rpx;color: #000000;">
			
 
				+				筛选 <image src="../../static/index/shaixuan.png" mode="" style="width: 24rpx;height: 24rpx;vertical-align: middle;margin-left: 4rpx;"></image>
			
 
				 			</view>
			
 
				 		</view>
			
 
				 		<view class="u-flex u-row-between" style="flex-wrap: wrap;padding: 0 30rpx;">
			
 
				-		<view class="" style="background-color: #fff;width: 336rpx;margin: 0 0 20rpx;border-radius: 20rpx;position: relative;" v-for="(item,index) in list" :key="index" @click="toinfo(item)">
			
 
				-			<view class="">
			
 
				+		<view class="" style="background-color: #fff;width: 336rpx;margin: 0 0 20rpx;border-radius: 20rpx;position: relative;height: 600rpx;box-sizing: border-box;" v-for="(item,index) in list" :key="index" @click="toinfo(item)">
			
 
				+			<view class="" style="position: relative;">
			
 
				 				<image :src="item.headimg" mode="" style="width: 336rpx;
			
 
				 				height: 336rpx;
			
 
				 				border-radius: 20rpx;"></image>
			
 
				+				<image src="../../static/index/notice.png" mode="" style="width: 48rpx;height: 48rpx;vertical-align: middle;position: absolute;bottom: 16rpx;right: 20rpx;" @click.stop="tomessage(item)"></image>
			
 
				+				<!-- <view class=" u-flex u-row-center" style="width: 144rpx;
			
 
				+height: 28rpx;
			
 
				+background: rgba(0,0,0,0.5);
			
 
				+border-radius: 14rpx;position: absolute;left: 16rpx;bottom: 16rpx;text-align: center;align-items: center;" v-if="item.province_id">
			
 
				+					<image src="../../static/index/address.png" mode="" style="width: 20rpx;height: 20rpx;vertical-align: middle;"></image>
			
 
				+					<text style="color: #fff;font-size: 16rpx;">现居地:{{item.province_id}}</text>
			
 
				+				</view> -->
			
 
				+			</view>
			
 
				+			<view class=" u-flex u-row-center" style="width: 124rpx;height: 28rpx;background: rgba(0,0,0,0.5);border-radius: 14rpx;position: absolute;top: 20rpx;left: 40rpx;text-align: center;align-items: center;transform: scale(1.2);" v-if="item.vip_level==1">
			
 
				+				<image src="../../static/index/level.png" mode="" style="width: 20rpx;height: 20rpx;vertical-align: middle;"></image><text style="font-size: 16rpx;color: #fff;">身份已认证</text>
			
 
				 			</view>
			
 
				-	<view class="" style="font-size: 32rpx;padding: 20rpx;">
			
 
				-		{{item.nickname}} <image src="../../static/index/2@2x.png" mode="" style="width: 36rpx;height: 36rpx;margin:0 20rpx -6rpx" v-show="item.sex==1"></image> <image src="../../static/index/1@2x.png" mode="" style="width: 36rpx;height: 36rpx;margin:0 20rpx -6rpx"  v-show="item.sex==2"></image>
			
 
				+	<view class="" style="font-size: 32rpx;padding:8rpx 20rpx;font-weight: 600;color: #000;">
			
 
				+		{{item.nickname}} 
			
 
				+		<!-- <image src="../../static/index/2@2x.png" mode="" style="width: 36rpx;height: 36rpx;margin:0 20rpx -6rpx" v-show="item.sex==1"></image> <image src="../../static/index/1@2x.png" mode="" style="width: 36rpx;height: 36rpx;margin:0 20rpx -6rpx"  v-show="item.sex==2"></image> -->
			
 
				+	</view>
			
 
				+	<view class="" style="font-size: 24rpx;color: #888888;padding:8rpx 20rpx;">
			
 
				+		性别：<text style="color: #333333;">{{item.sex==1?'男':'女'}}</text>
			
 
				+	</view>
			
 
				+	<view class="" style="font-size: 24rpx;color: #888888;padding:8rpx 20rpx;" >
			
 
				+		年龄：<text style="color: #333333;" v-if="item.age">{{item.age}}岁</text>
			
 
				 	</view>
			
 
				-	<view class="u-flex u-row-between"  style="font-size: 24rpx;padding: 20rpx;color: #888888;">
			
 
				-		<text>{{item.province_id?item.province_id+'·':''}}{{item.age?item.age+'·':''}}{{item.height?item.height:''}}</text>
			
 
				-		<image src="../../static/index/dazhaohu.png" mode="" style="width: 128rpx;height: 48rpx;vertical-align: middle;position: absolute;top: 24rpx;right: 16rpx;" @click.stop="tomessage(item)"></image>
			
 
				+	<view class="" style="font-size: 24rpx;color: #888888;padding:8rpx 20rpx;" >
			
 
				+		身高：<text style="color: #333333;" v-if="item.height">{{item.height}}cm</text>
			
 
				 	</view>
			
 
				+	<view class="" style="font-size: 24rpx;color: #888888;padding:8rpx 20rpx;" >
			
 
				+		现居地：<text style="color: #333333;" v-if="item.province_id"> {{item.province_id}}</text>
			
 
				+	</view>
			
 
				+	<!-- <view class="u-flex u-row-between"  style="font-size: 24rpx;padding: 20rpx;color: #888888;">
			
 
				+		<text>{{item.sex==1?'男':'女'}}{{item.age?'·'+item.age:''}}{{item.height?'·'+item.height:''}}</text>
			
 
				+		
			
 
				+		<image src="../../static/profile/88@2x.png" mode="" style="width: 124rpx;height: 28rpx;vertical-align: middle;position: absolute;top: 20rpx;left: 20rpx;transform: scale(1.3);" v-if="item.vip_level==1"></image>
			
 
				+		<image src="../../static/profile/8@2x.png" mode="" style="width: 84rpx;height: 28rpx;vertical-align: middle;position: absolute;top: 20rpx;left: 20rpx;transform: scale(1.3);" v-else></image>
			
 
				+	</view> -->
			
 
				 		</view>
			
 
				+		
			
 
				 		</view>
			
 
				+		<u-empty
			
 
				+		        mode="list"
			
 
				+		        icon="http://cdn.uviewui.com/uview/empty/list.png" v-if="list.length==0"
			
 
				+		>
			
 
				+		</u-empty>
			
 
				 		<u-picker :show="showsex" :columns="sexcolumns" keyName="name" @confirm='changesex' @cancel='showsex=false' :closeOnClickOverlay='true'>
			
 
				 				</u-picker>
			
 
				 				<u-picker :show="showage" @cancel='showage=false' title="年龄" ref="uPicker" :columns="columns" @confirm="confirm"  @change="changeage">
			
 
				 				</u-picker>
			
 
				 				<u-popup :show="popup"  :round="10" mode="bottom" :closeable='true' @close="popup=false" @open="open">
			
 
				+					<view class="" style="padding: 30rpx 30rpx 0;">
			
 
				+						<view class="" style="font-size: 32rpx;color: #000;font-weight: 600;margin: 20rpx 0;">
			
 
				+							年龄
			
 
				+						</view>
			
 
				+						<view class="u-flex u-row-between" style="flex-wrap: nowrap;">
			
 
				+							<view class="">
			
 
				+								<u-input inputAlign="center" v-model="age_min" type="number" :customStyle="inputstyle" placeholder="请输入年龄"></u-input>
			
 
				+							</view>
			
 
				+							<text>至</text>
			
 
				+							<view class="">
			
 
				+								<u-input inputAlign="center" v-model="age_max" type="number" :customStyle="inputstyle" placeholder="请输入年龄"></u-input>
			
 
				+							</view>
			
 
				+						</view>
			
 
				+					</view>
			
 
				 						<view style="width: 750rpx;padding: 30rpx;box-sizing: border-box;">
			
 
				 				           <view class="" style="font-size: 32rpx;color: #000;font-weight: 600;margin: 20rpx 0;">
			
 
				 				           	工作性质<text style="font-size: 22rpx;color: #888888;font-weight: 400;">/多选</text>
			
@@ -83,6 +132,11 @@
 
				 			Showtoast
			
 
				 		},
			
 
				 		onLoad() {
			
 
				+			// #ifdef H5
			
 
				+			let res = wx.getSystemInfoSync()
			
 
				+			this.navBarHeight = res.statusBarHeight + 44 //顶部状态栏+顶部导航，大部分机型默认44px
			
 
				+			// #endif
			
 
				+			
			
 
				 			var list=this.columns[0]
			
 
				 			var list1=this.columns[1] 
			
 
				 			for( let i=1;i<66;i++){
			
@@ -97,6 +151,11 @@
 
				 		},
			
 
				 		data() {
			
 
				 			return {
			
 
				+				navBarHeight:0,
			
 
				+				age_min:'',
			
 
				+				age_max:'',
			
 
				+				current:0,
			
 
				+				tabList:['认证会员','注册会员','男会员','女会员'],
			
 
				 				showtoast:false,
			
 
				 				columns1:[],
			
 
				 				columns: [
			
@@ -117,7 +176,13 @@
 
				 				workList:[],
			
 
				 				educationList:[{name:'高中',isSelect:false},{name:'大专',isSelect:false},{name:'本科',isSelect:false},{name:'研究生',isSelect:false},{name:'博士',isSelect:false}],
			
 
				 				work:[],
			
 
				-				education:[]
			
 
				+				education:[],
			
 
				+				inputstyle:{
			
 
				+					width:'260rpx',
			
 
				+					background: '#F4F4F4',
			
 
				+					borderRadius:' 8rpx'
			
 
				+					
			
 
				+				}
			
 
				 			}
			
 
				 		},
			
 
				 		onReachBottom() {
			
@@ -125,6 +190,13 @@
 
				 			this.getList()
			
 
				 		},
			
 
				 		methods: {
			
 
				+			tabClick(index){
			
 
				+					if(this.current!=index){
			
 
				+						this.page=1
			
 
				+						this.current=index
			
 
				+						this.getList()
			
 
				+					}
			
 
				+			},
			
 
				 			canceltoast(){
			
 
				 					this.showtoast=false
			
 
				 			},
			
@@ -158,6 +230,8 @@
 
				 			this.popup=false	
			
 
				 			},
			
 
				 			reset(){
			
 
				+				this.age_min=''
			
 
				+				this.age_max=''
			
 
				 					this.workList.forEach(item=>{
			
 
				 						item.isSelect=false
			
 
				 					})
			
@@ -259,12 +333,13 @@
 
				 			},
			
 
				 			getList(){
			
 
				 				let data={
			
 
				+					level:this.current==0?1:this.current==1?0:'',
			
 
				 					page:this.page,
			
 
				-					age_min:this.age.length==0?'':this.age[0],
			
 
				-					age_max:this.age.length==0?'':this.age[1],
			
 
				+					age_min:this.age_min,
			
 
				+					age_max:this.age_max,
			
 
				 					nature:this.work.length==0?'':this.work.toString(),
			
 
				 					education:this.education.length==0?'':this.education.toString(),
			
 
				-					sex:this.sex
			
 
				+					sex:this.current==2?1:this.current==3?2:''
			
 
				 				}
			
 
				 				uni.$u.http.post('/api/Index/certified_user',data).then(res => {
			
 
				 				if(this.page==1){
			
@@ -316,4 +391,19 @@ page{
 
				 	padding: 100rpx 0;
			
 
				 	background-color: #F6F2FD;
			
 
				 }
			
 
				+.tab_item{
			
 
				+	width: 132rpx;
			
 
				+	height: 52rpx;
			
 
				+	background: #F0F0F0;
			
 
				+	border-radius: 8rpx;
			
 
				+	color: #777777;
			
 
				+	font-size: 26rpx;
			
 
				+	line-height: 52rpx;
			
 
				+	text-align: center;
			
 
				+}
			
 
				+.select_tab{
			
 
				+	background: linear-gradient(270deg, #A890FE 0%, #FFAEAE 100%);
			
 
				+	color: #fff;
			
 
				+	font-weight: 600;
			
 
				+}
			
 
				 </style>
			
--- a/pages/index/twoHappy.vue
+++ b/pages/index/twoHappy.vue
@@ -49,6 +49,11 @@
 
				 </script>
			
 
				 
			
 
				 <style lang="scss">
			
 
				+	// #ifdef H5
			
 
				+	page{
			
 
				+		background: url(/static/bg.png) no-repeat;
			
 
				+	}
			
 
				+	//#endif
			
 
				 page{
			
 
				 	background-color: #F3F3F3;
			
 
				 	padding: 20rpx 0;
			
--- a/pages/profile/login.vue
+++ b/pages/profile/login.vue
@@ -1,5 +1,7 @@
 
				 <template>
			
 
				+	<!-- #ifdef MP-WEIXIN -->
			
 
				 	<view>
			
 
				+		
			
 
				 		<view class="top">
			
 
				 			
			
 
				 			<image src="../../static/index/goback.png" mode="" @click="goback"></image>
			
@@ -10,6 +12,32 @@
 
				 			<u-button @click="getUserProfile" text="授权登录"  shape="circle" color="linear-gradient(270deg, #A890FE 0%, #FFAEAE 100%)"></u-button>
			
 
				 		</view>
			
 
				 	</view>
			
 
				+	<!-- #endif -->
			
 
				+	<!-- #ifdef H5 -->
			
 
				+	<view>
			
 
				+		
			
 
				+		<view class="top">
			
 
				+			
			
 
				+			<image src="../../static/index/goback.png" mode="" @click="goback"></image>
			
 
				+		</view>
			
 
				+		<!-- <image src="../../static/bg.png" mode="" style="position: fixed;
			
 
				+		width: 100vw;
			
 
				+		height: 100vh;z-index: 0;"></image> -->
			
 
				+		<!-- <button   @click="getUserProfile">登录</button> -->
			
 
				+		 <view class="" style="margin-top: 200rpx;padding: 0 30rpx;">
			
 
				+		 	<u--input
			
 
				+			type='number'
			
 
				+		 	   placeholder="请输入手机号"
			
 
				+		 	   v-model="phone"
			
 
				+		 				:customStyle='style'
			
 
				+		 				shape='circle'
			
 
				+		 	 ></u--input>
			
 
				+		 </view>
			
 
				+		<view class="" style="margin: 72rpx auto 40rpx;width: 610rpx;padding-top: 300rpx;">
			
 
				+			<u-button @click="phoneLogin" text="登录"  shape="circle" color="linear-gradient(270deg, #A890FE 0%, #FFAEAE 100%)"></u-button>
			
 
				+		</view>
			
 
				+	</view>
			
 
				+	<!-- #endif -->
			
 
				 </template>
			
 
				 
			
 
				 <script>
			
@@ -19,7 +47,10 @@
 
				 		},
			
 
				 		data() {
			
 
				 			return {
			
 
				-				
			
 
				+				phone:'',
			
 
				+				style:{
			
 
				+					backgroundColor:'#fff'
			
 
				+				}
			
 
				 			}
			
 
				 		},
			
 
				 		methods: {
			
@@ -37,6 +68,23 @@
 
				 				}
			
 
				 					
			
 
				 			},
			
 
				+			phoneLogin(){
			
 
				+				if(!this.phone){
			
 
				+					this.$u.toast('请输入手机号')
			
 
				+					return
			
 
				+				}
			
 
				+				uni.$u.http.post('/api/Login/Hflogin',{phone:this.phone}).then(res => {
			
 
				+					uni.setStorageSync('token',res.data.token)
			
 
				+					if(res.code==1){
			
 
				+						uni.switchTab({
			
 
				+							url:'../index/index'
			
 
				+						})
			
 
				+						
			
 
				+					}
			
 
				+					
			
 
				+					
			
 
				+				})
			
 
				+			},
			
 
				 			gologin(){
			
 
				 							uni.login({
			
 
				 								provider: 'weixin',
			
@@ -96,9 +144,12 @@
 
				 </script>
			
 
				 
			
 
				 <style lang="scss">
			
 
				-page{
			
 
				-	
			
 
				-}
			
 
				+	// #ifdef H5
			
 
				+	page{
			
 
				+		background: url(/static/bg.png) no-repeat;
			
 
				+	}
			
 
				+	//#endif
			
 
				+
			
 
				 .top {
			
 
				 		position: relative;
			
 
				 		padding-top: 44rpx;
			
--- a/pages/profile/myPage.vue
+++ b/pages/profile/myPage.vue
@@ -103,9 +103,9 @@
 
				        </view>
			
 
				 	   <view class="" v-show="current==1">
			
 
				 	   		<view class="group_50 flex-row  justify-between">
			
 
				-	   		  <text class="text_49">工作机构</text>
			
 
				+	   		  <text class="text_49">工作单位</text>
			
 
				 	   		  <view class="flex-row" @click="showunit=true">
			
 
				-	   		  	<text class="text_50">{{info.danwei||'请选择工作机构'}}</text>
			
 
				+	   		  	<text class="text_50">{{info.danwei||'请选择工作单位'}}</text>
			
 
				 	   		  	<u-icon name="arrow-right"></u-icon>
			
 
				 	   		  </view>
			
 
				 	   		</view>
			
@@ -367,7 +367,7 @@ export default {
 
				 };
			
 
				 </script>
			
 
				 <style lang="scss">
			
 
				-// @import '@/common/common.css';
			
 
				+@import '@/common/common.css';
			
 
				 page{
			
 
				 	
			
 
				 }
			
--- a/pages/profile/mydongtai.vue
+++ b/pages/profile/mydongtai.vue
@@ -2,7 +2,7 @@
 
				 	<view>
			
 
				 		<image src="../../static/bg.png" mode="" class="bg"></image>
			
 
				 		<view class="nodongtai u-flex-col u-col-center" v-if="dongtaiList.length==0">
			
 
				-			<image src="../../static/profile/nodongtai.png" mode=""></image>
			
 
				+			<!-- <image src="../../static/profile/nodongtai.png" mode=""></image> -->
			
 
				 			<text class="tips">暂无动态，快去发一条吧！</text>
			
 
				 			<view class="publish" @click="tofabu">
			
 
				 				发布动态
			
@@ -62,7 +62,7 @@
 
				 				</view>
			
 
				 			</view>
			
 
				 		</view>
			
 
				-		<image src="../../static/forum/4@2x.png" mode="" @click="tofabu" class="fa"></image>
			
 
				+		<!-- <image src="../../static/forum/4@2x.png" mode="" @click="tofabu" class="fa"></image> -->
			
 
				 		<u-action-sheet :actions="list" cancelText='取消' @close='close' @select='select' round='20'  :show="show"></u-action-sheet>
			
 
				 	</view>
			
 
				 </template>
			
--- a/pages/profile/otherPage.vue
+++ b/pages/profile/otherPage.vue
@@ -98,7 +98,7 @@
 
				        </view>
			
 
				 	   <view class="" v-show="current==1">
			
 
				 	   		<view class="group_50 flex-row  justify-between">
			
 
				-	   		  <text class="text_49">工作机构</text>
			
 
				+	   		  <text class="text_49">工作单位</text>
			
 
				 	   		  <view class="flex-row">
			
 
				 	   		  	<text class="text_50">{{info.danwei||'暂无'}}</text>
			
 
				 	   		  </view>
			
@@ -293,7 +293,7 @@ export default {
 
				 };
			
 
				 </script>
			
 
				 <style lang="scss">
			
 
				-// @import '@/common/common.css';
			
 
				+@import '@/common/common.css';
			
 
				 page{
			
 
				 	
			
 
				 }
			
--- a/pages/profile/personStatus.vue
+++ b/pages/profile/personStatus.vue
@@ -69,7 +69,7 @@ export default {
 
				 };
			
 
				 </script>
			
 
				 <style lang="scss">
			
 
				-// @import '@/common/common.css';
			
 
				+@import '@/common/common.css';
			
 
				 .select{
			
 
				 background: linear-gradient(270deg, #A890FE 0%, #FFAEAE 100%);
			
 
				 text{
			
--- a/pages/profile/profile.vue
+++ b/pages/profile/profile.vue
@@ -55,7 +55,16 @@
 
				 			</view>
			
 
				 		</view>
			
 
				 		<view class="bottom">
			
 
				-			<view class="u-flex u-row-between" @click="tostatus">
			
 
				+			<view class="u-flex u-row-between" @click="tosuqiu">
			
 
				+				<view class="item u-flex u-col-center">
			
 
				+					<image src="../../static/profile/zeou.png" mode=""></image>
			
 
				+					<text>择偶条件</text>
			
 
				+					<image src="../../static/profile/tan.png" mode="" style="width: 20rpx;height: 20rpx;vertical-align: middle;margin: 0 4rpx;"></image>
			
 
				+					<text style="font-size: 16rpx;color: #777777;">此项内容为智能推荐功能重要依据，请认真填写</text>
			
 
				+				</view>
			
 
				+				<u-icon name="arrow-right"></u-icon>
			
 
				+			</view>
			
 
				+			<view class="u-flex u-row-between" style="margin-top: 54rpx;" @click="tostatus">
			
 
				 				<view class="item">
			
 
				 					<image src="../../static/profile/5@2x.png" mode=""></image>
			
 
				 					<text>个人状态</text>
			
@@ -83,13 +92,20 @@
 
				 				</view>
			
 
				 				<u-icon name="arrow-right"></u-icon>
			
 
				 			</view>
			
 
				-			<view class="u-flex u-row-between" style="margin-top: 54rpx;"  @click="contact">
			
 
				+			<view class="u-flex u-row-between" style="margin-top: 54rpx;"  @click="tofenxiang">
			
 
				+				<view class="item">
			
 
				+					<image src="../../static/profile/contact.png" mode=""></image>
			
 
				+					<text>推荐分享</text>
			
 
				+				</view>
			
 
				+				<u-icon name="arrow-right"></u-icon>
			
 
				+			</view>
			
 
				+			<!-- <view class="u-flex u-row-between" style="margin-top: 54rpx;"  @click="contact">
			
 
				 				<view class="item">
			
 
				 					<image src="../../static/profile/lianxi@2x.png" mode=""></image>
			
 
				 					<text>联系我们</text>
			
 
				 				</view>
			
 
				 				<u-icon name="arrow-right"></u-icon>
			
 
				-			</view>
			
 
				+			</view> -->
			
 
				 		</view>
			
 
				 		<Showtoast @canceltoast='canceltoast' :showtoast='showtoast' />
			
 
				 	</view>
			
@@ -131,6 +147,36 @@
 
				 				
			
 
				 		},
			
 
				 		methods: {
			
 
				+			tosuqiu(){
			
 
				+				if(!this.is_login){
			
 
				+					this.toLogin()
			
 
				+					return
			
 
				+				}
			
 
				+				if (this.is_info != 2) {
			
 
				+					uni.navigateTo({
			
 
				+						url: '/pages/index/base'
			
 
				+					})
			
 
				+					return
			
 
				+				}
			
 
				+				uni.navigateTo({
			
 
				+					url:'/pages/profile/suqiu'
			
 
				+				})
			
 
				+			},
			
 
				+			tofenxiang(){
			
 
				+				if(!this.is_login){
			
 
				+					this.toLogin()
			
 
				+					return
			
 
				+				}
			
 
				+				if (this.is_info != 2) {
			
 
				+					uni.navigateTo({
			
 
				+						url: '/pages/index/base'
			
 
				+					})
			
 
				+					return
			
 
				+				}
			
 
				+					uni.navigateTo({
			
 
				+						url:'/pages/index/recommend'
			
 
				+					})
			
 
				+			},
			
 
				 			toLogin(){
			
 
				 				if (!uni.getStorageSync('token')) {
			
 
				 					uni.navigateTo({
			
@@ -402,6 +448,11 @@
 
				 </script>
			
 
				 
			
 
				 <style lang="scss">
			
 
				+	// #ifdef H5
			
 
				+	page{
			
 
				+		background: url(/static/bg.png) no-repeat;
			
 
				+	}
			
 
				+	//#endif
			
 
				 	.bottom{
			
 
				 		box-sizing: border-box;
			
 
				 		padding: 36rpx 20rpx;
			
--- a/pages/profile/set.vue
+++ b/pages/profile/set.vue
@@ -30,10 +30,10 @@
 
				 				{{userInfo.phone}}<u-icon name="arrow-right"></u-icon>
			
 
				 			</view>
			
 
				 		</view> -->
			
 
				-		<view class="item-box u-flex u-col-center u-row-between" @click="tosuqiu">
			
 
				+		<!-- <view class="item-box u-flex u-col-center u-row-between" @click="tosuqiu">
			
 
				 			<text class="text1" style="flex: 1;">个人诉求</text>
			
 
				 			<u-icon name="arrow-right"></u-icon>
			
 
				-		</view>
			
 
				+		</view> -->
			
 
				 		<view class="item-box u-flex u-col-center u-row-between">
			
 
				 			<text class="text1" style="flex: 1;" @click="tozhuxiao">账号注销</text>
			
 
				 			<u-icon name="arrow-right"></u-icon>
			
--- a/pages/profile/suqiu.vue
+++ b/pages/profile/suqiu.vue
@@ -159,6 +159,9 @@
 
				 </script>
			
 
				 
			
 
				 <style lang="scss">
			
 
				+	page{
			
 
				+		padding: 30rpx 0;
			
 
				+	}
			
 
				 	.publish{
			
 
				 		position: fixed;
			
 
				 		bottom: 84rpx;
			
@@ -199,6 +202,7 @@
 
				 		}
			
 
				 	}
			
 
				 .title{
			
 
				+	margin-left: 36rpx;
			
 
				 	font-size: 30rpx;
			
 
				 	color: #222222;
			
 
				 	font-weight: 600;
			
--- a/static/index/10@2x.png
+++ b/static/index/10@2x.png
--- a/static/index/111@2x.png
+++ b/static/index/111@2x.png
--- a/static/index/11@2x.png
+++ b/static/index/11@2x.png
--- a/static/index/14@2x.png
+++ b/static/index/14@2x.png
--- a/static/index/16@2x.png
+++ b/static/index/16@2x.png
--- a/static/index/5@2x.png
+++ b/static/index/5@2x.png
--- a/static/index/6@2x.png
+++ b/static/index/6@2x.png
--- a/static/index/7@2x.png
+++ b/static/index/7@2x.png
--- a/static/index/9@2x.png
+++ b/static/index/9@2x.png
--- a/static/index/address.png
+++ b/static/index/address.png
--- a/static/index/level.png
+++ b/static/index/level.png
--- a/static/index/notice.png
+++ b/static/index/notice.png
--- a/static/index/shaixuan.png
+++ b/static/index/shaixuan.png
--- a/static/index/yugao.png
+++ b/static/index/yugao.png
--- a/static/profile/88@2x.png
+++ b/static/profile/88@2x.png
--- a/static/profile/recommend.png
+++ b/static/profile/recommend.png
--- a/static/profile/tan.png
+++ b/static/profile/tan.png
--- a/static/profile/zeou.png
+++ b/static/profile/zeou.png
--- a/uni_modules/uview-ui/components/u-row-notice/u-row-notice.vue
+++ b/uni_modules/uview-ui/components/u-row-notice/u-row-notice.vue
@@ -26,11 +26,15 @@
 
				 				class="u-notice__content__text"
			
 
				 				:style="[animationStyle]"
			
 
				 			>
			
 
				-				<text
			
 
				+				<!-- <text
			
 
				 					v-for="(item, index) in innerText"
			
 
				 					:key="index"
			
 
				 					:style="[textStyle]"
			
 
				-				>{{item}}</text>
			
 
				+				>{{item}}</text> -->
			
 
				+				<text
			
 
				+					
			
 
				+					:style="[textStyle]"
			
 
				+				>{{text}}</text>
			
 
				 			</view>
			
 
				 		</view>
			
 
				 		<view
			
@@ -141,6 +145,7 @@
 
				 				let result = [],
			
 
				 					// 每组text标签的字符长度
			
 
				 					len = 20
			
 
				+					console.log('this.text',this.text)
			
 
				 				const textArr = this.text.split('')
			
 
				 				for (let i = 0; i < textArr.length; i += len) {
			
 
				 					// 对拆分的后的text进行slice分割，得到的为数组再进行join拼接为字符串
			
--- a/unpackage/dist/build/.automator/h5/.automator.json
+++ b/unpackage/dist/build/.automator/h5/.automator.json
--- a/unpackage/dist/build/h5.zip
+++ b/unpackage/dist/build/h5.zip
--- a/unpackage/dist/build/h5/index.html
+++ b/unpackage/dist/build/h5/index.html
@@ -0,0 +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>
			
--- a/unpackage/dist/build/h5/static/activity/1.png
+++ b/unpackage/dist/build/h5/static/activity/1.png
--- a/unpackage/dist/build/h5/static/activity/2.png
+++ b/unpackage/dist/build/h5/static/activity/2.png
--- a/unpackage/dist/build/h5/static/activity/bmz@2x.png
+++ b/unpackage/dist/build/h5/static/activity/bmz@2x.png
--- a/unpackage/dist/build/h5/static/activity/count@2x.png
+++ b/unpackage/dist/build/h5/static/activity/count@2x.png
--- a/unpackage/dist/build/h5/static/activity/doing.png
+++ b/unpackage/dist/build/h5/static/activity/doing.png
--- a/unpackage/dist/build/h5/static/activity/doing@2x.png
+++ b/unpackage/dist/build/h5/static/activity/doing@2x.png
--- a/unpackage/dist/build/h5/static/activity/end@2x.png
+++ b/unpackage/dist/build/h5/static/activity/end@2x.png
--- a/unpackage/dist/build/h5/static/activity/fill@2x.png
+++ b/unpackage/dist/build/h5/static/activity/fill@2x.png
--- a/unpackage/dist/build/h5/static/activity/have.png
+++ b/unpackage/dist/build/h5/static/activity/have.png
--- a/unpackage/dist/build/h5/static/activity/history.png
+++ b/unpackage/dist/build/h5/static/activity/history.png
--- a/unpackage/dist/build/h5/static/activity/share@2x.png
+++ b/unpackage/dist/build/h5/static/activity/share@2x.png
--- a/unpackage/dist/build/h5/static/activity/status@2x.png
+++ b/unpackage/dist/build/h5/static/activity/status@2x.png
--- a/unpackage/dist/build/h5/static/activity/success.png
+++ b/unpackage/dist/build/h5/static/activity/success.png
--- a/unpackage/dist/build/h5/static/activity/weirenzheng.png
+++ b/unpackage/dist/build/h5/static/activity/weirenzheng.png
--- a/unpackage/dist/build/h5/static/activity/yugao.png
+++ b/unpackage/dist/build/h5/static/activity/yugao.png
--- a/unpackage/dist/build/h5/static/auth/1@2x.png
+++ b/unpackage/dist/build/h5/static/auth/1@2x.png
--- a/unpackage/dist/build/h5/static/auth/2@2x.png
+++ b/unpackage/dist/build/h5/static/auth/2@2x.png
--- a/unpackage/dist/build/h5/static/auth/3@2x.png
+++ b/unpackage/dist/build/h5/static/auth/3@2x.png
--- a/unpackage/dist/build/h5/static/auth/4@2x.png
+++ b/unpackage/dist/build/h5/static/auth/4@2x.png
--- a/unpackage/dist/build/h5/static/auth/5@2x.png
+++ b/unpackage/dist/build/h5/static/auth/5@2x.png
--- a/unpackage/dist/build/h5/static/auth/add.png
+++ b/unpackage/dist/build/h5/static/auth/add.png
--- a/unpackage/dist/build/h5/static/auth/error@2x.png
+++ b/unpackage/dist/build/h5/static/auth/error@2x.png
--- a/unpackage/dist/build/h5/static/auth/shenhe@2x.png
+++ b/unpackage/dist/build/h5/static/auth/shenhe@2x.png
--- a/unpackage/dist/build/h5/static/auth/succes@2x.png
+++ b/unpackage/dist/build/h5/static/auth/succes@2x.png
--- a/unpackage/dist/build/h5/static/bg.png
+++ b/unpackage/dist/build/h5/static/bg.png
--- a/unpackage/dist/build/h5/static/forum/add.png
+++ b/unpackage/dist/build/h5/static/forum/add.png
--- a/unpackage/dist/build/h5/static/forum/more.png
+++ b/unpackage/dist/build/h5/static/forum/more.png
--- a/unpackage/dist/build/h5/static/forum/publish.png
+++ b/unpackage/dist/build/h5/static/forum/publish.png
--- a/unpackage/dist/build/h5/static/forum/weirenzheng.png
+++ b/unpackage/dist/build/h5/static/forum/weirenzheng.png
--- a/unpackage/dist/build/h5/static/icon/10@2x.png
+++ b/unpackage/dist/build/h5/static/icon/10@2x.png
--- a/unpackage/dist/build/h5/static/icon/1@2x.png
+++ b/unpackage/dist/build/h5/static/icon/1@2x.png
--- a/unpackage/dist/build/h5/static/icon/2@2x.png
+++ b/unpackage/dist/build/h5/static/icon/2@2x.png
--- a/unpackage/dist/build/h5/static/icon/3@2x.png
+++ b/unpackage/dist/build/h5/static/icon/3@2x.png
--- a/unpackage/dist/build/h5/static/icon/4@2x.png
+++ b/unpackage/dist/build/h5/static/icon/4@2x.png
--- a/unpackage/dist/build/h5/static/icon/5@2x.png
+++ b/unpackage/dist/build/h5/static/icon/5@2x.png
--- a/unpackage/dist/build/h5/static/icon/6@2x.png
+++ b/unpackage/dist/build/h5/static/icon/6@2x.png
--- a/unpackage/dist/build/h5/static/icon/7@2x.png
+++ b/unpackage/dist/build/h5/static/icon/7@2x.png
--- a/unpackage/dist/build/h5/static/icon/8@2x.png
+++ b/unpackage/dist/build/h5/static/icon/8@2x.png
--- a/unpackage/dist/build/h5/static/icon/9@2x.png
+++ b/unpackage/dist/build/h5/static/icon/9@2x.png
--- a/unpackage/dist/build/h5/static/img/14@2x.7ef95ef8.png
+++ b/unpackage/dist/build/h5/static/img/14@2x.7ef95ef8.png
--- a/unpackage/dist/build/h5/static/img/17.3cf503f3.png
+++ b/unpackage/dist/build/h5/static/img/17.3cf503f3.png
--- a/unpackage/dist/build/h5/static/img/3@2x.bc2ae7d5.png
+++ b/unpackage/dist/build/h5/static/img/3@2x.bc2ae7d5.png
--- a/unpackage/dist/build/h5/static/img/bg.30deae09.png
+++ b/unpackage/dist/build/h5/static/img/bg.30deae09.png
--- a/unpackage/dist/build/h5/static/img/dazhaohu.e1df8789.png
+++ b/unpackage/dist/build/h5/static/img/dazhaohu.e1df8789.png
--- a/unpackage/dist/build/h5/static/img/dazhaohu@2x.4e80bc30.png
+++ b/unpackage/dist/build/h5/static/img/dazhaohu@2x.4e80bc30.png
--- a/unpackage/dist/build/h5/static/img/jubao@2x.4479d09a.png
+++ b/unpackage/dist/build/h5/static/img/jubao@2x.4479d09a.png
--- a/unpackage/dist/build/h5/static/img/pipeibg.c60980bd.png
+++ b/unpackage/dist/build/h5/static/img/pipeibg.c60980bd.png
--- a/unpackage/dist/build/h5/static/img/weirenzheng.25dbfba7.png
+++ b/unpackage/dist/build/h5/static/img/weirenzheng.25dbfba7.png
--- a/unpackage/dist/build/h5/static/index.b0707a6a.css
+++ b/unpackage/dist/build/h5/static/index.b0707a6a.css
--- a/unpackage/dist/build/h5/static/index/10@2x.png
+++ b/unpackage/dist/build/h5/static/index/10@2x.png
--- a/unpackage/dist/build/h5/static/index/111@2x.png
+++ b/unpackage/dist/build/h5/static/index/111@2x.png
--- a/unpackage/dist/build/h5/static/index/11@2x.png
+++ b/unpackage/dist/build/h5/static/index/11@2x.png
--- a/unpackage/dist/build/h5/static/index/14@2x.png
+++ b/unpackage/dist/build/h5/static/index/14@2x.png
--- a/unpackage/dist/build/h5/static/index/15@2x.png
+++ b/unpackage/dist/build/h5/static/index/15@2x.png
--- a/unpackage/dist/build/h5/static/index/16@2x.png
+++ b/unpackage/dist/build/h5/static/index/16@2x.png