diff --git a/service/Application/Common/Lang/zh-cn.php b/service/Application/Common/Lang/zh-cn.php index 3a75f9f44..75d2828e6 100755 --- a/service/Application/Common/Lang/zh-cn.php +++ b/service/Application/Common/Lang/zh-cn.php @@ -300,6 +300,14 @@ return array( 'common_favor_not_text' => '收藏', 'common_not_install_text' => '未安装', + 'common_linkage_province_text' => '省份', + 'common_linkage_city_text' => '城市', + 'common_linkage_county_text' => '区/县', + + 'common_linkage_province_format' => '请选择省份', + 'common_linkage_city_format' => '请选择城市', + 'common_linkage_county_format' => '请选择区/县', + // 性别 'common_gender_list' => array( 0 => array('id' => 0, 'name' => '保密', 'checked' => true), diff --git a/service/Application/Home/Controller/RegionController.class.php b/service/Application/Home/Controller/RegionController.class.php new file mode 100644 index 000000000..2bf70f4a5 --- /dev/null +++ b/service/Application/Home/Controller/RegionController.class.php @@ -0,0 +1,54 @@ +error(L('common_unauthorized_access')); + } + } + + /** + * 获取地区 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2018-09-21 + * @desc description + */ + public function Index() + { + $params = [ + 'where' => [ + 'pid' => intval(I('pid', 0)), + ], + ]; + $data = ResourcesService::RegionNode($params); + $this->ajaxReturn(L('common_operation_success'), 0, $data); + } +} +?> \ No newline at end of file diff --git a/service/Application/Home/Controller/UserAddressController.class.php b/service/Application/Home/Controller/UserAddressController.class.php new file mode 100644 index 000000000..7529ade9e --- /dev/null +++ b/service/Application/Home/Controller/UserAddressController.class.php @@ -0,0 +1,79 @@ +Is_Login(); + } + + /** + * [Index 首页] + * @author Devil + * @blog http://gong.gg/ + * @version 0.0.1 + * @datetime 2017-02-22T16:50:32+0800 + */ + public function Index() + { + $cart_list = BuyService::CartList(['user'=>$this->user]); + $this->assign('cart_list', $cart_list['data']); + + $base = [ + 'total_price' => empty($cart_list['data']) ? 0 : array_sum(array_column($cart_list['data'], 'total_price')), + 'total_stock' => empty($cart_list['data']) ? 0 : array_sum(array_column($cart_list['data'], 'stock')), + 'ids' => empty($cart_list['data']) ? '' : implode(',', array_column($cart_list['data'], 'id')), + ]; + $this->assign('base', $base); + $this->display('Index'); + } + + /** + * [SaveInfo 地址添加/编辑页面] + * @author Devil + * @blog http://gong.gg/ + * @version 0.0.1 + * @datetime 2016-12-14T21:37:02+0800 + */ + public function SaveInfo() + { + $this->assign('is_header', 0); + $this->assign('is_footer', 0); + + // 文章信息 + if(empty($_REQUEST['id'])) + { + $data = array(); + } else { + $data = M('Article')->find(I('id')); + } + $this->assign('data', $data); + + // 地区 + + $this->display('SaveInfo'); + } +} +?> \ No newline at end of file diff --git a/service/Application/Home/Lang/zh-cn/useraddress.php b/service/Application/Home/Lang/zh-cn/useraddress.php new file mode 100644 index 000000000..0051c7d06 --- /dev/null +++ b/service/Application/Home/Lang/zh-cn/useraddress.php @@ -0,0 +1,12 @@ + \ No newline at end of file diff --git a/service/Application/Home/View/Default/Buy/Index.html b/service/Application/Home/View/Default/Buy/Index.html index 5712048e8..ad9073353 100644 --- a/service/Application/Home/View/Default/Buy/Index.html +++ b/service/Application/Home/View/Default/Buy/Index.html @@ -20,7 +20,7 @@

确认收货地址

- +