update: ui

build/webpack.base.conf.js

@@ -84,7 +84,7 @@ module.exports = {
     'vue-router': 'VueRouter',
     vuex: 'Vuex',
     axios: 'axios',
-    // 'element-ui': 'ELEMENT',
+    'element-ui': 'ELEMENT',
   },
   plugins: [
     new VueLoaderPlugin(),

package.json

@@ -75,7 +75,7 @@
 		"@tinymce/tinymce-vue": "^1.0.8",
 		"axios": "^0.18.0",
 		"babel-polyfill": "^6.26.0",
-		"element-ui": "^2.15.6",
+		"element-ui": "^2.4.0",
 		"es6-promise": "^4.2.6",
 		"less": "^3.0.4",
 		"less-loader": "^4.1.0",

src/views/goods/ruleList/ruleList.vue

@@ -33,9 +33,12 @@
               class="w-140"
               @change="getList"
             >
-              <el-option label="全部顾客" :value="1" />
-              <el-option label="人群筛选" :value="3" />
-              <el-option label="门店筛选" :value="4" />
+              <el-option
+                v-for="item in selectOption"
+                :label="item.label"
+                :value="item.value"
+                :key="item.label"
+              />
             </el-select>
             <el-checkbox
               v-model="form.showSelfFlag"
@@ -174,12 +177,11 @@
         <div class="pagination-conteiner" style="padding:10px 0 0 0;">
           <div class="pagination">
             <el-pagination
-              layout="total, sizes, prev, pager, next"
+              layout="prev, pager, next"
               :current-page.sync="form.currentPage"
               :page-size.sync="form.pageSize"
               @current-change="getList"
               :total="totalCount"
-              @size-change="handleSizeChange"
             />
           </div>
         </div>
@@ -258,7 +260,7 @@
           </div>
           <el-table
             :data="relatingGoodsTable"
-            v-loading="dialogTableLoading"
+            v-loading="loading"
             @selection-change="handleSelectionChange"
             ref="relatingGoodsTable"
             @row-click="onRowClick"
@@ -374,7 +376,6 @@ export default {
       ],
       multipleSelection: [],
       dialogTableVisible: false,
-      dialogTableLoading: false,
       type: '选择',
       relateForm: {
         search: '',
@@ -396,14 +397,23 @@ export default {
       defaultImg: '../../../../static/img/pic_default.png',
     };
   },
+  computed: {
+    selectOption () {
+      let option = [
+        { label: '全部顾客', value: 1 },
+        { label: '人群筛选', value: 3 },
+        { label: '门店筛选', value: 4 },
+      ];
+      if (this.$store.state.product.ruleMemberFilterClose == 1) {
+        option = option.filter(item => item.label != '人群筛选');
+      }
+      return option;
+    },
+  },
   mounted () {
     this.getList();
   },
   methods: {
-    handleSizeChange () {
-      this.form.currentPage = 1;
-      this.getList();
-    },
     handleCommand (command, row) {
       if (command == 1) {
         this.delRelating(row);
@@ -414,7 +424,6 @@ export default {
       request.get('/api-integral-mall/page-rule', { params: this.form }).then(res => {
         console.log(res);
         this.tableDate = res.data.result.result || [];
-        console.log(this.tableDate);
         this.totalCount = res.data.result.totalCount;
       }).finally(_ => {
         this.loading = false;
@@ -486,13 +495,13 @@ export default {
       this.getList();
     },
     getRelatingGoodsTable () {
-      this.dialogTableLoading = true;
+      this.loading = true;
       const params = this.relateForm;
       request.get('/api-integral-mall/page-rule-pro', { params }).then(res => {
         this.relatingGoodsTable = res.data.result.result || [];
         this.relateCount = res.data.result.totalCount;
       }).finally(_ => {
-        this.dialogTableLoading = false;
+        this.loading = false;
       });
     },
     submit () {