Merge branch 'master' of gitpfg.pinfangw.com:gaofangming/yhb

app.js

@@ -12,23 +12,23 @@ App({
       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) {

app.json

@@ -1,6 +1,6 @@
 {
   "pages": [
-  "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",

pages/personal_core/requirements/requirements.js

@@ -60,18 +60,15 @@ Page({
     var that = this
  
     //  获取择偶信息
-    let personal_url = 'my/personaloption/optioninfo';
-    let personal_data = {
-    };
-    app.postRequest(personal_url, personal_data, function (res) {
-      if (res.code == 201) {
+    // let personal_url = 'my/personaloption/optioninfo';
+    // let personal_data = {
+    // };
+    // app.postRequest(personal_url, personal_data, function (res) {
+    //   if (res.code == 201) {
         
-        that.setData({
-          personal: res.data,    //获取全部数据
-      
-        })
-      }
-    })
+ 
+    //   }
+    // })
 
 
 
@@ -82,7 +79,10 @@ Page({
     let editinfo_data = {
     };
     app.postRequest(editinfo_url, editinfo_data, function (res) {     
+       that.setData({
+          personal: res.data,    //获取全部数据
 
+        })
       // console.log(res.data)
 
       //  年龄 ajax

pages/personal_core/requirements/requirements.wxml

@@ -38,7 +38,7 @@
 
 
 
-    <view class="Choice_dx_box" data-da="{{personacodel.data.age_max}}">  
+    <!-- <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>
@@ -58,11 +58,47 @@
 
                           </view>
               </picker>
+    </view> -->
+
+    <view class="Choice_dx_box" data-da="{{AgeArray[0][AgeIndex[0]]  +'-' + AgeArray[1][AgeIndex[1]]}}">  
+            <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}}'>
+                                       {{AgeArray[0][AgeIndex[0]]  +'-' + AgeArray[1][AgeIndex[1]]  == '不限-以上' ? '无需求'  :  AgeArray[0][AgeIndex[0]]  +'-' + AgeArray[1][AgeIndex[1]]}}
+                                     </block> -->
+
+                                    <!-- <block  wx:else>无需求</block> -->
+
+                                   
+                                   {{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 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]]}}
+                                </view> 
+
+                          </view>
+              </picker>
     </view>
 
 
 
 
+
+
+
 <view class="Choice_dx_box">     <!--  住址 多项选择器 -->
             <picker mode="multiSelector" range="{{multiArray}}" bindcolumnchange="columnchange" value="{{multiIndex}}" bindchange='pickchange'>
                       <view class='Choice_dx c'>
@@ -71,7 +107,7 @@
                               <view class='Choice_dx_text' >
                                 
                                           <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:if='{{personacodel.code == 201 && personacodel.data.city}}'>{{personal.select_city}}</text>
 
                                                   <text wx:else>无需求</text>
                                           </view>
@@ -97,11 +133,22 @@
 
                                 <view class="Choice_dx_text picker" wx:if='{{heightid == 0}}'>
 
-                                     <block wx:if='{{personacodel.code == 201}}'>
+                                     <!-- <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> -->
+
+                                   {{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 class="Choice_dx_text picker" wx:else>
@@ -116,7 +163,7 @@
 
 
 
-<view class="Choice_dx_box">     <!--  婚史 单项选择器-->
+<view class="Choice_dx_box" data-asd="{{MarriageArray[Marriageindex]}}">     <!--  婚史 单项选择器-->
             <picker  bindchange="MarriageEvent" value="{{Marriageindex}}" range="{{MarriageArray}}">
                     
                       <view class='Choice_dx c'>
@@ -146,11 +193,23 @@
                                 <view class="Choice_dx_title">收入要求</view>
 
                                 <view class="Choice_dx_text picker"  wx:if='{{incomeid == 0}}'>
-                                    <block wx:if='{{personacodel.code == 201}}'>
+                                    <!-- <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> -->
+
+
+                                   {{incomeArray[0][incomeindex[0]]  && incomeArray[1][incomeindex[1]]  ? 
+
+                                   ( incomeArray[0][incomeindex[0]] +'-' + incomeArray[1][incomeindex[1]] == '不限-以上' ?
+
+                                    '无需求' : incomeArray[0][incomeindex[0]] +'-' + incomeArray[1][incomeindex[1]] ) 
+
+                                    : '无需求'}}  
+
+
+
                                 </view>   
 
                                 <view class="Choice_dx_text picker"  wx:else>