update

src/App.vue

@@ -108,7 +108,7 @@ export default {
 }
 </script>
 <style>
-  @import "//at.alicdn.com/t/font_635492_p33f7rq158p.css";
+  @import "//at.alicdn.com/t/font_635492_zhaw2pckn4j.css";
   @import "./assets/css/Semibold.css";
   @import "./assets/css/global/config.css";
   @import "./assets/css/fileIcon.css";

src/components/ShoppingStore/ShoppingStore.vue

@@ -387,6 +387,9 @@
   display: block;
 }
 .shoppingStore .combottomDiv{height:400px;}
+.IsConflict td{
+  background-color:pink!important;
+}
 /* 购物店 */
 </style>
 <template>
@@ -593,7 +596,7 @@
               <th>币种</th>
               <th>操作</th>
             </tr>
-            <tr v-for="(item,index) in importData" :key="item.subCode">
+            <tr v-for="(item,index) in importData" :key="item.subCode" :class="{'IsConflict':item.IsConflict==1}">
               <td :class="{'redType':item.TCIDExist==-1}">
                 <el-input v-model="item.TCNUM" class="w150"></el-input>
               </td>

src/components/activity/LuckyDraw.vue

@@ -135,7 +135,7 @@
         <th>{{$t('admin.admin_company')}}</th>
         <th>{{$t('active.ld_cjcs')}}</th>
         <th>{{$t('hotel.hotel_StartDate')}}</th>
-        <th>{{$t('hotel.hotel_StartDate')}}</th>
+        <th>{{$t('hotel.hotel_EndDate')}}</th>
         <th>{{$t('active.ld_status')}}</th>
         <th width="400">{{$t('hotel.hotel_remark')}}</th>
         <th>{{$t('hotel.table_operat')}}</th>