Commit 5580cc3d by yuzhenWang

修改月份对应的天数,各种情景的支付方式

parent f9c23c43
...@@ -36,7 +36,8 @@ ...@@ -36,7 +36,8 @@
<!-- 支付方式 --> <!-- 支付方式 -->
<view class="paymentMethodContent"> <view class="paymentMethodContent">
<h4>选择支付方式</h4> <h4>选择支付方式</h4>
<view class="paymentItem" @click="selectPaymentMethod(2)"> <view @click="selectPaymentMethod(2)" >
<view class="paymentItem" v-if="runEnv!=='wechat-miniprogram'">
<view> <view>
<i class="iconfont icon-zhifubao"></i> <i class="iconfont icon-zhifubao"></i>
<text class="txtFont">支付宝支付</text> <text class="txtFont">支付宝支付</text>
...@@ -45,6 +46,8 @@ ...@@ -45,6 +46,8 @@
<i class="iconfont icon-duihao txtFont"></i> <i class="iconfont icon-duihao txtFont"></i>
</view> </view>
</view> </view>
</view>
<view class="paymentItem" @click="selectPaymentMethod(1)" v-if="deviceType==3"> <view class="paymentItem" @click="selectPaymentMethod(1)" v-if="deviceType==3">
<view> <view>
<i class="iconfont icon-py_weixinzhifu txtFont"></i> <i class="iconfont icon-py_weixinzhifu txtFont"></i>
...@@ -210,7 +213,8 @@ ...@@ -210,7 +213,8 @@
calculatedPrice: 0, calculatedPrice: 0,
dataToken:'', dataToken:'',
oldToken:'',//原始用户token oldToken:'',//原始用户token
pollTimer:'' pollTimer:'',
runEnv:dataHandling.h5RuntimeEnv()
} }
}, },
computed: { computed: {
...@@ -256,6 +260,7 @@ ...@@ -256,6 +260,7 @@
fileId: this.fileId, fileId: this.fileId,
companyType: companyInfo.companyType, companyType: companyInfo.companyType,
} }
if (this.paymentMethod == 1) { if (this.paymentMethod == 1) {
// APP:微信app支付 // APP:微信app支付
// #ifdef APP-PLUS // #ifdef APP-PLUS
...@@ -324,8 +329,14 @@ ...@@ -324,8 +329,14 @@
} }
let _this = this let _this = this
param.isPayOrAuth = 1; param.isPayOrAuth = 1;
uni.showToast({
title: JSON.stringify(param),
duration: 10000,
icon: 'none'
})
api.wxAuthorize(param).then((res) => { api.wxAuthorize(param).then((res) => {
_this.paymentBtnDisabled = false; _this.paymentBtnDisabled = false;
if (res['success']) { if (res['success']) {
if (param.amount == '0.00') { if (param.amount == '0.00') {
uni.navigateTo({ uni.navigateTo({
...@@ -418,6 +429,7 @@ ...@@ -418,6 +429,7 @@
}, },
getunifiedPay(param){ getunifiedPay(param){
api.unifiedPay(param).then((res) => { api.unifiedPay(param).then((res) => {
const data = res['data']; const data = res['data'];
this.paymentBtnDisabled = false; this.paymentBtnDisabled = false;
......
...@@ -400,6 +400,7 @@ ...@@ -400,6 +400,7 @@
this.$emit('comfirm',{year:this.year,month:this.month,current:this.current,timeType:'8'}) this.$emit('comfirm',{year:this.year,month:this.month,current:this.current,timeType:'8'})
} }
if(this.current=='2'){ if(this.current=='2'){
console.log('this.currentDate',this.currentDate);
if(!this.currentDate.length){ if(!this.currentDate.length){
uni.showToast({ uni.showToast({
title: `请选择时间`, title: `请选择时间`,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment