1

app.js

@@ -11,23 +11,24 @@ App({
     try {
       console.log(wx.getStorageSync('access_token'), '注册');
       console.log(wx.getStorageSync('wx_id'), '授权');
-      if (wx.getStorageSync('access_token')) {   //是否注册过
-        console.log('列表页');
-        wx.reLaunch({
-          url: '/pages/index/index'        //注册过 进入首页
-        })
-
-      } else if (wx.getStorageSync('wx_id')) {  //是否授权
-        console.log('登陆页');
-        wx.reLaunch({
-          url: '/pages/Landpage/Land/Land'    //授权过 进入登陆页
-        })
-      } else {
-        console.log('授权页');
-        wx.reLaunch({
-          url: '/pages/Jurisdiction/click_Jurisdiction/click_Jurisdiction'   //未授权  进入授权页
-        })
-      }
+      
+        // if (wx.getStorageSync('access_token')) {   //是否注册过
+        //   console.log('列表页');
+        //   wx.reLaunch({
+        //     url: '/pages/index/index'        //注册过 进入首页
+        //   })
+
+        // } else if (wx.getStorageSync('wx_id')) {  //是否授权
+        //   console.log('登陆页');
+        //   wx.reLaunch({
+        //     url: '/pages/Landpage/Land/Land'    //授权过 进入登陆页
+        //   })
+        // } else {
+        //   console.log('授权页');
+        //   wx.reLaunch({
+        //     url: '/pages/Jurisdiction/click_Jurisdiction/click_Jurisdiction'   //未授权  进入授权页
+        //   })
+        // }
 
     
     } catch (e) {
@@ -55,6 +56,8 @@ App({
  
   },
 
+
+
   // 提示框
   Tips(text) {
 

app.json

@@ -1,6 +1,6 @@
 {
   "pages": [
-        "pages/personal_core/requirements/requirements",
+  "pages/personal_core/personaldata/personaldata",
   "pages/index/waitfor/waitfor",
   "pages/index/index",
   "pages/Jurisdiction/click_Jurisdiction/click_Jurisdiction",
@@ -11,7 +11,7 @@
   "pages/Landpage/Land/Land",
   "pages/zheo_More/zheo_More",
   "pages/details_More/details_More",
-   "pages/personal_core/personaldata/personaldata",
+
   "pages/Setup/Opinion/Opinion",
   "pages/Setup/Publicaddress/Publicaddress",
   "pages/Setup/Contactus/Contactus",
@@ -20,7 +20,7 @@
    "pages/Setup/Setuplist/Setuplist",
    "pages/payment/Member/Member",
     "pages/personal_core/Album/Album",
-
+        "pages/personal_core/requirements/requirements",
     "pages/personal_core/personaldataModifythe/personaldataModifythe",
     "pages/personal_core/QRcode/QRcode",
     "pages/personal_core/home/home",

pages/index/index.js

@@ -4,8 +4,6 @@ const webSocket = require('../../utils/websocket.js');
 Page({
 
   data: {
-
-
     heightid: 0,
     heightArray: [], // 身高-数据
     heightindex: [0, 0],  // 身高-下标
@@ -80,10 +78,8 @@ Page({
     } 
     app.globalData.trigger = false;
 
-    wx.setTabBarBadge({
-      index: 0,
-      text: '1'
-    })  
+    
+    
   },
  
  

pages/personal_core/personaldata/personaldata.wxml

@@ -102,6 +102,7 @@
                         <text>编辑</text>
                         <image src='/image/personal5.png' mode="widthFix"></image>
                 </navigator>
+                
       </view>
 
       <view class='data_list c' wx:if='{{optioninfocode.code == 201}}'>

pages/personal_core/personaldata/personaldata.wxss

@@ -36,7 +36,7 @@
 .data_title_r image{width:10rpx;position:relative;top:-2rpx;margin-left:16rpx;height:0;}
 
 /* .data_list{margin-top:30rpx;} */
-.data_list text{border:1px solid #E5E5E5;display:block;float:left;padding:20rpx 30rpx;border-radius:100rpx;font-size:28rpx;color:#292828;margin-right:30rpx;margin-top:30rpx}
+.data_list text{border:1px solid #E5E5E5;display:block;float:left;padding:10rpx 30rpx;border-radius:100rpx;font-size:28rpx;color:#292828;margin-right:30rpx;margin-top:30rpx}
 .data_list_text{font-size:28rpx;color:#333;text-align:center;margin-top:60rpx;}
 
 /* 认证信息 */

pages/personal_core/requirements/requirements.js

@@ -3,7 +3,7 @@ const app = getApp();
 Page({
 
   data: {
-
+    // viewhiddenName:true,
     // selectArray: [], // 性别-数据
     // index: '',  // 性别-下标、
     heightid:0,
@@ -212,23 +212,45 @@ Page({
       };
 
       let _education = res.data.education;
+      console.log(_education)
       app.postRequest(Education_url, Education_data, function (res) {      //  学历 ajax
         if (res.code == 201) {
           
-                for (let i = 0; i < res.data.length; i++) {   //已选中的数据处理
+          var obj = { id: 0, name: '不限' };
+          var datares = res.data;
+          datares.unshift(obj)
 
-                  if (res.data[i].id == _education) {
 
-                    // console.log(res.data[i].id)
-                    that.setData({
-                      Educationindex: i
-                    })
-                  }
-                }
+          for (let i = 0; i < datares.length; i++) {    //已选中的数据处理
+            if (datares[i].id == _education) {
+              that.setData({
+                Educationindex: i,
+              })
+            }
+          }
 
-                that.setData({
-                  EducationArray: res.data
-                })
+
+          that.setData({
+            EducationArray: datares,
+        
+          })
+
+
+
+                // for (let i = 0; i < res.data.length; i++) {   //已选中的数据处理
+
+                //   if (res.data[i].id == _education) {
+
+                //     // console.log(res.data[i].id)
+                //     that.setData({
+                //       Educationindex: i
+                //     })
+                //   }
+                // }
+
+                // that.setData({
+                //   EducationArray: res.data
+                // })
         }
       })
 
@@ -262,8 +284,8 @@ Page({
       let _income_max = res.data.income_max == 0 ? '以上' : res.data.income_max;
 
 
-      console.log(_income_min);
-      console.log(_income_max);
+      // console.log(_income_min);
+      // console.log(_income_max);
       app.postRequest(income_url, income_data, function (res) {      //  收入 ajax
         if (res.code == 201) {
     
@@ -277,8 +299,8 @@ Page({
 
           var min = data_processing(res_data, _income_min);      //已选中的数据处理  min
           var max = data_processing(res_data1, _income_max);   //已选中的数据处理  max
-          console.log(min);
-          console.log(max);
+          // console.log(min);
+          // console.log(max);
 
             that.setData({
               incomeindex: [min, max]
@@ -306,21 +328,27 @@ Page({
             // console.log(res);
 
 
-                    for (let i = 0; i < res.data.length; i++) {      //已选中的数据处理
 
-                      if (res.data[i].id == _occupation) {
+            var obj = { id: 0, name: '不限' };
+            var datares = res.data;
+            datares.unshift(obj)
+
+
+            for (let i = 0; i < datares.length; i++) {    //已选中的数据处理
+              if (datares[i].id == _occupation) {
+                that.setData({
+                  Occupationindex: i,
+                })
+              }
+            }
+
+            that.setData({
+              OccupationArray: datares,
+
+            })
 
-                        // console.log(res.data[i].id)
-                        that.setData({
-                          Occupationindex: i
-                        })
-                      }
-                    }
 
 
-                    that.setData({
-                      OccupationArray: res.data
-                    })
           }
       })
 
@@ -762,7 +790,7 @@ Page({
         var income = this.data.income             //  收入 
         var occupation = this.data.occupation  //  职业
 
-    if (_age || height || province || city || area || education || marry || income || occupation){
+
                     //  修改择偶信息
                     let editinfoform_url = 'my/personaloption/editoptionform';
                     let editinfoform_data = {
@@ -796,15 +824,16 @@ Page({
                       getApp().Tips(fail)
 
                     })
-        }else{
-            var _occupation = '您没有选择'
-            getApp().Tips(_occupation)
-        }
 
-        
+  },
 
 
-  },
+  // onReady: function () {
+  //   this.setData({
+  //     viewhiddenName:false
+  //   })
+  // },
+
 
 })
 

pages/personal_core/requirements/requirements.wxml

@@ -1,4 +1,4 @@
-
+<!-- <view  hidden="{{viewhiddenName}}"> -->
 
 <!-- 填写资料 -->
 <view class='data_box'>
@@ -38,24 +38,24 @@
 
 
 
-    <view class="Choice_dx_box">  
+    <view class="Choice_dx_box" data-da="{{personacodel.data.age_max}}">  
             <picker mode="multiSelector" bindchange="AgeEvent"  value="{{AgeIndex}}" range="{{AgeArray}}">           
                           <view class='Choice_dx c'>
                                 <view class="Choice_dx_title">年龄要求</view>
 
                                 <view class="Choice_dx_text picker" wx:if='{{Ageid == 0}}'>
 
-                                     <block wx:if='{{personacodel.code == 201 && personacodel.data.age_max}}'>
-                                       {{AgeArray[0][AgeIndex[0]]}}-{{AgeArray[1][AgeIndex[1]]}}
+                                     <block wx:if='{{personacodel.code == 201}}'>
+                                       {{AgeArray[0][AgeIndex[0]]  +'-' + AgeArray[1][AgeIndex[1]]  == '不限-以上' ? '无需求'  :  AgeArray[0][AgeIndex[0]]  +'-' + AgeArray[1][AgeIndex[1]]}}
                                      </block>
 
-                                      <block wx:else>请选择</block>
+                                      <block wx:else>无需求</block>
                                 </view> 
 
                                 <view class="Choice_dx_text picker" wx:if='{{Ageid == 1}}'>
-                                      {{AgeArray[0][AgeIndex[0]]}}-{{AgeArray[1][AgeIndex[1]]}}
-
+                                      {{AgeArray[0][AgeIndex[0]] +'-' + AgeArray[1][AgeIndex[1]]  == '不限-以上' ? '无需求'  : AgeArray[0][AgeIndex[0]] +'-' + AgeArray[1][AgeIndex[1]]}}
                                 </view> 
+
                           </view>
               </picker>
     </view>
@@ -73,11 +73,11 @@
                                           <view class='right' wx:if="{{multiArray[2][multiIndex[2]] && step == 0}}">
                                                   <text wx:if='{{personacodel.code == 201 && personacodel.data.city}}'>{{personal.city}}</text>
 
-                                                  <text wx:else>请选择</text>
+                                                  <text wx:else>无需求</text>
                                           </view>
 
                                           <view class="picker c" wx:if="{{multiArray[0][multiIndex[0]] && step == 1}}">
-                                                {{multiArray[0][multiIndex[0]]  }}-{{multiArray[1][multiIndex[1]]  }}-{{multiArray[2][multiIndex[2]]}} 
+                                                {{multiArray[0][multiIndex[0]]}}-{{multiArray[1][multiIndex[1]]}}-{{multiArray[2][multiIndex[2]]}} 
                                           </view>
                                   
                               </view>
@@ -90,22 +90,22 @@
 
 
    <!--  身高 双选-->
-    <view class="Choice_dx_box" data-da="{{personacodel.data.height_max}}">  
+    <view class="Choice_dx_box">  
             <picker mode="multiSelector" bindchange="heightEvent"  value="{{heightindex}}" range="{{heightArray}}">           
                           <view class='Choice_dx c'>
                                 <view class="Choice_dx_title">身高</view>
 
                                 <view class="Choice_dx_text picker" wx:if='{{heightid == 0}}'>
 
-                                     <block wx:if='{{personacodel.code == 201  && personacodel.data.height_max}}'>
-                                        {{heightArray[0][heightindex[0]]}}-{{heightArray[1][heightindex[1]]}}
+                                     <block wx:if='{{personacodel.code == 201}}'>
+                                        {{heightArray[0][heightindex[0]] +'-' + heightArray[1][heightindex[1]] == '不限-以上' ? '无需求' : heightArray[0][heightindex[0]] +'-' + heightArray[1][heightindex[1]]}}
                                      </block>
                                      
-                                      <block wx:else>请选择</block>
+                                      <block wx:else>无需求</block>
                                 </view> 
 
                                 <view class="Choice_dx_text picker" wx:else>
-                                      {{heightArray[0][heightindex[0]]}}-{{heightArray[1][heightindex[1]]}}
+                                      {{heightArray[0][heightindex[0]] +'-' + heightArray[1][heightindex[1]] == '不限-以上' ? '无需求' : heightArray[0][heightindex[0]] +'-' + heightArray[1][heightindex[1]]}}
                                 </view>
 
                           </view>
@@ -124,13 +124,13 @@
 
                             <view class='Choice_dx_text' wx:if='{{personacodel.code == 201  && personacodel.data.marry}}'>
                               
-                                  {{MarriageArray[Marriageindex]}}
+                                  {{MarriageArray[Marriageindex] == '不限' ?  '无需求' : MarriageArray[Marriageindex]}}
                                 
                             </view>
 
                             <view class='Choice_dx_text' wx:else>
                               
-                                  {{MarriageArray[Marriageindex] ? MarriageArray[Marriageindex]  : "请选择"}}
+                                  {{MarriageArray[Marriageindex] ? MarriageArray[Marriageindex]  : "无需求"}}
                                 
                             </view>
                                 
@@ -146,15 +146,15 @@
                                 <view class="Choice_dx_title">收入要求</view>
 
                                 <view class="Choice_dx_text picker"  wx:if='{{incomeid == 0}}'>
-                                    <block wx:if='{{personacodel.code == 201 && personacodel.data.income_max}}'>
-                                       {{incomeArray[0][incomeindex[0]]}}-{{incomeArray[1][incomeindex[1]]}}1
+                                    <block wx:if='{{personacodel.code == 201}}'>
+                                       {{incomeArray[0][incomeindex[0]] +'-' + incomeArray[1][incomeindex[1]]  == '不限-以上' ? '无需求' : incomeArray[0][incomeindex[0]] +'-' + incomeArray[1][incomeindex[1]]}}
                                      </block>
                                     
-                                      <block wx:else>请选择</block>
+                                      <block wx:else>无需求</block>
                                 </view>   
 
                                 <view class="Choice_dx_text picker"  wx:else>
-                                      {{incomeArray[0][incomeindex[0]]}}-{{incomeArray[1][incomeindex[1]]}}2
+                                      {{incomeArray[0][incomeindex[0]] +'-' + incomeArray[1][incomeindex[1]] == '不限-以上' ? '无需求' : incomeArray[0][incomeindex[0]] +'-' + incomeArray[1][incomeindex[1]]}}
 
                                 </view> 
 
@@ -164,21 +164,21 @@
 
 
 
-<view class="Choice_dx_box">     <!--  学历 单项选择器-->
+<view class="Choice_dx_box" data-id="{{EducationArray[Educationindex].name}}">     <!--  学历 单项选择器-->
             <picker  bindchange="EducationEvent" value="{{Educationindex}}" range="{{EducationArray}}"  range-key="name">
                     
                       <view class='Choice_dx c'>
                             <view class="Choice_dx_title">学历</view>
 
-                            <view class='Choice_dx_text'  wx:if='{{personacodel.code == 201 && personacodel.data.education}}'>
+                            <view class='Choice_dx_text'  wx:if='{{personacodel.code == 201}}'>
                               
-                                  {{EducationArray[Educationindex].name}}
+                                  {{EducationArray[Educationindex].name  == '不限' ?  '无需求' : EducationArray[Educationindex].name}}
                                 
                             </view>
 
                             <view class='Choice_dx_text'  wx:else>
                               
-                                  {{EducationArray[Educationindex].name ? EducationArray[Educationindex].name  :  "请选择"}}
+                                  {{EducationArray[Educationindex].name ? EducationArray[Educationindex].name  :  "无需求"}}
                                 
                             </view>
                                 
@@ -188,21 +188,21 @@
 
 
 
-<view class="Choice_dx_box">     <!--  职业 单项选择器-->
+<view class="Choice_dx_box" data-asd="{{personacodel.data.occupation}}">     <!--  职业 单项选择器-->
             <picker  bindchange="OccupationEvent" value="{{Occupationindex}}" range="{{OccupationArray}}"  range-key="name">
                     
                       <view class='Choice_dx c'>
                             <view class="Choice_dx_title">职业要求</view>
 
-                            <view class='Choice_dx_text' wx:if='{{personacodel.code == 201  && personacodel.data.occupation}}'>
+                            <view class='Choice_dx_text' wx:if='{{personacodel.code == 201}}'>
                               
-                                 {{OccupationArray[Occupationindex].name}}
+                                 {{OccupationArray[Occupationindex].name   == '不限' ?  '无需求' : OccupationArray[Occupationindex].name}}
                                 
                             </view>
 
                             <view class='Choice_dx_text'   wx:else>
                               
-                                 {{OccupationArray[Occupationindex].name ? OccupationArray[Occupationindex].name  :  "请选择"}}
+                                 {{OccupationArray[Occupationindex].name ? OccupationArray[Occupationindex].name  :  "无需求"}}
                                 
                             </view>
                                 
@@ -257,3 +257,4 @@
 
 </view>
 
+<!-- </view> -->