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

Compare commits

base: theluyuan:1f6d2b4ab37bf4bea0f101cbba7fb69cdea3d860
Branches Tags
theluyuan:master
theluyuan:qxf
theluyuan:zhy
theluyuan:xbx
theluyuan:gyh
theluyuan:cmx
theluyuan:zmr
theluyuan:lxb
..
compare: theluyuan:391fda5abc765586a65683a10fbc889f23cf0c87
Branches Tags
theluyuan:qxf
theluyuan:master
theluyuan:zhy
theluyuan:xbx
theluyuan:gyh
theluyuan:cmx
theluyuan:zmr
theluyuan:lxb

No commits in common. "1f6d2b4ab37bf4bea0f101cbba7fb69cdea3d860" and "391fda5abc765586a65683a10fbc889f23cf0c87" have entirely different histories.
1f6d2b4ab3 ... 391fda5abc

4 changed files with 16 additions and 56 deletions
Show Stats Expand all files Collapse all files

5
App.vue
View File

@ -4,11 +4,6 @@ export default {
im: {}
},
onLaunch: function() {
// 禁止旋转
// #ifdef APP-PLUS
plus.screen.lockOrientation('portrait-primary');
// #endif
getApp().globalData.im = this.imService
console.log('App Launch');
// 缓存token

62
pages/index/details.vue
View File

@ -43,20 +43,16 @@
</view>
<view>
<view class="title">手机号</view>
<view class="value" @longtap="longtap(info.extend_order_common.reciver_info.mob_phone)">{{ info.extend_order_common.reciver_info.mob_phone }}</view>
<view class="value">{{ info.extend_order_common.reciver_info.mob_phone }}</view>
</view>
<view>
<view class="title">收货地址</view>
<view class="value u-line-2" @longtap="longtap(info.extend_order_common.reciver_info.address)">{{ info.extend_order_common.reciver_info.address }}</view>
<view class="value u-line-1">{{ info.extend_order_common.reciver_info.address }}</view>
</view>
<view>
<view class="title">派送方式</view>
<view class="value u-line-1">{{ users_type == 0 ? "-" : users_type == 1 ? "快递" : users_type == 2 ? "骑手" : "自提" }}</view>
</view>
<view class="remark">
<view class="title">订单备注</view>
<view class="value" @longtap="longtap(info.extend_order_common.order_message)">{{ info.extend_order_common.order_message }}</view>
</view>
<view @click="showInvoice">
<view class="title">开具发票</view>
<view class="invoice">
@ -84,11 +80,11 @@
</view>
</view>
<!-- 待处理 -->
<view class="delivery" v-if="type == 1 && cur != -1">
<view class="delivery" v-if="type == 1">
<view class="title">派送方式</view>
<view class="methods">
<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 == 0 }" @click="pushstyleA">快递</view>
<view :class="{ active: cur == 1 }" @click="pushstyleB">骑手</view>
<view :class="{ active: cur == 2 }" @click="pushstyleC">自提</view>
</view>
<view v-if="pushstyleBshow && (pushid || selctcar)" >
@ -280,7 +276,6 @@ export default {
this.type = option.type;
// console.log(this.type)
this.orderid = option.id;
this.resetinfo();
if (this.type == 1) {
// 获取快递公司
@ -335,39 +330,26 @@ export default {
this.refundid = e
console.log(e);
},
pushstyle(index) {
// console.log(this.users_type);
if (this.users_type == 1 && index == 1) {
this.showcompany = true;
} else if (this.users_type == 2 && index == 2) {
this.show = true;
} else if (this.users_type == 3 && index == 3) {
this.cur = 2;
}
},
// 人工配送
pushstyleA() {
console.log(this.cur)
if(this.cur != 0 && this.cur != -1){
if(this.cur != 0){
return ;
}
this.cur = 0;
this.showcompany = true;
},
// 选择骑手
pushstyleB() {
if(this.cur != 1 && this.cur != -1){
if(this.cur != 1){
return ;
}
this.cur = 1;
this.show = true;
},
// 自提
// 选择骑手
pushstyleC() {
if(this.cur != 2 && this.cur != -1){
if(this.cur != 2){
return ;
}
this.cur = 2;
this.pushstyleBshow = true
},
// 获取物流公司列表
@ -397,8 +379,7 @@ export default {
})
return
}
this.showExpress = false;
this.pushstyleBshow = true
this.showExpress = false;
},
// 取消退款
cancel() {
@ -566,7 +547,6 @@ export default {
// 选择骑手
getselect(e) {
this.selctcar = this.list[e[0].value];
this.pushstyleBshow = true
},
// 获取订单信息
resetinfo() {
@ -587,7 +567,6 @@ export default {
this.is_invoice = this.invoiceList.invoice_id || false;
this.invoice_type = this.invoiceList.invoice_type;
this.ordered_type = res.data.store_deliver_type; // 发货方式
// console.log(this.users_type,this.cur);
// 骑手
this.takeawayer_info = res.data.takeawayer || {}; // 骑手信息
// 自提
@ -620,15 +599,6 @@ export default {
urls: this.mineBy_img,
current: 1
})
},
// 复制到粘贴板
longtap(text) {
console.log(text);
uni.setClipboardData({
data: text,
success: (res) => {
}
});
}
}
};
@ -775,16 +745,10 @@ export default {
padding: 0 30rpx;
background-color: #ffffff;
margin-bottom: 20rpx;
.remark {
padding: 10rpx 0;
height: 100%;
min-height: 88rpx;
}
> view {
height: 88rpx;
display: flex;
align-items: center;
height: 88rpx;
padding: 10rpx 0;
color: rgba(51, 51, 51, 1);
&:not(:last-child) {
border-bottom: 2rpx solid #ececec;
@ -845,11 +809,11 @@ export default {
}
.btn {
position: absolute;
bottom: 40rpx;
left: 50%;
transform: translate(-50%, 0);
width: 690rpx;
height: 98rpx;
margin: 40rpx 0;
background: rgba(255, 120, 15, 1);
border-radius: 49rpx;
font-size: 36rpx;

3
pages/release/index.vue
View File

@ -149,6 +149,7 @@ export default {
this.getLiveSpec();
this.device = uni.getSystemInfoSync(); // 获取信息
console.log(this.device);
},
methods: {
publish() {
@ -157,7 +158,7 @@ export default {
for (let index in arr) {
newarr.push(arr[index].file_id);
}
console.log(this.imgarrA,newarr);
console.log(this.imgarrA);
this.$u.api
.publishphoto({
article_title: this.form.name,

2
pages/release/zhibo.nvue
View File

@ -139,7 +139,7 @@
font-size: 30rpx;
color:#fff;
width: 350rpx;
position: absolute;
position: fixed;
top: 70rpx;
left: 31rpx;
height: 31rpx;