Merge branch 'couponV2.0' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/mobileclient into couponV2.0

This commit is contained in:
wangsongsole 2022-10-21 17:57:17 +08:00
commit 17f8643fee
1 changed files with 24 additions and 9 deletions

View File

@ -11,13 +11,14 @@
<script type="text/javascript"
src="https://lsxdemall.oss-cn-beijing.aliyuncs.com/common/axios.js?v=1367936144322"></script>
<script src="https://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/js/api2_0.js"></script>
<script src="https://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/js/modelPop.js"></script>
<link rel="stylesheet" href="https://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/css/paySuccess.css?v=1" />
<script src="https://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/js/modelPop.js?v=3"></script>
<link rel="stylesheet" href="https://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/css/loading.css">
<link rel="stylesheet" href="https://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/css/paySuccess.css?v=12" />
</head>
<body>
<div id="app">
<div class="content">
<div class="content" v-if="payResult">
<img class="img" src="https://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/img/paySuccess.png"
alt="" />
<p class="success">支付成功</p>
@ -38,7 +39,7 @@
</div>
</div>
<!-- 弹出提示 -->
<model-pop :show.sync="popAttr.show" :title="popAttr.title" :status="popAttr.status" :text="popAttr.text"
<model-pop :show="popAttr.show" :title="popAttr.title" :status="popAttr.status" :text="popAttr.text"
@backFunction="backFunctionPop"></model-pop>
</div>
@ -53,15 +54,16 @@
popAttr: {
show: false,
title: '温馨提示',
status: 2,/*1 成功 2提示 3失败 */
status: 3,/*1 成功 2提示 3失败 */
text: '错误信息'
},
plaflam: 1,
payResult:false,
redirect_url: '' //微信小程序链接
};
},
components: {},
components: {modelPop},
created() {
let orderNumber = this.getQueryString(
@ -109,8 +111,10 @@
this.orderInfo = res.data;
if (res.data.type == 2) { //1 商品 2立减金
//channel 1支付宝 2微信
this.plaflam = res.data.goods.entity.channel;//只有立减金商品才有channel字段
this.redirect_url = res.data.wechat_redirect_url
this.plaflam = res.data.product.entity.channel;//只有立减金商品才有channel字段
this.redirect_url = res.data.wechat_redirect_url;
this.payStatus=res.data.pay_status;
this.payResult=true;
}
}
}).catch();
@ -122,7 +126,7 @@
},
/* 弹框回调,点击按钮触发 */
backFunctionPop() {
this.popAttr.show=false;
},
toLinkAlipay() {
//支付宝H5跳转
@ -137,6 +141,17 @@
},
//领取立减金
receiveFn() {
if(this.payStatus!=2){
this.openTipDialog({
show: true,
title: '温馨提示',
status: 2,/*1 成功 2提示 3失败 */
text: '支付结算中,请等待支付结果...'
});
return
}
console.log(153,this.plaflam );
return
let ua = navigator.userAgent.toLowerCase(); //判断用户打开链接环境
if (this.plaflam == 1) {
//支付宝-微信环境中不能唤起支付宝