Skip to content

G
group-buy-ui
Commit 65690df2 authored by Xuguangxing's avatar Xuguangxing
Browse files
Options

Merge branch 'feat/group-buy' of git.quantgroup.cn:ui/group-buy-ui into feat/group-buy

parents ab81e1d5 c09a2e83
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 4 deletions
public/index.html
View file @ 65690df2
...@@ -105,12 +105,12 @@ ...@@ -105,12 +105,12 @@
</script> </script>
</head> </head>
<body> <body>
<!-- <script src="https://cdn.bootcdn.net/ajax/libs/vConsole/3.9.0/vconsole.min.js"></script> <script src="https://cdn.bootcdn.net/ajax/libs/vConsole/3.9.0/vconsole.min.js"></script>
<script> <script>
// init vConsole // init vConsole
var vConsole = new VConsole(); var vConsole = new VConsole();
console.log('Hello world'); console.log('Hello world');
</script> --> </script>
<noscript> <noscript>
<strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled. Please enable it to continue.</strong> <strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
</noscript> </noscript>
......
src/views/orderList/components/List.vue
View file @ 65690df2
...@@ -56,14 +56,14 @@ ...@@ -56,14 +56,14 @@
> >
查看订单 查看订单
</cr-button> </cr-button>
<!-- v-if="item.showOrderDetail" -->
<!-- 支付中按钮跳转支付页面 --> <!-- 支付中按钮跳转支付页面 -->
<cr-button <cr-button
v-if="item.openGroupStatus === 0"
size="small" size="small"
plain plain
type="primary" type="primary"
shape="circle" shape="circle"
@click.stop="goGroupDetails(item)" @click.stop="goGroupPayPages(item)"
> >
去支付 去支付
</cr-button> </cr-button>
...@@ -152,6 +152,9 @@ export default { ...@@ -152,6 +152,9 @@ export default {
newUrl: `/pages/order/orderDetail?orderNo=${skuInfo.orderNo}` newUrl: `/pages/order/orderDetail?orderNo=${skuInfo.orderNo}`
}); });
}, },
goGroupPayPages(skuInfo) {
this.$router.push(`/pay?orderNo=${skuInfo.orderNo}`);
},
async openShareEvent(skuInfo) { async openShareEvent(skuInfo) {
let options = await this.getShareData(skuInfo); let options = await this.getShareData(skuInfo);
......
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