插件修改

src/components/CommodityMan/goodsListEdit.vue

@@ -150,6 +150,18 @@
                       <span class="point" @click="imgDig = true">查看图例</span>
                     </p>
                   </el-form-item>
+                  <el-form-item label="商品Logo" v-if="currentUserInfo&&currentUserInfo.IsKorea==1">
+                    <el-tooltip class="item" effect="dark" content="建议尺寸420*336" placement="top">
+                      <el-button @click="openChangeDig(5)" size="small">选择图片</el-button>
+                    </el-tooltip>
+                    <div class="app-gallery-item" style="position: relative;width: 100px;margin-top: 10px;border:none">
+                      <img v-if="
+                          !addMsg.goodsLogo ||
+                            addMsg.goodsLogo == ''
+                        " src="../../assets/img/default.png" style="width:80px;height:80px" alt="" />
+                      <img v-else style="width:80px;height:80px" :src="addMsg.goodsLogo" alt="" />
+                    </div>
+                  </el-form-item>
                   <el-form-item label="直播商品" v-if="currentUserInfo.IsKorea==0">
                     <el-switch v-model="addMsg.IsLiveGoods" active-color="#409EFF" :active-value="1"
                       :inactive-value="2">
@@ -169,13 +181,14 @@
                       show-word-limit>
                     </el-input>
                   </el-form-item>
-                  <el-form-item label="海关代码/关税率" v-if="currentUserInfo&&currentUserInfo.IsKorea==1" style="display:none;">
-                    <el-input v-model="addMsg.FatCode" size="small" placeholder="海关代码/关税率" maxlength="100" show-word-limit>
+
+                  <el-form-item label="地址" v-if="currentUserInfo&&currentUserInfo.IsKorea==1">
+                    <el-input v-model="addMsg.FatCode" size="small" placeholder="地址" maxlength="100" show-word-limit>
                     </el-input>
                   </el-form-item>
-                  <el-form-item label="商品官网" v-if="currentUserInfo&&currentUserInfo.IsKorea==1" style="display:none;">
-                    <el-input v-model="addMsg.GoodsUrl" size="small" placeholder="商品官网" maxlength="100"
-                      show-word-limit>
+                  <el-form-item label="简介" v-if="currentUserInfo&&currentUserInfo.IsKorea==1">
+                    <el-input type="textarea" :rows="2" v-model="addMsg.GoodsUrl" size="small" placeholder="简介"
+                      maxlength="200" show-word-limit>
                     </el-input>
                   </el-form-item>
                   <el-form-item label="自动上架时间">
@@ -1188,8 +1201,9 @@
           Remark: '', //备注
           IsNoTax: 0, //是否可开发票 0是 1否
           GoodsCountry: "", //商品国家
-          FatCode: "", //海关代码/关税率
-          GoodsUrl: "", //商品官网
+          FatCode: "", //地址
+          GoodsUrl: "", //简介
+          goodsLogo: "", //商品Logo
           IsKorea: 0, //是否为韩国馆
         },
         predefineColors: [
@@ -2042,6 +2056,11 @@
           if (this.imgType == 4) {
             that.addMsg.MarketingLogo.ico = that.getIconLink(msg[0].url)
           }
+          //商品logo
+          if (this.imgType == 5) {
+            this.addMsg.goodsLogo = that.getIconLink(msg[0].url);
+            console.log("this.addMsg.goodsLogo",this.addMsg.goodsLogo)
+          }
         }
         this.changeState = false;
       },

src/components/sallCenter/plugin/nav-page.vue

@@ -212,7 +212,8 @@
                 <a v-if="index>0" @click="Move('up',index)" style="color:blue;cursor:pointer;">
                   上移
                 </a>
-                <a v-if="index!=navData.data.navs.length-1" @click="Move('down',index)" style="color:blue;cursor:pointer;">
+                <a v-if="index!=navData.data.navs.length-1" @click="Move('down',index)"
+                  style="color:blue;cursor:pointer;">
                   下移
                 </a>
               </div>
@@ -238,6 +239,12 @@
                       <el-radio :label="1">模板</el-radio>
                     </el-radio-group>
                   </div>
