diff --git a/application/service/UserAddressService.php b/application/service/UserAddressService.php
index 5ddf918d4..608a3c507 100644
--- a/application/service/UserAddressService.php
+++ b/application/service/UserAddressService.php
@@ -221,9 +221,9 @@ class UserAddressService
$data = [
'name' => $params['name'],
'tel' => $params['tel'],
- 'province' => $params['province'],
- 'city' => $params['city'],
- 'county' => $params['county'],
+ 'province' => intval($params['province']),
+ 'city' => intval($params['city']),
+ 'county' => isset($params['county']) ? intval($params['county']) : 0,
'address' => $params['address'],
'is_default' => $is_default,
];
@@ -341,11 +341,6 @@ class UserAddressService
'key_name' => 'city',
'error_msg' => '城市不能为空',
],
- [
- 'checked_type' => 'empty',
- 'key_name' => 'county',
- 'error_msg' => '区/县不能为空',
- ],
[
'checked_type' => 'empty',
'key_name' => 'address',
@@ -495,7 +490,7 @@ class UserAddressService
// 省市区解析
$province_name = $params['province'];
$city_name = $params['city'];
- $county_name = $params['county'];
+ $county_name = isset($params['county']) ? $params['county'] : '';
$town_name = isset($params['town']) ? $params['town'] : '';
// 开始匹配地址
@@ -551,15 +546,11 @@ class UserAddressService
$where2[] = ['name', 'like', str_replace($search, '', $town_name).'%'];
$county = Db::name('Region')->where($where2)->field($field)->find();
}
- if(empty($county))
- {
- return DataReturn('区/县匹配失败', -1);
- }
// 地区id赋值
$params['province'] = $province['id'];
$params['city'] = $city['id'];
- $params['county'] = $county['id'];
+ $params['county'] = empty($county['id']) ? 0 : $county['id'];
// 存在街道字段数据则拼接到详细地址前面
if(!empty($town_name))
diff --git a/changelog.txt b/changelog.txt
index 96c75a2b1..5fc529dba 100755
--- a/changelog.txt
+++ b/changelog.txt
@@ -10,10 +10,11 @@
web端
1. 后台菜单支持自定义url地址、并支持钩子自动添加
- 2. 统计维度新增当月、上月
+ 2. 后台区块数据统计新增当月、上月维度
小程序
1. QQ小程序支持微信支付
+ 2. 百度/微信小程序支持手机号码一键绑定、获取收货地址
插件
1. 汇率插件支持货币自由切换
diff --git a/sourcecode/alipay/pages/buy/buy.axml b/sourcecode/alipay/pages/buy/buy.axml
index 4480ab8b3..8703a6335 100644
--- a/sourcecode/alipay/pages/buy/buy.axml
+++ b/sourcecode/alipay/pages/buy/buy.axml
@@ -22,7 +22,7 @@
- {{address.province_name}}{{address.city_name}}{{address.county_name}}{{address.address}}
+ {{address.province_name || ''}}{{address.city_name || ''}}{{address.county_name || ''}}{{address.address || ''}}
diff --git a/sourcecode/alipay/pages/extraction-address/extraction-address.axml b/sourcecode/alipay/pages/extraction-address/extraction-address.axml
index 8a3a9ec50..034eb9ac7 100644
--- a/sourcecode/alipay/pages/extraction-address/extraction-address.axml
+++ b/sourcecode/alipay/pages/extraction-address/extraction-address.axml
@@ -9,7 +9,7 @@
- {{item.province_name}}{{item.city_name}}{{item.county_name}}{{item.address}}
+ {{item.province_name || ''}}{{item.city_name || ''}}{{item.county_name || ''}}{{item.address || ''}}
diff --git a/sourcecode/alipay/pages/user-address/user-address.axml b/sourcecode/alipay/pages/user-address/user-address.axml
index 775aa5e29..71a20a8aa 100755
--- a/sourcecode/alipay/pages/user-address/user-address.axml
+++ b/sourcecode/alipay/pages/user-address/user-address.axml
@@ -8,7 +8,7 @@
- {{item.province_name}}{{item.city_name}}{{item.county_name}}{{item.address}}
+ {{item.province_name || ''}}{{item.city_name || ''}}{{item.county_name || ''}}{{item.address || ''}}
diff --git a/sourcecode/alipay/pages/user-address/user-address.js b/sourcecode/alipay/pages/user-address/user-address.js
index 1848cf640..4b4037581 100644
--- a/sourcecode/alipay/pages/user-address/user-address.js
+++ b/sourcecode/alipay/pages/user-address/user-address.js
@@ -10,11 +10,11 @@ Page({
onLoad(params) {
this.setData({params: params});
+ this.init();
},
onShow() {
my.setNavigationBar({title: app.data.common_pages_title.user_address});
- this.init();
},
// 初始化
diff --git a/sourcecode/baidu/pages/buy/buy.swan b/sourcecode/baidu/pages/buy/buy.swan
index 8aebd345c..66fad2c82 100755
--- a/sourcecode/baidu/pages/buy/buy.swan
+++ b/sourcecode/baidu/pages/buy/buy.swan
@@ -22,7 +22,7 @@
- {{address.province_name}}{{address.city_name}}{{address.county_name}}{{address.address}}
+ {{address.province_name || ''}}{{address.city_name || ''}}{{address.county_name || ''}}{{address.address || ''}}
diff --git a/sourcecode/baidu/pages/extraction-address/extraction-address.swan b/sourcecode/baidu/pages/extraction-address/extraction-address.swan
index 91cc710c1..92b0591e5 100644
--- a/sourcecode/baidu/pages/extraction-address/extraction-address.swan
+++ b/sourcecode/baidu/pages/extraction-address/extraction-address.swan
@@ -9,7 +9,7 @@
- {{item.province_name}}{{item.city_name}}{{item.county_name}}{{item.address}}
+ {{item.province_name || ''}}{{item.city_name || ''}}{{item.county_name || ''}}{{item.address || ''}}
diff --git a/sourcecode/baidu/pages/user-address/user-address.js b/sourcecode/baidu/pages/user-address/user-address.js
index f1ec1131b..125b8a71c 100755
--- a/sourcecode/baidu/pages/user-address/user-address.js
+++ b/sourcecode/baidu/pages/user-address/user-address.js
@@ -10,11 +10,11 @@ Page({
onLoad(params) {
this.setData({ params: params });
+ this.init();
},
onShow() {
swan.setNavigationBarTitle({ title: app.data.common_pages_title.user_address });
- this.init();
},
// 初始化
@@ -253,7 +253,6 @@ Page({
swan.hideLoading();
if (res.data.code == 0) {
this.get_data_list();
- app.showToast(res.data.msg, "success");
} else {
if (app.is_login_check(res.data)) {
app.showToast(res.data.msg);
diff --git a/sourcecode/baidu/pages/user-address/user-address.swan b/sourcecode/baidu/pages/user-address/user-address.swan
index 2b2c86342..6e07874e8 100755
--- a/sourcecode/baidu/pages/user-address/user-address.swan
+++ b/sourcecode/baidu/pages/user-address/user-address.swan
@@ -9,7 +9,7 @@
- {{item.province_name}}{{item.city_name}}{{item.county_name}}{{item.address}}
+ {{item.province_name || ''}}{{item.city_name || ''}}{{item.county_name || ''}}{{item.address || ''}}
diff --git a/sourcecode/qq/pages/buy/buy.qml b/sourcecode/qq/pages/buy/buy.qml
index e343a3149..7c8379375 100755
--- a/sourcecode/qq/pages/buy/buy.qml
+++ b/sourcecode/qq/pages/buy/buy.qml
@@ -22,7 +22,7 @@
- {{address.province_name}}{{address.city_name}}{{address.county_name}}{{address.address}}
+ {{address.province_name || ''}}{{address.city_name || ''}}{{address.county_name || ''}}{{address.address || ''}}
diff --git a/sourcecode/qq/pages/extraction-address/extraction-address.qml b/sourcecode/qq/pages/extraction-address/extraction-address.qml
index 7c5ab8829..5e192f11f 100644
--- a/sourcecode/qq/pages/extraction-address/extraction-address.qml
+++ b/sourcecode/qq/pages/extraction-address/extraction-address.qml
@@ -9,7 +9,7 @@
- {{item.province_name}}{{item.city_name}}{{item.county_name}}{{item.address}}
+ {{item.province_name || ''}}{{item.city_name || ''}}{{item.county_name || ''}}{{item.address || ''}}
diff --git a/sourcecode/qq/pages/user-address/user-address.js b/sourcecode/qq/pages/user-address/user-address.js
index 46b915d2f..0a99f849f 100755
--- a/sourcecode/qq/pages/user-address/user-address.js
+++ b/sourcecode/qq/pages/user-address/user-address.js
@@ -10,11 +10,11 @@ Page({
onLoad(params) {
this.setData({params: params});
+ this.init();
},
onShow() {
qq.setNavigationBarTitle({title: app.data.common_pages_title.user_address});
- this.init();
},
// 初始化
diff --git a/sourcecode/qq/pages/user-address/user-address.qml b/sourcecode/qq/pages/user-address/user-address.qml
index 598ac7870..b712cfe0b 100755
--- a/sourcecode/qq/pages/user-address/user-address.qml
+++ b/sourcecode/qq/pages/user-address/user-address.qml
@@ -8,7 +8,7 @@
- {{item.province_name}}{{item.city_name}}{{item.county_name}}{{item.address}}
+ {{item.province_name || ''}}{{item.city_name || ''}}{{item.county_name || ''}}{{item.address || ''}}
diff --git a/sourcecode/toutiao/pages/buy/buy.ttml b/sourcecode/toutiao/pages/buy/buy.ttml
index a7a73f9a6..70aaf9c9d 100755
--- a/sourcecode/toutiao/pages/buy/buy.ttml
+++ b/sourcecode/toutiao/pages/buy/buy.ttml
@@ -22,7 +22,7 @@
- {{address.province_name}}{{address.city_name}}{{address.county_name}}{{address.address}}
+ {{address.province_name || ''}}{{address.city_name || ''}}{{address.county_name || ''}}{{address.address || ''}}
diff --git a/sourcecode/toutiao/pages/extraction-address/extraction-address.ttml b/sourcecode/toutiao/pages/extraction-address/extraction-address.ttml
index d2b65386b..bd1f754f0 100644
--- a/sourcecode/toutiao/pages/extraction-address/extraction-address.ttml
+++ b/sourcecode/toutiao/pages/extraction-address/extraction-address.ttml
@@ -9,7 +9,7 @@
- {{item.province_name}}{{item.city_name}}{{item.county_name}}{{item.address}}
+ {{item.province_name || ''}}{{item.city_name || ''}}{{item.county_name || ''}}{{item.address || ''}}
diff --git a/sourcecode/toutiao/pages/user-address/user-address.js b/sourcecode/toutiao/pages/user-address/user-address.js
index 292f20e5f..bbafb84da 100755
--- a/sourcecode/toutiao/pages/user-address/user-address.js
+++ b/sourcecode/toutiao/pages/user-address/user-address.js
@@ -10,11 +10,11 @@ Page({
onLoad(params) {
this.setData({params: params});
+ this.init();
},
onShow() {
tt.setNavigationBarTitle({title: app.data.common_pages_title.user_address});
- this.init();
},
// 初始化
diff --git a/sourcecode/toutiao/pages/user-address/user-address.ttml b/sourcecode/toutiao/pages/user-address/user-address.ttml
index 2358087b9..431493f34 100755
--- a/sourcecode/toutiao/pages/user-address/user-address.ttml
+++ b/sourcecode/toutiao/pages/user-address/user-address.ttml
@@ -9,7 +9,7 @@
- {{item.province_name}}{{item.city_name}}{{item.county_name}}{{item.address}}
+ {{item.province_name || ''}}{{item.city_name || ''}}{{item.county_name || ''}}{{item.address || ''}}
diff --git a/sourcecode/weixin/app.js b/sourcecode/weixin/app.js
index 03b77e0c2..481a271b6 100755
--- a/sourcecode/weixin/app.js
+++ b/sourcecode/weixin/app.js
@@ -71,7 +71,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/pages/buy/buy.wxml b/sourcecode/weixin/pages/buy/buy.wxml
index 3aa0a2b2f..006f45564 100755
--- a/sourcecode/weixin/pages/buy/buy.wxml
+++ b/sourcecode/weixin/pages/buy/buy.wxml
@@ -22,7 +22,7 @@
- {{address.province_name}}{{address.city_name}}{{address.county_name}}{{address.address}}
+ {{address.province_name || ''}}{{address.city_name || ''}}{{address.county_name || ''}}{{address.address || ''}}
diff --git a/sourcecode/weixin/pages/extraction-address/extraction-address.wxml b/sourcecode/weixin/pages/extraction-address/extraction-address.wxml
index e73012cf1..5b5918a9a 100644
--- a/sourcecode/weixin/pages/extraction-address/extraction-address.wxml
+++ b/sourcecode/weixin/pages/extraction-address/extraction-address.wxml
@@ -9,7 +9,7 @@
- {{item.province_name}}{{item.city_name}}{{item.county_name}}{{item.address}}
+ {{item.province_name || ''}}{{item.city_name || ''}}{{item.county_name || ''}}{{item.address || ''}}
diff --git a/sourcecode/weixin/pages/user-address/user-address.js b/sourcecode/weixin/pages/user-address/user-address.js
index 4f3c8635d..553b242e8 100755
--- a/sourcecode/weixin/pages/user-address/user-address.js
+++ b/sourcecode/weixin/pages/user-address/user-address.js
@@ -10,11 +10,11 @@ Page({
onLoad(params) {
this.setData({params: params});
+ this.init();
},
onShow() {
wx.setNavigationBarTitle({title: app.data.common_pages_title.user_address});
- this.init();
},
// 初始化
@@ -236,5 +236,57 @@ Page({
wx.navigateBack();
}
},
+
+ // 获取系统地址
+ choose_system_address_event(e) {
+ var self = this;
+ wx.authorize({
+ scope: 'scope.address',
+ success: function(res) {
+ wx.chooseAddress({
+ success (res) {
+ var data = {
+ "name": res.userName || '',
+ "tel": res.telNumber || '',
+ "province": res.provinceName || '',
+ "city": res.cityName || '',
+ "county": res.countyName || '',
+ "address": res.detailInfo || '',
+ };
+
+ // 加载loding
+ wx.showLoading({ title: "处理中..." });
+
+ // 获取数据
+ wx.request({
+ url: app.get_request_url("outsystemadd", "useraddress"),
+ method: "POST",
+ data: data,
+ dataType: "json",
+ success: res => {
+ wx.hideLoading();
+ if (res.data.code == 0) {
+ self.get_data_list();
+ } else {
+ if (app.is_login_check(res.data)) {
+ app.showToast(res.data.msg);
+ } else {
+ app.showToast('提交失败，请重试！');
+ }
+ }
+ },
+ fail: () => {
+ wx.hideLoading();
+ app.showToast("服务器请求出错");
+ }
+ });
+ }
+ });
+ },
+ fail: function(res) {
+ app.showToast('取消选择');
+ }
+ });
+ },
});
diff --git a/sourcecode/weixin/pages/user-address/user-address.wxml b/sourcecode/weixin/pages/user-address/user-address.wxml
index a4c4d0f11..900e9e793 100755
--- a/sourcecode/weixin/pages/user-address/user-address.wxml
+++ b/sourcecode/weixin/pages/user-address/user-address.wxml
@@ -9,7 +9,7 @@
- {{item.province_name}}{{item.city_name}}{{item.county_name}}{{item.address}}
+ {{item.province_name || ''}}{{item.city_name || ''}}{{item.county_name || ''}}{{item.address || ''}}
@@ -33,8 +33,11 @@
-
-
-
-
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/sourcecode/weixin/pages/user-address/user-address.wxss b/sourcecode/weixin/pages/user-address/user-address.wxss
index 38c61d6be..722fdb159 100755
--- a/sourcecode/weixin/pages/user-address/user-address.wxss
+++ b/sourcecode/weixin/pages/user-address/user-address.wxss
@@ -33,4 +33,12 @@
}
.page {
padding-bottom: 85rpx;
+}
+.submit-list button {
+ width: 50%;
+}
+.submit-list .import-system-address-submit {
+ background: #07c160 !important;
+ right: 0;
+ left: auto;
}
\ No newline at end of file