开发ing

src/views/dashboard/index.vue

@@ -14,7 +14,7 @@
                 <div class="el-icon-user button-icon"></div>
                 <div class="info-box">
                   <div class="text">已预约观众</div>
-                  <div class="value">68</div>
+                  <div class="value">{{currentExpo.form_count}}</div>
                 </div>
               </router-link>
               <router-link to="/invitation" class="card-button">
@@ -28,7 +28,7 @@
                 <div class="el-icon-date button-icon"></div>
                 <div class="info-box">
                   <div class="text">进行中展会</div>
-                  <div class="value">2</div>
+                  <div class="value">{{currentExpoList.length}}</div>
                 </div>
               </router-link>
             </div>
@@ -87,7 +87,8 @@ export default {
   name: 'Dashboard',
   data() {
     return {
-      currentExpo: {}
+      currentExpo: {},
+      currentExpoList: []
     }
   },
   computed: {
@@ -136,11 +137,10 @@ export default {
         const expoList = res.data.data
         for (const item of expoList) {
           if (item.status === 0 && this.getEndDay(item.end_date) >= 0) {
-            this.currentExpo = item
-            return
+            this.currentExpoList.push(item)
           }
         }
-        this.currentExpo = false
+        this.currentExpo = this.currentExpoList.length > 0 ? expoList[0] : false
       }).catch(err => {
         this.$notify({
           title: '提示',

src/views/exhibitorManage/exhibitorSetting.vue

@@ -67,8 +67,7 @@ export default Vue.extend({
           })
           this.loading = false
         })
-      }
-      if (this.$route.query.copy) {
+      } else if (this.$route.query.copy) {
         this.loading = true
         getMyExpoInfo(this.$route.query.copy).then(res => {
           this.exhibitorSetting = res.data
@@ -85,6 +84,8 @@ export default Vue.extend({
           })
           this.loading = false
         })
+      } else {
+        this.initEditor()
       }
       getFormList(1, 1000).then(res => {
         this.formList = res.data.data
@@ -106,7 +107,7 @@ export default Vue.extend({
             input.setAttribute('accept', 'image/*')
             input.onchange = () => {
               upload(input.files[0]).then(res => {
-                let image = this.ossUrl + res.data.file
+                const image = this.ossUrl + res.data.file
                 editor.insertContent(`<img src="${image}" />`)
               })
             }
@@ -122,6 +123,7 @@ export default Vue.extend({
         inline: true,
         statusbar: false,
         plugins: 'insertImage',
+        placeholder: '请输入展会介绍',
         toolbar: [
           'undo redo | bold italic underline | fontsize',
           'forecolor backcolor | alignleft aligncenter alignright | insertImage'
@@ -478,7 +480,8 @@ export default Vue.extend({
         overflow-y: auto;
       }
       .text-area{
-        padding:  0 16px;
+        max-height: 120px;
+        outline: 2px dashed lightgray;
         width: 100%;
         margin-top: 24px;
       }

src/views/user/form.vue

@@ -456,6 +456,7 @@ export default Vue.extend({
       display: flex;
       justify-content: flex-end;
       @media (max-width:768px)  {
+        margin-top: 36px;
          .el-button{
            width: 100%;
            font-size: 18px;