From 8e57c9328746617fb7bed662192f304fdb45cf5a Mon Sep 17 00:00:00 2001
From: devil <fuxiang.gong@qq.com>
Date: Fri, 25 Sep 2020 00:45:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=AE=9D=E3=80=81QQ=E5=B0=8F?=
 =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E6=96=B0=E5=A2=9E=E8=8E=B7=E5=8F=96=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 changelog.txt                                 |  3 +-
 .../pages/user-address/user-address.acss      |  8 ++++
 .../pages/user-address/user-address.axml      |  9 ++--
 .../alipay/pages/user-address/user-address.js | 48 +++++++++++++++++++
 .../baidu/pages/user-address/user-address.js  |  4 +-
 .../plugins/wallet/cash-auth/cash-auth.qml    |  1 -
 .../qq/pages/user-address/user-address.js     | 45 +++++++++++++++++
 .../qq/pages/user-address/user-address.qml    | 11 +++--
 .../qq/pages/user-address/user-address.qss    |  8 ++++
 .../weixin/pages/user-address/user-address.js |  1 +
 .../pages/user-address/user-address.wxml      |  2 +-
 11 files changed, 129 insertions(+), 11 deletions(-)

diff --git a/changelog.txt b/changelog.txt
index 5fc529dba..19d62faf7 100755
--- a/changelog.txt
+++ b/changelog.txt
@@ -14,7 +14,8 @@ web端
 
 小程序
 	1. QQ小程序支持微信支付
-	2. 百度/微信小程序支持手机号码一键绑定、获取收货地址
+	2. 支持手机号码一键绑定[百度/微信]
+	3. 支持获取收货地址[百度/微信/QQ/支付宝]
 
 插件
 	1. 汇率插件支持货币自由切换
diff --git a/sourcecode/alipay/pages/user-address/user-address.acss b/sourcecode/alipay/pages/user-address/user-address.acss
index f495ab3fe..901382d49 100644
--- a/sourcecode/alipay/pages/user-address/user-address.acss
+++ b/sourcecode/alipay/pages/user-address/user-address.acss
@@ -26,4 +26,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
diff --git a/sourcecode/alipay/pages/user-address/user-address.axml b/sourcecode/alipay/pages/user-address/user-address.axml
index 71a20a8aa..00e2ae635 100755
--- a/sourcecode/alipay/pages/user-address/user-address.axml
+++ b/sourcecode/alipay/pages/user-address/user-address.axml
@@ -33,7 +33,10 @@
   <import src="/pages/common/bottom_line.axml" />
   <template is="bottom_line" data="{{status: data_bottom_line_status}}"></template>
   
-  <navigator url="/pages/user-address-save/user-address-save" open-type="navigate" hover-class="none">
-    <button class="submit-fixed submit-bottom" type="default" hover-class="none">新增地址</button>
-  </navigator>
+  <view class="submit-list">
+    <navigator url="/pages/user-address-save/user-address-save" open-type="navigate" hover-class="none">
+      <button class="submit-fixed submit-bottom" type="default" hover-class="none">添加新地址</button>
+    </navigator>
+    <button class="submit-fixed submit-bottom import-system-address-submit" type="default" hover-class="none" onTap="choose_system_address_event">导入支付宝地址</button>
+  </view>
 </view>
\ No newline at end of file
diff --git a/sourcecode/alipay/pages/user-address/user-address.js b/sourcecode/alipay/pages/user-address/user-address.js
index 4b4037581..b493b4744 100644
--- a/sourcecode/alipay/pages/user-address/user-address.js
+++ b/sourcecode/alipay/pages/user-address/user-address.js
@@ -237,5 +237,53 @@ Page({
       my.navigateBack();
     }
   },
+
+  // 获取系统地址
+  choose_system_address_event(e) {
+    var self = this;
+    my.getAddress({
+      success (res) {
+        if(res.resultStatus == '9000') {
+          var data = {
+            "name": res.result.fullname || '',
+            "tel": res.result.mobilePhone || '',
+            "province": res.result.prov || '',
+            "city": res.result.city || '',
+            "county": res.result.area || '',
+            "town": res.result.street || '',
+            "address": res.result.address || '',
+          };
+
+          // 加载loding
+          my.showLoading({ content: "处理中..." });
+      
+          // 获取数据
+          my.request({
+            url: app.get_request_url("outsystemadd", "useraddress"),
+            method: "POST",
+            data: data,
+            dataType: "json",
+            headers: { 'content-type': 'application/x-www-form-urlencoded' },
+            success: res => {
+              my.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: () => {
+              my.hideLoading();
+              app.showToast("服务器请求出错");
+            }
+          });
+        }
+      }
+    });
+  },
   
 });
