更换

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

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

@@ -77,7 +77,6 @@ const install = (Vue, vm) => {
 		    return vm.$u.post("/Takeawayer/tryOrderSnList")
 		},
 		// 投诉骑手
-		
 		reportorder({order_id,takeawayer_id,order_list,content}){
 		    return vm.$u.post("/takeawayer/complaintTakeawayer",{order_id,takeawayer_id,order_list,content})
 		},
@@ -114,16 +113,16 @@ const install = (Vue, vm) => {
 		    return vm.$u.post("/order/goodsTryOrderInfo",{goods_try_id})
 		},
 		// 绑定物流订单
-		bindpushid({order_id,shipping_code,shipping_express_id}){
-		    return vm.$u.post("/order/send",{order_id,shipping_code,shipping_express_id})
+		bindpushid({store_deliver_type,order_id,shipping_code,shipping_express_id}){
+		    return vm.$u.post("/order/send",{store_deliver_type,order_id,shipping_code,shipping_express_id})
 		},
 		// 绑定骑手
-		bindcarer({order_id,takeawayer_id}){
-		    return vm.$u.post("/order/orderRider",{order_id,takeawayer_id})
+		bindcarer({store_deliver_type,order_id,takeawayer_id}){
+		    return vm.$u.post("/order/send",{store_deliver_type,order_id,takeawayer_id})
 		},
         // 自提
-        bindmention({shipping_express_id,deliver_explain,order_id,sendimg}) {
-            return vm.$u.post("/order/send",{shipping_express_id,deliver_explain,order_id,sendimg})
+        bindmention({store_deliver_type,shipping_express_id,deliver_explain,order_id,sendimg}) {
+            return vm.$u.post("/order/send",{store_deliver_type,shipping_express_id,deliver_explain,order_id,sendimg})
         },
 		// 发货物流公司
 		pushcompany(){
@@ -137,6 +136,10 @@ const install = (Vue, vm) => {
 		agreetest({goods_try_id,type,takeawayer_id}){
 			return vm.$u.post("/order/goodsTryAgree",{goods_try_id,type,takeawayer_id})
 		},
+        // 物流
+        getcarinfo({order_id}) {
+            return vm.$u.post("/Order/orderLogistics",{order_id})
+        },
 
 		messageList({page = 1}){
 			return vm.$u.post("/message/messageList",{page})
@@ -146,6 +149,19 @@ const install = (Vue, vm) => {
 		},
 		messageInfo({id}){
 			return vm.$u.post("/message/messageInfo",{id})
+		},
+        // 达人验证码
+        getCode({member_mobile,smslog_type=2}) {
+            return vm.$u.post("/Sms/sendSmsCode",{member_mobile,smslog_type})
+        },
+        // 达人登录
+        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})
 		}
 		
     }

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">
-				<image :src="list.goods_image"></image>
+			<view class="goods-info" v-for="list in info.goods_list">
+				<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">
 							实付
-							<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,15 +43,26 @@
 				</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">{{ cur == 0 ? "快递" : cur == 1 ? "骑手" : "自提" }}</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>
@@ -73,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 :class="{ active: cur == 1 }" @click="pushstyleB">骑手</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>
@@ -88,12 +99,42 @@
 		</view>
 		<!-- 已发货 -->
 		<view class="pushtimeline" v-if="type == 2">
-			<view class="timelinetitle">物流信息</view>
-			<view class="timelineid">订单单号:&nbsp;&nbsp;&nbsp;{{ info.order_sn }}</view>
-			<view class="timelinebox" v-for="list in info.express_list">
-				<view class="timelinecontent">{{list.content}}</view>
-				<view class="timelinetime">{{list.kd_time}}</view>
-			</view>
+            <view v-if="ordered_type == 1">
+                <view class="timelinetitle">物流信息</view>
+                <view class="timelineid">订单单号:&nbsp;&nbsp;&nbsp;{{ info.order_sn }}</view>
+                <view class="timelinebox" v-for="(list,index) in info.express_list" :key="index">
+                	<view class="timelinecontent">{{list.content}}</view>
+                	<view class="timelinetime">{{list.kd_time}}</view>
+                </view>
+            </view>
+			<view v-else-if="ordered_type == 2">
+                <view class="timelinetitle">骑手信息</view>
+                <view class="refunds-user-two">
+                    <view>
+                    	<image src="/static/image/home/2.png"></image>
+                    	<view>{{ takeawayer_info.takeawayer_name }}</view>
+                    </view>
+                    <view>
+                    	<image src="/static/image/home/3.png"></image>
+                    	<view>{{ takeawayer_info.takeawayer_mobile }}</view>
+                    </view>
+                    <view>
+                    	<image src="/static/image/home/4.png"></image>
+                    	<view class="address u-line-1">{{ takeawayer_info.company_name }}</view>
+                    </view>
+                </view>
+            </view>
+            <view v-else style="padding-bottom: 20rpx;">
+                <view class="timelinetitle">自提信息</view>
+                <view>
+                    <view class="ziti-title">凭证图片</view>
+                    <image class="certificate-img" :src="mineBy_img" @tap="viewImage" mode="aspectFill"></image>
+                </view>
+                <view>
+                    <view class="ziti-title">备注:</view>
+                    <view class="u-line-5">{{ mineBy_text }}</view>
+                </view>
+            </view>
 		</view>
 		<!-- 已完成 -->
 		<!-- 退款处理 -->
@@ -148,6 +189,42 @@
 				<view class="determine" @click="confirm">确定</view>
 			</view>
 		</u-popup>
+        <u-popup class="invoice-box" v-model="show_invoice" :mask-close-able="false" mode="center" length="540rpx" border-radius="10">
+            <view class="title">
+                <text>发票信息</text>
+                <u-icon class="close" name="close" @click="show_invoice=false"></u-icon>
+            </view>
+            <view class="info">
+                <view>
+                    <text>发票抬头：</text>
+                    <view class="u-line-2">{{ invoiceList.invoice_title }}</view>
+                </view>
+                <view v-if="invoice_type==2">
+                    <text>税号：</text>
+                    <text>{{ invoiceList.invoice_code }}</text>
+                </view>
+                <view v-if="invoice_type==2">
+                    <text>单位地址：</text>
+                    <view class="u-line-3">{{ invoiceList.invoice_goto_addr }}</view>
+                </view>
+                <view>
+                    <text>电话号码：</text>
+                    <text>{{ invoiceList.invoice_rec_mobphone }}</text>
+                </view>
+                <view v-if="invoice_type==2">
+                    <text>开户银行：</text>
+                    <view class="u-line-3">{{ invoiceList.invoice_reg_bname }}</view>
+                </view>
+                <view v-if="invoice_type==2">
+                    <text>银行账户：</text>
+                    <text>{{ invoiceList.invoice_reg_baccount }}</text>
+                </view>
+                <view v-if="invoice_type==1">
+                    <text>身份证号：</text>
+                    <text>{{ invoiceList.invoice_code }}</text>
+                </view>
+            </view>
+        </u-popup>
 		<u-toast ref="uToast" />
 	</view>
 </template>
@@ -157,6 +234,7 @@ export default {
 		return {
 			status: 1, // 订单状态
 			cur: null,
+      show_invoice: false, // 发票
 			showDelivery: false, // 填写骑手信息
 			showExpress: false, // 填写快递单号
 			showRefunds: false, // 平台退货处理
@@ -186,13 +264,23 @@ export default {
 			companyidA: null, //物流派送公司id
 			companyidB: null, //骑手派送公司id
 			value:"",
-			refundid:null
+			refundid:null,
+			is_invoice: 0, // 判断发票
+			invoice_type: null,
+			invoiceList: {}, // 发票数据
+			users_type: "", // 用户选择发货type
+			ordered_type: 0, // 发货方式的状态
+      takeawayer_info: {}, // 骑手信息
+			mineBy_img: "", // 自提图片
+			mineBy_text: "", // 自提备注
+			pushstyleBshow: false
 		};
 	},
 	onLoad(option) {
 		this.type = option.type;
-		console.log(this.type)
+		// console.log(this.type)
 		this.orderid = option.id;
+        
 		this.resetinfo();
 		if (this.type == 1) {
 			// 获取快递公司
@@ -200,7 +288,7 @@ export default {
 		}
 		if (this.type == 2) {
 			// 获取物流信息
-			this.getcarinfo();
+			// this.getcarinfo();
 		}
 		// 订单状态： 0:全部 1已付款未发货 2已发货 3已完成 4申请退款/退货 5已退款/退货 6拒绝退款/退货
 	},
@@ -247,19 +335,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() {
@@ -271,6 +380,14 @@ export default {
 				}
 			});
 		},
+        // 查询物流
+        // getcarinfo() {
+        //     this.$u.api.getcarinfo({
+        //         order_id: this.orderid
+        //     }).then(res => {
+        //         console.log(res);
+        //     })
+        // },
         // 保存订单号
         saveDelivery() {
             if (!this.pushid) {
@@ -280,7 +397,8 @@ export default {
                 })
                 return
             }
-            this.showExpress = false;
+			this.showExpress = false;
+			this.pushstyleBshow = true
         },
 		// 取消退款
 		cancel() {
@@ -290,14 +408,15 @@ export default {
 		//
 		confirm() {
 			this.showRefunds = false;
-            if (!this.refundid) {
-                this.$refs.uToast.show({
-                	title: "请选择商品",
-                	type: "warning"
-                });
-                return;
-            }
+            // if (!this.refundid) {
+            //     this.$refs.uToast.show({
+            //     	title: "请选择商品",
+            //     	type: "warning"
+            //     });
+            //     return;
+            // }
 			if (this.cur == 0) {
+                console.log(this.refundid);
 				// 确定退款
 				this.$u.api.refund({
 					refund_id: this.refundid,
@@ -314,10 +433,10 @@ export default {
 							title: res.message,
 							type: 'success'
 						});
-                        let pages = getCurrentPages();
-                        let prePage = pages[pages.length - 2];
-                        console.log(prePage.$vm);
-                        prePage.$vm.del_id = this.orderid;
+						let pages = getCurrentPages();
+						let prePage = pages[pages.length - 2];
+						console.log(prePage.$vm);
+						prePage.$vm.del_id = this.orderid;
 						uni.navigateBack({
 							delta: 1
 						});
@@ -366,24 +485,25 @@ export default {
 		},
 		// 绑定配送方式
 		confirmpushstyle() {
-            // console.log(this.cur);
-            if (this.cur < 0) {
-                this.$refs.uToast.show({
-                    title: '请选择派送方式！',
-                    type: 'warning ',
-                })
-                return;
-            }
+			// console.log(this.cur);
+			if (this.cur < 0) {
+					this.$refs.uToast.show({
+							title: '请选择派送方式！',
+							type: 'warning ',
+					})
+					return;
+			}
 			if (this.cur == 0) {
-                if (!this.companyidA) {
-                    this.$refs.uToast.show({
-                        title: '请选择派送方式！',
-                        type: 'warning ',
-                    })
-                    return;
-                }
+				if (!this.companyidA) {
+						this.$refs.uToast.show({
+								title: '请选择派送方式！',
+								type: 'warning ',
+						})
+						return;
+				}
 				// console.log(this.pushid);
 				this.$u.api.bindpushid({
+          store_deliver_type: 1,
 					order_id: this.orderid,
 					shipping_code: this.pushid,
 					shipping_express_id: this.companyidA.express_id
@@ -404,14 +524,15 @@ export default {
 					}
 				});
 			} else if (this.cur == 1) {
-                if (!this.selctcar) {
-                    this.$refs.uToast.show({
-                        title: '请选择派送方式！',
-                        type: 'warning ',
-                    })
-                    return;
-                }
+				if (!this.selctcar) {
+						this.$refs.uToast.show({
+								title: '请选择派送方式！',
+								type: 'warning ',
+						})
+						return;
+				}
 				this.$u.api.bindcarer({
+          store_deliver_type: 2,
 					order_id: this.orderid,
 					takeawayer_id: this.selctcar.takeawayer_id
 				}).then(res => {
@@ -432,14 +553,21 @@ export default {
 					}
 				});
 			} else {
-                uni.navigateTo({
-                    url: "mention?id=" + this.orderid
-                })
-            }
+					uni.navigateTo({
+							url: "mention?id=" + this.orderid
+					})
+			}
+		},
+		// 显示发票
+		showInvoice() {
+			if (this.is_invoice) {
+					this.show_invoice = true;
+			}
 		},
 		// 选择骑手
 		getselect(e) {
 			this.selctcar = this.list[e[0].value];
+			this.pushstyleBshow = true
 		},
 		// 获取订单信息
 		resetinfo() {
@@ -454,7 +582,21 @@ export default {
 					});
 				} else {
 					this.info = res.data;
-                    this.cur = res.data.is_selfraising;
+					this.cur = res.data.member_deliver_type - 1;
+					this.users_type = res.data.member_deliver_type; // 用户选择发货方式
+					this.invoiceList = res.data.extend_order_common.invoice_info;
+					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);
 				}
 			});
 			this.$u.api.takeawayerlist({}).then(res => {
@@ -473,7 +615,24 @@ export default {
 					this.list = arr;
 				}
 			});
-		}
+		},
+        // 预览图片
+        viewImage() {
+            console.log(this.mineBy_img);
+            uni.previewImage({
+                urls: this.mineBy_img,
+                current: 1
+            })
+        },
+        // 复制到粘贴板
+        longtap(text) {
+            console.log(text);
+            uni.setClipboardData({
+                data: text,
+                success: (res) => {
+                }
+            });
+        }
 	}
 };
 </script>
