gdpao

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

App.vue

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

common/http.api.js

@@ -157,6 +157,11 @@ const install = (Vue, vm) => {
         // 达人登录
         starLogin({member_mobile,sms_code}) {
             return vm.$u.post("/Login/platformExpertPhoneLogin",{member_mobile,sms_code})
+		},
+		//上传直播间人数
+		//https://mall.dmygkeji.com/storeapi/Streaming/changeLiveRealtimeNumber?live_id=1&realtime_number=10
+		changeLiveRealtimeNumber({id,number}){
+			return vm.$u.post("Streaming/changeLiveRealtimeNumber",{live_id:id,realtime_number:number})
 		}
 		
     }

components/order-item/index.vue

@@ -14,12 +14,13 @@
 				<view class="status" v-else-if="info.view_type==5">已退款订单</view>
 				<view class="status" v-else-if="info.view_type==6">商家同意</view>
 				<view class="status" v-else-if="info.view_type==7">商家拒绝</view>
+				<view class="status" v-else-if="info.view_type==10">待支付订单</view>
 			</view>
 			<view class="name u-line-1">{{info.extend_order_goods[0].goods_name}}</view>
 			<view class="info">
 				<view class="num">共{{info.count_number}}件商品</view>
-				<view class="price">实付<span>￥{{info.order_amount}}</span></view>
+				<view class="price">{{ info.view_type==10 ? "待支付" : "实付" }}<span>￥{{info.order_amount}}</span></view>
-                <view class="time">{{ info.payment_time.slice(5,16) }}</view>
+                <view class="time">{{ info.view_type==10 ? info.add_time.slice(5,16) : info.payment_time.slice(5,16) }}</view>
 			</view>
 		</view>
 	</view>

pages.json

@@ -313,6 +313,5 @@
 			"text": "我的",
 			"selectedColor": "#FBFBFB"
 		}]
-
 	}
 }

pages/index/details.vue

@@ -16,19 +16,19 @@
 			</view>	
 		</view>
 		<u-radio-group class="box" v-model="value" v-if="type>3">
-			<view class="goods-info" v-for="list in info.refund_list">
+			<view class="goods-info" v-for="list in info.goods_list">
-				<image :src="list.goods_image"></image>
+				<image :src="list.image_480_url"></image>
 				<view class="info-right">
 					<view class="name u-line-1">{{ list.goods_name }}</view>
 					<view class="info">
 						<view class="num">共{{ list.goods_num }}件商品</view>
 						<view class="price">
-							实付
+                            {{ type == 10 ? "待支付" : "实付" }}
-							<span>￥{{ list.refund_amount }}</span>
+							<span>￥{{ list.goods_pay_price }}</span>
 						</view>
 					</view>
 				</view>
-				<u-radio :name="list.refund_id" v-if="type==4" shape="circle" @change="radioGroupChange">
+				<!-- <u-radio :name="list.refund_id" v-if="type==4" shape="circle" @change="radioGroupChange"> -->
 				</u-radio >
 			</view>
 		</u-radio-group>
@@ -43,16 +43,20 @@
 				</view>
 				<view>
 					<view class="title">手机号</view>
-					<view class="value">{{ info.extend_order_common.reciver_info.mob_phone }}</view>
+					<view class="value" @longtap="longtap(info.extend_order_common.reciver_info.mob_phone)">{{ info.extend_order_common.reciver_info.mob_phone }}</view>
 				</view>
 				<view>
 					<view class="title">收货地址</view>
-					<view class="value u-line-1">{{ info.extend_order_common.reciver_info.address }}</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>
                 <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">
@@ -80,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="pushstyleA">快递</view>
+				<view :style="{'color': this.cur == -1 ? '#333' : '' }" :class="{ active: cur == 0 }" @click="pushstyleA">快递</view>
-				<view :class="{ active: cur == 1 }" @click="pushstyleB">骑手</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>
@@ -142,6 +146,38 @@
 		<view class="refund" v-if="type == 5 ">退款状态:同意退款，请注意查收！</view>
 		<view class="refund" v-if="type == 6 ">退款状态:商家同意退款，等待后台处理！</view>
 		<view class="refund" v-if="type == 7 ">退款状态:商家拒绝退款，请等待客服联系！</view>