diff --git a/sourcecode/baidu/pages/user-address/user-address.js b/sourcecode/baidu/pages/user-address/user-address.js
index 125b8a71c..3a3263e39 100755
--- a/sourcecode/baidu/pages/user-address/user-address.js
+++ b/sourcecode/baidu/pages/user-address/user-address.js
@@ -229,6 +229,7 @@ Page({
 
   // 获取系统地址
   choose_system_address_event(e) {
+    var self = this;
     var detail = e.detail;
     var data = {
       "name": detail.userName || '',
@@ -249,10 +250,11 @@ Page({
       method: "POST",
       data: data,
       dataType: "json",
+      headers: { 'content-type': 'application/x-www-form-urlencoded' },
       success: res => {
         swan.hideLoading();
         if (res.data.code == 0) {
-          this.get_data_list();
+          self.get_data_list();
         } else {
           if (app.is_login_check(res.data)) {
             app.showToast(res.data.msg);
diff --git a/sourcecode/qq/pages/plugins/wallet/cash-auth/cash-auth.qml b/sourcecode/qq/pages/plugins/wallet/cash-auth/cash-auth.qml
index a4155cc52..1944a51be 100644
--- a/sourcecode/qq/pages/plugins/wallet/cash-auth/cash-auth.qml
+++ b/sourcecode/qq/pages/plugins/wallet/cash-auth/cash-auth.qml
@@ -45,7 +45,6 @@
     </navigator>
   </view>
 </view>
-</view>
 
 <view qq:else>
   <import src="/pages/common/nodata.qml" />
diff --git a/sourcecode/qq/pages/user-address/user-address.js b/sourcecode/qq/pages/user-address/user-address.js
index 0a99f849f..502d6e43e 100755
--- a/sourcecode/qq/pages/user-address/user-address.js
+++ b/sourcecode/qq/pages/user-address/user-address.js
@@ -236,5 +236,50 @@ Page({
       qq.navigateBack();
     }
   },
+
+  // 获取系统地址
+  choose_system_address_event(e) {
+    var self = this;
+    qq.chooseAddress({
+      success (res) {
+        var data = {
+          "name": res.userName || '',
+          "tel": res.telNumber || '',
+          "province": res.provinceName || '',
+          "city": res.cityName || '',
+          "county": res.countyName || '',
+          "address": res.detailInfo || '',
+        };
+
+        // 加载loding
+        qq.showLoading({ title: "处理中..." });
+    
+        // 获取数据
+        qq.request({
+          url: app.get_request_url("outsystemadd", "useraddress"),
+          method: "POST",
+          data: data,
+          dataType: "json",
+          headers: { 'content-type': 'application/x-www-form-urlencoded' },
+          success: res => {
+            qq.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: () => {
+            qq.hideLoading();
+            app.showToast("服务器请求出错");
+          }
+        });
+      }
+    });
+  },
   
 });
diff --git a/sourcecode/qq/pages/user-address/user-address.qml b/sourcecode/qq/pages/user-address/user-address.qml
index b712cfe0b..f01425496 100755
--- a/sourcecode/qq/pages/user-address/user-address.qml
+++ b/sourcecode/qq/pages/user-address/user-address.qml
@@ -32,8 +32,11 @@
     
   <import src="/pages/common/bottom_line.qml" />
   <template is="bottom_line" data="{{status: data_bottom_line_status}}"></template>
-  
-  <navigator url="/pages/user-address-save/user-address-save" open-type="navigate" hover-class="none">
-    <button class="submit-fixed submit-bottom" type="default" hover-class="none">新增地址</button>
-  </navigator>
+
+  <view class="submit-list">
+    <navigator url="/pages/user-address-save/user-address-save" open-type="navigate" hover-class="none">
+      <button class="submit-fixed submit-bottom" type="default" hover-class="none">添加新地址</button>
+    </navigator>
+    <button class="submit-fixed submit-bottom import-system-address-submit" type="default" hover-class="none" bindtap="choose_system_address_event">导入QQ地址</button>
+  </view>
 </view>
\ No newline at end of file
diff --git a/sourcecode/qq/pages/user-address/user-address.qss b/sourcecode/qq/pages/user-address/user-address.qss
index dff6f15ed..878eb6c02 100755
--- a/sourcecode/qq/pages/user-address/user-address.qss
+++ b/sourcecode/qq/pages/user-address/user-address.qss
@@ -26,4 +26,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
diff --git a/sourcecode/weixin/pages/user-address/user-address.js b/sourcecode/weixin/pages/user-address/user-address.js
index 553b242e8..67cbb7927 100755
--- a/sourcecode/weixin/pages/user-address/user-address.js
+++ b/sourcecode/weixin/pages/user-address/user-address.js
@@ -263,6 +263,7 @@ Page({
               method: "POST",
               data: data,
               dataType: "json",
+              headers: { 'content-type': 'application/x-www-form-urlencoded' },
               success: res => {
                 wx.hideLoading();
                 if (res.data.code == 0) {
diff --git a/sourcecode/weixin/pages/user-address/user-address.wxml b/sourcecode/weixin/pages/user-address/user-address.wxml
index 900e9e793..ae24bfa75 100755
--- a/sourcecode/weixin/pages/user-address/user-address.wxml
+++ b/sourcecode/weixin/pages/user-address/user-address.wxml
@@ -38,6 +38,6 @@
     <navigator url="/pages/user-address-save/user-address-save" open-type="navigate" hover-class="none">
       <button class="submit-fixed submit-bottom" type="default" hover-class="none">添加新地址</button>
     </navigator>
-    <button class="submit-fixed submit-bottom import-system-address-submit" type="default" hover-class="none" bindtap="choose_system_address_event">导入百度地址</button>
+    <button class="submit-fixed submit-bottom import-system-address-submit" type="default" hover-class="none" bindtap="choose_system_address_event">导入微信地址</button>
   </view>
 </view>
\ No newline at end of file