diff --git a/high-unionPay/App.vue b/high-unionPay/App.vue
index 65c36aa..119003f 100644
--- a/high-unionPay/App.vue
+++ b/high-unionPay/App.vue
@@ -5,23 +5,23 @@
// brestUrl: 'http://192.168.3.4:9302/brest',
// imgUrl: 'https://192.168.3.4:9301/filesystem/',
//正式
- url: 'https://hsg.dctpay.com/crest',
- v1url:'https://hsg.dctpay.com/v1',
- orderurl:' https://hsg.dctpay.com/order',
- userurl:'https://hsg.dctpay.com/user',
- imgUrl: 'https://hsg.dctpay.com/filesystem/',
- brestUrl: 'https://hsg.dctpay.com/brest',
- imageWxImg: 'https://hsg.dctpay.com/filesystem/wxApplets/',
- imageqrImg: 'https://hsg.dctpay.com/filesystem/temporary/',
+ // url: 'https://hsg.dctpay.com/crest',
+ // v1url:'https://hsg.dctpay.com/v1',
+ // orderurl:' https://hsg.dctpay.com/order',
+ // userurl:'https://hsg.dctpay.com/user',
+ // imgUrl: 'https://hsg.dctpay.com/filesystem/',
+ // brestUrl: 'https://hsg.dctpay.com/brest',
+ // imageWxImg: 'https://hsg.dctpay.com/filesystem/wxApplets/',
+ // imageqrImg: 'https://hsg.dctpay.com/filesystem/temporary/',
//测试
- // url: 'https://hsgcs.dctpay.com/crest',
- // v1url: 'https://hsgcs.dctpay.com/v1',
- // orderurl:'https://hsgcs.dctpay.com/order',
- // userurl:'https://hsgcs.dctpay.com/user',
- // brestUrl: 'https://hsgcs.dctpay.com/brest',
- // imgUrl: 'https://hsgcs.dctpay.com/filesystem/',
- // imageWxImg: 'https://hsgcs.dctpay.com/filesystem/wxApplets/',
- // imageqrImg: 'https://hsgcs.dctpay.com/filesystem/temporary/',
+ url: 'https://hsgcs.dctpay.com/crest',
+ v1url: 'https://hsgcs.dctpay.com/v1',
+ orderurl:'https://hsgcs.dctpay.com/order',
+ userurl:'https://hsgcs.dctpay.com/user',
+ brestUrl: 'https://hsgcs.dctpay.com/brest',
+ imgUrl: 'https://hsgcs.dctpay.com/filesystem/',
+ imageWxImg: 'https://hsgcs.dctpay.com/filesystem/wxApplets/',
+ imageqrImg: 'https://hsgcs.dctpay.com/filesystem/temporary/',
userInfo: "",
brestUserInfo: '',
openId: '',
@@ -60,5 +60,14 @@
diff --git a/high-unionPay/Utils/Api.js b/high-unionPay/Utils/Api.js
index 4098e6c..e6709c9 100644
--- a/high-unionPay/Utils/Api.js
+++ b/high-unionPay/Utils/Api.js
@@ -495,6 +495,10 @@ export const sendUserPass = params => {
export const getUserOrderListhuafei = params => {
return POST('GET', `${base}/outRechargeOrder/getUserOrderList`, params).then(res => res.data);
}
+// 话费充值数据字典
+export const findSecConfigByType = params => {
+ return POST('GET', `${base}/common/findSecConfigByType`, params).then(res => res.data);
+}
//肯德基返利
export const getRebateIntegral = params => {
diff --git a/high-unionPay/pages/goods/refuel-confirm/refuel-confirm.vue b/high-unionPay/pages/goods/refuel-confirm/refuel-confirm.vue
index bb4915b..8ced636 100644
--- a/high-unionPay/pages/goods/refuel-confirm/refuel-confirm.vue
+++ b/high-unionPay/pages/goods/refuel-confirm/refuel-confirm.vue
@@ -202,7 +202,7 @@
优惠券选择
+ @click="radioChanges(items)">
@@ -396,9 +396,9 @@
this.$refs.popup.show();
},
//选择优惠券
- radioChanges(item, items) {
+ radioChanges(item) {
this.rechangeload();
- if (this.memDiscountId == items.id) { // 如果已经选中,则取消选中
+ if (this.memDiscountId == item.id) { // 如果已经选中,则取消选中
this.memDiscountId = '';
this.deductionPrice = '0.00';
this.priceCaluc(this.orderList.payPrice);
@@ -406,7 +406,7 @@
} else { // 否则进行选中赋值
if (item.discountType == 1) {
if (this.orderPrice >= item.discountCondition) {
- this.memDiscountId = items.id;
+ this.memDiscountId = item.id;
//满减价格
this.deductionPrice = item.discountPrice;
let oldprice = this.orderPrice - this.deductionPrice;
@@ -420,14 +420,14 @@
}
}
if (item.discountType == 2) {
- this.memDiscountId = items.id;
+ this.memDiscountId = item.id;
//抵扣价格
this.deductionPrice = item.discountPrice;
let oldprice = this.orderPrice - this.deductionPrice;
this.priceCaluc(oldprice);
}
if (item.discountType == 3) {
- this.memDiscountId = items.id;
+ this.memDiscountId = item.id;
// 打折
this.deductionPrice = this.orderPrice - (this.orderPrice * item.discountPrice);
let oldprice = parseFloat(this.orderPrice * item.discountPrice).toFixed(2);
diff --git a/high-unionPay/pages/tabBar/home/home.vue b/high-unionPay/pages/tabBar/home/home.vue
index 01dbcf2..659f79a 100644
--- a/high-unionPay/pages/tabBar/home/home.vue
+++ b/high-unionPay/pages/tabBar/home/home.vue
@@ -662,8 +662,7 @@
.spcarea {
width: 31%;
- margin-right: auto;
- margin-left: auto;
+ margin-left: 2%;
border-radius: 10px 10px 0px 0px;
padding-bottom: 10px;
}
diff --git a/high-unionPay/pages/unionPay/recharge-centre/recharge-centre.vue b/high-unionPay/pages/unionPay/recharge-centre/recharge-centre.vue
index b2af7a7..2792996 100644
--- a/high-unionPay/pages/unionPay/recharge-centre/recharge-centre.vue
+++ b/high-unionPay/pages/unionPay/recharge-centre/recharge-centre.vue
@@ -1,154 +1,269 @@
-
+
+
+
+
+
+ {{notice}}
+
+
+
+
-
-
-
- 选择金额
-
-
-
- {{item.rechargePrice}}元
- {{item.payPrice}}元
- 已售空
+
+
+
+
+
+
+
+
+
+
+
+
+ 话费特惠充值
+
+
+
+
+
+
+ {{item.rechargePrice}}元
+ 售{{item.payPrice}}元
+ 已售空
+ {{explainReceiptTime}}
+
+
+
+
+
+
+
+ ¥
+ {{inputAmount}}
+ 立即充值
+
+
-
- 充值说明:
-
-
-
-
-
-
-
- 应付: {{inputAmount}}元
- 立即购买
+
+
+
+
+
+
diff --git a/high-unionPay/static/img/tongz.png b/high-unionPay/static/img/tongz.png
new file mode 100644
index 0000000..b712ee9
Binary files /dev/null and b/high-unionPay/static/img/tongz.png differ
diff --git a/high-unionPay/uni.scss b/high-unionPay/uni.scss
index cfcf448..92684b3 100644
--- a/high-unionPay/uni.scss
+++ b/high-unionPay/uni.scss
@@ -296,6 +296,9 @@ $uni-font-size-paragraph:30upx;
background: linear-gradient(to bottom, #3da7e7, #6fbdee);
}
+.backcorlf5{
+ background: linear-gradient(to bottom, #3267f6, #f5f5f5);
+}
.backcorf06{
background-color: #0083f5;
@@ -552,6 +555,10 @@ $uni-font-size-paragraph:30upx;
.height25 {
height: 25px;
}
+.height25l {
+ height: 25px;
+ line-height: 25px;
+}
.height50 {