1

app.js

@@ -7,6 +7,7 @@ App({
   },
 
   judge_Land() {
+<<<<<<< HEAD
     // try {
     //   const value = wx.getStorageSync('wx_id')
     //   if (value) {
@@ -15,6 +16,19 @@ App({
     // } catch (e) {
     //   // Do something when catch error
     // }
+=======
+    // console.log(wx.getStorageSync('wx_id'))    //已经授权 id
+    // console.log(wx.getStorageSync('access_token'))    //是否注册过
+
+    try {
+      const value = wx.getStorageSync('wx_id')
+      if (value) {
+        // Do something with return value
+      }
+    } catch (e) {
+      // Do something when catch error
+    }
+>>>>>>> 465e4a521529b4053bd5916de8135b481ec44d51
 
     try {
       if (wx.getStorageSync('access_token')) {   //是否注册过
@@ -46,8 +60,6 @@ App({
     } catch (e) {
       // Do something when catch error
     }
-    // console.log(wx.getStorageSync('wx_id'))    //已经授权 id
-    // console.log(wx.getStorageSync('access_token'))    //是否注册过
 
 
 
@@ -58,6 +70,7 @@ App({
   onLoad: function (options) {
 
     webSocket.connectSocket();
+
   
   },
 
@@ -117,7 +130,7 @@ App({
       success: function (res) {
           if(res.data.code == "401"){
             wx.clearStorageSync();
-            wx.navigateTo({
+            wx.reLaunch({
               url: '/pages/Landpage/Land/Land'
             });
           }

app.json

@@ -1,6 +1,7 @@
 {
   "pages": [
-        "pages/index/index",
+  "pages/index/waitfor/waitfor",
+  "pages/index/index",
   "pages/Jurisdiction/click_Jurisdiction/click_Jurisdiction",
 "pages/personal_core/vehicle/vehicle",
   "pages/information/chat/chat",
@@ -16,7 +17,7 @@
   "pages/Setup/Aboutus/Aboutus",
    "pages/Setup/security/security",
    "pages/Setup/Setuplist/Setuplist",
-        "pages/payment/Member/Member",
+   "pages/payment/Member/Member",
     "pages/personal_core/Album/Album",
      "pages/personal_core/requirements/requirements",
     "pages/personal_core/personaldataModifythe/personaldataModifythe",

pages/chat-list/chat-list.js

@@ -132,6 +132,9 @@ Page({
           if (dataAtt[index].type == 2) {
             dataAtt[index].content = '[图片]'
           }
+     
+          dataAtt[index].isTouchMove = false    //  处理滑动
+
         }
         if(data.data){
           _this.setData({
@@ -197,56 +200,59 @@ Page({
 
   },
 
-  touchstart: function (e) {
-    var that =this;
-    // thath.setData({
-      startX: e.changedTouches[0].clientX
-    //   startY: e.changedTouches[0].clientY
-    // })
-
-    // console.log(e.changedTouches[0].clientX);
-    // console.log(e.changedTouches[0].clientY);
+ 
 
+  touchstart: function (e) {
+    this.setData({
+      startX: e.changedTouches[0].clientX,
+      startY: e.changedTouches[0].clientY
+    })
   },
 
-
   touchmove: function (e) {
 
-    console.log(e.changedTouches[0].clientX);
-    // console.log(e.changedTouches[0].clientY);
-
-    // let index = e.currentTarget.dataset.index,//当前索引
-      // startX = this.data.startX,//开始X坐标
-      // startY = this.data.startY,//开始Y坐标
+    let index = e.currentTarget.dataset.index,//当前索引
+      startX = this.data.startX,//开始X坐标
+      startY = this.data.startY,//开始Y坐标
+      touchMoveX = e.changedTouches[0].clientX,//滑动变化坐标
+      touchMoveY = e.changedTouches[0].clientY,//滑动变化坐标
+      //获取滑动角度
+      angle = this.angle({ X: startX, Y: startY }, { X: touchMoveX, Y: touchMoveY });
+    console.log(angle)
 
-      // touchMoveX = e.changedTouches[0].clientX,//滑动变化坐标
-      // touchMoveY = e.changedTouches[0].clientY,//滑动变化坐标
-      // //获取滑动角度
-      // angle = this.angle({ X: startX, Y: startY }, { X: touchMoveX, Y: touchMoveY });
 
+    this.data.list.forEach(function (v, i) {
+      v.isTouchMove = false
+      //滑动超过30度角 return
 
-    // this.data.list.forEach(function (v, i) {
-    //   v.isTouchMove = false
-    //   //滑动超过30度角 return
+      if (Math.abs(angle) > 30) return;
 
-    //   if (Math.abs(angle) > 30) return;
-
-    //   if (i == index) {
-    //     if (touchMoveX > startX) //右滑
-    //       v.isTouchMove = false
-    //     else //左滑
-    //       v.isTouchMove = true
-    //   }
-    // })
+      if (i == index) {
+        if (touchMoveX > startX) //右滑
+          v.isTouchMove = false
+        else //左滑
+          v.isTouchMove = true
+      }
+    })
 
 
     // //更新数据
-    // this.setData({
-    //   list: this.data.list
-    // })
+    this.setData({
+      list: this.data.list
+    })
 
 
   },
 
+  angle: function (start, end) {
+    var _X = end.X - start.X,
+      _Y = end.Y - start.Y
+    //返回角度 /Math.atan()返回数字的反正切值
+    return 360 * Math.atan(_Y / _X) / (2 * Math.PI)
+  },
+
+
+
+
 
 });

pages/chat-list/chat-list.wxml

@@ -13,5 +13,5 @@
         </view>
     </block>
 
-
-<!-- <view style=' margin-top:10px;width:100%;height:80rpx;border:1px solid;text-align:center;line-height:80rpx; '  bindtap='ceshi'>点击</view> -->
+<!-- 
+<view style=' margin-top:10px;width:100%;height:80rpx;border:1px solid;text-align:center;line-height:80rpx; '  bindtap='ceshi'>点击</view> -->

pages/chat-list/view/chat-item.wxml

@@ -3,8 +3,8 @@
 
 
             
-              <view class="{{isTouchMove ? 'chat-item-styleon' : 'chat-item-style'}}" bindtap="toChat" data-item="{{item}}" 
-              data-dsa="{{isTouchMove}}" hover-class="press-style">
+              <view class="{{item.isTouchMove ? 'chat-item-styleon' : 'chat-item-style'}}" bindtap="toChat" data-item="{{item}}" 
+              data-dsa="{{item.isTouchMove}}" hover-class="press-style">
                           <template is="chat-item-head" data="{{headUrl:item.img,count:item.count}}"/> <!-- 接收消息 提示小红点 引入页面 -->
 
                           <view class="chat-item-content-super-style">

pages/index/waitfor/waitfor.js

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

pages/index/waitfor/waitfor.json

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

pages/index_details/index_details.js

@@ -263,7 +263,7 @@ console.log(that.data.uploadImages)
         // wx.navigateTo({
         //   url: '../chat/chat?to_id=' +  + '&myheadurl=' + that.myheadurl + '&headUrl=' + that.data.options_img
         // });
-       
+       return;
       } 
 
       if (res.data.location == 'shiming') {
@@ -275,14 +275,14 @@ console.log(that.data.uploadImages)
                 if (res.confirm) {
                     // console.log('用户点击确定');
                       wx.navigateTo({
-                        url: '/pages/personal_core/Realname/Realname'
+                        url: '/pages/personal_core/home_list/home_list'
                       });
                 } else if (res.cancel) {
                   // console.log('用户点击取消')
                 }
               }
             })
-
+        return;
       }
 
       if (res.data.location == 'huiyuan') {
@@ -300,7 +300,7 @@ console.log(that.data.uploadImages)
             }
           }
         })
-
+        return;
       }
 
       // if (res.data.location == shiming) {
@@ -310,10 +310,7 @@ console.log(that.data.uploadImages)
       // }
 
 
-    
-
-
-      // app.Tips(res.msg);
+      app.Tips(res.msg);
 
     })
 

pages/information/chat/chat.js

@@ -413,8 +413,11 @@ Page({
           isMy: false,   //他人
         };
 
+       
         let _Receive_news = that.data.Receive_news;
-        _Receive_news.push(obj);      //合并历史消息对象
+        if (typeof _Receive_news == 'object'){
+          _Receive_news.push(obj);      //合并历史消息对象
+        }
 
         that.setData({
           Receive_news: _Receive_news,     //前台数据赋值 

pages/personal_core/home/home.js

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

project.config.json

@@ -9,9 +9,9 @@
 		"postcss": true,
 		"minified": true,
 		"newFeature": true,
-		"coverView": true,
 		"autoAudits": false,
 		"checkInvalidKey": true,
+		"coverView": true,
 		"checkSiteMap": true,
 		"uploadWithSourceMap": true,
 		"babelSetting": {