Merge branch 'dev/v4.8.49_zsy' of qmx/jy into feature/v4.8.49

src/web/staticres/frontRouter/pc/mesgCenter/css/index-pc.css

@@ -184,6 +184,7 @@
 }
 .main-mesg .tabs-mesg .el-tabs .el-tabs__content {
   padding: 8px 0;
+    min-height:400px;
 }
 .main-mesg .tabs-mesg .el-tabs .el-tabs__content .el-loading-mask {
   z-index: 99;

src/web/templates/frontRouter/pc/user/sess/set_favorite.html

@@ -43,9 +43,10 @@
                                 <p class="key_title_substxt">${ item.describe }</p>
                             </div>
                             <div class="key_condition">
-                                <div class="self-row" v-for="temp in item.data || []" :key="temp.key">
-                                    <span>${temp.name}</span>
-                                    <span>
+                                <template v-for="temp in item.data || []">
+                                    <div class="self-row" :key="temp.key" v-if="temp.key != 'o_msg_active'">
+                                        <span>${temp.name}</span>
+                                        <span>
                                         <span class="wx-label">微信提醒</span>
                                         <el-switch
                                                 v-model="msgSet[temp.key]['i_wxpush']"
@@ -56,7 +57,8 @@
                                                 :width="48"
                                                 @change="changeWxSwitch($event, temp.key)"></el-switch>
                                     </span>
-                                </div>
+                                    </div>
+                                </template>
                             </div>
                         </div>
                     </template>

src/web/templates/pc/biddetail_rec.html

@@ -197,7 +197,7 @@
     }
   }
 </script>
-<div class="j-content" style="padding-top: 26px;">
+<div class="j-content">
     <!-- 用户留资 -->
     <div id="vue-collect-user-info"></div>
     <div id="vue-collect-bid-info"></div>
@@ -601,7 +601,7 @@
                        toastFn('终止参标操作成功！')
                      } else {
                       //  toastFn('已参标，请前往我的参标项目列表查看。')
-                      // 调起参标更新弹窗 
+                      // 调起参标更新弹窗
                       Bidrenewal_Dialog.sendId(_id)
                       window.$BidrenewalDialog.open()
                        $('#bidJoin').hide()
@@ -1795,7 +1795,7 @@ var ucbs_source="pc_rec",ucbsId="{{.T.obj.ucbsId}}";
            if (r.data) {
              if(r.data.admin_system || r.data.admin_department){
                $('#manual-distribution').show();
-            }  
+            }
            }
           }
         })
@@ -1806,15 +1806,15 @@ var ucbs_source="pc_rec",ucbsId="{{.T.obj.ucbsId}}";
            person_Dialog.selectAreas = [pagedata.area]
          }else{
         // 无地区
-           person_Dialog.selectArea = []  
+           person_Dialog.selectArea = []
          }
          person_Dialog.titleMsg = '选择接收人员' // 设置弹窗标题
          person_Dialog.searchVal = ''
          person_Dialog.centerDialogVisible = true // 打开弹窗
          person_Dialog.selectDataIds = [pagedata._id]// 传入标讯ID
          person_Dialog.getData('yes') // 发送获取人员列表请求
-        })  
-      }  
+        })
+      }
 
       })
     </script>