oneos-v5/backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

前端：商品订单价格修复

Browse Source
This commit is contained in:
YunaiV
2019-04-22 22:43:40 +08:00
parent 8e38bf000c
commit 6fdec47430
7 changed files with 50 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mobile-web/src/config/router.js
View File

@@ -190,14 +190,6 @@ const routes = [
requireAuth: true,
}
},
{
path: '/order/success',
component: () => import('../page/shipping/order-success'),
meta: {
title: '确认订单',
requireAuth: true,
}
},
{
name: 'category',
component: () => import('../page/category/index'),

6
mobile-web/src/page/account/phonelogin.vue
View File

@@ -19,8 +19,10 @@
<div style="margin: 10px;">
<van-button size="large" type="primary" style="height: 45px;line-height:45px;" @click="submit">登录</van-button>
</div>
<div>1. 新注册的手机号验证后自动创建账户</div>
<div>2. 默认验证码是 9999</div>
<van-panel title="友情提示">
<van-cell>1. 新注册的手机号验证后自动创建账户</van-cell>
<van-cell>2. 默认验证码是 9999</van-cell>
</van-panel>
</div>
</div>
</div>

35
mobile-web/src/page/shipping/order-success.vue
View File

@@ -1,35 +0,0 @@
<template>
<div class="order-success">
<headerNav title="提交成功"/>
<sapn>TODO 支付成功</sapn>
<router-link :to="'/user/order'">
<van-button size="small" type="danger">订单列表</van-button>
</router-link>
</div>
</template>
<script>
import {createOrder} from '../../api/order';
export default {
data() {
return {
}
},
methods: {
},
activated() {
},
};
</script>
<style lang="less">
.order-success {
text-align: center;
}
</style>

26
mobile-web/src/page/shipping/order.vue
View File

@@ -177,24 +177,26 @@
}).then(result => {
if (result) {
// const { orderNo } = result;
this.$router.push({ //核心语句
path:`/order/success`, //跳转的路径
query:{ //路由传参时push和query搭配使用 ，作用时传递参数
...result,
}
});
// this.$router.push({ //核心语句
// path:`/order/success`, //跳转的路径
// query:{ //路由传参时push和query搭配使用 ，作用时传递参数
// ...result,
// }
// });
this.$router.push('/pay?appId=POd4RC6a&orderId=' + result.id + '&returnUrl=' + encodeURI('/user/order/info/' + result.id));
}
});
} else if (this.from === 'cart') {
createOrderFromCart(userAddressId, couponCardId, remark).then(result => {
if (result) {
// const { orderNo } = result;
this.$router.push({ //核心语句
path:`/order/success`, //跳转的路径
query:{ //路由传参时push和query搭配使用 ，作用时传递参数
...result,
}
});
// this.$router.push({ //核心语句
// path:`/order/success`, //跳转的路径
// query:{ //路由传参时push和query搭配使用 ，作用时传递参数
// ...result,
// }
// });
this.$router.push('/pay?appId=POd4RC6a&orderId=' + result.id + '&returnUrl=' + encodeURI('/user/order/info/' + result.id));
}
});
}