1

app.js

@@ -52,7 +52,7 @@ App({
     //   })
     // }
 
-
+  
   },
 
   
@@ -189,6 +189,7 @@ App({
 
 
   getDistrict(latitude, longitude) {
+
     let _page = this;
     let keys = '3VTBZ-JEH6Q-M7D5I-GNPVS-3QWBH-QUFY3';
     wx.request({

modules/chat-input/chat-input.wxss

@@ -20,6 +20,8 @@ input{
     width: 100%;
     align-items: center;
     height:100rpx;
+    padding:8rpx 0 36rpx 0;
+
 }
 .input-flex-column{
     width:100%;

pages/Landpage/Land/Land.js

@@ -13,15 +13,25 @@ Page({
 
     inputValue1: null,
     inputValue2: null,
-
+    usertext:'',   //储存手机号码
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+    var _this =this;
     setTimeout(function () {
       wx.hideLoading()
+
+ 
+      // 记录登陆过的手机
+    if (wx.getStorageSync('user')){
+        _this.setData({
+          inputValue1: wx.getStorageSync('user'),
+        });
+      }
+ 
     })
 
     wx.getSetting({
@@ -33,6 +43,7 @@ Page({
           // });
           console.log('已经授权');
 
+
         } else {
       wx.reLaunch({
         url: '/pages/Jurisdiction/click_Jurisdiction/click_Jurisdiction'   //未授权  进入授权页
@@ -75,7 +86,7 @@ Page({
     app.postRequest(Land_url, Land_data, function (res) {
 
       if (res.code == 201) {
-         console.log(res.data);
+        console.log(res.data);
         // console.log(res.data.access_key);
         // console.log(res.data.access_token);
 
@@ -88,6 +99,7 @@ Page({
                     wx.setStorageSync('access_key', res.data.access_key)
                     wx.setStorageSync('access_token', res.data.access_token)
                     wx.setStorageSync('access_user', res.data.access_user)
+                    wx.setStorageSync('user', that.data.user)
                   } catch (e) {
 
                   }

pages/Setup/Setuplist/Setuplist.js

@@ -14,10 +14,17 @@ Page({
 
 
   register:function(){
+    var user = wx.getStorageSync('user');
     wx.clearStorageSync();
+
+    try {
+      wx.setStorageSync('user', user)
+    } catch (e) {
+    }
+
     wx.reLaunch({
-      url: '/pages/Landpage/Land/Land'
+      url: '/pages/Landpage/Land/Land'    //传递登陆过手机号码
     });
-    // console.log(111);
+
   }
 })

pages/chat/chat.wxml

@@ -26,7 +26,7 @@
 <template is="chat-input" data="{{inputObj,textMessage,showVoicePart:true}}"/> -->
 
  <scroll-view
-        style="height:{{pageHeight}}px;width: 100%;display: flex;flex-direction: column;margin-top: 54rpx;"
+        style="height:{{pageHeight -44}}px;width: 100%;display: flex;flex-direction: column;"
         scroll-y="true"
         scroll-top="{{scrollTopVal}}"
         bindtap="resetInputStatus"

pages/index/index.js

@@ -50,9 +50,7 @@ Page({
 
 
     // 省市区
-    province: 0,     // 省 要传的数据
     city: 0,     // 市  要传的数据
-    area: 0,     // 区 要传的数据
     provinceName: '',     // 省 要传的数据
     cityName: '',     // 市  要传的数据
     areaName: '',     // 区 要传的数据
@@ -111,9 +109,6 @@ Page({
 
 
 
-
-
-
     if (app.globalData.income) {
       that.setData({
         income: _income,
@@ -123,56 +118,30 @@ Page({
         income: _income,
       })
     }
+    // console.log(_Selection)
 
-
-    var _province = app.globalData.province     //  省  
     var _city = app.globalData.city      //  市 
-    var _area = app.globalData.area     //  区  
     var _provincename = app.globalData.provinceName  //  省 名称
     var _cityname = app.globalData.cityName   //  市 名称
     var _areaname = app.globalData.areaName      //  区  名称
 
-    if (_province && _city && _area && _Selection == 1) {
+    if (_provincename && _cityname && _Selection == 1) {
       that.setData({
-        province: _province,
         city: _city,
-        area: _area,
         provinceName: _provincename,  // 省名称
         cityName: _cityname, // 市名称
         areaName: _areaname,  // 区名称
       })
 
-      // console.log(that.data.province)
-      // console.log(that.data.city)
-      // console.log(that.data.area)
-      // console.log(that.data.provinceName)
-      // console.log(that.data.cityName)
-      // console.log(that.data.areaName)
-    }
-
-
-    // if (_provincename && _cityname && _areaname) {
-    //   that.setData({
-    //     provinceName: _provincename,
-    //     cityName: _cityname,
-    //     areaName: _areaname,
-    //     // step: 0,
-    //   })
-
-    //   // console.log(_provincename);
-    //   // console.log(_cityname);
-    //   // console.log(_areaname);  
-    // } else if (_cityname == 0 && _Selection == 1) {     //判断筛选页面  是否清空数据   同时 是否选中，而不是返回
-    //   that.setData({
-    //     provinceName: _provincename,
-    //     cityName: _cityname,
-    //     areaName: _areaname,
-    //     // step: 0,
-    //   })
-    // }
-
-
+    } else if (_provincename == '' && _cityname == '' &&  _Selection == 1){
+      that.setData({
+        city: _city,
+        provinceName: _provincename,  // 省名称
+        cityName: _cityname, // 市名称
+        areaName: _areaname,  // 区名称
+      })
 
+    }
 
 
 
@@ -554,7 +523,6 @@ Page({
     var that = this;
     // console.log(that.data.age);
 
-    // '&province=' + that.data.province + '&city=' + that.data.city + '&area=' + that.data.area +  
 
 
     // console.log(that.data.provinceName);
@@ -563,7 +531,7 @@ Page({
 
 
     wx.navigateTo({
-      url: '/pages/index_screen/index_screen?age=' + that.data.age + '&height=' + that.data.height + '&marry=' + that.data.marry + '&idmarry=' + that.data.idmarry + '&education=' + that.data.education + '&income=' + that.data.income + '&educationid=' + that.data.educationid + '&province=' + that.data.province + '&city=' + that.data.city + '&area=' + that.data.area + '&provinceName=' + that.data.provinceName + '&cityName=' + that.data.cityName + '&areaName=' + that.data.areaName +  ''
+      url: '/pages/index_screen/index_screen?age=' + that.data.age + '&height=' + that.data.height + '&marry=' + that.data.marry + '&idmarry=' + that.data.idmarry + '&education=' + that.data.education + '&income=' + that.data.income + '&educationid=' + that.data.educationid +'&city=' + that.data.city +  '&provinceName=' + that.data.provinceName + '&cityName=' + that.data.cityName + '&areaName=' + that.data.areaName +  ''
     })
 
 
@@ -609,9 +577,7 @@ Page({
         marry: that.data.marry,    //   婚史 
         education: that.data.education,    //  学历  
         income: _income,  //收入
-        province: that.data.province ,     // 省
         city: that.data.city,                    // 市
-        area: that.data.area,                    // 区
       };
 
       console.log('选择');
@@ -702,9 +668,7 @@ Page({
         marry: that.data.marry,    //   婚史 
         education: that.data.education,    //  学历  
         income: _income,  //收入
-        province: that.data.province ,     // 省
         city: that.data.city,                    // 市
-        area: that.data.area,                    // 区
       };
 
       // console.log('选择');
@@ -878,15 +842,19 @@ Page({
     var _style = e.currentTarget.dataset.style;
     // console.log(_style);
 
+
+    var regionid = e.currentTarget.dataset.id;     //传递地区ID
+    // console.log(regionid);
+
+
     switch (_style) {
+
       case 'provinceLx':
         // console.log('省');
         that.setData({
-          province: that.data.provinceid,   // 省数据
+          city: regionid,
           provinceName: that.data.provincetext, // 省名字
-          city: 0,   // 市数据清空
           cityName: '',   // 市名字清空
-          area: 0,   // 区数据清空
           areaName: "",  //  区名字
         })
         break;
@@ -894,39 +862,31 @@ Page({
       case 'cityLx':
         // console.log('市');
         that.setData({
-          province: that.data.provinceid,   // 省数据
+          city: regionid,
           provinceName: that.data.provincetext, // 省名字
-          city: that.data.cityidx,   // 市数据
           cityName: that.data.citytext, // 省名字
-          area: 0,   // 区数据清空
           areaName: "",  //  区名字
         })
         break;
 
       case 'areaLx':
         // console.log('区');
-        var areaid = e.currentTarget.dataset.id;     //区ID
         var areatext = e.currentTarget.dataset.text;     //区名字
-
         that.setData({
-          province: that.data.provinceid,   // 省数据
+          city: regionid,
           provinceName: that.data.provincetext, // 省名字
-          city: that.data.cityidx,   // 市数据
           cityName: that.data.citytext, // 省名字
-          area: areaid,   // 区数据
           areaName: areatext,   //  区名字
 
         })
         break;
 
     }
-
-    // console.log(that.data.province)
-    // console.log(that.data.city)
-    // console.log(that.data.area)
-    // 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(); //调用筛选
 
@@ -952,11 +912,9 @@ Page({
       cityidx: 0,
       citytext: '',
 
-      province:0,   // 省数据
       provinceName:'', // 省名字
       city: 0,   // 市数据清空
       cityName: '',   // 市名字清空
-      area: 0,   // 区数据清空
       areaName: "",  //  区名字
     })
 

pages/index_screen/index_screen.js

@@ -41,9 +41,7 @@ Page({
 
 
     // 省市区
-    province: 0,     // 省 要传的数据
     city: 0,     // 市  要传的数据
-    area: 0,     // 区 要传的数据
     provinceName: '',     // 省 要传的数据
     cityName: '',     // 市  要传的数据
     areaName: '',     // 区 要传的数据
@@ -79,9 +77,8 @@ Page({
     app.globalData.income = 0;     //  收入 
 
     
-    var _province = option.province      //  省  
+
     var _city = option.city      //  市  
-    var _area = option.area      //  区  
 
     var _provincename = option.provinceName      //  省  
     var _cityname = option.cityName      //  市  
@@ -94,9 +91,7 @@ Page({
 
 
     that.setData({
-      province: _province,
       city: _city,
-      area: _area,
       provinceName: _provincename,  // 省
       cityName: _cityname, // 市
       areaName: _areaname,  // 区
@@ -106,9 +101,8 @@ Page({
 
     })
 
-    // console.log(that.data.province)
+
     // console.log(that.data.city)
-    // console.log(that.data.area)
     // console.log(that.data.provinceName)
     // console.log(that.data.cityName)
     // console.log(that.data.areaName)
@@ -584,9 +578,7 @@ Page({
     app.globalData.Selection = String(1);    //  是否选中   1 选中   0没选中
 
 
-    app.globalData.province = String(_this.data.province);    //  省 
     app.globalData.city = String(_this.data.city);    //  市 
-    app.globalData.area = String(_this.data.area);    //  区 
 
     app.globalData.provinceName = String(_this.data.provinceName);    //  省 
     app.globalData.cityName = String(_this.data.cityName);    //  市 
@@ -635,9 +627,7 @@ Page({
 
       inputValue: '', //ID
 
-      province: 0,  // 市
       city: 0,  // 市
-      area: 0,   // 区
       provinceName: '',  // 省
       cityName: '', // 市
       areaName: '',  // 区
@@ -655,9 +645,7 @@ Page({
     app.globalData.income = String(_this.data.income);     //  收入 
     app.globalData.Selection = String(1);    //  是否选中   1 选中   0没选中
 
-    app.globalData.province = String(_this.data.province);    //  省 
     app.globalData.city = String(_this.data.city);    //  市 
-    app.globalData.area = String(_this.data.area);    //  区 
 
     app.globalData.provinceName = String(_this.data.provinceName);    //  省 
     app.globalData.cityName = String(_this.data.cityName);    //  市 
@@ -721,7 +709,7 @@ Page({
           cityidx: '',   // idx  选中清空
         })
 
-        console.log(res.data)
+        // console.log(res.data)
 
       }
     })
@@ -765,7 +753,7 @@ Page({
           // console.log('执行')
           //   console.log(_index * 42);
         }
-        console.log(res.data)
+        // console.log(res.data)
       }
 
     })
@@ -780,15 +768,17 @@ Page({
     var _style = e.currentTarget.dataset.style;
     // console.log(_style);
 
+    var regionid = e.currentTarget.dataset.id;     //传递地区ID
+    // console.log(regionid);
+
     switch (_style) {
+
       case 'provinceLx':
         // console.log('省');
         that.setData({
-          province: that.data.provinceid,   // 省数据
+          city: regionid,
           provinceName: that.data.provincetext, // 省名字
-          city: 0,   // 市数据清空
           cityName: '',   // 市名字清空
-          area: 0,   // 区数据清空
           areaName: "",  //  区名字
         })
         break;
@@ -796,26 +786,20 @@ Page({
       case 'cityLx':
         // console.log('市');
         that.setData({
-          province: that.data.provinceid,   // 省数据
+          city: regionid,
           provinceName: that.data.provincetext, // 省名字
-          city: that.data.cityidx,   // 市数据
           cityName: that.data.citytext, // 省名字
-          area: 0,   // 区数据清空
           areaName: "",  //  区名字
         })
         break;
 
       case 'areaLx':
         // console.log('区');
-        var areaid = e.currentTarget.dataset.id;     //区ID
         var areatext = e.currentTarget.dataset.text;     //区名字
-
         that.setData({
-          province: that.data.provinceid,   // 省数据
+          city: regionid,
           provinceName: that.data.provincetext, // 省名字
-          city: that.data.cityidx,   // 市数据
           cityName: that.data.citytext, // 省名字
-          area: areaid,   // 区数据
           areaName: areatext,   //  区名字
 
         })
@@ -823,9 +807,7 @@ Page({
 
     }
 
-    // console.log(that.data.province)
     // console.log(that.data.city)
-    // console.log(that.data.area)
     // console.log(that.data.provinceName)
     // console.log(that.data.cityName)
     // console.log(that.data.areaName)
@@ -854,11 +836,9 @@ Page({
       cityidx: 0,
       citytext: '',
 
-      province: 0,   // 省数据
-      provinceName: '', // 省名字
       city: 0,   // 市数据清空
+      provinceName: '', // 省名字
       cityName: '',   // 市名字清空
-      area: 0,   // 区数据清空
       areaName: "",  //  区名字
     })