Skip to content

M
mallapp
Commit 83de98fd authored by zhangjianguo's avatar zhangjianguo
Browse files
Options

1

parent 10bd72ba
Hide whitespace changes
Inline Side-by-side
Showing with 128 additions and 79 deletions
pages.json
View file @ 83de98fd
......@@ -191,10 +191,7 @@
},
{
"path": "express"
},
{
"path": "expressdetail"
}
}
]
}
],
......
pages/order/after-sale/refunds-detail.vue
View file @ 83de98fd
......@@ -106,11 +106,11 @@
<view class="reason">{{ d.remark }}</view>
<view class="grid-reasion">
<image
v-for="(x, i) in d.pic_list"
v-for="(x, i) in d.VoucherList"
:key="i"
:src="x"
class="img"
@click="previewImage(i, d.pic_list)"
@click="previewImage(i, d.VoucherList)"
mode="aspectFill"
/>
</view>
......@@ -118,16 +118,16 @@
<view style="margin-top: 40rpx;" class="block">
<view class="filed center">
<view class="key">服务单号</view>
<view class="val" style="font-size: 24rpx;">{{ d.order_no }}</view>
<view class="val" style="font-size: 24rpx;">{{ d.ReOrderNo }}</view>
<view class="op">
<u-button size="mini" shape="circle" @click="paste(d.order_no)"
<u-button size="mini" shape="circle" @click="paste(d.ReOrderNo)"
>复制</u-button
>
</view>
</view>
<view class="filed">
<view class="key">申请时间</view>
<view class="val">{{ d.created_at }}</view>
<view class="val">{{ d.CreateDate }}</view>
</view>
<view class="filed split">
<view class="key">服务类型</view>
......@@ -166,7 +166,7 @@
<view class="key">快递公司</view>
<view class="val" @click="showExpressHandler">
<text
v-if="forms.expressId == -1"
v-if="forms.ExpressId == -1"
style="font-size: 13px; color: gray;"
>请选择快递公司</text
>
......@@ -187,7 +187,7 @@
<view class="val">
<input
type="text"
v-model="forms.expressNo"
v-model="forms.ExpressNumber"
placeholder="请输入快递单号"
/>
</view>
......@@ -284,8 +284,9 @@ export default {
expressList: [],
showExpress: false,
forms: {
expressId: -1,
expressNo: "",
ReOrderId:-1,
ExpressId: -1,
ExpressNumber: "",
expressName: "",
},
currentStatus: 0,
......@@ -332,9 +333,9 @@ export default {
tmplIds: that.d.template_message_list,
complete(res) {
let msg = "";
if (that.forms.expressId == -1) {
if (that.forms.ExpressId == -1) {
msg = "请选择快递公司";
} else if (that.forms.expressNo == "") {
} else if (that.forms.ExpressNumber == "") {
msg = "请输入快递单号";
}
if (msg == "") {
......@@ -349,7 +350,7 @@ export default {
id: that.id,
express: that.forms.expressName,
customer_name: "",
express_no: that.forms.expressNo,
express_no: that.forms.ExpressNumber,
},
method: "POST",
},
......@@ -386,7 +387,7 @@ export default {
this.showExpress = true;
},
chosenExpressHandler(i) {
this.forms.expressId = this.expressList[i[0]].id;
this.forms.ExpressId = this.expressList[i[0]].id;
this.forms.expressName = this.expressList[i[0]].name;
},
previewImage(i, images) {
......@@ -412,7 +413,7 @@ export default {
},
init() {
this.isover = false;
let h = this.apiheader();
this.request2(
{
url: '/api/AppletOrder/GetAppletOrderAfterSaleInfo',
......@@ -422,10 +423,10 @@ export default {
},
(res) => {
this.d = res.data;
this.expressList = res.data.OrderInfo;
this.loading = false;
this.currentStatus = this.d.ReOrderStatus - 1;
this.getExpressInfo()
// if (this.d.ReOrderStatusName == 1) {
// this.currentStatus += 1;
// } else if (this.d.ReOrderStatusName == "待退款" || this.d.status_text == "已换货") {
......@@ -436,6 +437,17 @@ export default {
}
);
},
getExpressInfo(){
this.request2(
{
url: '/api/appletorder/GetExpressInfo',
data: {}
},
(res) => {
this.expressList = res.data;
}
);
}
},
};
</script>
......
pages/order/express.vue
View file @ 83de98fd
......@@ -3,18 +3,18 @@
<view class="status-box">
<view class="item">
<view class="name">快递公司：</view>
<view class="val">{{ expressInfo.ExpressName }}</view>
<view class="val">{{ express }}</view>
</view>
<view class="item">
<view class="name">运单号：</view>
<view class="val">{{ expressInfo.ExpressNumber }}</view>
<view class="val">{{ express_no }}</view>
</view>
<view class="item">
<!-- <view class="item">
<view class="name">运送状态：</view>
<view class="val" :style="{ color: mainColor }">{{
expressInfo.Remark
d.status_text
}}</view>
</view>
</view> -->
</view>
<view
......@@ -48,7 +48,7 @@
</view>
</template>
</u-time-line-item>
<u-time-line-item nodeTop="2" v-if="d.status == 3">
<!-- <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>
......@@ -61,13 +61,15 @@
<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">
</u-time-line-item> -->
<u-time-line-item v-for="(x, i) in d" :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 style="padding-bottom: 30rpx;" :style="{color:(i==0)?'#000 !important':'gray'}">
<view class="u-order-desc">{{ x.AcceptStation }}</view>
<view class="u-order-desc">{{ x.Remark }}</view>
<view class="u-order-time">{{ x.AcceptTime }}</view>
</view>
</template>
</u-time-line-item>
......@@ -81,11 +83,11 @@ export default {
data() {
return {
mainColor: "",
d: {},
d: [],
loading: false,
OrderId:0,
last: {},
expressInfo:{},
express:'',
express_no:'',
address:'',
};
},
......@@ -94,26 +96,50 @@ export default {
title: "物流信息",
});
this.mainColor = this.$uiConfig.mainColor;
this.OrderId = option.OrderId
// this.express = option.express || "圆通速递";
// this.express_no = option.no || "YT2042624009816";
this.express = option.express || "圆通速递";
this.express_no = option.no || "YT2042624009816";
this.address = option.address || "四川成都市高新西区万景峰二期";
this.init();
this.id = option.id || 0;
this.init(this.id,this.express_no);
},
methods: {
init() {
this.request2(
{
url: '/api/AppletOrder/GetAppletMyOrderExpressInfo',
data: {
OrderId: this.OrderId
}
},
(res) => {
this.expressInfo = res.data
}
);
init(id,express_no) {
// 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);
// }
// }
// );
this.request2(
{
url: "/api/AppletOrder/GetOrderExpressInfo",
data: {
ExpressId: id,
ExpressNumber: express_no,
},
},
(res) => {
this.d = res.data;
}
);
},
},
};
......
pages/order/order-detail.vue
View file @ 83de98fd
......@@ -74,32 +74,33 @@
<view class="good-price">￥{{ x.Final_Price }}</view>
</view>
</view>
<template v-for="(e, ei) in orders.detailExpress">
<template v-for="(e, ei) in expressInfo">
<view :key="ei" class="order-info-item peisong">
<!-- <template v-for="(ec, eci) in e.expressRelation">
<template v-for="(ec, eci) in e.GoodsList">
<view
class="field"
:key="eci"
v-if="e.send_type == '2' && ec.order_detail_id == x.id"
v-if="e.Type == '2' && ec.Id == x.DetailId"
>
<view class="label">配送方式</view>
<view class="content">{{ e.express_content }}</view>
<view class="content">{{ e.Remark }}</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"
@click="goExpressHandler(e.ExpressName, e.ExpressNumber,e.ExpressId)"
v-if="e.Type == '1' && ec.Id == x.DetailId"
>
<view class="label">配送方式</view>
<view class="content"
>{{ e.express }} {{ e.express_no }}</view
>{{ e.ExpressName }} {{ e.ExpressNumber }}</view
>
<view style="margin-left: 10px;">
<u-icon name="arrow" size="32" color="#000"></u-icon>
</view>
</view>
</template> -->
</template>
</view>
</template>
<view
......@@ -220,16 +221,6 @@
>立即支付</u-button
>
</view>
<view class="item" v-if="orders.OrderStatus == '3'||orders.OrderStatus == '4' ">
<u-button
shape="circle"
@click="goExpressHandler(orders)"
size="medium"
:custom-style="customStyle"
>查看物流</u-button
>
</view>
<view class="item" v-if="orders.OrderStatus == '3'">
<u-button
shape="circle"
......@@ -363,6 +354,7 @@ export default {
padding: "0 30rpx",
color: "#FFF",
},
expressInfo:[],
Cancelmsg:{
OrderId:0,
Type:1,
......@@ -399,12 +391,19 @@ export default {
shouhuoHandler() {
this.showReviceModal = true;
},
goExpressHandler(orders) {
uni.navigateTo({
url:
"/pages/order/express?OrderId="+ orders.OrderId+'&address='+orders.DistrictAddress+orders.ShoppingAddress
});
},
goExpressHandler(express, no,id) {
uni.navigateTo({
url:
"/pages/order/express?express=" +
express +
"&no=" +
no +
"&address=" +
this.orders.DistrictAddress+this.orders.ShoppingAddress +
"&id=" +id,
});
},
submitReviceGoodHandler() {
let that = this
uni.requestSubscribeMessage({
......@@ -474,6 +473,7 @@ export default {
this.loading = false;
this.initRecommend();
this.getexpressInfo(res.data.OrderId)
}
);
},
......@@ -500,6 +500,20 @@ export default {
}
);
},
getexpressInfo(OrderId){
this.request2(
{
url: "/api/AppletOrder/GetAppletMyOrderExpressInfo",
data: {
OrderId: OrderId,
},
},
(res) => {
this.expressInfo = res.data;
}
);
},
redirectGoods(id) {
uni.navigateTo({
url: "/pages/goods/goods?id=" + id,
......
pages/user-center/user-center.vue
View file @ 83de98fd
......@@ -6,7 +6,7 @@
<u-avatar :src="user_info.avatar" size="140" style="margin-left: 50rpx;"></u-avatar>
<view style="display: flex;flex-direction: column;justify-content: center;">
<Text style="color: #FFF;margin-left: 20rpx;font-size: 36rpx;" @click="login(user_info)">{{ user_info.nickname ? user_info.nickname : '立即登录' }}</Text>
<view class="member" @click="goUrl('/pages/member/index/index')">
<view class="member" @click="goUrl('/pages/member/index/index')" v-if='user_info.nickname'>
<image :src="meueData.user_center.top_pic_url" mode='aspectFill' style="width: 26px;height: 26px;border-radius: 13px;"></image>
<Text style='margin-right: 10px;'>{{user_info.identity.level_name!=null ?user_info.identity.level_name:'普通用户' }}</Text>
</view>
......@@ -16,7 +16,7 @@
<view style="display: flex;flex-direction: column;align-items: center;" v-if="meueData.user_center.top_style == 2">
<u-avatar :src="user_info.avatar" size="140"></u-avatar>
<Text style="color: #FFF;margin-left: 20rpx;font-size: 36rpx;" @click="login(user_info)">{{ user_info.nickname ? user_info.nickname : '立即登录' }}</Text>
<view class="member" @click="goUrl('/pages/member/index/index')">
<view class="member" @click="goUrl('/pages/member/index/index')" v-if='user_info.nickname'>
<image :src="meueData.user_center.top_pic_url" mode='aspectFill' style="width: 26px;height: 26px;border-radius: 13px;"></image>
<Text style='margin-right: 10px;'>{{user_info.identity.level_name!=null ?user_info.identity.level_name:'普通用户' }}</Text>
</view>
......@@ -99,8 +99,8 @@
</view>
</view>
<view class="copyright">
<image :src="meueData.user_center.copyright.pic_url" style="width: 95px;height: 28px;"></image>
<Text style="margin-top: 10rpx;">{{ meueData.user_center.copyright.description }}</Text>
<image :src="meueData.user_center.copyright.pic_url" mode="widthFix" style="width: 95px;"></image>
<Text style="margin-top: 10rpx;color: #666666;">{{ meueData.user_center.copyright.description }}</Text>
</view>
</view>
<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
......
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