核销前端的修改
This commit is contained in:
zpian
parent
d459df42ee
commit
4dcea9995b
|
|
@ -699,6 +699,14 @@ export function getMerchantIntegral(data) {
|
|||
export function convertMerchantIntegral(merId,data) {
|
||||
return request.post("user/integral/integral_convert/"+merId, data);
|
||||
}
|
||||
// 创建核销二维码
|
||||
export function createQRcode(data) {
|
||||
return request.get("coupon/create_qrcode", data);
|
||||
}
|
||||
// 完成核销操作
|
||||
export function writeOff(data) {
|
||||
return request.post("coupon/writeOff", data);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -18,17 +18,17 @@
|
|||
<block v-if="item.status == 0">
|
||||
<view v-if="item.coupon.send_type == 5" class='money vip-coupon'>
|
||||
<view class="line1 coupon_value">￥<text class='num'>{{item.coupon_price}}</text></view>
|
||||
<!--<view class="pic-num">满{{ item.use_min_price }}元可用</view>-->
|
||||
<view class="pic-num">满{{ item.use_min_price }}元可用</view>
|
||||
</view>
|
||||
<view v-else class='money' :style="{ 'background-image': `url(${domain}/static/diy/couponBg${keyColor}.png)` }">
|
||||
<view class="line1 coupon_value">￥<text class='num'>{{item.coupon_price}}</text></view>
|
||||
<!--<view class="pic-num">满{{ item.use_min_price }}元可用</view>-->
|
||||
<view class="pic-num">满{{ item.use_min_price }}元可用</view>
|
||||
</view>
|
||||
</block>
|
||||
|
||||
|
||||
<view v-else class='money moneyGray'>
|
||||
<view>￥<text class='num'>{{item.coupon_price}}</text></view>
|
||||
<!--<view class="pic-num">满{{ item.use_min_price }}元可用</view>-->
|
||||
<view class="pic-num">满{{ item.use_min_price }}元可用</view>
|
||||
</view>
|
||||
<view class='text'>
|
||||
<view class='condition line1'>
|
||||
|
|
@ -37,15 +37,19 @@
|
|||
<view class="line-title" :class="item._type === 0 ? 'bg-color-huic' : 'bg-color-check'" v-else-if="item.coupon && item.coupon.type === 11">品类券</view>
|
||||
<view class="line-title" :class="item._type === 0 ? 'bg-color-huic' : 'bg-color-check'" v-else-if="item.coupon && item.coupon.type === 10">通用券</view>
|
||||
<view class="line-title" :class="item._type === 0 ? 'bg-color-huic' : 'bg-color-check'" v-else-if="item.coupon && item.coupon.type === 12">跨店券</view>
|
||||
<view class="line-title" :class="item._type === 0 ? 'bg-color-huic' : 'bg-color-check'" v-else-if="item.coupon && item.coupon.type === 13">核销券</view>
|
||||
<view class="line-title" :class="item._type === 0 ? 'bg-color-huic' : 'bg-color-check'" v-else>商品券</view>
|
||||
<view class="line1 coupon-title">{{item.coupon_title}}</view>
|
||||
</view>
|
||||
<view class='data acea-row row-between-wrapper'>
|
||||
<view>{{item.start_time | timeYMD}}-{{item.end_time | timeYMD}}</view>
|
||||
<view v-if="item.status==0">
|
||||
<navigator :url="'/pages/columnGoods/goods_coupon_list/index?coupon_id='+item.coupon_id" class='bnt1 b-color' :class="item.coupon.send_type == 5 ? 'svip-btn' : ''" hover-class="none">
|
||||
<navigator :url="'/pages/columnGoods/goods_coupon_list/index?coupon_id='+item.coupon_id" class='bnt1 b-color' :class="item.coupon.send_type == 5 ? 'svip-btn' : ''" hover-class="none" v-if="item.coupon.type != 13">
|
||||
去使用
|
||||
</navigator>
|
||||
<view class='bnt1 b-color' @click="getQRcode(item.write_code)" :class="item.coupon.send_type == 5 ? 'svip-btn' : ''" hover-class="none" v-else>
|
||||
去使用
|
||||
</view>
|
||||
</view>
|
||||
<view class='bnt1 gray' style="position: static;" v-if="item.status==1">已使用</view>
|
||||
<view class='bnt1 gray' style="position: static;" v-if="item.status==2">已过期</view>
|
||||
|
|
@ -60,6 +64,15 @@
|
|||
</view>
|
||||
</view>
|
||||
<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
|
||||
<uni-popup ref="qrCodePopup" type="center">
|
||||
<view class="qr-code-content">
|
||||
<image class="image" :src="qrCode"></image>
|
||||
<view class="close-qr-code" @click="closeQrCode()">关闭</view>
|
||||
<navigator :url="'/pages/users/write_off/index?write_code=8sesff42seds'" class='bnt1 b-color'>
|
||||
去使用
|
||||
</navigator>
|
||||
</view>
|
||||
</uni-popup>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
|
|
@ -71,6 +84,9 @@
|
|||
import {
|
||||
getUserCoupons
|
||||
} from '@/api/api.js';
|
||||
|
||||
import { createQRcode } from '@/api/user.js';
|
||||
|
||||
import {
|
||||
mapGetters
|
||||
} from "vuex";
|
||||
|
|
@ -102,7 +118,7 @@
|
|||
page:1,
|
||||
isScroll:true,
|
||||
moneyBg: '/static/images/couponBg',
|
||||
|
||||
qrCode: '',
|
||||
};
|
||||
},
|
||||
computed: configMap(['hide_mer_status'], mapGetters(['isLogin','uid','viewColor','keyColor'])),
|
||||
|
|
@ -111,7 +127,7 @@
|
|||
if(value){
|
||||
var newDate=/\d{4}-\d{1,2}-\d{1,2}/g.exec(value)
|
||||
return newDate[0]
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
onLoad(options) {
|
||||
|
|
@ -169,7 +185,27 @@
|
|||
that.isScroll = that.couponsList.length<res.data.count
|
||||
that.page++
|
||||
})
|
||||
}
|
||||
},
|
||||
/**
|
||||
*生成核销券的二维码
|
||||
*/
|
||||
getQRcode(write_code)
|
||||
{
|
||||
// let that = this;
|
||||
createQRcode({
|
||||
write_code: write_code
|
||||
}).then(res => {
|
||||
console.log(res.data.qr_code)
|
||||
this.qrCode = res.data.qr_code
|
||||
this.$refs.qrCodePopup.open('center')
|
||||
}).catch(err => {
|
||||
this.$util.Tips({title: err});
|
||||
});
|
||||
},
|
||||
// 关闭二维码弹框
|
||||
closeQrCode() {
|
||||
this.$refs.qrCodePopup.close();
|
||||
},
|
||||
},
|
||||
onReachBottom() {
|
||||
this.getUseCoupons()
|
||||
|
|
@ -319,4 +355,23 @@
|
|||
.coupon_value{
|
||||
max-width: 220rpx;
|
||||
}
|
||||
// 二维码弹框
|
||||
.qr-code-content{
|
||||
width: 80vw;
|
||||
.image{
|
||||
width: 80vw;
|
||||
height: 80vw;
|
||||
}
|
||||
.close-qr-code{
|
||||
position: fixed;
|
||||
top: 35rpx;
|
||||
right: 70rpx;
|
||||
color: #FFFFFF;
|
||||
border: 2rpx solid #FFFFFF;
|
||||
height: 40rpx;
|
||||
line-height: 36rpx;
|
||||
padding: 0 20rpx;
|
||||
border-radius: 50rpx;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue