diff --git a/pages/tabBar/home/home.vue b/pages/tabBar/home/home.vue
index 143e696..7f3d90c 100644
--- a/pages/tabBar/home/home.vue
+++ b/pages/tabBar/home/home.vue
@@ -305,9 +305,9 @@
})
that.city = '重庆市';
app.globalData.cityName = '重庆市';
- app.globalData.cityId = '500000';
- that.getCmsAactibity();
+ app.globalData.cityId = '500000';
that.getCmsContentcmsContent();
+ that.getCmsAactibity();
}
);
// #endif
diff --git a/pages/tabBar/user/user.vue b/pages/tabBar/user/user.vue
index deca1b6..5149ac5 100644
--- a/pages/tabBar/user/user.vue
+++ b/pages/tabBar/user/user.vue
@@ -89,7 +89,7 @@
等待付款
- 剩余时间: {{countdownm}}:{{countdowns}}
+ 剩余时间: {{countdownm}}分钟
去支付
@@ -451,7 +451,7 @@
lefth = Math.floor((lefttime / (1000 * 60 * 60) % 24) + leftd * 24) < 10 ? "0" + Math.floor((lefttime /
(1000 * 60 * 60) % 24) + leftd * 24) : Math.floor((lefttime / (1000 * 60 * 60) % 24) + leftd *
24), //计算小时数
- leftm = Math.floor(lefttime / (1000 * 60) % 60) < 10 ? "0" + Math.floor(lefttime / (1000 * 60) % 60) :
+ leftm = Math.floor(lefttime / (1000 * 60) % 60) < 10 ? + Math.floor(lefttime / (1000 * 60) % 60) :
Math.floor(lefttime / (1000 * 60) % 60), //计算分钟数
lefts = Math.floor(lefttime / 1000 % 60) < 10 ? "0" + Math.floor(lefttime / 1000 % 60) : Math.floor(
lefttime / 1000 % 60); //计算秒数
diff --git a/pages/user/deposit/deposit.vue b/pages/user/deposit/deposit.vue
index d57a2aa..8ba2d3f 100644
--- a/pages/user/deposit/deposit.vue
+++ b/pages/user/deposit/deposit.vue
@@ -36,8 +36,8 @@
选择支付方式
-
-
+
+
@@ -45,7 +45,7 @@
微信支付
-
+
@@ -66,7 +66,8 @@
let app = getApp()
import {
create,
- wechatPay
+ wechatPay,
+ getThirdPartyByDetail
} from "../../../Utils/Api.js";
// #ifdef H5
var jweixin = require('jweixin-module');
@@ -76,17 +77,40 @@
return {
inputAmount: '', //金额
amountList: [100, 200, 300, 500, 800, 1000], //预设3个可选快捷金额
- paytype: 'wxpay', //支付类型
+ paytype: '2', //支付类型
user: "",
imagewxUrl: app.globalData.imageWxImg,
- imgadres: 'wxpay.png'
+ imgadres: 'wxpay.png',
+ paytypeList: [] //支付方式
};
},
onLoad() {
this.user = app.globalData.userInfo
},
+ onShow() {
+ this.getThirdPartyByDetail();
+ },
methods: {
-
+ //查询支付方式
+ getThirdPartyByDetail() {
+ // #ifdef H5
+ this.showType = 2;
+ // #endif
+ // #ifdef MP
+ this.showType = 1;
+ // #endif
+ let datas = {
+ platformId: this.showType,
+ "companyId": app.globalData.companyId,
+ productType: 4
+ }
+ getThirdPartyByDetail(datas).then(res => {
+ if (res.return_code == '000000') {
+ this.paytypeList = res.return_data.productPayType.split(',');
+ this.paytypeList = this.paytypeList.slice(0, this.paytypeList.length - 1);
+ }
+ });
+ },
select(amount) {
this.inputAmount = amount;
},
@@ -115,16 +139,16 @@
uni.showLoading({
title: '正在提交订单...'
})
- let goods = {
- "childOrderList": [{
- "goodsId": app.globalData.userInfo.id,
- "goodsPrice": this.inputAmount,
- "goodsType": 2,
- "saleCount": 1,
- }],
- "promoteCode": app.globalData.identificationCode
- }
-
+ let goods = {
+ "childOrderList": [{
+ "goodsId": app.globalData.userInfo.id,
+ "goodsPrice": this.inputAmount,
+ "goodsType": 2,
+ "saleCount": 1,
+ }],
+ "promoteCode": app.globalData.identificationCode
+ }
+
create(goods).then(res => {
uni.hideLoading();
if (res.return_code == '000000') {
@@ -139,7 +163,7 @@
// #ifdef MP
let params = {
"orderNo": res.return_data.orderNo,
- "openId": app.globalData.openId,
+ "openId": app.globalData.openId,
"openIdType": 1
}
// #endif
@@ -187,9 +211,9 @@
} else {
uni.showToast({
- title: res.return_msg,
- duration:2000,
- icon:'none'
+ title: res.return_msg,
+ duration: 2000,
+ icon: 'none'
});
}
})
@@ -297,6 +321,7 @@
font-size: 36upx;
color: #089bf5;
background-color: #f1f1f1;
+
&.on {
background-color: #089bf5;
color: #ffffff;
diff --git a/pages/user/order_details/order_details.vue b/pages/user/order_details/order_details.vue
index 3cddd1a..ac2009a 100644
--- a/pages/user/order_details/order_details.vue
+++ b/pages/user/order_details/order_details.vue
@@ -96,24 +96,23 @@
加油金额
¥{{oilList.gasRefuelPrice}}
-
-
- 联系人
- ¥{{materialData.user}}
-
-
- 联系电话
- ¥{{materialData.phone}}
-
-
- 联系地址
- ¥{{materialData.address}}
-
-
+
+
+ 联系人
+ ¥{{materialData.user}}
+
+
+ 联系电话
+ ¥{{materialData.phone}}
+
+
+ 联系地址
+ ¥{{materialData.address}}
+
-
+
优惠信息
商品优惠
@@ -127,17 +126,21 @@
积分抵扣
-¥{{recinfo.payGold / 100}}
-
-
-
+
+
+
-
-
+
+
+
+
+
+
+
+
-
-
加油实付 ￥{{recinfo.payRealPrice}}
@@ -738,10 +741,11 @@
// '&paytype=' + payTypes + '&orderId=' + this.recinfo.id + '&couponId=' + this.recinfo
// .highChildOrderList[0].goodsId + '&typeaout=' + this.recinfo.highChildOrderList[0].ext1 +
// '&goodsType=' + this.recinfo.highChildOrderList[0].goodsType
- // })
- uni.redirectTo({
- url: '/qianzhu-KFC/payment-method/payment-method?orderId=' + this.recinfo.orderNo + '&amount=' + this.recinfo
- .payPrice + '&productType=' + this.recinfo.productType
+ // })
+ uni.redirectTo({
+ url: '/qianzhu-KFC/payment-method/payment-method?orderId=' + this.recinfo.orderNo +
+ '&amount=' + this.recinfo
+ .payPrice + '&productType=' + this.recinfo.productType
})
},
}
@@ -1051,22 +1055,28 @@
border-radius: 25px;
}
+ .cro_left_top,
+ .cro_right_top,
+ .cro_left_bottom,
+ .cro_right_bottom {
+ width: 20rpx;
+ height: 20rpx;
+ background: #f0f0f0;
+ }
- .borderleft {
- background-image: -webkit-radial-gradient(10px at bottom left, #f0f0f0 10px, #ffffff);
+ .cro_left_top {
+ border-radius: 0px 0px 20rpx 0px;
}
- .bordertopleft {
- background-image: -webkit-radial-gradient(10px at top left, #f0f0f0 10px, #ffffff);
+ .cro_right_top {
+ border-radius: 0px 0px 0px 20rpx;
}
- .concont {
- border-radius: 8px 8px 0 0;
- background-image: -webkit-radial-gradient(10px at bottom right, #f0f0f0 10px, #ffffff);
+ .cro_left_bottom {
+ border-radius: 0px 20rpx 0px 0px;
}
- .gooddes {
- border-radius: 0 0 8px 8px;
- background-image: -webkit-radial-gradient(10px at top right, #f0f0f0 10px, #ffffff);
+ .cro_right_bottom {
+ border-radius: 20rpx 0px 0px 0px;
}
-
+
diff --git a/qianzhu-KFC/order-details/order-details.vue b/qianzhu-KFC/order-details/order-details.vue
index 353467b..29d1a09 100644
--- a/qianzhu-KFC/order-details/order-details.vue
+++ b/qianzhu-KFC/order-details/order-details.vue
@@ -64,7 +64,7 @@
v-for="(item,index) in recinfo.object.orderItems" :key='index'>{{item.code}}
-
+
{{typeText[orderList.orderStatus]}}
-
+
充值明细
@@ -101,15 +101,20 @@
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
商品小计
@@ -344,7 +349,8 @@
//跳转支付
jumppay() {
uni.redirectTo({
- url: '/qianzhu-KFC/payment-method/payment-method?orderId=' + this.orderList. orderNo+ '&amount=' +
+ url: '/qianzhu-KFC/payment-method/payment-method?orderId=' + this.orderList.orderNo +
+ '&amount=' +
this.orderList.payPrice + '&productType=' + this.orderList.productType
})
},
@@ -449,24 +455,32 @@
background: linear-gradient(to bottom, #3da7e7, #e8eff4);
}
- .borderleft {
- background-image: radial-gradient(10px at bottom left, #f0f0f0 10px, #ffffff);
+ .cro_left_top,
+ .cro_right_top,
+ .cro_left_bottom,
+ .cro_right_bottom {
+ width: 20rpx;
+ height: 20rpx;
+ background: #f0f0f0;
}
- .bordertopleft {
- background-image: radial-gradient(10px at top left, #f0f0f0 10px, #ffffff);
+ .cro_left_top {
+ border-radius: 0px 0px 20rpx 0px;
}
- .concont {
- border-radius: 12px 12px 0 0;
- background-image: radial-gradient(10px at bottom right, #f0f0f0 10px, #ffffff);
+ .cro_right_top {
+ border-radius: 0px 0px 0px 20rpx;
}
- .gooddes {
- border-radius: 0 0 12px 12px;
- background-image: radial-gradient(10px at top right, #f0f0f0 10px, #ffffff);
+ .cro_left_bottom {
+ border-radius: 0px 20rpx 0px 0px;
}
+ .cro_right_bottom {
+ border-radius: 20rpx 0px 0px 0px;
+ }
+
+
.footbtn {
bottom: 0px;
position: fixed;
diff --git a/subPages/coupon-comfirmation/coupon-comfirmation.vue b/subPages/coupon-comfirmation/coupon-comfirmation.vue
index 50320d9..391513b 100644
--- a/subPages/coupon-comfirmation/coupon-comfirmation.vue
+++ b/subPages/coupon-comfirmation/coupon-comfirmation.vue
@@ -23,13 +23,13 @@
-
-
-
- 邀请码
-
-
-
+
+
+
+ 邀请码
+
+
+
@@ -47,24 +47,26 @@
-->
-
-
-
- 微信支付
-
-
-
-
-
-
-
-
- 汇联通工会卡可用余额: {{tongCardPrice}}元
+
+
+
+
+ 微信支付
+
+
+
+
-
-
+
+
+
+ 汇联通工会卡可用余额: {{tongCardPrice}}元
+
+
+
+
@@ -102,7 +104,8 @@
orderToGoldPay,
findUser,
cardPay,
- getHuiLianTongCardBalance
+ getHuiLianTongCardBalance,
+ getThirdPartyByDetail
} from '../../Utils/Api.js';
import ssPaymentPassword from '../../components/sanshui-payment-password'
let app = getApp();
@@ -125,23 +128,24 @@
radioStatus: true,
memDiscountId: '',
user: '',
- paytype: '',
+ paytype: '2',
PaymentPassword: '',
orderId: '',
tongCardPrice: 0,
storeId: '',
- isDiscont: false,
- identificationCode: '' //渠道商
+ isDiscont: false,
+ identificationCode: '', //渠道商
+ paytypeList: [] //支付方式
};
},
onLoad(option) {
- this.couponId = option.id;
- // #ifdef H5
- this.identificationCode = app.globalData.staffCode;
- // #endif
- // #ifdef MP
- this.identificationCode = app.globalData.identificationCode;
+ this.couponId = option.id;
+ // #ifdef H5
+ this.identificationCode = app.globalData.staffCode;
+ // #endif
+ // #ifdef MP
+ this.identificationCode = app.globalData.identificationCode;
// #endif
this.getDiscountPackageDetail();
},
@@ -149,7 +153,8 @@
let that = this;
that.paytype = '';
that.user = app.globalData.userInfo;
- that.findUser();
+ that.findUser();
+ that.getThirdPartyByDetail();
},
onHide() {
@@ -179,15 +184,35 @@
}
},
methods: {
+ //查询支付方式
+ getThirdPartyByDetail() {
+ // #ifdef H5
+ this.showType = 2;
+ // #endif
+ // #ifdef MP
+ this.showType = 1;
+ // #endif
+ let datas = {
+ platformId: this.showType,
+ "companyId": app.globalData.companyId,
+ productType: 7
+ }
+ getThirdPartyByDetail(datas).then(res => {
+ if (res.return_code == '000000') {
+ this.paytypeList = res.return_data.productPayType.split(',');
+ this.paytypeList = this.paytypeList.slice(0, this.paytypeList.length - 1);
+ }
+ });
+ },
//查询积分
findUser() {
let params;
findUser(params).then(res => {
if (res.return_code == '000000') {
app.globalData.userInfo = res.return_data;
- this.user = res.return_data;
- if(res.return_data.hltCardNo != undefined){
- this.getHuiLianTongCardBalance();
+ this.user = res.return_data;
+ if (res.return_data.hltCardNo != undefined) {
+ this.getHuiLianTongCardBalance();
}
uni.setStorage({
key: "user",
@@ -333,7 +358,7 @@
//获取订单数据
wechatPay(item) {
let that = this;
- if (that.paytype == 'weixin') {
+ if (that.paytype == '2') {
// #ifdef H5
let params = {
"orderNo": item.orderNo,
@@ -392,7 +417,7 @@
})
}
})
- } else if (that.paytype == 'gonghuika') {
+ } else if (that.paytype == '3') {
if (that.tongCardPrice < that.paytheprice) {
uni.showToast({
icon: 'none',
@@ -444,7 +469,7 @@
uni.showLoading({
title: '支付中...'
})
-
+
let params = {
"orderNo": this.orderId,
"cardNo": this.user.hltCardNo.cardNo,
diff --git a/subPages/trade-union-recharge/trade-union-recharge.vue b/subPages/trade-union-recharge/trade-union-recharge.vue
index 3d8e408..b0bd326 100644
--- a/subPages/trade-union-recharge/trade-union-recharge.vue
+++ b/subPages/trade-union-recharge/trade-union-recharge.vue
@@ -37,8 +37,8 @@
选择支付方式
-
-
+
+
@@ -46,7 +46,7 @@
微信支付
-
+
@@ -68,7 +68,8 @@
import {
create,
wechatPay,
- getHuiLianTongCardBalance
+ getHuiLianTongCardBalance,
+ getThirdPartyByDetail
} from "../../Utils/Api.js";
// #ifdef H5
var jweixin = require('jweixin-module');
@@ -78,13 +79,14 @@
return {
inputAmount: '', //金额
amountList: [50, 100, 150], //预设3个可选快捷金额
- paytype: 'wxpay', //支付类型
+ paytype: '2', //支付类型
user: "",
imagewxUrl: app.globalData.imageWxImg,
imgadres: 'wxpay.png',
tongCardPrice: 0,
cardId: '', //工会卡号
- typevas: ''
+ typevas: '',
+ paytypeList: [] //支付方式
};
},
onLoad(options) {
@@ -92,11 +94,32 @@
this.typevas = options.RechargeType;
},
onShow() {
- this.user = app.globalData.userInfo;
+ this.user = app.globalData.userInfo;
+ this.getThirdPartyByDetail();
},
methods: {
select(amount) {
this.inputAmount = amount;
+ },
+ //查询支付方式
+ getThirdPartyByDetail() {
+ // #ifdef H5
+ this.showType = 2;
+ // #endif
+ // #ifdef MP
+ this.showType = 1;
+ // #endif
+ let datas = {
+ platformId: this.showType,
+ "companyId": app.globalData.companyId,
+ productType: 8
+ }
+ getThirdPartyByDetail(datas).then(res => {
+ if (res.return_code == '000000') {
+ this.paytypeList = res.return_data.productPayType.split(',');
+ this.paytypeList = this.paytypeList.slice(0, this.paytypeList.length - 1);
+ }
+ });
},
doDeposit() {
if (!this.cardId) {