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.4.0",
+		"element-ui": "^2.15.6",
 		"es6-promise": "^4.2.6",
 		"less": "^3.0.4",
 		"less-loader": "^4.1.0",

src/components/ruleDetail.vue

@@ -13,12 +13,10 @@
         show-word-limit
         placeholder="请输入上架规则名称"
         v-model="ruleForm.ruleTitle"
-        clearable
-        @clear="ruleForm.ruleTitle=''"
         style="width:340px"
       />
     </el-form-item>
-    <el-form-item label="上架规则名称备注" prop="ruleExplanation">
+    <el-form-item label="上架规则说明" prop="ruleExplanation">
       <el-input
         maxlength="50"
         show-word-limit

src/components/visible.vue

@@ -11,7 +11,7 @@
     <el-form-item label="上架规则" prop="ruleTitle" v-if="isNew">
       <span class="ruleTitle" v-show="giftForm.ruleTitle">{{ giftForm.ruleTitle }}</span>
       <el-button small type="text" @click="openRelating">
-        {{ giftForm.ruleTitle?'修改':'选择' }}上架规则
+        {{ giftForm.ruleTitle?'修改':'关联' }}上架规则
       </el-button>
     </el-form-item>
     <!-- 老数据兼容 -->

src/views/goods/coupon/coupon.vue

@@ -333,6 +333,8 @@
                   <el-button
                     type="text"
                     @click="goAdd(scope.row,'couponCopy')"
+                    :limit-code="$buttonCode.couponCopy"
+                    v-if="$getButtonLimit($buttonCode.couponCopy)"
                   >
                     复制
                   </el-button>

src/views/goods/gift/gift.vue

@@ -364,6 +364,8 @@
                   </el-button>
                   <el-button
                     type="text"
+                    :limit-code="$buttonCode.giftCopy"
+                    v-if="$getButtonLimit($buttonCode.giftCopy)"
                     @click="goAdd(scope.row,'giftCopy')"
                   >
                     复制

src/views/goods/ruleList/ruleList.vue

@@ -174,11 +174,12 @@
         <div class="pagination-conteiner" style="padding:10px 0 0 0;">
           <div class="pagination">
             <el-pagination
-              layout="prev, pager, next"
+              layout="total, sizes, prev, pager, next"
               :current-page.sync="form.currentPage"
               :page-size.sync="form.pageSize"
               @current-change="getList"
               :total="totalCount"
+              @size-change="handleSizeChange"
             />
           </div>
         </div>
@@ -257,7 +258,7 @@
           </div>
           <el-table
             :data="relatingGoodsTable"
-            v-loading="loading"
+            v-loading="dialogTableLoading"
             @selection-change="handleSelectionChange"
             ref="relatingGoodsTable"
             @row-click="onRowClick"
@@ -373,6 +374,7 @@ export default {
       ],
       multipleSelection: [],
       dialogTableVisible: false,
+      dialogTableLoading: false,
       type: '选择',
       relateForm: {
         search: '',
@@ -398,6 +400,10 @@ export default {
     this.getList();
   },
   methods: {
+    handleSizeChange () {
+      this.form.currentPage = 1;
+      this.getList();
+    },
     handleCommand (command, row) {
       if (command == 1) {
         this.delRelating(row);
@@ -408,6 +414,7 @@ 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;
@@ -479,13 +486,13 @@ export default {
       this.getList();
     },
     getRelatingGoodsTable () {
-      this.loading = true;
+      this.dialogTableLoading = 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.loading = false;
+        this.dialogTableLoading = false;
       });
     },
     submit () {