Commit 20be9870 by 李嘉林

优化

parent 51d18665
...@@ -13,7 +13,8 @@ ...@@ -13,7 +13,8 @@
'padding-top': datas.componentData.verticalMargin + 'px', 'padding-top': datas.componentData.verticalMargin + 'px',
'padding-bottom': datas.componentData.verticalMargin + 'px', 'padding-bottom': datas.componentData.verticalMargin + 'px',
'padding-left': datas.componentData.levelMargin + 'px', 'padding-left': datas.componentData.levelMargin + 'px',
'padding-right': datas.componentData.levelMargin + 'px' 'padding-right': datas.componentData.levelMargin + 'px',
overflow: 'hidden'
}" }"
> >
<div <div
......
...@@ -40,15 +40,17 @@ ...@@ -40,15 +40,17 @@
<div class="bottom flex"> <div class="bottom flex">
<template v-if="orderDetail.orderType == 5"> </template> <template v-if="orderDetail.orderType == 5"> </template>
<template v-else> <template v-else>
<div <template v-if="routeQuery.isPayReplace != 1">
v-if="routeQuery.multiMerchantsFlag" <div
@click="toOrderList" v-if="routeQuery.multiMerchantsFlag"
> @click="toOrderList"
<van-button size="normal">查看详情</van-button> >
</div> <van-button size="normal">查看详情</van-button>
<div v-else @click="toOrderDetail"> </div>
<van-button size="normal">查看详情</van-button> <div v-else @click="toOrderDetail">
</div> <van-button size="normal">查看详情</van-button>
</div>
</template>
<div @click="toIndex"> <div @click="toIndex">
<van-button size="normal">回首页</van-button> <van-button size="normal">回首页</van-button>
</div> </div>
......
...@@ -189,6 +189,15 @@ export default { ...@@ -189,6 +189,15 @@ export default {
// 余额充值 // 余额充值
params+= `&accountBalanceFlag=1&totalMoney=${_this.totalMoney}` params+= `&accountBalanceFlag=1&totalMoney=${_this.totalMoney}`
} }
if (_this.options.isPayReplace == 1) {
// 好友代付
wx.redirectTo({
url: `../index/main?from=wxPay&backpath=/order/payForOrderDetail&params=${JSON.stringify(
query
)}`,
});
return;
}
wx.redirectTo({ wx.redirectTo({
url: `/pages/paySuccess/main${params}`, url: `/pages/paySuccess/main${params}`,
}); });
......
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
overflow-x: scroll; overflow-x: scroll;
white-space: nowrap; white-space: nowrap;
text-align: center; text-align: center;
margin-top: 4px; margin-top: 10px;
} }
.words_item { .words_item {
......
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