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

Merge pull request 'xbx' (#53) from xbx into master

Browse Source 
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/53
This commit is contained in:
luyuan 2020-08-14 17:11:41 +08:00
commit fd78ec19db
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pages/index/details.vue
View File

@ -75,6 +75,10 @@
<view :class="{ active: cur == 0 }" @click="pushstyleA">快递</view> <view :class="{ active: cur == 0 }" @click="pushstyleA">快递</view>
<view :class="{ active: cur == 1 }" @click="pushstyleB">骑手</view> <view :class="{ active: cur == 1 }" @click="pushstyleB">骑手</view>
</view> </view>
<view v-if="cur != 2 && (pushid || selctcar)">
<view class="title">{{cur == 0 ? '快递单号':'骑手信息'}}</view>
<view class="value">{{ cur == 0 ? pushid ? companyidA.express_name + ": " + pushid : '' : selctcar ? selctcar.label : '' }}</view>
</view>
<view class="btn" @click="confirmpushstyle">确认</view> <view class="btn" @click="confirmpushstyle">确认</view>
</view> </view>
<!-- 已发货 --> <!-- 已发货 -->
@ -147,7 +151,7 @@ export default {
data() { data() {
return { return {
status: 1, // 订单状态 status: 1, // 订单状态
cur: Number, cur: 2,
showDelivery: false, // 填写骑手信息 showDelivery: false, // 填写骑手信息
showExpress: false, // 填写快递单号 showExpress: false, // 填写快递单号
showRefunds: false, // 平台退货处理 showRefunds: false, // 平台退货处理
@ -330,7 +334,7 @@ export default {
// 选择快递公司 // 选择快递公司
getselectcompany(e) { getselectcompany(e) {
let obj = this.companylist[e[0]]; let obj = this.companylist[e[0]];
this.companyidA = obj.express_id; this.companyidA = obj;
this.showExpress = true; this.showExpress = true;
}, },
// 绑定配送方式 // 绑定配送方式
@ -355,7 +359,7 @@ export default {
this.$u.api.bindpushid({ this.$u.api.bindpushid({
order_id: this.orderid, order_id: this.orderid,
shipping_code: this.pushid, shipping_code: this.pushid,
shipping_express_id: this.companyidA shipping_express_id: this.companyidA.express_id
}).then(res => { }).then(res => {
if (res.errCode != 0) { if (res.errCode != 0) {
this.$refs.uToast.show({ this.$refs.uToast.show({

1
pages/index/index.vue
View File

@ -152,6 +152,7 @@ export default {
}, },
onShow() { onShow() {
this.publishstate = false; this.publishstate = false;
this.tabsChange(this.current)
}, },
onReachBottom() { onReachBottom() {
this.num++; this.num++;

2
pages/release/zhibo.nvue
View File

@ -41,7 +41,7 @@
<image class="userhead" :src="info.member_avatar"></image> <image class="userhead" :src="info.member_avatar"></image>
<div class="userinfo"> <div class="userinfo">
<text class="username">{{info.member_nickname}}</text> <text class="username">{{info.member_nickname}}</text>
<text class="username" style="font-size:20rpx">{{time}} | {{room.onlineUsers.users.length}}</text> <text class="username" style="font-size:20rpx">{{time}} | {{room.onlineUsers.users.length - 1 < 0 ? 0 : room.onlineUsers.users.length - 1}}</text>
</div> </div>
</div> </div>
<image v-if="zhibo" class="closeimg" src="../../static/image/close.png" @click="closes"></image> <image v-if="zhibo" class="closeimg" src="../../static/image/close.png" @click="closes"></image>