diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json
index 9cba30d..075b9c5 100644
--- a/.hbuilderx/launch.json
+++ b/.hbuilderx/launch.json
@@ -6,6 +6,10 @@
{
"launchtype" : "remote"
},
+ "h5" :
+ {
+ "launchtype" : "remote"
+ },
"mp-weixin" :
{
"launchtype" : "remote"
diff --git a/pages/goods/coupon-details/coupon-details.vue b/pages/goods/coupon-details/coupon-details.vue
index 004f21e..e80ca1f 100644
--- a/pages/goods/coupon-details/coupon-details.vue
+++ b/pages/goods/coupon-details/coupon-details.vue
@@ -13,29 +13,32 @@
领取时间:{{oneTime | formatDate('-')}}
使用有效期:{{twoTime | formatDate('-')}}
消费时间:{{threeTime | formatDate('-')}}
- 加油站点:{{couponDesInfo.couponCodeInfo.storeName}}
-
+
+ 加油站点:{{couponDesInfo.couponCodeInfo.storeName}}
+
视频教程
-
+
+
+ v-if="!couponDesInfo.couponInfo.reserveStatus && couponDesInfo.highUserCoupon.status != 0 && couponDesInfo.couponInfo.couponSource == 3">
请出示核销码(商户扫客户)
-
+
+ 请告知加油员用码商支付
+
- {{couponDesInfo.couponCodeInfo.codeKey}}
+
+ {{couponDesInfo.couponCodeInfo.codeKey}}
diff --git a/pages/pay/success/success.vue b/pages/pay/success/success.vue
index 789efe4..9fdf76a 100644
--- a/pages/pay/success/success.vue
+++ b/pages/pay/success/success.vue
@@ -36,10 +36,10 @@
-
- 核销码(商户扫客户)
- 请告知加油员用码商支付
-
+
+ 请出示核销码(商户扫客户)
+ 请告知加油员用码商支付
+
diff --git a/pages/tabBar/category/category.vue b/pages/tabBar/category/category.vue
index c54a370..23c3ee4 100644
--- a/pages/tabBar/category/category.vue
+++ b/pages/tabBar/category/category.vue
@@ -12,14 +12,6 @@
-
-
-
-
-
-
@@ -205,25 +197,6 @@
}
})
},
- //扫码
- toScan() {
- uni.scanCode({
- success: function(res) {
- uni.navigateTo({
- url: '../../goods/coupons-info-details/coupons-info-details?id=' + JSON
- .parse(res.result).code
- })
- },
- fail() {
- uni.showToast({
- title: '无法识别二维码',
- icon: 'none',
- duration: 2000
- })
- }
- });
-
- },
//跳转位置
goPostion() {
uni.navigateTo({
diff --git a/pages/tabBar/home/home.vue b/pages/tabBar/home/home.vue
index 8a968fa..6d4fb74 100644
--- a/pages/tabBar/home/home.vue
+++ b/pages/tabBar/home/home.vue
@@ -455,25 +455,7 @@
url: '../../goods/goods?id=' + e
});
},
- //扫码
- toScan() {
- uni.scanCode({
- success: function(res) {
- uni.navigateTo({
- url: '../../goods/coupons-info-details/coupons-info-details?id=' + JSON
- .parse(res.result).code
- })
- },
- fail() {
- uni.showToast({
- title: '无法识别二维码',
- icon: 'none',
- duration: 2000
- })
- }
- });
-
- },
+
//赠券卡券列表
getCouponListArea() {
let params = {
diff --git a/pages/tabBar/user/user.vue b/pages/tabBar/user/user.vue
index fc63cc7..adfd71c 100644
--- a/pages/tabBar/user/user.vue
+++ b/pages/tabBar/user/user.vue
@@ -371,25 +371,6 @@
url: '../../userLogin/userLogin'
})
},
- //扫码
- toScan() {
- uni.scanCode({
- success: function(res) {
- uni.navigateTo({
- url: '../../goods/coupons-info-details/coupons-info-details?id=' + JSON
- .parse(res.result).code
- })
- },
- fail() {
- uni.showToast({
- title: '无法识别二维码',
- icon: 'none',
- duration: 2000
- })
- }
- });
-
- },
//消息列表
toMsg() {
uni.showToast({
diff --git a/subPages/unionPay-orderList/unionPay-orderList.vue b/subPages/unionPay-orderList/unionPay-orderList.vue
index 7cd5161..57b4f16 100644
--- a/subPages/unionPay-orderList/unionPay-orderList.vue
+++ b/subPages/unionPay-orderList/unionPay-orderList.vue
@@ -39,7 +39,7 @@
+ src="../../static/img/jfx.png">
{{row.payPrice*100}}
{{typeText[row.status]}}
diff --git a/subPages/unionPay/unionPay.vue b/subPages/unionPay/unionPay.vue
index 2815265..e412c44 100644
--- a/subPages/unionPay/unionPay.vue
+++ b/subPages/unionPay/unionPay.vue
@@ -1,7 +1,7 @@
-
-
+
+
@@ -9,6 +9,9 @@
export default {
data() {
return {
+ imagewxUrl: app.globalData.imageWxImg,
+ imgadres: 'union1.jpg',
+ imgadres1: 'union2.jpg',
codes:'',
url:'https://base.95516.com/s/wl/WebAPP/helpAgree/page/help/shareRutineHelp.html?params=eyJlbmNyeXB0QXBwSWQiOiIxOTAwYmM4NDQ5N2NhYjNiIiwidG9MaW5rIjoiaHR0cHMlM0ElMkYlMkZoc2cuZGN0cGF5LmNvbSUyRnVuaW9uUGF5JTJGIn0=&id=40'
}