Commit 414d762f by 李嘉林

支付成功优化

parent d8a7ae72
......@@ -44,5 +44,9 @@ export default {
return requestPOST(
`${process.env.OLSHOP_URL}/shop/get_shop_configuration`
);
}
},
// 获取系统配置
get_system_config_by_code(params) {
return requestPOST(`${process.env.OLSHOP_URL}/common/get_system_config_by_code?code=${params.code}`)
},
};
......@@ -124,6 +124,9 @@ export default {
type: Number,
default: 0,
},
giftsKey: {
default: 0,
},
},
computed: {
icon() {
......@@ -237,20 +240,7 @@ export default {
console.log("headerImg", headerImg);
app.$themeToLink({
type: 1,
link: `/goods/posters
?type=cloudGift
&href=${window.location.protocol}//${window.location.host}/activty/receivingGift?mixid=${this.routeQuery.mixid}&orderId=${this.orderId}
&spokesmanGroupId=${spokesmanGroupId}
&hasInvitationStatus=${spokemanInfo.hasInvitationStatus}
&spokesmanShopId=${spokesmanShopId}
&spokesmanRelId=${spokesmanRelId}
&nickname=${nickname}
&headerImg=${headerImg}
&ordernumber=${this.routeQuery.orderSn}
&orderId=${this.orderId}
&orgName=${this.orgName}
&goodsImg=${this.orderDetail.noShipmentOrderItems[0].specificationPictureUrl}
`,
link: `/goods/posters?type=cloudGift&href=${process.env.BASE_URL}/activty/receivingGift?mixid=${this.$store.state.mixid}&orderId=${this.orderDetail.orderId}&spokesmanGroupId=${spokesmanGroupId}&hasInvitationStatus=${spokemanInfo.hasInvitationStatus}&spokesmanShopId=${spokesmanShopId}&spokesmanRelId=${spokesmanRelId}&nickname=${nickname}&headerImg=${headerImg}&ordernumber=${this.routeQuery.orderSn}&orgName=${this.orgName}&goodsImg=${this.orderDetail.noShipmentOrderItems[0].specificationPictureUrl}`,
})
// this.$router.push({
// path: "/goods/posters",
......@@ -354,7 +344,8 @@ export default {
}
}
.steps_wrap {
}
.steps_wrap {
display: flex;
background: #fff;
margin-top: 10px;
......@@ -404,6 +395,30 @@ export default {
left: 15px;
}
}
}
.line {
height: 10px;
background: #ededed;
}
.bottom_box {
display: flex;
flex-direction: column;
align-items: center;
padding-top: 30px;
.bottom_item {
height: 40px;
background: #e94f4f;
width: 70%;
text-align: center;
line-height: 40px;
border-radius: 20px;
font-size: 16px;
color: #fff;
}
.bottom_last {
margin-top: 10px;
background: #e3e3e3;
color: #333333;
}
}
</style>
\ No newline at end of file
<template>
<!-- 支付成功页 -->
<div class="paySuccess">
<div class="paySuccess" v-show="showPage">
<ThemeDataPlant :pageCode="11"></ThemeDataPlant>
<div style="margin-top: 60px;"></div>
<div v-for="(item, index) in pageData" :key="index">
......@@ -39,11 +39,34 @@
v-if="item.componentCode=='pay-success-info' && item.componentInfo.visible==1"
:render="true"
:datas="item"
:giftsKey="giftsKey"
:routeQuery="routeQuery"
:orderDetail="orderDetail"
:totalMoney="totalMoney"
/>
</div>
<!-- 分销员弹框入口 -->
<van-popup
class="spokemanEntry"
closeable
:show="showspokmanEntry"
position="center"
:close-on-click-overlay="false"
close-icon="close"
@close="closeSpokenman"
>
<!-- <div class="ent_box"> -->
<div class="ent-top">
<p style="font-size:45px;color:rgba(83,37,26,1);">恭喜</p>
<p style="font-size:16px;color:rgba(83,37,26,1);">您获得分销员申请指标</p>
<p style="font-size:11px;color:#53251A;">提示:可以在【我的】-【分销员中心】查看</p>
</div>
<div style="width:100%;display:flex;justify-content: center;">
<p class="reviwBtn" @click="toSpokesmanCenter">立即查看</p>
</div>
<p class="ignore" @click="showspokmanEntry=false">跳过</p>
<!-- </div> -->
</van-popup>
</div>
</template>
......@@ -105,6 +128,7 @@ export default {
this.query.orderSn = options.orderSn;
this.routeQuery = options;
this.orderMsg();
this.setGiftsKey(); //设置码表
// 获取页面数据
if (this.mpApp.globalData.pageList) {
console.log(
......@@ -130,6 +154,10 @@ export default {
console.log("----------------------------------2")
if(res.data.orderType == '14') {
this.isGroupBuy = true;
let url = `/pages/index/main?from=home&backpath=${encodeURIComponent(`/groupBuying/invite?orderSn=${this.query.orderSn}&isReplace=true`)}`
wx.redirectTo({
url,
});
this.title = "拼团详情"
}else {
this.title = "支付成功"
......@@ -141,6 +169,7 @@ export default {
this.goodsId =
res.data.noShipmentOrderItems[0].terminalProductGoodsId;
}
this.showPage = true;
//查询是否是分销员
getMiniProgram().then(res1 => {
......@@ -191,6 +220,30 @@ export default {
}
});
},
setGiftsKey() {
shop.get_system_config_by_code({code:'GIFTS_KEY'}).then(res1 => {
let res = res1.data;
if(res.code == '200'){
this.giftsKey = res.data;
console.log(this.giftsKey,'-----giftsKey')
}
})
},
closeSpokenman() {
this.quitWarn();
},
quitWarn() {
apply_for_withdraw({type:'remindFlag'}).then(res => {
if (res.data.data == "true") {
}
});
},
toSpokesmanCenter() {
let url = `/pages/index/main?from=home&backpath=${encodeURIComponent(`/personalCenter/spokesmanCenter`)}`
wx.redirectTo({
url,
});
},
async initWxShare() {
return
let this_ = this;
......@@ -210,9 +263,9 @@ export default {
console.log(spokesmanRelId,'分销员信息---=====',spokesmanGroupId,spokesmanShopId);
let newWindowHref = '';
if(getTokenmu() && spokesmanRelId){
newWindowHref = `${window.location.protocol}//${window.location.host}/activty/receivingGift?mixid=${this.$route.query.mixid}&orderId=${this.orderDetail.orderId}&spokesmanGroupId=${spokesmanGroupId}&spokesmanShopId=${spokesmanShopId}&spokesmanRelId=${spokesmanRelId}&userId=${getTokenmu()}`;
newWindowHref = `${process.env.BASE_URL}/activty/receivingGift?mixid=${this.$route.query.mixid}&orderId=${this.orderDetail.orderId}&spokesmanGroupId=${spokesmanGroupId}&spokesmanShopId=${spokesmanShopId}&spokesmanRelId=${spokesmanRelId}&userId=${getTokenmu()}`;
}else {
newWindowHref = `${window.location.protocol}//${window.location.host}/activty/receivingGift?mixid=${this.$route.query.mixid}&orderId=${this.orderDetail.orderId}&userId=${getTokenmu()}`;
newWindowHref = `${process.env.BASE_URL}/activty/receivingGift?mixid=${this.$route.query.mixid}&orderId=${this.orderDetail.orderId}&userId=${getTokenmu()}`;
}
let shareImgUrl = DFSImg(
......@@ -391,4 +444,64 @@ export default {
<style lang="scss" scoped>
.paySuccess {
}
.spokemanEntry {
/deep/.van-popup{
width: 85%!important;
height: 50%!important;
// padding:12px;
border-radius: 3px;
background: url("http://mayi-newshop.oss-cn-shanghai.aliyuncs.com/public/png/d6c8ce5a-574b-4191-81ea-843d15a30b68.png") no-repeat!important;
background-size: 100% 100%!important;
padding-left: 38px!important;
padding-top: 50px!important;
padding-right: 38px!important;
// height: 100px;
.ent-top {
// background:#DFDFDF;
// height: 150px;
// padding:45px 0;
p {
// text-align: center;
line-height: 30px;
}
p:nth-child(1) {
text-align: left;
}
p:nth-child(2) {
margin-top: 17px;
margin-bottom: 55px;
}
}
.reviwBtn {
width: 200px;
height: 44px;
// background: var(--main-color);
background: linear-gradient(
-90deg,
rgba(83, 37, 26, 1) 0%,
rgba(130, 71, 56, 1) 100%
);
border-radius: 25px;
font-size: 14px;
// color:#fff;
color: #fff;
margin-top: 10px;
display: flex;
justify-content: center;
align-items: center;
// margin-left:45px;
}
.ignore {
// color:var(--minor-color);
color: #53251a;
font-size: 12px;
text-align: center;
margin-top: 20px;
}
p {
// text-align:center;
}
}
}
</style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment