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/newTravelmanager/TravelGroupControl/TravelConfig.vue

@@ -217,9 +217,10 @@
               <GGMap></GGMap>
             </div>
             <div class="Travel_ImgList clearfix" :class="{'showOther':TeamType==3}">
+              {{PostConfig.fileList}}
               <div class="TFimgList" v-for="(item,index) in PostConfig.fileList" :key="item.subCode">
                 <img v-if="!item.Url" src="../../../assets/img/bg_c3@3x.png">
-                <img v-else :src='compressImg(item.Url, "filt", 170, "")'>
+                <img v-else :src='item.Url'>
                 <div class="TFIMGzhe">
                   <div class="TFreupload" @click="updateTFimg(index)">
                     <el-upload :file-list="PostConfig.fileList" :http-request="reUpload" :multiple="true"
@@ -454,8 +455,8 @@
           var str = this.domainManager().ViittoFileUrl + x.data.FilePath;
           that.PostConfig.fileList[
             this.updateChoseIndex
-          ].Url = this.$commonUtils.GetALiFileUrl(str);
-          that.PostConfig.fileList[this.updateChoseIndex].Name = fileName;
+          ].Url = str;
+          that.PostConfig.fileList[this.updateChoseIndex].Name = "";
         });
       },
       //修改图片
@@ -494,7 +495,7 @@
             obj.ID = 0;
             obj.Path = this.$commonUtils.removeDomain(imgItem.Path);
             obj.PicID = imgItem.ID;
-            obj.ShowPath = imgItem.Path + "?x-oss-process=image/resize,l_140";
+            obj.ShowPath = imgItem.Path ;
             that.PostConfig.fileList[this.ChooseImgIndex].Url = obj.ShowPath;
           });
         } else {