yangjie
/
high-mini
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.修改文案显示

Browse Source 
2.判断详情二维码显示
yj-dev
杨杰 3 years ago
parent aef4ec3a14
commit 5601754066
8 changed files with 29 additions and 83 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      .hbuilderx/launch.json
  2. 23
      pages/goods/coupon-details/coupon-details.vue
  3. 8
      pages/pay/success/success.vue
  4. 27
      pages/tabBar/category/category.vue
  5. 18
      pages/tabBar/home/home.vue
  6. 19
      pages/tabBar/user/user.vue
  7. 2
      subPages/unionPay-orderList/unionPay-orderList.vue
  8. 7
      subPages/unionPay/unionPay.vue

4
.hbuilderx/launch.json
Unescape View File

@ -6,6 +6,10 @@
{
"launchtype" : "remote"
},
"h5" :
{
"launchtype" : "remote"
},
"mp-weixin" :
{
"launchtype" : "remote"

23
pages/goods/coupon-details/coupon-details.vue
Unescape View File

@ -13,7 +13,8 @@
<view class="fontwig6 font13 fcor999 mart5" v-if="oneTime">领取时间:{{oneTime | formatDate('-')}}</view>
<view class="fontwig6 font13 fcor999 mart5" v-if="twoTime">使用有效期:{{twoTime | formatDate('-')}}</view>
<view class="fontwig6 font13 fcor999 mart5" v-if="threeTime">消费时间:{{threeTime | formatDate('-')}}</view>
<view class="fontwig6 font13 fcor999 mart5" v-if="couponDesInfo.couponCodeInfo.storeName">加油站点:{{couponDesInfo.couponCodeInfo.storeName}}</view>
<view class="fontwig6 font13 fcor999 mart5" v-if="couponDesInfo.couponCodeInfo.storeName">
加油站点:{{couponDesInfo.couponCodeInfo.storeName}}</view>
</view>
@ -21,21 +22,23 @@
<view class="width90 backcorfff mart80 qrcs">
<view class="width100 fotct" v-if="couponDesInfo.couponInfo.couponSource == 4">
<view class="font28 fontlet mart5 marb10" style="color: #1593c3;">视频教程</view>
<yy-video-player
:auto-play="false"
:url="imagewxUrl+imgadres3"
:poster="poster"
:show-back-btn="true"
></yy-video-player>
<yy-video-player :auto-play="false" :url="imagewxUrl+imgadres3" :poster="poster" :show-back-btn="true">
</yy-video-player>
<image :src="imagewxUrl+imgadres2" mode="widthFix" class="mart10"></image>
</view>
<view class="mart20 fotct fcorred font15 marb20 height20"
v-if="couponDesInfo.highUserCoupon.status != 0 && couponDesInfo.couponInfo.couponSource != 4">
v-if="!couponDesInfo.couponInfo.reserveStatus && couponDesInfo.highUserCoupon.status != 0 && couponDesInfo.couponInfo.couponSource == 3">
请出示核销码(商户扫客户)</view>
<view class="width90 mart20 fotct" v-if="couponDesInfo.highUserCoupon.status != 0 && couponDesInfo.couponInfo.couponSource != 4">
<view class="mart20 fotct fcorred font15 marb20 height20"
v-if="!couponDesInfo.couponInfo.reserveStatus && couponDesInfo.highUserCoupon.status != 0 && couponDesInfo.couponInfo.couponSource != 3">
请告知加油员用码商支付</view>
<view class="width90 mart20 fotct"
v-if="!couponDesInfo.couponInfo.reserveStatus">
<image class="coupon-qr" :src="imageUrl+'couponCode/'+couponDesInfo.highUserCoupon.qrCodeImg"></image>
</view>
<view class="fotct fcor333 font15 marb10 mart10" v-if="couponDesInfo.couponInfo.couponSource != 4 && couponDesInfo.couponCodeInfo.codeKey">{{couponDesInfo.couponCodeInfo.codeKey}}</view>
<view class="fotct fcor333 font15 marb10 mart10"
v-if="couponDesInfo.couponInfo.couponSource != 4 && couponDesInfo.couponCodeInfo.codeKey">
{{couponDesInfo.couponCodeInfo.codeKey}}</view>
</view>
<view class="width90 mart10 googscs backcorfff" v-if="couponDesInfo.couponInfo.couponSource != 4">
<view class="width90 height45l font18 fcor666 aliitem">

8
pages/pay/success/success.vue
Unescape View File

@ -36,10 +36,10 @@
</view>
<view class="width100" v-if="couponDesInfo.couponInfo.couponSource != 4">
<view class="width90 mart10 fcor666">核销码(商户扫客户)</view>
<view class="mart20 fotct fcorred font15 marb20">请告知加油员用码商支付</view>
<view class="width90 mart20 fotct">
<view class="width100">
<view class="width90 mart10 fcor666" v-if="!couponDesInfo.couponInfo.reserveStatus && couponDesInfo.highUserCoupon.status != 0 && couponDesInfo.couponInfo.couponSource == 3">请出示核销码(商户扫客户)</view>
<view class="mart20 fotct fcorred font15 marb20" v-if="!couponDesInfo.couponInfo.reserveStatus && couponDesInfo.highUserCoupon.status != 0 && couponDesInfo.couponInfo.couponSource != 3">请告知加油员用码商支付</view>
<view class="width90 mart20 fotct" v-if="!couponDesInfo.couponInfo.reserveStatus">
<image class="coupon-qr" :src="imageUrl+'couponCode/'+couponDesInfo.highUserCoupon.qrCodeImg">
</image>
</view>

27
pages/tabBar/category/category.vue
Unescape View File

@ -12,14 +12,6 @@
<input placeholder="搜索门店" placeholder-style="color:#c0c0c0;" @tap="toSearch()" />
<view class="icon search"></view>
</view>
<!-- <view class="icon-btn"> -->
<!-- <view class="icon yuyin-home"></view> -->
<!-- <button open-type="contact" class="icon" show-message-card session-from send-message-path send-message-title> -->
<!-- <image style="width: 30px;height: 30px;" @click="toScan"
src="data:image/png;base64,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">
</image> -->
<!-- </button> -->
<!-- </view> -->
</view>
<!-- 占位 -->
<view class="place"></view>
@ -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({

18
pages/tabBar/home/home.vue
Unescape View File

@ -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 = {

19
pages/tabBar/user/user.vue
Unescape View File

@ -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({

2
subPages/unionPay-orderList/unionPay-orderList.vue
Unescape View File

@ -39,7 +39,7 @@
</view>
<view class="font16 fontwig6 text1 fcor333 aliitem" style="justify-content: flex-end;" v-else>
<image style="width: 15px;height: 15px;"
src="../../../static/img/jfx.png">
src="../../static/img/jfx.png">
</image>{{row.payPrice*100}}
</view>
<view class="fotrt font15 text1 fcor999 mart5">{{typeText[row.status]}}</view>

7
subPages/unionPay/unionPay.vue
Unescape View File

@ -1,7 +1,7 @@
<template>
<view>
<image class="width90" mode="widthFix" src="../static/union1.jpg" @click="jumpunionpay"></image>
<image class="width90" mode="widthFix" src="../static/union2.jpg" @click="jumpMp"></image>
<image class="width90" mode="widthFix" :src="imagewxUrl+imgadres" @click="jumpunionpay"></image>
<image class="width90" mode="widthFix" :src="imagewxUrl+imgadres1" @click="jumpMp"></image>
</view>
</template>
@ -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'
}

Write Preview
Loading…
Cancel
Save