sileya-ai
/
vr-shopxo-source
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'v1.4.0'

feat/task1-c-wallet
gongfuxiang 2019-03-28 00:48:01 +08:00
parent 7bcdfd8a6f 600f930cae
commit fe8edefe76
3 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/service/BuyService.php
View File

@ -145,7 +145,7 @@ class BuyService
{ {
if(!is_array($params['spec'])) if(!is_array($params['spec']))
{ {
$spec = json_decode($params['spec'], true); $spec = json_decode(htmlspecialchars_decode($params['spec']), true);
} else { } else {
$spec = $params['spec']; $spec = $params['spec'];
} }

6
public/appmini/old/alipay/pages/buy/buy.js
View File

@ -71,6 +71,7 @@ Page({
var data = this.data.params; var data = this.data.params;
data['address_id'] = this.data.address_id; data['address_id'] = this.data.address_id;
data['payment_id'] = this.data.payment_id;
my.httpRequest({ my.httpRequest({
url: app.get_request_url("index", "buy"), url: app.get_request_url("index", "buy"),
method: "POST", method: "POST",
@ -99,6 +100,10 @@ Page({
address: data.base.address, address: data.base.address,
address_id: data.base.address.id, 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) { payment_event(e) {
this.setData({ payment_id: e.target.dataset.value}); this.setData({ payment_id: e.target.dataset.value});
this.payment_list_data(this.data.payment_list); this.payment_list_data(this.data.payment_list);
this.init();
}, },
// 支付方式数据处理 // 支付方式数据处理

7
public/appmini/old/weixin/pages/buy/buy.js
View File

@ -69,6 +69,7 @@ Page({
var data = this.data.params; var data = this.data.params;
data['address_id'] = this.data.address_id; data['address_id'] = this.data.address_id;
data['payment_id'] = this.data.payment_id;
wx.request({ wx.request({
url: app.get_request_url("index", "buy"), url: app.get_request_url("index", "buy"),
method: "POST", method: "POST",
@ -97,6 +98,11 @@ Page({
address: data.base.address, address: data.base.address,
address_id: data.base.address.id, 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) { payment_event(e) {
this.setData({ payment_id: e.currentTarget.dataset.value}); this.setData({ payment_id: e.currentTarget.dataset.value});
this.payment_list_data(this.data.payment_list); this.payment_list_data(this.data.payment_list);
this.init();
}, },
// 支付方式数据处理 // 支付方式数据处理