Skip to content

M
mallapp
Commit f1ce0435 authored by 罗超's avatar 罗超
Browse files
Options

新增物流功能

parent e9999eb7
Hide whitespace changes
Inline Side-by-side
Showing with 397 additions and 106 deletions
pages.json
View file @ f1ce0435
...@@ -3,13 +3,7 @@ ...@@ -3,13 +3,7 @@
"^u-(.*)": "uview-ui/components/u-$1/u-$1.vue" "^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
}, },
"pages": [{ "pages": [{
"path": "pages/order-submit/pay-success" "path": "pages/index/index"
},
{
"path": "pages/order/after-sale/refunds-list"
},
{
"path": "pages/user-center/user-center"
}, },
{ {
"path": "pages/pay/pay/pay" "path": "pages/pay/pay/pay"
...@@ -17,50 +11,12 @@ ...@@ -17,50 +11,12 @@
{ {
"path": "pages/cart/cart" "path": "pages/cart/cart"
}, },
{
"path": "pages/order/index/index"
},
{
"path": "pages/order/order-detail",
"style": {
"navigationStyle": "custom"
}
},
{
"path": "pages/balance/balance"
},
{
"path": "pages/index/index"
},
{
"path": "pages/order/after-sale/refunds-detail"
},
{
"path": "pages/order/after-sale/refunds"
},
{
"path": "pages/order/after-sale/index"
},
{
"path": "pages/order-submit/order-submit"
},
{ {
"path": "pages/search/search" "path": "pages/search/search"
}, },
{ {
"path": "pages/cats/cats" "path": "pages/cats/cats"
}, },
{
"path": "pages/goods/goods"
},
{
"path": "pages/goods/comment-list"
},
{ {
"path": "pages/foot/index/index" "path": "pages/foot/index/index"
}, },
...@@ -68,57 +24,152 @@ ...@@ -68,57 +24,152 @@
"path": "pages/favorite/favorite" "path": "pages/favorite/favorite"
}, },
{ {
"path": "pages/address/address" "path": "pages/card/index/index"
},
{
"path": "pages/address/address_chosen"
}, },
{ {
"path": "pages/address/AddAddress" "path": "pages/cash-detail/cash-detail"
}, },
{ {
"path": "pages/webbox/webbox" "path": "pages/webbox/webbox"
},
{
"path": "pages/goods/list"
},
{
"path": "pages/order/index"
},
{
"path": "pages/balance/recharge"
}, {
"path": "pages/card/index/index"
}, {
"path": "pages/coupon/list/list"
}, {
"path": "pages/coupon/details/details"
}, {
"path": "pages/coupon/index/index"
}, {
"path": "pages/user-center/integral-detail/integral-detail"
} }
],
, { "subPackages": [{
"path": "pages/share/index/index" "root": "pages/goods",
}, { "pages": [{
"path": "pages/share/add/add" "path": "goods",
}, { "style": {}
"path": "pages/share/cash/cash" },
}, { {
"path": "pages/share-money/share-money" "path": "comment-list"
}, { },
"path": "pages/cash-detail/cash-detail" {
}, { "path": "list"
"path": "pages/share/level/level" }
}, { ]
"path": "pages/share-qrcode/share-qrcode" },
},{ {
"path" : "pages/share-order/share-order" "root": "pages/balance",
} "pages": [{
,{ "path": "recharge"
"path" : "pages/share-team/share-team" },
{
"path": "balance"
}
]
},
{
"root": "pages/user-center",
"pages": [{
"path": "integral-detail/integral-detail"
},
{
"path": "user-center"
}
]
},
{
"root": "pages/share",
"pages": [{
"path": "index/index"
},
{
"path": "add/add"
},
{
"path": "cash/cash"
}
]
},
{
"root": "pages/share-team",
"pages": [{
"path": "share-team"
}]
},
{
"root": "pages/share-order",
"pages": [{
"path": "share-order"
}]
},
{
"root": "pages/share-qrcode",
"pages": [{
"path": "share-qrcode"
}]
},
{
"root": "pages/share-money",
"pages": [{
"path": "share-money"
}]
},
{
"root": "pages/coupon",
"pages": [{
"path": "list/list"
},
{
"path": "details/details"
},
{
"path": "index/index"
}
]
},
{
"root": "pages/order-submit",
"pages": [{
"path": "pay-success"
},
{
"path": "order-submit"
}
]
},
{
"root": "pages/address",
"pages": [{
"path": "address"
},
{
"path": "address_chosen"
},
{
"path": "AddAddress"
}
]
},
{
"root": "pages/order",
"pages": [{
"path": "index/index"
},
{
"path": "after-sale/refunds-list"
},
{
"path": "order-detail",
"style": {
"navigationStyle": "custom"
}
},
{
"path": "after-sale/refunds-detail"
},
{
"path": "after-sale/refunds"
},
{
"path": "after-sale/index"
},
{
"path": "index"
},
{
"path": "express"
}
]
} }
], ],
"globalStyle": { "globalStyle": {
......
pages/order/express.vue 0 → 100644
View file @ f1ce0435
<template>
<view class="express">
<view class="status-box">
<view class="item">
<view class="name">快递公司：</view>
<view class="val">{{ express }}</view>
</view>
<view class="item">
<view class="name">运单号：</view>
<view class="val">{{ express_no }}</view>
</view>
<view class="item">
<view class="name">运送状态：</view>
<view class="val" :style="{ color: mainColor }">{{
d.status_text
}}</view>
</view>
</view>
<view
style="
margin-top: 40rpx;
background: #fff;
padding: 40rpx;
border-radius: 20rpx;
"
>
<u-time-line>
<u-time-line-item nodeTop="2">
<template v-slot:node>
<view
class="u-node meudim"
:style="{ background: mainColor, color: '#FFF' }"
>收</view
>
</template>
<template v-slot:content>
<view>
<view
class="u-order-desc"
style="
padding-bottom: 60rpx;
margin-top: 5rpx;
font-size: 26rpx;
"
>收货地址：{{address}}</view
>
</view>
</template>
</u-time-line-item>
<u-time-line-item nodeTop="2" v-if="d.status == 3">
<template v-slot:node>
<view class="u-node" :style="{ background: mainColor }">
<u-icon name="success" color="#fff" :size="32"></u-icon>
</view>
</template>
<template v-slot:content>
<view style="padding-bottom: 30rpx;color:#000 !important;">
<view class="u-order-title">已签收</view>
<view class="u-order-desc">{{ last.desc }}</view>
<view class="u-order-time">{{ last.datetime }}</view>
</view>
</template>
</u-time-line-item>
<u-time-line-item v-for="(x, i) in d.list" :key="i">
<!-- 此处没有自定义左边的内容，会默认显示一个点 -->
<template v-slot:content>
<view style="padding-bottom: 30rpx;" :style="{color:(i==0 && d.status!=3)?'#000 !important':'gray'}">
<view class="u-order-desc">{{ x.desc }}</view>
<view class="u-order-time">{{ x.datetime }}</view>
</view>
</template>
</u-time-line-item>
</u-time-line>
</view>
</view>
</template>
<script>
export default {
data() {
return {
mainColor: "",
express: "",
express_no: "",
d: {},
loading: false,
address: "",
last: {},
};
},
onLoad(option) {
uni.setNavigationBarTitle({
title: "物流信息",
});
this.mainColor = this.$uiConfig.mainColor;
this.express = option.express || "圆通速递";
this.express_no = option.no || "YT2042624009816";
this.address = option.address || "四川成都市高新西区万景峰二期";
this.init();
},
methods: {
init() {
let h = this.apiheader();
this.request(
{
url: "",
header: h,
data: {
r: "api/order/express-detail",
express: this.express,
express_no: this.express_no,
customer_name: "",
},
},
(res) => {
this.loading = false;
this.d = res.data.express;
this.d.list = this.d.list.reverse();
if (this.d.status == 3) {
this.last = this.d.list[0];
this.d.list.splice(0, 1);
}
}
);
},
},
};
</script>
<style>
.express {
min-height: 100vh;
background: #f5f5f5;
font-family: "aaa";
}
.express .status-box {
background: #fff;
padding: 60rpx 40rpx;
padding-bottom: 0;
border-bottom-left-radius: 20rpx;
border-bottom-right-radius: 20rpx;
}
.express .status-box .item {
display: flex;
align-items: center;
padding-bottom: 40rpx;
}
.express .status-box .item .name {
font-size: 24rpx;
color: #888;
width: 120rpx;
margin-right: 40rpx;
}
.express .status-box .item .val {
font-family: "aaa";
font-size: 28rpx;
color: #000;
font-weight: 600;
width: 1rpx;
flex: 1;
}
.u-node {
width: 44rpx;
height: 44rpx;
border-radius: 100rpx;
display: flex;
justify-content: center;
align-items: center;
background: #d0d0d0;
}
.u-node.meudim {
width: 40rpx;
height: 40rpx;
font-size: 24rpx;
}
.u-order-title {
color: #333333;
font-weight: bold;
font-size: 32rpx;
margin-bottom: 20rpx;
}
.u-order-desc {
/* color: rgb(150, 150, 150); */
font-size: 28rpx;
margin-bottom: 10rpx;
}
.u-order-time {
/* color: rgb(200, 200, 200); */
font-size: 26rpx;
}
</style>
pages/order/order-detail.vue
View file @ f1ce0435
...@@ -74,6 +74,34 @@ ...@@ -74,6 +74,34 @@
<view class="good-price">￥{{ x.total_original_price }}</view> <view class="good-price">￥{{ x.total_original_price }}</view>
</view> </view>
</view> </view>
<template v-for="(e, ei) in orders.detailExpress">
<view :key="ei" class="order-info-item peisong">
<template v-for="(ec, eci) in e.expressRelation">
<view
class="field"
:key="eci"
v-if="e.send_type == '2' && ec.order_detail_id == x.id"
>
<view class="label">配送方式</view>
<view class="content">{{ e.express_content }}</view>
</view>
<view
class="field"
:key="eci"
@click="goExpressHandler(e.express, e.express_no)"
v-if="e.send_type == '1' && ec.order_detail_id == x.id"
>
<view class="label">配送方式</view>
<view class="content"
>{{ e.express }} {{ e.express_no }}</view
>
<view style="margin-left: 10px;">
<u-icon name="arrow" size="32" color="#000"></u-icon>
</view>
</view>
</template>
</view>
</template>
<view <view
style=" style="
margin-top: 20px; margin-top: 20px;
...@@ -119,14 +147,14 @@ ...@@ -119,14 +147,14 @@
<view class="content">{{ orders.pay_time }}</view> <view class="content">{{ orders.pay_time }}</view>
</view> </view>
</view> </view>
<view class="order-info-item"> <!-- <view class="order-info-item" v-if="orders.detailExpress[0].">
<view class="field"> <view class="field">
<view class="label">配送方式：</view> <view class="label">配送方式：</view>
<view class="content">{{ <view class="content">{{
orders.detailExpress[0].express_content orders.detailExpress[0].express_content
}}</view> }}</view>
</view> </view>
</view> </view> -->
</view> </view>
<view class="block"> <view class="block">
<view class="order-info-item"> <view class="order-info-item">
...@@ -188,22 +216,20 @@ ...@@ -188,22 +216,20 @@
>确认收货</u-button >确认收货</u-button
> >
</view> </view>
<view <view class="item" v-if="orders.status_text == '待付款'">
class="item" <u-button shape="circle" size="medium" :custom-style="themCustomStyle"
v-if="orders.status_text == '待付款'"
>
<u-button
shape="circle"
size="medium"
:custom-style="themCustomStyle"
>立即支付</u-button >立即支付</u-button
> >
</view> </view>
<view class="item" v-if="orders.status_text == '待收货'"> <!-- <view class="item" v-if="orders.status_text == '待收货'">
<u-button shape="circle" size="medium" :custom-style="customStyle" <u-button
shape="circle"
@click=""
size="medium"
:custom-style="customStyle"
>查看物流</u-button >查看物流</u-button
> >
</view> </view> -->
<view class="item" v-if="orders.status_text == '待收货'"> <view class="item" v-if="orders.status_text == '待收货'">
<u-button <u-button
shape="circle" shape="circle"
...@@ -273,11 +299,11 @@ ...@@ -273,11 +299,11 @@
<script> <script>
import afterSale from "@/components/userorder/after-sale"; import afterSale from "@/components/userorder/after-sale";
import goodlist from "@/components/goods/list" import goodlist from "@/components/goods/list";
export default { export default {
components: { components: {
afterSale, afterSale,
goodlist goodlist,
}, },
data() { data() {
return { return {
...@@ -324,6 +350,17 @@ export default { ...@@ -324,6 +350,17 @@ export default {
shouhuoHandler() { shouhuoHandler() {
this.showReviceModal = true; this.showReviceModal = true;
}, },
goExpressHandler(express, no) {
uni.navigateTo({
url:
"/pages/order/express?express=" +
express +
"&no=" +
no +
"&address=" +
this.orders.address,
});
},
submitReviceGoodHandler() { submitReviceGoodHandler() {
let that = this; let that = this;
let h = this.apiheader(); let h = this.apiheader();
...@@ -604,6 +641,14 @@ export default { ...@@ -604,6 +641,14 @@ export default {
margin-bottom: 15px; margin-bottom: 15px;
display: flex; display: flex;
} }
.orderdetail .order-info-item.peisong {
border: none;
background: #f1f1f1;
border-radius: 5px;
padding: 10px;
margin: 15px 0 5px 0;
overflow: hidden;
}
.orderdetail .order-info-item .field:last-child { .orderdetail .order-info-item .field:last-child {
margin-bottom: 0; margin-bottom: 0;
} }
......
plugin/api.js
View file @ f1ce0435
export default { export default {
install(Vue, options) { install(Vue, options) {
Vue.prototype.host = "https://wx.weibaoge.cn/web/index.php?_mall_id=1285" Vue.prototype.host = "https://wx.weibaoge.cn/web/index.php?_mall_id=1285"
Vue.prototype.host2 = "http://192.168.0.110:8200" Vue.prototype.host2 = "http://192.168.2.16:8088"
//Vue.prototype.host2 = "http://mallapi.oytour.com" //Vue.prototype.host2 = "http://mallapi.oytour.com"
Vue.prototype.request = function(param, success, failed) { Vue.prototype.request = function(param, success, failed) {
//网络请求 //网络请求
......
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