Skip to content

Y
yudao-cloud
提交 77c6edef authored 作者: sin's avatar sin
浏览文件
操作

- 订单流程

上级 6c502864
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 335 行增加 和 206 行删除
mobile-web/src/api/order.js 0 → 100644
浏览文件 @ 77c6edef
import request from "../config/request";
export function getOrderPage(params) {
return request({
url: '/order-api/users/order/order_page',
method: 'get',
params: {
...params,
}
});
}
export function cancelOrder(id) {
return request({
url: '/product-api/users/spu/info',
method: 'get',
params: {
id,
}
});
}
export function createOrder(params) {
return request({
headers: {
'Content-Type': 'application/json',
},
url: '/order-api/users/order/create_order',
method: 'post',
data: {
...params,
},
});
}
mobile-web/src/api/product.js
浏览文件 @ 77c6edef
...@@ -2,7 +2,7 @@ import request from "../config/request"; ...@@ -2,7 +2,7 @@ import request from "../config/request";
export function getProductCategoryList(pid) { export function getProductCategoryList(pid) {
return request({ return request({
url: 'product-api/users/category/list', url: '/product-api/users/category/list',
method: 'get', method: 'get',
params: { params: {
pid pid
...@@ -12,7 +12,7 @@ export function getProductCategoryList(pid) { ...@@ -12,7 +12,7 @@ export function getProductCategoryList(pid) {
export function getProductSpuPage(cid, pageNo, pageSize) { export function getProductSpuPage(cid, pageNo, pageSize) {
return request({ return request({
url: 'product-api/users/spu/page', url: '/product-api/users/spu/page',
method: 'get', method: 'get',
params: { params: {
cid, cid,
...@@ -24,10 +24,10 @@ export function getProductSpuPage(cid, pageNo, pageSize) { ...@@ -24,10 +24,10 @@ export function getProductSpuPage(cid, pageNo, pageSize) {
export function getProductSpuInfo(id) { export function getProductSpuInfo(id) {
return request({ return request({
url: 'product-api/users/spu/info', url: '/product-api/users/spu/info',
method: 'get', method: 'get',
params: { params: {
id, id,
} }
}); });
} }
\ No newline at end of file
mobile-web/src/api/promotion.js
浏览文件 @ 77c6edef
...@@ -4,7 +4,7 @@ import request from "../config/request"; ...@@ -4,7 +4,7 @@ import request from "../config/request";
export function getBannerList() { export function getBannerList() {
return request({ return request({
url: 'promotion-api/users/banner/list', url: '/promotion-api/users/banner/list',
method: 'get', method: 'get',
}); });
} }
...@@ -13,7 +13,7 @@ export function getBannerList() { ...@@ -13,7 +13,7 @@ export function getBannerList() {
export function getProductRecommendList() { export function getProductRecommendList() {
return request({ return request({
url: 'promotion-api/users/product_recommend/list', url: '/promotion-api/users/product_recommend/list',
method: 'get', method: 'get',
}); });
} }
\ No newline at end of file
mobile-web/src/api/user.js
浏览文件 @ 77c6edef
...@@ -74,14 +74,14 @@ export function ExchangeCoupon(code){ ...@@ -74,14 +74,14 @@ export function ExchangeCoupon(code){
export function getUserInfo() { export function getUserInfo() {
return request({ return request({
url: 'user-api/users/user/info', url: '/user-api/users/user/info',
method: 'get', method: 'get',
}); });
} }
export function doUserUpdateNickname(nickname) { export function doUserUpdateNickname(nickname) {
return request({ return request({
url: 'user-api/users/user/update_nickname', url: '/user-api/users/user/update_nickname',
method: 'post', method: 'post',
params: { params: {
nickname, nickname,
...@@ -91,7 +91,7 @@ export function doUserUpdateNickname(nickname) { ...@@ -91,7 +91,7 @@ export function doUserUpdateNickname(nickname) {
export function doPassportMobileRegister(mobile, code) { export function doPassportMobileRegister(mobile, code) {
return request({ return request({
url: 'user-api/users/passport/mobile/register', url: '/user-api/users/passport/mobile/register',
method: 'post', method: 'post',
params: { params: {
mobile, mobile,
...@@ -102,7 +102,7 @@ export function doPassportMobileRegister(mobile, code) { ...@@ -102,7 +102,7 @@ export function doPassportMobileRegister(mobile, code) {
export function doPassportMobileSendRegisterCode(mobile) { export function doPassportMobileSendRegisterCode(mobile) {
return request({ return request({
url: 'user-api/users/passport/mobile/send_register_code', url: '/user-api/users/passport/mobile/send_register_code',
method: 'post', method: 'post',
params: { params: {
mobile, mobile,
......
mobile-web/src/components/page/product.vue
浏览文件 @ 77c6edef
<template> <template>
<div> <div>
<ul :class="'cap-goods-list__container cap-goods-list__container--'+data.classname+' cap-goods-list__container--'+data.ParameterDictionary.showtype+' '+(data.ParameterDictionary.type=='6'?'nowrap':'')" > <ul
<li v-if="productlist.length==0" style="width:100%;height:150px;border:0px;"> :class="'cap-goods-list__container cap-goods-list__container--'+data.classname+' cap-goods-list__container--'+data.ParameterDictionary.showtype+' '+(data.ParameterDictionary.type=='6'?'nowrap':'')">
<div style="width:100%;height:150px;"></div> <li v-if="productlist.length==0" style="width:100%;height:150px;border:0px;">
</li> <div style="width:100%;height:150px;"></div>
<li v-for="(item,index) in productlist" :key="index" :class="'cap-goods-list__wrapper '+(data.ParameterDictionary.type=='3'?(index%3==0?'cap-goods-list__wrapper--hybrid-big ':'cap-goods-list__wrapper--hybrid-small '):'')"> </li>
<router-link :class="'cap-goods-list__item cap-goods-list__item--'+data.classname+' '+data.ParameterDictionary.showtype+' '+data.aclass" :to="'/product/'+item.id"> <li v-for="(item,index) in productlist" :key="index"
<div class="cap-goods-list__photo"> :class="'cap-goods-list__wrapper '+(data.ParameterDictionary.type=='3'?(index%3==0?'cap-goods-list__wrapper--hybrid-big ':'cap-goods-list__wrapper--hybrid-small '):'')">
<img class="cap-goods-list__img lazy lazyload" v-lazy="item.imageURL+'?w='+((data.ParameterDictionary.type=='1'||data.ParameterDictionary.type=='3')?'750':'375')" /> <router-link
</div> :class="'cap-goods-list__item cap-goods-list__item--'+data.classname+' '+data.ParameterDictionary.showtype+' '+data.aclass"
<div :class="'cap-goods-list__info has-title has-price '+(data.ParameterDictionary.showtype == 'card'?'has-btn':'')"> :to="'/product/'+item.id">
<h3 class="title">{{item.title}}</h3> <div class="cap-goods-list__photo">
<p class="sale-info"> <img class="cap-goods-list__img lazy lazyload"
<span class="sale-price">¥ {{item.price}}</span> v-lazy="item.imageURL+'?w='+((data.ParameterDictionary.type=='1'||data.ParameterDictionary.type=='3')?'750':'375')"/>
</p> </div>
</div> <div
<div v-if="data.ParameterDictionary.showtype == 'card'" class="cap-goods-list__buy-btn-wrapper cap-goods-list__buy-btn-wrapper--4"> :class="'cap-goods-list__info has-title has-price '+(data.ParameterDictionary.showtype == 'card'?'has-btn':'')">
<button class="cap-goods-list__buy-btn-4 van-button van-button--default van-button--small">{{data.ParameterDictionary.buttonvalue}}</button> <h3 class="title">{{item.title}}</h3>
</div> <p class="sale-info">
</router-link> <span class="sale-price">¥ {{item.price}}</span>
</li> </p>
</div>
<div v-if="data.ParameterDictionary.showtype == 'card'"
class="cap-goods-list__buy-btn-wrapper cap-goods-list__buy-btn-wrapper--4">
<button
class="cap-goods-list__buy-btn-4 van-button van-button--default van-button--small">
{{data.ParameterDictionary.buttonvalue}}
</button>
</div>
</router-link>
</li>
</ul> </ul>
<div style="clear:both;"></div> <div style="clear:both;"></div>
</div> </div>
</template> </template>
<script> <script>
import {getProduct} from "../../api/page.js"; import {getProduct} from "../../api/page.js";
export default { export default {
name:'product', name: 'product',
data () { data() {
return { return {
productlist: [] productlist: []
} }
}, },
props:{ props: {
data:Object data: Object
}, },
created:function(){ created: function () {
var id=this.data.PageSectionId; var id = this.data.PageSectionId;
var data=this.data; var data = this.data;
var classname = "big"; var classname = "big";
var aclass = ""; var aclass = "";
switch (data.ParameterDictionary.type) { switch (data.ParameterDictionary.type) {
case "1": case "1":
aclass = "cap-goods-list__item--btn1 cap-goods-list__item--ratio-3-2 cap-goods-list__item--whitespace"; aclass = "cap-goods-list__item--btn1 cap-goods-list__item--ratio-3-2 cap-goods-list__item--whitespace";
break; break;
case "2": case "2":
classname = "small"; classname = "small";
aclass = "cap-goods-list__item--btn1 cap-goods-list__item--padding"; aclass = "cap-goods-list__item--btn1 cap-goods-list__item--padding";
break; break;
case "3": case "3":
classname = "hybrid"; classname = "hybrid";
aclass = "cap-goods-list__item--big cap-goods-list__item--hybrid-big cap-goods-list__item--btn1 cap-goods-list__item--padding"; aclass = "cap-goods-list__item--big cap-goods-list__item--hybrid-big cap-goods-list__item--btn1 cap-goods-list__item--padding";
break; break;
case "4": case "4":
classname = "list"; classname = "list";
aclass = "cap-goods-list__item--btn4 cap-goods-list__item--padding"; aclass = "cap-goods-list__item--btn4 cap-goods-list__item--padding";
break; break;
case "5": case "5":
classname = "three"; classname = "three";
aclass = "cap-goods-list__item--btn4 cap-goods-list__item--padding"; aclass = "cap-goods-list__item--btn4 cap-goods-list__item--padding";
break; break;
case "6": case "6":
classname = "three"; classname = "three";
break; break;
} }
data.classname=classname; data.classname = classname;
data.aclass=aclass; data.aclass = aclass;
getProduct(id).then(response => { getProduct(id).then(response => {
this.productlist=response; this.productlist = response;
}) })
} }
} }
</script> </script>
<style> <style>
......
mobile-web/src/config/request.js
浏览文件 @ 77c6edef
...@@ -15,6 +15,14 @@ const serviceRouter = function(requestUrl) { ...@@ -15,6 +15,14 @@ const serviceRouter = function(requestUrl) {
prefix: '/user-api', prefix: '/user-api',
target: 'http://127.0.0.1:18082/user-api', target: 'http://127.0.0.1:18082/user-api',
}, },
'/product-api': {
prefix: '/product-api',
target: 'http://127.0.0.1:18081/product-api',
},
'/promotion-api': {
prefix: '/promotion-api',
target: 'http://127.0.0.1:18085//promotion-api',
},
}; };
const configProd = { const configProd = {
...@@ -26,6 +34,14 @@ const serviceRouter = function(requestUrl) { ...@@ -26,6 +34,14 @@ const serviceRouter = function(requestUrl) {
prefix: '/user-api', prefix: '/user-api',
target: 'http://127.0.0.1:18082/user-api', target: 'http://127.0.0.1:18082/user-api',
}, },
'/product-api': {
prefix: '/product-api',
target: 'http://127.0.0.1:18081/product-api',
},
'/promotion-api': {
prefix: '/promotion-api',
target: 'http://127.0.0.1:18085//promotion-api',
},
}; };
if (process.env.NODE_ENV == 'development') { if (process.env.NODE_ENV == 'development') {
...@@ -57,7 +73,9 @@ const serviceRouter = function(requestUrl) { ...@@ -57,7 +73,9 @@ const serviceRouter = function(requestUrl) {
const indexOf = requestUrl.indexOf("/", 1); const indexOf = requestUrl.indexOf("/", 1);
const _urlPrefix = requestUrl.substring(0, indexOf); const _urlPrefix = requestUrl.substring(0, indexOf);
if (!config[_urlPrefix]) { if (!config[_urlPrefix]) {
throw new Error(`服务路由，未找到可用服务! ${requestUrl}`); // throw new Error(`服务路由，未找到可用服务! ${requestUrl}`);
console.error(`服务路由，未找到可用服务! ${requestUrl}`)
return ''
} }
// if (!createServer[_urlPrefix]) { // if (!createServer[_urlPrefix]) {
// throw new Error("服务路由，未找到可用服务!"); // throw new Error("服务路由，未找到可用服务!");
......
mobile-web/src/config/router.js
浏览文件 @ 77c6edef
...@@ -178,6 +178,13 @@ const routes = [ ...@@ -178,6 +178,13 @@ const routes = [
title: '确认订单' title: '确认订单'
} }
}, },
{
path: '/order/success',
component: () => import('../page/shipping/order-success'),
meta: {
title: '确认订单'
}
},
{ {
name: 'category', name: 'category',
component: () => import('../page/category/index'), component: () => import('../page/category/index'),
......
mobile-web/src/page/shipping/order-success.vue 0 → 100644
浏览文件 @ 77c6edef
<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>
mobile-web/src/page/shipping/order.vue
浏览文件 @ 77c6edef
<template> <template>
<div class="order"> <div class="order">
<headerNav title="确认订单"/> <headerNav title="确认订单"/>
<van-cell <van-cell
center center
:border="false" :border="false"
class="contact-card" class="contact-card"
...@@ -13,12 +13,12 @@ ...@@ -13,12 +13,12 @@
</template> </template>
<template v-else> <template v-else>
<strong>张三 138****6520</strong> <strong>张三 138****6520</strong>
<div>广东省深圳市南山区科技园 </div> <div>广东省深圳市南山区科技园</div>
</template> </template>
</van-cell> </van-cell>
<div style="height:15px;"></div> <div style="height:15px;"></div>
<div class="card" v-for="(product,i) in products" :key="i"> <div class="card" v-for="(product,i) in products" :key="i">
<product-card :product='product' /> <product-card :product='product'/>
</div> </div>
<div style="height:15px;"></div> <div style="height:15px;"></div>
<van-cell-group> <van-cell-group>
...@@ -32,15 +32,15 @@ ...@@ -32,15 +32,15 @@
</van-cell-group> </van-cell-group>
<div style="height:15px;"></div> <div style="height:15px;"></div>
<van-cell-group class="total"> <van-cell-group class="total">
<van-cell title="优惠券" is-link value="抵扣¥5.00" /> <van-cell title="优惠券" is-link value="抵扣¥5.00"/>
</van-cell-group> </van-cell-group>
<div style="height:15px;"></div> <div style="height:15px;"></div>
<van-cell-group class="total"> <van-cell-group class="total">
<van-cell title="商品总额" value="9.99" /> <van-cell title="商品总额" value="9.99"/>
<van-cell title="运费" value="+ 0.00" /> <van-cell title="运费" value="+ 0.00"/>
<van-cell title="折扣" value="- 5.00" /> <van-cell title="折扣" value="- 5.00"/>
<van-cell title="实付金额" value="4.99" style="font-weight: 700;" /> <van-cell title="实付金额" value="4.99" style="font-weight: 700;"/>
</van-cell-group> </van-cell-group>
<div style="height:50px;"></div> <div style="height:50px;"></div>
...@@ -55,130 +55,155 @@ ...@@ -55,130 +55,155 @@
</template> </template>
<script> <script>
export default {
data() { import {createOrder} from '../../api/order';
return {
type: "add1", export default {
products: [ data() {
{ return {
imageURL: type: "add1",
"https://img10.360buyimg.com/mobilecms/s88x88_jfs/t17572/12/840082281/351445/e1828c58/5aab8dbbNedb77d88.jpg", products: [
title: "良品铺子 肉肉聚汇猪肉脯 猪蹄卤 辣味小吃520g", {
desc: "0.670kg/件，肉肉聚汇520g", imageURL:
price: "59.80", "https://img10.360buyimg.com/mobilecms/s88x88_jfs/t17572/12/840082281/351445/e1828c58/5aab8dbbNedb77d88.jpg",
quantity: 2 title: "良品铺子 肉肉聚汇猪肉脯 猪蹄卤 辣味小吃520g",
}, desc: "0.670kg/件，肉肉聚汇520g",
{ price: "59.80",
imageURL: quantity: 2
"https://img10.360buyimg.com/mobilecms/s88x88_jfs/t22720/128/1410375403/319576/8dbd859f/5b5e69b3Nf4f0e9e7.jpg", },
title: "元朗 鸡蛋卷 饼干糕点 中秋礼盒 广东特产680g", {
desc: "1.320kg/件", imageURL:
price: "65.80", "https://img10.360buyimg.com/mobilecms/s88x88_jfs/t22720/128/1410375403/319576/8dbd859f/5b5e69b3Nf4f0e9e7.jpg",
quantity: 1, title: "元朗 鸡蛋卷 饼干糕点 中秋礼盒 广东特产680g",
gift: [ desc: "1.320kg/件",
{ price: "65.80",
title: "星巴克（Starbucks）星冰乐小熊吊饰星巴克（Starbucks）星冰乐小熊吊饰", quantity: 1,
quantity: 2 gift: [
}, {
{ title: "星巴克（Starbucks）星冰乐小熊吊饰星巴克（Starbucks）星冰乐小熊吊饰",
title: "星巴克（Starbucks）星冰乐小熊吊饰星巴克（Starbucks）星冰乐小熊吊饰", quantity: 2
quantity: 1 },
} {
] title: "星巴克（Starbucks）星冰乐小熊吊饰星巴克（Starbucks）星冰乐小熊吊饰",
}, quantity: 1
{ }
imageURL: ]
"https://img10.360buyimg.com/mobilecms/s88x88_jfs/t17572/12/840082281/351445/e1828c58/5aab8dbbNedb77d88.jpg", },
title: "良品铺子 肉肉聚汇猪肉脯 猪蹄卤 辣味小吃520g", {
desc: "0.670kg/件，肉肉聚汇520g", imageURL:
price: "59.80", "https://img10.360buyimg.com/mobilecms/s88x88_jfs/t17572/12/840082281/351445/e1828c58/5aab8dbbNedb77d88.jpg",
quantity: 2 title: "良品铺子 肉肉聚汇猪肉脯 猪蹄卤 辣味小吃520g",
}, desc: "0.670kg/件，肉肉聚汇520g",
] price: "59.80",
}; quantity: 2
}, },
methods: { ]
onSubmit() { };
this.$toast("点击按钮");
}, },
}, methods: {
activated(){ onSubmit() {
//根据key名获取传递回来的参数，data就是map this.$toast("点击按钮");
this.$on('selectAddress', function(data){ const { skuId, quantity } = this.$route.query;
const userAddressId = 1;
const remark = '';
const orderItems = [{
skuId,
quantity,
}];
createOrder({
orderItems,
userAddressId,
remark,
})
},
},
activated() {
//根据key名获取传递回来的参数，data就是map
this.$on('selectAddress', function (data) {
//赋值给首页的附近医院数据模型 //赋值给首页的附近医院数据模型
console.log(1); console.log(1);
}.bind(this)); }.bind(this));
}, },
}; };
</script> </script>
<style lang="less"> <style lang="less">
.order { .order {
font-size: 14px; font-size: 14px;
background: #f7f7f7; background: #f7f7f7;
.contact-card::before {
content: ""; .contact-card::before {
left: 0; content: "";
right: 0; left: 0;
bottom: 0; right: 0;
height: 2px; bottom: 0;
position: absolute; height: 2px;
background: -webkit-repeating-linear-gradient( position: absolute;
135deg, background: -webkit-repeating-linear-gradient(
#ff6c6c 0, 135deg,
#ff6c6c 20%, #ff6c6c 0,
transparent 0, #ff6c6c 20%,
transparent 25%, transparent 0,
#3283fa 0, transparent 25%,
#3283fa 45%, #3283fa 0,
transparent 0, #3283fa 45%,
transparent 50% transparent 0,
); transparent 50%
background: repeating-linear-gradient( );
-45deg, background: repeating-linear-gradient(
#ff6c6c 0, -45deg,
#ff6c6c 20%, #ff6c6c 0,
transparent 0, #ff6c6c 20%,
transparent 25%, transparent 0,
#3283fa 0, transparent 25%,
#3283fa 45%, #3283fa 0,
transparent 0, #3283fa 45%,
transparent 50% transparent 0,
); transparent 50%
background-size: 80px; );
} background-size: 80px;
.total {
.van-cell__value {
color: red;
}
}
.van-submit-bar__bar {
border-top: 1px solid #f7f7f7;
}
.additional {
.van-cell {
padding: 0 15px;
font-size: 12px;
} }
.van-cell__title {
flex: 11; .total {
overflow: hidden; .van-cell__value {
text-overflow: ellipsis; color: red;
white-space: nowrap; }
} }
.van-tag {
line-height: 12px; .van-submit-bar__bar {
margin-right: 5px; border-top: 1px solid #f7f7f7;
} }
.price { .additional {
color: #e93b3d; .van-cell {
font-size: 10px; padding: 0 15px;
span { font-size: 12px;
font-size: 16px; }
.van-cell__title {
flex: 11;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.van-tag {
line-height: 12px;
margin-right: 5px;
}
.price {
color: #e93b3d;
font-size: 10px;
span {
font-size: 16px;
}
} }
} }
} }
}
</style> </style>
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论