yangjie
/
high-mini
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.修改充值金额的值

Browse Source 
2.修改其他问题
yj-dev
杨杰 3 years ago
parent 8f606ffd1c
commit 3e4e4f78b7
6 changed files with 156 additions and 131 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 27
      pages/order/confirmation.vue
  2. 8
      pages/tabBar/user/user.vue
  3. 40
      pages/user/deposit/deposit.vue
  4. 17
      pages/user/mineCouponsDestails/mineCouponsDestails.vue
  5. 12
      pages/user/minePromotion/minePromotion.vue
  6. 73
      subPages/unionComfirmation/unionComfirmation.vue

27
pages/order/confirmation.vue
Unescape View File

@ -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>
@ -228,7 +228,7 @@
tongCardPrice: 0, tongCardPrice: 0,
storeId: '', storeId: '',
isDiscont: false, isDiscont: false,
coupondiscountid:'' coupondiscountid: ''
}; };
}, },
@ -732,6 +732,12 @@
}); });
}); });
}, },
//跳转积分充值
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;

8
pages/tabBar/user/user.vue
Unescape View File

@ -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>

40
pages/user/deposit/deposit.vue
Unescape View File

@ -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字段均为小写。但最新版的支付后台生成签名使用的timeStamp字段名需大写其中的S字符 .timeStamp, // 支付签名时间戳，注意微信jssdk中的所有使用timestamp字段均为小写。但最新版的支付后台生成签名使用的timeStamp字段名需大写其中的S字符
nonceStr: self.return_data.nonceStr, // 支付签名随机串，不长于 32 位 nonceStr: self.return_data.nonceStr, // 支付签名随机串，不长于 32 位
package: self.return_data package: self.return_data
.package, // 统一支付接口返回的prepay_id参数值，提交格式如：prepay_id=***） .package, // 统一支付接口返回的prepay_id参数值，提交格式如：prepay_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;

17
pages/user/mineCouponsDestails/mineCouponsDestails.vue
Unescape View File

@ -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: {
@ -152,7 +156,7 @@
// }); // });
}, },
//播放视频 //播放视频
playvideo(){ playvideo() {
this.isplayvideo = true; this.isplayvideo = true;
} }
} }
@ -227,7 +231,8 @@
color: #FFFFFF; color: #FFFFFF;
border-radius: 0px; border-radius: 0px;
} }
.btnplay{
.btnplay {
width: 120px; width: 120px;
text-align: center; text-align: center;
height: 40px; height: 40px;

12
pages/user/minePromotion/minePromotion.vue
Unescape View File

@ -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,10 +267,14 @@
couponList:[], //兑换码数据 couponList:[], //兑换码数据
couponCont:[], //卡券数据 couponCont:[], //卡券数据
tabs: ["销售码", "兑换码"], //切换操作 tabs: ["销售码", "兑换码"], //切换操作
current: 0, //默认 current: 1, //默认
} }
}, },
onLoad() { onLoad() {
// this.getAgentCount(1);
// this.getAgentConvertCodeCount();
},
onShow() {
this.getAgentCount(1); this.getAgentCount(1);
this.getAgentConvertCodeCount(); this.getAgentConvertCodeCount();
}, },

73
subPages/unionComfirmation/unionComfirmation.vue
Unescape View File

@ -182,7 +182,7 @@
agentKey: '', agentKey: '',
objectId: '', objectId: '',
OrderPreList: [], OrderPreList: [],
reType:'' //充值类型 reType: '' //充值类型
}; };
}, },
@ -194,7 +194,7 @@
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) {
//抵扣价格 //抵扣价格
@ -320,7 +320,8 @@
}); });
}, },
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) {},
}) })
}, },
//获取选择支付方式 //获取选择支付方式
@ -563,7 +570,7 @@
uni.showToast({ uni.showToast({
title: res.return_msg, title: res.return_msg,
icon: 'none', icon: 'none',
duration:2000 duration: 2000
}) })
}) })

Write Preview
Loading…
Cancel
Save