1.修改充值金额的值

2.修改其他问题
yj-dev
杨杰 3 years ago
parent 8f606ffd1c
commit 3e4e4f78b7
  1. 35
      pages/order/confirmation.vue
  2. 8
      pages/tabBar/user/user.vue
  3. 42
      pages/user/deposit/deposit.vue
  4. 43
      pages/user/mineCouponsDestails/mineCouponsDestails.vue
  5. 14
      pages/user/minePromotion/minePromotion.vue
  6. 145
      subPages/unionComfirmation/unionComfirmation.vue

@ -90,8 +90,8 @@
<view class="width94 comorder mart10"> <view class="width94 comorder mart10">
<view class="height50 width100 backcorfff"> <view class="height50 width100 backcorfff">
<view class="width50 flleft fcor333 fontwig6 font16" style="padding-left: 4%;"> <view class="width100 flleft fcor333 fontwig6 font16" style="padding-left: 4%;">
支付方式 支付方式 <text class="jfrecharge" @click="jumpdeposits" v-if="couponList.payType == 2 || couponList.payType==3">积分充值</text>
</view> </view>
</view> </view>
<view class="width94 line1 mart5 marb5"></view> <view class="width94 line1 mart5 marb5"></view>
@ -227,8 +227,8 @@
jumpType: '', jumpType: '',
tongCardPrice: 0, tongCardPrice: 0,
storeId: '', storeId: '',
isDiscont: false, isDiscont: false,
coupondiscountid:'' coupondiscountid: ''
}; };
}, },
@ -310,14 +310,14 @@
}, },
radioChanges(item) { radioChanges(item) {
if (this.memDiscountId == item.highDiscount.id) { // if (this.memDiscountId == item.highDiscount.id) { //
this.memDiscountId = ''; this.memDiscountId = '';
this.coupondiscountid = ''; this.coupondiscountid = '';
this.paytheprice = this.couponList.discountPrice; this.paytheprice = this.couponList.discountPrice;
this.deductionPrice = '0.00'; this.deductionPrice = '0.00';
this.isDiscont = false; this.isDiscont = false;
} else { // } else { //
this.isDiscont = true; this.isDiscont = true;
this.memDiscountId = item.highDiscount.id; this.memDiscountId = item.highDiscount.id;
this.coupondiscountid = item.id; this.coupondiscountid = item.id;
if (item.highDiscount.discountType == 1) { if (item.highDiscount.discountType == 1) {
// //
@ -731,7 +731,13 @@
duration: 4000 duration: 4000
}); });
}); });
}, },
//
jumpdeposits(){
uni.navigateTo({
url:'../user/deposit/deposit'
})
}
} }
} }
@ -917,7 +923,7 @@
align-items: center; align-items: center;
.sum { .sum {
width: 50%; width: 68%;
font-size: 18px; font-size: 18px;
margin-right: 10upx; margin-right: 10upx;
display: flex; display: flex;
@ -930,7 +936,7 @@
} }
.btn { .btn {
padding: 0 50rpx; padding: 0 45rpx;
height: 80rpx; height: 80rpx;
background-color: #0083f5; background-color: #0083f5;
color: #fff; color: #fff;
@ -943,6 +949,17 @@
} }
} }
.jfrecharge {
background-color: #0083f5;
padding: 5px 20rpx;
color: #fff;
margin-left: 50%;
justify-content: center;
align-items: center;
font-size: 30rpx;
border-radius: 40rpx;
}
.goods-list { .goods-list {
width: 100%; width: 100%;
padding: 0; padding: 0;

@ -24,18 +24,18 @@
<!-- #ifdef MP --> <!-- #ifdef MP -->
<button class="erweima fotct aliitem font14" v-if="user == null" open-type="getPhoneNumber" <button class="erweima fotct aliitem font14" v-if="user == null" open-type="getPhoneNumber"
@getphonenumber="loginByPhone"> @getphonenumber="loginByPhone">
<image src="../../../static/img/jingbi.png"></image> 充值金额 <image src="../../../static/img/jingbi.png"></image> 充值积分
</button> </button>
<button class="erweima fotct aliitem font14" v-else @click="toDeposit"> <button class="erweima fotct aliitem font14" v-else @click="toDeposit">
<image src="../../../static/img/jingbi.png"></image> 充值金额 <image src="../../../static/img/jingbi.png"></image> 充值积分
</button> </button>
<!-- #endif --> <!-- #endif -->
<!-- #ifdef H5 --> <!-- #ifdef H5 -->
<button class="erweima fotct aliitem font14" v-if="user.phone == null" @click="jumpH5Bding"> <button class="erweima fotct aliitem font14" v-if="user.phone == null" @click="jumpH5Bding">
<image src="../../../static/img/jingbi.png"></image> 充值金额 <image src="../../../static/img/jingbi.png"></image> 充值积分
</button> </button>
<button class="erweima fotct aliitem font14" v-else @click="toDeposit"> <button class="erweima fotct aliitem font14" v-else @click="toDeposit">
<image src="../../../static/img/jingbi.png"></image> 充值金额 <image src="../../../static/img/jingbi.png"></image> 充值积分
</button> </button>
<!-- #endif --> <!-- #endif -->
</view> </view>

@ -36,17 +36,6 @@
</view> </view>
<view class="content"> <view class="content">
<view class="pay-list"> <view class="pay-list">
<!-- <view class="row" @tap="paytype='alipay'">
<view class="left">
<image src="/static/img/alipay.png"></image>
</view>
<view class="center">
支付宝支付
</view>
<view class="right">
<radio :checked="paytype=='alipay'" color="#0083f5" />
</view>
</view> -->
<view class="row" @tap="paytype='wxpay'"> <view class="row" @tap="paytype='wxpay'">
<view class="left"> <view class="left">
<image :src="imagewxUrl+imgadres"></image> <image :src="imagewxUrl+imgadres"></image>
@ -85,11 +74,11 @@
data() { data() {
return { return {
inputAmount: '', // inputAmount: '', //
amountList: [10, 50, 100], //3 amountList: [100, 200, 300, 500, 800, 1000], //3
paytype: 'wxpay', // paytype: 'wxpay', //
user: "", user: "",
imagewxUrl: app.globalData.imageWxImg, imagewxUrl: app.globalData.imageWxImg,
imgadres:'wxpay.png' imgadres: 'wxpay.png'
}; };
}, },
onLoad() { onLoad() {
@ -126,7 +115,7 @@
title: '正在提交订单...' title: '正在提交订单...'
}) })
let goods = { let goods = {
"identificationCode":app.globalData.identificationCode, "identificationCode": app.globalData.identificationCode,
"highChildOrderList": [{ "highChildOrderList": [{
"goodsType": 2, "goodsType": 2,
"goodsId": app.globalData.userInfo.id, "goodsId": app.globalData.userInfo.id,
@ -214,10 +203,10 @@
jweixin.chooseWXPay({ jweixin.chooseWXPay({
appId: self.return_data.appId, appId: self.return_data.appId,
timestamp: self.return_data timestamp: self.return_data
.timeStamp, // jssdk使timestamp使timeStampS .timeStamp, // jssdk使timestamp使timeStampS
nonceStr: self.return_data.nonceStr, // 32 nonceStr: self.return_data.nonceStr, // 32
package: self.return_data package: self.return_data
.package, // prepay_idprepay_id=*** .package, // prepay_idprepay_id=***
signType: 'MD5', // 'SHA1'使'MD5' signType: 'MD5', // 'SHA1'使'MD5'
paySign: self.return_data.sign, // paySign: self.return_data.sign, //
success: function(res) { success: function(res) {
@ -271,19 +260,22 @@
width: 100%; width: 100%;
.list { .list {
display: flex; display: flow-root;
justify-content: space-between; justify-content: space-between;
padding: 20upx 0; padding: 20upx 0;
.box { .box {
width: 30%; width: 30%;
height: 120upx; height: 120rpx;
float: left;
margin-left: 3.333%;
margin-top: 20px;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
border-radius: 10upx; border-radius: 10rpx;
box-shadow: 0upx 5upx 20upx rgba(0, 0, 0, 0.05); box-shadow: 0rpx 5rpx 20rpx rgba(0, 0, 0, 0.05);
font-size: 36upx; font-size: 36rpx;
background-color: #f1f1f1; background-color: #f1f1f1;
color: 333; color: 333;
@ -295,14 +287,14 @@
} }
.num { .num {
margin-top: 10upx; margin-top: 20upx;
display: flex; display: flex;
justify-content: flex-end; justify-content: flex-end;
align-items: center; align-items: center;
.text { .text {
padding-right: 10upx; padding-right: 10upx;
font-size: 30upx; font-size: 40upx;
} }
.input { .input {
@ -315,7 +307,7 @@
input { input {
margin: 0 20upx; margin: 0 20upx;
height: 60upx; height: 60upx;
font-size: 30upx; font-size: 40upx;
color: #0083f5; color: #0083f5;
justify-content: flex-end; justify-content: flex-end;
align-items: center; align-items: center;
@ -395,4 +387,4 @@
} }
} }
} }
</style> </style>

@ -43,13 +43,16 @@
</view> </view>
</view> </view>
</view> </view>
<view class="width90 mart40 fcor666" v-if="videourl != ''">视频教程</view> <!-- <view class="width90 mart40 fcor666" v-if="videourl != ''">视频教程</view>
<view class="btnplay" @click="playvideo" v-if="videourl != ''">播放视频教学</view> <view class="btnplay" @click="playvideo" v-if="videourl != ''">播放视频教学</view>
<view class="width80 mart20 marb30" v-if="isplayvideo"> <view class="width80 mart20 marb30" v-if="isplayvideo">
<yy-video-player :auto-play="false" :url="imageUrl+imagedess1" :poster="poster" :show-back-btn="true"> <yy-video-player :auto-play="false" :url="imageUrl+imagedess1" :poster="poster" :show-back-btn="true">
</yy-video-player> </yy-video-player>
</view> -->
<view class="width90 mart40 fcor666" v-if="videourl != ''">临时通知</view>
<view class="alijus mart20 marb30" v-if="videourl != ''">
<image mode="widthFix" :src="imageUrl+imagedess2"></image>
</view> </view>
</view> </view>
</template> </template>
@ -72,14 +75,15 @@
imagewxUrl: app.globalData.imageWxImg, imagewxUrl: app.globalData.imageWxImg,
imgadres: 'noorder.png', imgadres: 'noorder.png',
imagedess1: '/CMS/html/11641540903873.mp4', imagedess1: '/CMS/html/11641540903873.mp4',
imagedess2: '/CMS/html/notice1.png',
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
isNoMoreData: false, isNoMoreData: false,
couponsDetails: '', couponsDetails: '',
salesEndTime: '', salesEndTime: '',
couponId: '', couponId: '',
videourl: '' ,// videourl: '', //
isplayvideo: false // isplayvideo: false //
} }
}, },
filters: { filters: {
@ -150,10 +154,10 @@
// uni.navigateTo({ // uni.navigateTo({
// url: '../../goods/goods?id='+e // url: '../../goods/goods?id='+e
// }); // });
}, },
// //
playvideo(){ playvideo() {
this.isplayvideo = true; this.isplayvideo = true;
} }
} }
} }
@ -226,16 +230,17 @@
background-color: red; background-color: red;
color: #FFFFFF; color: #FFFFFF;
border-radius: 0px; border-radius: 0px;
} }
.btnplay{
width: 120px; .btnplay {
text-align: center; width: 120px;
height: 40px; text-align: center;
line-height: 40px; height: 40px;
color: #FFFFFF; line-height: 40px;
background-color: #089bf5; color: #FFFFFF;
border-radius: 5px; background-color: #089bf5;
margin-left: 5%; border-radius: 5px;
margin-top: 20px; margin-left: 5%;
margin-top: 20px;
} }
</style> </style>

@ -18,12 +18,12 @@
<view class="width50 flright font15 fcor666 fontwig6 fotrt">今日流水</view> <view class="width50 flright font15 fcor666 fontwig6 fotrt">今日流水</view>
</view> </view>
</view> </view>
<view class="mart70"> <!-- <view class="mart70">
<QSTabs ref="tabs" :tabs="tabs" animationMode="line2" :current="current" @change="change" <QSTabs ref="tabs" :tabs="tabs" animationMode="line2" :current="current" @change="change"
activeColor="#089bf5" lineColor="#089bf5" minWidth="374"> activeColor="#089bf5" lineColor="#089bf5" minWidth="374">
</QSTabs> </QSTabs>
<view class="line1"></view> <view class="line1"></view>
</view> </view> -->
<!-- // --> <!-- // -->
<view class="width100" v-if="current == 0"> <view class="width100" v-if="current == 0">
@ -100,7 +100,7 @@
</view> </view>
</view> </view>
<!-- 兑换码库存 --> <!-- 兑换码库存 -->
<view class="width100" v-if="current == 1"> <view class="width100 mart80" v-if="current == 1">
<view class="width100 mart20"> <view class="width100 mart20">
<view class="width90 mart10 fcor333 font14 fontwig6 height22"> <view class="width90 mart10 fcor333 font14 fontwig6 height22">
<view class="promotion_xg flleft"></view> <view class="promotion_xg flleft"></view>
@ -267,11 +267,15 @@
couponList:[], // couponList:[], //
couponCont:[], // couponCont:[], //
tabs: ["销售码", "兑换码"], // tabs: ["销售码", "兑换码"], //
current: 0, // current: 1, //
} }
}, },
onLoad() { onLoad() {
this.getAgentCount(1); // this.getAgentCount(1);
// this.getAgentConvertCodeCount();
},
onShow() {
this.getAgentCount(1);
this.getAgentConvertCodeCount(); this.getAgentConvertCodeCount();
}, },
methods: { methods: {

@ -80,7 +80,7 @@
<radio :checked="paytype=='gonghuika'" @click="changeRiado()" color="#0083f5" /> <radio :checked="paytype=='gonghuika'" @click="changeRiado()" color="#0083f5" />
</view> </view>
</view> </view>
</view> </view>
<image src="../static/union5.jpg" class="width100 mart20 marb30" mode="widthFix"></image> <image src="../static/union5.jpg" class="width100 mart20 marb30" mode="widthFix"></image>
<view class="width100 height60"></view> <view class="width100 height60"></view>
<view class="footer"> <view class="footer">
@ -181,8 +181,8 @@
rechargeModel: '', rechargeModel: '',
agentKey: '', agentKey: '',
objectId: '', objectId: '',
OrderPreList: [], OrderPreList: [],
reType:'' // reType: '' //
}; };
}, },
@ -193,8 +193,8 @@
this.rechargeContent = options.rechargeContent; this.rechargeContent = options.rechargeContent;
this.rechargeModel = options.rechargeModel; this.rechargeModel = options.rechargeModel;
this.agentKey = options.agentKey; this.agentKey = options.agentKey;
this.objectId = options.objectId; this.objectId = options.objectId;
this.reType = options.rechargeType; this.reType = options.rechargeType;
}, },
onShow() { onShow() {
let that = this; let that = this;
@ -269,7 +269,7 @@
if (item.discountType == 1) { if (item.discountType == 1) {
// //
this.deductionPrice = item.discountPrice; this.deductionPrice = item.discountPrice;
this.payPrice = this.paytheprice- this.deductionPrice; this.payPrice = this.paytheprice - this.deductionPrice;
} else if (item.discountType == 2) { } else if (item.discountType == 2) {
// //
@ -319,8 +319,9 @@
} }
}); });
}, },
toPay() { toPay() {
if (this.paytype == '') { let that = this;
if (that.paytype == '') {
uni.showToast({ uni.showToast({
title: '请选择支付方式', title: '请选择支付方式',
icon: 'none', icon: 'none',
@ -328,36 +329,42 @@
}) })
return; return;
} }
uni.showLoading({ uni.requestSubscribeMessage({
title: '提交订单中...' tmplIds: ['ZO6kC3oJv0zj9QzL0htsF-mM9vAElcgPZEcUGglxsoU'],
}) success(res) {
let params = { uni.showLoading({
"memDiscountId": this.memDiscountId, title: '提交订单中...'
"orderPrice": this.orderPrice, })
"payPrice": this.payPrice,
"rechargeContent": this.rechargeContent,
"rechargeModel": this.rechargeModel,
"agentKey": this.agentKey,
"objectId": this.objectId,
"identificationCode": app.globalData.identificationCode
}
addOrderPay(params).then(res => {
if (res.return_code == '000000') {
uni.hideLoading();
this.orderId = res.return_data.id;
let params = { let params = {
"orderId": res.return_data.id, "memDiscountId": that.memDiscountId,
"openId": app.globalData.openId "orderPrice": that.orderPrice,
"payPrice": that.payPrice,
"rechargeContent": that.rechargeContent,
"rechargeModel": that.rechargeModel,
"agentKey": that.agentKey,
"objectId": that.objectId,
"identificationCode": app.globalData.identificationCode
} }
this.orderToUNionPay(params); addOrderPay(params).then(res => {
} else { if (res.return_code == '000000') {
uni.hideLoading(); uni.hideLoading();
uni.showToast({ that.orderId = res.return_data.id;
title: res.return_msg, let params = {
icon: 'none', "orderId": res.return_data.id,
duration: 2000 "openId": app.globalData.openId
}); }
} that.orderToUNionPay(params);
} else {
uni.hideLoading();
uni.showToast({
title: res.return_msg,
icon: 'none',
duration: 2000
});
}
})
},
fail(res) {},
}) })
}, },
// //
@ -432,21 +439,21 @@
}) })
} }
}) })
} else if (that.paytype == 'jinbi') { } else if (that.paytype == 'jinbi') {
if (that.user.gold < that.payPrice * 100) { if (that.user.gold < that.payPrice * 100) {
uni.showToast({ uni.showToast({
icon: 'none', icon: 'none',
title: '积分不足', title: '积分不足',
duration: 2000, duration: 2000,
success() { success() {
setTimeout(() => { setTimeout(() => {
uni.navigateTo({ uni.navigateTo({
url: '../../pages/user/deposit/deposit' url: '../../pages/user/deposit/deposit'
}) })
}, 1000) }, 1000)
} }
}); });
return; return;
} }
if (!that.user.isSetPayPwd) { if (!that.user.isSetPayPwd) {
uni.navigateTo({ uni.navigateTo({
@ -455,14 +462,14 @@
return; return;
} }
that.$refs.paymentPassword.modalFun('show'); that.$refs.paymentPassword.modalFun('show');
} else if (that.paytype == 'gonghuika') { } else if (that.paytype == 'gonghuika') {
if (that.tongCardPrice < that.payPrice) { if (that.tongCardPrice < that.payPrice) {
uni.showToast({ uni.showToast({
icon: 'none', icon: 'none',
title: '工会卡余额不足', title: '工会卡余额不足',
duration: 2000, duration: 2000,
}); });
return; return;
} }
if (!that.user.isSetPayPwd) { if (!that.user.isSetPayPwd) {
uni.navigateTo({ uni.navigateTo({
@ -541,16 +548,16 @@
"orderId": this.orderId, "orderId": this.orderId,
"cardNo": this.user.hltCardNo.cardNo, "cardNo": this.user.hltCardNo.cardNo,
"password": this.PaymentPassword "password": this.PaymentPassword
} }
hltUnionCardPayUnion(params).then(res => { hltUnionCardPayUnion(params).then(res => {
uni.hideLoading(); uni.hideLoading();
if (res.return_code == '000000') { if (res.return_code == '000000') {
uni.showToast({ uni.showToast({
title: '支付成功' title: '支付成功'
}) })
uni.reLaunch({ uni.reLaunch({
url: '../Phone-recharge-details/Phone-recharge-details?id=' + url: '../Phone-recharge-details/Phone-recharge-details?id=' +
this.orderId this.orderId
}) })
return; return;
} }
@ -562,8 +569,8 @@
} }
uni.showToast({ uni.showToast({
title: res.return_msg, title: res.return_msg,
icon: 'none', icon: 'none',
duration:2000 duration: 2000
}) })
}) })

Loading…
Cancel
Save