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

xbx #99

Merged
theluyuan merged 4 commits from xbx into master 2020-09-11 12:23:57 +00:00
Conversation 0 Commits 4 Files Changed 2 +33 -10
2 changed files with 33 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
pages/index/details.vue
View File

@ -84,14 +84,14 @@
</view>
</view>
<!-- 待处理 -->
<view class="delivery" v-if="type == 1">
<view class="delivery" v-if="type == 1 && cur != -1">
<view class="title">派送方式</view>
<view class="methods">
<view :class="{ active: cur == 0 }" @click="pushstyle(1)">快递</view>
<view :class="{ active: cur == 1 }" @click="pushstyle(2)">骑手</view>
<view :class="{ active: cur == 2 }" @click="pushstyle(3)">自提</view>
<view :style="{'color': this.cur == -1 ? '#333' : '' }" :class="{ active: cur == 0 }" @click="pushstyleA">快递</view>
<view :style="{'color': this.cur == -1 ? '#333' : '' }" :class="{ active: cur == 1 }" @click="pushstyleB">骑手</view>
<view :class="{ active: cur == 2 }" @click="pushstyleC">自提</view>
</view>
<view v-if="cur != 2 && (pushid || selctcar)">
<view v-if="pushstyleBshow && (pushid || selctcar)" >
<view class="title">{{cur == 0 ? '快递单号':'骑手信息'}}</view>
<view class="value">{{ cur == 0 ? pushid ? companyidA.express_name + ": " + pushid : '' : selctcar ? selctcar.label : '' }}</view>
</view>
@ -273,6 +273,7 @@ export default {
takeawayer_info: {}, // 骑手信息
mineBy_img: "", // 自提图片
mineBy_text: "", // 自提备注
pushstyleBshow: false
};
},
onLoad(option) {
@ -346,17 +347,28 @@ export default {
},
// 人工配送
pushstyleA() {
console.log(this.cur)
if(this.cur != 0 && this.cur != -1){
return ;
}
this.cur = 0;
this.showcompany = true;
},
// 选择骑手
pushstyleB() {
if(this.cur != 1 && this.cur != -1){
return ;
}
this.cur = 1;
this.show = true;
},
// 自提
pushstyleC() {
if(this.cur != 2 && this.cur != -1){
return ;
}
this.cur = 2;
this.pushstyleBshow = true
},
// 获取物流公司列表
getcompanyinfo() {
@ -385,7 +397,8 @@ export default {
})
return
}
this.showExpress = false;
this.showExpress = false;
this.pushstyleBshow = true
},
// 取消退款
cancel() {
@ -553,13 +566,14 @@ export default {
// 选择骑手
getselect(e) {
this.selctcar = this.list[e[0].value];
this.pushstyleBshow = true
},
// 获取订单信息
resetinfo() {
this.$u.api.orderdetail({
order_id: this.orderid
}).then(res => {
// console.log(res);
console.log(res);
if (res.errCode != 0) {
this.$refs.uToast.show({
title: res.message,
@ -813,7 +827,7 @@ export default {
justify-content: space-around;
> view {
font-size: 30rpx;
color: rgba(0, 0, 51, 1);
color: #999;
width: 30%;
height: 80rpx;
border: 1rpx solid rgba(236, 236, 236, 1);

13
pages/release/tosign.vue
View File

@ -28,7 +28,7 @@
<!-- 标签的引入 -->
<tap_tosign :fileListes="fileListes" @chuangjian="chuangjian" @qiehuan="qiehuan"></tap_tosign>
<view class="titles">直播封面图</view>
<u-upload :form-data="{'name':'article_cover'}" action='https://mall.dmygkeji.com/storeapi/Upload/uploadFile' name="article_cover" :header="{'Authorization' : 'Bearer' + ' ' + token}" :max-count="1" :show-progress="true" @on-change="tupian" @on-success="sccg" del-color="#ececec" upload-text="上传" del-bg-color="#fff" :before-upload="shangchuan"></u-upload>
<u-upload ref="upload" :form-data="{'name':'article_cover'}" action='https://mall.dmygkeji.com/storeapi/Upload/uploadFile' name="article_cover" :header="{'Authorization' : 'Bearer' + ' ' + token}" :max-count="1" :show-progress="true" @on-change="tupian" @on-success="sccg" del-color="#ececec" upload-text="上传" del-bg-color="#fff" :before-upload="shangchuan"></u-upload>
</view>
<view class="button-uview">
<u-button :hair-line="false" @click="kaibo">{{relerest}}</u-button>
@ -112,9 +112,18 @@
tupian(a){
// console.log(JSON.parse(a.data));
let info = JSON.parse(a.data);
console.log(info.data);
console.log(info);
// console.log(JSON.stringify(a.data))
if(info.errCode == 1){
this.$refs.uToast.show({
title: info.message,
type: 'error'
});
}
this.$refs.upload.clear()
return ;
this.image = info.data.file_name;
},
navto(url){
this.$u.route({