页面修改

src/components/sallCenter/plugin/banner.vue

 <style>
-    .banner-container{
+  .banner-container {
     background-color: #fff;
   }
+
   .bannerStyle-item {
     width: 100px;
     border: 1px solid #ebeef5;
@@ -11,10 +12,12 @@
     text-align: center;
     color: #606266;
   }
-    .banner_active{
+
+  .banner_active {
     border-color: #00a0e9;
     color: #409EFF;
   }
+
   .banner-style-1 {
     background: #e6f4ff;
     display: block;
@@ -22,13 +25,15 @@
     margin: 0 auto 5px;
     position: relative;
   }
-    .banner-style-2{
+
+  .banner-style-2 {
     display: block;
     height: 50px;
     margin: 0 auto 5px;
     position: relative;
   }
-    .banner-style-2 > div {
+
+  .banner-style-2>div {
     background: #e6f4ff;
     position: absolute;
     left: 0;
@@ -38,7 +43,8 @@
     z-index: 0;
     zoom: .75;
   }
-   .banner-style-2 > div:last-child {
+
+  .banner-style-2>div:last-child {
     left: 15%;
     zoom: 1;
     box-shadow: 0 0 5px rgba(0, 0, 0, .2);
@@ -46,13 +52,15 @@
     width: 70%;
     top: 0;
   }
+
   .banner-edit-item {
     border: 1px solid #dcdfe6;
     padding: 5px;
     margin-bottom: 5px;
     position: relative;
   }
-    .banner_image_upload .pic-box{
+
+  .banner_image_upload .pic-box {
     width: 70px;
     height: 70px;
     border: 1px solid #ccc;
@@ -63,6 +71,7 @@
     background-repeat: no-repeat;
     position: relative;
   }
+
   .banner-edit-options .el-button {
     height: 25px;
     line-height: 25px;
@@ -74,6 +83,7 @@
     position: absolute;
     margin-left: 0;
   }
+
   .banner_image_upload .pic-box .size-tip {
     line-height: 1.35;
     text-align: center;
@@ -89,10 +99,12 @@
     background: rgba(0, 0, 0, 0.2);
     letter-spacing: -1px;
   }
+
   .banner_image_upload .pic-box i {
     font-size: 12px;
     color: #fff;
   }
+
   .banner_image_upload .image-delete {
     position: absolute;
     top: -10px;
@@ -101,43 +113,55 @@
     visibility: hidden;
     z-index: 1;
   }
-    .banner_image_upload:hover .image-delete{
-        visibility:visible;
+
+  .banner_image_upload:hover .image-delete {
+    visibility: visible;
   }
+
   .banner-container .banner-img {
     height: 100%;
     width: 100%;
     background-repeat: no-repeat;
     background-position: center;
   }
-    .banner-container .banner-img-contain{
+
+  .banner-container .banner-img-contain {
     background-size: contain;
   }
-    .banner-container .banner-img-cover{
+
+  .banner-container .banner-img-cover {
     background-size: cover;
   }
-    .bannerTopRadis{
-        overflow:hidden;
+
+  .bannerTopRadis {
+    overflow: hidden;
   }
+
 </style>
 <template>
   <div :class="{'active':banData.isCked}">
     <div class="diy-component-options" v-if="banData.isCked">
       <el-button type="primary" icon="el-icon-delete" style="left: -25px; top: 0px;" @click="delPlugin()"></el-button>
       <el-button type="primary" icon="el-icon-document-copy" style="left: -25px; top: 30px;"></el-button>
-            <el-button type="primary" icon="el-icon-arrow-up" v-if="index>0" @click="resetSord(0)" style="right: -25px; top: 0;"></el-button>
-            <el-button type="primary" icon="el-icon-arrow-down" v-if="index!=dataLeng-1" @click="resetSord(1)" style="right: -25px; top: 30px;"></el-button>
+      <el-button type="primary" icon="el-icon-arrow-up" v-if="index>0" @click="resetSord(0)"
+        style="right: -25px; top: 0;"></el-button>
+      <el-button type="primary" icon="el-icon-arrow-down" v-if="index!=dataLeng-1" @click="resetSord(1)"
+        style="right: -25px; top: 30px;"></el-button>
     </div>
-        <div class="diy-component-preview" :style="{backgroundColor:banData.data.background,paddingBottom:banData.data.topAndBottom+'px',paddingTop:banData.data.topAndBottom+'px',paddingLeft:banData.data.leftAndRight+'px',paddingRight:banData.data.leftAndRight+'px'}">
-            <div class="banner-container bannerTopRadis" :style="{height:banData.data.height+'px',borderRadius:banData.data.radius+'px'}">
+    <div class="diy-component-preview"
+      :style="{backgroundColor:banData.data.background,paddingBottom:banData.data.topAndBottom+'px',paddingTop:banData.data.topAndBottom+'px',paddingLeft:banData.data.leftAndRight+'px',paddingRight:banData.data.leftAndRight+'px'}">
+      <div class="banner-container bannerTopRadis"
+        :style="{height:banData.data.height+'px',borderRadius:banData.data.radius+'px'}">
         <el-carousel :interval="3000" arrow="always" v-if="banData.data.style==1" :height="banData.data.height+'px'">
           <el-carousel-item v-for="(item,index) in banData.data.banners" :key="index">
-                        <div class="banner-img" :class="banData.data.fill==1?'banner-img-cover':'banner-img-contain'" :style="{backgroundImage:'url('+getIconLink(item.picUrl)+')'}"></div>
+            <div class="banner-img" :class="banData.data.fill==1?'banner-img-cover':'banner-img-contain'"
+              :style="{backgroundImage:'url('+getIconLink(item.picUrl)+')'}"></div>
           </el-carousel-item>
         </el-carousel>
         <el-carousel v-else :interval="4000" type="card" :height="banData.data.height+'px'">
           <el-carousel-item v-for="(item,index) in banData.data.banners" :key="index">
-                        <div class="banner-img" :class="banData.data.fill==1?'banner-img-cover':'banner-img-contain'" :style="{backgroundImage:'url('+getIconLink(item.picUrl)+')'}"></div>
+            <div class="banner-img" :class="banData.data.fill==1?'banner-img-cover':'banner-img-contain'"
+              :style="{backgroundImage:'url('+getIconLink(item.picUrl)+')'}"></div>
           </el-carousel-item>
         </el-carousel>
       </div>
@@ -146,11 +170,13 @@
       <el-form label-width="100px">
         <el-form-item label="样式">
           <div flex="dir:left">
-                        <div class="bannerStyle-item" :class="{'banner_active':banData.data.style==1}" @click="banData.data.style=1">
+            <div class="bannerStyle-item" :class="{'banner_active':banData.data.style==1}"
+              @click="banData.data.style=1">
               <div class="banner-style-1"></div>
               <div>样式1</div>
             </div>
-                        <div class="bannerStyle-item" style="margin-left:5px;" :class="{'banner_active':banData.data.style==2}" @click="banData.data.style=2">
+            <div class="bannerStyle-item" style="margin-left:5px;" :class="{'banner_active':banData.data.style==2}"
+              @click="banData.data.style=2">
               <div flex class="banner-style-2">
                 <div></div>
                 <div></div>
@@ -173,19 +199,29 @@
         <el-form-item label="拉取轮播图">
           <el-button size="small" @click="isShowLunbo=true">选择</el-button>
         </el-form-item>
+        <el-form-item label="链接标题">
+          <el-radio-group v-model="banData.data.isShowTitle">
+            <el-radio :label="0">不显示</el-radio>
+            <el-radio :label="1">显示</el-radio>
+          </el-radio-group>
+        </el-form-item>
         <el-form-item label="轮播图">
           <div flex="dir:top">
             <div class="banner-edit-item" v-for="(item,index) in banData.data.banners" :key="index">
               <div class="banner-edit-options">
-                                <el-button type="primary" icon="el-icon-delete" @click="delBanner(index)" style="position:absolute;top: -1px; right: -26px;"></el-button>
+                <el-button type="primary" icon="el-icon-delete" @click="delBanner(index)"
+                  style="position:absolute;top: -1px; right: -26px;"></el-button>
               </div>
               <div flex="box:first">
                 <div>
                   <div class="banner_image_upload" style="margin-right:5px;">
-                                        <div flex="main:center cross:center" @click="choiceMyImg(index)" class="pic-box" :style="{backgroundImage:'url(' + getIconLink(item.picUrl) + ')'}">
-                                            <i style="font-size:22px;color:#909399;" class="el-icon-picture-outline" v-if="item.picUrl==''"></i> 
+                    <div flex="main:center cross:center" @click="choiceMyImg(index)" class="pic-box"
+                      :style="{backgroundImage:'url(' + getIconLink(item.picUrl) + ')'}">
+                      <i style="font-size:22px;color:#909399;" class="el-icon-picture-outline"
+                        v-if="item.picUrl==''"></i>
                       <div class="size-tip">720 × 250</div>
-                                            <el-button type="danger" v-if="item.picUrl!=''" class="image-delete"  size="mini" icon="el-icon-close" @click.stop="item.picUrl=''" circle></el-button>
+                      <el-button type="danger" v-if="item.picUrl!=''" class="image-delete" size="mini"
+                        icon="el-icon-close" @click.stop="item.picUrl=''" circle></el-button>
                     </div>
                   </div>
                 </div>
@@ -194,6 +230,7 @@
                     <el-input type="text" v-model="item.url" placeholder="点击选择链接" size="small">
                       <el-button slot="append" @click="getMyChoice(index)">选择链接</el-button>
                     </el-input>
+                    <el-input v-if="banData.data.isShowTitle==1" type="text" v-model="item.title" placeholder="链接标题" size="small"></el-input>
                   </div>
                 </div>
               </div>
@@ -201,6 +238,7 @@
           </div>
           <el-button size="small" @click="addBanner()">添加轮播图</el-button>
         </el-form-item>
+
         <el-form-item label="圆角">
           <el-input type="number" size="small" v-model="banData.data.radius">
             <template slot="append">px</template>
@@ -247,14 +285,14 @@
   import chooseLunbo from "../../common/chooseLunbo.vue";
   import ChooseImg from "@/components/global/ChooseImg.vue";
   export default {
-    props: ["banData","index","dataLeng"],
+    props: ["banData", "index", "dataLeng"],
     data() {
       return {
-          isShowLink:false,
-          choicImg:false,
-          commonIndex:0,
+        isShowLink: false,
+        choicImg: false,
+        commonIndex: 0,
         //显示轮播图弹窗
-          isShowLunbo:false
+        isShowLunbo: false
       };
     },
     components: {
@@ -267,72 +305,72 @@
     },
     methods: {
       //添加轮播图
-      addBanner(){
-        let obj={
-            picUrl:'',
-            url:'',
-            openType:''
+      addBanner() {
+        let obj = {
+          picUrl: '',
+          url: '',
+          openType: ''
         }
         this.banData.data.banners.push(obj);
       },
       //删除banner
-      delBanner(index){
-        this.banData.data.banners.splice(index,1);
+      delBanner(index) {
+        this.banData.data.banners.splice(index, 1);
       },
       //选择链接
-      getMyChoice(index){
-        this.isShowLink=true;
-        this.commonIndex=index;
+      getMyChoice(index) {
+        this.isShowLink = true;
+        this.commonIndex = index;
       },
       //获取选择链接
-      getChoiceLink(){
+      getChoiceLink() {
         //调用子组件方法
         var obj = this.$refs.chooseMenu.getChooseMenu();
-        this.banData.data.banners[this.commonIndex].url=obj.PageUrl;
+        this.banData.data.banners[this.commonIndex].url = obj.PageUrl;
         this.isShowLink = false;
       },
       //选取图片
-      choiceMyImg(index){
+      choiceMyImg(index) {
         this.choicImg = true;
-        this.commonIndex=index;
+        this.commonIndex = index;
       },
       //选择图片
-      SelectId(msg){
-        this.banData.data.banners[this.commonIndex].picUrl=msg.url;
-        this.choicImg=false;
+      SelectId(msg) {
+        this.banData.data.banners[this.commonIndex].picUrl = msg.url;
+        this.choicImg = false;
       },
       //向父组件传值 并调用排序
-      resetSord(IsUp){
-        this.$emit('getSord', this.index,IsUp);
+      resetSord(IsUp) {
+        this.$emit('getSord', this.index, IsUp);
       },
       //点击触发父组件删除
-      delPlugin(){
+      delPlugin() {
         this.$emit('comDelPlugin', this.index);
       },
       //取消选择
-      quxiaoLunbo(){
-        this.isShowLunbo=false;
+      quxiaoLunbo() {
+        this.isShowLunbo = false;
         this.$refs.lunbo.toggleSelection();
       },
-      getChiceLunbo(){
-        var ckedArr=this.$refs.lunbo.getChoicedLunbo(); 
+      getChiceLunbo() {
+        var ckedArr = this.$refs.lunbo.getChoicedLunbo();
         ckedArr.forEach(x => {
-            let obj={
-                picUrl:this.getIconLink(x.NavImg),
-                url:x.NavLink,
-                openType:''
+          let obj = {
+            picUrl: this.getIconLink(x.NavImg),
+            url: x.NavLink,
+            openType: ''
           }
           this.banData.data.banners.push(obj);
         });
-        this.isShowLunbo=false;
+        this.isShowLunbo = false;
         this.$refs.lunbo.toggleSelection();
       },
-      getminNum(){
-        if(this.banData.data.topAndBottom==''){
-            this.banData.data.topAndBottom=0;
+      getminNum() {
+        if (this.banData.data.topAndBottom == '') {
+          this.banData.data.topAndBottom = 0;
         }
-        if(this.banData.data.leftAndRight==''){
-              this.banData.data.leftAndRight=0;
+        if (this.banData.data.leftAndRight == '') {
+          this.banData.data.leftAndRight = 0;
         }
       }
 
@@ -341,4 +379,5 @@
 
     }
   };
+
 </script>

src/components/sallCenter/templateEdit.vue

@@ -619,7 +619,8 @@
                 radius: 0, //圆角
                 topAndBottom: 0, //上下边距
                 leftAndRight: 0, //左右边距
-                background: '' //背景色
+                background: '', //背景色
+                isShowTitle: 0, //是否显示链接表头
               }
             }
             this.dataList.push(banObj);

src/components/tradePavilion/addContact.vue

@@ -80,7 +80,7 @@
         defaultMsg: "",
         config: {
           initialFrameWidth: null,
-          initialFrameHeight: 350
+          initialFrameHeight: 250
         },
         choicImg: false, //是否显示选择文件
         chooseType: 1, //选择类型1-头像，2-背景图

src/components/tradePavilion/investmentList.vue

@@ -16,23 +16,23 @@
           </div>
         </div>
         <el-table :data="tableData" v-loading="loading" border style="width: 100%;margin:20px 0">
-          <el-table-column prop="Id" label="编号" width="100">
+          <el-table-column prop="Id" label="编号" width="80">
           </el-table-column>
           <el-table-column prop="CompanyName" label="公司名称">
           </el-table-column>
           <el-table-column prop="Investment" label="投资意向">
           </el-table-column>
-          <el-table-column prop="Mobile" width="150" label="联系电话">
+          <el-table-column prop="Industry" width="150" label="行业">
           </el-table-column>
-          <el-table-column prop="EMail" width="150" label="邮箱">
+          <el-table-column prop="AnnualSales" width="120" label="年销售(万元)">
           </el-table-column>
-          <el-table-column prop="Industry" width="150" label="行业">
+          <el-table-column prop="AnnualImport" width="100" label="年进口额">
           </el-table-column>
-          <el-table-column prop="AnnualSales" width="150" label="年销售(万元)">
+          <el-table-column prop="Mobile" width="150" label="联系电话">
           </el-table-column>
-          <el-table-column prop="AnnualImport" width="150" label="年进口额">
+          <el-table-column prop="EMail" width="180" label="邮箱">
           </el-table-column>
-          <el-table-column prop="address" width="200" label="操作">
+          <el-table-column prop="address" width="150" label="操作">
             <template slot-scope="scope">
               <el-tooltip class="item" effect="dark" content="查看" placement="top">
                 <img @click="getInfo(scope.row)" src="../../assets/img/userman/icon-show.png" alt="">

src/components/tradePavilion/procurementList.vue

@@ -22,19 +22,19 @@
           </el-table-column>
           <el-table-column prop="ImportCategory" label="采购品目">
           </el-table-column>
-          <el-table-column prop="ImportNum" label="采购数量">
+          <el-table-column prop="ImportNum" width="150" label="采购数量">
           </el-table-column>
-          <el-table-column prop="Mobile" width="150" label="联系电话">
+          <el-table-column prop="Industry" width="150" label="行业">
           </el-table-column>
-          <el-table-column prop="EMail" width="150" label="邮箱">
+          <el-table-column prop="Mobile" width="150" label="联系电话">
           </el-table-column>
-          <el-table-column prop="Industry" width="150" label="行业">
+          <el-table-column prop="EMail" width="180" label="邮箱">
           </el-table-column>
-          <el-table-column prop="AnnualSales" width="150" label="年销售(万元)">
+          <el-table-column prop="AnnualSales" width="120" label="年销售(万元)">
           </el-table-column>
-          <el-table-column prop="AnnualImport" width="150" label="年进口额">
+          <el-table-column prop="AnnualImport" width="100" label="年进口额">
           </el-table-column>
-          <el-table-column prop="address" width="200" label="操作">
+          <el-table-column prop="address" width="150" label="操作">
             <template slot-scope="scope">
               <el-tooltip class="item" effect="dark" content="查看" placement="top">
                 <img @click="getInfo(scope.row)" src="../../assets/img/userman/icon-show.png" alt="">