页面修改

src/components/common/choicels.vue

 <template>
   <div>
     <el-input size="mini" v-model="msg.Name" placeholder="根据名称搜索" :clearable="true" @clear="msg.pageIndex=1,getList()"
-              @keyup.enter.native="msg.pageIndex=1,getList()">
+      @keyup.enter.native="msg.pageIndex=1,getList()">
       <el-button slot="append" @click="msg.pageIndex=1,getList()">搜索</el-button>
     </el-input>
     <el-table ref="multipleTable" :data="dataList" tooltip-effect="dark" height="450" style="width: 100%"
-              @selection-change="handleSelectionChange">
+      @selection-change="handleSelectionChange">
       <template v-if="isSingle">
         <el-table-column width="50px" label="">
           <template slot-scope="scope">
@@ -21,11 +21,10 @@
       <el-table-column label="编号" width="80px">
         <template slot-scope="scope">{{ scope.row.ID }}</template>
       </el-table-column>
-      <el-table-column
-        prop="Name"
-        label="信息">
+      <el-table-column prop="Name" label="信息">
         <template slot-scope="scope">
-          <div class="app-image" :style="{backgroundImage:'url(' + scope.row.TeacherLogo + ')',backgroundSize:'cover'}"></div>
+          <div class="app-image" :style="{backgroundImage:'url(' + scope.row.TeacherLogo + ')',backgroundSize:'cover'}">
+          </div>
           <div flex="dir:left cross:center">
             {{scope.row.Name}}
           </div>
@@ -35,7 +34,7 @@
       </el-table-column>
     </el-table>
     <el-pagination style="text-align:center" background @current-change="handleCurrentChange" :page-size="msg.pageSize"
-                   layout="prev, pager, next" :total="total">
+      layout="prev, pager, next" :total="total">
     </el-pagination>
   </div>
 </template>
@@ -48,10 +47,10 @@
         msg: {
           pageIndex: 1,
           pageSize: 15,
-          Name:'',
-          ID:0,
-          Telephone:'',
-          TeacherStatus:1
+          Name: '',
+          ID: 0,
+          Telephone: '',
+          TeacherStatus: 1
         },
         total: 0,
         selectRow: [],
@@ -120,12 +119,13 @@
 
 </script>
 <style>
-   .app-image{
+  .app-image {
     background-position: center center;
     width: 50px;
     height: 50px;
-    border-radius:0%;
+    border-radius: 0%;
     float: left;
     margin-right: 8px;
   }
+
 </style>

src/components/sallCenter/plugin/educationteacher.vue

@@ -154,6 +154,7 @@
     overflow: hidden;
     text-overflow: ellipsis;
     margin-bottom: 10px;
+    text-align: center;
   }
 
   .diy-teacher .diy-component-preview .goods-name-static {
@@ -268,35 +269,36 @@
       <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>
+        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>
+        style="right: -25px; top: 30px;"></el-button>
     </div>
     <div class="diy-teacher">
-      <div class="diy-component-preview" :style="{'backgroundColor':data.backgroundColor,'borderRadius':data.SearchFilletPX+'px'}">
-        <div :flex="cMainFlex"  :style="{marginLeft:data.PaddingLeft+'px',
+      <div class="diy-component-preview"
+        :style="{'backgroundColor':data.backgroundColor,'borderRadius':data.SearchFilletPX+'px'}">
+        <div :flex="cMainFlex" :style="{marginLeft:data.PaddingLeft+'px',
         marginRight:data.PaddingRight+'px',marginTop:data.PaddingTop+'px',
         marginBottom:data.PaddingBottom+'px'}">
           <div class="goods-list" :class="'goods-list-style-'+data.listStyle">
             <div v-for="(cat,catIndex) in cCatList" :key="catIndex">
               <div :style="cGoodsListStyle" flex>
                 <div v-for="(goods,goodsIndex) in cCatGoodsList(cat, catIndex)" class="goods-item" :key="goodsIndex"
-                     :class="data.catPosition==='left'?'goods-cat-list':''">
+                  :class="data.catPosition==='left'?'goods-cat-list':''">
                   <div style="display: inline-block;" :style="cGoodsItemWidth">
-                    <div :style="cGoodsItemStyle" :flex="cGoodsItemFlex" style="position: relative;border:1px solid rgb(226, 226, 226);display: flex;flex-direction: column;align-items: center">
+                    <div :style="cGoodsItemStyle" :flex="cGoodsItemFlex"
+                      style="position: relative;border:1px solid rgb(226, 226, 226);display: flex;flex-direction: column;align-items: center">
                       <div class="goods-pic"
