Merge branch 'master' into feature/停复机1

* master:
  update: dist
  update: dist
  update: 切换账号后清除缓存的权限等数据
  update: dist
  update: dist

src/App.vue

@@ -51,6 +51,8 @@ export default {
               // 两次的uId不等 表示账号有冲突
               if (this.uniqueId !== uId) {
                 this.$store.commit('changeUniqueId', uId);
+                // 切换账号后，不缓存权限数据、菜单数据、面包屑数据
+                window.notCache = true;
                 this.$confirm('当前登录账号已经发生变化，如果您在其他页面已经登录另一个账号，请重新登录！', '登录账号变更提示', {
                   confirmButtonText: '重新登录',
                   cancelButtonText: '刷新页面',

src/components/active-config/base-config.vue

@@ -46,7 +46,15 @@ import baseConfig from '@/components/active-config/base-config.vue';
         v-if="$route.query.activityId && activeInfoData.cardCoupName"
         label="卡券："
         prop="cardCoupName"
-      >{{activeInfoData.cardCoupName}} </el-form-item>
+      >
+      {{activeInfoData.cardCoupName}}
+      <el-tag size="mini" style="margin-left:5px;" type="danger" v-if="!!activeInfoData.cardCoupStatus">
+      {{statusText[activeInfoData.cardCoupStatus]}}
+      </el-tag>
+       <el-tag size="mini" style="margin-left:5px;" type="danger" v-if="activeInfoData.cardCoupStatus==0&&activeInfoData.cardCoupStock==0">
+       库存不足
+      </el-tag>
+       </el-form-item>
       <el-form-item
         label="活动名称："
         prop="activityName"
@@ -162,6 +170,11 @@ export default {
     };
     return {
       loading: false,
+      statusText: {
+        0: '正常',
+        1: '删除',
+        2: '已过期'
+      },
       activeInfoData: {
         activityId: '',
         parentGoalId: '',