+                  <div style="margin-bottom:5px;">
+                    <el-radio-group v-model="item.isShow">
+                      <el-radio :label="1">显示</el-radio>
+                      <el-radio :label="0">隐藏</el-radio>
+                    </el-radio-group>
+                  </div>
                   <div v-if="item.ShowType==0" style="margin-bottom:5px;">
                     <el-input type="text" v-model="item.ComponentName" placeholder="选择组件" size="small">
                       <el-button slot="append" @click="isShowModule=true,commonIndex=index">选择组件</el-button>
@@ -416,6 +423,7 @@
           url: "", //组件URL
           TemplateId: 0,
           TemplateShowName: "",
+          isShow:1,//1-显示，0-隐藏
         }
         this.navData.data.navs.push(obj);
       },

src/components/tradePavilion/investmentList.vue

@@ -26,8 +26,6 @@
           </el-table-column>
           <el-table-column prop="AnnualSales" width="120" label="年销售(万元)">
           </el-table-column>
-          <el-table-column prop="AnnualImport" width="100" label="年进口额">
-          </el-table-column>
           <el-table-column prop="Mobile" width="150" label="联系电话">
           </el-table-column>
           <el-table-column prop="EMail" width="180" label="邮箱">
@@ -52,8 +50,8 @@
     </template>
     <template v-else>
       <div class="head-title">
-        <span @click="isShowInfo=false" style="color:rgb(64, 158, 255);cursor:pointer;">投资管理</span><span
-          style="margin:0 9px;color:#C0C4CC">/</span><span>投资详情</span>
+        <span @click="isShowInfo=false" style="color:rgb(64, 158, 255);cursor:pointer;">招商管理</span><span
+          style="margin:0 9px;color:#C0C4CC">/</span><span>招商详情</span>
       </div>
       <div class="content">
         <el-form label-width="120px">
@@ -105,16 +103,16 @@
           <el-form-item label="详细地址英文">
             <el-input type="text" v-model="addMsg.EnAddress" class="w400" disabled></el-input>
           </el-form-item>
-          <el-form-item label="年进口额">
+          <el-form-item label="年进口额" style="display:none;">
             <el-input type="text" v-model="addMsg.AnnualImport" class="w400" disabled></el-input>
           </el-form-item>
-          <el-form-item label="主要进口品目">
+          <el-form-item label="主要进口品目" style="display:none;">
             <el-input type="text" v-model="addMsg.ImportCategory" class="w400" disabled></el-input>
           </el-form-item>
-          <el-form-item label="主要进口国">
+          <el-form-item label="主要进口国" style="display:none;">
             <el-input type="text" v-model="addMsg.ImportCountry" class="w400" disabled></el-input>
           </el-form-item>
-          <el-form-item label="主要出口国">
+          <el-form-item label="主要出口国" style="display:none;">
             <el-input type="text" v-model="addMsg.ExportCountry" class="w400" disabled></el-input>
           </el-form-item>
           <el-form-item label="公司介绍">

src/components/tradePavilion/procurementList.vue

@@ -32,8 +32,6 @@
           </el-table-column>
           <el-table-column prop="AnnualSales" width="120" label="年销售(万元)">
           </el-table-column>
-          <el-table-column prop="AnnualImport" width="100" label="年进口额">
-          </el-table-column>
           <el-table-column prop="AuditStatusStr" width="100" label="审核状态">
           </el-table-column>
           <el-table-column prop="address" width="150" label="操作">
@@ -110,16 +108,16 @@
           <el-form-item label="详细地址英文">
             <el-input type="text" v-model="addMsg.EnAddress" class="w400" disabled></el-input>
           </el-form-item>
-          <el-form-item label="年进口额">
+          <el-form-item label="年进口额" style="display:none;">
             <el-input type="text" v-model="addMsg.AnnualImport" class="w400" disabled></el-input>
           </el-form-item>
-          <el-form-item label="主要进口品目">
+          <el-form-item label="主要进口品目" style="display:none;">
             <el-input type="text" v-model="addMsg.ImportCategory" class="w400" disabled></el-input>
           </el-form-item>
-          <el-form-item label="主要进口国">
+          <el-form-item label="主要进口国" style="display:none;">
             <el-input type="text" v-model="addMsg.ImportCountry" class="w400" disabled></el-input>
           </el-form-item>
-          <el-form-item label="主要出口国">
+          <el-form-item label="主要出口国" style="display:none;">
             <el-input type="text" v-model="addMsg.ExportCountry" class="w400" disabled></el-input>
           </el-form-item>
           <el-form-item label="公司介绍">