Merge branch 'feature/营销' into dev

src/components/aside-menu.vue

@@ -82,12 +82,14 @@ export default {
     '$route.path': {
       immediate: true,
       handler(path) {
+        console.log(path);
         this.activeTab = path;
       }
     },
     menu: {
       immediate: true,
       handler(menu) {
+
         let menuTree = menu.filter(item => item.code === 'marketing_operation')[0] || {};
         console.log(menu, menuTree);
         this.tabData = (menuTree.nodeChildren || []).map(item => {

src/styles/component.less

@@ -16,6 +16,9 @@
 .ml10 {
   margin-left: 10px;
 }
+.mt5 {
+  margin-top: 5px;
+}
 .mt6 {
   margin-top: 6px;
 }
@@ -64,6 +67,12 @@
 .pb10{
   padding-bottom: 10px;
 }
+.fz12{
+  font-size: 12px;
+}
+.fz14{
+  font-size: 14px;
+}
 .lh1{
   line-height: 1;
 }

src/views/activity/template-config.vue

@@ -13,8 +13,8 @@
         <el-progress :percentage="(item.configNum/20)*100" :show-text="false"></el-progress>
       </div>
       <div class="btn">
-        <el-button v-if="item.configNum > 0" @click="$router.push(`/activity/template-list?type=${item.templateType}`)">模板列表</el-button>
-        <el-button v-else @click="$router.push(`/activity/template-detail/${item.type}`);">前往配置</el-button>
+        <el-button v-if="item.configNum > 0" @click="$router.push(`/activity/template-list?type=${item.templateType}&tabId=${$route.query.tabId}`)">模板列表</el-button>
+        <el-button v-else @click="$router.push(`/activity/template-detail/${item.type}&tabId=${$route.query.tabId}`);">前往配置</el-button>
       </div>
     </div>
   </div>

src/views/activity/template-detail.vue

@@ -2,8 +2,8 @@
   <div>
     <div class="pt10 pb10 pl20 border-bottom">
           <el-breadcrumb separator-class="el-icon-arrow-right">
-               <el-breadcrumb-item :to="{ path: '/activity/template-config' }">营销游戏配置</el-breadcrumb-item>
-            <el-breadcrumb-item :to="{ path: `/activity/template-list?type=${$route.params.type}` }">模板列表</el-breadcrumb-item>
+               <el-breadcrumb-item :to="{ path: `/activity/template-config?tabId=${$route.query.tabId}` }">营销游戏配置</el-breadcrumb-item>
+            <el-breadcrumb-item :to="{ path: `/activity/template-list?type=${$route.params.type}&tabId=${$route.query.tabId}` }">模板列表</el-breadcrumb-item>
             <el-breadcrumb-item>{{($route.query.id?'编辑':'新增')+'模板'}}</el-breadcrumb-item>
           </el-breadcrumb>
       </div>
@@ -41,7 +41,7 @@
             </el-checkbox>
           </el-checkbox-group>
           <el-upload :action="musicUrl" with-credentials multiple  accept="audio/mpeg"  :data="{requestProject: 'gic-web'}"  :show-file-list="false" :file-list="defineMusicList" :before-upload="(file) => beforeMusicUpload(file)"   :on-success="uploadOnMusicSuccess">
-            <el-button size="small"   class="iconfont-components3 icon-cp-shangc colorBtn"> 自定义上传</el-button>
+            <el-button size="small" class="colorBtn mt5"><i class="iconfont-components3 icon-cp-shangc"></i> <span class="fz14"> 自定义上传</span> </el-button>
           </el-upload>
         </el-form-item>
       </div>

src/views/activity/template-list.vue

@@ -2,7 +2,7 @@
   <div>
     <div class="pt10 pb10 pl20 border-bottom">
       <el-breadcrumb separator-class="el-icon-arrow-right">
-        <el-breadcrumb-item :to="{ path: '/activity/template-config' }">营销游戏配置</el-breadcrumb-item>
+        <el-breadcrumb-item :to="{ path: `/activity/template-config?tabId=${$route.query.tabId}` }">营销游戏配置</el-breadcrumb-item>
         <el-breadcrumb-item>模板列表</el-breadcrumb-item>
       </el-breadcrumb>
     </div>
@@ -89,10 +89,10 @@ export default {
         });
     },
     addTemplate() {
-      this.$router.push(`/activity/template-detail/${this.$route.query.type}`);
+      this.$router.push(`/activity/template-detail/${this.$route.query.type}?tabId=${this.$route.query.tabId}`);
     },
     edit(row) {
-      this.$router.push({ path: `/activity/template-detail/${this.$route.query.type}`, query: { id: row.templateId } });
+      this.$router.push({ path: `/activity/template-detail/${this.$route.query.type}?tabId=${this.$route.query.tabId}`, query: { id: row.templateId } });
     },
     handleSwitch(statusFlag, templateId) {
       this.$confirm(`${statusFlag == 0 ? '关闭后，商户在创建此类型游戏时将无法选用此游戏模板，确认关闭' : '开启后，商户将可引用次模板，确认开启'}？`, `${statusFlag == 0 ? '关闭' : '开启'}提示`, {