1

app.json

@@ -1,6 +1,5 @@
 {
   "pages": [
-        "pages/payment/Member/Member",
         "pages/index/index",
   "pages/Jurisdiction/click_Jurisdiction/click_Jurisdiction",
 "pages/personal_core/vehicle/vehicle",
@@ -17,7 +16,7 @@
   "pages/Setup/Aboutus/Aboutus",
    "pages/Setup/security/security",
    "pages/Setup/Setuplist/Setuplist",
-
+        "pages/payment/Member/Member",
     "pages/personal_core/Album/Album",
      "pages/personal_core/requirements/requirements",
     "pages/personal_core/personaldataModifythe/personaldataModifythe",
@@ -30,7 +29,8 @@
     "pages/index_details/index_details",
     "pages/index_screen/index_screen",
     "pages/Landpage/Retrievepassword/Retrievepassword",
-    "pages/register/fillTel/fillTel",
+  "pages/register/Agreement/Agreement",
+  "pages/register/fillTel/fillTel",
     "pages/register/OwnData/OwnData",
     "pages/news/newslist/newslist",
     "pages/news/FabulousI/FabulousI",

pages/chat-list/chat-list.js

@@ -12,8 +12,11 @@ Page({
      * 页面的初始数据
      */
     data: {
-        conversations: [],
-        myheadurl:''
+      conversations: [],
+      myheadurl:'',
+      isTouchMove:false,
+      
+ 
     },
 
     /**
@@ -101,6 +104,8 @@ Page({
     getConversationsItem(item) {
         let {latestMsg, ...msg} = item;
         return Object.assign(msg, JSON.parse(latestMsg));
+
+      console.log(latestMsg)
     },
   onSocketMessageCallback:function(e){
      let _this = this; 
@@ -178,5 +183,70 @@ Page({
               }
           }
       return arr;
-  }
+  },
+
+
+  ceshi: function (e) {
+    console.log(this.data.isTouchMove);
+    this.setData({
+      isTouchMove: 'true',
+    })
+    
+    console.log(this.data.isTouchMove);
+
+
+  },
+
+  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);
+
+  },
+
+
+  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坐标
+
+      // 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
+
+    //   if (Math.abs(angle) > 30) return;
+
+    //   if (i == index) {
+    //     if (touchMoveX > startX) //右滑
+    //       v.isTouchMove = false
+    //     else //左滑
+    //       v.isTouchMove = true
+    //   }
+    // })
+
+
+    // //更新数据
+    // this.setData({
+    //   list: this.data.list
+    // })
+
+
+  },
+
+
 });

pages/chat-list/chat-list.wxml

@@ -1,4 +1,17 @@
+
+
+
 <import src="view/chat-item.wxml"/>
-<block wx:for="{{conversations}}" wx:key="conversationId"  >
-    <template is="chat-item" data="{{item}}"/>
-</block>
+
+
+
+    <block wx:for="{{conversations}}" wx:key="conversationId"  >
+        <view class='m_container' bindtouchstart='touchstart'  bindtouchmove='touchmove'>
+               <template is="chat-item" data="{{item,isTouchMove}}"/>     <!-- 聊天用户列表 -->
+
+               <view class='delete'>删除</view>
+        </view>
+    </block>
+
+
+<!-- <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-head.wxml

@@ -1,6 +1,10 @@
+
+<!-- 接收消息 提示小红点 -->
 <template name="chat-item-head">
     <view class="chat-item-head-super-style">
         <image class="chat-head-style" src="{{headUrl}}" />
         <text wx:if="{{count>0}}" class="unread-style">{{count<=99?count:'99+'}}</text>
     </view>
-</template>
+</template>
+
+

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

@@ -2,19 +2,26 @@
 <template name="chat-item">
 
 
-    <view class="chat-item-style" bindtap="toChat" data-item="{{item}}" hover-class="press-style">
-        <template is="chat-item-head" data="{{headUrl:item.img,count:item.count}}"/>
-        <view class="chat-item-content-super-style">
-            <view class="chat-item-name-style">{{item.nickname}}</view>
-            <!--<image src="./../../image/chat/send_fail.png" style="width: 28rpx;height: 28rpx;margin-right: 6rpx;"/>-->
-            <text class="chat-item-content-style">{{item.content}}</text>
-        </view>
-        <view class="chat-item-status-super-style">
-            <view class="chat-item-time-style">{{item.timeStr}}</view>
-        </view>
-    </view>
-    <view class="list-divide-line" style="width: 79.5%;margin-left: 20.5%"/>
-
-
-    
+            
+              <view class="{{isTouchMove ? 'chat-item-styleon' : 'chat-item-style'}}" bindtap="toChat" data-item="{{item}}" 
+              data-dsa="{{isTouchMove}}" hover-class="press-style">
+                          <template is="chat-item-head" data="{{headUrl:item.img,count:item.count}}"/> <!-- 接收消息 提示小红点 引入页面 -->
+
+                          <view class="chat-item-content-super-style">
+                              <view class="chat-item-name-style">{{item.nickname}}</view>
+                           <!--<image src="./../../image/chat/send_fail.png" style="width: 28rpx;height: 28rpx;margin-right: 6rpx;"/>-->
+                              <text class="chat-item-content-style">{{item.content}}</text>
+                          </view>
+                          
+                          <view class="chat-item-status-super-style">
+                              <view class="chat-item-time-style">{{item.timeStr}}</view>
+                          </view>
+              </view>
+
+          
+
+              <view class="list-divide-line" style="width: 79.5%;margin-left: 20.5%;border-bottom:1px solid #EEE;"/>
+
+
+
 </template>

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

@@ -1,10 +1,27 @@
 @import "chat-item-head.wxss";
-
+.m_container{position:relative;}
+.chat-item-styleon{
+    width:750rpx;
+    display: flex;
+    align-items: center;
+    position: relative;
+    z-index: 20;
+    background:#FFF;
+    transition: all 0.4s;
+  transform: translateX(-148rpx);
+  }
 .chat-item-style{
-    width:100%;
+    width:750rpx;
     display: flex;
     align-items: center;
     position: relative;
+    z-index: 20;
+    background:#FFF;
+    transition: all 0.4s;
+
+   
+   
+   
 }
 .chat-item-content-super-style{
     display: flex;
@@ -40,4 +57,6 @@
     font-size: 20rpx;
     margin-bottom: 20rpx;
     text-align: right;
-}
+}
+
+.delete{position:absolute;top:0;right:0;z-index:10;width:148rpx;height:148rpx;text-align:center;line-height:148rpx;background:#FF4500;font-size:32rpx;color:#FFF;}

pages/register/Agreement/Agreement.js

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

pages/register/Agreement/Agreement.json

@@ -0,0 +1,3 @@
+{
+  "navigationBarTitleText": "注册服务条款"
+}

pages/register/Agreement/Agreement.wxml

@@ -0,0 +1 @@
+<web-view src="https://xiaochengxuapi.jrjyjrjy.com/v1/other/about/agreement"></web-view>

pages/register/Agreement/Agreement.wxss

@@ -0,0 +1 @@
+/* pages/register/Agreement/Agreement.wxss */

pages/register/fillTel/fillTel.js

@@ -238,10 +238,7 @@ complete: function (e) {
   getVerificationCode(res) {
 
     var that = this
-    that.setData({
-      disabled: true,
-      color: '#ccc',
-    })
+
 
           var phone = that.data.user;
 
@@ -266,8 +263,11 @@ complete: function (e) {
             app.postRequest(code_url, code_data, function (res) {
               if (res.code == 201) {
                 // console.log(res.data.id);
+
                 that.setData({
-                  codeid: res.data.id     // 微信ID
+                  codeid: res.data.id,    // 微信ID
+                  disabled: true,
+                  color: '#ccc',
                 })
           
                 //当手机号正确的时候提示用户短信验证码已经发送
@@ -275,35 +275,41 @@ complete: function (e) {
                   title: '短信验证码已发送',
                   icon: 'none',
                   duration: 2000
-                });      
+                });    
+
+                //设置一分钟的倒计时
+                var interval = setInterval(function () {
+                  currentTime--; //每执行一次让倒计时秒数减一
+                  that.setData({
+                    text: "重新发送(" + currentTime + 's)', //按钮文字变成倒计时对应秒数
+
+                  })
+                  //如果当秒数小于等于0时 停止计时器 且按钮文字变成重新发送 且按钮变成可用状态 倒计时的秒数也要恢复成默认秒数 即让获取验证码的按钮恢复到初始化状态只改变按钮文字
+                  if (currentTime <= 0) {
+                    clearInterval(interval)
+                    that.setData({
+                      text: '重新发送',
+                      currentTime: 61,
+                      disabled: false,
+                      color: '#FF9BCA'
+                    })
+                  }
+                }, 1000);
+
+
+
+
                 return;
               }
 
-              // var _qrcode = '微信二维码与微信号,任选一项进行完善'
-              // getApp().Tips(_qrcode);
+              var _qrcode = res.data.mobile[0]
+              getApp().Tips(_qrcode);
 
             })
 
 
    
-            //设置一分钟的倒计时
-            var interval = setInterval(function () {
-              currentTime--; //每执行一次让倒计时秒数减一
-              that.setData({
-                text: "重新发送("+currentTime + 's)', //按钮文字变成倒计时对应秒数
-
-              })
-              //如果当秒数小于等于0时 停止计时器 且按钮文字变成重新发送 且按钮变成可用状态 倒计时的秒数也要恢复成默认秒数 即让获取验证码的按钮恢复到初始化状态只改变按钮文字
-              if (currentTime <= 0) {
-                clearInterval(interval)
-                that.setData({
-                  text: '重新发送',
-                  currentTime: 61,
-                  disabled: false,
-                  color: '#FF9BCA'
-                })
-              }
-            }, 1000);
+  
 
           };
 

pages/register/fillTel/fillTel.wxml

@@ -20,7 +20,7 @@
       <button class='form_button'   bindtap='complete'>完成</button>
 
       <view class='Agreement c'>
-             <view class='Agreement_img'><image src='/image/xy.png' mode="widthFix"></image></view>
-             <navigator>本人<text>同意</text>本协议所有规定</navigator>
+             <!-- <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>
       </view>
 </view>

pages/register/fillTel/fillTel.wxss

@@ -32,9 +32,9 @@ font-size:30rpx;
 
 .Verification{width:226rpx;height:70rpx;background: linear-gradient(to right, #FF9BCA , #FF79B8);position:absolute;right:0;top:18rpx;font-size:24rpx;color:#FFF;border-radius:5rpx;line-height:70rpx;overflow:hidden;}
 
-.Agreement{width:294rpx;margin:auto;margin-top:40rpx;}
+.Agreement{margin-top:40rpx;}
 .Agreement_img{width:24rpx;height:24rpx;border:1px solid #999;border-radius:4rpx;position:relative;float:left;}
 .Agreement_img image{width:32rpx;position:absolute;top:-4rpx;}
 
-.Agreement navigator{font-size:22rpx;color:#1B1B1B;float:left;margin-left:14rpx;display:block;}
+.Agreement navigator{font-size:22rpx;color:#1B1B1B;float:left;margin-left:14rpx;display:block;text-align:center;width:100%;}
 .Agreement navigator text{font-size:22rpx;color:#1E6CE1;}

utils/websocket.js

@@ -1,3 +1,5 @@
+
+
 // socket已经连接成功
 var socketOpen = false
 // socket已经调用关闭function
@@ -107,6 +109,8 @@ var webSocket = {
     })
   },
 
+
+
   // 收到消息回调
   onSocketMessageCallback: function (msg) {
 
@@ -220,4 +224,18 @@ wx.onSocketClose(function (res) {
   }
 })
 
+// 监听WebSocket关闭。
+wx.onSocketClose(function (res) {
+  console.log('WebSocket 已关闭！')
+  if (!socketClose) {
+    clearTimeout(connectSocketTimeOut)
+    connectSocketTimeOut = setTimeout(() => {
+      webSocket.connectSocket();
+    }, 3000);
+  }
+})
+
+
+
+
 module.exports = webSocket;