Merge branch 'master' of ssh://192.168.1.202:8088/lx/shares

pages/attention/attention.js

@@ -75,8 +75,8 @@ Page({
     });
     // 获取关注的信息
     var userId={
-      // userId:wx.getStorageSync('openid')
-      userId:'ocVI541TGfnTChi5DlIa7beac2YM'
+      userId:wx.getStorageSync('openid')
+      // userId:'ocVI541TGfnTChi5DlIa7beac2YM'
     }
     console.log(userId);
     this.getFollow(userId);

pages/item/item.js

@@ -288,7 +288,7 @@ Page({
         winHeight: 0,
         // tab切换 
         currentTab: 0,
-        follow:"关注",
+        follow:"",
           ec: {
       // onInit: initChart
     },
@@ -378,29 +378,41 @@ Page({
   },
   postfollow:function(){
     var that = this;
-
     var data={
       plateId: this.data.object.plateId,
       plateName: this.data.object.Name,
       userId: wx.getStorageSync('openid'),
       userName: app.globalData.userInfo.nickName,
     }
-  
     var postfollow = wxRequest.postRequest(Api.postfollow(),data);
-    postfollow.then((res)=>{
-   
-      if(res.statusCode==200){
-        that.setData({
-          follow:res.data.data==1? "已关注":"关注"
-         })
-        wx.showToast({
-          title: res.data.message,
-          icon: 'success',
-          duration: 2000
-        })
-      }
-      
-    })
+    var postfollowcancel=wxRequest.postRequest(Api.postfollowcancel(),data);
+    if(this.data.follow=="关注"){
+      postfollow.then((res)=>{
+        if(res.statusCode==200){
+          that.setData({
+            follow:res.data.data==1? "已关注":"关注"
+           })
+          wx.showToast({
+            title: res.data.message,
+            icon: 'success',
+            duration: 2000
+          })
+        }
+      })
+    }else{
+      postfollowcancel.then((res)=>{
+        if(res.statusCode==200){
+          that.setData({
+            follow:res.data.data==1? "关注":"已关注"
+           })
+          wx.showToast({
+            title: res.data.message,
+            icon: 'success',
+            duration: 2000
+          })
+        }
+      })
+    }
   },
     //获取数据
     posthisfind:function(row){

utils/api.js

@@ -46,9 +46,14 @@ module.exports = {
       var url =HOST_URI + '/api/user/openId';
       return url;
     },
-        // 关注接口
-        postfollow: function (obj) {
-          var url =HOST_URI + '/api/follow';
-          return url;
-        },
+  // 关注接口
+  postfollow: function (obj) {
+    var url =HOST_URI + '/api/follow';
+    return url;
+  },
+    // 取消关注接口
+    postfollowcancel: function (obj) {
+      var url =HOST_URI + '/api/follow/cancel';
+      return url;
+    },
 }