Merge remote-tracking branch 'origin/master'

# Conflicts:
#	components/messageBoard/MessageBoard.vue

components/default/RightBar.vue

@@ -85,14 +85,12 @@
         page: 1,
         count: 3,
         currentPage: 1,
-        chatCount: -1
-      }
-    },
-    created () {
-      if (this.user.logged) {
-        this.$store.dispatch('getMessageBoardInformation', {page: 1, count: 3})
+        chatCount: 0
       }
     },
+//    created () {
+//      this.$store.dispatch('getMessageBoardInformation', {page: 1, count: 3})
+//    },
     components: {
       MessageBoard
     },
@@ -148,9 +146,6 @@
       toBottom () {
         scrollTo(window.scrollY + window.innerHeight, 300)
       },
-      // 打开留言板
-      onLeaveMessageClick () {
-      },
       deleteHistory (item, id) {
         this.$store.dispatch('user/deleteHistory', {id: id})
         this.$store.dispatch('user/loadHistory')

components/help/left.vue

@@ -18,8 +18,8 @@
   // 升序
   function compare (propertyName) {
     return function (object1, object2) {
-      var value1 = object1[propertyName]
-      var value2 = object2[propertyName]
+      let value1 = object1[propertyName]
+      let value2 = object2[propertyName]
       if (value1 > value2) {
         return 1
       } else if (value1 < value2) {

components/messageBoard/MessageBoard.vue

@@ -56,7 +56,6 @@
           <div class="img-warp">
             <div class="img-item">
               <image-upload @fileAction="listenFile">
-                <img src="/images/messageBoard/msg_uploadPic.png" alt="">
               </image-upload>
             </div>
             <div class="img-item">
@@ -202,6 +201,7 @@
         this.$emit('openBoardEvent', false)
       },
       isOpenHistory () {
+        this.$store.dispatch('getMessageBoardInformation', {page: 1, count: 3})
         this.showHistory = !this.showHistory
       },
       isHideHistory () {
@@ -219,6 +219,7 @@
         this.isEmail = (/^([a-zA-Z0-9_.-])+@(([a-zA-Z0-9-])+.)+([a-zA-Z0-9]{2,4})+$/).test(this.messageBoard.email)
       },
       confirm () {
+        this.$store.dispatch('uploadMessageBoardInformation', {question: this.messageBoard.question, role: this.messageBoard.role, submitTitle: '【优软商城】IC电子元器件现货采购交易平台商城', submitUrl: window.location.href, type: this.messageBoard.type, imgs: this.dialogImageUrl, userTel: '13333333333'})
         if (this.messageBoard) {
           if (!this.messageBoard.question) {
             Message.info('您还没有填写反馈内容')