Merge branch 'h5_zyly_vue_0517' into Development

src/store/modules/common.js

@@ -13,7 +13,7 @@ const state = {
 
 
 const mutations = {
 const mutations = {
   cartCount(state, payload) {
   cartCount(state, payload) {
-    state.cartCount = payload.data ?payload.data  : '';
+    state.cartCount = payload.data ?payload.data  : 0;
   },
   },
   loginCheck(state, payload) {
   loginCheck(state, payload) {
     if (payload.data.err_code == 0) {
     if (payload.data.err_code == 0) {

src/store/modules/gooddetail/gooddetail.js

@@ -37,7 +37,8 @@ const actions = {
         const toast = Toast.loading({
         const toast = Toast.loading({
             message: '加载中...',
             message: '加载中...',
             duration: 0,
             duration: 0,
-            forbidClick: true
+            forbidClick: true,
+            loadingType: 'spinner'
         });
         });
         state.zygoodDetail = {};
         state.zygoodDetail = {};
         state.lygoodDetail = {};
         state.lygoodDetail = {};

src/views/lxshop/lxshop.vue

@@ -116,6 +116,9 @@ export default {
     isShowAlert(now) {
     isShowAlert(now) {
       if (now) {
       if (now) {
         this.detailsData = { isShow: false, id: "" };
         this.detailsData = { isShow: false, id: "" };
+         this.$store.dispatch({
+          type: "cartCount"
+        });
       }
       }
     },
     },
     supplierList(val) {
     supplierList(val) {

src/views/xianhuo/xianhuo.vue

@@ -264,6 +264,9 @@ export default {
     isShowAlert(now) {
     isShowAlert(now) {
       if (now) {
       if (now) {
         this.detailsData = { isShow: false, id: "" };
         this.detailsData = { isShow: false, id: "" };
+        this.$store.dispatch({
+          type: "cartCount"
+        });
       }
       }
     },
     },
     loading(now) {
     loading(now) {