Merge remote-tracking branch 'origin/master'

src/views/contentManagement/activity/index.vue

@@ -43,6 +43,7 @@
               range-separator="至"
               start-placeholder="开始日期"
               end-placeholder="结束日期"
+              style="width: 300px"
               @change="handleChangeTime"
             />
           </el-form-item>
@@ -81,7 +82,6 @@
       <div style="padding:5px 10px">
         <div class="tableTitle">活动列表</div>
         <el-table v-loading="fullscreenLoading" :data="tableData" border sortable="true" style="text-align: left;">
-          <span slot="empty">{{ tableDataTips }}</span>
           <el-table-column align="center" prop="id" label="序号" min-width="55px">
             <template slot-scope="scope">
               <span>{{ scope.$index + 1 }}</span>
@@ -403,8 +403,7 @@ export default {
       fullscreenLoading: false,
       curCatForm: {
 
-      },
-      tableDataTips: '加载中'
+      }
     }
   },
   computed: {

src/views/contentManagement/banner/index.vue

@@ -397,24 +397,6 @@ export default {
       // 先验证表单
       this.$refs['form'].validate(valid => {
         if (valid) {
-          // 获取表单中的权重值
-          const weight = this.form.weight
-          const pictureId = this.form.pictureId
-          // 如果权重为 0，提示用户选择有效权重
-          if (weight === 0) {
-            this.$message.error('请选择有效的权重值')
-            return
-          }
-
-          // 检查当前 weight 是否与已获取的列表中的 weight 重复
-          const isWeightExists = this.cmsBannerList.some(banner => banner.weight === weight)
-          const isPictureIdExists = this.cmsBannerList.some(banner => banner.pictureId === pictureId)
-          if (isPictureIdExists && isWeightExists) {
-            // 如果重复，提醒用户并阻止继续提交
-            this.$message.error('该权重值已经存在，请选择其他权重')
-            return // 停止提交
-          }
-
           // 权重不重复，继续新增或修改
           if (this.form.businessId !== null) {
             // 修改操作

src/views/contentManagement/notice/index.vue

@@ -80,7 +80,6 @@
       </div><div style="padding:5px 10px">
         <div class="tableTitle">公告列表</div>
         <el-table v-loading="fullscreenLoading" :data="tableData" border sortable="true" style="text-align: left;">
-          <span slot="empty">{{ tableDataTips }}</span>
           <el-table-column align="center" prop="id" label="序号" min-width="55px">
             <template slot-scope="scope">
               <span>{{ scope.$index + 1 }}</span>
@@ -262,8 +261,7 @@ export default {
       },
       total: 0,
       filelist: [],
-      fullscreenLoading: false,
-      tableDataTips: '加载中'
+      fullscreenLoading: false
     }
   },
   computed: {

src/views/contentManagement/topic/index.vue

@@ -69,7 +69,6 @@
       </div><div style="padding:5px 10px">
         <div class="tableTitle">话题列表</div>
         <el-table v-loading="fullscreenLoading" :data="tableData" border sortable="true" style="text-align: left;">
-          <span slot="empty">{{ tableDataTips }}</span>
           <el-table-column align="center" prop="id" label="序号" min-width="55px">
             <template slot-scope="scope">
               <span>{{ scope.$index + 1 }}</span>
@@ -320,7 +319,6 @@ export default {
       curCatForm: {
 
       },
-      tableDataTips: '加载中',
       rules: {
         topicName: [
           { required: true, message: '请输入话题名称', trigger: 'blur' }

src/views/operationsManagement/article/index.vue

@@ -87,7 +87,6 @@
       </div><div style="padding:5px 10px">
         <div class="tableTitle">动态列表</div>
         <el-table v-loading="fullscreenLoading" :data="tableData" border sortable="true" style="text-align: left;">
-          <span slot="empty">{{ tableDataTips }}</span>
           <el-table-column align="center" prop="id" label="序号" min-width="55px">
             <template slot-scope="scope">
               <span>{{ scope.$index + 1 }}</span>
@@ -345,7 +344,6 @@ export default {
       // pagination
       total: 0,
       fullscreenLoading: false,
-      tableDataTips: '加载中',
       rules: {}
     }
   },

src/views/operationsManagement/member/index.vue

@@ -214,7 +214,6 @@
       <div style="padding:5px 10px">
         <div class="tableTitle">会员列表</div>
         <el-table v-loading="fullscreenLoading" :data="tableData" border sortable="true" style="text-align: left;">
-          <span slot="empty">{{ tableDataTips }}</span>
           <el-table-column align="center" prop="id" label="序号" min-width="55px">
             <template slot-scope="scope">
               <span>{{ scope.$index + 1 }}</span>
@@ -459,7 +458,6 @@ export default {
       },
       total: 0,
       fullscreenLoading: false,
-      tableDataTips: '加载中',
       sexOptions: getOptions('sex'),
       nationOptions: getOptions('nation'),
       maxEducationOptions: getOptions('education'),

src/views/operationsManagement/memberHost/index.vue

@@ -56,7 +56,6 @@
       <div style="padding:5px 10px">
         <div class="tableTitle">会员列表</div>
         <el-table v-loading="fullscreenLoading" :data="tableData" border sortable="true" style="text-align: left;">
-          <span slot="empty">{{ tableDataTips }}</span>
           <el-table-column align="center" prop="id" label="序号" min-width="55px">
             <template slot-scope="scope">
               <span>{{ scope.$index + 1 }}</span>
@@ -146,7 +145,6 @@ export default {
       },
       total: 0,
       fullscreenLoading: false,
-      tableDataTips: '加载中',
       sexOptions: getOptions('sex')
     }
   },