From c2430e6f0d1d5f31fc0459c2f498cc7fea032f0d Mon Sep 17 00:00:00 2001
From: pushuo <229102104@qq.com>
Date: Mon, 4 Jul 2022 21:41:23 +0800
Subject: [PATCH] wip

---
 public/build/beike/shop/default/js/app.js | 6 ++++--
 resources/beike/shop/default/js/http.js   | 5 +++--
 themes/default/checkout.blade.php         | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/public/build/beike/shop/default/js/app.js b/public/build/beike/shop/default/js/app.js
index fffd8331..7223e51e 100644
--- a/public/build/beike/shop/default/js/app.js
+++ b/public/build/beike/shop/default/js/app.js
@@ -126,6 +126,8 @@ axios.defaults.baseURL = process.env.VUE_APP_BASE_URL; // axios.defaults.headers
         method: method,
         url: url
       }, method == 'get' ? 'params' : 'data', params)).then(function (res) {
+        console.log(res);
+
         if (res) {
           resolve(res.data);
         } else {
@@ -136,8 +138,8 @@ axios.defaults.baseURL = process.env.VUE_APP_BASE_URL; // axios.defaults.headers
       })["catch"](function (res) {
         reject(res);
 
-        if (!hmsg && res.message) {
-          layer.msg(res.response.data.message, function () {});
+        if (!hmsg) {
+          layer.msg(res.response.data.message || res.message, function () {});
         }
       })["finally"](function () {
         layer.closeAll('loading');
diff --git a/resources/beike/shop/default/js/http.js b/resources/beike/shop/default/js/http.js
index a5055e05..fcea1632 100644
--- a/resources/beike/shop/default/js/http.js
+++ b/resources/beike/shop/default/js/http.js
@@ -71,6 +71,7 @@ export default {
 
     return new Promise((resolve, reject) => {
       axios({method: method, url: url, [method == 'get' ? 'params' : 'data']: params}).then((res) => {
+        console.log(res)
         if (res) {
           resolve(res.data);
         } else { // 其他情况返回错误信息，根据需要处理
@@ -79,8 +80,8 @@ export default {
         }
       }).catch((res) => {
         reject(res);
-        if (!hmsg && res.message) {
-          layer.msg(res.response.data.message, ()=>{});
+        if (!hmsg) {
+          layer.msg(res.response.data.message || res.message, ()=>{});
         }
       }).finally(function(){
         layer.closeAll('loading')
diff --git a/themes/default/checkout.blade.php b/themes/default/checkout.blade.php
index d6d16b68..421bc205 100644
--- a/themes/default/checkout.blade.php
+++ b/themes/default/checkout.blade.php
@@ -270,7 +270,7 @@
           const self = this;
 
           $http.get(`/countries/${e}/zones`).then((res) => {
-            this.source.zones = res.zones;
+            this.source.zones = res.data.zones;
           })
         },