1

app.js

@@ -44,13 +44,11 @@ App({
       wx.reLaunch({
         url: '/pages/Landpage/Land/Land'    //授权过 进入登陆页
       })  
-    } 
-    
-    // else {
-    //   wx.reLaunch({
-    //     url: '/pages/Jurisdiction/click_Jurisdiction/click_Jurisdiction'   //未授权  进入授权页
-    //   })
-    // }
+    }else {
+      wx.reLaunch({
+        url: '/pages/Jurisdiction/click_Jurisdiction/click_Jurisdiction'   //未授权  进入授权页
+      })
+    }
 
   
   },
@@ -63,14 +61,7 @@ App({
     // 查看是否授权
  
 
-    wx.getLocation({
-
-      success: function (res) {
-        _this.getDistrict(res.latitude, res.longitude)
 
-      },
-
-    })
   },
 
   // 提示框
@@ -200,13 +191,16 @@ App({
       success: function (res) {
         console.log(res);
         if (res.data.status == 0) {
-          // 省
-          let province = res.data.result.address_component.province;
-          // 市
-          let city = res.data.result.address_component.city;
-          // 区
-          let district = res.data.result.address_component.district;
-          console.log(province);
+          console.log(res.data.result.address_component);
+          _page.postRequest('trajectory/location/position', res.data.result.address_component)
+          // // 省
+          // let province = res.data.result.address_component.province;
+          // // 市
+          // let city = res.data.result.address_component.city;
+          // // 区
+          // let district = res.data.result.address_component.district;
+          // console.log(province);
+
         }
 
       }

app.json

@@ -1,23 +1,22 @@
 {
   "pages": [
-      "pages/Setup/Opinion/Opinion",
-  "pages/Setup/Publicaddress/Publicaddress",
-  "pages/Setup/Contactus/Contactus",
-  "pages/Setup/Aboutus/Aboutus",
-
+ "pages/personal_core/remind/remind",
+  "pages/Jurisdiction/click_Jurisdiction/click_Jurisdiction",
   "pages/Setup/modify/modify",
   "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/Setup/Aboutus/Aboutus",
    "pages/Setup/security/security",
    "pages/Setup/Setuplist/Setuplist",
     "pages/information/chat/chat",
     "pages/payment/Member/Member",
-    "pages/Jurisdiction/click_Jurisdiction/click_Jurisdiction",
     "pages/personal_core/Album/Album",
-    "pages/personal_core/requirements/requirements",
+     "pages/personal_core/requirements/requirements",
     "pages/personal_core/personaldataModifythe/personaldataModifythe",
     "pages/personal_core/QRcode/QRcode",
     "pages/personal_core/home/home",
@@ -29,7 +28,6 @@
     "pages/index_details/index_details",
     "pages/index/index",
     "pages/index_screen/index_screen",
-
     "pages/Landpage/Retrievepassword/Retrievepassword",
     "pages/register/fillTel/fillTel",
     "pages/register/OwnData/OwnData",
@@ -65,18 +63,18 @@
     "backgroundColor": "#FFF",
     "list": [
       {
-        "selectedIconPath": "image/nav01.png",
-        "iconPath": "image/nav1.png",
-        "pagePath": "pages/index/index",
-        "text": "首页"
-      },
-      {
         "selectedIconPath": "image/nav03.png",
         "iconPath": "image/nav3.png",
         "pagePath": "pages/chat-list/chat-list",
         "text": "消息"
       },
       {
+        "selectedIconPath": "image/nav01.png",
+        "iconPath": "image/nav1.png",
+        "pagePath": "pages/index/index",
+        "text": "首页"
+      },
+      {
         "selectedIconPath": "image/nav04.png",
         "iconPath": "image/nav4.png",
         "pagePath": "pages/personal_core/home/home",

pages/Landpage/Land/Land.js

@@ -29,6 +29,7 @@ Page({
     if (wx.getStorageSync('user')){
         _this.setData({
           inputValue1: wx.getStorageSync('user'),
+          user: wx.getStorageSync('user'),
         });
       }
  

pages/index/index.js

@@ -44,7 +44,7 @@ Page({
     // tabTxt: ['性别', '年龄', '婚史', '特色'],//tab文案
     page: 1,//当前页码
     limit: 10,//获取条数
-    morehide: false,   //暂无更多信息显示隐藏
+    morehide: true,   //暂无更多信息显示隐藏
     moreTxt: '',
 
 
@@ -68,21 +68,34 @@ Page({
 
   },
 
-  onLoad: function (options) {
+
+  onShow: function (options) {
+    var that = this;
+    // webSocket.connectSocket();
+    var _trigger = app.globalData.trigger      //    搜索或清空
+    // console.log(_trigger);
+    if (_trigger == true){
+      that.onLoad();
+    } 
+    app.globalData.trigger = false;
+  },
+ 
+ 
+//  触发聊天
+  onReady: function (options){
     webSocket.connectSocket();
   },
 
-
-  onShow: function (options) {
+  onLoad: function (options) {
     var that = this;
 
-    that.setData({
-      page: 1,//当前页码
-    })
 
 
-    getApp().showLoading();   //提示加载中
+    that.Getlocation();   //获取地理位置
 
+    that.setData({
+      page: 1,//当前页码
+    })
 
 
     var _Selection = app.globalData.Selection      //  是否选中     1选中 0没选中
@@ -125,14 +138,15 @@ Page({
     var _cityname = app.globalData.cityName   //  市 名称
     var _areaname = app.globalData.areaName      //  区  名称
 
-    if (_provincename && _cityname && _Selection == 1) {
+    if (_provincename ||  _cityname && _Selection == 1) {
       that.setData({
         city: _city,
         provinceName: _provincename,  // 省名称
         cityName: _cityname, // 市名称
         areaName: _areaname,  // 区名称
       })
-
+      // console.log(_provincename)
+      // console.log(_cityname)
     } else if (_provincename == '' && _cityname == '' &&  _Selection == 1){
       that.setData({
         city: _city,
@@ -542,7 +556,6 @@ Page({
   //  上拉加载更多
   onReachBottom() {
     var that = this;
-    var text = ""
 
     let _age = transformation(that.data.age)      //不限以上 转换成0
     let _height = transformation(that.data.height)      //不限以上 转换成0
@@ -563,8 +576,7 @@ Page({
         number: that.data.inputValue,   //  性别  
       };
 
-      text = '您搜索的会员编码不存在'
-      console.log('用户ID');
+      // console.log('用户ID');
 
 
     } else {     //否则 传常规选择
@@ -580,8 +592,7 @@ Page({
         city: that.data.city,                    // 市
       };
 
-      console.log('选择');
-      text = '暂无更多数据。'
+      // console.log('选择');
 
     }
 
@@ -594,11 +605,11 @@ Page({
 
         var moreTxt = '';
         if (0 < (res.data.length < 10)) {
-          moreTxt = text;
-          console.log('无')
+          moreTxt = res.msg;
+          // console.log('无')
         } else {
           moreTxt = ''
-          console.log('有')
+          // console.log('有')
         }
 
         // 设置数据
@@ -608,8 +619,8 @@ Page({
 
         that.setData({
           home: home,
-          morehide: true,
-          moreTxt: moreTxt,
+          morehide: false,
+          moreTxt: res.msg,
         })
 
         that.cancelLoading();   //数据加载完关闭
@@ -621,8 +632,8 @@ Page({
 
       that.setData({
         home_code: res.code,
-        morehide: true,
-        moreTxt: text,
+        morehide: false,
+        moreTxt: res.msg,
       })
 
 
@@ -636,7 +647,6 @@ Page({
 
   list: function () {
     var that = this;
-    var text = ""
 
     let _age = transformation(that.data.age)       //不限以上 转换成0
     let _height = transformation(that.data.height)       //不限以上 转换成0
@@ -654,10 +664,6 @@ Page({
         number: that.data.inputValue,   //  性别  
       };
 
-      text = '您搜索的会员编码不存在'
-      console.log('用户ID');
-
-
     } else {     //否则 传常规选择
 
       var home_data = {
@@ -671,9 +677,6 @@ Page({
         city: that.data.city,                    // 市
       };
 
-      // console.log('选择');
-      text = '暂无更多数据。'
-
     }
 
 
@@ -686,7 +689,7 @@ Page({
 
         var moreTxt = '';
         if (res.data.length < 10) {
-          moreTxt = text
+          moreTxt = res.msg
         } else {
           moreTxt = ''
         }
@@ -694,7 +697,7 @@ Page({
         // console.log(res.data);
         that.setData({
           home: res.data,
-          moreTxt: moreTxt,
+          moreTxt: res.msg,
           home_code: res.code,
         })
 
@@ -705,12 +708,19 @@ Page({
 
       that.cancelLoading();   //数据加载完关闭
 
+
+
       that.setData({
         home: res.data,
-        morehide: true,
-        moreTxt: text
+        morehide: false,
+        moreTxt: res.msg,
       })
 
+
+
+  
+
+
     })
 
   },
@@ -718,7 +728,7 @@ Page({
   // 加载
   showLoading: function () {
 
-    wx.showToast({
+    wx.showLoading({
 
       title: '加载中',
 
@@ -729,7 +739,7 @@ Page({
   },
   // 关闭加载
   cancelLoading: function () {
-    wx.hideToast();
+    wx.hideLoading();
   },
 
 
@@ -783,7 +793,7 @@ Page({
           cityidx: '',   // idx  选中清空
         })
 
-        console.log(res.data)
+        // console.log(res.data)
 
       }
     })
@@ -827,7 +837,7 @@ Page({
           // console.log('执行')
           //   console.log(_index * 42);
         }
-        console.log(res.data)
+        // console.log(res.data)
       }
 
     })
@@ -883,10 +893,10 @@ Page({
 
     }
     
-    console.log(that.data.city)
-    console.log(that.data.provinceName)
-    console.log(that.data.cityName)
-    console.log(that.data.areaName)
+    // console.log(that.data.city)
+    // console.log(that.data.provinceName)
+    // console.log(that.data.cityName)
+    // console.log(that.data.areaName)
 
     that.list(); //调用筛选
 
@@ -936,15 +946,55 @@ Page({
   },
 
 
-  //   heightPosition: function (event){
-  //     var that=this;
-  //     var _heightP = event.detail.scrollTop;
-  //     console.log(_heightP);
-  //     that.setData({
-  //       heightP: _heightP,   // 区数据
-  //     })
-  // },
 
+  Getlocation: function () {
+
+    wx.getSetting({
+      success: (res) => {
+        // console.log(JSON.stringify(res))
+        // console.log(res)
+        // console.log(res.authSetting['scope.userLocation'])
+        // res.authSetting['scope.userLocation'] == undefined    表示 初始化进入该页面
+        // res.authSetting['scope.userLocation'] == false    表示 非初始化进入该页面,且未授权
+        // res.authSetting['scope.userLocation'] == true    表示 地理位置授权
+        if (!res.authSetting['scope.userLocation']) {
+          wx.showModal({
+            title: '请求授权当前位置',
+            content: '需要获取您的地理位置，请前往授权',
+            success: function (res) {
+              if (res.cancel) {
+                wx.showToast({
+                  title: '拒绝授权',
+                  icon: 'none',
+                  duration: 1000
+                })
+              } else if (res.confirm) {
+
+                wx.getLocation({
+
+                  success: function (res) {
+                    // console.log(res.latitude)
+                    // console.log(res.longitude)
+                    getApp().getDistrict(res.latitude, res.longitude);
+
+                  },
+
+                })
+
+
+              }
+            }
+          })
+        } else if (res.authSetting['scope.userLocation'] == undefined) {
+          //调用wx.getLocation的API
+        }
+        else {
+          //调用wx.getLocation的API
+        }
+      }
+    })
+
+  },
 
 
 })

pages/index/index.wxml

@@ -234,7 +234,7 @@
         </block>
 
 
-        <view class='nexgengduo' style='display:{{morehide}};'>{{moreTxt}}</view>
+        <view class='nexgengduo' hidden="{{morehide}}">{{moreTxt}}</view>
 
         
         <!-- 省市区弹窗 -->

pages/index_details/index_details.js

@@ -23,9 +23,13 @@ Page({
     albumimgurl: '',// 相册url
   },
 
+
+
   onLoad: function (options) {
     var that = this;
 
+ 
+
     app.postRequest('my/images/headurl', {}, function (res) {
       if (res.code == 201) {
         that.myheadurl = res.data.img
@@ -37,7 +41,6 @@ Page({
       }
     })
 
-    getApp().showLoading();   //提示加载中
     that.to_id = options.uid;
     that.setData({
       options_img: options.img  //头像
@@ -187,6 +190,7 @@ Page({
 
   },
 
+
 // 相册点击放大
   enlarge: function (e) {
     var that = this;
@@ -252,7 +256,8 @@ console.log(that.data.uploadImages)
     wx.navigateTo({
       url: '../chat/chat?to_id=' + that.to_id + '&myheadurl=' + that.myheadurl + '&headUrl=' + that.data.options_img
     });
-  }
+  },
+
 
 
 })

pages/index_details/index_details.wxml

@@ -87,8 +87,8 @@
       <view class='data_title c'>
                 <view class='data_title_l'> <image src='/image/xtb3.png'  mode="widthFix" style='position:relative;top:6rpx;width: 32rpx;'></image> 择偶意向</view>
 
-                <navigator class='data_title_r' hover-class="none" url="/pages/zheo_More/zheo_More?uid='{{optionsuid}}'">
-                        <text>更多</text>
+                <navigator class='data_title_r' hover-class="none" url="/pages/zheo_More/zheo_More?uid='{{optionsuid}}'" wx:if='{{optioninfocode.code == 201}}'>
+                        <text >更多</text>
                         <image src='/image/personal5.png' mode="widthFix"></image>
                 </navigator>
       </view>

pages/index_screen/index_screen.js

@@ -64,9 +64,7 @@ Page({
   onLoad: function (option) {
     var that = this
 
-    console.log(option)
-
-    getApp().showLoading();   //提示加载中
+    // console.log(option)
 
     //先清空要传的数据
     app.globalData.Selection = 0;    //  是否选中  
@@ -314,7 +312,7 @@ Page({
 
 
     //  收入 ajax
-    let income_url = 'public/paramsgather?type=shouru';
+    let income_url = 'public/paramsgather?type=shouru1';
     let income_data = {
       // pid: '0'
     };
@@ -552,7 +550,7 @@ Page({
   // 会员编码 
   getPhone: function (e) {
     var _inputValue = e.detail.value;
-    console.log(_inputValue);
+    // console.log(_inputValue);
     this.setData({
       inputValue: _inputValue
     });
@@ -577,7 +575,6 @@ Page({
     app.globalData.income = String(_this.data.income);     //  收入 
     app.globalData.Selection = String(1);    //  是否选中   1 选中   0没选中
 
-
     app.globalData.city = String(_this.data.city);    //  市 
 
     app.globalData.provinceName = String(_this.data.provinceName);    //  省 
@@ -585,6 +582,10 @@ Page({
     app.globalData.areaName = String(_this.data.areaName);    //  区 
 
 
+    app.globalData.trigger = true;    // 搜索或清空
+
+
+
 
 
 
@@ -651,6 +652,8 @@ Page({
     app.globalData.cityName = String(_this.data.cityName);    //  市 
     app.globalData.areaName = String(_this.data.areaName);    //  区 
 
+    app.globalData.trigger = true;    // 搜索或清空
+
 
 
 

pages/personal_core/Album/Album.js

@@ -25,9 +25,7 @@ Page({
   },
 
 
-
   onShow: function (options) {
-    getApp().showLoading();   //提示加载中
 
     var that = this;
     
@@ -350,7 +348,8 @@ Page({
 
   demo:function(){
     this.onShow();
-  }
+  },
+
 
 
 // 取消事件

pages/personal_core/home/home.js

@@ -8,10 +8,8 @@ Page({
     datum: [],  //头部信息
     headurl: [],    //个人头像
     authenticationnum: [],    //认证信息
-    wxauthentication: [],     //我的微信
     memberstatus:'', //会员状态
 
-  
 
   },
 
@@ -21,7 +19,7 @@ Page({
   onShow: function (options) {
 
     var that =this;
-    // getApp().showLoading();   //提示加载中
+
 
               //  头部信息
     let datum_url = 'my/personaldata/datum';
@@ -64,17 +62,6 @@ Page({
     })
 
 
-    //  我的微信
-    let wxauthentication_url = 'my/wxqrcode/wxauthentication';
-    let wxauthentication_data = {
-    };
-    app.postRequest(wxauthentication_url, wxauthentication_data, function (res) {
-        // console.log(res.data);
-        that.setData({
-          wxauthentication: res.data
-        })
-   
-    })
 
 
     //  会员状态
@@ -94,5 +81,52 @@ Page({
   },
 
 
+  // 分享
+
+  onShareAppMessage: function (res) {
+
+    var that = this;
+    var code = '';
+    // getApp().showLoading();   //提示加载中
+
+    //  头部信息
+    let datum_url = 'my/other/share';
+    let datum_data = {
+    };
+    app.postRequest(datum_url, datum_data, function (res) {
+      if (res.code == 201) {
+        console.log(res.data.code);
+        that.setData({
+          code: res.data.code,
+        })
+      }
+    })
+
+
+    if (res.from === 'button') {
+      console.log("来自页面内转发按钮");
+      console.log(res.target);
+
+    }
+    else {
+      console.log("来自右上角转发菜单")
+    }
+    return {
+      title: '妹子图片',
+      // path: '/pages/share/share?code=' + _that.data.code + '',
+      success: (res) => {
+        console.log("转发成功", res);
+      },
+      fail: (res) => {
+        console.log("转发失败", res);
+      }
+    }
+
+  }
+
+
+
+
+
 
 })

pages/personal_core/home/home.wxml

@@ -58,14 +58,25 @@
               <view class='data_list_r'>{{memberstatus}}</view>
         </navigator>
 
-        <navigator class='data_list c' hover-class="none" url="/pages/personal_core/QRcode/QRcode">
+       <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>
+                            <text>分享给朋友</text>
+                    </view>
+                    <!-- <view class='data_list_r'>{{memberstatus}}</view> -->
+              </view>
+        </button>
+
+        <navigator class='data_list c' hover-class="none" url='/pages/personal_core/remind/remind'>
               <view class='data_list_l'>
-                      <image src='/image/m_core5.png' mode="widthFix"></image>
-                      <text>我的微信</text>
+                      <image src='/image/m_core4.png' mode="widthFix"></image>
+                      <text>安全征婚提示</text>
               </view>
-              <view class='data_list_r'>{{wxauthentication.messages}}</view>
+              <!-- <view class='data_list_r'>{{memberstatus}}</view> -->
         </navigator>
 
+
         <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>

pages/personal_core/home/home.wxss

@@ -33,3 +33,4 @@
 .data_list_r{float:right;font-size:26rpx;color: #A7A6A6;position:relative;top:11rpx;}
 .data_list_r text{color:#FF79B8;}
 
+button[plain]{ border:0;padding: 0;margin: 0;  line-height: 1;}

pages/personal_core/home_list/home_list.js

@@ -4,14 +4,16 @@ Page({
  
   data: {
     optioninfo:'',
+
+    wxauthentication: [],     //我的微信
   },
 
 
   onLoad: function (options) {
 
         var that = this;
-        // console.log(options.uid)
-
+    
+    // getApp().showLoading();   //提示加载中
         //  认证信息
     let optioninfo_url = 'my/authentication/adopticonone';
         let optioninfo_data = {
@@ -28,6 +30,19 @@ Page({
           }
         })
 
+        //  我的微信
+        let wxauthentication_url = 'my/wxqrcode/wxauthentication';
+        let wxauthentication_data = {
+        };
+        app.postRequest(wxauthentication_url, wxauthentication_data, function (res) {
+          // console.log(res.data);
+          that.setData({
+            wxauthentication: res.data
+          })
+
+        })
+
+
   },
 
 })

pages/personal_core/home_list/home_list.wxml

@@ -31,6 +31,13 @@
 
                 <view class='yzlist_text'>{{optioninfo.fangchan.status}}</view>
         </navigator>
+
+        <navigator class='yzlist'  hover-class="none"  url="/pages/personal_core/QRcode/QRcode">
+                <image src='/image/yz5.png' mode="widthFix"></image>
+                <text>我的微信</text>
+
+                <view class='yzlist_text'>{{wxauthentication.messages}}</view>
+        </navigator>
 </view>
 
 <view class='yztext'>

pages/personal_core/personaldata/personaldata.js

@@ -27,18 +27,13 @@ Page({
     
 
   },
-  // onShow() { //返回显示页面状态函数
 
-  //   this.onLoad()//再次加载，实现返回上一页页面刷新
 
-  //   //只执行获取地址的方法，来进行局部刷新
-  // },
+
 
   onShow: function (options) {
     var that = this;
-    getApp().showLoading();   //提示加载中
 
-  
   //  个人信息
     let information_url = 'my/personaldata/personal';
     let information_data = {
@@ -133,12 +128,13 @@ Page({
           headurl: res.data
         })
       }
+ 
     })
 
-
+  
 
   },
-  
+
   // enlarge:function(e){
   //   var that = this;
   
@@ -208,5 +204,6 @@ Page({
 
   },
 
+
   
 })

pages/personal_core/personaldataModifythe/personaldataModifythe.js

@@ -53,12 +53,9 @@ Page({
 
 
 
-
   onLoad: function () {
     var that = this
 
-    getApp().showLoading();   //提示加载中
-
     //  获取个人信息
     let personal_url = 'my/personaldata/personal';
     let personal_data = {

pages/personal_core/remind/remind.js

@@ -0,0 +1,19 @@
+// pages/personal_core/remind/remind.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+
+  },
+
+  
+})

pages/personal_core/remind/remind.json

@@ -0,0 +1,3 @@
+{
+  "navigationBarTitleText": "约会绑"
+}

pages/personal_core/remind/remind.wxml

@@ -0,0 +1,14 @@
+
+<view class="remind_box">
+     <view class='remind'>
+                <text class='title'>安全征婚提示</text>
+
+                <text class='text' style='margin-top:30rpx;'>1 .仔细核对对方资料，选择公共约会场所；</text>
+                <text class='text'>2. 不要为面子支付不必要的账单，提高警觉意识；</text>
+                <text class='text'>3. 遵循循序渐进的交往原则；</text>
+                <text class='text'>4. 不要相信天上会掉馅饼，不要付出财物，也不要贪图对方的财物；</text>
+                <text class='text'>5. 充分思考，保持清晰的头脑，异地展现事业成就，不可轻信；</text>
+                <text class='text'>6. 在与异性联系的过程中，不要轻言轻信，或过于注重对方的外表与财力，稳固幸福的婚姻建立于相似的价值观念、相容的个性、相协调的生活态度，理性对待对方的高收入或出众外形等条件；</text>
+
+     </view>
+</view>

pages/personal_core/remind/remind.wxss

@@ -0,0 +1,9 @@
+
+
+.remind_box{border:1px solid #EEE;width:90%;margin:auto;margin-top:20rpx;border-radius:10rpx;box-shadow :1px 3px 20px 0px #eee; }
+.remind{padding:30rpx;}
+
+.remind .title{font-size:34rpx;color:#333;display:block;text-align:center;font-weight:600;}
+
+.remind .text{font-size:27rpx;color:#666;display:block;line-height:44rpx;margin-bottom:25rpx;}
+.remind .text:last-child{margin-bottom:0;}

pages/personal_core/requirements/requirements.js

@@ -58,8 +58,7 @@ Page({
 
   onLoad: function () {
     var that = this
-    getApp().showLoading();   //提示加载中
-
+ 
     //  获取择偶信息
     let personal_url = 'my/personaloption/optioninfo';
     let personal_data = {
@@ -98,27 +97,23 @@ Page({
       // console.log(_age_max);
       app.postRequest(Age_url, Age_data, function (res) {   //  年龄 ajax
               if (res.code == 201) {
-                      for (let i = 0; i < res.data.length; i++) {    //已选中的数据处理
-
-                        if (res.data[i] == _age_min) { var _min = i; }
 
-                        if (res.data[i] == _age_max) { var _max = i; }
-
-                        that.setData({
-                          AgeIndex: [_min, _max]
-                        })
-                      }
+                let min = data_processing(res.data, _age_min);      //已选中的数据处理  min
+                let max = data_processing(res.data, _age_max);   //已选中的数据处理  max
 
+                that.setData({
+                  AgeIndex: [min, max]
+                })
 
-                      let dictObject = res.data;    //对象不能直接使用  以下转成数组
-                        // 对象转成数组
-                        var createArr = []
-                        for (let i in dictObject) {
-                          createArr.push(dictObject[i] + "岁");
-                        }
-                        that.setData({
-                          AgeArray: [createArr, createArr],
-                        })
+                let dictObject = res.data;    //对象不能直接使用  以下转成数组
+                  // 对象转成数组
+                  var createArr = []
+                  for (let i in dictObject) {
+                    createArr.push(dictObject[i] + "岁");
+                  }
+                  that.setData({
+                    AgeArray: [createArr, createArr],
+                  })
 
                             // console.log(createArr);           
                 }
@@ -140,16 +135,13 @@ Page({
       app.postRequest(height_url, height_data, function (res) {      //  身高 ajax
                 if (res.code == 201) {
 
-                      for (let i = 0; i < res.data.length; i++) {    //已选中的数据处理
-                        // console.log(res.data[i])
-                        if (res.data[i] == _height_min) { var _min = i; }
+                  let min = data_processing(res.data, _height_min);      //已选中的数据处理  min
+                  let max = data_processing(res.data, _height_max);   //已选中的数据处理  max
 
-                        if (res.data[i] == _height_max) { var _max = i; }
-
-                        that.setData({
-                          heightindex: [_min, _max]
-                        })
-                      }
+                  that.setData({
+                    heightindex: [min, max]
+                  })
+   
 
                         let dictObject = res.data;        //对象不能直接使用  以下转成数组
                         // 对象转成数组
@@ -221,7 +213,7 @@ Page({
       })
 
       //  收入 ajax
-      let income_url = 'public/paramsgather?type=shouru';
+      let income_url = 'public/paramsgather?type=shouru1';
       let income_data = {
         // pid: '0'
       };
@@ -231,28 +223,19 @@ Page({
       // console.log(_income_max);
       app.postRequest(income_url, income_data, function (res) {      //  收入 ajax
         if (res.code == 201) {
-                  for (let i = 0; i < res.data.length; i++) {    //已选中的数据处理
-                    // console.log(res.data[i])
-                    if (res.data[i].min == _income_min) { var _min = i; }
+    
 
-                    if (res.data[i].max == _income_max) { var _max = i; }
+          var min = data_processing(res.data, _income_min);      //已选中的数据处理  min
+          var max = data_processing(res.data, _income_max);   //已选中的数据处理  max
 
-                    that.setData({
-                      incomeindex: [_min, _max]
-                    })
-                  }
+            that.setData({
+              incomeindex: [min, max]
+            })
+          
 
-                  let dictObject = res.data;      //对象不能直接使用  以下转成数组
-                  // 对象转成数组
-                  var createArr = []
-                  var createArr1 = []
-                  for (let i in dictObject) {
-                    createArr.push(dictObject[i].min);
-                    createArr1.push(dictObject[i].max);
-                  }
-                  that.setData({
-                    incomeArray: [createArr, createArr1],
-                  })
+            that.setData({
+              incomeArray: [res.data, res.data],
+            })
         }
 
       })
@@ -374,16 +357,29 @@ Page({
 
   // 年龄双选
   AgeEvent: function (e) {
+    var that =this;
     console.log('picker发送选择改变，携带值为', e.detail.value)
-
+    var _value = e.detail.value;  //发送选择改变，携带值为
     var Small = this.data.AgeArray[0][e.detail.value[0]].substring(0, 2);
     var large = this.data.AgeArray[1][e.detail.value[1]].substring(0, 2);
-    var Agedata = Small + '-' + large;
+
+
+    if (Small > large && Small != '不限' && large != '以上') {     //判断  最小值  大于  最大值  数据互换
+      //  console.log('调换')
+      var Agedata = large + '-' + Small;
+      that.Exchange(_value);    // 调用数组调换
+
+    } else {
+
+      var Agedata = Small + '-' + large;    //否则正常选中
+
+    }
+
 
     console.log(Agedata);
 
     this.setData({
-      AgeIndex: e.detail.value,
+      AgeIndex: _value,
       age: Agedata,
       Ageid: 1,
     })
@@ -391,19 +387,31 @@ Page({
 
 
   heightEvent: function (e) {   //  身高    单项选择器
+    var that = this;
     // console.log(this);
     // console.log(e);
     // console.log(this.data.heightArray[e.detail.value]);
     // console.log('picker发送选择改变，携带值为', e.detail.value)
-
+    var _value = e.detail.value;  //发送选择改变，携带值为
     var heightSmall = this.data. heightArray[0][e.detail.value[0]].substring(0, 3);
     var heightlarge = this.data. heightArray[1][e.detail.value[1]].substring(0, 3);
-    var heightdata = heightSmall + '-' + heightlarge;
+ 
+
+    // console.log(heightdata)
+    if (heightSmall > heightlarge && heightSmall != '不限' && heightlarge != '以上') {     //判断  最小值  大于  最大值  数据互换
+      //  console.log('调换')
+      var heightdata = heightlarge + '-' + heightSmall;
+      that.Exchange(_value);    // 调用数组调换
+
+    } else {
+
+      var heightdata = heightSmall + '-' + heightlarge;
+
+    }
 
-    // console.log(heightdata);
 
     this.setData({
-      heightindex: e.detail.value,
+      heightindex: _value,
       height: heightdata,
       heightid: 1,
     })
@@ -432,17 +440,29 @@ Page({
   },
 
   incomeEvent: function (e) {   //  收入    单项选择器
-
+    var that = this;
     // console.log(this);
     // console.log(e);
     // console.log(this.data.incomeArray[e.detail.value].id);
     // console.log('picker发送选择改变，携带值为', e.detail.value)
+    var _value = e.detail.value;  //发送选择改变，携带值为
     var srSmall = this.data.incomeArray[0][e.detail.value[0]];
     var srlarge = this.data.incomeArray[1][e.detail.value[1]];
-    var srdata = srSmall + '-' + srlarge;
+
+    if (srSmall > srlarge && srSmall != '不限' && srlarge != '以上') {     //判断  最小值  大于  最大值  数据互换
+      //  console.log('调换')
+      var srdata = srlarge + '-' + srSmall;
+      that.Exchange(_value);    // 调用数组调换
+
+    } else {
+
+      var srdata = srSmall + '-' + srlarge;  //否则正常选中
+
+    }
+
     // console.log(srdata);
     this.setData({
-      incomeindex: e.detail.value,
+      incomeindex: _value,
       income: srdata,
       incomeid:1,
     })
@@ -459,6 +479,17 @@ Page({
     })
   },
 
+  // 数组数据调换
+  Exchange: function (data) {
+    for (var i = 0; i < data.length / 2; i++) {
+      var data_i = data[i];
+      data[i] = data[data.length - 1 - i];
+      data[data.length - 1 - i] = data_i;
+    }
+    return;
+  },
+
+
   // contactEvent: function (e) {   //  允许有意者联系我    单项选择器
   //   // console.log(this.data.selectArray[e.detail.value].area_name)
   //   // console.log('picker发送选择改变，携带值为', e.detail.value)
@@ -720,3 +751,10 @@ Page({
 
 })
 
+var data_processing = function (data, min_max, ) {
+  for (let i = 0; i < data.length; i++) {    //已选中的数据处理
+    if (data[i] == min_max) {
+      return i;
+    }
+  }
+}

pages/register/OwnData/OwnData.js

@@ -177,6 +177,8 @@ Page({
     app.postRequest(Marriage_url, Marriage_data, function (res) {      //  婚史 ajax
       if (res.code == 201) {
         // console.log(res.data);
+
+    
         that.setData({
           MarriageArray: res.data
         })
@@ -192,7 +194,7 @@ Page({
     };
     app.postRequest(income_url, income_data, function (res) {      //  收入 ajax
       if (res.code == 201) {
-        // console.log(res.data);
+        console.log(res.data);
         that.setData({
           incomeArray: res.data
         })

pages/register/OwnData/OwnData.wxml

@@ -126,6 +126,8 @@
           </picker>
 </view>
 
+
+
 <view class="Choice_dx_box">     <!--  收入 单项选择器-->
             <picker  bindchange="incomeEvent" value="{incomeindex}}" range="{{incomeArray}}"  range-key="name">