Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/activity/CouponDetail.vue

@@ -23,7 +23,7 @@
     <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
       <tr>
         <th>{{$t('active.cl_hdtujing')}}</th>
-        <th>{{$t('active.cl_hdqudao')}}</th>
+        <!-- <th>{{$t('active.cl_hdqudao')}}</th> -->
         <th>{{$t('active.cl_syzhuangtai')}}</th>
         <th>{{$t('hotel.order_Number')}}</th>
         <th>{{$t('active.cl_orderType')}}</th>
@@ -35,9 +35,18 @@
       <tbody v-loading="loading">
         <tr v-for="(item,index) in DataList" :key="index">
           <td>
-            <span v-if="item.accessType == 1">{{$t('active.cl_choujiang')}}</span>
+            <span v-if="item.accessType == 1">活动</span>
+            <span v-else-if="item.accessType == 2">{{$t('active.cl_choujiang')}}</span>
+            <span v-else-if="item.accessType == 3">完款自动发放</span>
+            <span v-else-if="item.accessType == 4">后台发放</span>
+            <span v-else-if="item.accessType == 5">分享</span>
+            <span v-else-if="item.accessType == 6">购买并付款</span>
+            <span v-else-if="item.accessType == 7">新人领券</span>
+            <span v-else-if="item.accessType == 8">新人购买并付款</span>
+            <span v-else-if="item.accessType == 9">口令发放</span>
+            <span v-else-if="item.accessType == 10">新人购买</span>
           </td>
-          <td>{{item.acessName}}</td>
+          <!-- <td>{{item.acessName}}</td> -->
           <td>
             <span v-if="item.useState == 1" style="color: green">{{$t('active.cl_wsyong')}}</span>
             <span v-if="item.useState == 2" style="color: gary">{{$t('active.cl_ysyong')}}</span>

src/components/activity/components/addAutorelease.vue

@@ -378,7 +378,7 @@
             this.apipost("coupon_post_GetTriggerTypeEnumList",{}, res => {
               if (res.data.resultCode == 1) {
                 this.options = res.data.data;
-                this.msg.TriggerType = res.data.data[0].Id
+                if(!this.msg.TriggerType) this.msg.TriggerType = res.data.data[0].Id
               } else {
                 this.Info(res.data.message);
               }