Эх сурвалжийг харах

1.留言板遗留问题解决。
2.店铺首页和品牌中心分类点击筛选问题解决。
3.首页快讯数据问题解决。
4.首页IM隐藏

yangc 8 жил өмнө
parent
commit
a74057d960

+ 2 - 2
components/default/RightBar.vue

@@ -26,13 +26,13 @@
             <p>周一至周五 9:00-18:00</p>
           </div>
         </li>
-        <li class="right-bar-item contact-menu">
+        <!--<li class="right-bar-item contact-menu">
           <a href="javascript:void(0)" class="title" @click="goWebChat" @mouseenter="getChatCount">
             <i class="fa fa-comments-o" aria-hidden="true" style="color: #FFFFFF;">
             </i>
           </a>
           <div class="sidebar-menu" title="优软互联"><a @click="goWebChat">优软互联<span v-if="user.logged">({{chatCount}})</span></a></div>
-        </li>
+        </li>-->
       </ul>
       <ul class="right-bar-bottom">
         <li class="right-bar-item" @mouseenter="loadHistorys()">

+ 3 - 7
components/messageBoard/MessageBoard.vue

@@ -262,13 +262,9 @@
               type: this.messageBoard.type,
               imgs: this.dialogImageUrl
             })
-            if (this.messageBoardInfo.question) {
-              this.isOpendMessage()
-              this.$message.info('感谢您的宝贵意见')
-              this.messageBoard = {}
-            } else {
-              this.$message.info('联系方式不可为空,请填写任意一种联系方式')
-            }
+            this.isOpendMessage()
+            this.$message.info('感谢您的宝贵意见')
+            this.messageBoard = {}
           }
         }
       }

+ 7 - 7
components/product/brand/BrandComponent.vue

@@ -84,13 +84,13 @@
         this.pageParams.page = 1
         this.pageCmpGoods(this.pageParams)
       },
-//      async pageCmpGoods (params) {
-      pageCmpGoods (params) {
-//        let { data } = await this.$http.get('/api/product/component/list', { params })
-//        this.$store.commit('brandComponent/GET_COMPONENT_SUCCESS', data)
-        this.$http.get('/api/product/component/list', { params }).then(response => {
-          this.$store.commit('brandComponent/GET_COMPONENT_SUCCESS', response)
-        })
+      async pageCmpGoods (params) {
+//      pageCmpGoods (params) {
+        let { data } = await this.$http.get('/api/product/component/list', { params })
+        this.$store.commit('brandComponent/GET_COMPONENT_SUCCESS', data)
+//        this.$http.get('/api/product/component/list', { params }).then(response => {
+//          this.$store.commit('brandComponent/GET_COMPONENT_SUCCESS', response)
+//        })
       },
       handleCurrentChange (page) {
         this.pageParams.page = page

+ 13 - 12
components/product/brand/CategoriesList.vue

@@ -66,6 +66,7 @@
             }
           }
         }
+        console.log(brands)
         return brands[0] || []
       },
       brand () {
@@ -102,19 +103,19 @@
         this.pageParams.filter.kindid = data.id
         this.pageCommodity(this.pageParams, this.ids)
       },
-//      async pageCommodity (params) {
-      pageCommodity (params) {
-//        try {
-//          let { data } = await this.$http.get('/api/product/component/list', { params })
-//          this.$store.commit('brandComponent/GET_COMPONENT_SUCCESS', data)
-//        } catch (err) {
-//          this.$store.commit('brandComponent/GET_COMPONENT_FAILURE', err)
-//        }
-        this.$http.get('/api/product/component/list', { params }).then(response => {
-          this.$store.commit('brandComponent/GET_COMPONENT_SUCCESS', response)
-        }, err => {
+      async pageCommodity (params) {
+//      pageCommodity (params) {
+        try {
+          let { data } = await this.$http.get('/api/product/component/list', { params })
+          this.$store.commit('brandComponent/GET_COMPONENT_SUCCESS', data)
+        } catch (err) {
           this.$store.commit('brandComponent/GET_COMPONENT_FAILURE', err)
-        })
+        }
+//        this.$http.get('/api/product/component/list', { params }).then(response => {
+//          this.$store.commit('brandComponent/GET_COMPONENT_SUCCESS', response)
+//        }, err => {
+//          this.$store.commit('brandComponent/GET_COMPONENT_FAILURE', err)
+//        })
       }
     }
   }

+ 12 - 12
components/store/CommodityList.vue

@@ -183,23 +183,23 @@ export default {
       this.pageParams.page = 1
       this.pageCommodity(this.pageParams, this.ids, keyword)
     },
-//    async pageCommodity (pageParams, kindId, keyword) {
-    pageCommodity (pageParams, kindId, keyword) {
+    async pageCommodity (pageParams, kindId, keyword) {
+//    pageCommodity (pageParams, kindId, keyword) {
       let params = { storeid: this.$route.params.uuid, origin: 'store', kindUuid: kindId, code: keyword }
       params.page = pageParams.page
       params.count = pageParams.count
 
-//      try {
-//        let { data } = await this.$http.get('/api/commodity/commodities', { params })
-//        this.$store.commit('shop/storeInfo/GET_STORE_COMMODITY_SUCCESS', data)
-//      } catch (err) {
-//        this.$store.commit('shop/storeInfo/GET_STORE_COMMODITY_FAILURE', err)
-//      }
-      this.$http.get('/api/commodity/commodities', { params }).then(response => {
-        this.$store.commit('shop/storeInfo/GET_STORE_COMMODITY_SUCCESS', response)
-      }, err => {
+      try {
+        let { data } = await this.$http.get('/api/commodity/commodities', { params })
+        this.$store.commit('shop/storeInfo/GET_STORE_COMMODITY_SUCCESS', data)
+      } catch (err) {
         this.$store.commit('shop/storeInfo/GET_STORE_COMMODITY_FAILURE', err)
-      })
+      }
+//      this.$http.get('/api/commodity/commodities', { params }).then(response => {
+//        this.$store.commit('shop/storeInfo/GET_STORE_COMMODITY_SUCCESS', response)
+//      }, err => {
+//        this.$store.commit('shop/storeInfo/GET_STORE_COMMODITY_FAILURE', err)
+//      })
     },
     handleCurrentChange (page) {
       this.pageParams.page = page

+ 7 - 7
pages/store/_uuid/index.vue

@@ -22,13 +22,13 @@ export default {
       store.dispatch('shop/pageCommoditiesOfStore', params.uuid, { page: 1, count: 6 })
     ])
   },
-//  async asyncData ({ params }) {
-  asyncData ({ params }) {
-//    let { data } = await axios.get('/api/commodity/components/kinds', { params: { StoreUuid: params.uuid } })
-    axios.get('/api/commodity/components/kinds', { params: { StoreUuid: params.uuid } })
-      .then(response => {
-        return { kinds: response.data }
-      })
+  async asyncData ({ params }) {
+//  asyncData ({ params }) {
+    let { data } = await axios.get('/api/commodity/components/kinds', { params: { StoreUuid: params.uuid } })
+//    axios.get('/api/commodity/components/kinds', { params: { StoreUuid: params.uuid } })
+//      .then(response => {
+    return { kinds: data }
+//      })
   },
   components: {
     RecommendProduct,