theluyuan/demingshangjia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update api

Browse Source
This commit is contained in:
cmxdd 2020-08-05 20:03:53 +08:00
parent df1bad0a31
commit 31474f482f
4 changed files with 142 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/http.api.js
View File

@ -129,6 +129,10 @@ const install = (Vue, vm) => {
refund({refund_id,seller_state,seller_message}){
return vm.$u.post("/order/editRefund",{refund_id,seller_state,seller_message})
},
// 试穿
agreetest({goods_try_id,type,takeawayer_id}){
return vm.$u.post("/order/goodsTryAgree",{goods_try_id,type,takeawayer_id})
}
}

6
pages/index/details.vue
View File

@ -55,9 +55,9 @@
<view class="pushtimeline" v-if="type == 2">
<view class="timelinetitle">物流信息</view>
<view class="timelineid">订单单号:{{ info.order_sn }}</view>
<view class="timelinebox">
<view class="timelinecontent">{{}}进度</view>
<view class="timelinetime">{{}}时间</view>
<view class="timelinebox" v-for="list in info.express_list">
<view class="timelinecontent">{{list.content}}</view>
<view class="timelinetime">{{list.kd_time}}</view>
</view>
</view>
<view class="refunds-option" v-if="type == 4">

2
pages/index/index.vue
View File

