提交一下 重新打包

1

dist/static/css/chunk-0bad3ee8.c9f2c946.css

@@ -0,0 +1 @@
+.right-code .title[data-v-06967bd6]{font-size:18px;text-align:center;padding-bottom:8px}.newBand[data-v-06967bd6]{display:inline-block}.el-input[data-v-06967bd6]{width:180px!important}

dist/static/css/chunk-649705fc.21c27d54.css

@@ -1 +0,0 @@
-.right-code .title[data-v-34ecd91e]{font-size:18px;text-align:center;padding-bottom:8px}.newBand[data-v-34ecd91e]{display:inline-block}.el-input[data-v-34ecd91e]{width:180px!important}

dist/static/css/chunk-c380a2cc.df259d87.css

@@ -0,0 +1 @@
+.titleCell[data-v-59f46f44]{display:inline-block}.tableWrap[data-v-59f46f44]{margin-top:20px}.qrcode[data-v-59f46f44]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.qrcode img[data-v-59f46f44]{width:200px;height:200px;margin:0 auto}.code-url[data-v-59f46f44]{font-size:18px;text-align:center;padding:15px 15px 0 15px}

src/store/modules/permission.js

@@ -599,6 +599,19 @@ function setDetailRoute(accessedRoutes) {
           }
         },
         {
+          name: '2021memeberActionManager',
+          path: '/2021memeberActionManager',
+          component: () => import('@/views/2021memeberActionManager'),
+          hidden: true,
+          meta: {
+            noCache: '1',
+            title: '2021会员活动',
+            belongTopMenu: "/operateManager",
+            activeMenu: '/activeMarketing',
+            id: 'xx19'
+          }
+        },
+        {
           name: 'memberActiveDetail',
           path: 'memberActiveDetail',
           component: () => import('@/views/2021memeberActionManager/memberActiveDetail'),

src/views/2021memeberActionManager/index.vue

@@ -1,7 +1,11 @@
 <!--  -->
 <template>
   <div class="m-container">
+<<<<<<< HEAD
     <el-page-header
+=======
+        <el-page-header
+>>>>>>> 03/03GRADE
       @back="onCancel"
       :content="'2021十一会员活动'"
     ></el-page-header>
@@ -409,7 +413,11 @@ export default {
         "您确定导出会员活动列表?"
       );
     },
+<<<<<<< HEAD
     onCancel() {
+=======
+      onCancel() {
+>>>>>>> 03/03GRADE
       this.$store.dispatch("delVisitedViews", this.$route);
       this.$router.push("/activeMarketing");
     },

src/views/sporadicManager/sporadicList.vue

@@ -532,7 +532,7 @@ export default {
         { label: "账户充值", value: 9 },
         { label: "乐保服务", value: 10 },
         { label: "网基课活动", value: 13 },
-        { label: "云教练系统", value: 15 },
+        { label: "云教练购买", value: 15 },
         { label: "其它", value: 11 },
       ],
       orderType1: [
@@ -545,7 +545,7 @@ export default {
         { label: "账户充值", value: 9 },
         { label: "乐保服务", value: 10 },
         { label: "网基课活动", value: 13 },
-        // { label: "云教练系统", value: 15 },
+        { label: "云教练购买", value: 15 },
       ],
       maskForm: {
         organId: "",
@@ -1003,7 +1003,7 @@ export default {
         11: "其它",
         12: "双十一活动",
         13: '网基课活动',
-        15: '云教练系统',
+        15: '云教练购买',
       };
       return template[val];
     },