Merge branch 'dev/v4.8.16_tsz2' of qmx/jy into feature/v4.8.16

src/web/staticres/common-module/big-member/js/page_client_follow_list.js

@@ -46,7 +46,8 @@ var vNode = {
         this.getAreaList()
     },
     mounted () {
-        $(this.$refs.jList).scrollTop(this.scrollTop)
+      utils.iosBackRefresh()
+      $(this.$refs.jList).scrollTop(this.scrollTop)
     },
     methods: {
         recover: function () {

src/web/staticres/common-module/collection/js/index-wx.js

@@ -139,15 +139,25 @@ var vNode = {
           $data = JSON.parse($data)
           var listState = $data["listState"];
           var list = listState["list"];
+          let actionCBInfo = sessionStorage.getItem('actionCBInfo')
+          if(actionCBInfo) {
+            actionCBInfo = JSON.parse(actionCBInfo)
+          }
           for (var i=0;i<list.length;i++){
-        	if (sessionStorage.getItem('listCollSessionId')&&sessionStorage.getItem('listCollSessionId')==list[i]["_id"]){
-				if (sessionStorage.getItem('listCollSessionBool')=="0"){
-					listState["list"].splice(i,1);
-				}
-   				sessionStorage.removeItem('listCollSessionId')
-   				sessionStorage.removeItem('listCollSessionBool')
-		    }
-	      }
+            if (sessionStorage.getItem('listCollSessionId')&&sessionStorage.getItem('listCollSessionId')==list[i]["_id"]){
+              if (sessionStorage.getItem('listCollSessionBool')=="0"){
+                listState["list"].splice(i,1);
+              }
+              sessionStorage.removeItem('listCollSessionId')
+              sessionStorage.removeItem('listCollSessionBool')
+            }
+            if (actionCBInfo) {
+              if (actionCBInfo.id == list[i]._id) {
+                list[i].isCB.value = actionCBInfo.value
+              }
+              sessionStorage.removeItem('actionCBInfo')
+            }
+          }
           for (var key in $data) {
               if (excludeKey.indexOf(key) !== -1) {
                   continue

src/web/templates/big-member/wx/page_pro_follow_list.html

@@ -153,7 +153,8 @@
             }
         },
         mounted () {
-            $(this.$refs.jList).scrollTop(this.scrollTop)
+          utils.iosBackRefresh()
+          $(this.$refs.jList).scrollTop(this.scrollTop)
         },
         methods: {
             recover: function () {
@@ -167,6 +168,7 @@
                         }
                         this.$data[key] = $data[key]
                     }
+                    this.checkCBStateChanged()
                     sessionStorage.removeItem(this.sessStorageKey)
                 }
                 return !!$data
@@ -286,6 +288,17 @@
                     },
                 })
             },
+            checkCBStateChanged: function () {
+              var actionInfo = sessionStorage.getItem('actionCBInfo')
+              if (actionInfo) {
+                  var info = JSON.parse(actionInfo)
+                  this.list.forEach(function (item) {
+                      if (item.sid === info.id) {
+                          item.isCB.value = info.value
+                      }
+                  })
+              }
+            },
             preSortList: function (list) {
                 var _this = this
                 list.forEach(function (item) {