From 95005fb0237ae0441f7c23420ecaa2af564baeb0 Mon Sep 17 00:00:00 2001
From: gongfuxiang <2499232802@qq.com>
Date: Thu, 28 Mar 2019 00:40:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/service/BuyService.php         | 2 +-
 public/appmini/old/alipay/app.js           | 2 +-
 public/appmini/old/alipay/pages/buy/buy.js | 6 ++++++
 public/appmini/old/weixin/pages/buy/buy.js | 7 +++++++
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/application/service/BuyService.php b/application/service/BuyService.php
index 4400ae481..713276e71 100755
--- a/application/service/BuyService.php
+++ b/application/service/BuyService.php
@@ -145,7 +145,7 @@ class BuyService
         {
             if(!is_array($params['spec']))
             {
-                $spec = json_decode($params['spec'], true);
+                $spec = json_decode(htmlspecialchars_decode($params['spec']), true);
             } else {
                 $spec = $params['spec'];
             }
diff --git a/public/appmini/old/alipay/app.js b/public/appmini/old/alipay/app.js
index 86d9662ec..c54b2821a 100755
--- a/public/appmini/old/alipay/app.js
+++ b/public/appmini/old/alipay/app.js
@@ -58,7 +58,7 @@ App({
     // 请求地址
     request_url: "{{request_url}}",
     //request_url: "https://test.shopxo.net/",
-    //request_url: 'http://tp5-dev.com/',
+    request_url: 'http://tp5-dev.com/',
 
     // 基础信息
     application_title: "{{application_title}}",
diff --git a/public/appmini/old/alipay/pages/buy/buy.js b/public/appmini/old/alipay/pages/buy/buy.js
index d8901a3ec..b3015c949 100755
--- a/public/appmini/old/alipay/pages/buy/buy.js
+++ b/public/appmini/old/alipay/pages/buy/buy.js
@@ -71,6 +71,7 @@ Page({
 
     var data = this.data.params;
     data['address_id'] = this.data.address_id;
+    data['payment_id'] = this.data.payment_id;
     my.httpRequest({
       url: app.get_request_url("index", "buy"),
       method: "POST",
@@ -99,6 +100,10 @@ Page({
                   address: data.base.address,
                   address_id: data.base.address.id,
                 });
+                my.setStorage({
+                  key: app.data.cache_buy_user_address_select_key,
+                  data: data.base.address,
+                });
               }
             }
 
@@ -196,6 +201,7 @@ Page({
   payment_event(e) {
     this.setData({ payment_id: e.target.dataset.value});
     this.payment_list_data(this.data.payment_list);
+    this.init();
   },
 
   // 支付方式数据处理
diff --git a/public/appmini/old/weixin/pages/buy/buy.js b/public/appmini/old/weixin/pages/buy/buy.js
index aa4e58b48..b379f9ece 100755
--- a/public/appmini/old/weixin/pages/buy/buy.js
+++ b/public/appmini/old/weixin/pages/buy/buy.js
@@ -69,6 +69,7 @@ Page({
 
     var data = this.data.params;
     data['address_id'] = this.data.address_id;
+    data['payment_id'] = this.data.payment_id;
     wx.request({
       url: app.get_request_url("index", "buy"),
       method: "POST",
@@ -97,6 +98,11 @@ Page({
                   address: data.base.address,
                   address_id: data.base.address.id,
                 });
+
+                my.setStorage({
+                  key: app.data.cache_buy_user_address_select_key,
+                  data: data.base.address,
+                });
               }
             }
 
@@ -182,6 +188,7 @@ Page({
   payment_event(e) {
     this.setData({ payment_id: e.currentTarget.dataset.value});
     this.payment_list_data(this.data.payment_list);
+    this.init();
   },
 
   // 支付方式数据处理