1

app.js

@@ -9,32 +9,27 @@ App({
   judge_Land() {
 
     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(2);
+        console.log('登陆页');
         wx.reLaunch({
           url: '/pages/Landpage/Land/Land'    //授权过 进入登陆页
         })
       } else {
+        console.log('授权页');
         wx.reLaunch({
           url: '/pages/Jurisdiction/click_Jurisdiction/click_Jurisdiction'   //未授权  进入授权页
         })
       }
-      // const value = wx.getStorageSync('access_token')
-      // if (value) {
-      //   // console.log(1234)
-      //   console.log(value);
-      //   // Do something with return value
-      // }else{
-      //   wx.reLaunch({
-      //     url: '/pages/Landpage/Land/Land'    //授权过 进入登陆页
-      //   })  
-      // }
+
+    
     } catch (e) {
       // Do something when catch error
     }

app.json

@@ -1,5 +1,6 @@
 {
   "pages": [
+        "pages/personal_core/requirements/requirements",
   "pages/index/waitfor/waitfor",
   "pages/index/index",
   "pages/Jurisdiction/click_Jurisdiction/click_Jurisdiction",
@@ -19,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/Setup/Aboutus/Aboutus.js

@@ -4,12 +4,29 @@ Page({
 
 
   data: {
-
+    optioninfo: '',
   },
 
 
   onLoad: function (options) {
-
+    var that = this;
+
+    // getApp().showLoading();   //提示加载中
+    //  认证信息
+    let optioninfo_url = 'other/about/details';
+    let optioninfo_data = {
+      // uid: options.uid,
+    };
+    app.getRequest(optioninfo_url, optioninfo_data, function (res) {
+      console.log(res.data);
+      if (res.code == 201) {
+
+        that.setData({
+          optioninfo: res.data,
+
+        })
+      }
+    })
   },
 
 

pages/Setup/Aboutus/Aboutus.wxss

@@ -1,5 +1,5 @@
 
-.m_logo{width:200rpx;height:200rpx;margin:auto;border-radius:20rpx;overflow:hidden;margin-top:40rpx;}
+.m_logo{width:255rpx;height:215rpx;margin:auto;border-radius:20rpx;overflow:hidden;margin-top:40rpx;position:relative;left:17rpx;}
 .m_logo image{width:100%;height:100%;}
 
 .m_text{width:85%;padding:20rpx;margin:auto;margin-top:60rpx;background:#F5F5F5;border-radius:10rpx;font-size:26rpx;color:#333;line-height:48rpx;}

pages/Setup/Contactus/Contactus.js

@@ -1,13 +1,30 @@
-
+const app = getApp();
 Page({
 
 
   data: {
-
+    optioninfo:'',
   },
 
   onLoad: function (options) {
-
+    var that = this;
+
+    // getApp().showLoading();   //提示加载中
+    //  认证信息
+    let optioninfo_url = 'other/about/details';
+    let optioninfo_data = {
+      // uid: options.uid,
+    };
+    app.getRequest(optioninfo_url, optioninfo_data, function (res) {
+      console.log(res.data);
+      if (res.code == 201) {
+
+        that.setData({
+          optioninfo: res.data,
+
+        })
+      }
+    })
   },
 
 

pages/Setup/Contactus/Contactus.wxml

@@ -2,24 +2,25 @@
         <view class='yzlist c' >
                 <text>客服微信</text>
 
-                <view class='yzlist_text'>ninkefu01</view>
+                <view class='yzlist_text'>{{optioninfo.wx_id}}</view>
         </view>
 
         <view class='yzlist c'>
                 <text>客服邮箱</text>
 
-                <view class='yzlist_text'>nini@ninihl.com</view>
+                <view class='yzlist_text'>{{optioninfo.email}}</view>
         </view>
 
-        <view class='yzlist c'>
+        <!-- <view class='yzlist c'>
                 <text>官方网址</text>
 
                 <view class='yzlist_text'>www.ninihl.com</view>
-        </view>
+        </view> -->
 
         <view class='yzlist c' >
-                <text>微信公众号</text>
-
-                <view class='yzlist_text'>搜索"约会邦"或"ninihunlian"</view>
+                <navigator hover-class="none" class='c' url="/pages/Setup/Publicaddress/Publicaddress">
+                    <text>微信公众号</text>
+                    <view class='yzlist_text'>搜索"佳人佳缘"</view>
+                </navigator>
         </view>
 </view>

pages/Setup/Publicaddress/Publicaddress.js

@@ -1,68 +1,37 @@
-// pages/Setup/Publicaddress/Publicaddress.js
+const app = getApp();
 Page({
 
   /**
    * 页面的初始数据
    */
   data: {
-
+    optioninfo: '',
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+    var that = this;
 
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
 
-  },
+    //  认证信息
+    let optioninfo_url = 'other/about/details';
+    let optioninfo_data = {
+      // uid: options.uid,
+    };
+    app.getRequest(optioninfo_url, optioninfo_data, function (res) {
+      console.log(res.data);
+      if (res.code == 201) {
 
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
+        that.setData({
+          optioninfo: res.data,
 
+        })
+      }
+    })
   },
 
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage: function () {
-
-  },
 
 
 

pages/Setup/Publicaddress/Publicaddress.json

@@ -1,3 +1,3 @@
 {
-  "navigationBarTitleText": "约会邦微信公众号"
+  "navigationBarTitleText": "佳人佳缘微信公众号"
 }

pages/Setup/Publicaddress/Publicaddress.wxml

@@ -2,14 +2,14 @@
 
 <view class="m_gzh_box">
             <view style='height:40rpx;'></view>
-            <view class="m_2wm"><image src='/image/ico_weibo02.png' mode="aspectFill"></image></view>
+            <view class="m_2wm"><image src='{{optioninfo.wx_code_img}}' mode="aspectFill"></image></view>
 
             <view class='m_gzh_text'>
-                   <text class='title'>如何关注约会邦微信公众号?</text>
+                   <text class='title'>如何关注佳人佳缘微信公众号?</text>
                     <view class='text_box'>
                  
-                        <view class='text'>1.点击右上角   <image src='/image/gd.png' mode="widthFix"></image>  选择【关于约会邦婚恋相亲征婚找对象平台】</view>
-                        <text class='text'>2.点击相关公众号,选择【约会邦】</text>
+                        <view class='text'>1.点击右上角   <image src='/image/gd.png' mode="widthFix"></image>  选择【关于佳人佳缘婚恋相亲征婚找对象平台】</view>
+                        <text class='text'>2.点击相关公众号,选择【佳人佳缘】</text>
                         <text class='text'>3.点击【关注公众号】即可进行关注</text>
                    </view>
             </view>

pages/Setup/Setuplist/Setuplist.js

@@ -15,10 +15,12 @@ Page({
 
   register:function(){
     var user = wx.getStorageSync('user');
+    var Jurisdiction = wx.getStorageSync('wx_id');
     wx.clearStorageSync();
 
     try {
       wx.setStorageSync('user', user)
+      wx.setStorageSync('wx_id', Jurisdiction)
     } catch (e) {
     }
 

pages/Setup/modify/modify.wxml

@@ -2,21 +2,21 @@
 <view class='form'>
        <view class='form_zh'>
             <view class='form_zh_img1'>
-                  <image  src='/image/dl3.png' mode="widthFix"></image>
+                  <image  src='/image/m_jm.png' mode="widthFix"></image>
             </view> 
             <input  password type="text"  placeholder="请输入旧的密码"  value="{{used_value}}"   bindinput="used_password"></input>
        </view>
 
        <view class='form_zh'>
             <view class='form_zh_img1'>
-                  <image  src='/image/dl3.png' mode="widthFix"></image>
+                  <image  src='/image/m_xm.png' mode="widthFix"></image>
             </view> 
             <input  password type="text"  placeholder="请输入新的密码"  value="{{password_value}}"   bindinput="password"></input>
        </view>
 
        <view class='form_zh'>
             <view class='form_zh_img1'>
-                  <image  src='/image/dl3.png' mode="widthFix"></image>
+                  <image  src='/image/m_qr.png' mode="widthFix"></image>
             </view> 
             <input  password type="text"  placeholder="再次输入新的密码"  value="{{qpassword_value}}"   bindinput="qpassword"></input>
        </view>

pages/chat-list/chat-list.wxml

@@ -9,7 +9,7 @@
         <view class='m_container' bindtouchstart='touchstart'  bindtouchmove='touchmove'>
                <template is="chat-item" data="{{item,isTouchMove}}"/>     <!-- 聊天用户列表 -->
 
-               <view class='delete'>删除</view>
+               <!-- <view class='delete'>删除</view> -->
         </view>
     </block>
 

pages/index/index.json

@@ -1,3 +1,3 @@
 {
-  "navigationBarTitleText": "约会绑"
+  "navigationBarTitleText": "佳人佳缘"
 }

pages/index/index.wxml

@@ -219,15 +219,15 @@
                                   </view>
 
                                   <view class='m_Age c'>
-                                      <text>ID: {{item.number}}</text>
-                                      <text>{{item.age}}</text>
+                                      <text wx:if="{{item.number}}">ID: {{item.number}}</text>
+                                      <text wx:if="{{item.age}}">{{item.age}}</text>
                                   </view>
                                 
                                   <view class='m_text'>
-                                          <text>{{item.education}}</text>
-                                          <text>{{item.marry}}</text>
-                                          <text>{{item.occupation}}</text>
-                                          <text>{{item.income}}/月</text>
+                                          <!-- <text wx:if="{{item.education}}">{{item.education}}</text> -->
+                                          <text wx:if="{{item.marry}}">{{item.marry}}</text>
+                                          <text wx:if="{{item.occupation}}">{{item.occupation}}</text>
+                                          <text wx:if="{{item.income}}">{{item.income}}/月</text>
                                   </view>
                         </view>
                 </view>

pages/index/waitfor/waitfor.js

@@ -19,9 +19,7 @@ Page({
    * 生命周期函数--监听页面初次渲染完成
    */
   onReady: function () {
-    wx.showLoading({
-      title: '加载中',
-    })
+
   },
 
   /**

pages/index/waitfor/waitfor.json

@@ -1,3 +1,3 @@
 {
-  "navigationBarTitleText": "约会绑"
+  "navigationBarTitleText": "佳人佳缘"
 }

pages/index/waitfor/waitfor.wxml

@@ -0,0 +1 @@
+<loading>加载中...</loading>

pages/information/chat/chat.js

@@ -250,10 +250,15 @@ Page({
               isMy: true,   //自己
               send: true,   //    发送成功  为true   失败false 
             };
+
+
             let _Receive_news = that.data.Receive_news;
-            _Receive_news.push(obj);   //合并历史消息对象
+            if (typeof _Receive_news == 'object') {
+              _Receive_news.push(obj);      //合并历史消息对象
+            }
+
 
-            console.log(_Receive_news, 'aaa');
+            // console.log(_Receive_news, 'aaa');
             that.setData({
               Receive_news: _Receive_news,     //前台数据赋值 
             });
@@ -465,20 +470,7 @@ Page({
 
   },
 
-  // 处理滚动条
-  scrollbar: function (data) {
-    var that = this;
-    if (data) {
-      let lengNum = data.length;
-      //页面滚动条处理
-
-      that.setData({
-        scrollTopVal: lengNum * 999
-      })
-      console.log(lengNum * 999);
-    }
 
-  },
 
   // 发送消息事件  用来获取input数据
   Sendout: function (e) {
@@ -621,5 +613,18 @@ Page({
   //   // console.log(e.detail);
   // }
 
+  // 处理滚动条
+  scrollbar: function (data) {
+    var that = this;
+    if (data.length > 1) {
+      let lengNum = data.length;
+      //页面滚动条处理
+    
+      that.setData({
+        scrollTopVal: lengNum * 999
+      })
+      console.log(lengNum * 999);
+    }
 
+  },
 })

pages/information/chat/chat.wxml

@@ -7,7 +7,7 @@
    <!-- bindtouchend="cheshi" -->
 
 <view class='Load_img_box' hidden="{{hiddenName}}">
-    <view class='Load_img'><image src='/image/jz.png' mode="aspectFill"></image></view>
+    <view class='Load_img'><image src='/image/jz1.gif' mode="aspectFill"></image></view>
 </view>
 
 <scroll-view class="history"     scroll-top="{{scrollTopVal}}"    scroll-y="true"  bindtap="resetInputStatus"  bindscrolltoupper="upper"   scroll-into-view="{{toView}}" >
@@ -92,7 +92,8 @@
                        adjust-position="true" 
                        bindconfirm="Sendout"
                        bindfocus="bindfocusclick"
-                       confirm-hold="true"
+                       
+                       
                        ></input>
                   </view>
 

pages/payment/Member/Member.js

@@ -10,6 +10,7 @@ Page({
     Originalprice: '',   //价格
     day: '', //  天
     Priceid: '', //  价格ID
+    memberstatus:'', //会员状态
   },
 
   onLoad: function (options) {
@@ -49,6 +50,20 @@ Page({
     
     })
 
+
+    //  会员状态
+    let memberstatus_url = 'pay/recharge/memberstatus';
+    let memberstatus_data = {
+    };
+    app.postRequest(memberstatus_url, memberstatus_data, function (res) {
+      if (res.code == 201) {
+        // console.log(res.data,6666);
+        that.setData({
+          memberstatus: res.data
+        })
+      }
+    })
+
   },
 
   // OccupationEvent: function (e) {   //  职业    单项选择器
@@ -155,6 +170,9 @@ Page({
                     icon: 'success',
                     duration: 2000
                   })
+
+                  _that.onLoad();
+
                 },
                 fail(res) {
                   getApp().Tips('支付失败');

pages/payment/Member/Member.wxml

@@ -36,11 +36,12 @@
 
  -->
 
-<view class='Tips'>未开通</view> 
+<view class='Tips' wx:if="{{memberstatus.state == 2}}">未开通</view> 
+<view class='Tips'  data-ss="{{memberstatus.state}}"  wx:else>已开通</view> 
 
 <view class='m_head_img'><image src="/image/m.zhif.png" mode="aspectFill"></image></view>
 
-<view class='Payment_List_box'>
+<view class='Payment_List_box'  wx:if="{{memberstatus.state ==  2}}">
          <view class='Payment_List'>
                      <radio-group bindchange="checkboxChange">  <!-- 勾选组件 -->
                                

pages/personal_core/Adegreein/Adegreein.wxml

@@ -8,7 +8,7 @@
                   <!-- 手持身份证照 -->
                 <view class='sfzyz_upload_t c'>
                         <view class='sfzyz_upload_l'>
-                                <image src="/image/smyz2.png"  mode="aspectFill"></image>
+                                <image src="/image/xueli.jpg"  mode="aspectFill"></image>
                                 <text>示例照片</text>
                         </view>
 

pages/personal_core/Realestate/Realestate.wxml

@@ -8,7 +8,7 @@
                   <!-- 手持身份证照 -->
                 <view class='sfzyz_upload_t c'>
                         <view class='sfzyz_upload_l'>
-                                <image src="/image/smyz2.png" mode="aspectFill"></image>
+                                <image src="/image/fangc.jpg" mode="aspectFill"></image>
                                 <text>示例照片</text>
                         </view>
 

pages/personal_core/home/home.js

@@ -69,7 +69,7 @@ Page({
     };
     app.postRequest(memberstatus_url, memberstatus_data, function (res) {
       if (res.code == 201) {
-        console.log(res.data,6666);
+        // console.log(res.data,6666);
         that.setData({
           memberstatus: res.data.messages
         })

pages/personal_core/home/home.wxml

@@ -57,7 +57,7 @@
        <button  open-type="share"  plain="true" >
               <view class='data_list c'>
                     <view class='data_list_l'>
-                            <image src='/image/m_core4.png' mode="widthFix"></image>
+                            <image src='/image/m_fx.png' mode="widthFix"></image>
                             <text>分享给朋友</text>
                     </view>
                     <!-- <view class='data_list_r'>{{memberstatus}}</view> -->
@@ -66,7 +66,7 @@
 
         <navigator class='data_list c' hover-class="none" url='/pages/personal_core/remind/remind'>
               <view class='data_list_l'>
-                      <image src='/image/m_core4.png' mode="widthFix"></image>
+                      <image src='/image/m_aq.png' mode="widthFix"></image>
                       <text>安全征婚提示</text>
               </view>
               <!-- <view class='data_list_r'>{{memberstatus}}</view> -->
@@ -75,7 +75,7 @@
 
         <navigator class='data_list c' hover-class="none" url="/pages/Setup/Setuplist/Setuplist">
               <view class='data_list_l'>
-                      <image src='/image/m_core2.png' mode="widthFix"></image>
+                      <image src='/image/m_sz.png' mode="widthFix"></image>
                       <text>设置</text>
               </view>
               <view class='data_list_r'></view>

pages/personal_core/home_list/home_list.wxml

@@ -1,11 +1,11 @@
 <view class="yzlist_box">
 <!-- url="/pages/personal_core/Realname/Realname"  -->
-        <navigator class='yzlist'  hover-class="none" bindtap="faceid">
+        <view class='yzlist'  hover-class="none" bindtap="faceid">
                 <image src='/image/yz1.png' mode="widthFix"></image>
                 <text>实名认证</text>
 
                 <view class='yzlist_text'>{{optioninfo.shenfenzheng.status}}</view>
-        </navigator>
+        </view>
 
         <!-- <navigator class='yzlist'  hover-class="none">
                 <image src='/image/yz2.png' mode="widthFix"></image>
@@ -34,7 +34,7 @@
         </navigator>
 
         <navigator class='yzlist'  hover-class="none"  url="/pages/personal_core/QRcode/QRcode">
-                <image src='/image/yz5.png' mode="widthFix"></image>
+                <image src='/image/m_wx.png' mode="widthFix"></image>
                 <text>我的微信</text>
 
                 <view class='yzlist_text'>{{wxauthentication.messages}}</view>

pages/personal_core/personaldata/personaldata.wxml

@@ -105,9 +105,9 @@
       </view>
 
       <view class='data_list c' wx:if='{{optioninfocode.code == 201}}'>
-              <text  wx:if='{{optioninfo.age}}'>{{optioninfo.age}}</text>
+              <text  wx:if='{{optioninfo.age_max && optioninfo.age_min}}'>{{optioninfo.age}}</text>
               <text wx:if='{{optioninfo.marry}}'>{{optioninfo.marry}}</text>
-              <text wx:if='{{optioninfo.height}}'>{{optioninfo.height}}</text>
+              <text wx:if='{{optioninfo.height_max && optioninfo.height_min}}'>{{optioninfo.height}}</text>
               <text wx:if='{{optioninfo.education}}'>{{optioninfo.education}}</text>
               <text wx:if='{{optioninfo.income_min && optioninfo.income_max}}'>{{optioninfo.income_min}}-{{optioninfo.income_max}}</text>
               <text wx:if='{{optioninfo.occupation}}'>职业：{{optioninfo.occupation}}</text>

pages/personal_core/requirements/requirements.js

@@ -83,7 +83,7 @@ Page({
     };
     app.postRequest(editinfo_url, editinfo_data, function (res) {     
 
-
+      // console.log(res.data)
 
       //  年龄 ajax
       let Age_url = 'public/paramsgather?type=age';
@@ -130,17 +130,16 @@ Page({
 
       let _height_min = res.data.height_min;
       let _height_max = res.data.height_max;
-      // console.log(_height_min);
-      // console.log(_height_max);
+
       app.postRequest(height_url, height_data, function (res) {      //  身高 ajax
                 if (res.code == 201) {
+          
+                  // let min = data_processing(res.data, _height_min);      //已选中的数据处理  min
+                  // let max = data_processing(res.data, _height_max);   //已选中的数据处理  max
 
-                  let min = data_processing(res.data, _height_min);      //已选中的数据处理  min
-                  let max = data_processing(res.data, _height_max);   //已选中的数据处理  max
-
-                  that.setData({
-                    heightindex: [min, max]
-                  })
+                  // that.setData({
+                  //   heightindex: [min, max]
+                  // })
    
 
                         let dictObject = res.data;        //对象不能直接使用  以下转成数组
@@ -290,7 +289,7 @@ Page({
         
           Marriageindex: res.data.marry,    //   婚史 
 
-
+    
           personacodel: res,    //获取全部数据
 
 
@@ -674,7 +673,8 @@ Page({
         // console.log(this.data.area);              //  区 
         // console.log(this.data.occupation);     //  职业 
 
-
+    // let _Receive_img = that.data.Receive_news;
+    // _Receive_img.push(obj);      //合并历史消息对象
 
         // var sex = this.data.sex                     //  性别  
         var age = this.data.age                     //  年龄  
@@ -687,64 +687,46 @@ Page({
         var income = this.data.income             //  收入 
         var occupation = this.data.occupation  //  职业
 
-        if (age == '') {
-          var _age = '请选择年龄'
-          getApp().Tips(_age)
-        } else if (province == '' && city == '' && area == '') {
-          var _province = '请选择地址'
-          getApp().Tips(_province)
-        } else if (height == '') {
-          var _height = '请选择身高'
-          getApp().Tips(_height)
-        } else if (marry == '') {
-          var _marry = '请选择婚史'
-          getApp().Tips(_marry)
-        } else if (income == '') {
-          var _income = '请选择收入'
-          getApp().Tips(_income)
-        } else if (education == '') {
-          var _education = '请选择学历'
-          getApp().Tips(_education)
-        } else if (occupation == '') {
-          var _occupation = '请选择职业'
-          getApp().Tips(_occupation)
-        } else{
-
-                  //  修改择偶信息
-                  let editinfoform_url = 'my/personaloption/editoptionform';
-                  let editinfoform_data = {
-
-                    age: this.data.age,      //  年龄  
-                    height: this.data.height,      //  身高  
-                    province: this.data.province,     // 市
-                    city: this.data.city,     // 市
-                    area: this.data.area,     // 区
-                    education: this.data.education,    //  学历  
-                    marry: this.data.marry,    //   婚史 
-                    income: this.data.income,     //  收入 
-                    occupation: this.data.occupation,     //  职业
-
-                  };
-                  app.postRequest(editinfoform_url, editinfoform_data, function (res) {
-
-                    if (res.code == 201) {
-                      wx.showToast({
-                        title: '修改成功',
-                        icon: 'success',
-                        duration: 2000
-                      })
-                       return;
-                    }
-
-
-                    var fail = '修改失败'    //调用提示框
-                    getApp().Tips(fail)
+       if (age || height || province || city || area || education || marry || income || occupation){
+                    //  修改择偶信息
+                    let editinfoform_url = 'my/personaloption/editoptionform';
+                    let editinfoform_data = {
+
+                      age: this.data.age,      //  年龄  
+                      height: this.data.height,      //  身高  
+                      province: this.data.province,     // 市
+                      city: this.data.city,     // 市
+                      area: this.data.area,     // 区
+                      education: this.data.education,    //  学历  
+                      marry: this.data.marry,    //   婚史 
+                      income: this.data.income,     //  收入 
+                      occupation: this.data.occupation,     //  职业
+
+                    };
+
+     
+                    app.postRequest(editinfoform_url, editinfoform_data, function (res) {
+
+                      if (res.code == 201) {
+                        wx.showToast({
+                          title: '修改成功',
+                          icon: 'success',
+                          duration: 2000
+                        })
+                        return;
+                      }
 
-                  })
 
+                      var fail = '修改失败'    //调用提示框
+                      getApp().Tips(fail)
 
+                    })
+        }else{
+            var _occupation = '您没有选择'
+            getApp().Tips(_occupation)
         }
 
+        
 
 
   },

pages/personal_core/requirements/requirements.wxml

@@ -45,7 +45,7 @@
 
                                 <view class="Choice_dx_text picker" wx:if='{{Ageid == 0}}'>
 
-                                     <block wx:if='{{personacodel.code == 201}}'>
+                                     <block wx:if='{{personacodel.code == 201 && personacodel.data.age_max}}'>
                                        {{AgeArray[0][AgeIndex[0]]}}-{{AgeArray[1][AgeIndex[1]]}}
                                      </block>
 
@@ -71,7 +71,7 @@
                               <view class='Choice_dx_text' >
                                 
                                           <view class='right' wx:if="{{multiArray[2][multiIndex[2]] && step == 0}}">
-                                                  <text wx:if='{{personacodel.code == 201}}'>{{personal.city}}</text>
+                                                  <text wx:if='{{personacodel.code == 201 && personacodel.data.city}}'>{{personal.city}}</text>
 
                                                   <text wx:else>请选择</text>
                                           </view>
@@ -90,14 +90,14 @@
 
 
    <!--  身高 双选-->
-    <view class="Choice_dx_box">  
+    <view class="Choice_dx_box" data-da="{{personacodel.data.height_max}}">  
             <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}}'>
+                                     <block wx:if='{{personacodel.code == 201  && personacodel.data.height_max}}'>
                                         {{heightArray[0][heightindex[0]]}}-{{heightArray[1][heightindex[1]]}}
                                      </block>
                                      
@@ -122,7 +122,7 @@
                       <view class='Choice_dx c'>
                             <view class="Choice_dx_title">婚史</view>
 
-                            <view class='Choice_dx_text' wx:if='{{personacodel.code == 201}}'>
+                            <view class='Choice_dx_text' wx:if='{{personacodel.code == 201  && personacodel.data.marry}}'>
                               
                                   {{MarriageArray[Marriageindex]}}
                                 
@@ -146,7 +146,7 @@
                                 <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 && personacodel.data.income_max}}'>
                                        {{incomeArray[0][incomeindex[0]]}}-{{incomeArray[1][incomeindex[1]]}}
                                      </block>
                                     
@@ -170,7 +170,7 @@
                       <view class='Choice_dx c'>
                             <view class="Choice_dx_title">学历</view>
 
-                            <view class='Choice_dx_text'  wx:if='{{personacodel.code == 201}}'>
+                            <view class='Choice_dx_text'  wx:if='{{personacodel.code == 201 && personacodel.data.education}}'>
                               
                                   {{EducationArray[Educationindex].name}}
                                 
@@ -194,7 +194,7 @@
                       <view class='Choice_dx c'>
                             <view class="Choice_dx_title">职业要求</view>
 
-                            <view class='Choice_dx_text' wx:if='{{personacodel.code == 201}}'>
+                            <view class='Choice_dx_text' wx:if='{{personacodel.code == 201  && personacodel.data.occupation}}'>
                               
                                  {{OccupationArray[Occupationindex].name}}
                                 

pages/register/OwnData/OwnData.json

@@ -1 +1,3 @@
-{}
+{
+  "navigationBarTitleText": "填写个人信息"
+}

pages/register/fillTel/fillTel.json

@@ -1 +1,3 @@
-{}
+{
+  "navigationBarTitleText": "手机验证"
+}

pages/register/fillTel/fillTel.wxml

@@ -21,6 +21,6 @@
 
       <view class='Agreement c'>
              <!-- <view class='Agreement_img'><image src='/image/xy.png' mode="widthFix"></image></view> -->
-             <navigator url="/pages/register/Agreement/Agreement"  hover-class="none" >注册即表示同意约会邦<text>注册服务条款</text></navigator>
+             <navigator url="/pages/register/Agreement/Agreement"  hover-class="none" >注册即表示同意佳人佳缘<text>注册服务条款</text></navigator>
       </view>
 </view>