10.19

components/Showtoast.vue

@@ -0,0 +1,53 @@
+<template>
+	<view>
+		<u-popup :show="showtoast" :round="10" mode="center" >
+						<view style="width: 550rpx;
+		height: 560rpx;
+		background: linear-gradient(to right,#E8F0FB,#F8E7FD);
+		border-radius: 28rpx;padding: 60rpx 120rpx;box-sizing: border-box;" class="u-flex-col u-col-center">
+				            <image src="../static/tishi.png" mode="" style="width: 84rpx;height: 84rpx;"></image>
+							<text style="font-size: 32rpx;margin-top: 40rpx;">成为认证会员才能</text>
+							<text style="font-size: 32rpx;">进行该操作</text>
+							<view class="" style="width: 310rpx;
+		height: 84rpx;
+		background: linear-gradient(270deg, #A890FE 0%, #FFAEAE 100%);
+		border-radius: 46rpx;color: #fff;font-size: 32rpx;line-height: 84rpx;text-align: center;margin: 50rpx 0 32rpx;" @click="torenzheng">
+								立即认证
+							</view>
+							<text style="font-size: 30rpx;color: #A2A2A2;" @click="cancel">取消</text>
+						</view>
+					</u-popup>
+	</view>
+</template>
+
+<script>
+	export default {
+		name:"showtoast",
+		data() { 
+			return {
+				
+			};
+			
+		},
+		props:{
+			showtoast:{
+				type:Boolean,
+				default:true
+			}
+		},
+		methods:{
+			torenzheng(){
+					uni.switchTab({
+						url:'../auth/auth'
+					})
+			},
+			cancel(){
+				this.$emit('canceltoast')
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+
+</style>

pages.json

@@ -7,7 +7,18 @@
 				"enablePullDownRefresh": true,
 				"navigationStyle": "custom"
 			}
+		},
+		{
+		    "path" : "pages/index/base",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "",
+		        "enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+		    }
+		    
 		}
+		
 	    ,{
             "path" : "pages/activity/activity",
             "style" :                                                                                    
@@ -28,16 +39,16 @@
             }
             
         }
-        ,{
-            "path" : "pages/forum/forum",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": true,
-				"navigationStyle": "custom"
-            }
+    //     ,{
+    //         "path" : "pages/forum/forum",
+    //         "style" :                                                                                    
+    //         {
+    //             "navigationBarTitleText": "",
+    //             "enablePullDownRefresh": true,
+				// "navigationStyle": "custom"
+    //         }
             
-        }
+    //     }
         ,{
             "path" : "pages/profile/profile",
             "style" :                                                                                    
@@ -48,24 +59,24 @@
             }
             
         }
-        ,{
-            "path" : "pages/forum/forumInfo",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "动态详情",
-                "enablePullDownRefresh": false
-            }
+        // ,{
+        //     "path" : "pages/forum/forumInfo",
+        //     "style" :                                                                                    
+        //     {
+        //         "navigationBarTitleText": "动态详情",
+        //         "enablePullDownRefresh": false
+        //     }
             
-        }
-        ,{
-            "path" : "pages/forum/publish",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "发布动态",
-                "enablePullDownRefresh": false
-            }
+        // }
+        // ,{
+        //     "path" : "pages/forum/publish",
+        //     "style" :                                                                                    
+        //     {
+        //         "navigationBarTitleText": "发布动态",
+        //         "enablePullDownRefresh": false
+        //     }
             
-        }
+        // }
         ,{
             "path" : "pages/profile/set",
             "style" :                                                                                    
@@ -314,7 +325,7 @@
             "path" : "pages/index/talkLove",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "谈情说爱",
+                "navigationBarTitleText": "婚恋知识",
                 "enablePullDownRefresh": false
             }
             
@@ -430,6 +441,45 @@
             }
             
         }
+        
+        ,{
+            "path" : "pages/index/twoHappy",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "喜上加喜",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/index/twoHappyInfo",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "详情",
+                "enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/profile/fankuiinfo",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "意见反馈",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/index/base1",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+            }
+            
+        }
     ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",

pages/activity/activity.vue

@@ -40,7 +40,17 @@
 					uni.stopPullDownRefresh();
 				}, 1000);
 			},
