页面修改

src/components/tradePavilion/addContact.vue

@@ -37,8 +37,7 @@
           </div>
         </el-form-item>
         <el-form-item label="介绍">
-          <el-input type="textarea" :rows="3" v-model="addMsg.Intro" size="small" placeholder="介绍"
-            maxlength="1000" />
+          <UE style="width:750px;" :defaultMsg="defaultMsg" :config="config" :IsMultiple="true" ref="ue"></UE>
         </el-form-item>
       </el-form>
     </div>
@@ -53,8 +52,10 @@
 </template>
 <script>
   import ChooseImg from "@/components/global/ChooseImg.vue";
+  import UE from "@/components/global/UE.vue";
   export default {
     components: {
+      UE,
       ChooseImg
     },
     data() {
@@ -65,17 +66,22 @@
             message: '请输入姓名',
             trigger: 'blur'
           }],
-          Tel:[{
+          Tel: [{
             required: true,
             message: '请输入电话',
             trigger: 'blur'
           }],
-          Position:[{
+          Position: [{
             required: true,
             message: '请输入职位',
             trigger: 'blur'
           }]
         },
+        defaultMsg: "",
+        config: {
+          initialFrameWidth: null,
+          initialFrameHeight: 350
+        },
         choicImg: false, //是否显示选择文件
         chooseType: 1, //选择类型1-头像，2-背景图
         loading: false,
@@ -106,6 +112,8 @@
         }
       },
       Save(formName) {
+        let content = this.$refs.ue.getUEContent();
+        this.addMsg.Intro = content;
         this.$refs[formName].validate((valid) => {
           if (valid) {
             this.apipost("/api/Trade/SetContract", this.addMsg, res => {
@@ -136,6 +144,9 @@
             this.addMsg.BgImg = tempData.BgImg;
             this.addMsg.Position = tempData.Position;
             this.addMsg.Intro = tempData.Intro;
+            if (tempData.Intro) {
+              this.defaultMsg = tempData.Intro;
+            }
           }
         })
       },
@@ -231,12 +242,15 @@
     height: 32px;
     margin: 0 5px;
   }
-  .addContact .headerImg{
-    width:80px;
-    height:80px;
+
+  .addContact .headerImg {
+    width: 80px;
+    height: 80px;
   }
-  .addContact .headerImg img{
-    width:100%;
-    height:100%;
+
+  .addContact .headerImg img {
+    width: 100%;
+    height: 100%;
   }
+
 </style>

src/components/tradePavilion/contactus.vue

@@ -11,7 +11,7 @@
       <div>
         <div class="searchInput" style="width:250px;">
           <el-input @keyup.enter.native="msg.pageIndex=1,getList()" @clear="msg.pageIndex=1,getList()"
-            style="display:inline-block;width:225px;height:30px" placeholder="请输入昵称" v-model="msg.Name" size="small"
+            style="display:inline-block;width:225px;height:30px" placeholder="请输入姓名" v-model="msg.Name" size="small"
             clearable>
           </el-input>
           <span @click="msg.pageIndex=1,getList()" class="el-icon-search"
@@ -21,7 +21,7 @@
       <el-table :data="tableData" v-loading="loading" border style="width: 100%;margin:20px 0">
         <el-table-column prop="Id" label="ID" width="100">
         </el-table-column>
-        <el-table-column prop="Name" width="280" label="头像">
+        <el-table-column prop="Name" width="280" label="头像/姓名">
           <template slot-scope="scope">
             <div class="app-image" :style="{backgroundImage:'url(' + scope.row.HeadIcon + ')',backgroundSize:'cover'}">
             </div>
@@ -47,7 +47,8 @@
                 alt="">
             </el-tooltip>
             <el-tooltip class="item" effect="dark" content="删除" placement="top-start">
-              <img @click="delContactus(scope.row)"  style="width:32px;height:32px;margin:0 10px" src="../../assets/img/userman/del.png" alt="">
+              <img @click="delContactus(scope.row)" style="width:32px;height:32px;margin:0 10px"
+                src="../../assets/img/userman/del.png" alt="">
             </el-tooltip>
           </template>
         </el-table-column>
@@ -64,7 +65,7 @@
       return {
         msg: {
           pageIndex: 1,
-          pageSize: 15,
+          pageSize: 10,
           Name: '',
         },
         total: 0,

src/components/tradePavilion/tradeactivityList.vue

@@ -35,6 +35,15 @@
           </el-table-column>
           <el-table-column prop="EndTimeStr" label="结束时间">
           </el-table-column>
+          <el-table-column prop="ActivityStatusStr" label="活动状态">
+          </el-table-column>
+          <el-table-column prop="JoinNum" label="报名人数">
+            <template slot-scope="scope">
+              <el-button type="text" @click="dialogTableVisible = true,getItem(scope.row)">
+                {{scope.row.JoinNum}} 人
+              </el-button>
+            </template>
+          </el-table-column>
           <el-table-column prop="Id" width="200" label="操作">
             <template slot-scope="scope">
               <el-tooltip class="item" effect="dark" content="编辑" placement="top">
@@ -100,6 +109,12 @@
     <el-dialog title="选择文件" :visible.sync="isShowImage" width="1240px">
       <ChooseImg @SelectId="SelectId"></ChooseImg>
     </el-dialog>
+    <el-dialog title="报名信息" :visible.sync="dialogTableVisible">
+      <el-table :data="joinData">
+        <el-table-column property="LinkMan" label="联系人" width="150"></el-table-column>
+        <el-table-column property="LinkTel" label="联系电话" width="200"></el-table-column>
+      </el-table>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -143,6 +158,8 @@
           ActivityInfo: "", //活动详情
         },
         activityTypeList: [], //活动类型列表
+        dialogTableVisible: false, //是否显示弹窗
+        joinData: [], //报名信息
         rules: {
           ActivityName: [{
             required: true,
@@ -163,7 +180,8 @@
             validator: validataTrade,
             trigger: "change",
             required: true
-          }]
+          }],
+
         },
         pickerBeginDateBefore: {
           disabledDate: time => {
@@ -188,6 +206,10 @@
       this.getList();
     },
     methods: {
+      getItem(item) {
+        this.joinData = [];
+        this.joinData = item.CommerceConsultList;
+      },
       //获取活动类型列表
       getActivityType() {
         this.apipost("/api/Trade/GetCommerceActivityTypeList", {}, res => {
@@ -344,7 +366,9 @@
     padding: 20px;
     box-sizing: border-box;
   }
-  .tradeactivity .el-form-item__content{
+
+  .tradeactivity .el-form-item__content {
     line-height: 0;
   }
+
 </style>