diff --git a/App.vue b/App.vue
index 7a477d6..47bd48d 100644
--- a/App.vue
+++ b/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/pages.json b/pages.json
index 8f4e9cb..eb4e5d0 100644
--- a/pages.json
+++ b/pages.json
@@ -521,6 +521,17 @@
"backgroundColorTop": "#0083f5",
"navigationBarTextStyle": "white"
}
+ },
+ {
+ "path": "unionPay/unionPay",
+ "style": {
+ "enablePullDownRefresh": false,
+ "navigationBarTitleText": "入口选择",
+ "backgroundTextStyle": "light",
+ "navigationBarBackgroundColor": "#0083f5",
+ "backgroundColorTop": "#0083f5",
+ "navigationBarTextStyle": "white"
+ }
}
]
}],
diff --git a/pages/goods/externalCoupon/externalCoupon.vue b/pages/goods/externalCoupon/externalCoupon.vue
index 1fab82c..ca2caaa 100644
--- a/pages/goods/externalCoupon/externalCoupon.vue
+++ b/pages/goods/externalCoupon/externalCoupon.vue
@@ -124,9 +124,9 @@
})
}
})
- var arr1 = decodeURIComponent(options.q);
- var arr2 = arr1.split('=');
- this.codes = arr2[2];
+ // var arr1 = decodeURIComponent(options.q);
+ // var arr2 = arr1.split('=');
+ this.codes = options.id;
this.getDiscountByQrCode();
},
diff --git a/pages/tabBar/home/home.vue b/pages/tabBar/home/home.vue
index 5fdd3ab..fe035cb 100644
--- a/pages/tabBar/home/home.vue
+++ b/pages/tabBar/home/home.vue
@@ -657,7 +657,6 @@
uni.navigateTo({
url: '../../../subPages/recharge/recharge'
})
-
} else {
uni.showToast({
title: '暂未开通',
diff --git a/subPages/static/cz1.jpg b/subPages/static/cz1.jpg
index 91685cd..2360d42 100644
Binary files a/subPages/static/cz1.jpg and b/subPages/static/cz1.jpg differ
diff --git a/subPages/static/cz2.jpg b/subPages/static/cz2.jpg
index ebc6608..2c41456 100644
Binary files a/subPages/static/cz2.jpg and b/subPages/static/cz2.jpg differ
diff --git a/subPages/static/cz3.jpg b/subPages/static/cz3.jpg
index e717858..2db69f4 100644
Binary files a/subPages/static/cz3.jpg and b/subPages/static/cz3.jpg differ
diff --git a/subPages/static/lottery/gold.png b/subPages/static/lottery/gold.png
deleted file mode 100644
index aa84ae8..0000000
Binary files a/subPages/static/lottery/gold.png and /dev/null differ
diff --git a/subPages/static/lottery/gold@2x.png b/subPages/static/lottery/gold@2x.png
deleted file mode 100644
index 2f7606f..0000000
Binary files a/subPages/static/lottery/gold@2x.png and /dev/null differ
diff --git a/subPages/static/lottery/gold@3x.png b/subPages/static/lottery/gold@3x.png
deleted file mode 100644
index 1d9e06d..0000000
Binary files a/subPages/static/lottery/gold@3x.png and /dev/null differ
diff --git a/subPages/static/lottery/icon_xxhg.png b/subPages/static/lottery/icon_xxhg.png
deleted file mode 100644
index a378605..0000000
Binary files a/subPages/static/lottery/icon_xxhg.png and /dev/null differ
diff --git a/subPages/static/lottery/icon_xxhg@2x.png b/subPages/static/lottery/icon_xxhg@2x.png
deleted file mode 100644
index a66a2bc..0000000
Binary files a/subPages/static/lottery/icon_xxhg@2x.png and /dev/null differ
diff --git a/subPages/static/lottery/icon_xxhg@3x.png b/subPages/static/lottery/icon_xxhg@3x.png
deleted file mode 100644
index b354a29..0000000
Binary files a/subPages/static/lottery/icon_xxhg@3x.png and /dev/null differ
diff --git a/subPages/static/lottery/icon_zhongjiang.png b/subPages/static/lottery/icon_zhongjiang.png
deleted file mode 100644
index 9b4e092..0000000
Binary files a/subPages/static/lottery/icon_zhongjiang.png and /dev/null differ
diff --git a/subPages/static/lottery/icon_zhongjiang@2x.png b/subPages/static/lottery/icon_zhongjiang@2x.png
deleted file mode 100644
index b9be4aa..0000000
Binary files a/subPages/static/lottery/icon_zhongjiang@2x.png and /dev/null differ
diff --git a/subPages/static/lottery/icon_zhongjiang@3x.png b/subPages/static/lottery/icon_zhongjiang@3x.png
deleted file mode 100644
index 731a69c..0000000
Binary files a/subPages/static/lottery/icon_zhongjiang@3x.png and /dev/null differ
diff --git a/subPages/static/lottery/top-bg.jpg b/subPages/static/lottery/top-bg.jpg
deleted file mode 100644
index 0d3380a..0000000
Binary files a/subPages/static/lottery/top-bg.jpg and /dev/null differ
diff --git a/subPages/static/lottery/top-bg.png b/subPages/static/lottery/top-bg.png
deleted file mode 100644
index 241965f..0000000
Binary files a/subPages/static/lottery/top-bg.png and /dev/null differ
diff --git a/subPages/static/lottery/top-bg@2x.jpg b/subPages/static/lottery/top-bg@2x.jpg
deleted file mode 100644
index bb9d0d7..0000000
Binary files a/subPages/static/lottery/top-bg@2x.jpg and /dev/null differ
diff --git a/subPages/static/lottery/top-bg@2x.png b/subPages/static/lottery/top-bg@2x.png
deleted file mode 100644
index 9f3ab17..0000000
Binary files a/subPages/static/lottery/top-bg@2x.png and /dev/null differ
diff --git a/subPages/static/lottery/top-bg@3x.jpg b/subPages/static/lottery/top-bg@3x.jpg
deleted file mode 100644
index 4f29aa6..0000000
Binary files a/subPages/static/lottery/top-bg@3x.jpg and /dev/null differ
diff --git a/subPages/static/lottery/top-bg@3x.png b/subPages/static/lottery/top-bg@3x.png
deleted file mode 100644
index 8ab38ab..0000000
Binary files a/subPages/static/lottery/top-bg@3x.png and /dev/null differ
diff --git a/subPages/static/union1.jpg b/subPages/static/union1.jpg
new file mode 100644
index 0000000..d8c94f9
Binary files /dev/null and b/subPages/static/union1.jpg differ
diff --git a/subPages/static/union2.jpg b/subPages/static/union2.jpg
new file mode 100644
index 0000000..4f97034
Binary files /dev/null and b/subPages/static/union2.jpg differ
diff --git a/subPages/static/upay1.jpg b/subPages/static/upay1.jpg
index b9057d0..a3536fb 100644
Binary files a/subPages/static/upay1.jpg and b/subPages/static/upay1.jpg differ
diff --git a/subPages/static/upay2.jpg b/subPages/static/upay2.jpg
index 284ca7d..2975278 100644
Binary files a/subPages/static/upay2.jpg and b/subPages/static/upay2.jpg differ
diff --git a/subPages/static/upay3.jpg b/subPages/static/upay3.jpg
index 6a2c5f3..bccefe0 100644
Binary files a/subPages/static/upay3.jpg and b/subPages/static/upay3.jpg differ
diff --git a/subPages/static/upay4.jpg b/subPages/static/upay4.jpg
index c32e4eb..f4196dd 100644
Binary files a/subPages/static/upay4.jpg and b/subPages/static/upay4.jpg differ
diff --git a/subPages/unionPay/unionPay.vue b/subPages/unionPay/unionPay.vue
new file mode 100644
index 0000000..b00f3bb
--- /dev/null
+++ b/subPages/unionPay/unionPay.vue
@@ -0,0 +1,52 @@
+
+
+
+
+
+
+
+
+
+
+
+