@@ -560,6 +719,51 @@ export default {
 			}
 		}
 	}
+    .refunds-user-two {
+        padding: 25rpx 0;
+        background-color: #ffffff;
+        margin-bottom: 20rpx;
+        > view {
+        	display: flex;
+        	align-items: center;
+        	justify-content: space-between;
+        	margin-bottom: 30rpx;
+        	@mixin image-class($width, $right) {
+        		> image {
+        			flex-shrink: 0;
+        			width: $width;
+        			height: 40rpx;
+        			margin-right: $right;
+        		}
+        	}
+        	&:first-child {
+        		@include image-class($width: 40rpx, $right: 20rpx);
+        	}
+        	&:nth-child(2) {
+        		margin-left: 4rpx;
+        		@include image-class($width: 32rpx, $right: 24rpx);
+        	}
+        	&:last-child {
+        		margin-left: 2rpx;
+        		@include image-class($width: 36rpx, $right: 22rpx);
+        	}
+        	> view {
+        		flex: 1;
+        		font-size: 26rpx;
+        		color: rgba(51, 51, 51, 1);
+        	}
+        }
+    }
+    .ziti-title {
+        margin: 20rpx 0 10rpx;
+        font-size: 28rpx;
+        color: #333;
+    }
+    .certificate-img {
+        width: 320rpx;
+        height: 240rpx;
+        border-radius: 4rpx;
+    }
 	.user-info {
 		.info-title {
 			font-size: 30rpx;
@@ -574,10 +778,16 @@ 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;
@@ -591,6 +801,11 @@ export default {
 					font-size: 26rpx;
 					flex: 1;
 				}
+                .invoice {
+                    margin-left: auto;
+                    font-size: 26rpx;
+                    color: #333;
+                }
 				image{
 					width: 40rpx;
 					height: 40rpx;
@@ -615,7 +830,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);
@@ -633,11 +848,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;
@@ -766,5 +981,35 @@ export default {
 			}
 		}
 	}
