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

Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/53

pages/index/details.vue

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

pages/index/index.vue

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

pages/release/zhibo.nvue

@@ -41,7 +41,7 @@
             <image class="userhead" :src="info.member_avatar"></image>
             <div class="userinfo">
                 <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>
         <image v-if="zhibo" class="closeimg" src="../../static/image/close.png" @click="closes"></image>