-                           :class="'goods-pic-'+data.goodsCoverProportion+' goods-pic-fill-'+data.fill"
-                           :style="'background-image: url('+getIconLink(goods.picUrl)+')'">
+                        :class="'goods-pic-'+data.goodsCoverProportion+' goods-pic-fill-'+data.fill"
+                        :style="'background-image: url('+getIconLink(goods.picUrl)+')'">
                       </div>
                       <div :style="cGoodsItemInfoStyle">
                         <div class="goods-name" :class="data.listStyle===-1?'goods-name-static':''">
-                          <template>{{goods.name}}</template>
+                          <template >{{goods.name}}</template>
                         </div>
                         <div flex="box:last">
                           <div style="text-align: center">
-                             <template>{{goods.nationality}}</template>
+                            <template>{{goods.nationality}}</template>
                           </div>
-
                           <div>
                             <template v-if="cShowBuyBtn">
                               <template v-if="data.buyBtn==='cart'">
@@ -312,8 +314,11 @@
                             </template>
                           </div>
                         </div>
-                        <div style="text-align: center">
-                          <template>{{goods.lableName}}</template>
+                        <div style="text-align: center;font-size:12px" v-if='goods.lableNameList.length>0'>
+                          <span v-for="(gitem,gindex) in goods.lableNameList"  :key="gindex">{{gitem}}{{goods.lableNameList.length==gindex+1?'':','}}</span>
+                        </div>
+                         <div style="text-align: center;font-size:12px" v-if='goods.lableNameList.length==0'>
+                          <template >教育</template>
                         </div>
                       </div>
                     </div>
@@ -327,15 +332,12 @@
       <div class="diy-component-edit" v-if="lsData.isCked">
         <el-form label-width='150px' @submit.native.prevent>
           <template>
-<!--            <el-form-item label="老师添加">-->
-<!--              <el-radio v-model="data.addGoodsType" :label="0">自定义</el-radio>-->
-<!--            </el-form-item>-->
-            <el-form-item  label="老师列表">
+            <el-form-item label="老师列表">
               <draggable v-model="data.TeacherList" class="goods-list" style="display:flex;">
                 <div class="goods-item" v-for="(goods,goodsIndex) in data.TeacherList" :key="goodsIndex">
                   <el-tooltip effect="dark" content="移除老师" placement="top">
                     <el-button @click="deleteGoods(goodsIndex,null)" circle class="goods-delete" type="danger"
-                               icon="el-icon-close"></el-button>
+                      icon="el-icon-close"></el-button>
                   </el-tooltip>
                   <div class="goods-pic" :style="'background-image:url('+getIconLink(goods.picUrl)+')'"></div>
                 </div>
@@ -347,9 +349,7 @@
           </template>
           <hr>
           <el-form-item label="列表样式">
-<!--            <el-radio v-model="data.listStyle" :label="-1">列表模式</el-radio>-->
             <el-radio v-model="data.listStyle" :label="0">左右滑动</el-radio>
-<!--            <el-radio v-model="data.listStyle" :label="1">一行一个</el-radio>-->
           </el-form-item>
           <el-form-item label="背景颜色">
             <div class="input-color" flex="dir:left cross:center">
@@ -378,7 +378,7 @@
             </el-input>
           </el-form-item>
           <el-form-item label="圆角">
-            <el-input type="number" size="small" :min="0" v-model="data.SearchFilletPX" >
+            <el-input type="number" size="small" :min="0" v-model="data.SearchFilletPX">
               <template slot="append">px</template>
             </el-input>
           </el-form-item>
@@ -477,8 +477,7 @@
         this.isShowGoods = true;
       },
       deleteGoods(goodsIndex, catIndex) {
-        if (catIndex !== null) {
-        } else {
+        if (catIndex !== null) {} else {
           this.data.TeacherList.splice(goodsIndex, 1);
         }
       },
@@ -503,15 +502,15 @@
             myArray.push({
               id: element.ID,
               name: element.Name,
-              picUrl: element.TeacherLogo,
               nationality: element.Nationality,
-              isForeigners: element.IsForeigners,
-              lableName: element.LableName,
+              foreignersUrl: element.IsForeigners,
+              lableName: "",
+              lableNameList: element.LableNameList,
+              picUrl: element.TeacherLogo,
             });
           });
         }
         if (this.comIndex !== null) {
-
         } else {
           this.data.TeacherList = this.data.TeacherList.concat(myArray);
         }

src/components/sallCenter/templateEdit.vue

@@ -1437,7 +1437,6 @@
               Id: 'educationteacher',
               isCked:false,
               data:{
-
                 addGoodsType:0, //商品添加方式【0-自定义,1-最新】
                 listStyle:0, //列表样式[-1-列表模式,0-左右滑动,1-一行一个]
                 backgroundColor: '#fff', //背景颜色