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

src/jfw/modules/app/src/web/staticres/jyapp/big-member/css/page_pro_follow_detail.css

@@ -7,6 +7,7 @@
   display: flex;
   align-items: center;
   justify-content: center;
+  min-height: .48rem;
   padding: .06rem 0;
   background: #FFE9EA;
   color: #FF3A20;

src/jfw/modules/app/src/web/templates/big-member/page_pro_follow_list.html

@@ -481,6 +481,8 @@
                                 id: item.sid,
                                 value: true
                             })
+                        } else {
+                          _this.$toast(res.error_msg)
                         }
                     }
                 })

src/jfw/modules/app/src/web/templates/weixin/wxinfocontent.html

@@ -1693,28 +1693,24 @@
               if (!data.currentTime) {
                 data.currentTime = 0
               }
-              if (!data.userName && (data.currentTime > data.bidEndTime)) {
-                $('.refer_stand').hide()
+              if (data.userName) {
+                const newList = data.userName.split(',').map(item => item.trim()).filter(item => item)
+                const userNameString = newList.length > 1 ? newList.slice(0,1).join(',') + '等' : newList.join(',')
+                data.userName = userNameString
+                $('.r-s-left').css('visibility', 'inherit')
+                cbNameElem.html(data.userName)
               } else {
-                if (data.userName) {
-                  const newList = data.userName.split(',').map(item => item.trim()).filter(item => item)
-                  const userNameString = newList.length > 1 ? newList.slice(0,1).join(',') + '等' : newList.join(',')
-                  data.userName = userNameString
-                  $('.r-s-left').css('visibility', 'inherit')
-                  cbNameElem.html(data.userName)
-                } else {
-                  $('.r-s-left').css('visibility', 'hidden')
-                }
-                if(!data.bidEndTime) {
-                  $('.r-s-right').css('visibility', 'inherit')
-                } else {
-                  if (data.currentTime > data.bidEndTime) {
-                    $('.r-s-right').css('visibility', 'hidden')
-                  } else {
-                    $('.r-s-right').css('visibility', 'inherit')
-                  }
-                }
+                $('.r-s-left').css('visibility', 'hidden')
               }
+              // if(!data.bidEndTime) {
+              //   $('.r-s-right').css('visibility', 'inherit')
+              // } else {
+              //   if (data.currentTime > data.bidEndTime) {
+              //     $('.r-s-right').css('visibility', 'hidden')
+              //   } else {
+              //     $('.r-s-right').css('visibility', 'inherit')
+              //   }
+              // }
               if (data.showStopParticipate) {
                 $('.weicanbiao').hide();
                 $('.canbiao').show();

src/web/staticres/big-member/css/page_pro_follow_detail.css

@@ -7,6 +7,7 @@
   display: flex;
   align-items: center;
   justify-content: center;
+  min-height: .48rem;
   padding: .06rem 0;
   background: #FFE9EA;
   color: #FF3A20;

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

@@ -398,6 +398,8 @@ var vNode = {
                             id: item.sid,
                             value: true
                         })
+                    } else {
+                      _this.$toast(res.error_msg)
                     }
                 }
             })

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

@@ -376,6 +376,8 @@ var vNode = {
                       id: item._id,
                       value: true
                   })
+              } else {
+                _this.$toast(res.error_msg)
               }
           }
       })

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

@@ -378,6 +378,8 @@ var vNode = {
                       id: item._id,
                       value: true
                   })
+              } else {
+                _this.$toast(res.error_msg)
               }
           }
       })

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

@@ -491,6 +491,8 @@
                                 id: item.sid,
                                 value: true
                             })
+                        } else {
+                          _this.$toast(res.error_msg)
                         }
                     }
                 })

src/web/templates/weixin/wxinfocontent_rec.html

@@ -2074,33 +2074,14 @@ function openFileDown (url) {
             const isCBElem = $('.isCB');
             if (Object.keys(data).length > 0) {
               window.canBiaoInfo = data
-              if (!data.bidEndTime) {
-                data.bidEndTime = 0
-              }
-              if (!data.currentTime) {
-                data.currentTime = 0
-              }
-              if (!data.userName && (data.currentTime > data.bidEndTime)) {
-                $('.refer_stand').hide()
+              if (data.userName) {
+                const newList = data.userName.split(',').map(item => item.trim()).filter(item => item)
+                const userNameString = newList.length > 1 ? newList.slice(0,1).join(',') + '等' : newList.join(',')
+                data.userName = userNameString
+                $('.r-s-left').css('visibility', 'inherit')
+                cbNameElem.html(data.userName);
               } else {
-                if (data.userName) {
-                  const newList = data.userName.split(',').map(item => item.trim()).filter(item => item)
-                  const userNameString = newList.length > 1 ? newList.slice(0,1).join(',') + '等' : newList.join(',')
-                  data.userName = userNameString
-                  $('.r-s-left').css('visibility', 'inherit')
-                  cbNameElem.html(data.userName);
-                } else {
-                  $('.r-s-left').css('visibility', 'hidden')
-                }
-                if(!data.bidEndTime) {
-                  $('.r-s-right').css('visibility', 'inherit')
-                } else {
-                  if (data.currentTime > data.bidEndTime) {
-                    $('.r-s-right').css('visibility', 'hidden')
-                  } else {
-                    $('.r-s-right').css('visibility', 'inherit')
-                  }
-                }
+                $('.r-s-left').css('visibility', 'hidden')
               }
               if (data.showStopParticipate) {
                 $('.canbiao').show();