@ -154,6 +154,8 @@ export default {
},
onShow() {
this.current=0
// 初始化数据
this.resetarr()
// 所有订单
this.getallorder(0);
this.publishstate = false;

219
pages/index/otherdetails.vue
View File

@ -3,25 +3,28 @@
<view class="goods-info">
<image :src="info.goods_image"></image>
<view class="info-right">
<view class="name u-line-1">{{info.goods_name}}</view>
<view class="name u-line-1">{{ info.goods_name }}</view>
<view class="info">
<view class="num">共{{info.goods_try_num}}件商品</view>
<view class="price">实付<span>￥{{info.goods_price}}</span></view>
<view class="num">共{{ info.goods_try_num }}件商品</view>
<view class="price">
实付
<span>￥{{ info.goods_price }}</span>
</view>
</view>
</view>
</view>
<view class="refunds-user" v-if="type==2 || type==3||type==4">
<view class="refunds-user" v-if="type == 2 || type == 3 || type == 4">
<view>
<image src="/static/image/home/2.png"></image>
<view>{{info.goods_try_member_name}}</view>
<view>{{ info.goods_try_member_name }}</view>
</view>
<view>
<image src="/static/image/home/3.png"></image>
<view>{{info.goods_try_member_mobile}}</view>
<view>{{ info.goods_try_member_mobile }}</view>
</view>
<view>
<image src="/static/image/home/4.png"></image>
<view class="address u-line-1">{{info.goods_try_area_info}}</view>
<view class="address u-line-1">{{ info.goods_try_area_info }}</view>
</view>
</view>
<view class="user-info" v-if="type == 1">
@ -29,32 +32,32 @@
<view class="info-container">
<view>
<view class="title">姓名</view>
<view class="value">{{info.goods_try_member_name}}</view>
<view class="value">{{ info.goods_try_member_name }}</view>
</view>
<view>
<view class="title">手机号</view>
<view class="value">{{info.goods_try_member_mobile}}</view>
<view class="value">{{ info.goods_try_member_mobile }}</view>
</view>
<view>
<view class="title">收货地址</view>
<view class="value u-line-1">{{info.goods_try_area_info}}</view>
<view class="value u-line-1">{{ info.goods_try_area_info }}</view>
</view>
</view>
</view>
<view class="delivery" v-if="type == 1">
<view class="title">派送方式</view>
<view class="methods">
<view :class="{active: cur==0}" @click="people">人工送达</view>
<view :class="{active: cur==1}" @click="carer">指派外部骑手</view>
<view :class="{ active: cur == 0 }" @click="people">人工送达</view>
<view :class="{ active: cur == 1 }" @click="carer">指派外部骑手</view>
</view>
<view class="btn" @click="confirmpushstyle">确认</view>
</view>
<!-- <view class="refunds-option" v-if="type==4">
<!-- <view class="refunds-option" v-if="type==4">
<view :class="{active: cur==0}" @click="cur=0;showRefunds=true">不处理</view>
<view :class="{active: cur==1}" @click="cur=1;showRefunds=true">确定处理</view>
</view> -->
<!-- <u-popup v-model="showDelivery" mode="center" border-radius="10" class="delivery-popup">
<!-- <u-popup v-model="showDelivery" mode="center" border-radius="10" class="delivery-popup">
<view class="title">骑手信息</view>
<view class="input-info">
<input type="text" placeholder="请输入您的姓名" v-model="name" />
@ -63,15 +66,15 @@
</view>
<view class="btn">确认</view>
</u-popup> -->
<u-picker mode="selector" v-model="show" :default-selector="[0]" :range="list" range-key="content" @confirm="getselect"></u-picker>
<!-- <u-popup v-model="showExpress" mode="center" border-radius="10" class="delivery-popup">
<u-picker mode="selector" v-model="show" :default-selector="[0]" :range="list" range-key="content" @confirm="getselect"></u-picker>
<!-- <u-popup v-model="showExpress" mode="center" border-radius="10" class="delivery-popup">
<view class="title" @click="bindpushid">填写快递单号</view>
<view class="input-info">
<input type="text" placeholder="请输入快递单号" v-model="express" />
</view>
<view class="btn">确认</view>
</u-popup> -->
<!-- <u-popup v-model="showRefunds" mode="center" border-radius="10" class="refunds-popup">
<!-- <u-popup v-model="showRefunds" mode="center" border-radius="10" class="refunds-popup">
<view v-if="cur==1" class="popup-tips">确定处理<br />平台将进行退款</view>
<view v-if="cur==0" class="popup-tips">确定不处理<br />平台将进行联系</view>
<view class="popup-btn">
@ -96,66 +99,104 @@ export default {
phone: '',
company: '',
express: '',
type:"",
orderid:0,
info:{},
list:[],
selctcar:null//选择骑手ID
}
type: '',
orderid: 0,
info: {},
list: [],
selctcar: null //选择骑手ID
};
},
onLoad(option) {
this.type = option.type;
this.orderid = option.id;
this.resetinfo()
this.resetinfo();
},
methods: {
// 人工配送
people(){
this.cur=0;
people() {
this.cur = 0;
},
carer(){
this.cur=1;
this.show=true
carer() {
this.cur = 1;
this.show = true;
},
// 绑定配送方式
confirmpushstyle() {
if(this.cur==0){
}else{
if (this.cur == 0) {
this.$u.api
.agreetest({
goods_try_id: this.orderid,
type: 1,
takeawayer_id: 0
})
.then(res => {
console.log(res);
if (res.errCode != 0) {
this.$refs.uToast.show({
title: res.message,
type: 'error'
});
} else {
}
});
} else {
this.$u.api
.agreetest({
goods_try_id: this.orderid,
type: 1,
takeawayer_id: this.selctcar.takeawayer_id
})
.then(res => {
console.log(res);
if (res.errCode != 0) {
this.$refs.uToast.show({
title: res.message,
type: 'error'
});
} else {
}
});
}
},
// 选择骑手
getselect(e){
getselect(e) {
this.selctcar = this.list[e[0]];
},
// 获取订单信息
resetinfo(){
this.$u.api.testorderdetail({
goods_try_id:this.orderid
}).then(res => {
console.log(res);
if (res.errCode != 0) {
} else {
this.info = res.data
}
});
resetinfo() {
this.$u.api
.testorderdetail({
goods_try_id: this.orderid
})
.then(res => {
console.log(res);
if (res.errCode != 0) {
this.$refs.uToast.show({
title: res.message,
type: 'error'
});
} else {
this.info = res.data.info;
}
});
// 获取骑手列表
this.$u.api.takeawayerlist({}).then(res => {
console.log(res);
if (res.errCode != 0) {
this.$refs.uToast.show({
title: res.message,
type: 'error'
});
} else {
let arr = res.data
for(let index in arr){
arr[index].content = arr[index].company_name+"——"+arr[index].contacts+"——"+arr[index].contact_number
let arr = res.data;
for (let index in arr) {
arr[index].content = arr[index].company_name + '——' + arr[index].contacts + '——' + arr[index].contact_number;
}
this.list = arr
this.list = arr;
}
});
}
},
}
};
</script>
<style lang="scss" scoped>
@ -163,9 +204,9 @@ export default {
display: flex;
flex-direction: column;
min-height: calc(100vh - var(--window-top));
background-color: #ECECEC;
background-color: #ececec;
.goods-info {
background-color: #FFFFFF;
background-color: #ffffff;
padding: 30rpx;
display: flex;
align-items: center;
@ -181,7 +222,7 @@ export default {
.name {
width: 439rpx;
font-size: 28rpx;
color: rgba(51,51,51,1);
color: rgba(51, 51, 51, 1);
margin-bottom: 30rpx;
}
.info {
@ -189,11 +230,11 @@ export default {
display: flex;
align-items: center;
font-size: 26rpx;
color: rgba(102,102,102,1);
color: rgba(102, 102, 102, 1);
.price {
margin-left: 10rpx;
> span {
color: #FF780F;
color: #ff780f;
}
}
}
@ -201,7 +242,7 @@ export default {
}
.refunds-user {
padding: 25rpx 30rpx;
background-color: #FFFFFF;
background-color: #ffffff;
margin-bottom: 20rpx;
> view {
display: flex;
@ -228,7 +269,7 @@ export default {
}
> view {
font-size: 26rpx;
color: rgba(51,51,51,1);
color: rgba(51, 51, 51, 1);
}
}
}
@ -236,23 +277,23 @@ export default {
.info-title {
font-size: 30rpx;
font-weight: 500;
color: rgba(51,51,51,1);
color: rgba(51, 51, 51, 1);
height: 88rpx;
background-color: #FFFFFF;
background-color: #ffffff;
margin-bottom: 2rpx;
padding: 30rpx;
}
.info-container {
padding: 0 30rpx;
background-color: #FFFFFF;
background-color: #ffffff;
margin-bottom: 20rpx;
> view {
height: 88rpx;
display: flex;
align-items: center;
color: rgba(51,51,51,1);
color: rgba(51, 51, 51, 1);
&:not(:last-child) {
border-bottom: 2rpx solid #ECECEC;
border-bottom: 2rpx solid #ececec;
}
.title {
width: 150rpx;
@ -267,13 +308,13 @@ export default {
}
.delivery {
flex: 1;
background-color: #FFFFFF;
background-color: #ffffff;
padding: 30rpx;
position: relative;
.title {
font-size: 30rpx;
font-weight: 500;
color: rgba(51,51,51,1);
color: rgba(51, 51, 51, 1);
margin-bottom: 30rpx;
}
.methods {
@ -281,11 +322,11 @@ export default {
flex-wrap: wrap;
> view {
font-size: 30rpx;
color: rgba(0,0,51,1);
color: rgba(0, 0, 51, 1);
width: 335rpx;
height: 80rpx;
border: 1rpx solid rgba(236,236,236,1);
background: rgba(236,236,236,1);
border: 1rpx solid rgba(236, 236, 236, 1);
background: rgba(236, 236, 236, 1);
border-radius: 6rpx;
text-align: center;
line-height: 80rpx;
@ -295,9 +336,9 @@ export default {
}
}
.active {
border: 1rpx solid #FF780F;
color: #FF780F;
background: #FFF1E6;
border: 1rpx solid #ff780f;
color: #ff780f;
background: #fff1e6;
}
}
.btn {
@ -307,10 +348,10 @@ export default {
transform: translate(-50%, 0);
width: 690rpx;
height: 98rpx;
background: rgba(255,120,15,1);
background: rgba(255, 120, 15, 1);
border-radius: 49rpx;
font-size: 36rpx;
color: rgba(255,255,255,1);
color: rgba(255, 255, 255, 1);
text-align: center;
line-height: 98rpx;
}
@ -318,24 +359,24 @@ export default {
.refunds-option {
flex: 1;
padding: 88rpx 30rpx;
background-color: #FFFFFF;
background-color: #ffffff;
display: flex;
> view {
width: 335rpx;
height: 80rpx;
border: 1rpx solid rgba(236,236,236,1);
background: rgba(236,236,236,1);
border: 1rpx solid rgba(236, 236, 236, 1);
background: rgba(236, 236, 236, 1);
border-radius: 6rpx;
font-size: 30rpx;
color: rgba(0,0,51,1);
color: rgba(0, 0, 51, 1);
line-height: 80rpx;
text-align: center;
margin-right: 20rpx;
}
.active {
border: 1rpx solid #FF780F;
color: #FF780F;
background: #FFF1E6;
border: 1rpx solid #ff780f;
color: #ff780f;
background: #fff1e6;
}
}
.delivery-popup {
@ -343,27 +384,27 @@ export default {
width: 420rpx;
font-size: 30rpx;
font-weight: 500;
color: rgba(51,51,51,1);
color: rgba(51, 51, 51, 1);
text-align: center;
line-height: 88rpx;
border-bottom: 2rpx solid #ECECEC;
border-bottom: 2rpx solid #ececec;
}
.input-info {
> input {
font-size: 26rpx;
line-height: 88rpx;
padding: 30rpx;
border-bottom: 2rpx solid #ECECEC;
border-bottom: 2rpx solid #ececec;
}
}
.btn {
margin: 20rpx auto;
width: 200rpx;
height: 60rpx;
background: rgba(255,120,15,1);
background: rgba(255, 120, 15, 1);
border-radius: 30rpx;
font-size: 28rpx;
color: rgba(255,255,255,1);
color: rgba(255, 255, 255, 1);
line-height: 60rpx;
text-align: center;
}
@ -373,25 +414,25 @@ export default {
width: 420rpx;
text-align: center;
font-size: 28rpx;
color: rgba(102,102,102,1);
color: rgba(102, 102, 102, 1);
line-height: 42rpx;
padding: 30rpx 0;
}
.popup-btn {
width: 420rpx;
display: flex;
border-top: 2rpx solid #ECECEC;
border-top: 2rpx solid #ececec;
> view {
flex: 1;
height: 98rpx;
text-align: center;
line-height: 98rpx;
&:first-child {
border-right: 2rpx solid #ECECEC;
border-right: 2rpx solid #ececec;
}
}
.determine {
color: #FF780F;
color: #ff780f;
}
}
}