+    .invoice-box {
+        .title {
+            display: flex;
+            align-items: center;
+            justify-content: flex-end;
+            padding: 20rpx 20rpx 0 20rpx;
+            text-align: center;
+            .close {
+                margin-left: 180rpx;
+            }
+        }
+        .info {
+            padding: 30rpx;
+            & > view {
+                display: flex;
+                margin: 10rpx 0;
+                & > text:first-child {
+                    flex-shrink: 0;
+                    width: 140rpx !important;
+                    text-align: right;
+                }
+                & > text:last-child {
+                    width: 320rpx !important;
+                    overflow: hidden;
+                    white-space: nowrap;
+                    text-overflow: ellipsis;
+                }
+            }
+        }
+    }
 }
 </style>

pages/index/index.vue

@@ -156,7 +156,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拒绝退款/退货
 	},
@@ -294,7 +294,7 @@ export default {
 		getshiftlist() {
 			let that = this;
 			this.$u.api.getshiftlist({}).then(res => {
-				console.log(JSON.stringify(res));
+				// console.log(JSON.stringify(res));
 				if (res.errCode != 0) {
 					this.$refs.uToast.show({
 						title: res.message,

pages/index/mention.vue

@@ -69,6 +69,7 @@
                 }
                 // 提交
                 this.$u.api.bindmention({
+                    store_deliver_type: 3,
                     shipping_express_id: "e1000",
                     deliver_explain: this.textareaVal,
                     order_id: this.order_id,

pages/login/login.vue

@@ -11,16 +11,16 @@
 						商家登录
 					</view>
 					<view v-bind:class="[state==1 ? 'show' : '']" @click="changetab(1)">
-						达人登录
+						商家达人
 					</view>
                     <view v-bind:class="[state==2 ? 'show' : '']" @click="changetab(2)">
-                    	平台达人登录
+                    	平台达人
                     </view>
 				</view>
 				<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>
@@ -45,7 +45,9 @@
                     <view class="labales">
                     	<image src="../../static/image/login/safe.png"></image>
                     	<input v-model="code" type="number" placeholder="请输入验证码" />
-                        <u-button class="get-code">获取验证码</u-button>
+                        <u-button class="get-code" :class=" is_sendcode ? 'stopClick' : '' " :disabled="is_sendcode" @click="getCode">
+                            {{ is_sendcode ? time_count + "后可以重新发送" : "发送验证码" }}
+                        </u-button>
                     </view>
                 </view>
 			</view>
@@ -77,7 +79,11 @@ export default {
             phone: "",
             code: "",
 			state:0,
-			clickstate:false
+			clickstate:false,
+            // 时间
+            timer: null,
+            is_sendcode: false, // 60s
+            time_count: 60,
 		};
 	},
 	methods: {
@@ -98,10 +104,39 @@ export default {
 		},
 		// 获取验证码倒计时
 		getCode() {
-			console.log('11');
-			this.loading();
+            if (!this.$u.test.mobile(this.phone)) {
+                this.$refs.uToast.show({
+                    title: '手机号码有误！',
+                })
+                return;
+            }
+            this.$u.api.getCode({
+                member_mobile: this.phone,
+            }).then(res => {
+                console.log(res);
+                if (res.errCode == 0) {
+                    this.$refs.uToast.show({
+                        title: res.message,
+                        type: 'success',
+                    })
+                    this.getSendCode();
+                } else {
+                    this.$refs.uToast.show({
+                        title: res.message,
+                        type: "warning"
+                    })
+                }
+            })
 		},
-		loading() {},
+        // 失去焦点获取数据
+        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);
@@ -137,7 +172,38 @@ export default {
 						});
 					}
 				});
-			}else{
+			}else if (this.state == 2) {
+                if (!this.$u.test.mobile(this.phone)) {
+                    this.$refs.uToast.show({
+                        title: '手机号码有误！',
+                    })
+                    return;
+                }
+                if (this.code.length < 4) {}
+                this.$u.api.starLogin({
+                    member_mobile: this.phone,
+                    sms_code: this.code,
+                }).then(res => {
+                    if (res.errCode == 0) {
+                        this.$refs.uToast.show({
+                            title: res.message,
+                            type: 'success',
+                        })
+                        uni.setStorageSync('token', res.data.token);
+                        uni.setStorageSync('userinfo', res.data);
+                        uni.setStorageSync('rongyun', res.data.rongcloud_token);
+                        this.$u.route({
+                        	url: '/pages/user/myinfo',
+                        	type:"redirect"
+                        });
+                    } else {
+                        this.$refs.uToast.show({
+                            title: res.message,
+                            type: "warning"
+                        })
+                    }
+                })
+            } else{
 				this.$u.api.shoplogin({ member_name: this.zhanghao, member_password: this.mima }).then(res => {
 					console.log(JSON.stringify(res))
 					if (res.errCode != 0) {
@@ -159,6 +225,23 @@ export default {
 				});
 			}
 		},
+        // 60s
+        getSendCode() {
+            const TIME_COUNT = 60;
+            if (!this.timer) {
+                this.time_count = TIME_COUNT;
+                this.is_sendcode = true;
+                this.timer = setInterval(() => {
+                    if (this.time_count > 0 && this.time_count <= TIME_COUNT) {
+                        this.time_count--;
+                    } else {
+                        this.is_sendcode = false;
+                        clearInterval(this.timer);
+                        this.timer = null;
+                    }
+                }, 1000);
+            }
+        },
         moveHandle(){
             return;
         }
@@ -267,9 +350,10 @@ export default {
 	}
     
     .get-code {
-        width: 250rpx !important;
+        width: auto !important;
         height: 60rpx !important;
-        font-size: 30rpx !important;
+        padding: 0 30rpx !important;
+        font-size: 24rpx !important;
         line-height: 60rpx !important;
         color: #fff !important;
         border: none !important;

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

@@ -137,7 +137,8 @@ export default {
 			selectarr: [], //选中标签
 			tagcontent: '',
 			is_edit: false, // 编辑
-			userinfo:{}
+			userinfo:{},
+            device: null, // 手机信息
 		};
 	},
 	onLoad() {
@@ -146,6 +147,8 @@ export default {
 
 		this.tosign();
 		this.getLiveSpec();
+        
+        this.device = uni.getSystemInfoSync(); // 获取信息
 	},
 	methods: {
 		publish() {
@@ -154,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,
@@ -277,7 +280,18 @@ export default {
         },
 		// 上传封面
 		uploadcover(data) {
-			console.log(data);
+			// console.log(data.data);
+            // #ifdef APP-PLUS
+            plus.io.getImageInfo({
+                src: data.data.file_path,
+                success: (res) => {
+                    console.log(res);
+                },
+                fail: (err) => {
+                    console.log(err);
+                }
+            })
+            // #endif
 			if (data.errCode != 0) {
 				this.$refs.uToast.show({
 					title: '上传失败',

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="优秀的标题可以卖的更好哦~" />
+						<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/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">德铭阳光在线绿色直播，请遵循相关法律法规，警察叔叔24小时巡查哦。为了保障直播系统稳定，现将全局开放防主播沉迷功能。主播积累直播16小时将自动下播休息2小时后方可继续开播。请大家注意休息/避免空播。
+        <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>
@@ -73,10 +73,10 @@
         </view>
         </div>
         <div class="jieshu" v-if="!zhibo" :style="{'height':height + 'px'}">
-            <div class="jieshuback" :style="{'height':height + 'px'}"></div>
+            <div class="jieshuback" :style="{'height':height + 'px'}" @click="closes1"></div>
             <image class="closeimg" src="../../static/image/cloneb.png" @click="closes"></image>
             <text class="jieshutitle">徳铭阳光在线</text>
-            <image class="jieshuheadimg" :src="info.member_avatar"></image>
+            <image class="jieshuheadimg" @click="closes1" :src="info.member_avatar"></image>
             <text class="jieshuusername">{{info.member_nickname}}</text>
             <div class="jieshubox">
                 <view class="jieshuboxitem">
@@ -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;margin-top:10rpx">热度</text>
+                    <text style="color:#fff;font-size:30rpx">{{jieshu.headcount}}</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>
@@ -138,7 +138,8 @@
 .jieshutitle{
     font-size: 30rpx;
     color:#fff;
-    position: fixed;
+    width: 350rpx;
+    position: absolute;
     top: 70rpx;
     left: 31rpx;
     height: 31rpx;
@@ -150,9 +151,9 @@
     left: 0;
     top: 0;
     width: 750rpx;
-    
 }
 .jieshu{
+    z-index: 9999;
     position: fixed;
     top: 0;
     left: 0;
@@ -175,7 +176,7 @@
     bottom: 24rpx;
 }
 .closeimg{
-    position: fixed;
+    position: absolute;
     top: 70rpx;
     right: 31rpx;
     width: 51rpx;
@@ -343,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;
@@ -373,18 +375,30 @@
             danmulist:[],
             zhibo:true,
             jieshu:{},
-            renshumax:0
+            renshumax:0,
+            changeLiveRealtimeNumber:{},
+            fen:true
         },
         onLaunch: function() {
             console.log('App Launch');
         },
         onShow: function() {
+            if(!this.zhibo){
+                return ;
+            }
             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() {
@@ -434,6 +448,7 @@
             return true;  
         }, 
         onLoad(a){
+            
 		    console.log(getApp().globalData.im)
             uni.setKeepScreenOn({
                 keepScreenOn: true
@@ -444,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",
@@ -485,6 +501,7 @@
                     that.chatRoomService.warrings = that.jinggao
                     //获取当前聊天室数据
                     that.room = that.chatRoomService.room;
+                    console.log(that.room)
                     that.chatRoomService.initialWhenOnlineUserChange(that.renqu)
                 }
             })
@@ -497,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
@@ -516,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);
 	
 
@@ -597,6 +635,7 @@
                 if(res.users.length > this.renqu){
                     this.renqu = res.users.length
                 }
+                this.$forceUpdate()
             },
             whenNewMessage (message) {//新消息监听
 				// if(message.type == this.room.MessageType.PROP){
@@ -619,13 +658,19 @@
                     duration: 2000
                 });
             },
+            closes1() {
+                console.log(111);
+            },
             closes(){
+                console.log(this.zhibo)
                 if(!this.zhibo){
                     uni.navigateBack({
                         delta:1
                     });
                     return ;
                 }
+                this.chatRoomService.warrings = ()=>{};
+
                 const token = uni.getStorageSync('token');
                 let that = this
                 console.log(that.url)

pages/user/complaintDetails.vue

@@ -47,6 +47,7 @@ export default {
 			this.$u.api.reportdetail({
 				id: id
 			}).then(res => {
+				console.log(res)
 				if (res.errCode != 0) {
 					this.$refs.uToast.show({
 						title: res.message,

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>
@@ -160,6 +160,7 @@ export default {
             align-items: center;
             
             >image{
+                flex-shrink: 0;
                 width: 110rpx;
                 height: 110rpx;
                 border-radius: 50%;

pages/user/info.vue

@@ -12,7 +12,7 @@
 			<text class="title">个性签名</text>
 			<input type="text" value="" v-model="info.signature" placeholder="请输入个性签名"/>
 		</view>
-		<view class="password" @click="updatePwd">
+		<view class="password" @click="updatePwd" v-if="role != 4">
 			<text>修改密码</text>
 			<image src="/static/image/user/1.png"></image>
 		</view>
@@ -27,11 +27,15 @@ export default {
 			fileurl: "",
 			filename:"",
 			info:{},
-			num:0
+			num:0,
+            role: 0,
 		};
 	},
 	onLoad() {
-		this.getmyinfo()
+		this.getmyinfo();
+        let userinfo = uni.getStorageSync("userinfo");
+        this.role = userinfo.role;
+        // console.log(this.role);
 	},
 	onNavigationBarButtonTap() {
 		let that = this;

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: {
@@ -278,6 +278,7 @@ export default {
             align-items: center;
             
             >image{
+                flex-shrink: 0;
                 width: 110rpx;
                 height: 110rpx;
                 border-radius: 50%;

static/imservice.js

@@ -36,7 +36,7 @@ function CurrentUser(uuid, name, avatar) {
 function IMService() {
     this.im = GoEasyIM.getInstance({
         host:'hangzhou.goeasy.io',//qos=1
-        appkey:'BC-453aa755c4ea48148abefc55a86df283'
+        appkey:'BC-d9b5e639006b4ee2a4bc9eddc4235a6a'
     });
     //当前“我”
     this.currentUser = null;