Merge branch 'dev' of http://git.izouma.com/panhui/card-wechat into dev

src/mixins/store.js

@@ -1,7 +1,9 @@
 export default {
     data() {
         return {
-            storeInfo: {}
+            storeInfo: {
+                storeName: ''
+            }
         };
     },
     computed: {

src/pages/details.vue

@@ -153,10 +153,9 @@ export default {
                 })
                 .catch(e => {
                     this.hideLoading();
-                    wx.showToast({
-                        icon: 'none',
-                        title: e.error
-                    });
+                    if (e.error) {
+                        this.toast(e.error);
+                    }
                 });
         },
         // 确认订单

src/pages/store/homePage.vue

@@ -176,8 +176,10 @@ export default {
     },
     methods: {
         loginMethods() {
+            this.showLoading();
             this.loading = true;
             this.getStore().then(res => {
+                console.log(res);
                 this.storeInfo = res;
                 this.getData();
                 setTimeout(() => {