1

app.js

@@ -53,15 +53,18 @@ App({
   
   },
 
+  onLoad: function (options) {
+
+   
   
+  },
+
   onLaunch: function (options) {
     wx.showShareMenu();
 
     var _this = this;
     // 查看是否授权
  
-
-
   },
 
   // 提示框
@@ -202,7 +205,6 @@ App({
           // console.log(province);
 
         }
-
       }
     })
   },

pages/chat-list/chat-list.js

@@ -20,7 +20,18 @@ Page({
      */
     onLoad(options) {
       let that = this;
-      // emojiChar: "☺-😋-😌-😍-😏-😜-😝-😞-😔-😪-😭-😁-😂-😃-😅-😆-👿-😒-😓-😔-😏-😖-😘-😚-😒-😡-😢-😣-😤-😢-😨-😳-😵-😷-😸-😻-😼-😽-😾-😿-🙊-🙋-🙏-✈-🚇-🚃-🚌-🍄-🍅-🍆-🍇-🍈-🍉-🍑-🍒-🍓-🐔-🐶-🐷-👦-👧-👱-👩-👰-👨-👲-👳-💃-💄-💅-💆-💇-🌹-💑-💓-💘-🚲",
+
+      app.postRequest('my/images/headurl', {}, function (res) {
+        if (res.code == 201) {
+        //  console.log(res);
+          that.setData({
+            myheadurl: res.data.img,
+            // optioninfocode: res,
+          })
+        }
+      })
+
+    // emojiChar: "☺-😋-😌-😍-😏-😜-😝-😞-😔-😪-😭-😁-😂-😃-😅-😆-👿-😒-😓-😔-😏-😖-😘-😚-😒-😡-😢-😣-😤-😢-😨-😳-😵-😷-😸-😻-😼-😽-😾-😿-🙊-🙋-🙏-✈-🚇-🚃-🚌-🍄-🍅-🍆-🍇-🍈-🍉-🍑-🍒-🍓-🐔-🐶-🐷-👦-👧-👱-👩-👰-👨-👲-👳-💃-💄-💅-💆-💇-🌹-💑-💓-💘-🚲",
 
 
 
@@ -35,6 +46,9 @@ Page({
         _that.data.conversations[index].count = 0;
       }
     }
+  
+    //唯一用户表示
+    wx.setStorageSync('ChatListCount', e.currentTarget.dataset.item.to_str);
     // wx.setStorageSync('','');
     wx.setStorageSync('chat_to_id', e.currentTarget.dataset.item.to_id)
     wx.navigateTo({
@@ -59,20 +73,6 @@ Page({
 
     }
       console.log(e,111111222222);
-   
-    console.log(11);
-
-      app.postRequest('my/images/headurl', {}, function (res) {
-        if (res.code == 201) {
-          console.log(res);
-          _this.setData({
-            myheadurl: res.data.img,
-            // optioninfocode: res,
-          })
-        }
-      })
-
-      console.log(getApp().UserId());
       webSocket.sendSocketMessage({
         msg: JSON.stringify({ form_id: getApp().UserId(), type: 'Chat_list' }),
         success: function (res) {
@@ -105,12 +105,24 @@ Page({
   onSocketMessageCallback:function(e){
      let _this = this; 
     let data =  JSON.parse(e);
+    let chatlistcount = wx.getStorageSync('ChatListCount')
+    try {
+     
  
+    } catch (e) {
+      // Do something when catch error
+    }
     switch(data.type){
       case 'Chat_list':
       let dataAtt = data.data
       console.log(data.data,111111);
         for (var index in dataAtt) {
+          //清除缓存
+          if (chatlistcount && dataAtt[index].to_str == chatlistcount) {
+            wx.removeStorageSync('ChatListCount');
+            console.log(112233);
+            dataAtt[index].count = 0;
+          }
           if (dataAtt[index].type == 2) {
             dataAtt[index].content = '[图片]'
           }

pages/chat/chat.js

@@ -342,6 +342,6 @@ Page({
     this.SocketSend({ to_id: _that.data.friendId, form_id: getApp().UserId(), type: 'get_history', page: _that.data.limit_page})
   },
   emojis:function(){
-      console.log(1111);
+    getApp().Tips('该功能正在开发中。');
   }
 });

pages/index/index.js

@@ -1,3 +1,4 @@
+
 const app = getApp();
 const webSocket = require('../../utils/websocket.js');
 Page({
@@ -1027,4 +1028,6 @@ var transformation = function (resdata) {
     resdata = _min + '-' + _max
   }
   return resdata;
+
+
 }

pages/index_details/index_details.js

@@ -253,10 +253,20 @@ console.log(that.data.uploadImages)
   },
   toChat(e) { //跳转进入聊天页面
   let that = this;
-    wx.navigateTo({
-      url: '../chat/chat?to_id=' + that.to_id + '&myheadurl=' + that.myheadurl + '&headUrl=' + that.data.options_img
-    });
-  },
+
+    app.postRequest('circle/dialogue/validate', {}, function (res) {
+        console.log(res);
+      if (res.code == 201) {
+        wx.navigateTo({
+          url: '../chat/chat?to_id=' + that.to_id + '&myheadurl=' + that.myheadurl + '&headUrl=' + that.data.options_img
+        });
+        return ;
+      } 
+      app.Tips(res.msg);
+
+    })
+
+  }
 
 
 

pages/payment/Member/Member.js

@@ -68,52 +68,64 @@ Page({
 
   sfzfmclick(e) {
 
-    var _Priceid = this.data.Priceid
-
-
-    let payment_url = 'pay/wxpay/index';
-    let payment_data = {
-      rid: this.data.Priceid,
-      total_price: this.data.Price,  //原价
-      discount_peice: this.data.Originalprice,  //优惠
-      
-    };
-    app.postRequest(payment_url, payment_data, function (res) {      //  年龄 ajax
-
-      console.log(res.data)
-      if (res.code == 201) {
-
-        wx.requestPayment({
-          timeStamp: res.data.timeStamp,
-          nonceStr: res.data.nonceStr,
-          package: res.data.package,
-          signType: res.data.signType,
-          paySign: res.data.paySign,
-
-          success(res) {
-
-            wx.showToast({
-              title: '支付成功',
-              icon: 'success',
-              duration: 2000
-            })
-
-           },
-          fail(res) {
-            var _fail = '支付失败'
-            getApp().Tips(_fail);
-           }
-        })
-          
-          return 
 
+  },
+  pay: function () {
+    let _that = this;
+    wx.login({
+      success: function (res) {
+        console.log(res.code)
+        if (res.code) {
+          // let p_url = 'public/wxlogin';
+          // let p_data = {
+          //   code: res.code,
+          // };
+          var _Priceid = _that.data.Priceid
+          let payment_url = 'pay/wxpay/index';
+          let payment_data = {
+            rid: _that.data.Priceid,
+            total_price: _that.data.Price,  //原价
+            discount_peice: _that.data.Originalprice,  //优惠
+            code: res.code
+          };
+          app.postRequest(payment_url, payment_data, function (res) { 
+
+            console.log(res.data)
+            if (res.code == 201) {
+
+              wx.requestPayment({
+                timeStamp: res.data.timeStamp,
+                nonceStr: res.data.nonceStr,
+                package: res.data.package,
+                signType: res.data.signType,
+                paySign: res.data.paySign,
+
+                success(res) {
+                  wx.showToast({
+                    title: '支付成功',
+                    icon: 'success',
+                    duration: 2000
+                  })
+                },
+                fail(res) {
+                    getApp().Tips('支付失败');
+                }
+              })
+              return
+            }
+              getApp().Tips('支付失败');
+          })
+
+          // app.postRequest(p_url, p_data, function (res) {
+          //   console.log(res);
+          //   if (res.code == 201) {
+
+
+          //   }
+          // })
+        }
       }
-
-      var _fail = '支付失败'
-      getApp().Tips(_fail);
-
     })
-
   }
 
 

pages/payment/Member/Member.wxml

@@ -31,8 +31,8 @@
 
 
     <!-- <view></view> -->
-    
-      <view class='NextStep' bindtap='sfzfmclick'>立即开通</view>
+    <!-- sfzfmclick -->
+      <view class='NextStep' bindtap='pay'>立即开通</view>
 </view>
 
 

project.config.json

@@ -8,7 +8,9 @@
 		"es6": true,
 		"postcss": true,
 		"minified": true,
-		"newFeature": true
+		"newFeature": true,
+		"autoAudits": false,
+		"checkInvalidKey": true
 	},
 	"compileType": "miniprogram",
 	"libVersion": "2.4.0",

utils/share.js

@@ -0,0 +1,26 @@
+const app = getApp();
+const share_title = 'sharetitle';
+const share_path = 'sharepath';
+const share_imageurl = 'shareimageurl';
+function ShareSetInfo(){
+  app.postRequest('my/other/share', {}, function (res) {
+    if (res.code == 201) {
+      wx.setStorageSync(share_title, res.data.title);
+      wx.setStorageSync(share_path, res.data.path);
+      wx.setStorageSync(share_imageurl, res.data.imageUrl);
+    }
+  })
+}
+
+function Shareginfo(){
+    return{
+      title: wx.getStorageSync(share_title),
+      path: wx.getStorageSync(share_path),
+      imageurl: wx.getStorageSync(share_imageurl),
+    };
+}
+
+module.exports = {
+  ShareSetInfo,
+  Shareginfo
+};