购物店导入修改

src/components/ShoppingStore/ShoppingStore.vue

@@ -5,7 +5,7 @@
 }
 .shoppingStore .resourceList {
   width: 215px;
-  height: 288px;
+  height: 230px;
   background-color: #fff;
   border: 1px solid #ededed;
   border-radius: 4px;
@@ -434,10 +434,9 @@
     <div class="hotelResource clearfix" v-loading="loading" :class="{'divTop':isShow,'fillTop':fillShow}">
       <div class="resourceList" v-for="item in dataInfo" :key="item.subCode">
         <div class="reTopInfo">
-
           <img v-if="item.PicPath!=''" :src="'https://reborndev.oss-cn-hangzhou.aliyuncs.com'+item.PicPath" :onerror='defaultImg' />
           <img v-else src="../../assets/img/shoppingstore.jpg" :onerror='defaultImg' />
-          <div class="profitList">
+          <div class="profitList" style="display:none">
             <div class="profOne">一<span class="cumlaProfit">累计利润</span>一</div>
             <div>￥{{item.TotalProfit}}</div>
           </div>
@@ -453,8 +452,8 @@
             No.{{item.Sort}}
           </div>
         </div>
-        <div class="AccumuTrading">累计交易</div>
-        <div class="amountOf">￥{{item.TotalPrice}}</div>
+        <div class="AccumuTrading" style="display:none">累计交易</div>
+        <div class="amountOf" style="display:none">￥{{item.TotalPrice}}</div>
         <div class="PhoneNum">
           <i class="iconfont icon-img_dianhua"></i>{{item.Tel}}
         </div>
@@ -477,7 +476,6 @@
           <input type="button" class="hollowFixedBtn" @click="isShow=false,resetForm('addMsg')" value="取消" />
         </el-col>
       </el-row>
-      <!-- <div class="combottomTitle">{{titleInfo}}</div> -->
       <el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="100px">
         <ul class="changeMsg">
           <li>
@@ -575,15 +573,10 @@
           </div>
         </div>
       </el-form>
-      <!-- <div class="btmBtn">
-                        <div style="float:right;">
-                          <input type="button" class="hollowFixedBtn" @click="isShow=false,resetForm('addMsg')" value="取消"/>
-                          <input type="button" class="normalBtn" @click="submitForm('addMsg')" value="保存"/>
-                        </div>
-                    </div> -->
     </div>
     <div class="btmAddStore" :class="{'fillShow':fillShow}">
       <div class="btmTitle">导入营销数据<span class="litTip">(红色边框代表未匹配到的数据)</span></div>
+      <div style="height:250px;overflow-y: auto;">
       <table class="impoTable" style="border-spacing: 0px 1px;">
         <thead>
           <tr>
@@ -633,6 +626,7 @@
           </tr>
         </thead>
       </table>
+      </div>
       <div class="btmBtn impotBtn">
         <input type="button" class="normalBtn" @click="importInfo" value="确认导入" />
         <input type="button" class="hollowFixedBtn" @click="hideFill" value="取消" />

src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue

@@ -579,7 +579,6 @@
             res => {
               if (res.data.resultCode == 1) {
                 var tempData = res.data.data;
-                console.log('tempData',tempData)
                 if (tempData.Feature != null) {
                   this.FeatureData.ID = tempData.Feature.ID;
                   this.FeatureData.ConfigId = tempData.Feature.ConfigId;