+		<view class="pain-box" v-if="type == 10 ">
+            <view class="info-container">
+            	<view>
+            		<view class="title">姓名</view>
+            		<view class="value">{{ info.extend_order_common.reciver_name }}</view>
+            		<image src="/static/image/home/chat.png" @click="tochat(info.buyer_id)"></image>
+            	</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>
+            	<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>
+                <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">
+                        <text>{{ is_invoice ? "是" : "否" }}</text>
+                        <u-icon name="arrow-right" color="#999" size="20" style="margin-left: 10rpx;"></u-icon>
+                    </view>
+                </view>
+            </view>
+        </view>
 		<u-popup v-model="showDelivery" mode="center" border-radius="10" class="delivery-popup">
 			<view class="title">骑手信息</view>
 			<view class="input-info">
@@ -269,12 +305,14 @@ export default {
       takeawayer_info: {}, // 骑手信息
 			mineBy_img: "", // 自提图片
 			mineBy_text: "", // 自提备注
+			pushstyleBshow: false
 		};
 	},
 	onLoad(option) {
 		this.type = option.type;
 		// console.log(this.type)
 		this.orderid = option.id;
+        
 		this.resetinfo();
 		if (this.type == 1) {
 			// 获取快递公司
@@ -329,19 +367,40 @@ 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){
+				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() {
@@ -371,6 +430,7 @@ export default {
                 return
             }
 			this.showExpress = false;
+			this.pushstyleBshow = true
         },
 		// 取消退款
 		cancel() {
@@ -380,14 +440,15 @@ export default {
 		//
 		confirm() {
 			this.showRefunds = false;
-            if (!this.refundid) {
+            // if (!this.refundid) {
-                this.$refs.uToast.show({
+            //     this.$refs.uToast.show({
-                	title: "请选择商品",
+            //     	title: "请选择商品",
-                	type: "warning"
+            //     	type: "warning"
-                });
+            //     });
-                return;
+            //     return;
-            }
+            // }
 			if (this.cur == 0) {
+                console.log(this.refundid);
 				// 确定退款
 				this.$u.api.refund({
 					refund_id: this.refundid,
@@ -538,6 +599,7 @@ export default {
 		// 选择骑手
 		getselect(e) {
 			this.selctcar = this.list[e[0].value];
+			this.pushstyleBshow = true
 		},
 		// 获取订单信息
 		resetinfo() {
@@ -558,11 +620,14 @@ 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 || {}; // 骑手信息
 					// 自提
 					this.mineBy_img = res.data.extend_order_common.sendimg; // 自提图片
 					this.mineBy_text = res.data.extend_order_common.deliver_explain; // 自提备注
+                    // 退款id
+                    this.refundid = res.data.refund_list[0].refund_id;
 					// console.log(this.invoiceList,this.is_invoice,this.invoice_type);
 				}
 			});
@@ -590,6 +655,15 @@ export default {
                 urls: this.mineBy_img,
                 current: 1
             })
+        },
+        // 复制到粘贴板
+        longtap(text) {
+            console.log(text);
+            uni.setClipboardData({
+                data: text,
+                success: (res) => {
+                }
+            });
         }
 	}
 };
@@ -736,10 +810,56 @@ 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;
+				}
+				.title {
+					width: 150rpx;
+					font-size: 30rpx;
+					margin-right: 10rpx;
+				}
+				.value {
+					font-size: 26rpx;
+					flex: 1;
+				}
+                .invoice {
+                    margin-left: auto;
+                    font-size: 26rpx;
+                    color: #333;
+                }
+				image{
+					width: 40rpx;
+					height: 40rpx;
+				}
+			}
+		}
+	}
+    .pain-box {
+        .info-container {
+            padding: 0 30rpx;
+            margin-bottom: 20rpx;
+            background-color: #ffffff;
+            .remark {
+                padding: 10rpx 0;
+                height: 100%;
+                min-height: 88rpx;
+            }
+            > view {
+                display: flex;
+                align-items: center;
+                height: 88rpx;
+                padding: 10rpx 0;
                 color: rgba(51, 51, 51, 1);
                 &:not(:last-child) {
                     border-bottom: 2rpx solid #ececec;
@@ -782,7 +902,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);
@@ -800,11 +920,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;

pages/index/index.vue

@@ -56,6 +56,12 @@
 			</view>
 			<u-empty margin-top="20" v-if="!badlist.length" mode="order"></u-empty>
 		</view>
+        <view v-else-if="current == 7">
+            <view v-for="(item, index) in paidList" :key="index">
+            	<OrderItem :info="item"></OrderItem>
+            </view>
+            <u-empty margin-top="20" v-if="!paidList.length" mode="order"></u-empty>
+        </view>
 		<view class="release-btn" @click="publish">
 			<image src="../../static/image/index/publish.png"></image>
 			<view class="text">发布</view>
@@ -124,6 +130,9 @@ export default {
 				},
 				{
 					name: '退货订单'
+				},
+                {
+                    name: '待支付订单'
                 }
 			],
 			imageList: [],
@@ -142,6 +151,7 @@ export default {
 			finshlist: [], //已完成列表
 			badlist: [], //退货列表
 			carlist: [], //可投诉订单列表
+            paidList: [], // 待支付订单
 			reportinfo: null, //投诉信息
 			reportcontent: '', //投诉内容
             del_id: 0, // 删除id
@@ -156,7 +166,7 @@ export default {
 		this.getallorder(0);
 		const user = uni.getStorageSync('userinfo');
 		console.log(user)
-		this.imService.login(user.userId,user.member_nickname,user.member_avatar)
+		this.imService.login(user.member_id,user.member_nickname,user.member_avatar)
 		this.imService.connectIM()
 		// 订单状态： 0:全部 1已付款未发货 2已发货 3已完成 4申请退款/退货 5已退款/退货 6拒绝退款/退货
 	},
@@ -178,6 +188,7 @@ export default {
 			this.badlist = [];
 			this.badlist = [];
 			this.testlist = [];
+            this.paidList = [];
 		},
 		// 根据current请求不同的接口
 		reset() {
@@ -202,6 +213,9 @@ export default {
 			} else if (current == 6) {
 				// 退货订单
 				this.getallorder(4);
+			} else if (current == 7) {
+                // 待支付订单
+                this.getallorder(10);
             }
 		},
 		// 关闭发布弹窗
@@ -332,6 +346,8 @@ export default {
 							this.badlist.push(arr[index]);
 						} else if (type == 5) {
 							this.badlist.push(arr[index]);
+						} else if (type == 10) {
+                            this.paidList.push(arr[index]);
                         }
 					}
 				}

pages/login/login.vue

@@ -20,7 +20,7 @@
 				<view class="" v-if="state==0">
 					<view class="labales">
 						<image src="../../static/image/login/login(3).png"></image>
-						<input v-model="zhanghao" type="text" placeholder="请输入账号" />
+						<input v-model="zhanghao" type="text" @blur="getBlurVal" placeholder="请输入账号" />
 					</view>
 					<view class="labales">
 						<image src="../../static/image/login/login(1).png"></image>
@@ -30,7 +30,7 @@
 				<view class="" v-else-if="state==1">
 					<view class="labales">
 						<image src="../../static/image/login/login(3).png"></image>
-						<input v-model="zhanghaoA" type="text" placeholder="请输入账号" />
+						<input v-model="zhanghaoA" type="text" @blur="getBlurVal1" placeholder="请输入账号" />
 					</view>
 					<view class="labales">
 						<image src="../../static/image/login/login(1).png"></image>
@@ -128,6 +128,15 @@ export default {
                 }
             })
 		},
