Merge branch 'master' of git.caimei365.com:git_lijun/caimei-mall-admin-ui

src/views/goods/list-commonly.vue

@@ -1,10 +1,11 @@
 <template>
   <div class="app-container" style="padding: 0 20px;padding-bottom: 0;">
-    <el-menu :default-active="activeIndex" class="el-menu-demo" mode="horizontal">
-      <el-menu-item index="0"><router-link to="/goods/list">全部商品</router-link></el-menu-item>
-      <el-menu-item v-if="modules && modules.firstModulesName" index="1"><router-link to="/goods/list/preferred">{{ modules.firstModulesName }}</router-link></el-menu-item>
-      <el-menu-item v-if="modules && modules.secondModulesName" index="2"><router-link to="/goods/list/preferential">{{ modules.secondModulesName }}</router-link></el-menu-item>
-      <el-menu-item v-if="modules && modules.thirdModulesName" index="3"><router-link to="/goods/list/commonly">{{ modules.thirdModulesName }}</router-link></el-menu-item>
+
+    <el-menu :router="true" default-active="/goods/list/commonly" class="el-menu-demo" mode="horizontal">
+      <el-menu-item index="/goods/list">全部商品</el-menu-item>
+      <el-menu-item v-if="modules && modules.firstModulesName" index="/goods/list/preferred">{{ modules.firstModulesName }}</el-menu-item>
+      <el-menu-item v-if="modules && modules.secondModulesName" index="/goods/list/preferential">{{ modules.secondModulesName }}</el-menu-item>
+      <el-menu-item v-if="modules && modules.thirdModulesName" index="/goods/list/commonly">{{ modules.thirdModulesName }}</el-menu-item>
     </el-menu>
 
     <div class="filter-container">
@@ -33,7 +34,7 @@
         </el-form-item>
         <el-form-item style="width:120px;float: left;">
           <el-button class="filter-item" type="primary" icon="el-icon-circle-plus-outline">
-            <router-link :to="'/goods/list/select/'+ activeIndex">添加商品</router-link>
+            <router-link :to="'/goods/list/select/'+ modulesId">添加商品</router-link>
           </el-button>
         </el-form-item>
       </el-form>
