From c29fc7b5cb520060e9f091fc00df0bcb9fff672b Mon Sep 17 00:00:00 2001
From: zhangmanman <994797151@qq.com>
Date: Wed, 7 Jul 2021 10:47:38 +0800
Subject: [PATCH] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/car/index.js | 4 --
pages/chooseTel/chooseTel.js | 7 ++--
pages/frozen/frozen.js | 1 -
pages/index/index.js | 1 -
pages/login/login.js | 7 +++-
pages/order/order.js | 2 -
pages/orderData/orderData.js | 70 ++++++++++++++++++++++------------
pages/orderData/orderData.wxml | 2 +-
pages/rights/rights.js | 2 -
pages/rights/rights.wxml | 2 +-
pages/switchcity/switchcity.js | 4 --
pages/washcar/washcar.js | 2 -
12 files changed, 56 insertions(+), 48 deletions(-)
diff --git a/pages/car/index.js b/pages/car/index.js
index 83a1af7..1737725 100644
--- a/pages/car/index.js
+++ b/pages/car/index.js
@@ -45,8 +45,6 @@ Page({
// 获取卡券列表
this.couponInfo()
-
- console.log(this.data.platformCp[this.data.platIndex])
},
/**
@@ -270,8 +268,6 @@ Page({
}
},
fail : res=>{
- console.log(this.data.isdeliver)
- console.log(Newtype)
if(Newtype == 'welfare'){
if(this.data.isdeliver == 1) {
wx.reLaunch({
diff --git a/pages/chooseTel/chooseTel.js b/pages/chooseTel/chooseTel.js
index ba17013..26b7287 100644
--- a/pages/chooseTel/chooseTel.js
+++ b/pages/chooseTel/chooseTel.js
@@ -25,7 +25,6 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad (options) {
- console.log(options)
// 登录方式-活动
this.setData({
way : options.way
@@ -121,10 +120,10 @@ Page({
* 点击账号登录
*/
loginGo(e) {
- let username = e.currentTarget.dataset.name,
- wechatUser_id = app.globalData.wechatUser
+ let username = e.currentTarget.dataset.name
+ const wechatUserId = wx.getStorageSync("wechatUser")
- wx.$api.enroll.tel(wechatUser_id, username).then(res=>{
+ wx.$api.enroll.tel(wechatUserId, username).then(res=>{
app.globalData.token = res.data.token
app.globalData.isUser = true
diff --git a/pages/frozen/frozen.js b/pages/frozen/frozen.js
index e6e5157..adad58a 100644
--- a/pages/frozen/frozen.js
+++ b/pages/frozen/frozen.js
@@ -33,7 +33,6 @@ Page({
*/
frozenInfo() {
wx.$api.user.ungrants(this.data.type).then(res=>{
- console.log(res.data)
this.setData({
frozenData: res.data
})
diff --git a/pages/index/index.js b/pages/index/index.js
index 8cf13f3..13f6e8f 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -354,7 +354,6 @@ Page({
}
},
fail: err => {
- console.log(err)
}
})
}
diff --git a/pages/login/login.js b/pages/login/login.js
index c61935f..83f4b9f 100644
--- a/pages/login/login.js
+++ b/pages/login/login.js
@@ -107,7 +107,12 @@ Page({
// 存入缓存
app.globalData.userInfo = res.data.users
- app.globalData.wechatUser = res.data.wechatUser_id
+
+ // 写入缓存
+ wx.setStorage({
+ key : 'wechatUser',
+ data : res.data.wechatUser_id
+ })
this.setData({
isLogin: false
diff --git a/pages/order/order.js b/pages/order/order.js
index aa77f57..dbfaf24 100644
--- a/pages/order/order.js
+++ b/pages/order/order.js
@@ -26,8 +26,6 @@ Page({
orderType: options.orderType,
stateType: options.stateType
})
-
- console.log(options.orderType)
},
onShow() {
diff --git a/pages/orderData/orderData.js b/pages/orderData/orderData.js
index 9521d11..858d7fe 100644
--- a/pages/orderData/orderData.js
+++ b/pages/orderData/orderData.js
@@ -97,35 +97,55 @@ Page({
* 支付提交
*/
orderPay(e) {
+ let url = ''
let orderid = e.currentTarget.dataset.id
- wx.$api.exchange.payments(orderid).then(res=>{
- wx.$api.index.wechat(res.data.trade_no).then(res=>{
- let payInfo = JSON.parse(res.data)
- wx.requestPayment({
- timeStamp: payInfo.timeStamp,
- nonceStr : payInfo.nonceStr,
- package : payInfo.package,
- paySign : payInfo.paySign,
- signType : payInfo.signType,
- success : res=>{
- if(res.errMsg == "requestPayment:ok"){
- wx.showToast({
- title: '支付成功',
- icon : 'success'
- })
- setTimeout(()=>{
- wx.reLaunch({
- url: '/pages/coupon/coupon?type=couponPublic'
+ if(this.data.orderType == 'welfare' || this.data.orderType == 'welfareGoods') url = wx.$api.exchange.welfarePay
+ if(this.data.orderType == 'rights' || this.data.orderType == 'rightsCoupons') url = wx.$api.exchange.rightsPay
+ url(orderid).then(res=>{
+ // payTips为1的时候为微信支付
+ if(this.data.pay.payTips == 1) {
+ let wechaUrl = ''
+ if(this.data.orderType == 'welfare' || this.data.orderType == 'welfareGoods') wechaUrl = wx.$api.index.fridayPay
+ if(this.data.orderType == 'rights' || this.data.orderType == 'rightsCoupons') wechaUrl = wx.$api.index.wechat
+ wechaUrl(res.data.trade_no).then(res=>{
+ let payInfo = JSON.parse(res.data)
+ wx.requestPayment({
+ timeStamp: payInfo.timeStamp,
+ nonceStr : payInfo.nonceStr,
+ package : payInfo.package,
+ paySign : payInfo.paySign,
+ signType : payInfo.signType,
+ success : res=>{
+ if(res.errMsg == "requestPayment:ok"){
+ wx.showToast({
+ title: '支付成功',
+ icon : 'success'
})
- },2000)
+ setTimeout(()=>{
+ // 获取商品活动订单
+ this.orderInfo();
+ },2000)
+ }
+ },
+ fail : res=>{
+ // 获取商品活动订单
+ this.orderInfo();
}
- },
- fail : res=>{
- wx.reLaunch({
- url: '/pages/order/order?stateType=unpay'
- })
- }
+ })
})
+ }
+ // payTips为2的时候为沃钱包支付
+ if(this.data.pay.payTips == 2) {
+ const newUrl = "https://lifetest.ysd-bs.com/unicom/payment?trade_no=" + res.data.trade_no
+ let url= encodeURIComponent(newUrl)
+ wx.navigateTo({
+ // 跳转到webview页面
+ url: `/pages/webView/webView?url=${url}`
+ });
+ }
+
+ this.setData({
+ ['pay.payState']: false
})
})
diff --git a/pages/orderData/orderData.wxml b/pages/orderData/orderData.wxml
index 170e1d9..4ce65b7 100644
--- a/pages/orderData/orderData.wxml
+++ b/pages/orderData/orderData.wxml
@@ -59,5 +59,5 @@
\ No newline at end of file
diff --git a/pages/rights/rights.js b/pages/rights/rights.js
index b40a71d..2e4f31c 100644
--- a/pages/rights/rights.js
+++ b/pages/rights/rights.js
@@ -78,7 +78,6 @@ Page({
}
if(res.data.detail.type == 'virtual') this.setData({isdeliver : 1})
}
-
this.setData({
address : res.data.address,
allAddress : res.data.all_address,
@@ -219,7 +218,6 @@ Page({
* 选择收货地址
*/
selectAddress(e){
- console.log(e)
let new_addressId = e.currentTarget.dataset.id,
addressId = this.data.address.id
if (new_addressId != addressId) {
diff --git a/pages/rights/rights.wxml b/pages/rights/rights.wxml
index b9f8d93..4eb0dd6 100644
--- a/pages/rights/rights.wxml
+++ b/pages/rights/rights.wxml
@@ -122,7 +122,7 @@
{{detail.attribute.form_type}}
- ￥{{detail.score}}
+ ￥{{score}}
{{detail.attribute.form_pay}}
diff --git a/pages/switchcity/switchcity.js b/pages/switchcity/switchcity.js
index b0d55b9..de4c22d 100644
--- a/pages/switchcity/switchcity.js
+++ b/pages/switchcity/switchcity.js
@@ -27,7 +27,6 @@ Page({
},
onLoad(e) {
- console.log(e)
wx.getLocation({
success: res => {
// 解析坐标
@@ -133,8 +132,6 @@ Page({
this.setData({
regiList : res.data
})
-
- console.log(this.data.regiList)
})
},
@@ -142,7 +139,6 @@ Page({
* 选择市区返回
*/
regionOpt (e) {
- console.log(e)
let area_name = e.currentTarget.dataset.city
var pages = getCurrentPages();
var prevPage = pages[pages.length - 2];
diff --git a/pages/washcar/washcar.js b/pages/washcar/washcar.js
index 5bf4602..721259a 100644
--- a/pages/washcar/washcar.js
+++ b/pages/washcar/washcar.js
@@ -15,8 +15,6 @@ Page({
this.setData({
url : decodeURIComponent(options.url)
})
-
- console.log(this.data.url)
},
/**