+        // 失去焦点获取数据
+        getBlurVal(e) {
+            // console.log(e.detail.value);
+            this.zhanghao = this.$u.trim(e.detail.value,"all");
+        },
+        getBlurVal1(e) {
+            this.zhanghaoA = this.$u.trim(e.detail.value,"all");
+            // console.log(this.$u.trim(this.zhanghaoA));
+        },
 		logins() {
 			// 判断是否可以点击
             // console.log(this.zhanghao);
@@ -208,10 +217,13 @@ export default {
 						uni.setStorageSync('token', res.data.token);
 						uni.setStorageSync('userinfo', res.data);
 						uni.setStorageSync('rongyun', res.data.rongcloud_token);
-						this.$u.route({
+						// this.$u.route({
+						// 	url: '/pages/index/index',
+						// 	type: 'switchTab'
+						// });
+                        uni.switchTab({
                             url: '/pages/index/index',
-							type: 'switchTab'
+                        })
-						});
 					}
 				});
 			}

pages/messages/info.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<image :src="list.picture" class="picture" mode=""></image>
+		<image :src="list.picture" class="picture" mode="widthFix"></image>
         <view class="box">
             <view class="info">
                 <text class="title u-line-2">{{ list.title }}</text>
@@ -43,7 +43,7 @@
 page {
 }
 .picture {
-    width: 100%;
+    width: 750rpx;
 }
 .box {
     width: 100%;

pages/release/index.vue

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

pages/release/tosign.vue

@@ -13,7 +13,7 @@
 			<view id="content_tosign">
 				<u-form :model="form" ref="uForm">
 					<u-form-item label-position="right">
-						<u-input v-model="max"  :placeholder="userinfo.rple != 4 ? '优秀的标题可以卖的更好哦~' : '优秀的标题可以吸引更多人观看哦~'" />
+						<u-input v-model="max"  :placeholder="userinfo.role != 4 ? '优秀的标题可以卖的更好哦~' : '优秀的标题可以吸引更多人观看哦~'" />
 					</u-form-item>
 					<view class="values"><text>{{this.titleMaxLength - this.max.length}}</text>/20</view>
 					<u-form-item label-position="right">
@@ -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,19 @@
 			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({
@@ -179,6 +189,7 @@
 
 			this.token = uni.getStorageSync('token');
 			this.userinfo = uni.getStorageSync("userinfo")
+            console.log(this.userinfo)
 			 var config = {
                 appkey: 'mgb7ka1',
                 debug:true

pages/release/video.vue

@@ -42,7 +42,7 @@
 			<view class="titles">正文</view>
 			<view class="titles_border"><textarea placeholder="请输入内容..." v-model="form.intro"></textarea></view>
 			<view class="show_two">
-				<u-popup v-model="show_two" mode="bottom" :closeable="true">
+				<u-popup v-model="show_two" mode="bottom" @close="closeGood" :closeable="true">
 					<view class="title"><text>选择商品</text></view>
 					<!-- 商品列表 -->
 					<scroll-view :scroll-top="scrollTop" scroll-y="true" class="scroll">
@@ -61,7 +61,7 @@
 					<view class="u-button" @click="changes()">确定</view>
 				</u-popup>
 				<!-- 底部选择商品列表 -->
-				<view @click="show_two = true" v-if="userinfo.role != 4">
+				<view @click="selectGoods" v-if="userinfo.role != 4">
 					选择商品
 					<image class="images" src="../../static/image/tosign/bhottom.png"></image>
 				</view>
@@ -146,6 +146,7 @@ const cImage = _this => {
 		count: 1,
 		sourceType: ['camera', 'album'],
 		success: function(res) {
+            // _this.is_video = true;
 			uni.showLoading({
 				title: '上传中'
 			});
@@ -286,6 +287,15 @@ export default {
 				this.selectarr.push(this.fileListes[num].id);
 			}
 		},
+        // 选择商品
+        selectGoods() {
+            this.show_two = true;
+            this.is_video = true;
+        },
+        // 选择商品弹窗关闭
+        closeGood() {
+            this.is_video = false;
+        },
 		// 创建标签
 		addLiveSpec() {
 			this.$u.api.createLivesp({

pages/release/zhibo.nvue

@@ -47,7 +47,7 @@
         <image v-if="zhibo" class="closeimg" src="../../static/image/close.png" @click="closes"></image>
         <image v-if="zhibo" class="menuimg" src="../../static/image/menu.png" @click="tool = true"></image>
         <image v-if="zhibo && list.length != 0" class="shoptapimg" @click="xianshi" src="../../static/image/shop.png" ></image>
-        <text v-if="zhibo" style="font-size:26rpx;color:#fff;width:512rpx;position:fixed;left:30rpx;top:793rpx">本平台提倡绿色健康直播，严禁在平台内外出现诱导未成年人诈骗、赌博、低俗色情、吸烟酗酒等不当行为，若有违反，将向相关部门依法追究您的法律责任。如因此给平台造成损失，有权向您全额追偿。
+        <text v-if="zhibo && fen" style="font-size:26rpx;color:#fff;width:512rpx;position:fixed;left:30rpx;top:793rpx;">本平台提倡绿色健康直播，严禁在平台内外出现诱导未成年人诈骗、赌博、低俗色情、吸烟酗酒等不当行为，若有违反，将向相关部门依法追究您的法律责任。如因此给平台造成损失，有权向您全额追偿。
         </text>
         <div v-if="zhibo" class="danmulist">
             <text class="danmuitem" v-for="(i,j) in danmulist" :key="j">{{i.senderNickname}}:{{i.content}}</text>
@@ -84,8 +84,8 @@
                     <text style="color:#fff;font-size:30rpx;margin-top:10rpx">新粉丝</text>
                 </view>
                 <view class="jieshuboxitem">
-                    <text style="color:#fff;font-size:30rpx">{{renshumax}}</text>
+                    <text style="color:#fff;font-size:30rpx">{{jieshu.headcount}}</text>
-                    <text style="color:#fff;font-size:30rpx;margin-top:10rpx">热度</text>
+                    <text style="color:#fff;font-size:30rpx;margin-top:10rpx">观看人数</text>
                 </view>
                 <view class="jieshuboxitem" v-if="list.length != 0">
                     <text style="color:#fff;font-size:30rpx">RMB {{jieshu.sales_amount}}</text>
@@ -139,7 +139,7 @@
     font-size: 30rpx;
     color:#fff;
     width: 350rpx;
-    position: fixed;
+    position: absolute;
     top: 70rpx;
     left: 31rpx;
     height: 31rpx;
@@ -147,11 +147,10 @@
 .jieshuback{
     background-color: #000;
     opacity: 0.8;
-    position: fixed;
+    position: absolute;
     left: 0;
     top: 0;
     width: 750rpx;
-    z-index: 901;
 }
 .jieshu{
     z-index: 9999;
@@ -345,10 +344,11 @@
     width: 690rpx;
 }
 .danmuitem{
-    font-size: 26rpx;
+    font-size: 30rpx;
     color: #fff;
     flex-direction: column-reverse;
     word-wrap:anywhere;
+    font-weight: bold;
 }
 .livePusher{
     width: 750rpx;
@@ -375,7 +375,9 @@
             danmulist:[],
             zhibo:true,
             jieshu:{},
-            renshumax:0
+            renshumax:0,
+            changeLiveRealtimeNumber:{},
+            fen:true
         },
         onLaunch: function() {
             console.log('App Launch');
@@ -387,9 +389,16 @@
             this.stop()
             this.startPreview()
             this.start()
+            // var message = {
+            // 	senderNickname : this.room.currentUser.nickname ,
+            // 	type : 1,
+            // 	content : '重连'
+            // }
+            // this.chatRoomService.sendMessages(this.room.id, message);
         },
         onHide: function() {
             console.log('App Hide');
+            this.chatRoomService.warrings = ()=>{};
         },
         //模拟onshow生命周期
         created() {
@@ -439,6 +448,7 @@
             return true;  
         }, 
         onLoad(a){
+            
 		    console.log(getApp().globalData.im)
             uni.setKeepScreenOn({
                 keepScreenOn: true
@@ -449,6 +459,7 @@
             console.log('Bearer' + " " + token)
             this.chatroom_id = a.id
             this.live_id = a.live_id
+            
             uni.request({
                 url:"https://mall.dmygkeji.com/storeapi/Streaming/liveStreamList",
                 method:"POST",
@@ -490,6 +501,7 @@
                     that.chatRoomService.warrings = that.jinggao
                     //获取当前聊天室数据
                     that.room = that.chatRoomService.room;
+                    console.log(that.room)
                     that.chatRoomService.initialWhenOnlineUserChange(that.renqu)
                 }
             })
@@ -502,6 +514,9 @@
                 miao = parseInt(miao)
                 miao = miao + 1 
                 // console.log(miao)
+                if(fen > 0){
+                    that.fen = false;
+                }
                 if(miao == 60){
                     miao = 0;
                     fen +=1
@@ -521,6 +536,24 @@
                 }
                 that.time = shi + ":" + fen + ":" + miao
             }, 1000);
+            setInterval(()=>{
+                    console.log("定时")
+                    uni.request({
+                        url:"https://mall.dmygkeji.com/storeapi/Streaming/changeLiveRealtimeNumber",
+                        method:"POST",
+                        header:{
+                            'Authorization' : 'Bearer' + " " + token
+                        },
+                        data:{
+                            live_id:that.live_id,
+                            realtime_number: that.room.onlineUsers.users.length - 1 < 0 ? 0 : that.room.onlineUsers.users.length - 1
+                        },
+                        success(res){
+                            console.log(JSON.stringify(res))
+                        }
+                    })
+                 },
+            10 * 1000)
             // var roomToken = JSON.parse(options.roomToken);
 	
 
@@ -636,6 +669,8 @@
                     });
                     return ;
                 }
+                this.chatRoomService.warrings = ()=>{};
+
                 const token = uni.getStorageSync('token');
                 let that = this
                 console.log(that.url)

pages/user/index.vue

@@ -6,7 +6,7 @@
                 <view class="name">
                     <text>{{info.member_nickname==null?"新用户":info.member_nickname}}</text>
                     <text>账号：{{info.member_name}}</text>
-                    <text>个性签名：{{info.signature==""?"该用户很懒没有签名！":info.signature}}</text>
+                    <text class="u-line-2">个性签名：{{info.signature==""?"该用户很懒没有签名！":info.signature}}</text>
                 </view>
             </view>
             <image src="/static/image/user/1.png"></image>
@@ -50,18 +50,17 @@ export default {
     watch: {
         isLoginOut() {
             // console.log(this.isLoginOut);
-            if (this.isLoginOut) {
+            // if (this.isLoginOut) {
-                uni.hideTabBar();
+            //     uni.hideTabBar();
-            } else {
+            // } else {
-                setTimeout(function() {
+            //     setTimeout(function() {
-                    uni.showTabBar();
+            //         uni.showTabBar();
-                },200)
+            //     },200)
-            }
+            // }
         }
     },
 	onLoad() {
         this.getCache();
-        console.log(222);
 	},
 	onShow() {
 		this.getmyinfo()
@@ -101,9 +100,9 @@ export default {
                         plus.cache.clear(function(e) {
                             console.log(e);
                         })
-                    }
                         this.getCache();
                     }
+                }
             })
             // #endif
         },
@@ -160,6 +159,7 @@ export default {
             align-items: center;
             
             >image{
+                flex-shrink: 0;
                 width: 110rpx;
                 height: 110rpx;
                 border-radius: 50%;

pages/user/info.vue

@@ -5,7 +5,7 @@
 			<text>更换头像</text>
 		</view>
 		<view class="item">
-			<text class="title">用户名</text>
+			<text class="title">店铺名称</text>
 			<input type="text" value="" v-model="info.member_nickname" placeholder="请输入用户名"/>
 		</view>
 		<view class="item">
@@ -37,6 +37,7 @@ export default {
         this.role = userinfo.role;
         // console.log(this.role);
 	},
+    // 保存信息
 	onNavigationBarButtonTap() {
 		let that = this;
 		let obj ={
@@ -86,7 +87,13 @@ export default {
 		},
 		// 获取图片,上传图片
 		chooseImage(sourceType) {
-			let that = this
+			let that = this;
+            let photo_type = "";
+            if (this.role == 2) {
+                photo_type = "store_avatar"
+            } else {
+                photo_type = "avatar"
+            }
 			const token = uni.getStorageSync('token');
 			uni.chooseImage({
 				count: 1,
@@ -97,9 +104,10 @@ export default {
 					uni.uploadFile({
 						url: 'https://mall.dmygkeji.com/storeapi/Upload/uploadFile',
 						filePath: tempFilePaths[0],
-						name: 'avatar',
+						name: photo_type,
 						formData:{
-							name:"avatar"
+							name: photo_type,
+                            store_id: that.info.store_id
 						},
 						header:{
 							Authorization:'Bearer' + " " + token
@@ -110,6 +118,9 @@ export default {
 							that.filename =  obj.data.file_name
 							that.num++
 							console.log(that.fileurl,that.filename)
+						},
+                        fail: (res) => {
+                            console.log(res);
                         }
 					});
 				}

pages/user/myinfo.vue

@@ -6,7 +6,7 @@
                 <view class="name">
                     <text>{{info.member_nickname==null?"新用户":info.member_nickname}}</text>
                     <text>账号：{{info.member_name}}</text>
-                    <text>个性签名：{{info.signature==""?"该用户很懒没有签名！":info.signature}}</text>
+                    <text class="u-line-2">个性签名：{{info.signature==""?"该用户很懒没有签名！":info.signature}}</text>
                 </view>
             </view>
             <image src="/static/image/user/1.png"></image>
@@ -77,7 +77,7 @@ export default {
         this.getCache();
 		const user = uni.getStorageSync('userinfo');
 		console.log(user)
-		this.imService.login(user.userId,user.member_nickname,user.member_avatar)
+		this.imService.login(user.member_id,user.member_nickname,user.member_avatar)
 		this.imService.connectIM()
 	},
 	methods: {
@@ -115,8 +115,8 @@ export default {
                                 plus.cache.clear(function(e) {
                                     console.log(e);
                                 })
-								}
                                 this.getCache();
+                            }
 						}
 				})
 				// #endif
@@ -278,6 +278,7 @@ export default {
             align-items: center;
             
             >image{
+                flex-shrink: 0;
                 width: 110rpx;
                 height: 110rpx;
                 border-radius: 50%;