diff --git a/high-unionPay/App.vue b/high-unionPay/App.vue
index 0ded058..b9d974e 100644
--- a/high-unionPay/App.vue
+++ b/high-unionPay/App.vue
@@ -5,15 +5,15 @@
// brestUrl: 'http://192.168.3.4:9302/brest',
// imgUrl: 'https://192.168.3.4:9301/filesystem/',
//正式
- // url: 'https://hsg.dctpay.com/crest',
- // imgUrl: 'https://hsg.dctpay.com/filesystem/',
- // brestUrl : 'https://hsg.dctpay.com/brest',
- // imageWxImg:'https://hsg.dctpay.com/filesystem/wxApplets/',
+ url: 'https://hsg.dctpay.com/crest',
+ imgUrl: 'https://hsg.dctpay.com/filesystem/',
+ brestUrl : 'https://hsg.dctpay.com/brest',
+ imageWxImg:'https://hsg.dctpay.com/filesystem/wxApplets/',
//测试
- url: 'https://hsgcs.dctpay.com/crest',
- brestUrl : 'https://hsgcs.dctpay.com/brest',
- imgUrl: 'https://hsgcs.dctpay.com/filesystem/',
- imageWxImg:'https://hsgcs.dctpay.com/filesystem/wxApplets/',
+ // url: 'https://hsgcs.dctpay.com/crest',
+ // brestUrl : 'https://hsgcs.dctpay.com/brest',
+ // imgUrl: 'https://hsgcs.dctpay.com/filesystem/',
+ // imageWxImg:'https://hsgcs.dctpay.com/filesystem/wxApplets/',
userInfo: "",
brestUserInfo : '',
openId: '',
diff --git a/high-unionPay/pages/goods/goods-list/goods-list.vue b/high-unionPay/pages/goods/goods-list/goods-list.vue
index e06335b..b56c1c4 100644
--- a/high-unionPay/pages/goods/goods-list/goods-list.vue
+++ b/high-unionPay/pages/goods/goods-list/goods-list.vue
@@ -135,6 +135,7 @@
let pagenum = this.pageNum;
let params = {
regionId: app.globalData.cityId,
+ // regionId: '510000',
pageNum: pagenum,
pageSize: this.pageSize,
displayArea: this.typeId,
diff --git a/high-unionPay/pages/order/confirmation.vue b/high-unionPay/pages/order/confirmation.vue
index c56c5d9..cae6f5a 100644
--- a/high-unionPay/pages/order/confirmation.vue
+++ b/high-unionPay/pages/order/confirmation.vue
@@ -73,7 +73,7 @@
-
+
银联支付
diff --git a/high-unionPay/pages/pay/payment/payment.vue b/high-unionPay/pages/pay/payment/payment.vue
index 25b60a5..b5c64d8 100644
--- a/high-unionPay/pages/pay/payment/payment.vue
+++ b/high-unionPay/pages/pay/payment/payment.vue
@@ -18,7 +18,7 @@
-
+
-
+
银联支付
@@ -306,8 +306,8 @@
align-items: center;
image {
- width: 80upx;
- height: 80upx;
+ width: 60upx;
+ height: 60upx;
}
}
diff --git a/high-unionPay/pages/tabBar/user/user.vue b/high-unionPay/pages/tabBar/user/user.vue
index adf78c7..bcbfd5a 100644
--- a/high-unionPay/pages/tabBar/user/user.vue
+++ b/high-unionPay/pages/tabBar/user/user.vue
@@ -16,8 +16,8 @@
请授权登录
{{user.name}}
- 积分: 0
- 积分: {{user.gold}} 个
+
+
@@ -77,9 +77,9 @@
-->
-
-
@@ -115,7 +115,8 @@
-
+
+
{{row.text}}
@@ -200,11 +201,11 @@
// text: '充值记录',
// img: 'user/mingxi.png'
// },
- {
- url: '/pages/goods/recording/recording?id=2',
- text: '消费记录',
- img: 'user/quan.png'
- },
+ // {
+ // url: '/pages/goods/recording/recording?id=2',
+ // text: '消费记录',
+ // img: 'user/quan.png'
+ // },
{
url: '/pages/user/mineCoupons/mineCoupons',
text: '我的卡券',
@@ -218,21 +219,22 @@
],
// 推广列表
mytgbarList: [
- // {
- // url: '',
- // text: '客服',
- // img: 'user/kefu.png'
- // },
- {
- url: '../../login/login?id=1',
- text: '商户入口',
- img: 'user/point.png'
- },
{
- url: '../../login/login?id=2',
- text: '我的推广',
- img: 'user/renw.png'
+ url: '',
+ text: '客服',
+ img: 'user/kefu.png'
}
+ // ,
+ // {
+ // url: '../../login/login?id=1',
+ // text: '商户入口',
+ // img: 'user/point.png'
+ // },
+ // {
+ // url: '../../login/login?id=2',
+ // text: '我的推广',
+ // img: 'user/renw.png'
+ // }
// ,
// {
@@ -280,11 +282,11 @@
if (!app.globalData.userInfo.isSetPayPwd) {
this.czList = [
- // {
- // url: '../../user/cardDes/cardDes',
- // text: '工会卡',
- // img: '../../../static/img/ghkpay.png'
- // },
+ {
+ url: '',
+ text: '客服',
+ img: 'user/kefu.png'
+ },
{
url: '../../login/updatePas/updatePas',
text: '设置密码',
@@ -295,15 +297,17 @@
}
// '../../user/unionCard/unionCard'
this.czList = [
- // {
- // url: '../../user/cardDes/cardDes',
- // text: '工会卡',
- // img: '../../../static/img/ghkpay.png'
- // },
+ {
+ url: '',
+ text: '客服',
+ img: 'user/kefu.png',
+ type:1
+ },
{
url: '../../login/updatePas/resetPas',
text: '修改密码',
- img: '../../../static/img/pas.png'
+ img: '../../../static/img/pas.png',
+ type:2
},
]
},
@@ -416,6 +420,11 @@
uni.navigateTo({
url: url
})
+ }else{
+ uni.showModal({
+ title: '客服',
+ content: '4006780738'
+ })
}
}
diff --git a/high-unionPay/pages/user/order_details/order_details.vue b/high-unionPay/pages/user/order_details/order_details.vue
index 7bbef31..e1e0ea6 100644
--- a/high-unionPay/pages/user/order_details/order_details.vue
+++ b/high-unionPay/pages/user/order_details/order_details.vue
@@ -61,7 +61,7 @@
{{recinfo.paySerialNo}}
-
+
订单总额 :
diff --git a/high-unionPay/static/img/unionpay.png b/high-unionPay/static/img/unionpay.png
new file mode 100644
index 0000000..3424381
Binary files /dev/null and b/high-unionPay/static/img/unionpay.png differ