+		onShow() {
+			// var is_info=uni.getStorageSync('is_info')
+			// if (is_info != 2) {
+			// 	uni.navigateTo({
+			// 		url: '/pages/index/base'
+			// 	})
+			// 	return
+			// }
+		},
 		onLoad() {
+			
 				this.getList()
 		},
 		onReachBottom() {
@@ -72,6 +82,19 @@
 				}
 			},
 			toinfo(item){
+				if (!uni.getStorageSync('token')) {
+					uni.navigateTo({
+						url:'/pages/profile/login'
+					})
+					return
+				}
+				var is_info=uni.getStorageSync('is_info')
+				if (is_info != 2) {
+					uni.navigateTo({
+						url: '/pages/index/base'
+					})
+					return
+				}
 				uni.navigateTo({
 					url:'./activityInfo?id='+item.id
 				})

pages/activity/activityInfo.vue

@@ -151,11 +151,17 @@ border-image: linear-gradient(270deg, rgba(178, 148, 246, 1), rgba(248, 172, 182
 							</view>
 						</u-popup>
 						<canvas canvas-id="shareCanvas" style="width: 650px;height: 800px;position: fixed;top: -1000px;left: 1000px;z-index: 99;"></canvas>
+						<!-- <Showtoast @canceltoast='canceltoast' :showtoast='showtoast' /> -->
 	</view>
 </template>
 
 <script>
+	
+	// import Showtoast from'../../components/Showtoast.vue'
 	export default {
+		// components:{
+		// 	Showtoast
+		// },
 		onLoad(option) {
 			uni.$u.mpShare.path='/pages/index/index'
 			this.id=option.id
@@ -163,6 +169,7 @@ border-image: linear-gradient(270deg, rgba(178, 148, 246, 1), rgba(248, 172, 182
 		},
 		data() {
 			return {
+				// showtoast:false,
 				info:{},
 				id:'',
 				showrenzheng:false,
@@ -175,6 +182,9 @@ border-image: linear-gradient(270deg, rgba(178, 148, 246, 1), rgba(248, 172, 182
 			}
 		},
 		methods: {
+			canceltoast(){
+					this.showtoast=false
+			},
 			storageImg(){
 					
 					this.drawCanvas()
@@ -336,8 +346,9 @@ border-image: linear-gradient(270deg, rgba(178, 148, 246, 1), rgba(248, 172, 182
 			},
 			baoming() {
 				if(this.userInfo.vip_level==0){
-					this.$u.toast('您暂未认证')
-					return
+					// this.$u.toast('您暂未认证')
+					// return
+					// this.showtoast=true
 				}
 				if(this.userInfo.vip_level==2){
 					this.$u.toast('经用户反馈，您账户存在违规行为，暂不支持使用该功能')
@@ -346,21 +357,23 @@ border-image: linear-gradient(270deg, rgba(178, 148, 246, 1), rgba(248, 172, 182
 				if(this.userInfo.vip_level==3){
 									this.$u.toast('您的账户已注销，暂不支持使用该功能')
 									return
+								}else{
+									uni.$u.http.post('/api/Activity/sign_up',{aid:this.info.id}).then(res => {
+										if(res.code==1){
+											if(res.data.status==3){
+												this.num=res.data.number
+												this.show1=true
+												this.getInfo(this.id)
+											}
+											else if(res.data.status==2){
+												this.showmanzu=true
+											}else if(res.data.status==1){
+												this.showrenzheng=true
+											}
+										}
+									})
 								}
-				uni.$u.http.post('/api/Activity/sign_up',{aid:this.info.id}).then(res => {
-					if(res.code==1){
-						if(res.data.status==3){
-							this.num=res.data.number
-							this.show1=true
-							this.getInfo(this.id)
-						}
-						else if(res.data.status==2){
-							this.showmanzu=true
-						}else if(res.data.status==1){
-							this.showrenzheng=true
-						}
-					}
-				})
+				
 				// this.showmanzu = true
 			},
 			close() {

pages/auth/auth.vue

@@ -19,15 +19,35 @@
 					<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>
+					<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>
 						<u-icon name="arrow-right" color="#FF5B5B"></u-icon>
 					</view>
 				</view> 
 				<view class="item u-flex u-row-between">
+					<text style="white-space: nowrap;margin-right: 240rpx;">是否为职工APP会员</text>
+					<u-radio-group
+					activeColor="#B997EF"
+					    v-model="radiovalue1"
+					    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">
 					<text style="white-space: nowrap;">会员号</text>
 					<input v-model="uuid" type="text" placeholder="请填写会员号">
+					
 				</view>
 				<view class="upload">
 					<view class="title">
@@ -40,7 +60,7 @@
 							<image src="../../static/auth/2@2x.png" mode="" class="smallImg"></image>
 						</view>
 						<view class="contentBottom" >
-							拍摄单位证明
+							请至齐鲁工惠-我的-个人资料-电子会员卡页面截图
 						</view>
 					</view>
 					<view class="lookvip" @click="toVip">
@@ -52,6 +72,28 @@
 					</view>
 				</view>
 				<view class="upload">
+					<view class="title">
+						<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>
+						<view class="contentTop">
+							<image src="../../static/auth/1@2x.png" mode="" class="bigImg"></image>
+							<image src="../../static/auth/2@2x.png" mode="" class="smallImg"></image>
+						</view>
+						<view class="contentBottom" >
+							上传电子会员卡
+						</view>
+					</view>
+					<!-- <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 class="upload">
 					<view class="title" style="margin-bottom: 18rpx;">
 						<text>*</text>上传个人照片<text style="font-size: 20rpx;color: #D2D2D2;">（至少上传一张照片）</text>
 					</view>
@@ -92,7 +134,7 @@
 					<text>手机号</text>
 					<input type="text" v-model="phone" :disabled="true" style="text-align: right;flex: 1;">
 				</view>
-				<view class="infoitem u-flex u-row-between">
+				<view class="infoitem u-flex u-row-between" v-if="unit">
 					<text>工会单位</text>
 					<input type="text" v-model="unit" :disabled="true"  style="text-align: right;flex: 1;">
 				</view>
@@ -122,12 +164,35 @@
 				this.getWorking()
 		},
 		onShow() {
+			if (!uni.getStorageSync('token')) {
+				uni.navigateTo({
+					url:'/pages/profile/login'
+				})
+				return
+			}
+			var is_info=uni.getStorageSync('is_info')
+			if (is_info != 2) {
+				uni.navigateTo({
+					url: '/pages/index/base'
+				})
+				return
+			}
 				this.getType()
 				
+				
 		},
 		data() {
 			return {
-				
+				radiolist1: [{
+				            name: '是',value:1
+				          },
+				            {
+				              name: '否',value:2
+				            },
+				           
+				          ],
+				          // u-radio-group的v-model绑定的值如果设置为某个radio的name，就会被默认选中
+				          radiovalue1: '',
 				working:{},
 				fileList1: [],
 				show: false,
@@ -139,6 +204,7 @@
 				phone:'',
 				unit:'',
 				workImg:'',
+				workImg1:'',
 				type:'',
 				reason:'',
 				uuid:''
@@ -181,10 +247,18 @@
 					this.$u.toast('请输入会员号')
 					return
 				}
+				if(!this.radiovalue1){
+					this.$u.toast('请选择是否为职工App会员')
+					return
+				}
 				if(!this.workImg){
 					this.$u.toast('上传单位证明')
 					return
 				}
+				if(!this.workImg1){
+					this.$u.toast('上传电子会员卡')
+					return
+				}
 				if(this.fileList1.length==0){
 					this.$u.toast('上传个人照片')
 					return
@@ -194,6 +268,8 @@
 					arr.push(item.url)
 				})
 				let data={
+					is_vip:this.radiovalue1,
+					n_image:this.workImg1,
 					name:this.name,
 					phone:this.phone,
 					c_id:this.current.id,
@@ -226,6 +302,23 @@
 					}
 				});
 			},
+			uploadImg1(){
+				var that=this
+				uni.chooseImage({
+					success: (chooseImageRes) => {
+						const tempFilePaths = chooseImageRes.tempFilePaths;
+						uni.uploadFile({
+							url: this.$url+'/api/Publics/uploadLocality', //仅为示例，非真实的接口地址
+							filePath: tempFilePaths[0],
+							name: 'file',
+							
+							success: (uploadFileRes) => {
+								that.workImg1=JSON.parse(uploadFileRes.data).data.url
+							}
+						});
+					}
+				});
+			},
 			getWorking(){
 				uni.$u.http.post('/api/Publics/working').then(res => {
 					this.columns=[res.data]

pages/index/base.vue

@@ -0,0 +1,546 @@
+<template>
+	<view class="" >
+		
+	
+	
+	<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" >
+			<view class="">
+				<view class="item u-flex u-row-between">
+					<text 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>
+					<input type="text" v-model="name" placeholder="请输入姓名">
+				</view>
+				<view class="item u-flex u-row-between">
+					<text 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>
+					<input type="number" v-model="age" 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 >{{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>
+					<input type="number" v-model="phone" placeholder="请输入手机号">
+				</view>
+				
+				<view class="item u-flex u-row-between">
+					<text 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>
+		</view>
+		<view class="" style="margin: 106rpx 30rpx 0;">
+			<u-button text="确定" @click="gorenzheng" shape="circle" color="linear-gradient(270deg, #A890FE 0%, #FFAEAE 100%)"
+				></u-button>
+		</view>
+		
+		
+		<u-picker :show="show" :columns="columns" keyName="name" @confirm='change' @cancel='cancel' :closeOnClickOverlay='true'>
+		</u-picker>
+	</view>
+	<view class="error u-flex-col u-col-center" v-if="status==3">
+		<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">
+			{{reason}}
+		</view> -->
+		<view class="u-flex u-row-around btnlist">
+			<view class="btn1" @click="reset">
+				重新注册
+			</view>
+			<!-- <view class="btn" style="color: #fff;"  @click="reset">
+				暂不注册
+			</view> -->
+		</view>
+	</view>
+	<view class="error u-flex-col u-col-center" v-if="status==1">
+		<image src="../../static/auth/shenhe@2x.png" mode=""></image>
+		<text style="font-size: 40rpx;font-weight: 600;margin: 48rpx 0 16rpx;">管理员审核中</text>
+		<text>请耐心等待审核结果哦～</text>
+		
+	</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		onPullDownRefresh() {
+				
+				setTimeout(function () {
+					uni.stopPullDownRefresh();
+				}, 1000);
+			},
+		onLoad() {
+				
+		},
+		onShow() {
+				this.getInfo()
+				
+		},
+		data() {
+			return {
+				status:0,
+				s:60,
+				count:'获取验证码',
+				code:'',
+				age:'',
+				unit:'',
+				idcard:'',
+				working:{},
+				fileList1: [],
+				show: false,
+				columns: [
+					['高中','大专','本科','硕士','博士']
+				],
+				current: null,
+				name:'',
+				phone:'',
+				unit:'',
+				workImg:'',
+				type:'',
+				reason:'',
+				uuid:''
+			}
+		},
+		methods: {
+			goback(){
+					uni.switchTab({
+						url:'./index'
+					})
+			},
+			reset(){
+					this.status=0
+			},
+			getInfo() {
+				uni.$u.http.post('/api/user/userinfo').then(res => {
+					if (res.code == 1) {
+						this.status=res.data.is_info
+					}
+				})
+			},
+			getCode(){
+			if (this.s == 60) {
+				if (!this.phone) {
+					uni.showToast({
+						title: "请输入手机号",
+						duration: 2000,
+						icon: "none",
+					});
+					return false;
+				}
+				      
+				uni.$u.http.post('/api/Sms/alsend',{phone:this.phone}).then((res) => {
+					uni.hideLoading()
+					uni.showToast({
+						title: res.msg,
+						duration: 2000,
+						icon: "none",
+					});
+					if (res.code == 1) {
+						this.time = setInterval(() => {
+							this.s--
+							this.count = `${this.s}s`
+							if (this.s <= 0) {
+								this.s = 60
+								this.count = '重新发送'
+								clearInterval(this.time)
+							}
+						}, 1000)
+					}
+				});
+				}
+			},
+			gorenzheng(){
+				if(!this.unit){
+					this.$u.toast('请输入单位名称')
+					return
+				}
+				if(!this.name){
+					this.$u.toast('请输入姓名')
+					return
+				}
+				if(!this.idcard){
+					this.$u.toast('请输入身份证号')
+					return
+				}
+				if(!this.age){
+					this.$u.toast('请输入年龄')
+					return
+				}
+				if(this.current==null){
+					this.$u.toast('请选择学历')
+					return
+				}
+				if(!this.phone){
+					this.$u.toast('请输入手机号')
+					return
+				}
+				if(!this.code){
+					this.$u.toast('请输入验证码')
+					return
+				}
+				// if(!this.uuid){
+				// 	this.$u.toast('请输入会员号')
+				// 	return
+				// }
+				// if(!this.workImg){
+				// 	this.$u.toast('上传单位证明')
+				// 	return
+				// }
+				// if(this.fileList1.length==0){
+				// 	this.$u.toast('上传个人照片')
+				// 	return
+				// }
+				
+				let data={
+					working:this.unit,
+					username:this.name,
+					ID_car:this.idcard,
+					age:this.age,
+					education:this.current,
+					phone:this.phone,
+					code:this.code,
+				}
+				uni.$u.http.post('/api/index/member_basic',data).then(res => {
+									if(res.code==1){
+										this.$u.toast(res.msg)
+										this.getInfo() 
+									}
+								})
+			},
+			uploadImg(){
+				var that=this
+				uni.chooseImage({
+					success: (chooseImageRes) => {
+						const tempFilePaths = chooseImageRes.tempFilePaths;
+						uni.uploadFile({
+							url: this.$url+'/api/Publics/uploadLocality', //仅为示例，非真实的接口地址
+							filePath: tempFilePaths[0],
+							name: 'file',
+							
+							success: (uploadFileRes) => {
+								that.workImg=JSON.parse(uploadFileRes.data).data.url
+							}
+						});
+					}
+				});
+			},
+
+			change(e) {
+				this.current = e.value[0]
+				// console.log(this.columns[0][this.current])
+				this.show = false
+			},
+			cancel() {
+				this.show = false
+			},
+			// 删除图片
+			deletePic(event) {
+				this[`fileList${event.name}`].splice(event.index, 1)
+			},
+			// 新增图片
+			async afterRead(event) {
+				// 当设置 mutiple 为 true 时, file 为数组格式，否则为对象格式
+				let lists = [].concat(event.file)
+				let fileListLen = this[`fileList${event.name}`].length
+				lists.map((item) => {
+					this[`fileList${event.name}`].push({
+						...item,
+						status: 'uploading',
+						message: '上传中'
+					})
+				})
+				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, {
+						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)
+						}
+					});
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	.btnlist{
+		width: 100%;
+	}
+	.btn1{
+		font-weight: 500;
+		color: #FFFFFF;
+		line-height: 50px;
+		background: linear-gradient(270deg, #A890FE 0%, #FFAEAE 100%);
+		-webkit-background-clip: text;
+		-webkit-text-fill-color: transparent;
+		width: 270rpx;
+		height: 88rpx;
+		line-height: 88rpx;
+		text-align: center;
+		font-size: 36rpx;
+		border-radius: 48rpx;
+		border: 4rpx solid #E6CDE6;
+		// border-image: linear-gradient(270deg, rgba(171, 145, 252, 1), rgba(251, 173, 177, 1)) 2 2;
+	}
+	.btn{
+		width: 270rpx;
+		height: 88rpx;
+		line-height: 88rpx;
+		text-align: center;
+		background: linear-gradient(270deg, #A890FE 0%, #FFAEAE 100%);
+		border-radius: 48rpx;
+		font-size: 36rpx;
+	}
+	.error{
+		padding-top: 96rpx;
+		padding-bottom: 94rpx;
+		margin: 56rpx auto 0;
+		width: 690rpx;
+		// height: 888rpx;
+		background: #FFFFFF;
+		border-radius: 40rpx;
+		font-size: 24rpx;
+		color: #222222;
+		image{
+			width: 140rpx;
+			height: 140rpx;
+		}
+		.reason{
+			padding: 24rpx 20rpx;
+			margin: 52rpx auto 64rpx;
+			width: 610rpx;
+			height: 200rpx;
+			background: #F4F4F4;
+			border-radius: 20rpx;
+		}
+	}
+	.success{
+		box-sizing: border-box;
+		padding: 0 40rpx;
+		height: auto;
+	}
+	.info{
+		padding: 40rpx 40rpx 0;
+		width: 100%;
+		margin-top: 80rpx;
+		border-top: 2rpx solid #F3F3F3;
+		.infoitem{
+			line-height: 100rpx;
+			width: 100%;
+			font-size: 30rpx;
+			color: #222222;
+		}
+	}
+	.btnlist{
+		margin-top: 30rpx;
+		width: 100%;
+	}
+	.btn1{
+		font-weight: 500;
+		color: #FFFFFF;
+		line-height: 50px;
+		background: linear-gradient(270deg, #A890FE 0%, #FFAEAE 100%);
+		-webkit-background-clip: text;
+		-webkit-text-fill-color: transparent;
+		width: 270rpx;
+		height: 88rpx;
+		line-height: 88rpx;
+		text-align: center;
+		font-size: 36rpx;
+		border-radius: 48rpx;
+		border: 4rpx solid #E6CDE6;
+		// border-image: linear-gradient(270deg, rgba(171, 145, 252, 1), rgba(251, 173, 177, 1)) 2 2;
+	}
+	.btn{
+		width: 270rpx;
+		height: 88rpx;
+		line-height: 88rpx;
+		text-align: center;
+		background: linear-gradient(270deg, #A890FE 0%, #FFAEAE 100%);
+		border-radius: 48rpx;
+		font-size: 36rpx;
+	}
+	.error{
+		padding-top: 96rpx;
+		padding-bottom: 94rpx;
+		margin: 56rpx auto 0;
+		width: 690rpx;
+		// height: 888rpx;
+		background: #FFFFFF;
+		border-radius: 40rpx;
+		font-size: 24rpx;
+		color: #222222;
+		image{
+			width: 140rpx;
+			height: 140rpx;
+		}
+		.reason{
+			padding: 24rpx 20rpx;
+			margin: 52rpx auto 64rpx;
+			width: 610rpx;
+			height: 200rpx;
+			background: #F4F4F4;
+			border-radius: 20rpx;
+		}
+	}
+	.lookvip {
+		font-weight: 500;
+		margin-top: 24rpx;
+		font-size: 24rpx;
+		color: #555555;
+		text-align: center;
+
+		text {
+			margin: 0 8rpx;
+		}
+	}
+
+	.uploadContent {
+		position: relative;
+		margin-top: 32rpx;
+		width: 650rpx;
+		height: 472rpx;
+		font-size: 28rpx;
+		color: #fff;
+		font-weight: 600;
+		background: #F3F4F6;
+		border-radius: 20rpx;
+
+		.contentTop {
+			height: 400rpx;
+			background-color: #F3F4F6;
+			position: relative;
+
+			.bigImg {
+				position: absolute;
+				top: 50%;
+				left: 50%;
+				transform: translate(-50%, -50%);
+				width: 510rpx;
+				height: 320rpx;
+			}
+
+			.smallImg {
+				position: absolute;
+				top: 50%;
+				left: 50%;
+				transform: translate(-50%, -50%);
+				width: 116rpx;
+				height: 116rpx;
+				z-index: 1;
+			}
+		}
+
+		.contentBottom {
+			width: 650rpx;
+			height: 72rpx;
+			line-height: 72rpx;
+			text-align: center;
+			background: linear-gradient(270deg, #A890FE 0%, #FFAEAE 100%);
+			border-radius: 0px 0px 20rpx 20rpx;
+		}
+	}
+
+	.upload {
+		margin: 20rpx auto;
+		width: 690rpx;
+		// height: 652rpx;
+		padding: 24rpx 20rpx;
+		background: #FDFCFE;
+		box-shadow: 0px 0px 16rpx 0px rgba(0, 0, 0, 0.0400);
+		border-radius: 24rpx;
+		box-sizing: border-box;
+
+		.title {
+			font-weight: 500;
+			font-size: 30rpx;
+			color: #222222;
+
+			text {
+				color: #FF5B5B;
+			}
+		}
+	}
+
+	.form {
+		padding: 0 30rpx;
+		margin: 36rpx 30rpx 0;
+		background-color: #fff;
+		border-radius: 40rpx ;
+		background: #fff;
+
+		.item {
+			height: 94rpx;
+			line-height: 94rpx;
+			border-bottom: 2rpx solid #F5F5F5;
+
+			text {
+				font-size: 30rpx;
+				color: #222222;
+			}
+
+			input {
+				text-align: right;
+			}
+		}
+	}
+
+	.top {
+		position: relative;
+		padding-top: 44rpx;
+		text-align: center;
+		font-size: 36rpx;
+		font-weight: 600;
+
+		image {
+			width: 64rpx;
+			height: 64rpx;
+			position: absolute;
+			left: 30rpx;
+			
+		}
+	}
+</style>

pages/index/base1.vue

@@ -0,0 +1,447 @@
+<template>
+	<view class="" >
+		
+	
+	
+	<view  >
+		<image src="../../static/bg.png" mode="" class="bg"></image>
+		<view class="top">
+			<view class="" style="text-align: center;margin-top: 100rpx;">
+				您的账号已被禁用，请联系平台管理员
+			</view>
+		</view>
+		
+	
+		
+		
+	</view>
+	
+	
+	</view>
+</template>
+
+<script>
+	export default {
+		
+		onLoad() {
+				
+		},
+		onShow() {
+			
+				
+		},
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			reset(){
+					this.status=0
+			},
+			getInfo() {
+				uni.$u.http.post('/api/user/userinfo').then(res => {
+					if (res.code == 1) {
+						this.status=res.data.is_info
+					}
+				})
+			},
+			getCode(){
+			if (this.s == 60) {
+				if (!this.phone) {
+					uni.showToast({
+						title: "请输入手机号",
+						duration: 2000,
+						icon: "none",
+					});
+					return false;
+				}
+				      
+				uni.$u.http.post('/api/Sms/alsend',{phone:this.phone}).then((res) => {
+					uni.hideLoading()
+					uni.showToast({
+						title: res.msg,
+						duration: 2000,
+						icon: "none",
+					});
+					if (res.code == 1) {
+						this.time = setInterval(() => {
+							this.s--
+							this.count = `${this.s}s`
+							if (this.s <= 0) {
+								this.s = 60
+								this.count = '重新发送'
+								clearInterval(this.time)
+							}
+						}, 1000)
+					}
+				});
+				}
+			},
+			gorenzheng(){
+				if(!this.unit){
+					this.$u.toast('请输入单位名称')
+					return
+				}
+				if(!this.name){
+					this.$u.toast('请输入姓名')
+					return
+				}
+				if(!this.idcard){
+					this.$u.toast('请输入身份证号')
+					return
+				}
+				if(!this.age){
+					this.$u.toast('请输入年龄')
+					return
+				}
+				if(this.current==null){
+					this.$u.toast('请选择学历')
+					return
+				}
+				if(!this.phone){
+					this.$u.toast('请输入手机号')
+					return
+				}
+				if(!this.code){
+					this.$u.toast('请输入验证码')
+					return
+				}
+				// if(!this.uuid){
+				// 	this.$u.toast('请输入会员号')
+				// 	return
+				// }
+				// if(!this.workImg){
+				// 	this.$u.toast('上传单位证明')
+				// 	return
+				// }
+				// if(this.fileList1.length==0){
+				// 	this.$u.toast('上传个人照片')
+				// 	return
+				// }
+				
+				let data={
+					working:this.unit,
+					username:this.name,
+					ID_car:this.idcard,
+					age:this.age,
+					education:this.current,
+					phone:this.phone,
+					code:this.code,
+				}
+				uni.$u.http.post('/api/index/member_basic',data).then(res => {
+									if(res.code==1){
+										this.$u.toast(res.msg)
+										this.getInfo() 
+									}
+								})
+			},
+			uploadImg(){
+				var that=this
+				uni.chooseImage({
+					success: (chooseImageRes) => {
+						const tempFilePaths = chooseImageRes.tempFilePaths;
+						uni.uploadFile({
+							url: this.$url+'/api/Publics/uploadLocality', //仅为示例，非真实的接口地址
+							filePath: tempFilePaths[0],
+							name: 'file',
+							
+							success: (uploadFileRes) => {
+								that.workImg=JSON.parse(uploadFileRes.data).data.url
+							}
+						});
+					}
+				});
+			},
+
+			change(e) {
+				this.current = e.value[0]
+				// console.log(this.columns[0][this.current])
+				this.show = false
+			},
+			cancel() {
+				this.show = false
+			},
+			// 删除图片
+			deletePic(event) {
+				this[`fileList${event.name}`].splice(event.index, 1)
+			},
+			// 新增图片
+			async afterRead(event) {
+				// 当设置 mutiple 为 true 时, file 为数组格式，否则为对象格式
+				let lists = [].concat(event.file)
+				let fileListLen = this[`fileList${event.name}`].length
+				lists.map((item) => {
+					this[`fileList${event.name}`].push({
+						...item,
+						status: 'uploading',
+						message: '上传中'
+					})
+				})
+				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, {
+						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)
+						}
+					});
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	.btnlist{
+		width: 100%;
+	}
+	.btn1{
+		font-weight: 500;
+		color: #FFFFFF;
+		line-height: 50px;
+		background: linear-gradient(270deg, #A890FE 0%, #FFAEAE 100%);
+		-webkit-background-clip: text;
+		-webkit-text-fill-color: transparent;
+		width: 270rpx;
+		height: 88rpx;
+		line-height: 88rpx;
+		text-align: center;
+		font-size: 36rpx;
+		border-radius: 48rpx;
+		border: 4rpx solid #E6CDE6;
+		// border-image: linear-gradient(270deg, rgba(171, 145, 252, 1), rgba(251, 173, 177, 1)) 2 2;
+	}
+	.btn{
+		width: 270rpx;
+		height: 88rpx;
+		line-height: 88rpx;
+		text-align: center;
+		background: linear-gradient(270deg, #A890FE 0%, #FFAEAE 100%);
+		border-radius: 48rpx;
+		font-size: 36rpx;
+	}
+	.error{
+		padding-top: 96rpx;
+		padding-bottom: 94rpx;
+		margin: 56rpx auto 0;
+		width: 690rpx;
+		// height: 888rpx;
+		background: #FFFFFF;
+		border-radius: 40rpx;
+		font-size: 24rpx;
+		color: #222222;
+		image{
+			width: 140rpx;
+			height: 140rpx;
+		}
+		.reason{
+			padding: 24rpx 20rpx;
+			margin: 52rpx auto 64rpx;
+			width: 610rpx;
+			height: 200rpx;
+			background: #F4F4F4;
+			border-radius: 20rpx;
+		}
+	}
+	.success{
+		box-sizing: border-box;
+		padding: 0 40rpx;
+		height: auto;
+	}
+	.info{
+		padding: 40rpx 40rpx 0;
+		width: 100%;
+		margin-top: 80rpx;
+		border-top: 2rpx solid #F3F3F3;
+		.infoitem{
+			line-height: 100rpx;
+			width: 100%;
+			font-size: 30rpx;
+			color: #222222;
+		}
+	}
+	.btnlist{
+		margin-top: 30rpx;
+		width: 100%;
+	}
+	.btn1{
+		font-weight: 500;
+		color: #FFFFFF;
+		line-height: 50px;
+		background: linear-gradient(270deg, #A890FE 0%, #FFAEAE 100%);
+		-webkit-background-clip: text;
+		-webkit-text-fill-color: transparent;
+		width: 270rpx;
+		height: 88rpx;
+		line-height: 88rpx;
+		text-align: center;
+		font-size: 36rpx;
+		border-radius: 48rpx;
+		border: 4rpx solid #E6CDE6;
+		// border-image: linear-gradient(270deg, rgba(171, 145, 252, 1), rgba(251, 173, 177, 1)) 2 2;
+	}
+	.btn{
+		width: 270rpx;
+		height: 88rpx;
+		line-height: 88rpx;
+		text-align: center;
+		background: linear-gradient(270deg, #A890FE 0%, #FFAEAE 100%);
+		border-radius: 48rpx;
+		font-size: 36rpx;
+	}
+	.error{
+		padding-top: 96rpx;
+		padding-bottom: 94rpx;
+		margin: 56rpx auto 0;
+		width: 690rpx;
+		// height: 888rpx;
+		background: #FFFFFF;
+		border-radius: 40rpx;
+		font-size: 24rpx;
+		color: #222222;
+		image{
+			width: 140rpx;
+			height: 140rpx;
+		}
+		.reason{
+			padding: 24rpx 20rpx;
+			margin: 52rpx auto 64rpx;
+			width: 610rpx;
+			height: 200rpx;
+			background: #F4F4F4;
+			border-radius: 20rpx;
+		}
+	}
+	.lookvip {
+		font-weight: 500;
+		margin-top: 24rpx;
+		font-size: 24rpx;
+		color: #555555;
+		text-align: center;
+
+		text {
+			margin: 0 8rpx;
+		}
+	}
+
+	.uploadContent {
+		position: relative;
+		margin-top: 32rpx;
+		width: 650rpx;
+		height: 472rpx;
+		font-size: 28rpx;
+		color: #fff;
+		font-weight: 600;
+		background: #F3F4F6;
+		border-radius: 20rpx;
+
+		.contentTop {
+			height: 400rpx;
+			background-color: #F3F4F6;
+			position: relative;
+
+			.bigImg {
+				position: absolute;
+				top: 50%;
+				left: 50%;
+				transform: translate(-50%, -50%);
+				width: 510rpx;
+				height: 320rpx;
+			}
+
+			.smallImg {
+				position: absolute;
+				top: 50%;
+				left: 50%;
+				transform: translate(-50%, -50%);
+				width: 116rpx;
+				height: 116rpx;
+				z-index: 1;
+			}
+		}
+
+		.contentBottom {
+			width: 650rpx;
+			height: 72rpx;
+			line-height: 72rpx;
+			text-align: center;
+			background: linear-gradient(270deg, #A890FE 0%, #FFAEAE 100%);
+			border-radius: 0px 0px 20rpx 20rpx;
+		}
+	}
+
+	.upload {
+		margin: 20rpx auto;
+		width: 690rpx;
+		// height: 652rpx;
+		padding: 24rpx 20rpx;
+		background: #FDFCFE;
+		box-shadow: 0px 0px 16rpx 0px rgba(0, 0, 0, 0.0400);
+		border-radius: 24rpx;
+		box-sizing: border-box;
+
+		.title {
+			font-weight: 500;
+			font-size: 30rpx;
+			color: #222222;
+
+			text {
+				color: #FF5B5B;
+			}
+		}
+	}
+
+	.form {
+		padding: 0 30rpx;
+		margin: 36rpx 30rpx 0;
+		background-color: #fff;
+		border-radius: 40rpx ;
+		background: #fff;
+
+		.item {
+			height: 94rpx;
+			line-height: 94rpx;
+			border-bottom: 2rpx solid #F5F5F5;
+
+			text {
+				font-size: 30rpx;
+				color: #222222;
+			}
+
+			input {
+				text-align: right;
+			}
+		}
+	}
+
+	.top {
+		padding-top: 44rpx;
+		text-align: center;
+		font-size: 36rpx;
+		font-weight: 600;
+
+		image {
+			width: 102rpx;
+			height: 60rpx;
+		}
+	}
+</style>

pages/index/index.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="index">
-		<!-- <image src="../../static/bg.png" mode="" class="bg"></image> -->
+		<image src="../../static/bg.png" mode="" class="bg"></image>
 		<view class="top">
 			<image src="../../static/index/15@2x.png" mode=""></image>
 		</view>
@@ -41,7 +41,7 @@
 					</view>
 				</view>
 			</view>
-			<view class="videoModule">
+			<!-- <view class="videoModule">
 				<view class="videoTitle u-flex u-row-between">
 					<image src="../../static/index/12@2x.png" mode=""></image>
 					<view class="lookMore u-flex" @click="tolist">
@@ -59,10 +59,10 @@
 						</view>
 					</view>
 				</view>
-			</view>
+			</view> -->
 			<view class="videoModule">
 				<view class="videoTitle u-flex u-row-between">
-					<image src="../../static/index/13@2x.png" mode=""></image>
+					<image src="../../static/index/17.png" mode=""></image>
 					<view class="lookMore u-flex" @click="tomore">
 						<text>查看更多</text>
 						<u-icon name="arrow-right" color="#666666"></u-icon>
@@ -85,13 +85,21 @@
 				</view>
 			</view>
 		</view>
+		<Showtoast @canceltoast='canceltoast' :showtoast='showtoast' />
 	</view>
 </template>
 
 <script>
+	import Showtoast from '../../components/Showtoast.vue'
 	export default {
+		components: {
+			Showtoast
+		},
 		data() {
 			return {
+				is_login:false,
+				is_info: null,
+				showtoast: false,
 				info: {},
 				banner: [],
 				notice: {},
@@ -129,9 +137,9 @@
 						isWhite: false
 					},
 					{
-						img: '/static/index/8@2x.png',
-						name: '我要举报',
-						path: '/pages/index/indexjubao',
+						img: '/static/index/16@2x.png',
+						name: '喜上加喜',
+						path: '/pages/index/twoHappy',
 						isWhite: false
 					},
 					{
@@ -153,24 +161,44 @@
 			this.getInfo()
 			this.getNotice()
 			this.getBanner()
+			this.getArticle()
 			setTimeout(function() {
 				uni.stopPullDownRefresh();
 			}, 1000);
 		},
 		onLoad() {
-			this.getNotice()
+			
 			this.getBanner()
+			this.getArticle()
 		},
 		onShow() {
 			if (!uni.getStorageSync('token')) {
-				uni.reLaunch({
-					url: '../profile/login'
-				})
+				this.is_login=false
+				// uni.reLaunch({
+				// 	url: '../profile/login'
+				// })
 			} else {
+				this.is_login=true
+				this.getNotice()
 				this.getInfo()
 			}
 		},
 		methods: {
+			toLogin(){
+				if (!uni.getStorageSync('token')) {
+					uni.navigateTo({
+						url:'/pages/profile/login'
+					})
+				} 
+			},
+			canceltoast() {
+				this.showtoast = false
+			},
+			torenzheng() {
+				uni.switchTab({
+					url: '../auth/auth'
+				})
+			},
 			getBanner() {
 				uni.$u.http.post('/api/index/banner').then(res => {
 					if (res.code == 1) {
@@ -178,9 +206,28 @@
 					}
 				})
 			},
+			tozhuce() {
+				uni.navigateTo({
+					url: './base'
+				})
+			},
 			getInfo() {
 				uni.$u.http.post('/api/user/userinfo').then(res => {
 					if (res.code == 1) {
+						if (res.data.vip_level == 2) {
+							uni.reLaunch({
+								url: './base1'
+							})
+							return
+						}
+						this.is_info = res.data.is_info
+						uni.setStorageSync('is_info',res.data.is_info)
+						// if(res.data.is_info!=2){
+						// 	uni.reLaunch({
+						// 		url:'./base'
+						// 	})
+						// 	return
+						// }
 						this.info = res.data
 						uni.setStorageSync('userId', res.data.id)
 						uni.setStorageSync('userInfo', JSON.stringify(res.data))
@@ -188,6 +235,14 @@
 				})
 			},
 			torecommendinfo(item) {
+				if(!this.is_login){
+					this.toLogin()
+					return
+				}
+				if (this.is_info != 2) {
+					this.tozhuce()
+					return
+				}
 				uni.navigateTo({
 					url: '../profile/otherPage?id=' + item.id
 				})
@@ -202,15 +257,45 @@
 					this.notice = res.data.notice
 					this.video = res.data.video
 					this.member = res.data.member
-					this.article = res.data.article
+					// this.article = res.data.article
 				})
 			},
-			toinfo(item) {
-				uni.navigateTo({
-					url: './talkInfo?id=' + item.id
+			getArticle() {
+				uni.$u.http.post('/api/Index/articlelist', {
+					page: 1
+				}).then(res => {
+					this.article = res.data.data
 				})
 			},
+			toinfo(item) {
+				if(!this.is_login){
+					this.toLogin()
+					return
+				}
+				if (this.is_info != 2) {
+					this.tozhuce()
+					return
+				}
+				if (item.type == 1) {
+					uni.navigateTo({
+						url: './talkInfo?id=' + item.id
+					})
+				} else {
+					uni.navigateTo({
+						url: './videoInfo?id=' + item.id
+					})
+				}
+
+			},
 			tomore() {
+				if(!this.is_login){
+					this.toLogin()
+					return
+				}
+				if (this.is_info != 2) {
+					this.tozhuce()
+					return
+				}
 				uni.navigateTo({
 					url: './talkLove'
 				})
@@ -221,15 +306,23 @@
 				})
 			},
 			toitem(item) {
-
-				if (item.isWhite) {
+				if(!this.is_login){
+					this.toLogin()
+					return
+				}
+				if (this.is_info != 2) {
+					this.tozhuce()
+					return
+				}
+				if (item.isWhite || this.info.vip_level == 1) {
 					uni.navigateTo({
 						url: item.path
 					})
 				} else {
 					if (this.info.vip_level == 0) {
-						this.$u.toast('您暂未认证')
-						return
+						// this.$u.toast('您暂未认证')
+						// return
+						this.showtoast = true
 					}
 					if (this.info.vip_level == 2) {
 						this.$u.toast('经用户反馈，您账户存在违规行为，暂不支持使用该功能')
@@ -239,9 +332,9 @@
 						this.$u.toast('您的账户已注销，暂不支持使用该功能')
 						return
 					}
-					uni.navigateTo({
-						url: item.path
-					})
+					// uni.navigateTo({
+					// 	url: item.path
+					// })
 				}
 
 			}
@@ -302,7 +395,7 @@
 			width: 690rpx;
 
 			image {
-				width: 134rpx;
+				width: 166rpx;
 				height: 50rpx;
 			}
 

pages/index/pipei.vue

@@ -8,7 +8,8 @@
 			height: 120rpx;
 			background: #F1F1F1;
 			border-radius: 28rpx;margin: 24rpx 0;box-sizing: border-box;padding: 0 32rpx;" @click="showage=true">
-				<input type="text" :disabled="true" placeholder="你期望他的年龄" style="flex: 1;" v-model="age[0]+'-'+age[1]">
+				<input type="text" :disabled="true" placeholder="你期望ta的年龄" style="flex: 1;"
+					v-model="age.length==0?'':age[0]+'-'+age[1]">
 				<u-icon name="arrow-down"></u-icon>
 			</view>
 			<view class="" style="font-size: 32rpx;">
@@ -18,7 +19,7 @@
 					height: 120rpx;
 					background: #F1F1F1;
 					border-radius: 28rpx;margin: 24rpx 0;box-sizing: border-box;padding: 0 32rpx;" @click="showEducation=true">
-				<input type="text" :disabled="true" placeholder="你期望他的学历" style="flex: 1;" v-model="education">
+				<input type="text" :disabled="true" placeholder="你期望ta的学历" style="flex: 1;" v-model="education">
 				<u-icon name="arrow-down"></u-icon>
 			</view>
 			<view class="" style="font-size: 32rpx;">
@@ -27,89 +28,189 @@
 			<view class="u-flex" style="width: 630rpx;
 							height: 120rpx;
 							background: #F1F1F1;
-							border-radius: 28rpx;margin: 24rpx 0;box-sizing: border-box;padding: 0 32rpx;"  @click="showwork=true">
-				<input type="text" :disabled="true" placeholder="你期望他的工作性质" style="flex: 1;" v-model="work.name">
+							border-radius: 28rpx;margin: 24rpx 0;box-sizing: border-box;padding: 0 32rpx;" @click="showwork=true">
+				<input type="text" :disabled="true" placeholder="你期望ta的工作性质" style="flex: 1;" v-model="work.name">
 				<u-icon name="arrow-down"></u-icon>
 			</view>
-			<image src="../../static/index/start.png" mode=""
-				style="position: fixed;bottom: 184rpx;left: 50%;transform: translateX(-50%);width: 296rpx;height: 296rpx;" @click="start">
-			</image>
+			<view class="" style="font-size: 32rpx;">
+				身高
+			</view>
+			<view class="u-flex" style="width: 630rpx;
+			height: 120rpx;
+			background: #F1F1F1;
+			border-radius: 28rpx;margin: 24rpx 0;box-sizing: border-box;padding: 0 32rpx;" @click="showheight=true">
+				<input type="text" :disabled="true" placeholder="你期望ta的身高范围" style="flex: 1;"
+					v-model="height.length==0?'':height[0]+'-'+height[1]">
+				<u-icon name="arrow-down"></u-icon>
+			</view>
+			<view class="" style="font-size: 32rpx;">
+				月收入
+			</view>
+			<view class="u-flex" style="width: 630rpx;
+			height: 120rpx;
+			background: #F1F1F1;
+			border-radius: 28rpx;margin: 24rpx 0;box-sizing: border-box;padding: 0 32rpx;" @click="showmoney=true">
+				<input type="text" :disabled="true" placeholder="你期望ta的月收入" style="flex: 1;"
+					v-model="money.length==0?'':money[0]+'-'+money[1]">
+				<u-icon name="arrow-down"></u-icon>
+			</view>
+			<view class="" style="font-size: 32rpx;">
+				现住地
+			</view>
+			<view class="u-flex" style="width: 630rpx;
+			height: 120rpx;
+			background: #F1F1F1;
+			border-radius: 28rpx;margin: 24rpx 0;box-sizing: border-box;padding: 0 32rpx;" @click="showaddress=true">
+				<input type="text" :disabled="true" placeholder="你期望ta的现住地" style="flex: 1;"
+					v-model="address.length==0?'':address[0].name+'-'+address[1].name">
+				<u-icon name="arrow-down"></u-icon>
+			</view>
+
+			<view class="publish select" @click="start">
+				<!-- <image src="../../static/forum/publish.png" mode=""></image> -->
+				开始匹配
+			</view>
 		</view>
-		<u-picker :show="showage" @cancel='showage=false' title="年龄" ref="uPicker" :columns="columns" @confirm="confirm" @change="changeHandler">
+		<u-picker :show="showage" @cancel='showage=false' title="年龄" ref="uPicker" :columns="columns" @confirm="confirm"
+			@change="changeHandler">
+		</u-picker>
+		<u-picker :show="showheight" @cancel='showheight=false' title="身高" ref="uPicker" :columns="heightcolumns"
+			@confirm="heightconfirm">
 		</u-picker>
-		<u-picker :show="showEducation" @cancel='showEducation=false' title="学历" ref="uPicker" :columns="columns2" @confirm="confirmEducation">
+		<u-picker :show="showmoney" @cancel='showmoney=false' title="月收入" ref="uPicker" :columns="moneycolumns"
+			@confirm="moneyconfirm">
 		</u-picker>
-		<u-picker :show="showwork" @cancel='showwork=false' title="工作性质" @confirm='confirmWork' keyName="name"  :columns="columns1"></u-picker>
+		<u-picker :show="showaddress" @cancel='showaddress=false' keyName="name" title="居住地" ref="uPicker"
+			:columns="addresscolumns" @confirm="addressconfirm">
+		</u-picker>
+		<u-picker :show="showEducation" @cancel='showEducation=false' title="学历" ref="uPicker" :columns="columns2"
+			@confirm="confirmEducation">
+		</u-picker>
+		<u-picker :show="showwork" @cancel='showwork=false' title="工作性质" @confirm='confirmWork' keyName="name"
+			:columns="columns1"></u-picker>
 	</view>
 </template>
 
 <script>
 	export default {
 		onLoad() {
-				this.getWork()
-				var list=this.columns[0] 
-				var list1=this.columns[1] 
-				for( let i=1;i<66;i++){
-					if(list[list.length-1]<65){
-						list.push(list[0]+i)
-						list1.push(list1[0]+i)
-					}
+			this.getAddress()
+			this.getWork()
+			var list = this.columns[0]
+			var list1 = this.columns[1]
+			for (let i = 1; i < 66; i++) {
+				if (list[list.length - 1] < 65) {
+					list.push(list[0] + i)
+					list1.push(list1[0] + i)
 				}
-				
-				
+			}
+			for (let i = 159; i < 200; i++) {
+				this.heightcolumns[0].push(i + 'cm')
+				this.heightcolumns[1].push(i + 'cm')
+			}
+
+
 		},
 		data() {
 			return {
-				work:{},
-				age:[18,36],
-				showEducation:false,
+				showaddress: false,
+				showmoney: false,
+				showheight: false,
+				work: {},
+				address: [],
+				age: [],
+				money: [],
+				height: [],
+				showEducation: false,
 				showage: false,
-				showwork:false,
-				education:'',
-				columns1:[],
+				showwork: false,
+				education: '',
+				columns1: [],
 				columns: [
 					[18],
 					[18]
 				],
-				columns2:[['高中','大专','本科','硕士','博士']]
-				
+				heightcolumns: [
+					['不限'],
+					['不限']
+				],
+				addresscolumns: [
+					[{"id": 1,
+						"name": "临沂市"}
+					],
+					[]
+				],
+				moneycolumns: [
+					['不限', '3000元', '5000元', '7000元', '9000元', '11000元', '13000元', '15000元', '17000元', '20000元'],
+					['不限', '3000元', '5000元', '7000元', '9000元', '11000元', '13000元', '15000元', '17000元', '20000元'],
+				],
+				columns2: [
+					['高中', '大专', '本科', '硕士', '博士']
+				]
+
 			}
 		},
 		methods: {
-			confirmEducation(e){
-				this.education=e.value[0]
-				this.showEducation=false
+			confirmEducation(e) {
+				this.education = e.value[0]
+				this.showEducation = false
 			},
-			confirmWork(e){
-				this.work=e.value[0]
-				this.showwork=false
+			confirmWork(e) {
+				this.work = e.value[0]
+				this.showwork = false
 			},
-			getWork(){
+			getWork() {
 				uni.$u.http.post('/api/index/WorkNature').then(res => {
-				this.columns1=[res.data]
+					this.columns1 = [res.data]
+				})
+			},
+			getAddress() {
+				uni.$u.http.post('/api/index/linyi').then(res => {
+					this.addresscolumns[1] = res.data
 				})
 			},
-			start(){
-				if(!this.education){
+			start() {
+				if (this.age.length == 0) {
+					this.$u.toast('请选择年龄')
+					return
+				}
+				if (!this.education) {
 					this.$u.toast('请选择学历')
 					return
 				}
-				if(Object.keys(this.work).length==0){
+				if (Object.keys(this.work).length == 0) {
 					this.$u.toast('请选择工作性质')
 					return
 				}
-				var data={
-					age_min:this.age[0],
-					age_max:this.age[1],
-					nature:this.work.id,
-					education:this.education,
+				if (this.height.length==0) {
+					this.$u.toast('请选择身高')
+					return
 				}
-					uni.navigateTo({
-						url:'./pipeizhong?info='+JSON.stringify(data)
-					})
+				if (this.money.length==0) {
+					this.$u.toast('请选择月收入')
+					return
+				}
+				if (this.address.length==0) {
+					this.$u.toast('请选择现住地')
+					return
+				}
+				var data = {
+					age_min: this.age[0],
+					age_max: this.age[1],
+					nature: this.work.id,
+					education: this.education,
+					height_min:this.height[0],
+					height_max:this.height[1],
+					income_min:this.money[0],
+					income_max:this.money[1],
+					area_id:this.address[1].id,
+				}
+				uni.navigateTo({
+					url: './pipeizhong?info=' + JSON.stringify(data)
+				})
 			},
 			changeHandler(e) {
-				console.log(11,e)
+				console.log(11, e)
 				const {
 					columnIndex,
 					value,
@@ -120,29 +221,66 @@
 				} = e
 				// 当第一列值发生变化时，变化第二列(后一列)对应的选项
 				if (columnIndex === 0) {
-					this.columns[1]=[...this.columns[0]]
-					
-					console.log(123,this.columns[1])
+					this.columns[1] = [...this.columns[0]]
+
+					console.log(123, this.columns[1])
 					// picker为选择器this实例，变化第二列对应的选项
 					// picker.setColumnValues(1, this.columnData[index])
-					this.columns[1].splice(0,index)
-					this.$set(this.columns,1,this.columns[1])
-					
-					console.log(456,this.columns[1])
-					
+					this.columns[1].splice(0, index)
+					this.$set(this.columns, 1, this.columns[1])
+
+					console.log(456, this.columns[1])
+
 				}
 			},
 			// 回调参数为包含columnIndex、value、values
 			confirm(e) {
-				this.age=e.value
+				this.age = e.value
 				this.showage = false
-			}
+			},
+			heightconfirm(e) {
+				this.height = e.value
+				this.showheight = false
+			},
+			moneyconfirm(e) {
+				this.money = e.value
+				this.showmoney = false
+			},
+			addressconfirm(e){
+				console.log(e)
+				this.address = e.value
+				this.showaddress = false
+			},
+
 		}
 	}
 </script>
 
-<style>
+<style lang="scss">
 	page {
 		padding: 40rpx 60rpx;
 	}
+
+	.publish {
+
+		width: 630rpx;
+		height: 104rpx;
+		line-height: 104rpx;
+		text-align: center;
+		background: #D8D8D8;
+		border-radius: 52rpx;
+		font-size: 36rpx;
+		color: #fff;
+
+		image {
+			width: 64rpx;
+			height: 64rpx;
+			margin-bottom: 5rpx;
+			vertical-align: middle;
+		}
+	}
+
+	.select {
+		background: linear-gradient(270deg, #A890FE 0%, #FFAEAE 100%);
+	}
 </style>

pages/index/pipeizhong.vue

@@ -25,7 +25,7 @@
 					</view>
 				</view>
 			</view>
-		</view>
+		</view> 
 	</view>
 </template>
 

pages/index/registerVip.vue

@@ -13,20 +13,23 @@
 				筛选 <u-icon name="hourglass"  size="20" color="#000"></u-icon>
 			</view>
 		</view>
-		<view class="" style="background-color: #fff;width: 690rpx;margin:0 30rpx 20rpx;border-radius: 40rpx;" v-for="(item,index) in list" :key="index" @click="toinfo(item)">
+		<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: 40rpx;position: relative;" v-for="(item,index) in list" :key="index" @click="toinfo(item)">
 			<view class="">
-				<image :src="item.headimg" mode="" style="width: 690rpx;
-				height: 640rpx;
-				border-radius: 40rpx;"></image>
+				<image :src="item.headimg" mode="" style="width: 336rpx;
+				height: 336rpx;
+				border-radius: 20rpx;"></image>
 			</view>
-	<view class="" style="font-size: 40rpx;padding: 20rpx;">
-		{{item.nickname}} <image src="../../static/index/2@2x.png" mode="" style="width: 36rpx;height: 36rpx;margin:0 20rpx" v-show="item.sex==1"></image> <image src="../../static/profile/8@2x.png" mode="" style="width: 104rpx;height: 36rpx;"  v-show="item.sex==2"></image>
+	<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>
-	<view class="u-flex u-row-between"  style="font-size: 28rpx;padding: 20rpx;color: #888888;">
+	<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: 190rpx;height: 68rpx;vertical-align: middle;" @click.stop="tomessage(item)"></image>
+		<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>
 		</view>
+		</view>
 		<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">
@@ -68,11 +71,16 @@ border-radius: 42rpx;font-size: 36rpx;color: #fff;line-height: 84rpx;text-align:
 				   </view>
 				</view>
 			</u-popup>
+			<Showtoast @canceltoast='canceltoast' :showtoast='showtoast' />
 	</view>
 </template>
 
 <script>
+	import Showtoast from'../../components/Showtoast.vue'
 	export default {
+		components:{
+			Showtoast
+		},
 		onLoad() {
 			var list=this.columns[0]
 			var list1=this.columns[1] 
@@ -88,6 +96,7 @@ border-radius: 42rpx;font-size: 36rpx;color: #fff;line-height: 84rpx;text-align:
 		},
 		data() {
 			return {
+				showtoast:false,
 				columns1:[],
 				columns: [
 					[18],
@@ -116,6 +125,9 @@ border-radius: 42rpx;font-size: 36rpx;color: #fff;line-height: 84rpx;text-align:
 			this.getList()
 		},
 		methods: {
+			canceltoast(){
+					this.showtoast=false
+			},
 			submit(){
 				var arr=this.educationList.filter(item=>{
 					return item.isSelect==true
@@ -213,7 +225,7 @@ border-radius: 42rpx;font-size: 36rpx;color: #fff;line-height: 84rpx;text-align:
 			},
 			tomessage(item){
 				if(this.info.vip_level==0){
-					this.$u.toast('您暂未认证')
+					this.showtoast=true
 					return
 				}
 				if(this.info.vip_level==2){
@@ -229,6 +241,18 @@ border-radius: 42rpx;font-size: 36rpx;color: #fff;line-height: 84rpx;text-align:
 				})
 			},
 			toinfo(item){
+				if(this.info.vip_level==0){
+					this.showtoast=true
+					return
+				}
+				if(this.info.vip_level==2){
+					this.$u.toast('经用户反馈，您账户存在违规行为，暂不支持使用该功能')
+					return
+				}
+				if(this.info.vip_level==3){
+									this.$u.toast('您的账户已注销，暂不支持使用该功能')
+									return
+								}
 				uni.navigateTo({
 					url:'../profile/otherPage?id='+item.id
 				})

pages/index/renzhengVip.vue

@@ -13,20 +13,22 @@
 				筛选 <u-icon name="hourglass"  size="20" color="#000"></u-icon>
 			</view>
 		</view>
-		<view class="" style="background-color: #fff;width: 690rpx;margin: 0 auto 20rpx;border-radius: 40rpx;" v-for="(item,index) in list" :key="index" @click="toinfo(item)">
+		<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="">
-				<image :src="item.headimg" mode="" style="width: 690rpx;
-				height: 640rpx;
-				border-radius: 40rpx;"></image>
+				<image :src="item.headimg" mode="" style="width: 336rpx;
+				height: 336rpx;
+				border-radius: 20rpx;"></image>
 			</view>
-	<view class="" style="font-size: 40rpx;padding: 20rpx;">
-		{{item.nickname}} <image src="../../static/index/2@2x.png" mode="" style="width: 36rpx;height: 36rpx;margin:0 20rpx" v-show="item.sex==1"></image> <image src="../../static/index/1@2x.png" mode="" style="width: 36rpx;height: 36rpx;margin:0 20rpx"  v-show="item.sex==2"></image>
+	<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>
-	<view class="u-flex u-row-between"  style="font-size: 28rpx;padding: 20rpx;color: #888888;">
+	<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: 190rpx;height: 68rpx;vertical-align: middle;" @click.stop="tomessage(item)"></image>
+		<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>
 		</view>
+		</view>
 		<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">
@@ -68,12 +70,18 @@
 						   </view>
 						</view>
 					</u-popup>
+					<Showtoast @canceltoast='canceltoast' :showtoast='showtoast' />
 			</view>
+			
 	</view>
 </template>
 
 <script>
+	import Showtoast from'../../components/Showtoast.vue'
 	export default {
+		components:{
+			Showtoast
+		},
 		onLoad() {
 			var list=this.columns[0]
 			var list1=this.columns[1] 
@@ -89,6 +97,7 @@
 		},
 		data() {
 			return {
+				showtoast:false,
 				columns1:[],
 				columns: [
 					[18],
@@ -116,6 +125,9 @@
 			this.getList()
 		},
 		methods: {
+			canceltoast(){
+					this.showtoast=false
+			},
 			submit(){
 				var arr=this.educationList.filter(item=>{
 					return item.isSelect==true
@@ -213,7 +225,7 @@
 			},
 			tomessage(item){
 				if(this.info.vip_level==0){
-					this.$u.toast('您暂未认证')
+					this.showtoast=true
 					return
 				}
 				if(this.info.vip_level==2){
@@ -229,6 +241,18 @@
 				})
 			},
 			toinfo(item){
+				if(this.info.vip_level==0){
+					this.showtoast=true
+					return
+				}
+				if(this.info.vip_level==2){
+					this.$u.toast('经用户反馈，您账户存在违规行为，暂不支持使用该功能')
+					return
+				}
+				if(this.info.vip_level==3){
+									this.$u.toast('您的账户已注销，暂不支持使用该功能')
+									return
+								}
 				uni.navigateTo({
 					url:'../profile/otherPage?id='+item.id
 				})

pages/index/talkLove.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class="" style="padding: 20rpx 30rpx;">
-			<u--input
+			<u-input
 			    placeholder="输入关键词查询"
 			    border="surround"
 			    v-model="value"
@@ -12,7 +12,7 @@
 				shape="circle"
 				prefixIcon="search"
 					    prefixIconStyle="font-size: 22px;color: #909399"
-			  ></u--input>
+			  ></u-input>
 		</view>
 	<!-- 	<u-tabs :current='current' :scrollable='false' lineColor='#A890FE' itemStyle="width: 125px;padding-bottom:10px" :activeStyle="{
 		    color: '#303133',
@@ -24,7 +24,7 @@
 				<image :src="item.show_image" mode=""></image>
 				<view class="talkRight">
 					<view class="talkTitle">
-						{{item.subtitle}}
+						{{item.title}}
 					</view>
 					<view class="talkInfo u-flex  u-row-between">
 						<!-- <text>小小小柚子</text> -->
@@ -66,14 +66,20 @@
 				if(this.page==1){
 					this.article=res.data.data
 				}else{
-					this.article=[...this.video,...res.data.data]
+					this.article=[...this.article,...res.data.data]
 				}
 				})
 			},
 			toinfo(item){
-					uni.navigateTo({
-						url:'./talkInfo?id='+item.id
-					})
+					if(item.type==1){
+						uni.navigateTo({
+							url: './talkInfo?id=' + item.id
+						})
+					}else{
+						uni.navigateTo({
+							url: './videoInfo?id=' + item.id
+						})
+					}
 			},
 			change1(e){
 				if(this.current!=e.index){

pages/index/twoHappy.vue

@@ -0,0 +1,91 @@
+<template>
+	<view>
+		<view class="list u-flex u-row-between">
+			<view class="item" v-for="(item,index) in list" :key="index" @click="toinfo(item)">
+				<view class="img">
+					<image :src="item.show_image" mode=""></image>
+				</view>
+				<view class="title">
+					{{item.title}}
+				</view>
+				<view class="content">
+					{{item.subheading}}
+			    </view>
+		    </view>
+	</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				list:[],
+				page:1 
+			}
+		},
+		onReachBottom() {
+			this.page++
+			this.getList()
+		},
+		onLoad() {
+				this.getList()
+		},
+		methods: {
+			getList(){
+				uni.$u.http.post('/api/index/business',{page:this.page}).then(res => {
+					this.list=[...this.list,...res.data.data]
+				})
+			},
+			toinfo(item){
+				
+				uni.setStorageSync('item',item)
+				uni.navigateTo({
+					url:'./twoHappyInfo'
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+page{
+	background-color: #F3F3F3;
+	padding: 20rpx 0;
+}
+.list{
+	margin: 0 30rpx;
+	flex-wrap: wrap;
+	
+	.item{
+		width: 336rpx;
+		margin-bottom: 20rpx;
+		background-color: #fff;
+		padding-bottom: 20rpx;
+		border-radius: 16rpx;
+		overflow: hidden;
+		.img{
+			image{
+				width: 336rpx;
+				height: 336rpx;
+				border-radius: 16rpx 16rpx 0px 0px;
+			}
+		}
+		.title{
+			margin-bottom: 8rpx;
+			margin-left: 12rpx;
+			font-size: 32rpx;
+			color: #000;
+			font-weight: 600;
+		}
+		.content{
+			margin-left: 12rpx;
+			font-size: 22rpx;
+			color: #888888;
+			overflow: hidden;
+			white-space: nowrap;
+			text-overflow: ellipsis;
+		}
+	}
+}
+</style>

pages/index/twoHappyInfo.vue

@@ -0,0 +1,70 @@
+<template>
+	<view >
+		<image src="../../static/bg.png" mode="" class="bg" ></image>
+		<view class="" style="margin-left: 30rpx;padding-top: 44rpx;">
+			<image src="../../static/index/goback.png" mode="" style="width: 64rpx;height: 64rpx;" @click="goback"></image>
+		</view>
+		<view class="content">
+			<image :src="item.show_image" mode="" class="avr"></image>
+			<view class="title">
+				{{item.title}}
+			</view>
+			<view class="intro">
+				商家介绍
+			</view>
+			<view class="" v-html="item.content">
+				
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		onLoad(e) {
+			console.log(e.item)
+			this.item=uni.getStorageSync('item')
+		},
+		data() {
+			return {
+				item:{}
+			}
+		},
+		methods: {
+			goback(){
+				uni.navigateBack()
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+.content{
+	position: relative;
+	box-sizing: border-box;
+	padding: 20rpx;
+	margin: 80rpx auto 0;
+	width: 690rpx;
+	min-height: 800rpx;
+	background: #FFFFFF;
+	border-radius: 20rpx;
+	.avr{
+		position: absolute;
+		top: -44rpx;
+		left: 28rpx;
+		width: 132rpx;
+		height: 132rpx;
+		border-radius: 16rpx;
+	}
+	.title{
+		font-size: 36rpx;
+		font-weight: 600;
+		text-align: center;
+	}
+	.intro{
+		margin: 44rpx 0 20rpx;
+		font-size: 32rpx;
+		font-weight: 600;
+	}
+}
+</style>

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_url" style="width: 750rpx;height: 440rpx;" :controls="true" ></video>
+			<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}}
@@ -15,7 +15,7 @@
 <script>
 	export default {
 		onLoad(option) {
-			this.info=JSON.parse(option.item)
+			this.getinfo(option.id)
 		},
 		data() {
 			return {
@@ -23,6 +23,11 @@
 			}
 		},
 		methods: {
+			getinfo(id){
+				uni.$u.http.post('/api/index/articlederail',{id:id}).then(res => {
+				this.info=res.data
+				})
+			},
 			back(){
 				uni.navigateBack({
 					

pages/profile/fankuiList.vue

@@ -2,26 +2,28 @@
 	<view>
 		<view class="item" v-for="(item,index) in list" :key="index">
 			<view class="u-flex u-row-between data">
-				<text style="color: #6C6C6C;">2022-09-23 12:23:28</text>
-				<text class="yihui" style="background: #E2F5E1;color: #63C863;">已回复</text>
-				<!-- <text class="yihui" style="background: #F9E3E5;color: #FF2F2F;">待回复</text> -->
+				<text style="color: #6C6C6C;">{{item.create_at}}</text>
+				<text class="yihui" style="background: #E2F5E1;color: #63C863;" v-if="item.status==2">已回复</text>
+				<text class="yihui" style="background: #F9E3E5;color: #FF2F2F;" v-else>待回复</text>
 			</view>
 			<view class="content">
 				<view class="content_text">
-					我和对象到了谈婚论嫁的地步，但是因为彩礼谈崩了分手，之前我也找了其他的，都是我在学习后没太大作用，当时也没抱太大希望，就试试看的态度，是肖老师给了我很足的信心，最终也是她这边帮我挽回的。
+					{{item.content}}
 				</view>
-				<view class="content_img">
-					<image src="../../static/test.png" mode="" class="item_img"></image>
-					<image src="../../static/test.png" mode="" class="item_img"></image>
-					<image src="../../static/test.png" mode="" class="item_img"></image>
-					<image src="../../static/test.png" mode="" class="item_img"></image>
+				<view class="content_img" v-if="item.show_images.length!=0">
+					<image :src="item" mode="" class="item_img" v-for="(item,index) in item.show_images" :key="index"></image>
+					
 				</view>
 				
 			</view>
-			<view class="huifu">
-				<view class="info">
-					您反馈的问题我们已经收到了，请耐心等待我
-				</view>
+			<view class="huifu" v-if="item.huifu">
+				<u-read-more showHeight="50" :shadowStyle="shadowStyle" closeText="展开">
+				   <view class="info">
+				   	{{item.huifu}}
+				   	
+				   </view>
+				</u-read-more>
+				
 			</view>
 		</view>
 		<u-empty
@@ -30,7 +32,7 @@
 		        icon="http://cdn.uviewui.com/uview/empty/list.png"
 		>
 		</u-empty>
-		<view class="submit u-flex u-row-center">
+		<view class="submit u-flex u-row-center" @click="toinfo"> 
 			<image src="../../static/profile/fankui.png" mode="" style="width: 40rpx;height: 40rpx;margin-right: 14rpx;"></image>
 			<text>立即反馈</text>
 		</view>
@@ -39,13 +41,36 @@
 
 <script>
 	export default {
+		onShow() {
+			this.list=[]
+		this.getList()	
+		},
+		onReachBottom() {
+				this.page++
+				this.getList()	
+		},
 		data() {
 			return {
-				list:[]
+				shadowStyle: {
+									backgroundImage: "none",
+									paddingTop: "0",
+									marginTop: "20rpx"
+								},
+				list:[],
+				page:1
 			}
 		},
 		methods: {
-			
+			toinfo(){
+			uni.navigateTo({
+				url:'./fankuiinfo'
+			})	
+			},
+			getList(){
+				uni.$u.http.post('/api/user/feedback_list',{page:this.page}).then(res => {
+					this.list=[...this.list,...res.data]
+				})
+			}
 		}
 	}
 </script>
@@ -58,6 +83,7 @@ page{
 </style>
 <style lang="scss" scoped>
 	.item{
+		margin-bottom: 20rpx;
 		font-size: 24rpx;
 		color: #333;
 		padding: 20rpx;

pages/profile/fankuiinfo.vue

@@ -0,0 +1,183 @@
+<template>
+	<view>
+		<view class="textBox">
+			<textarea name="" style="width: 690rpx;
+min-height: 268rpx;
+background: #FFFFFF;
+border-radius: 20px;margin: 0 auto 20rpx;padding: 20rpx;box-sizing: border-box;" v-model="content" maxlength="100" id="" cols="30" rows="10" placeholder="请输入您的反馈内容～"></textarea>
+			<view class="" style="width: 690rpx;
+min-height: 340rpx;
+background: #FFFFFF;
+border-radius: 20rpx;margin: 0 auto 20rpx;padding: 20rpx;box-sizing: border-box;">
+				<view class="" style="font-size: 28rpx;color: #6C6C6C;margin-bottom: 32rpx;">
+					请提供问题截图或者照片（选填）
+				</view>
+				<view class="upload">
+								<u-upload :fileList="fileList1" :accept="accept" @afterRead="afterRead" @delete="deletePic" name="1" :multiple='false'
+									:maxCount="num">
+									<image src="../../static/forum/add.png" 
+										mode="widthFix" style="width: 160rpx;height:160rpx;"></image>
+									</u-upload>
+							</view>
+			</view>
+		</view>
+		<!-- <view class="publish">
+			<image src="../../static/forum/publish.png" mode=""></image>
+			发布动态
+		</view> -->
+		<view class="u-flex" style="width: 690rpx;
+height: 88rpx;
+background: #FFFFFF;
+border-radius: 20rpx;margin: 0 auto;padding: 20rpx;box-sizing: border-box;">
+			<text style="margin-right: 32rpx;">联系方式</text>
+			<input type="number" v-model="phone" placeholder="请输入您的联系方式">
+		</view>
+		<view class="publish select"  @click="publish">
+			<!-- <image src="../../static/forum/publish.png" mode=""></image> -->
+			提交
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		onLoad(option) {
+			if(option.item){
+				this.item=JSON.parse(option.item)
+				if(this.item.show_images.length!=0){
+					this.item.show_images.forEach(it=>{
+						this.fileList1.push({url:it})
+					})
+				}
+				
+				this.content=this.item.content
+				if(this.item.suffix=='mp4'){
+					this.num=1
+				}else{
+					this.accept='image'
+				}
+			}
+		},
+		data() {
+			return {
+				phone:'',
+				item:'',
+				fileList1:[],
+				content:'',
+				num:9,
+				accept:'media'
+			}
+		},
+		methods: {
+			publish(){
+				if(!this.content){
+					this.$u.toast('请输入您的反馈内容～')
+					return
+				}
+				if(!this.phone){
+					this.$u.toast('请输入您的联系电话～')
+					return
+				}else{
+					var arr=[]
+					this.fileList1.forEach(item=>{
+						arr.push(item.url)
+					})
+						uni.$u.http.post('/api/user/feedback',{show_images:arr.toString(),content:this.content,phone:this.phone}).then(res => {
+							if(res.code==1){
+								this.$u.toast(res.msg)
+								this.content=''
+								this.fileList1=[]
+								this.phone=''
+							}
+						})
+					
+				}
+			},
+			// 删除图片
+						deletePic(event) {
+							this[`fileList${event.name}`].splice(event.index, 1)
+						},
+						// 新增图片
+						async afterRead(event) {
+							console.log(event)
+							// 当设置 mutiple 为 true 时, file 为数组格式，否则为对象格式
+							if(event.file.type&&event.file.type=='video'){
+								this.num=1
+							}else{
+								this.accept='image'
+							}
+							let lists = [].concat(event.file)
+							let fileListLen = this[`fileList${event.name}`].length
+							lists.map((item) => {
+								this[`fileList${event.name}`].push({
+									...item,
+									status: 'uploading',
+									message: '上传中'
+								})
+							})
+							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, {
+									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',
+									success: (res) => {
+										setTimeout(() => {
+											resolve(JSON.parse(res.data).data.url)
+										}, 1000)
+									}
+								});
+							})
+						},
+		}
+	}
+</script>
+
+<style lang="scss">
+	page{
+		background-color: #F3F3F3;
+		padding-top: 20rpx;
+	}
+.textBox{
+	padding: 0 20rpx;
+	textarea{
+		width: 100%;
+		height: 200rpx;
+	}
+}
+.publish{
+	position: fixed;
+	bottom: 84rpx;
+	left: 50rpx;
+	right: 50rpx;
+	margin: 0 auto;
+	width: 650rpx;
+	height: 104rpx;
+	line-height: 104rpx;
+	text-align: center;
+	background: #D8D8D8;
+	border-radius: 52rpx;
+	font-size: 36rpx;
+	color: #fff;
+	image{
+		width: 64rpx;
+		height: 64rpx;
+		margin-bottom: 5rpx;
+		vertical-align: middle;
+	}
+}
+.select{
+	background: linear-gradient(270deg, #A890FE 0%, #FFAEAE 100%);
+}
+</style>

pages/profile/login.vue

@@ -1,5 +1,9 @@
 <template>
 	<view>
+		<view class="top">
+			
+			<image src="../../static/index/goback.png" mode="" @click="goback"></image>
+		</view>
 		<image src="../../static/bg.png" mode="" class="bg"></image>
 		<!-- <button   @click="getUserProfile">登录</button> -->
 		<view class="" style="margin: 72rpx auto 40rpx;width: 610rpx;padding-top: 300rpx;">
@@ -19,6 +23,20 @@
 			}
 		},
 		methods: {
+			goback(){
+				console.log(getCurrentPages())
+				let pages=getCurrentPages()
+				if(pages[pages.length-2].route='pages/auth/auth'){
+					uni.switchTab({
+						url:'../index/index'
+					})
+				}else{
+					uni.navigateBack({
+						
+					})
+				}
+					
+			},
 			gologin(){
 							uni.login({
 								provider: 'weixin',
@@ -44,16 +62,28 @@
 							success(re) {
 								uni.$u.http.post('/api/login/wechat_login',{code:re.code,rawData:resp.rawData}).then(res => {
 									uni.setStorageSync('token',res.data.token)
-									if(res.data.vip_level==1){
-										uni.switchTab({
-											url:'../index/index'
-										})
-									}else{
-										uni.switchTab({
-											url:'../auth/auth'
+									if(res.code==1){
+										uni.$u.http.post('/api/user/userinfo').then(re => {
+											if (re.code == 1) {
+												console.log(re.data.is_info)
+												uni.switchTab({
+													url:'../index/index'
+												})
+												// if(re.data.is_info==1){
+												// 	uni.switchTab({
+												// 		url:'../index/index'
+												// 	})
+												// }else{
+												// 	uni.navigateTo({
+												// 		url:'../index/base'
+												// 	})
+												// }
+												
+											}
 										})
 									}
 									
+									
 								})
 								
 							}
@@ -65,8 +95,23 @@
 	}
 </script>
 
-<style>
+<style lang="scss">
 page{
 	
 }
+.top {
+		position: relative;
+		padding-top: 44rpx;
+		text-align: center;
+		font-size: 36rpx;
+		font-weight: 600;
+
+		image {
+			width: 64rpx;
+			height: 64rpx;
+			position: absolute;
+			left: 30rpx;
+			
+		}
+	}
 </style>

pages/profile/myPage.vue

@@ -122,6 +122,12 @@
 							 <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">
@@ -250,7 +256,8 @@ export default {
 		  let data2={
 			  working:this.info.working,
 			  nature:this.info.nature,
-			  position:this.info.position
+			  position:this.info.position,
+			  income:this.info.income
 		  }
 		  let data3={
 		  			  is_du:this.info.is_du,

pages/profile/otherPage.vue

@@ -115,6 +115,12 @@
 				   	     	<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">

pages/profile/profile.vue

@@ -5,11 +5,11 @@
 			<view class="u-flex leftBox">
 				<image :src="info.headimg" mode="" class="avatar"></image>
 				<view class="">
-					<view class="name">
-						{{info.nickname}} <image src="../../static/profile/8@2x.png" mode="" v-show="info.vip_level==0"></image>
+					<view class="name" @click="toLogin">
+						{{is_login?info.nickname:'点击登录'}} <image src="../../static/profile/8@2x.png" mode="" v-show="info.vip_level==0"></image>
 					</view>
 					<view class="info" >
-						资料完成度{{info.progress}}% <text class="wanshan" v-show="info.progress!=100" @click="toPage">去完善></text>
+						资料完成度{{info.progress||0}}% <text class="wanshan" v-show="info.progress!=100" @click="toPage">去完善></text>
 					</view>
 					<template>
 						<u-line-progress :percentage="info.progress" :showText="false" activeColor="#A890FE" height="8"></u-line-progress>
@@ -91,15 +91,23 @@
 				<u-icon name="arrow-right"></u-icon>
 			</view>
 		</view>
+		<Showtoast @canceltoast='canceltoast' :showtoast='showtoast' />
 	</view>
 </template>
 
 <script>
+	import Showtoast from'../../components/Showtoast.vue'
 	export default {
+		components:{
+			Showtoast
+		},
 		data() {
 			return {
+				is_login:false,
+				showtoast:false,
 				isShow:0,
-				info:{}
+				info:{},
+				is_info:0,
 			}
 		},
 		onPullDownRefresh() {
@@ -109,29 +117,89 @@
 				}, 1000);
 			},
 		onShow() {
-			this.isShow=getApp().globalData.isShow
+			if (!uni.getStorageSync('token')) {
+				this.is_login=false
+			}else{
+				this.is_login=true
 				this.getInfo()
+			}
+			if(uni.getStorageSync('is_info')){
+				this.is_info=uni.getStorageSync('is_info')
+			}
+			
+			this.isShow=getApp().globalData.isShow
+				
 		},
 		methods: {
+			toLogin(){
+				if (!uni.getStorageSync('token')) {
+					uni.navigateTo({
+						url:'/pages/profile/login'
+					})
+				} 
+			},
+			
+			canceltoast(){
+					this.showtoast=false
+			},
 			tofankui(){
+				if(!this.is_login){
+					this.toLogin()
+					return
+				}
+				if (this.is_info != 2) {
+					uni.navigateTo({
+						url: '/pages/index/base'
+					})
+					return
+				}
 					uni.navigateTo({
 						url:'./fankuiList'
 					})
 			},
 			tozixun(){
+				if(!this.is_login){
+					this.toLogin()
+					return
+				}
+				if (this.is_info != 2) {
+					uni.navigateTo({
+						url: '/pages/index/base'
+					})
+					return
+				}
 					uni.navigateTo({
 						url:'./zixunList'
 					})
 			},
 			contact(){
+				if(!this.is_login){
+					this.toLogin()
+					return
+				}
+				if (this.is_info != 2) {
+					uni.navigateTo({
+						url: '/pages/index/base'
+					})
+					return
+				}
 				uni.navigateTo({
 					url:'/pages/index/contactour'
 				})
 			},
 			toliaotian(){
-				
+				if(!this.is_login){
+					this.toLogin()
+					return
+				}
+				if (this.is_info != 2) {
+					uni.navigateTo({
+						url: '/pages/index/base'
+					})
+					return
+				}
 				if(this.info.vip_level==0){
-					this.$u.toast('您暂未认证')
+					this.showtoast=true
 					return
 				}
 				if(this.info.vip_level==2){
@@ -156,23 +224,63 @@
 				})
 			},
 			toPage(){
+				if(!this.is_login){
+					this.toLogin()
+					return
+				}
+				if (this.is_info != 2) {
+					uni.navigateTo({
+						url: '/pages/index/base'
+					})
+					return
+				}
 				uni.navigateTo({
 					url:'./myPage'
 				})
 			},
 			tostatus(){
+				if(!this.is_login){
+					this.toLogin()
+					return
+				}
+				if (this.is_info != 2) {
+					uni.navigateTo({
+						url: '/pages/index/base'
+					})
+					return
+				}
 				uni.navigateTo({
 					url:'./personStatus'
 				})
 			},
 			toreport(){
+				if(!this.is_login){
+					this.toLogin()
+					return
+				}
+				if (this.is_info != 2) {
+					uni.navigateTo({
+						url: '/pages/index/base'
+					})
+					return
+				}
 				uni.navigateTo({
 					url:'./reportList'
 				})
 			},
 			toactivity(){
+				if(!this.is_login){
+					this.toLogin()
+					return
+				}
+				if (this.is_info != 2) {
+					uni.navigateTo({
+						url: '/pages/index/base'
+					})
+					return
+				}
 				if(this.info.vip_level==0){
-					this.$u.toast('您暂未认证')
+					this.showtoast=true
 					return
 				}
 				if(this.info.vip_level==2){
@@ -188,6 +296,16 @@
 				})
 			},
 			todongtai(){
+				if(!this.is_login){
+					this.toLogin()
+					return
+				}
+				if (this.is_info != 2) {
+					uni.navigateTo({
+						url: '/pages/index/base'
+					})
+					return
+				}
 				if(this.info.vip_level==0){
 					this.$u.toast('您暂未认证')
 					return
@@ -205,26 +323,76 @@
 				})
 			},
 			toxingqu(){
+				if(!this.is_login){
+					this.toLogin()
+					return
+				}
+				if (this.is_info != 2) {
+					uni.navigateTo({
+						url: '/pages/index/base'
+					})
+					return
+				}
 				uni.navigateTo({
 					url:'./ganxingqu'
 				})
 			},
 			todianzan(){
+				if(!this.is_login){
+					this.toLogin()
+					return
+				}
+				if (this.is_info != 2) {
+					uni.navigateTo({
+						url: '/pages/index/base'
+					})
+					return
+				}
 				uni.navigateTo({
 					url:'./dianzan'
 				})
 			},
 			tofensi(){
+				if(!this.is_login){
+					this.toLogin()
+					return
+				}
+				if (this.is_info != 2) {
+					uni.navigateTo({
+						url: '/pages/index/base'
+					})
+					return
+				}
 				uni.navigateTo({
 					url:'./fensi'
 				})
 			},
 			toguanzhu(){
+				if(!this.is_login){
+					this.toLogin()
+					return
+				}
+				if (this.is_info != 2) {
+					uni.navigateTo({
+						url: '/pages/index/base'
+					})
+					return
+				}
 				uni.navigateTo({
 					url:'./guanzhu'
 				})
 			},
 			toset(){
+				if(!this.is_login){
+					this.toLogin()
+					return
+				}
+				if (this.is_info != 2) {
+					uni.navigateTo({
+						url: '/pages/index/base'
+					})
+					return
+				}
 				uni.navigateTo({
 					url:'./set'
 				})