@@ -103,7 +104,7 @@ export default {
   components: { Pagination },
   data() {
     return {
-      activeIndex: '3', // 模块3
+      modulesId: '3', // 模块3
       list: null,
       classify: null,
       modules: null,
@@ -156,7 +157,7 @@ export default {
           sorts.push(item.id + '-' + item.commonlyProductSort)
         }
       })
-      saveGoodsSort({ newProducSorttList: sorts.join(','), modules: this.activeIndex }).then(response => {
+      saveGoodsSort({ newProducSorttList: sorts.join(','), modules: this.modulesId }).then(response => {
         this.$notify({
           title: response.code * 1 === 1 ? 'Success' : 'Error',
           message: response.msg,
@@ -169,7 +170,7 @@ export default {
       })
     },
     cancelGoods(id) {
-      canncelProduct({ id: id, modules: this.activeIndex }).then(() => {
+      canncelProduct({ id: id, modules: this.modulesId }).then(() => {
         this.fetchData()
       }).catch(() => {
         this.fetchData()

src/views/goods/list-preferential.vue

@@ -1,11 +1,11 @@
 <template>
   <div class="app-container" style="padding: 0 20px;">
 
-    <el-menu :default-active="activeIndex" class="el-menu-demo" mode="horizontal">
-      <el-menu-item index="0"><router-link to="/goods/list">全部商品</router-link></el-menu-item>
-      <el-menu-item v-if="modules && modules.firstModulesName" index="1"><router-link to="/goods/list/preferred">{{ modules.firstModulesName }}</router-link></el-menu-item>
-      <el-menu-item v-if="modules && modules.secondModulesName" index="2"><router-link to="/goods/list/preferential">{{ modules.secondModulesName }}</router-link></el-menu-item>
-      <el-menu-item v-if="modules && modules.thirdModulesName" index="3"><router-link to="/goods/list/commonly">{{ modules.thirdModulesName }}</router-link></el-menu-item>
+    <el-menu :router="true" default-active="/goods/list/preferential" class="el-menu-demo" mode="horizontal">
+      <el-menu-item index="/goods/list">全部商品</el-menu-item>
+      <el-menu-item v-if="modules && modules.firstModulesName" index="/goods/list/preferred">{{ modules.firstModulesName }}</el-menu-item>
+      <el-menu-item v-if="modules && modules.secondModulesName" index="/goods/list/preferential">{{ modules.secondModulesName }}</el-menu-item>
+      <el-menu-item v-if="modules && modules.thirdModulesName" index="/goods/list/commonly">{{ modules.thirdModulesName }}</el-menu-item>
     </el-menu>
 
     <div class="filter-container">
@@ -34,7 +34,7 @@
         </el-form-item>
         <el-form-item style="width:120px;float: left;">
           <el-button class="filter-item" type="primary" icon="el-icon-circle-plus-outline">
-            <router-link :to="'/goods/list/select/'+ activeIndex">添加商品</router-link>
+            <router-link :to="'/goods/list/select/'+ modulesId">添加商品</router-link>
           </el-button>
         </el-form-item>
       </el-form>
@@ -104,7 +104,7 @@ export default {
   components: { Pagination },
   data() {
     return {
-      activeIndex: '2', // 模块2
+      modulesId: '2', // 模块2
       list: null,
       classify: null,
       modules: null,
@@ -157,7 +157,7 @@ export default {
           sorts.push(item.id + '-' + item.preferentialProductSort)
         }
       })
-      saveGoodsSort({ newProducSorttList: sorts.join(','), modules: this.activeIndex }).then(response => {
+      saveGoodsSort({ newProducSorttList: sorts.join(','), modules: this.modulesId }).then(response => {
         this.$notify({
           title: response.code * 1 === 1 ? 'Success' : 'Error',
           message: response.msg,
@@ -170,7 +170,7 @@ export default {
       })
     },
     cancelGoods(id) {
-      canncelProduct({ id: id, modules: this.activeIndex }).then(() => {
+      canncelProduct({ id: id, modules: this.modulesId }).then(() => {
         this.fetchData()
       }).catch(() => {
         this.fetchData()

src/views/goods/list-preferred.vue

@@ -1,11 +1,11 @@
 <template>
   <div class="app-container" style="padding: 0 20px;">
 
-    <el-menu :default-active="activeIndex" class="el-menu-demo" mode="horizontal">
-      <el-menu-item index="0"><router-link to="/goods/list">全部商品</router-link></el-menu-item>
-      <el-menu-item v-if="modules && modules.firstModulesName" index="1"><router-link to="/goods/list/preferred">{{ modules.firstModulesName }}</router-link></el-menu-item>
-      <el-menu-item v-if="modules && modules.secondModulesName" index="2"><router-link to="/goods/list/preferential">{{ modules.secondModulesName }}</router-link></el-menu-item>
-      <el-menu-item v-if="modules && modules.thirdModulesName" index="3"><router-link to="/goods/list/commonly">{{ modules.thirdModulesName }}</router-link></el-menu-item>
+    <el-menu :router="true" default-active="/goods/list/preferred" class="el-menu-demo" mode="horizontal">
+      <el-menu-item index="/goods/list">全部商品</el-menu-item>
+      <el-menu-item v-if="modules && modules.firstModulesName" index="/goods/list/preferred">{{ modules.firstModulesName }}</el-menu-item>
+      <el-menu-item v-if="modules && modules.secondModulesName" index="/goods/list/preferential">{{ modules.secondModulesName }}</el-menu-item>
+      <el-menu-item v-if="modules && modules.thirdModulesName" index="/goods/list/commonly">{{ modules.thirdModulesName }}</el-menu-item>
     </el-menu>
 
     <div class="filter-container">
@@ -34,7 +34,7 @@
         </el-form-item>
         <el-form-item style="width:120px;float: left;">
           <el-button class="filter-item" type="primary" icon="el-icon-circle-plus-outline">
-            <router-link :to="'/goods/list/select/'+ activeIndex">添加商品</router-link>
+            <router-link :to="'/goods/list/select/'+ modulesId">添加商品</router-link>
           </el-button>
         </el-form-item>
       </el-form>
@@ -104,7 +104,7 @@ export default {
   components: { Pagination },
   data() {
     return {
-      activeIndex: '1', // 模块1
+      modulesId: '1', // 模块1
       list: null,
       classify: null,
       modules: null,
@@ -157,7 +157,7 @@ export default {
           sorts.push(item.id + '-' + item.preferredProductSort)
         }
       })
-      saveGoodsSort({ newProducSorttList: sorts.join(','), modules: this.activeIndex }).then(response => {
+      saveGoodsSort({ newProducSorttList: sorts.join(','), modules: this.modulesId }).then(response => {
         this.$notify({
           title: response.code * 1 === 1 ? 'Success' : 'Error',
           message: response.msg,
@@ -170,7 +170,7 @@ export default {
       })
     },
     cancelGoods(id) {
-      canncelProduct({ id: id, modules: this.activeIndex }).then(() => {
+      canncelProduct({ id: id, modules: this.modulesId }).then(() => {
         this.fetchData()
       }).catch(() => {
         this.fetchData()

src/views/goods/list.vue

@@ -1,11 +1,11 @@
 <template>
   <div class="app-container" style="padding: 0 20px;">
 
-    <el-menu :default-active="activeIndex" class="el-menu-demo" mode="horizontal">
-      <el-menu-item index="0"><router-link to="/goods/list">全部商品</router-link></el-menu-item>
-      <el-menu-item v-if="modules && modules.firstModulesName" index="1"><router-link to="/goods/list/preferred">{{ modules.firstModulesName }}</router-link></el-menu-item>
-      <el-menu-item v-if="modules && modules.secondModulesName" index="2"><router-link to="/goods/list/preferential">{{ modules.secondModulesName }}</router-link></el-menu-item>
-      <el-menu-item v-if="modules && modules.thirdModulesName" index="3"><router-link to="/goods/list/commonly">{{ modules.thirdModulesName }}</router-link></el-menu-item>
+    <el-menu :router="true" default-active="/goods/list" class="el-menu-demo" mode="horizontal">
+      <el-menu-item index="/goods/list">全部商品</el-menu-item>
+      <el-menu-item v-if="modules && modules.firstModulesName" index="/goods/list/preferred">{{ modules.firstModulesName }}</el-menu-item>
+      <el-menu-item v-if="modules && modules.secondModulesName" index="/goods/list/preferential">{{ modules.secondModulesName }}</el-menu-item>
+      <el-menu-item v-if="modules && modules.thirdModulesName" index="/goods/list/commonly">{{ modules.thirdModulesName }}</el-menu-item>
     </el-menu>
 
     <div class="filter-container" style="padding: 20px 0;">