1

app.js

@@ -6,7 +6,13 @@ App({
   },
 
 
-  asd() {
+  share() {   //分享
+    wx.showShareMenu();
+    console.log(1);
+  },
+
+
+  judge_Land() {
     try {
       const value = wx.getStorageSync('wx_id')
       if (value) {
@@ -19,7 +25,13 @@ App({
     try {
       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
@@ -35,10 +47,12 @@ App({
       })
 
     } else if (wx.getStorageSync('wx_id')) {  //是否授权
+      // console.log(2);
       wx.reLaunch({
         url: '/pages/Landpage/Land/Land'    //授权过 进入登陆页
       })  
     } 
+    
     // else {
     //   wx.reLaunch({
     //     url: '/pages/Jurisdiction/click_Jurisdiction/click_Jurisdiction'   //未授权  进入授权页
@@ -50,6 +64,8 @@ App({
 
   
   onLaunch: function (options) {
+    wx.showShareMenu();
+
     var _this = this;
     // 查看是否授权
  
@@ -213,7 +229,8 @@ App({
 
 
 
-getApp().asd();
+getApp().judge_Land(); //判断登陆
+getApp().share();  //分享
 
 
 

app.json

@@ -1,10 +1,15 @@
 {
   "pages": [
-        "pages/Landpage/Land/Land",
+  "pages/Setup/Publicaddress/Publicaddress",
+  "pages/Setup/Contactus/Contactus",
+  "pages/Setup/Aboutus/Aboutus",
+  "pages/Setup/Opinion/Opinion",
+  "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/modify/modify",
+ 
    "pages/Setup/security/security",
    "pages/Setup/Setuplist/Setuplist",
     "pages/information/chat/chat",

pages/Setup/Aboutus/Aboutus.js

@@ -0,0 +1,22 @@
+const app = getApp();
+
+Page({
+
+
+  data: {
+
+  },
+
+
+  onLoad: function (options) {
+
+  },
+
+
+  onReady: function () {
+
+  },
+
+
+
+})

pages/Setup/Aboutus/Aboutus.json

@@ -0,0 +1,3 @@
+{
+  "navigationBarTitleText": "关于我们"
+}

pages/Setup/Aboutus/Aboutus.wxss

@@ -0,0 +1,14 @@
+
+.m_logo{width:200rpx;height:200rpx;margin:auto;border-radius:20rpx;overflow:hidden;margin-top:40rpx;}
+.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;}
+
+.box{border-top:1px solid #F8F8F8;margin-top:40rpx;}
+.setup_box{padding:0 40rpx;}
+.setup_box navigator{border-bottom:1px solid #F8F8F8;padding:26rpx 0;}
+/* .setup_box navigator:last-child{border:0;} */
+.setup_box navigator text{font-size:30rpx;color:#333;float:left;}
+.setup_box navigator image{width:33rpx;height:30rpx;position:relative;top:10rpx;float:right;}
+
+.company{position:absolute;bottom:40rpx;width:100%;text-align:center;font-size:24rpx;color:#666;}

pages/Setup/Contactus/Contactus.js

@@ -0,0 +1,19 @@
+
+Page({
+
+
+  data: {
+
+  },
+
+  onLoad: function (options) {
+
+  },
+
+
+  onShow: function () {
+
+  },
+
+  
+})

pages/Setup/Contactus/Contactus.json

@@ -0,0 +1,3 @@
+{
+  "navigationBarTitleText": "联系我们"
+}

pages/Setup/Contactus/Contactus.wxml

@@ -0,0 +1,25 @@
+<view class="yzlist_box">
+        <view class='yzlist c' >
+                <text>客服微信</text>
+
+                <view class='yzlist_text'>ninkefu01</view>
+        </view>
+
+        <view class='yzlist c'>
+                <text>客服邮箱</text>
+
+                <view class='yzlist_text'>nini@ninihl.com</view>
+        </view>
+
+        <view class='yzlist c'>
+                <text>官方网址</text>
+
+                <view class='yzlist_text'>www.ninihl.com</view>
+        </view>
+
+        <view class='yzlist c' >
+                <text>微信公众号</text>
+
+                <view class='yzlist_text'>搜索"约会邦"或"ninihunlian"</view>
+        </view>
+</view>

pages/Setup/Contactus/Contactus.wxss

@@ -0,0 +1,4 @@
+.yzlist_box{margin:auto;padding:0 40rpx;}
+.yzlist{border-bottom:1px solid #F5F5F5;position:relative;padding:30rpx 0;}
+.yzlist text{font-size:26rpx;color:#333;float:left;}
+.yzlist .yzlist_text{font-size:26rpx;color: #999;float:right;}

pages/Setup/Opinion/Opinion.js

@@ -0,0 +1,57 @@
+const app = getApp();
+
+Page({
+
+ 
+  data: {
+
+    selectArray: [], // 性别-数据
+    index: '',  // 性别-下标、
+    sex: '',     //  性别  
+  },
+
+ 
+  onLoad: function (options) {
+    var that =this;
+        //  性别 ajax
+        let p_url = 'public/paramsgather?type=sex';
+        let p_data = {
+          // pid: '0'
+        };
+        app.postRequest(p_url, p_data, function (res) {      //  性别 ajax
+          if (res.code == 201) {
+            // console.log(res.data);
+            that.setData({
+              selectArray: res.data
+            })
+
+          }
+          // let dictObject = res.data;
+          // // 对象转成数组
+          // var createArr = []
+          // for (let i in dictObject) {
+          //   createArr.push(dictObject[i]);
+          // }
+
+        })
+  },
+
+
+
+  onShow: function () {
+
+  },
+
+  GenderEvent: function (e) {   //  性别    单项选择器
+    // console.log(this);
+    // console.log(e);
+    // console.log(this.data.selectArray[e.detail.value]);
+    // console.log('picker发送选择改变，携带值为', e.detail.value)
+    this.setData({
+      index: e.detail.value,
+      sex: e.detail.value
+    })
+  },
+
+
+})

pages/Setup/Opinion/Opinion.json

@@ -0,0 +1,3 @@
+{
+  "navigationBarTitleText": "意见反馈"
+}

pages/Setup/Opinion/Opinion.wxml

@@ -0,0 +1,37 @@
+
+
+<view class='data_box'>
+
+        <view class="Choice_dx_box">     <!--  性别 单项选择器-->
+                    <picker  bindchange="GenderEvent" value="{{index}}" range="{{selectArray}}">
+                            
+                              <view class='Choice_dx c'>
+                                    <view class="Choice_dx_title">请选择反馈类型</view>
+
+                                    <view class='Choice_dx_text' >
+                                      
+                                          {{selectArray[index] ? selectArray[index]  : "请选择"}}
+                                        
+                                    </view>
+                                        
+                              </view>
+                  </picker>
+        </view>
+
+        <view class='index_box'>
+                 <input type='text' placeholder="请描述您遇到的问题" bindinput="getPhone"  value=""></input>
+        </view>
+        
+        <view class='img_box'>
+                <image src='/image/ce1.jpg' mode="aspectFill"></image>
+        </view>
+
+        <view class='upload_box'>
+                <image src='/image/sctp1.png'  mode="widthFix"></image>
+                <text class='upload_text1'>上传相关截图说明</text>
+                <text class='upload_text2'>(可选)</text>
+        </view>
+
+       <view class='NextStep'  bindtap='register'>提交</view>
+
+</view>

pages/Setup/Opinion/Opinion.wxss

@@ -0,0 +1,26 @@
+
+.data_box{width:90%;margin:auto;margin-top:44rpx;position:relative;}
+
+
+.Choice_dx_box{border-bottom:1px solid #eee;padding-bottom:14rpx;color:#ECECEC;line-height:50rpx;margin-top:30rpx;}
+.Choice_dx_title{float:left;font-size:28rpx;color:#000;}
+.Choice_dx_text{float:right;font-size:28rpx;color:#B3B3B3;max-width:620rpx;text-overflow:ellipsis;white-space:nowrap;overflow:hidden;}
+/* .Choice_dx_text .picker{} */
+.Choice_dx_text .picker text{display:block;float:right;}
+
+
+.index_box{border:1px solid #eee;height:80rpx;margin-top:30rpx;border-radius:10rpx;background:#F5F5F5;}
+.index_box input{height:100%;padding:0 30rpx;font-size:26rpx;display:block;}
+
+.img_box{width:220rpx;height:220rpx;margin-top:30rpx;}
+.img_box image{width:100%;height:100%;}
+
+.upload_box{border:1px solid #eee;height:80rpx;margin-top:30rpx;border-radius:10rpx;
+display:flex;justify-content:center;align-items:center;
+}
+
+.upload_box image{width:33rpx;height:0;margin-top:2rpx;}
+.upload_box .upload_text1{font-size:26rpx;color:#414141;margin-left:5rpx;}
+.upload_box .upload_text2{font-size:26rpx;color:#9F9F9F;margin-left:5rpx;}
+
+.NextStep{border:1px solid;text-align:center;font-size:32rpx;color:#FFF;background: linear-gradient(to right, #FF9BCA , #FF79B8);height:88rpx;line-height:88rpx;border-radius:10rpx;margin-top:80rpx;}

pages/Setup/Publicaddress/Publicaddress.js

@@ -0,0 +1,66 @@
+// pages/Setup/Publicaddress/Publicaddress.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})

pages/Setup/Publicaddress/Publicaddress.json

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

pages/Setup/Publicaddress/Publicaddress.wxml

@@ -0,0 +1,16 @@
+
+
+<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_gzh_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>
+                        <text class='text'>3.点击【关注公众号】即可进行关注</text>
+                   </view>
+            </view>
+</view>

pages/Setup/Publicaddress/Publicaddress.wxss

@@ -0,0 +1,11 @@
+
+.m_gzh_box{width:90%;margin:auto;margin-top:40rpx;background:#FFF;border-radius:20rpx;padding-bottom:100rpx;box-shadow:0 0px 12px 0 rgb(235, 232, 232);}
+
+.m_2wm{width:240rpx;height:240rpx;margin:auto;}
+.m_2wm image{width:100%;height:100%;}
+
+.m_gzh_text{margin-top:40rpx;padding:0 30rpx;}
+.m_gzh_text .title{font-size:32rpx;color:#333;font-weight:600;}
+.m_gzh_text .text_box{margin-top:30rpx;}
+.m_gzh_text .text_box .text{font-size:26rpx;color:#666;display:block;line-height:48rpx;margin-bottom:10rpx;}
+.m_gzh_text .text_box .text image{width:50rpx;height:0;position:relative;top: -4rpx;}

pages/Setup/Setuplist/Setuplist.js

@@ -1,73 +1,23 @@
-// pages/Setup/Setuplist/Setuplist.js
+
 Page({
 
-  /**
-   * 页面的初始数据
-   */
+
   data: {
 
   },
 
-  /**
-   * 生命周期函数--监听页面加载
-   */
+ 
   onLoad: function (options) {
 
   },
 
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
 
-  },
 
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage: function () {
-
-  },
   register:function(){
     wx.clearStorageSync();
-    wx.navigateTo({
+    wx.reLaunch({
       url: '/pages/Landpage/Land/Land'
     });
-    console.log(111);
+    // console.log(111);
   }
 })

pages/Setup/Setuplist/Setuplist.wxml

@@ -24,7 +24,7 @@
              <image src='/image/gengduo.png' mode="aspectFill"></image>
        </navigator> -->
 
-       <navigator hover-class="none" class='c'>
+       <navigator hover-class="none" class='c' url="/pages/Setup/Opinion/Opinion">
              <text>意见反馈</text>
              <image src='/image/gengduo.png' mode="aspectFill"></image>
        </navigator>
@@ -33,17 +33,17 @@
 <view style='height:10rpx;background:#F5F5F5'></view>
 
 <view class="setup_box">
-       <navigator hover-class="none" class='c'>
+       <navigator hover-class="none" class='c' url="/pages/Setup/Aboutus/Aboutus">
              <text>关于我们</text>
              <image src='/image/gengduo.png' mode="aspectFill"></image>
        </navigator>
 
-       <navigator hover-class="none" class='c'>
+       <navigator hover-class="none" class='c' url="/pages/Setup/Contactus/Contactus">
              <text>联系我们</text>
              <image src='/image/gengduo.png' mode="aspectFill"></image>
        </navigator>
 
-       <navigator hover-class="none" class='c'>
+       <navigator hover-class="none" class='c' url="/pages/Setup/Publicaddress/Publicaddress">
              <text>微信公众号</text>
              <image src='/image/gengduo.png' mode="aspectFill"></image>
        </navigator>

pages/Setup/Setuplist/Setuplist.wxss

@@ -2,7 +2,7 @@
 .setup_box{padding:0 40rpx;}
 .setup_box navigator{border-bottom:1px solid #F8F8F8;padding:26rpx 0;}
 .setup_box navigator:last-child{border:0;}
-.setup_box navigator text{font-size:30rpx;color:#333; }
+.setup_box navigator text{font-size:30rpx;color:#333;float:left;}
 .setup_box navigator image{width:33rpx;height:30rpx;position:relative;top:10rpx;float:right;}
 
 .NextStep{text-align:center;font-size:34rpx;color:#FFF;background: linear-gradient(to right, #FF9BCA , #FF79B8);width:675rpx;height:88rpx;line-height:88rpx;border-radius:10rpx;margin:auto;margin-top:50rpx;}

pages/Setup/modify/modify.js

@@ -1,66 +1,135 @@
-// pages/Setup/modify/modify.js
+const app = getApp();
 Page({
 
-  /**
-   * 页面的初始数据
-   */
+ 
   data: {
 
+    past_password:'', //旧密码
+    password:'', //新密码
+    qpassword:'', //确认密码
+
+    used_value:'',
+    password_value:'',
+    qpassword_value:'',
   },
 
-  /**
-   * 生命周期函数--监听页面加载
-   */
+ 
   onLoad: function (options) {
 
   },
 
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
-
+  //获取旧密码
+  used_password: function (e) {
+    var _used_password = e.detail.value;
+    // console.log(_used_password);
+    this.setData({
+      past_password: _used_password
+    });
+  },
+  
+  //获取新密码
+  password: function (e) {
+    var _password = e.detail.value;
+    // console.log(_password);
+    this.setData({
+      password: _password
+    });
+  },
+  
+  //获取确认密码
+  qpassword: function (e) {
+    var _qpassword = e.detail.value;
+    // console.log(_qpassword);
+    this.setData({
+      qpassword: _qpassword
+    });
   },
 
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {
 
-  },
+  //完成事件
+  complete: function (e) {
+    var _this = this;
 
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
+    var _past_password = _this.data.past_password;
+    var _password = _this.data.password;
+    var _qpassword = _this.data.qpassword;
 
-  },
+    // console.log(_past_password);
+    // console.log(_password);
+    // console.log(_qpassword);
 
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {
 
-  },
+      if (_past_password  == ''){
+          var _qrcode = '原始密码不能为空'
+          getApp().Tips(_qrcode);
+      } else if (_password == ''){
+        var _qrcode = '新密码不能为空'
+        getApp().Tips(_qrcode);
+      } else if (_qpassword == '') {
+        var _qrcode = '确认新密码不能为空'
+        getApp().Tips(_qrcode);
+      } else if (_password != _qpassword) {
+        var _qrcode = '两次新密码输入不一致'
+        getApp().Tips(_qrcode);
+      }else{
 
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
 
-  },
+        let income_url = 'my/accountsecurity/resetpassword';
+        let income_data = {
+          past_password: _past_password, //旧密码
+          password: _password, //新密码
+          qpassword: _qpassword, //确认密码
+        };
+
+        app.postRequest(income_url, income_data, function (res) {
+
+          // console.log(income_data.photo);
+          if (res.code == 201) {
+
+                wx.showToast({
+                  title: '修改成功',
+                  duration: 1500,
+                })
+
+                
+            setTimeout(function () {
+              wx.clearStorageSync();
+              wx.reLaunch({
+                url: '/pages/Landpage/Land/Land'
+              });
+     
+            }, 800)
+
+  
+
+            return;
+          } 
+          // console.log(res.data.past_password);
+          if (res.data.past_password){
+            getApp().Tips(res.data.past_password[0]);
+
+            _this.setData({
+                used_value: '',
+            });
+
+          } else if (res.data.password){
+            getApp().Tips(res.data.password[0]);
+
+            _this.setData({
+              password_value: '',
+              qpassword_value: '',
+            });
+          }
+      
+
+          
+        })
+
+
+      }
 
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
 
   },
 
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage: function () {
 
-  }
 })

pages/Setup/modify/modify.wxml

@@ -4,21 +4,21 @@
             <view class='form_zh_img1'>
                   <image  src='/image/dl3.png' mode="widthFix"></image>
             </view> 
-            <input  password type="text"  placeholder="请输入旧的密码"  value=""   bindinput="password"></input>
+            <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>
             </view> 
-            <input  password type="text"  placeholder="请输入新的密码"  value=""   bindinput="password"></input>
+            <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>
             </view> 
-            <input  password type="text"  placeholder="再次输入新的密码"  value=""   bindinput="password"></input>
+            <input  password type="text"  placeholder="再次输入新的密码"  value="{{qpassword_value}}"   bindinput="qpassword"></input>
        </view>
 
       <button class='form_button'   bindtap='complete'>确认</button>

pages/index/index.js

@@ -62,7 +62,6 @@ Page({
   },
 
   onLoad: function (options) {
-   
     webSocket.connectSocket();
   },