diff --git a/application/api/controller/Answer.php b/application/api/controller/Answer.php index a424b7d0fb6cbaa8ea04dd3302b933eb2cae8a2c..b86d7f58dccaa37b0757eded29bfccab58471b8e 100755 --- a/application/api/controller/Answer.php +++ b/application/api/controller/Answer.php @@ -10,6 +10,7 @@ // +---------------------------------------------------------------------- namespace app\api\controller; +use app\service\BaseService; use app\service\AnswerService; /** @@ -72,11 +73,11 @@ class Answer extends Common // 返回数据 $result = [ - 'total' => $total, - 'page_total' => $page_total, - 'data' => $data['data'], + 'total' => $total, + 'page_total' => $page_total, + 'data' => $data['data'], ]; - return DataReturn('success', 0, $result); + return BaseService::DataReturn($result); } /** diff --git a/application/api/controller/Banner.php b/application/api/controller/Banner.php index 54539f8278d2b49d6651612724d77f3aed242268..e8eb28da606bd0ea50f9b3a331ee228d0286202d 100755 --- a/application/api/controller/Banner.php +++ b/application/api/controller/Banner.php @@ -10,6 +10,7 @@ // +---------------------------------------------------------------------- namespace app\api\controller; +use app\service\BaseService; use app\service\BannerService; /** @@ -44,10 +45,8 @@ class Banner extends Common public function Index() { // 获取轮播 - $data = BannerService::Banner(); - - // 返回数据 - return DataReturn('success', 0, $data); + $result = BannerService::Banner(); + return BaseService::DataReturn($result); } } ?> \ No newline at end of file diff --git a/application/api/controller/Base.php b/application/api/controller/Base.php index b6ddda3697cdff2c7a56226824b84c251eb0e4f5..fde038c494a6c1075ee4f33bd492576d8e4b5598 100644 --- a/application/api/controller/Base.php +++ b/application/api/controller/Base.php @@ -35,7 +35,7 @@ class Base extends Common // 参数 $params = $this->data_post; $params['user'] = $this->user; - return DataReturn('success', 0, BaseService::Common($params)); + return BaseService::Common($params); } } ?> \ No newline at end of file diff --git a/application/api/controller/Buy.php b/application/api/controller/Buy.php index 0799ae22d33460521348fbb1344bfe102f4d43e6..82155a35ba053bb5dceaf7cc167c9d3255db91fe 100755 --- a/application/api/controller/Buy.php +++ b/application/api/controller/Buy.php @@ -10,6 +10,7 @@ // +---------------------------------------------------------------------- namespace app\api\controller; +use app\service\BaseService; use app\service\GoodsService; use app\service\UserService; use app\service\PaymentService; @@ -67,10 +68,10 @@ class Buy extends Common // 数据返回组装 $result = [ - 'goods_list' => $buy_goods, - 'payment_list' => $payment_list, - 'base' => $buy_base, - 'common_site_type' => (int) $buy_base['common_site_type'], + 'goods_list' => $buy_goods, + 'payment_list' => $payment_list, + 'base' => $buy_base, + 'common_site_type' => (int) $buy_base['common_site_type'], ]; // 优惠劵 @@ -87,7 +88,7 @@ class Buy extends Common $result['plugins_points_data'] = $ret['data']['data']; } - return DataReturn('操作成功', 0, $result); + return BaseService::DataReturn($result); } return $buy_ret; } diff --git a/application/api/controller/Cart.php b/application/api/controller/Cart.php index 4db51ea370771aef5729f66a7fab1eedf740a107..b98678f0f8b8ab46ec4c2eec9cfe47c36bb5a5b0 100755 --- a/application/api/controller/Cart.php +++ b/application/api/controller/Cart.php @@ -10,6 +10,7 @@ // +---------------------------------------------------------------------- namespace app\api\controller; +use app\service\BaseService; use app\service\BuyService; /** @@ -47,12 +48,12 @@ class Cart extends Common public function Index() { $ret = BuyService::CartList(['user'=>$this->user]); - $ret['data'] = [ - 'data' => $ret['data'], - 'common_cart_total' => BuyService::UserCartTotal(['user'=>$this->user]), + $result = [ + 'data' => $ret['data'], + 'common_cart_total' => BuyService::UserCartTotal(['user'=>$this->user]), ]; - - return $ret; + + return BaseService::DataReturn($result); } /** diff --git a/application/api/controller/Goods.php b/application/api/controller/Goods.php index 65a590895073b17e8aa8e3adb54e7eef94e51b04..284c1db8da92747acd9a0251330180ee32c5042e 100755 --- a/application/api/controller/Goods.php +++ b/application/api/controller/Goods.php @@ -10,6 +10,7 @@ // +---------------------------------------------------------------------- namespace app\api\controller; +use app\service\BaseService; use app\service\GoodsService; use app\service\BuyService; use app\service\PluginsService; @@ -166,7 +167,7 @@ class Goods extends Common $result['plugins_coupon_data'] = $ret['data']['data']; } - return DataReturn('success', 0, $result); + return BaseService::DataReturn($result); } /** @@ -239,10 +240,9 @@ class Goods extends Common public function Category() { $result = [ - 'category' => GoodsService::GoodsCategoryAll($this->data_post), - //'category_show_level' => MyC('common_show_goods_category_level', 3, true), + 'category' => GoodsService::GoodsCategoryAll($this->data_post), ]; - return DataReturn('success', 0, $result); + return BaseService::DataReturn($result); } /** @@ -299,16 +299,16 @@ class Goods extends Common 'where' => $where, 'is_public' => 1, ); - $data = GoodsCommentsService::GoodsCommentsList($data_params); + $ret = GoodsCommentsService::GoodsCommentsList($data_params); // 返回数据 $result = [ 'number' => $number, 'total' => $total, 'page_total' => $page_total, - 'data' => $data['data'], + 'data' => $ret['data'], ]; - return DataReturn('success', 0, $result); + return BaseService::DataReturn($result); } } ?> \ No newline at end of file diff --git a/application/api/controller/Index.php b/application/api/controller/Index.php index a68b3c4b334e17436c07feea0fbeec8c398bcb38..3c28c801270efc9d2accb82745b483ad19019389 100755 --- a/application/api/controller/Index.php +++ b/application/api/controller/Index.php @@ -10,6 +10,7 @@ // +---------------------------------------------------------------------- namespace app\api\controller; +use app\service\BaseService; use app\service\GoodsService; use app\service\BannerService; use app\service\AppHomeNavService; @@ -64,7 +65,7 @@ class Index extends Common } // 返回数据 - return DataReturn('success', 0, $result); + return BaseService::DataReturn($result); } } ?> \ No newline at end of file diff --git a/application/api/controller/Message.php b/application/api/controller/Message.php index 32039bbae50281048cff76618efb3107f5ef8dff..07796565db456a1e9f0dc387a245524122bf12b0 100755 --- a/application/api/controller/Message.php +++ b/application/api/controller/Message.php @@ -10,6 +10,7 @@ // +---------------------------------------------------------------------- namespace app\api\controller; +use app\service\BaseService; use app\service\MessageService; /** @@ -75,11 +76,11 @@ class Message extends Common // 返回数据 $result = [ - 'total' => $total, - 'page_total' => $page_total, - 'data' => $data['data'], + 'total' => $total, + 'page_total' => $page_total, + 'data' => $data['data'], ]; - return DataReturn('success', 0, $result); + return BaseService::DataReturn($result); } } ?> \ No newline at end of file diff --git a/application/api/controller/Navigation.php b/application/api/controller/Navigation.php index 8cc6eab80324b5dd748a3e152469bdcc45ca5260..52d05cdb8c8845ece77c5bccc7222fac979c1bf5 100755 --- a/application/api/controller/Navigation.php +++ b/application/api/controller/Navigation.php @@ -10,6 +10,7 @@ // +---------------------------------------------------------------------- namespace app\api\controller; +use app\service\BaseService; use app\service\AppHomeNavService; /** @@ -44,10 +45,8 @@ class Navigation extends Common public function Index() { // 获取轮播 - $data = AppHomeNavService::AppHomeNav(); - - // 返回数据 - return DataReturn('success', 0, $data); + $result = AppHomeNavService::AppHomeNav(); + return BaseService::DataReturn($result); } } ?> \ No newline at end of file diff --git a/application/api/controller/Order.php b/application/api/controller/Order.php index bf5f3da77f7bc3967cabe07fe8a9aa0e5e369d37..2874a004506e67ad88b3b62b6d6fd1e0a092f021 100755 --- a/application/api/controller/Order.php +++ b/application/api/controller/Order.php @@ -10,6 +10,7 @@ // +---------------------------------------------------------------------- namespace app\api\controller; +use app\service\BaseService; use app\service\PaymentService; use app\service\OrderService; use app\service\GoodsCommentsService; @@ -80,12 +81,12 @@ class Order extends Common // 返回数据 $result = [ - 'total' => $total, - 'page_total' => $page_total, - 'data' => $data['data'], - 'payment_list' => $payment_list, + 'total' => $total, + 'page_total' => $page_total, + 'data' => $data['data'], + 'payment_list' => $payment_list, ]; - return DataReturn('success', 0, $result); + return BaseService::DataReturn($result); } /** @@ -131,7 +132,7 @@ class Order extends Common $site_fictitious = ConfigService::SiteFictitiousConfig(); $result['site_fictitious'] = $site_fictitious['data']; } - return DataReturn('success', 0, $result); + return BaseService::DataReturn($result); } return DataReturn('数据不存在或已删除', -100); } @@ -178,7 +179,7 @@ class Order extends Common 'data' => $data['data'][0], 'editor_path_type' => 'order_comments-'.$this->user['id'].'-'.$data['data'][0]['id'], ]; - return DataReturn('success', 0, $result); + return BaseService::DataReturn($result); } return DataReturn('没有相关数据', -100); } diff --git a/application/api/controller/Orderaftersale.php b/application/api/controller/Orderaftersale.php index 08e31bdb018456cad624a9311470b307461f751f..ab93bad4cdd40cdd2e3de223e03a054f86e28400 100644 --- a/application/api/controller/Orderaftersale.php +++ b/application/api/controller/Orderaftersale.php @@ -10,6 +10,7 @@ // +---------------------------------------------------------------------- namespace app\api\controller; +use app\service\BaseService; use app\service\OrderAftersaleService; /** @@ -75,11 +76,11 @@ class Orderaftersale extends Common // 返回数据 $result = [ - 'total' => $total, - 'page_total' => $page_total, - 'data' => $data['data'], + 'total' => $total, + 'page_total' => $page_total, + 'data' => $data['data'], ]; - return DataReturn('success', 0, $result); + return BaseService::DataReturn($result); } /** @@ -139,7 +140,7 @@ class Orderaftersale extends Common 'return_goods_address' => MyC('home_order_aftersale_return_goods_address', '管理员未填写', true), 'editor_path_type' => OrderAftersaleService::EditorAttachmentPathType($this->user['id'], $order_id, $order_detail_id), ]; - return DataReturn('success', 0, $result); + return BaseService::DataReturn($result); } return DataReturn($ret['msg'], -1); } diff --git a/application/api/controller/Region.php b/application/api/controller/Region.php index bb6d4c4cd4c1ba9d2df3fb0e115ad734d7873dd8..0d1bd5c139ddfa24bcbbfb4f15824332eb6c7322 100755 --- a/application/api/controller/Region.php +++ b/application/api/controller/Region.php @@ -10,6 +10,7 @@ // +---------------------------------------------------------------------- namespace app\api\controller; +use app\service\BaseService; use app\service\RegionService; /** @@ -50,8 +51,8 @@ class Region extends Common 'pid' => isset($this->data_post['pid']) ? intval($this->data_post['pid']) : 0, ], ]; - $data = RegionService::RegionNode($params); - return DataReturn('success', 0, $data); + $result = RegionService::RegionNode($params); + return BaseService::DataReturn($result); } /** diff --git a/application/api/controller/Search.php b/application/api/controller/Search.php index e202727bbbef815de4cfdd3e7851c059dee39648..90a1cbfe48bf6ed5156d8433de9ac266de461cab 100755 --- a/application/api/controller/Search.php +++ b/application/api/controller/Search.php @@ -10,6 +10,7 @@ // +---------------------------------------------------------------------- namespace app\api\controller; +use app\service\BaseService; use app\service\SearchService; use app\service\GoodsService; @@ -51,16 +52,12 @@ class Search extends Common // 获取数据 $ret = SearchService::GoodsList($this->data_post); + $result = $ret['data']; // 分类 - if(!empty($this->data_post['category_id'])) - { - $ret['data']['category'] = GoodsService::GoodsCategoryRow(['id'=>$this->data_post['category_id']]); - } else { - $ret['data']['category'] = []; - } + $result['category'] = empty($this->data_post['category_id']) ? [] : GoodsService::GoodsCategoryRow(['id'=>$this->data_post['category_id']]); - return $ret; + return BaseService::DataReturn($result); } } ?> \ No newline at end of file diff --git a/application/api/controller/Toutiao.php b/application/api/controller/Toutiao.php index d14c4498fd78797389a9ca60728dd528e5e46784..404547e6f1ee860e59b7cc036c4fdc200e5e6e3b 100644 --- a/application/api/controller/Toutiao.php +++ b/application/api/controller/Toutiao.php @@ -10,6 +10,7 @@ // +---------------------------------------------------------------------- namespace app\api\controller; +use app\service\BaseService; use app\service\ToutiaoService; /** @@ -50,7 +51,8 @@ class Toutiao extends Common // 获取支付信息 $params = $this->data_post; $params['user'] = $this->user; - return ToutiaoService::Pay($params); + $ret = ToutiaoService::Pay($params); + return BaseService::DataReturn($ret['data']); } } ?> \ No newline at end of file diff --git a/application/api/controller/User.php b/application/api/controller/User.php index 29af6c6c750443181ae85da33cc5fa926ed22629..3cd7cb2e0f98d374e07f488379255637a90de65d 100755 --- a/application/api/controller/User.php +++ b/application/api/controller/User.php @@ -10,6 +10,7 @@ // +---------------------------------------------------------------------- namespace app\api\controller; +use app\service\BaseService; use app\service\UserService; use app\service\OrderService; use app\service\GoodsService; @@ -548,7 +549,7 @@ class User extends Common ); // 返回数据 - return DataReturn('success', 0, $result); + return BaseService::DataReturn($result); } /** diff --git a/application/api/controller/Useraddress.php b/application/api/controller/Useraddress.php index ad0292ba42d1cc08c30bea999b86cd110b353942..7da5a7055d3abae92cdf12d9711325c73b271646 100755 --- a/application/api/controller/Useraddress.php +++ b/application/api/controller/Useraddress.php @@ -10,8 +10,9 @@ // +---------------------------------------------------------------------- namespace app\api\controller; -use app\service\UserAddressService; +use app\service\BaseService; use app\service\ConfigService; +use app\service\UserAddressService; /** * 用户地址 @@ -48,7 +49,11 @@ class UserAddress extends Common */ public function Index() { - return UserAddressService::UserAddressList(['user'=>$this->user]); + $ret = UserAddressService::UserAddressList(['user'=>$this->user]); + $result = [ + 'data' => $ret['data'], + ]; + return BaseService::DataReturn($result); } /** @@ -70,7 +75,7 @@ class UserAddress extends Common 'data' => empty($data['data']) ? null : $data['data'], 'editor_path_type' => UserAddressService::EditorAttachmentPathType($this->user['id']), ]; - return DataReturn('success', 0, $result); + return BaseService::DataReturn($result); } /** diff --git a/application/api/controller/Usergoodsbrowse.php b/application/api/controller/Usergoodsbrowse.php index d2a0186268e522cc2320ade017ab6de6e605c411..3e03dc4dfcbb3fee826f092d6de125071c087354 100755 --- a/application/api/controller/Usergoodsbrowse.php +++ b/application/api/controller/Usergoodsbrowse.php @@ -10,6 +10,7 @@ // +---------------------------------------------------------------------- namespace app\api\controller; +use app\service\BaseService; use app\service\GoodsBrowseService; /** @@ -73,11 +74,11 @@ class UserGoodsBrowse extends Common // 返回数据 $result = [ - 'total' => $total, - 'page_total' => $page_total, - 'data' => $data['data'], + 'total' => $total, + 'page_total' => $page_total, + 'data' => $data['data'], ]; - return DataReturn('success', 0, $result); + return BaseService::DataReturn($result); } /** diff --git a/application/api/controller/Usergoodsfavor.php b/application/api/controller/Usergoodsfavor.php index a0f6e1f6aaf3c0d25c18e21d3ae75a8d702d816c..b498ffd21c0d84f47e4ababdea4521e0aa84a9bc 100755 --- a/application/api/controller/Usergoodsfavor.php +++ b/application/api/controller/Usergoodsfavor.php @@ -10,6 +10,7 @@ // +---------------------------------------------------------------------- namespace app\api\controller; +use app\service\BaseService; use app\service\GoodsFavorService; /** @@ -72,11 +73,11 @@ class UserGoodsFavor extends Common // 返回数据 $result = [ - 'total' => $total, - 'page_total' => $page_total, - 'data' => $data['data'], + 'total' => $total, + 'page_total' => $page_total, + 'data' => $data['data'], ]; - return DataReturn('success', 0, $result); + return BaseService::DataReturn($result); } /** diff --git a/application/api/controller/Userintegral.php b/application/api/controller/Userintegral.php index f3d8de5c977ded151388b0d936e2a9df7c3bf2e2..30db39cfef413c8e2ece3c3f7022ecf779c6a877 100755 --- a/application/api/controller/Userintegral.php +++ b/application/api/controller/Userintegral.php @@ -10,6 +10,7 @@ // +---------------------------------------------------------------------- namespace app\api\controller; +use app\service\BaseService; use app\service\IntegralService; /** @@ -73,11 +74,11 @@ class UserIntegral extends Common // 返回数据 $result = [ - 'total' => $total, - 'page_total' => $page_total, - 'data' => $data['data'], + 'total' => $total, + 'page_total' => $page_total, + 'data' => $data['data'], ]; - return DataReturn('success', 0, $result); + return BaseService::DataReturn($result); } } diff --git a/application/service/BaseService.php b/application/service/BaseService.php index 7e68f2deba8e5ce9d3005b7d1cb31d776d4e2c10..9b0a852b12fac4426c3f5bb85d8a8224d1a92574 100644 --- a/application/service/BaseService.php +++ b/application/service/BaseService.php @@ -10,7 +10,6 @@ // +---------------------------------------------------------------------- namespace app\service; -use think\Db; use think\facade\Hook; use app\service\ResourcesService; use app\service\QuickNavService; @@ -108,7 +107,34 @@ class BaseService 'params' => $params, ]); - return $data; + return DataReturn('success', 0, $data); + } + + /** + * 数据返回处理 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2021-01-06 + * @desc description + * @param [array] $data [返回数据] + */ + public static function DataReturn($data = []) + { + // 当前操作名称, 兼容插件模块名称 + $module_name = strtolower(request()->module()); + $controller_name = strtolower(request()->controller()); + $action_name = strtolower(request()->action()); + + // 接口返回信息钩子 + $hook_name = 'plugins_service_base_return_data_'.$module_name.'_'.$controller_name.'_'.$action_name; + Hook::listen($hook_name, [ + 'hook_name' => $hook_name, + 'is_backend' => true, + 'data' => &$data, + ]); + + return DataReturn('success', 0, $data); } } ?> \ No newline at end of file diff --git a/sourcecode/alipay/default/pages/user-address/user-address.js b/sourcecode/alipay/default/pages/user-address/user-address.js index 993d78a2d0075365907e3b10d0712839f977658b..3b94bed2aa9b22a5550dd5df6c85c75e3e9c8a17 100644 --- a/sourcecode/alipay/default/pages/user-address/user-address.js +++ b/sourcecode/alipay/default/pages/user-address/user-address.js @@ -58,20 +58,21 @@ Page({ my.hideLoading(); my.stopPullDownRefresh(); if (res.data.code == 0) { - if (res.data.data.length > 0) { + var data = res.data.data; + if (data.data.length > 0) { // 获取当前默认地址 var is_default = 0; - for(var i in res.data.data) + for(var i in data.data) { - if(res.data.data[i]['is_default'] == 1) + if(data.data[i]['is_default'] == 1) { - is_default = res.data.data[i]['id']; + is_default = data.data[i]['id']; } } // 设置数据 this.setData({ - data_list: res.data.data, + data_list: data.data, is_default: is_default, data_list_loding_status: 3, data_bottom_line_status: true, diff --git a/sourcecode/baidu/default/pages/user-address/user-address.js b/sourcecode/baidu/default/pages/user-address/user-address.js index 04ce3ab4229d73a8ab55a964cd7fd6dd368ed99e..7486f295f0b97aee93ab484b05979bb55556e46e 100755 --- a/sourcecode/baidu/default/pages/user-address/user-address.js +++ b/sourcecode/baidu/default/pages/user-address/user-address.js @@ -57,18 +57,19 @@ Page({ swan.hideLoading(); swan.stopPullDownRefresh(); if (res.data.code == 0) { - if (res.data.data.length > 0) { + var data = res.data.data; + if (data.data.length > 0) { // 获取当前默认地址 var is_default = 0; - for (var i in res.data.data) { - if (res.data.data[i]['is_default'] == 1) { - is_default = res.data.data[i]['id']; + for (var i in data.data) { + if (data.data[i]['is_default'] == 1) { + is_default = data.data[i]['id']; } } // 设置数据 this.setData({ - data_list: res.data.data, + data_list: data.data, is_default: is_default, data_list_loding_status: 3, data_bottom_line_status: true diff --git a/sourcecode/qq/default/pages/user-address/user-address.js b/sourcecode/qq/default/pages/user-address/user-address.js index ca5efb109e9ac9e328f971a9b92758fbdb628b22..c19fed4f449a942d54e59a4a39caf3dee1ebc506 100755 --- a/sourcecode/qq/default/pages/user-address/user-address.js +++ b/sourcecode/qq/default/pages/user-address/user-address.js @@ -57,20 +57,21 @@ Page({ qq.hideLoading(); qq.stopPullDownRefresh(); if (res.data.code == 0) { - if (res.data.data.length > 0) { + var data = res.data.data; + if (data.data.length > 0) { // 获取当前默认地址 var is_default = 0; - for(var i in res.data.data) + for(var i in data.data) { - if(res.data.data[i]['is_default'] == 1) + if(data.data[i]['is_default'] == 1) { - is_default = res.data.data[i]['id']; + is_default = data.data[i]['id']; } } // 设置数据 this.setData({ - data_list: res.data.data, + data_list: data.data, is_default: is_default, data_list_loding_status: 3, data_bottom_line_status: true, diff --git a/sourcecode/toutiao/default/pages/user-address/user-address.js b/sourcecode/toutiao/default/pages/user-address/user-address.js index bbfaac30eb0e15e21cf0ad718360e43673b1a707..32b91d5c0601031f1e3807680610dd476b108131 100755 --- a/sourcecode/toutiao/default/pages/user-address/user-address.js +++ b/sourcecode/toutiao/default/pages/user-address/user-address.js @@ -57,20 +57,21 @@ Page({ tt.hideLoading(); tt.stopPullDownRefresh(); if (res.data.code == 0) { - if (res.data.data.length > 0) { + var data = res.data.data; + if (data.data.length > 0) { // 获取当前默认地址 var is_default = 0; - for(var i in res.data.data) + for(var i in data.data) { - if(res.data.data[i]['is_default'] == 1) + if(data.data[i]['is_default'] == 1) { - is_default = res.data.data[i]['id']; + is_default = data.data[i]['id']; } } // 设置数据 this.setData({ - data_list: res.data.data, + data_list: data.data, is_default: is_default, data_list_loding_status: 3, data_bottom_line_status: true, diff --git a/sourcecode/weixin/default/app.js b/sourcecode/weixin/default/app.js index 78df5902f0b6ef770a6db92900635017cc8e3a83..f185dd7684ecdb5af9ad0c87454bbe7b85c20c7f 100755 --- a/sourcecode/weixin/default/app.js +++ b/sourcecode/weixin/default/app.js @@ -74,7 +74,7 @@ App({ // 请求地址 request_url: "{{request_url}}", request_url: 'http://shopxo.com/', - request_url: 'https://dev.shopxo.net/', + // request_url: 'https://dev.shopxo.net/', // 基础信息 application_title: "{{application_title}}", diff --git a/sourcecode/weixin/default/pages/user-address/user-address.js b/sourcecode/weixin/default/pages/user-address/user-address.js index 8b43a49de4c2fff206d2b52f5d97540ea4fe2c25..a184a1542689aea844e314c5fe5f59e0a6edc2f1 100755 --- a/sourcecode/weixin/default/pages/user-address/user-address.js +++ b/sourcecode/weixin/default/pages/user-address/user-address.js @@ -57,20 +57,21 @@ Page({ wx.hideLoading(); wx.stopPullDownRefresh(); if (res.data.code == 0) { - if (res.data.data.length > 0) { + var data = res.data.data; + if (data.data.length > 0) { // 获取当前默认地址 var is_default = 0; - for(var i in res.data.data) + for(var i in data.data) { - if(res.data.data[i]['is_default'] == 1) + if(data.data[i]['is_default'] == 1) { - is_default = res.data.data[i]['id']; + is_default = data.data[i]['id']; } } // 设置数据 this.setData({ - data_list: res.data.data, + data_list: data.data, is_default: is_default, data_list_loding_status: 3, data_bottom_line_status: true,