Merge pull request 'cmx' (#21) from cmx into master

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

.gitignore

@@ -1,2 +1,3 @@
 .vscode
 node_modules
+unpackage

App.vue

@@ -1,18 +1,18 @@
 <script>
 export default {
 	onLaunch: function() {
-			console.log('App Launch')
+		console.log('App Launch');
 	},
 	onShow: function() {
-			console.log('App Show')
+		console.log('App Show');
 	},
 	onHide: function() {
-			console.log('App Hide')
-		}
+		console.log('App Hide');
 	}
+};
 </script>
 
 <style lang="scss">
 /*每个页面公共css */
-	@import "uview-ui/index.scss";
+@import 'uview-ui/index.scss';
 </style>

common/http.api.js

@@ -4,12 +4,14 @@
 const install = (Vue, vm) => {
 	// 此处没有使用传入的params参数
 	let api = {
+		// 获取标签
         getLiveSpec(){
             return vm.$u.get("Streaming/getLiveSpec")
         },
         login({member_name,member_password}){
-            return vm.$u.post("Login/login",{member_name,member_password})
+            return vm.$u.get("/Login/expertLogin",{member_name,member_password})
         },
+		// 创建标签
         createLivesp({spec_name}){
             return vm.$u.post("Streaming/createLivesp",{spec_name})
         },
@@ -21,7 +23,118 @@ const install = (Vue, vm) => {
         },
         liveStreamList(){
             return vm.$u.post("Streaming/liveStreamList")
+        },
+		// 获取订单列表
+		getorderlist({type,page}){
+			return vm.$u.get("/Order/orderList",{type,page})
+		},
+		// 获取试穿订单列表
+		getshiftlist(){
+			return vm.$u.get("/order/goodsTryOrderList")
+		},
+		// 获取轮播图列表
+		getswiper(){
+			return vm.$u.get("/Order/orderList")
+		},
+		// 商家登陆
+		shoplogin({member_name,member_password}){
+		    return vm.$u.get("/Login/storeLogin",{member_name,member_password})
+		},
+		// 获取个人信息
+		getshopinfo(){
+		    return vm.$u.post("/member/memberInfo")
+		},
+		// 获取粉丝列表
+		myfanlist(){
+		    return vm.$u.post("/member/myFansList")
+		},
+		// 修改个人信息
+		changeinfo({nickname,avatar,signature}){
+		    return vm.$u.post("/Member/changeMemberInfo",{nickname,avatar,signature})
+		},
+		// 获取内容列表
+		articlelist({type,page}){
+		    return vm.$u.post("/Article/articleList",{type,page})
+		},
+		// 删除文章
+		delarticle({article_id}){
+		    return vm.$u.post("/article/articleDelete",{article_id})
+		},
+		// 骑手列表
+		takeawayerlist(){
+		    return vm.$u.get("/Order/getTakeawayerList")
+		},
+		// 投诉列表
+		reportlist(){
+		    return vm.$u.post("/takeawayer/complaintTKList")
+		},
+		// 投诉详情
+		reportdetail({id}){
+		    return vm.$u.post("/takeawayer/complaintInfo",{id})
+		},
+		// 可以投诉的订单
+		canreportorder(){
+		    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})
+		},
+		// 文章详情
+		getdetail({article_id}){
+		    return vm.$u.post("/article/articleInfo",{article_id})
+		},
+		// 回复评论
+		reply({article_id,pid,content}){
+		    return vm.$u.post("/article/articleAddComment",{article_id,pid,content})
+		},
+		// 达人是否可以直播
+		canlive(){
+		    return vm.$u.post("/Streaming/expt_live")
+		},
+		// 可选择直播商品列表
+		canselectgood(){
+		    return vm.$u.post("/article/getStoreGoodsList")
+		},
+		// 发布图文
+		publishphoto({article_title,article_content,article_pic,file_id,goods_id_arr,label_arr}){
+		    return vm.$u.post("/article/publishImage",{article_title,article_content,article_pic,file_id,goods_id_arr,label_arr})
+		},
+		// 发布视频
+		publishvideo({article_title,article_content,article_pic,video_path,goods_id_arr,label_arr}){
+		    return vm.$u.post("/article/publishVideo",{article_title,article_content,article_pic,video_path,goods_id_arr,label_arr})
+		},
+		// 订单详情
+		orderdetail({order_id}){
+		    return vm.$u.post("/Order/orderInfo",{order_id})
+		},
+		// 试穿订单详情
+		testorderdetail({goods_try_id}){
+		    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})
+		},
+		// 绑定骑手
+		bindcarer({order_id,takeawayer_id}){
+		    return vm.$u.post("/order/orderRider",{order_id,takeawayer_id})
+		},
+		// 发货物流公司
+		pushcompany(){
+		    return vm.$u.post("/order/getExpress")
+		},
+		// 退款退货
+		refund({refund_id,seller_state,seller_message}){
+		    return vm.$u.post("/order/editRefund",{refund_id,seller_state,seller_message})
+		},
+		// 试穿
+		agreetest({goods_try_id,type,takeawayer_id}){
+			return vm.$u.post("/order/goodsTryAgree",{goods_try_id,type,takeawayer_id})
 		}
+		
+		
     }
 	// 将各个定义的接口名称，统一放进对象挂载到vm.$u.api(因为vm就是this，也即this.$u.api)下
 	vm.$u.api = api;

common/http.interceptor.js

@@ -1,20 +1,21 @@
 const install = (Vue, vm) => {
 	// 此为自定义配置参数，具体参数见上方说明
 	Vue.prototype.$u.http.setConfig({
-        baseUrl: 'https://dmmall.sdbairui.com//storeapi',
+        baseUrl: 'https://dmmall.sdbairui.com/storeapi',
 		loadingText: '努力加载中~',
 		loadingTime: 800,
-		// 设置自定义头部content-type
-		// header: {
-        //     "Authorization" : "122"
-		// }
-		// ......
+		originalData: true,
+	
     });
     Vue.prototype.$u.http.interceptor.request = (config) => {
         const token = uni.getStorageSync('token');
 		config.header.Authorization = 'Bearer' + " " + token;
 		return config;
 	}
+	Vue.prototype.$u.http.interceptor.response = (res) => {
+		// todo 判断状态码
+		return res.data;
+	}
 }
 
 export default {

components/complaint-item/index.vue

@@ -1,12 +1,12 @@
 <template>
 	<view class="item">
-		<image></image>
+		<image :src="info.complain_goods_image"></image>
 		<view class="people">
-			<view class="status">已受理</view>
-			<view class="goods-name u-line-1">心机小黑裙连衣裙赫本风夏季爆款...</view>
+			<view class="status">{{info.complain_status==0?"未受理":"已审核"}}</view>
+			<view class="goods-name u-line-1">{{info.complain_goods_name}}</view>
 			<view class="info">
-				<view class="name">骑手：李先生</view>
-				<view class="price">￥199.9</view>
+				<view class="name">骑手：{{info.takeawayer_name}}</view>
+				<view class="price">￥{{info.complain_goods_price*info.complain_goods_num}}</view>
 			</view>
 		</view>
 	</view>
@@ -16,8 +16,14 @@ export default {
 	data() {
 		return {}
 	},
-	methods: {
+	props: {
+		info:{
+			type: Object,
+			default: null
+		}
 	},
+	methods: {
+	}
 };
 </script>
 <style lang="scss" scoped>
@@ -35,7 +41,6 @@ export default {
 		height: 160rpx;
 		flex-shrink: 0;
 		margin-right: 25rpx;
-		background-color: aqua;
 	}
 	.people {
 		.status {

components/content-item/index.vue

@@ -1,24 +1,24 @@
 <template>
 	<view class="content-item">
 		<view class="image">
-			<image class="cover"></image>
-			<image src="/static/image/user/5.png" class="play-icon" v-if="cur==1"></image>
+			<image class="cover" :src="info.article_pic" alt="没有图片"></image>
+			<image src="/static/image/user/5.png" class="play-icon" v-if="type==2"></image>
 		</view>
-		<view class="right" @click="toDetailsPage">
-			<u-icon name="close" color="#999999" size="27" @click.stop="showPopup"></u-icon>
-			<view class="tags u-line-2">#配饰就该这么搭#</view>
+		<view class="right" >
+			<u-icon name="close" color="#999999" size="27" @click="showPopup(info.article_id)"></u-icon>
+			<view class="tags u-line-2" @click="toDetailsPage">{{info.article_title}}</view>
 			<view class="data">
 				<view>
 					<image src="/static/image/user/2.png"></image>
-					<text>2.5w</text>
+					<text>{{info.comment_num}}</text>
 				</view>
 				<view>
 					<image src="/static/image/user/3.png"></image>
-					<text>2.5w</text>
+					<text>{{info.collect_num}}</text>
 				</view>
 				<view>
 					<image src="/static/image/user/4.png"></image>
-					<text>2.5w</text>
+					<text>{{info.like_num}}</text>
 				</view>
 			</view>
 		</view>
@@ -30,19 +30,27 @@ export default {
 		return {}
 	},
 	props: {
-		cur: [Number, String],
+		info:{
+			type: Object,
+			default: null
+		},
+		type:{
+			type: Number,
+			default: 1
+		},
 		delItem: {
 			type: Function,
 			default: null
 		}
 	},
 	methods: {
-		showPopup() {
-			this.delItem();
+		showPopup(id) {
+			console.log(12345,id)
+			this.$emit("del",id)
 		},
 		toDetailsPage() {
 			uni.navigateTo({
-				url: '/pages/user/contentDetails?current=' + this.cur
+				url: '/pages/user/contentDetails?current=' + this.type+'&id=' + this.info.article_id
 			});
 		}
 	},
@@ -61,7 +69,7 @@ export default {
 			width: 160rpx;
 			height: 160rpx;
 			border-radius: 10rpx;
-			background-color: aqua;
+			// background-color: aqua;
 			flex-shrink: 0;
 		}
 		.play-icon {

components/fans-item/index.vue

@@ -1,15 +1,18 @@
 <template>
 	<view class="fans-item">
-		<image></image>
-		<view class="name">兽兽</view>
-		<view class="date">2017-10-14</view>
+		<image :src="info.friend_frommavatar"></image>
+		<view class="name">{{info.fromMemberNickname}}</view>
+		<view class="date">{{info.fromMemberFriendAddtime}}</view>
 	</view>
 </template>
 <script>
 export default {
 	data() {
 		return {}
-	}
+	},
+	props: {
+		info: Object
+	},
 };
 </script>
 <style lang="scss" scoped>

components/order-item/index.vue

@@ -1,12 +1,23 @@
 <template>
 	<view class="item" @click="toDetailsPage">
-		<image></image>
+		<image :src="info.extend_order_goods[0].goods_image"></image>
 		<view class="goods">
-			<view class="status" v-if="cur==4">待处理订单</view>
-			<view class="name u-line-1">心机小黑裙连衣裙赫本风夏季爆款...</view>
+			<view class="box">
+				<view class="">
+					编号：{{info.order_sn}}
+				</view>
+				<!-- 1待处理 2已发货 3已完成 4申请退款 5已退款 6拒绝退款 -->
+				<view class="status" v-if="info.view_type==1">待处理订单</view>
+				<view class="status" v-else-if="info.view_type==2">已发货订单</view>
+				<view class="status" v-else-if="info.view_type==3">已完成订单</view>
+				<view class="status" v-else-if="info.view_type==4">申请退款订单</view>
+				<view class="status" v-else-if="info.view_type==5">已退款订单</view>
+				<view class="status" v-else-if="info.view_type==6">拒绝退款订单</view>
+			</view>
+			<view class="name u-line-1">{{info.extend_order_goods[0].goods_name}}</view>
 			<view class="info">
-				<view class="num">共一件商品</view>
-				<view class="price">实付<span>￥199.9</span></view>
+				<view class="num">共{{info.extend_order_goods[0].goods_num}}件商品</view>
+				<view class="price">实付<span>￥{{info.extend_order_goods[0].goods_pay_price}}</span></view>
 			</view>
 		</view>
 	</view>
@@ -17,12 +28,13 @@ export default {
 		return {}
 	},
 	props: {
-		cur: [Number, String]
+		cur: [Number, String],
+		info: Object
 	},
 	methods: {
 		toDetailsPage() {
 			uni.navigateTo({
-				url: '/pages/index/details?current=' + this.cur
+				url: '/pages/index/details?id=' + this.info.order_id+"&type="+this.info.view_type
 			});
 		},
 	},
@@ -43,16 +55,22 @@ export default {
 		height: 160rpx;
 		flex-shrink: 0;
 		margin-right: 25rpx;
-		background-color: aqua;
 	}
 	.goods {
 		display: flex;
 		flex-direction: column;
 		align-items: flex-start;
 		justify-content: center;
+		.box{
+			width: 100%;
+			display: flex;
+			justify-content: space-between;
+			font-size: 24rpx;
+		}
 		.status {
+			width: 120rpx;
 			align-self: flex-end;
-			font-size: 26rpx;
+			font-size: 24rpx;
 			color: rgba(255,49,49,1);
 			margin-bottom: 30rpx;
 		}

components/order-item/testlist.vue

@@ -0,0 +1,98 @@
+<template>
+	<view class="item" @click="toDetailsPage">
+		<image :src="info.goods_pic"></image>
+		<view class="goods">
+			<view class="">
+				<!-- 0:待处理订单 20:同意 40:拒绝此订单 -->
+				<view class="status" v-if="info.goods_try_order_status==0">待处理订单</view>
+				<view class="status" v-if="info.goods_try_order_status==20">已接单订单</view>
+				<view class="status" v-if="info.goods_try_order_status==40">已拒绝订单</view>
+				<view class="status" v-if="info.goods_try_order_status==50">已完成订单</view>
+			</view>
+			
+			<view class="name u-line-1">{{info.goods_name}}</view>
+			<view class="info">
+				<view class="num">共{{info.goods_try_num}}件商品</view>
+				<view class="price">实付<span>￥{{info.price}}</span></view>
+			</view>
+		</view>
+	</view>
+</template>
+<script>
+export default {
+	data() {
+		return {}
+	},
+	props: {
+		cur: [Number, String],
+		info: Object
+	},
+	methods: {
+		toDetailsPage() {
+			let type =0
+			let info = this.info
+			if(info.goods_try_order_status==0){
+				type=1
+			}else if(info.goods_try_order_status==20){
+				type=2
+			}else if(info.goods_try_order_status==40){
+				type=3
+			}else if(info.goods_try_order_status==50){
+				type=4
+			}
+			uni.navigateTo({
+				url: '/pages/index/otherdetails?id=' + this.info.goods_try_id+"&type="+type
+			});
+		},
+	},
+};
+</script>
+<style lang="scss" scoped>
+.item {
+	margin: 0 auto 20rpx;
+	width: 690rpx;
+	height: 220rpx;
+	background: rgba(255,255,255,1);
+	border-radius: 10rpx;
+	padding: 30rpx;
+	display: flex; 
+	align-items: center;
+	> image {
+		width: 160rpx;
+		height: 160rpx;
+		flex-shrink: 0;
+		margin-right: 25rpx;
+	}
+	.goods {
+		display: flex;
+		flex-direction: column;
+		align-items: flex-start;
+		justify-content: center;
+		.status {
+			align-self: flex-end;
+			font-size: 26rpx;
+			color: rgba(255,49,49,1);
+			margin-bottom: 30rpx;
+		}
+		.name {
+			width: 439rpx;
+			font-size: 28rpx;
+			color: rgba(51,51,51,1);
+			margin-bottom: 30rpx;
+		}
+		.info {
+			width: 100%;
+			display: flex;
+			align-items: center;
+			font-size: 26rpx;
+			color: rgba(102,102,102,1);
+			.price {
+				margin-left: 10rpx;
+				> span {
+					color: #FF780F;
+				}
+			}
+		}
+	}
+}
+</style>

package-lock.json

@@ -6,13 +6,8 @@
   "dependencies": {
     "uview-ui": {
       "version": "1.5.2",
-<<<<<<< HEAD
       "resolved": "https://registry.npmjs.org/uview-ui/-/uview-ui-1.5.2.tgz",
       "integrity": "sha512-FV9G+gZTAZKEE2m85ahIbIRiC/fdzTl+eNXDIMBoyc9b+fQWQhEtmAfu6huu7AtKuTI6gfqaYn6WGcmqYvr76w=="
-=======
-      "resolved": "https://registry.npm.taobao.org/uview-ui/download/uview-ui-1.5.2.tgz?cache=0&sync_timestamp=1594781920423&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fuview-ui%2Fdownload%2Fuview-ui-1.5.2.tgz",
-      "integrity": "sha1-4jDud0TIBjMJe74GU+IyvJSyAwk="
->>>>>>> fa383397b331ec0091096becf886f978cc1277fc
     }
   }
 }

pages.json

@@ -2,8 +2,7 @@
 	"easycom": {
 		"^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
 	},
-	"pages": [ 
-		{
+	"pages": [{
 			"path": "pages/login/login",
 			"style": {
 				"navigationBarTitleText": "",
@@ -61,6 +60,17 @@
 				}
 			}
 		},
+		{
+			"path": "pages/index/otherdetails",
+			"style": {
+				"navigationBarTitleText": "试穿订单详情",
+				"app-plus": {
+					"titleNView": {
+						"titleColor": "#333333"
+					}
+				}
+			}
+		},
 		{
 			"path": "pages/release/video",
 			"style": {
@@ -91,6 +101,7 @@
 
 		{
 			"path": "pages/user/index",
+
 			"style": {
 				"navigationBarTitleText": "个人中心",
 				"app-plus": {
@@ -101,6 +112,18 @@
 				}
 			}
 		},
+		{
+			"path": "pages/user/myinfo",
+			"style": {
+				"navigationBarTitleText": "达人中心",
+				"app-plus": {
+					"titleNView": {
+						"backgroundColor": "#FFFFFF",
+						"titleColor": "#333333"
+					}
+				}
+			}
+		},
 		{
 			"path": "pages/release/tosign",
 			"style": {
@@ -120,7 +143,13 @@
 				"app-plus": {
 					"titleNView": {
 						"backgroundColor": "#FFFFFF",
-                        "titleColor": "#333333"
+						"titleColor": "#333333",
+						"buttons": [ //原生标题栏按钮配置,
+							{
+								"text": "保存",
+								"fontSize":"14px"
+							}
+						]
 					}
 				}
 			}
@@ -241,6 +270,12 @@
 			"selectedIconPath": "",
 			"text": "首页",
 			"selectedColor": "#FBFBFB"
+		}, {
+			"pagePath": "pages/messages/messagesList",
+			"iconPath": "",
+			"selectedIconPath": "",
+			"text": "消息",
+			"selectedColor": "#FBFBFB"
 		}, {
 			"pagePath": "pages/user/index",
 			"iconPath": "",

pages/index/details.vue

@@ -1,62 +1,70 @@
 <template>
 	<view class="details">
 		<view class="goods-info">
-			<image></image>
+			<image :src="info.extend_order_goods[0].goods_image"></image>
 			<view class="info-right">
-				<view class="name u-line-1">心机小黑裙连衣裙赫本风夏季爆款...</view>
+				<view class="name u-line-1">{{ info.extend_order_goods[0].goods_name }}</view>
 				<view class="info">
-					<view class="num">共一件商品</view>
-					<view class="price">实付<span>￥199.9</span></view>
+					<view class="num">共{{ info.extend_order_goods[0].goods_num }}件商品</view>
+					<view class="price">
+						实付
+						<span>￥{{ info.extend_order_goods[0].goods_pay_price }}</span>
 					</view>
 				</view>
 			</view>
-		<view class="refunds-user" v-if="status==4 || status==5">
+		</view>
+		<view class="refunds-user" v-if="type == 2 || type == 3 || type == 4 || type == 5 || type == 6">
 			<view>
 				<image src="/static/image/home/2.png"></image>
-				<view>李先生</view>
+				<view>{{ info.extend_order_common.reciver_name }}</view>
 			</view>
 			<view>
 				<image src="/static/image/home/3.png"></image>
-				<view>123456789</view>
+				<view>{{ info.extend_order_common.reciver_info.mob_phone }}</view>
 			</view>
 			<view>
 				<image src="/static/image/home/4.png"></image>
-				<view class="address u-line-1">山东省临沂市兰山区XX路XX小区XX楼xx单元</view>
+				<view class="address u-line-1">{{ info.extend_order_common.reciver_info.address }}</view>
 			</view>
 		</view>
-		<view class="user-info" v-if="status == 1 || status == 2">
+		<view class="user-info" v-if="type == 1">
 			<view class="info-title">收件人信息</view>
 			<view class="info-container">
 				<view>
 					<view class="title">姓名</view>
-					<view class="value">李先生</view>
+					<view class="value">{{ info.extend_order_common.reciver_name }}</view>
 				</view>
 				<view>
 					<view class="title">手机号</view>
-					<view class="value">123456789</view>
+					<view class="value">{{ info.extend_order_common.reciver_info.mob_phone }}</view>
 				</view>
 				<view>
 					<view class="title">收货地址</view>
-					<view class="value u-line-1">山东省临沂市兰山区XX路XX小区XX楼xx单元</view>
+					<view class="value u-line-1">{{ info.extend_order_common.reciver_info.address }}</view>
 				</view>
 			</view>
 		</view>
-		<view class="delivery" v-if="status == 1 || status == 2">
+		<view class="delivery" v-if="type == 1">
 			<view class="title">派送方式</view>
-			<view class="methods" v-if="status == 1">
-				<view :class="{active: cur==0}" @click="cur=0">人工送达</view>
-				<view :class="{active: cur==1}" @click="cur=1;showDelivery=true">指派外部骑手</view>
+			<view class="methods">
+				<view :class="{ active: cur == 0 }" @click="pushstyleA">快递</view>
+				<view :class="{ active: cur == 1 }" @click="pushstyleB">骑手</view>
 			</view>
-			<view class="methods" v-if="status == 2">
-				<view :class="{active: cur==0}" @click="cur=0;showExpress=true">快递</view>
-				<view :class="{active: cur==1}" @click="cur=1;showDelivery=true">骑手</view>
+			<view class="btn" @click="confirmpushstyle">确认</view>
 		</view>
-			<view class="btn">确认</view>
+		<view class="pushtimeline" v-if="type == 2">
+			<view class="timelinetitle">物流信息</view>
+			<view class="timelineid">订单单号:{{ 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 class="refunds-option" v-if="status==5">
-			<view :class="{active: cur==0}" @click="cur=0;showRefunds=true">不处理</view>
-			<view :class="{active: cur==1}" @click="cur=1;showRefunds=true">确定处理</view>
 		</view>
+		<view class="refunds-option" v-if="type == 4">
+			<view :class="{ active: cur == 0 }" @click="unrefuse">不处理</view>
+			<view :class="{ active: cur == 1 }" @click="refuse">确定处理</view>
+		</view>
+		<view class="refund" v-if="type == 5 || type == 6">退款状态:{{ type == 5 ? '同意退款，请注意查收' : '拒绝退款，请等待客服联系' }}</view>
 		<u-popup v-model="showDelivery" mode="center" border-radius="10" class="delivery-popup">
 			<view class="title">骑手信息</view>
 			<view class="input-info">
@@ -64,45 +72,272 @@
 				<input type="text" placeholder="请输入您的手机号" v-model="phone" />
 				<input type="text" placeholder="请输入您的公司名称" v-model="company" />
 			</view>
-			<view class="btn">确认</view>
+			<view class="btn" @click="showDelivery = false">确认</view>
 		</u-popup>
+		<u-picker mode="selector" v-model="show" :default-selector="[0]" :range="list" range-key="content" @confirm="getselect"></u-picker>
+		<!-- companylist -->
+		<u-picker
+			mode="selector"
+			v-model="showcompany"
+			:default-selector="[0]"
+			:range="companylist"
+			range-key="express_name"
+			@confirm="getselectcompany"
+			title="请选择公司"
+			confirm-text="下一步"
+		></u-picker>
 		<u-popup v-model="showExpress" mode="center" border-radius="10" class="delivery-popup">
 			<view class="title">填写快递单号</view>
-			<view class="input-info">
-				<input type="text" placeholder="请输入快递单号" v-model="express" />
-			</view>
-			<view class="btn">确认</view>
+			<view class="input-info"><input type="text" placeholder="请输入快递单号" v-model="pushid" /></view>
+			<view class="btn" @click="showExpress = false">确认</view>
 		</u-popup>
 		<u-popup v-model="showRefunds" mode="center" border-radius="10" class="refunds-popup">
-			<view v-if="cur==1" class="popup-tips">确定处理<br />平台将进行退款</view>
-			<view v-if="cur==0" class="popup-tips">确定不处理<br />平台将进行联系</view>
+			<view v-if="cur == 1" class="popup-tips">
+				确定处理
+				<br />
+				平台将进行退款
+			</view>
+			<view v-if="cur == 0" class="popup-tips">
+				确定不处理
+				<br />
+				平台将进行联系
+			</view>
 			<view class="popup-btn">
-				<view class="cancel" @click="showRefunds=false">取消</view>
-				<view class="determine">确定</view>
+				<view class="cancel" @click="cancel">取消</view>
+				<view class="determine" @click="confirm">确定</view>
 			</view>
 		</u-popup>
+		<u-toast ref="uToast" />
 	</view>
 </template>
 <script>
 export default {
 	data() {
 		return {
-			status: Number, // 订单状态
+			status: 1, // 订单状态
 			cur: Number,
 			showDelivery: false, // 填写骑手信息
 			showExpress: false, // 填写快递单号
 			showRefunds: false, // 平台退货处理
+			showcompany: false, // 平台退货处理
+			companylist: [],
+			show: false, // 骑手列表
 			name: '',
 			phone: '',
 			company: '',
-			express: ''
-		}
+			express: '',
+			type: '',
+			orderid: 0,
+			info: {},
+			list: [],
+			pushid: null,
+			pushstate: false, //显示物流单号
+			selctcar: null, //骑手信息
+			companyidA: null, //物流派送公司id
+			companyidB: null //骑手派送公司id
+		};
 	},
 	onLoad(option) {
-		this.status = option.current;
+		this.type = option.type;
+		this.orderid = option.id;
+		this.resetinfo();
+		if (this.type == 1) {
+			this.getcompanyinfo();
+		}
+		if (this.type == 2) {
+			this.getcarinfo();
+		}
+
+		// 订单状态： 0:全部 1已付款未发货 2已发货 3已完成 4申请退款/退货 5已退款/退货 6拒绝退款/退货
 	},
 	methods: {
+		// 人工配送
+		pushstyleA() {
+			this.cur = 0;
+			this.showcompany = true;
 		},
+		// 选择骑手
+		pushstyleB() {
+			this.cur = 1;
+			this.show = true;
+		},
+		// 获取物流公司列表
+		getcompanyinfo() {
+			let that = this;
+			this.$u.api.pushcompany({}).then(res => {
+				if (res.errCode != 0) {
+				} else {
+					that.companylist = res.data;
+				}
+			});
+		},
+		// 取消退款
+		cancel() {
+			this.showRefunds = false;
+			// cur
+		},
+		//
+		confirm() {
+			this.showRefunds = false;
+			if (this.cur == 0) {
+				// 确定退款
+				return;
+				this.$u.api.refund({
+					refund_id: this.orderid,
+					seller_state:2,
+					seller_message:""
+				}).then(res => {
+					if (res.errCode != 0) {
+						this.$refs.uToast.show({
+							title: res.message,
+							type: 'error'
+						});
+					} else {
+						this.$refs.uToast.show({
+							title: res.message,
+							type: 'success'
+						});
+						console.log(res);
+					}
+				});
+			} else {
+				// 不进行退款
+				return;
+				this.$u.api.refund({
+					refund_id: this.orderid,
+					seller_state:3,
+					seller_message:""
+				}).then(res => {
+					if (res.errCode != 0) {
+						this.$refs.uToast.show({
+							title: res.message,
+							type: 'error'
+						});
+					} else {
+						this.$refs.uToast.show({
+							title: res.message,
+							type: 'success'
+						});
+						console.log(res);
+					}
+				});
+			}
+		},
+		// 同意退款
+		refuse() {
+			this.cur = 1;
+			this.showRefunds = true;
+		},
+		// 同意退款
+		unrefuse() {
+			this.cur = 0;
+			this.showRefunds = true;
+		},
+		// 获取物流信息
+		getcarinfo() {
+			this.$u.api.getpushinfo({
+				order_id: this.orderid
+			}).then(res => {
+				if (res.errCode != 0) {
+					this.$refs.uToast.show({
+						title: res.message,
+						type: 'error'
+					});
+				} else {
+					this.$refs.uToast.show({
+						title: res.message,
+						type: 'success'
+					});
+					console.log(res);
+				}
+			});
+		},
+		// 选择快递公司
+		getselectcompany(e) {
+			let obj = this.companylist[e[0]];
+			this.companyidA = obj.express_id;
+			this.showExpress = true;
+		},
+		// 绑定配送方式
+		confirmpushstyle() {
+			if (this.cur == 0) {
+				console.log(this.pushid);
+				this.$u.api.bindpushid({
+					order_id: this.orderid,
+					shipping_code: this.pushid,
+					shipping_express_id: this.companyidA
+				}).then(res => {
+					if (res.errCode != 0) {
+						this.$refs.uToast.show({
+							title: res.message,
+							type: 'error'
+						});
+					} else {
+						this.$refs.uToast.show({
+							title: res.message,
+							type: 'success'
+						});
+						uni.navigateBack({
+							delta: 1
+						});
+					}
+				});
+			} else {
+				this.$u.api.bindcarer({
+					order_id: this.orderid,
+					takeawayer_id: this.selctcar.takeawayer_id
+				}).then(res => {
+					console.log(res);
+					if (res.errCode != 0) {
+						this.$refs.uToast.show({
+							title: res.message,
+							type: 'error'
+						});
+					} else {
+						this.$refs.uToast.show({
+							title: res.message,
+							type: 'success'
+						});
+					}
+				});
+			}
+		},
+		// 选择骑手
+		getselect(e) {
+			this.selctcar = this.list[e[0]];
+		},
+		// 获取订单信息
+		resetinfo() {
+			this.$u.api.orderdetail({
+				order_id: this.orderid
+			}).then(res => {
+				console.log(res);
+				if (res.errCode != 0) {
+					this.$refs.uToast.show({
+						title: res.message,
+						type: 'error'
+					});
+				} else {
+					this.info = res.data;
+				}
+			});
+			this.$u.api.takeawayerlist({}).then(res => {
+				console.log(res);
+				if (res.errCode != 0) {
+					this.$refs.uToast.show({
+						title: res.message,
+						type: 'error'
+					});
+				} else {
+					let arr = res.data;
+					for (let index in arr) {
+						arr[index].content = arr[index].company_name + '——' + arr[index].contacts + '——' + arr[index].contact_number;
+					}
+					this.list = arr;
+				}
+			});
+		}
+	}
 };
 </script>
 <style lang="scss" scoped>
@@ -110,9 +345,9 @@ export default {
 	display: flex;
 	flex-direction: column;
 	min-height: calc(100vh - var(--window-top));
-	background-color: #ECECEC;
+	background-color: #ececec;
 	.goods-info {
-		background-color: #FFFFFF;
+		background-color: #ffffff;
 		padding: 30rpx;
 		display: flex;
 		align-items: center;
@@ -123,7 +358,6 @@ export default {
 			border-radius: 10rpx;
 			flex-shrink: 0;
 			margin-right: 26rpx;
-			background-color: aqua;
 		}
 		.info-right {
 			.name {
@@ -141,7 +375,7 @@ export default {
 				.price {
 					margin-left: 10rpx;
 					> span {
-						color: #FF780F;
+						color: #ff780f;
 					}
 				}
 			}
@@ -149,7 +383,7 @@ export default {
 	}
 	.refunds-user {
 		padding: 25rpx 30rpx;
-		background-color: #FFFFFF;
+		background-color: #ffffff;
 		margin-bottom: 20rpx;
 		> view {
 			display: flex;
@@ -186,13 +420,13 @@ export default {
 			font-weight: 500;
 			color: rgba(51, 51, 51, 1);
 			height: 88rpx;
-			background-color: #FFFFFF;
+			background-color: #ffffff;
 			margin-bottom: 2rpx;
 			padding: 30rpx;
 		}
 		.info-container {
 			padding: 0 30rpx;
-			background-color: #FFFFFF;
+			background-color: #ffffff;
 			margin-bottom: 20rpx;
 			> view {
 				height: 88rpx;
@@ -200,7 +434,7 @@ export default {
 				align-items: center;
 				color: rgba(51, 51, 51, 1);
 				&:not(:last-child) {
-					border-bottom: 2rpx solid #ECECEC;
+					border-bottom: 2rpx solid #ececec;
 				}
 				.title {
 					width: 150rpx;
@@ -215,7 +449,7 @@ export default {
 	}
 	.delivery {
 		flex: 1;
-		background-color: #FFFFFF;
+		background-color: #ffffff;
 		padding: 30rpx;
 		position: relative;
 		.title {
@@ -243,9 +477,9 @@ export default {
 				}
 			}
 			.active {
-				border: 1rpx solid #FF780F;
-				color: #FF780F;
-				background: #FFF1E6;
+				border: 1rpx solid #ff780f;
+				color: #ff780f;
+				background: #fff1e6;
 			}
 		}
 		.btn {
@@ -263,10 +497,49 @@ export default {
 			line-height: 98rpx;
 		}
 	}
+	.pushtimeline {
+		width: 100%;
+		padding: 0 30rpx;
+		background-color: #ffffff;
+		.timelinetitle {
+			margin-top: 20rpx;
+			height: 40rpx;
+			line-height: 40rpx;
+			font-size: 30rpx;
+			font-weight: 400;
+			color: rgba(51, 51, 51, 1);
+		}
+		.timelineid {
+			min-height: 40rpx;
+			font-size: 24rpx;
+			font-weight: 400;
+			color: rgba(102, 102, 102, 1);
+		}
+		.timelinebox {
+			margin: 20rpx 0;
+		}
+		.timelinecontent {
+			line-height: 40rpx;
+			font-size: 26rpx;
+			font-weight: 500;
+			color: rgba(51, 51, 51, 1);
+		}
+		.timelinetime {
+			font-size: 24rpx;
+			font-weight: 500;
+			color: rgba(153, 153, 153, 1);
+			line-height: 40rpx;
+		}
+	}
+	.refund {
+		padding: 88rpx 30rpx;
+		background-color: #ffffff;
+		line-height: 40rpx;
+	}
 	.refunds-option {
 		flex: 1;
 		padding: 88rpx 30rpx;
-		background-color: #FFFFFF;
+		background-color: #ffffff;
 		display: flex;
 		> view {
 			width: 335rpx;
@@ -281,9 +554,9 @@ export default {
 			margin-right: 20rpx;
 		}
 		.active {
-			border: 1rpx solid #FF780F;
-			color: #FF780F;
-			background: #FFF1E6;
+			border: 1rpx solid #ff780f;
+			color: #ff780f;
+			background: #fff1e6;
 		}
 	}
 	.delivery-popup {
@@ -294,14 +567,14 @@ export default {
 			color: rgba(51, 51, 51, 1);
 			text-align: center;
 			line-height: 88rpx;
-			border-bottom: 2rpx solid #ECECEC;
+			border-bottom: 2rpx solid #ececec;
 		}
 		.input-info {
 			> input {
 				font-size: 26rpx;
 				line-height: 88rpx;
 				padding: 30rpx;
-				border-bottom: 2rpx solid #ECECEC;
+				border-bottom: 2rpx solid #ececec;
 			}
 		}
 		.btn {
@@ -328,18 +601,18 @@ export default {
 		.popup-btn {
 			width: 420rpx;
 			display: flex;
-			border-top: 2rpx solid #ECECEC;
+			border-top: 2rpx solid #ececec;
 			> view {
 				flex: 1;
 				height: 98rpx;
 				text-align: center;
 				line-height: 98rpx;
 				&:first-child {
-					border-right: 2rpx solid #ECECEC;
+					border-right: 2rpx solid #ececec;
 				}
 			}
 			.determine {
-				color: #FF780F;
+				color: #ff780f;
 			}
 		}
 	}

pages/index/index.vue

@@ -1,40 +1,39 @@
 <template>
 	<view class="home">
-		<view class="image-swiper">
-			<u-swiper :list="imageList" mode="dot" border-radius="20"></u-swiper>
-		</view>
+		<view class="image-swiper"><u-swiper :list="imageList" mode="dot" border-radius="20"></u-swiper></view>
 		<view class="tab-swiper">
-			<u-tabs-swiper ref="uTabs" :list="list" :current="current" @change="tabsChange" active-color="#FF780F" inactive-color="#333333" font-size="26" height="98" :show-bar="false" swiperWidth="750" gutter="52"></u-tabs-swiper>
+			<u-tabs-swiper
+				ref="uTabs"
+				:list="list"
+				:current="current"
+				@change="tabsChange"
+				active-color="#FF780F"
+				inactive-color="#333333"
+				font-size="26"
+				height="98"
+				:show-bar="false"
+				swiperWidth="750"
+				gutter="52"
+			></u-tabs-swiper>
 		</view>
-		<swiper :current="swiperCurrent" @animationfinish="animationfinish">
-			<swiper-item class="swiper-item">
-				<scroll-view scroll-y style="height: 100%;width: 100%;" class="order-list">
-					<view v-for="(item, index) in 5" :key="index">
-						<OrderItem :cur="current"></OrderItem>
+		<view class="order-list" v-if="current == 0">
+			<view v-for="(item, index) in allorder" :key="index"><OrderItem :info="item"></OrderItem></view>
 		</view>
-				</scroll-view>
-			</swiper-item>
-			<swiper-item class="swiper-item">
-				<scroll-view scroll-y style="height: 100%;width: 100%;">
-					<view v-for="(item, index) in 5" :key="index">
-						<OrderItem :cur="current"></OrderItem>
+		<view v-else-if="current == 1">
+			<view v-for="(item, index) in testlist" :key="index"><testList :info="item"></testList></view>
 		</view>
-				</scroll-view>
-			</swiper-item>
-			<swiper-item class="swiper-item">
-				<scroll-view scroll-y style="height: 100%;width: 100%;">
-					<view v-for="(item, index) in 5" :key="index">
-						<OrderItem :cur="current"></OrderItem>
+		<view v-else-if="current == 2">
+			<view v-for="(item, index) in worklist" :key="index"><OrderItem :info="item"></OrderItem></view>
 		</view>
-				</scroll-view>
-			</swiper-item>
-			<swiper-item class="swiper-item">
-				<scroll-view scroll-y style="height: 100%;width: 100%;">
+		<view v-else-if="current == 3">
+			<view v-for="(item, index) in translist" :key="index"><OrderItem :info="item"></OrderItem></view>
+		</view>
+		<view v-else-if="current == 4">
 			<view class="complaint">
 				<view class="select-container">
-							<view class="title">选择骑手</view>
+					<view class="title">选择订单号</view>
 					<view class="worker" v-if="JSON.stringify(worker) != '{}'">
-								<view>{{ worker.company + " " + worker.name }}</view>
+						<view>{{ worker.name }}</view>
 						<u-icon name="edit-pen" @click="worker = {}"></u-icon>
 					</view>
 					<view v-else class="select" @click="showSelect = true">
@@ -44,33 +43,23 @@
 				</view>
 				<view class="textarea">
 					<view class="title">投诉简介</view>
-							 <textarea placeholder-style="color:#999999" placeholder="请输入内容" />
+					<textarea placeholder-style="color:#999999" placeholder="请输入内容" v-model="reportcontent" />
 				</view>
 				<!-- 事件 -->
-						<view class="btn" @click="showComplaint=true">确定</view>
+				<view class="btn" @click="reportcar">确定</view>
 			</view>
-				</scroll-view>
-			</swiper-item>
-			<swiper-item class="swiper-item">
-				<scroll-view scroll-y style="height: 100%;width: 100%;">
-					<view v-for="(item, index) in 5" :key="index">
-						<OrderItem :cur="current"></OrderItem>
 		</view>
-				</scroll-view>
-			</swiper-item>
-			<swiper-item class="swiper-item">
-				<scroll-view scroll-y style="height: 100%;width: 100%;">
-					<view v-for="(item, index) in 15" :key="index">
-						<OrderItem :cur="current"></OrderItem>
+		<view v-else-if="current == 5">
+			<view v-for="(item, index) in finshlist" :key="index"><OrderItem :cur="current"></OrderItem></view>
+		</view>
+		<view v-else-if="current == 6">
+			<view v-for="(item, index) in badlist" :key="index"><OrderItem :cur="current"></OrderItem></view>
 		</view>
-				</scroll-view>
-			</swiper-item>
-		</swiper>
 		<view class="release-btn" @click="publish">
-			<image src="/static/home/1.png"></image>
-			<view class="text" @click="release()">发布</view>
+			<image src="../../static/image/index/publish.png"></image>
+			<view class="text">发布</view>
 		</view>
-		<u-select v-model="showSelect" mode="mutil-column-auto" :list="workerList" @confirm="setWorker"></u-select>
+		<u-select v-model="showSelect" :list="carlist" @confirm="setWorker" confirm-color="#FF780F"></u-select>
 		<u-popup v-model="showComplaint" mode="center" border-radius="10">
 			<view class="confirm-complaint">
 				<view class="text">
@@ -84,133 +73,324 @@
 			<view class="publish">
 				<view class="list">
 					<view @click="navto('release/tosign')">
-						<image></image>
+						<image src="../../static/image/index/live.png"></image>
 						<text>直播</text>
 					</view>
 					<view @click="navto('release/index')">
-						<image></image>
+						<image src="../../static/image/index/photo.png"></image>
 						<text>图文</text>
 					</view>
 					<view @click="navto('release/video')">
-						<image></image>
+						<image src="../../static/image/index/video.png"></image>
 						<text>视频</text>
 					</view>
 				</view>
-				<image class="off"></image>
+				<image src="../../static/image/index/close.png" class="off" @click="close"></image>
 			</view>
 		</u-popup>
+		<u-toast ref="uToast" />
 	</view>
 </template>
 
 <script>
-import OrderItem from '@/components/order-item/index'
+import OrderItem from '@/components/order-item/index';
+import testList from '@/components/order-item/testlist.vue';
 export default {
+	components: {
+		OrderItem,
+		testList
+	},
 	data() {
 		return {
-			list: [{
+			list: [
+				{
 					name: '全部订单'
-			}, {
+				},
+				{
 					name: '试穿订单'
-			}, {
+				},
+				{
 					name: '待处理订单'
-			}, {
+				},
+				{
+					name: '已发货订单'
+				},
+				{
 					name: '投诉骑手'
-			}, {
+				},
+				{
 					name: '已完成订单'
-			}, {
+				},
+				{
 					name: '退货订单'
-			}],
-			imageList: [
-				{}, {}, {}
+				}
 			],
+			imageList: [],
 			showSelect: false,
 			current: 0,
 			swiperCurrent: 0,
 			showComplaint: false,
 			worker: {},
-			workerList: [
-				{
-					label: '百世快递公司',
-					children: [
-						{
-							label: '小米'
-						},
-						{
-							label: '小亮'
-						}
-					]
-				},
-				{
-					label: '中通快递公司',
-					children: [
-						{
-							label: '小红'
-						}
-					]
-				},
-				{
-					label: '申通快递公司',
-					children: [
-						{
-							label: '小蓝'
-						}
-					]
-				}
-			],
-			publishstate:true
-		}
-	},
-	components: {
-		OrderItem
+			publishstate: false,
+			clickstate:false,//投诉骑手按钮点击状态
+			num: 1,
+			allorder: [], //所有订单
+			testlist: [], //试穿列表
+			worklist: [], //待处理列表
+			translist: [], //已发货列表
+			finshlist: [], //已完成列表
+			badlist: [], //退货列表
+			carlist: [], //可投诉订单列表
+			reportinfo: null, //投诉信息
+			reportcontent: '' //投诉内容
+		};
 	},
 	onLoad() {
-
+		// 初始化轮播图
+		this.getswiper();
+		// 获取可投诉列表
+		this.getcarlist();
+		// 订单状态： 0:全部 1已付款未发货 2已发货 3已完成 4申请退款/退货 5已退款/退货 6拒绝退款/退货
+	},
+	onShow() {
+		this.current=0
+		// 初始化数据
+		this.resetarr()
+		// 所有订单
+		this.getallorder(0);
+		this.publishstate = false;
+	},
+	onReachBottom() {
+		this.num++;
+		this.reset();
 	},
 	methods: {
-		release(){
-			this.publishstate = true
+		// 初始化数组
+		resetarr() {
+			this.allorder = [];
+			this.worklist = [];
+			this.translist = [];
+			this.finshlist = [];
+			this.badlist = [];
+			this.badlist = [];
+			this.testlist = [];
 		},
-		publish(){
-
-		},
-		setWorker(e) {
-			// console.log(e);
-			this.worker = {
-				company: e[0].label,
-				name: e[1].label
+		// 根据current请求不同的接口
+		reset() {
+			let current = this.current;
+			if (current == 0) {
+				// 所有订单
+				this.getallorder(0);
+			} else if (current == 1) {
+				// 试穿订单
+				this.getshiftlist();
+			} else if (current == 2) {
+				// 待处理订单
+				this.getallorder(1);
+			} else if (current == 3) {
+				// 已发货订单
+				this.getallorder(2);
+			} else if (current == 4) {
+				// 投诉
+			} else if (current == 5) {
+				// 已完成订单
+				this.getallorder(3);
+			} else if (current == 6) {
+				// 退货订单
+				this.getallorder(5);
 			}
 		},
+		// 关闭发布弹窗
+		close() {
+			this.publishstate = false;
+		},
+		// 投诉骑手
+		reportcar(type) {
+			let that = this;
+			if(this.clickstate==false){
+				this.clickstate=true
+			}else{
+				this.$refs.uToast.show({
+					title: "不能重复提交",
+					type: 'error'
+				});
+				return
+			}
+			if (that.reportcontent == '') {
+				this.$refs.uToast.show({
+					title: "投诉内容不能为空",
+					type: 'error'
+				});
+				return;
+			}
+			
+			this.$u.api.reportorder({
+				order_id: that.reportinfo.order_id,
+				takeawayer_id: that.reportinfo.takeawayer_id,
+				order_list: that.reportinfo.order_list,
+				content: that.reportcontent
+			}).then(res => {
+				// 恢复可点击状态
+				this.clickstate=false
+				if (res.errCode != 0) {
+					this.$refs.uToast.show({
+						title: res.message,
+						type: 'error'
+					});
+				} else {
+					// 提交后清空选择信息
+					that.reportinfo=null
+					// 清空投诉评价
+					that.reportcontent = ""
+					// 清空选择器返回信息
+					that.worker = {}
+					// 重新获取可投诉列表
+					that.getcarlist();
+					// 提示修改成功
+					that.showComplaint = true;
+				}
+			});
+		},
+		// 获取可投诉列表
+		getcarlist() {
+			let that = this;
+			this.$u.api.canreportorder({}).then(res => {
+				console.log(res);
+				if (res.errCode != 0) {
+					this.$refs.uToast.show({
+						title: res.message,
+						type: 'error'
+					});
+				} else {
+					let arr = res.data.order_normal;
+					// {
+					// 	value: 2,
+					// 	label: '广东',
+					// 	children: [
+					// 		{
+					// 			value: 3,
+					// 			label: '深圳'
+					// 		},
+					// 		{
+					// 			value: 4,
+					// 			label: '广州'
+					// 		}
+					// 	]
+					// },
+					for (let index in arr) {
+						arr[index].value = arr[index].takeawayer_id;
+						let newarr = arr[index].order_list.split('-');
+						arr[index].label = newarr[0] + ' ' + newarr[1];
+					}
+					this.carlist = arr;
+				}
+			});
+		},
+		// 获取试穿列表
+		getshiftlist() {
+			let that = this;
+			this.$u.api.getshiftlist({}).then(res => {
+				console.log(res);
+				if (res.errCode != 0) {
+					this.$refs.uToast.show({
+						title: res.message,
+						type: 'error'
+					});
+				} else {
+					this.testlist = res.data.orderList;
+				}
+			});
+		},
+		// 获取订单列表
+		getallorder(type) {
+			let that = this;
+			this.$u.api.getorderlist({
+				type: type,
+				page: that.num
+			}).then(res => {
+				if (res.errCode != 0) {
+					this.$refs.uToast.show({
+						title: res.message,
+						type: 'error'
+					});
+				} else {
+					let arr = res.data;
+					for (let index in arr) {
+						if (type == 0) {
+							this.allorder.push(arr[index]);
+						} else if (type == 1) {
+							this.worklist.push(arr[index]);
+						} else if (type == 2) {
+							this.translist.push(arr[index]);
+						} else if (type == 3) {
+							this.finshlist.push(arr[index]);
+						} else if (type == 4) {
+							this.badlist.push(arr[index]);
+						} else if (type == 5) {
+							this.badlist.push(arr[index]);
+						}
+					}
+				}
+			});
+		},
+		// 获取轮播图
+		getswiper() {
+			this.imageList = [
+				{
+					image: '../../static/image/index/swiper.png'
+				},
+				{
+					image: '../../static/image/index/swiper.png'
+				},
+				{
+					image: '../../static/image/index/swiper.png'
+				}
+			];
+		},
+		// 打开发布弹窗
+		publish() {
+			this.publishstate = true;
+		},
+		// 骑手投诉点击确定
+		setWorker(e) {
+			let arr = this.carlist;
+			for (let index in arr) {
+				if (arr[index].takeawayer_id == e[0].value) {
+					this.reportinfo = arr[index];
+				}
+			}
+			this.worker = {
+				name: e[0].label,
+				id: e[0].value
+			};
+		},
+		// 导航栏点击事件
 		tabsChange(index) {
 			this.swiperCurrent = index;
+			this.current = index;
+			this.num = 1;
+			this.resetarr();
+			if (index == 6) {
+				this.getallorder(4);
+			}
+			this.reset();
 		},
-		animationfinish(e) {
-			let current = e.detail.current;
-			// this.$refs.uTabs.setFinishCurrent(current);
-			this.swiperCurrent = current;
-			this.current = current;
-		},
+		// 发布内容跳转页面
 		navto(url) {
+			this.publishstate = false;
 			this.$u.route({
 				url: `/pages/${url}`
-			})
-			// console.log(`/pages/${url}`)
-			// uni.navigateTo({
-			// 	url: `/pages/${url}`
-			// });
-		}
+			});
 		}
 	}
+};
 </script>
 <style lang="scss" scoped>
 .home {
 	min-height: calc(100vh - var(--window-top));
-	background-color: #ECECEC;
+	background-color: #ececec;
 	display: flex;
 	flex-direction: column;
-	// padding-bottom: 100rpx;
-	> uni-swiper {
-		flex: 1;
-	}
 	.image-swiper {
 		background-color: #ffffff;
 		padding: 0 30rpx 16rpx;
@@ -218,7 +398,6 @@ export default {
 	.tab-swiper {
 		margin: 2rpx 0 20rpx 0;
 	}
-	.swiper-item {
 	.complaint {
 		margin: 0 30rpx;
 		padding: 75rpx 30rpx;
@@ -228,9 +407,11 @@ export default {
 			align-items: center;
 			margin-bottom: 60rpx;
 			.title {
+				width: 180rpx;
 				font-size: 30rpx;
 				color: rgba(51, 51, 51, 1);
 				margin-right: 20rpx;
+				text-align: right;
 			}
 			.select {
 				padding: 18rpx 20rpx;
@@ -253,8 +434,9 @@ export default {
 			.worker {
 				display: flex;
 				align-items: center;
+				background-color: #ececec;
 				> view {
-						font-size: 30rpx;
+					font-size: 26rpx;
 					color: rgba(51, 51, 51, 1);
 					margin-right: 20rpx;
 				}
@@ -264,7 +446,9 @@ export default {
 			box-sizing: border-box;
 			display: flex;
 			.title {
+				width: 180rpx;
 				font-size: 30rpx;
+				text-align: right;
 				color: rgba(51, 51, 51, 1);
 				margin-right: 20rpx;
 			}
@@ -288,7 +472,6 @@ export default {
 			text-align: center;
 		}
 	}
-	}
 	.release-btn {
 		position: fixed;
 		bottom: 475rpx;
@@ -346,7 +529,6 @@ export default {
 		align-items: center;
 		padding: 50rpx 84rpx 31rpx 78rpx;
 		image {
-			background-color: #0f0;
 		}
 		.list {
 			display: flex;

pages/index/otherdetails.vue

@@ -0,0 +1,434 @@
+<template>
+	<view class="details">
+		<view class="goods-info">
+			<image :src="info.goods_image"></image>
+			<view class="info-right">
+				<view class="name u-line-1">{{ info.goods_name }}</view>
+				<view class="info">
+					<view class="num">共{{ info.goods_try_num }}件商品</view>
+					<view class="price">
+						实付
+						<span>￥{{ info.goods_price }}</span>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="refunds-user" v-if="type == 2 || type == 3 || type == 4">
+			<view>
+				<image src="/static/image/home/2.png"></image>
+				<view>{{ info.goods_try_member_name }}</view>
+			</view>
+			<view>
+				<image src="/static/image/home/3.png"></image>
+				<view>{{ info.goods_try_member_mobile }}</view>
+			</view>
+			<view>
+				<image src="/static/image/home/4.png"></image>
+				<view class="address u-line-1">{{ info.goods_try_area_info }}</view>
+			</view>
+		</view>
+		<view class="user-info" v-if="type == 1">
+			<view class="info-title">收件人信息</view>
+			<view class="info-container">
+				<view>
+					<view class="title">姓名</view>
+					<view class="value">{{ info.goods_try_member_name }}</view>
+				</view>
+				<view>
+					<view class="title">手机号</view>
+					<view class="value">{{ info.goods_try_member_mobile }}</view>
+				</view>
+				<view>
+					<view class="title">收货地址</view>
+					<view class="value u-line-1">{{ info.goods_try_area_info }}</view>
+				</view>
+			</view>
+		</view>
+		<view class="delivery" v-if="type == 1">
+			<view class="title">派送方式</view>
+			<view class="methods">
+				<view :class="{ active: cur == 0 }" @click="people">人工送达</view>
+				<view :class="{ active: cur == 1 }" @click="carer">指派外部骑手</view>
+			</view>
+
+			<view class="btn" @click="confirmpushstyle">确认</view>
+		</view>
+		<!-- 		<view class="refunds-option" v-if="type==4">
+			<view :class="{active: cur==0}" @click="cur=0;showRefunds=true">不处理</view>
+			<view :class="{active: cur==1}" @click="cur=1;showRefunds=true">确定处理</view>
+		</view> -->
+		<!-- 		<u-popup v-model="showDelivery" mode="center" border-radius="10" class="delivery-popup">
+			<view class="title">骑手信息</view>
+			<view class="input-info">
+				<input type="text" placeholder="请输入您的姓名" v-model="name" />
+				<input type="text" placeholder="请输入您的手机号" v-model="phone" />
+				<input type="text" placeholder="请输入您的公司名称" v-model="company" />
+			</view>
+			<view class="btn">确认</view>
+		</u-popup> -->
+		<u-picker mode="selector" v-model="show" :default-selector="[0]" :range="list" range-key="content" @confirm="getselect"></u-picker>
+		<!-- 		<u-popup v-model="showExpress" mode="center" border-radius="10" class="delivery-popup">
+			<view class="title" @click="bindpushid">填写快递单号</view>
+			<view class="input-info">
+				<input type="text" placeholder="请输入快递单号" v-model="express" />
+			</view>
+			<view class="btn">确认</view>
+		</u-popup> -->
+		<!-- 		<u-popup v-model="showRefunds" mode="center" border-radius="10" class="refunds-popup">
+			<view v-if="cur==1" class="popup-tips">确定处理<br />平台将进行退款</view>
+			<view v-if="cur==0" class="popup-tips">确定不处理<br />平台将进行联系</view>
+			<view class="popup-btn">
+				<view class="cancel" @click="showRefunds=false">取消</view>
+				<view class="determine">确定</view>
+			</view>
+		</u-popup> -->
+		<u-toast ref="uToast" />
+	</view>
+</template>
+<script>
+export default {
+	data() {
+		return {
+			status: 1, // 订单状态
+			cur: Number,
+			showDelivery: false, // 填写骑手信息
+			showExpress: false, // 填写快递单号
+			showRefunds: false, // 平台退货处理
+			show: false, // 骑手列表
+			name: '',
+			phone: '',
+			company: '',
+			express: '',
+			type: '',
+			orderid: 0,
+			info: {},
+			list: [],
+			selctcar: null //选择骑手ID
+		};
+	},
+	onLoad(option) {
+		this.type = option.type;
+		this.orderid = option.id;
+		this.resetinfo();
+	},
+	methods: {
+		// 人工配送
+		people() {
+			this.cur = 0;
+		},
+		carer() {
+			this.cur = 1;
+			this.show = true;
+		},
+		// 绑定配送方式
+		confirmpushstyle() {
+			if (this.cur == 0) {
+				this.$u.api.agreetest({
+					goods_try_id: this.orderid,
+					type: 1,
+					takeawayer_id: 0
+				}).then(res => {
+					console.log(res);
+					if (res.errCode != 0) {
+						this.$refs.uToast.show({
+							title: res.message,
+							type: 'error'
+						});
+					} else {
+					}
+				});
+			} else {
+				this.$u.api.agreetest({
+					goods_try_id: this.orderid,
+					type: 1,
+					takeawayer_id: this.selctcar.takeawayer_id
+				}).then(res => {
+					console.log(res);
+					if (res.errCode != 0) {
+						this.$refs.uToast.show({
+							title: res.message,
+							type: 'error'
+						});
+					} else {
+					}
+				});
+			}
+		},
+		// 选择骑手
+		getselect(e) {
+			this.selctcar = this.list[e[0]];
+		},
+		// 获取订单信息
+		resetinfo() {
+			this.$u.api.testorderdetail({
+				goods_try_id: this.orderid
+			}).then(res => {
+				console.log(res);
+				if (res.errCode != 0) {
+					this.$refs.uToast.show({
+						title: res.message,
+						type: 'error'
+					});
+				} else {
+					this.info = res.data.info;
+				}
+			});
+			// 获取骑手列表
+			this.$u.api.takeawayerlist({}).then(res => {
+				console.log(res);
+				if (res.errCode != 0) {
+					this.$refs.uToast.show({
+						title: res.message,
+						type: 'error'
+					});
+				} else {
+					let arr = res.data;
+					for (let index in arr) {
+						arr[index].content = arr[index].company_name + '——' + arr[index].contacts + '——' + arr[index].contact_number;
+					}
+					this.list = arr;
+				}
+			});
+		}
+	}
+};
+</script>
+<style lang="scss" scoped>
+.details {
+	display: flex;
+	flex-direction: column;
+	min-height: calc(100vh - var(--window-top));
+	background-color: #ececec;
+	.goods-info {
+		background-color: #ffffff;
+		padding: 30rpx;
+		display: flex;
+		align-items: center;
+		margin: 2rpx 0 20rpx;
+		> image {
+			width: 160rpx;
+			height: 160rpx;
+			border-radius: 10rpx;
+			flex-shrink: 0;
+			margin-right: 26rpx;
+		}
+		.info-right {
+			.name {
+				width: 439rpx;
+				font-size: 28rpx;
+				color: rgba(51, 51, 51, 1);
+				margin-bottom: 30rpx;
+			}
+			.info {
+				width: 100%;
+				display: flex;
+				align-items: center;
+				font-size: 26rpx;
+				color: rgba(102, 102, 102, 1);
+				.price {
+					margin-left: 10rpx;
+					> span {
+						color: #ff780f;
+					}
+				}
+			}
+		}
+	}
+	.refunds-user {
+		padding: 25rpx 30rpx;
+		background-color: #ffffff;
+		margin-bottom: 20rpx;
+		> view {
+			display: flex;
+			align-items: center;
+			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 {
+				font-size: 26rpx;
+				color: rgba(51, 51, 51, 1);
+			}
+		}
+	}
+	.user-info {
+		.info-title {
+			font-size: 30rpx;
+			font-weight: 500;
+			color: rgba(51, 51, 51, 1);
+			height: 88rpx;
+			background-color: #ffffff;
+			margin-bottom: 2rpx;
+			padding: 30rpx;
+		}
+		.info-container {
+			padding: 0 30rpx;
+			background-color: #ffffff;
+			margin-bottom: 20rpx;
+			> view {
+				height: 88rpx;
+				display: flex;
+				align-items: center;
+				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;
+				}
+			}
+		}
+	}
+	.delivery {
+		flex: 1;
+		background-color: #ffffff;
+		padding: 30rpx;
+		position: relative;
+		.title {
+			font-size: 30rpx;
+			font-weight: 500;
+			color: rgba(51, 51, 51, 1);
+			margin-bottom: 30rpx;
+		}
+		.methods {
+			display: flex;
+			flex-wrap: wrap;
+			> view {
+				font-size: 30rpx;
+				color: rgba(0, 0, 51, 1);
+				width: 335rpx;
+				height: 80rpx;
+				border: 1rpx solid rgba(236, 236, 236, 1);
+				background: rgba(236, 236, 236, 1);
+				border-radius: 6rpx;
+				text-align: center;
+				line-height: 80rpx;
+				margin-bottom: 20rpx;
+				&:nth-child(2n-1) {
+					margin-right: 20rpx;
+				}
+			}
+			.active {
+				border: 1rpx solid #ff780f;
+				color: #ff780f;
+				background: #fff1e6;
+			}
+		}
+		.btn {
+			position: absolute;
+			bottom: 40rpx;
+			left: 50%;
+			transform: translate(-50%, 0);
+			width: 690rpx;
+			height: 98rpx;
+			background: rgba(255, 120, 15, 1);
+			border-radius: 49rpx;
+			font-size: 36rpx;
+			color: rgba(255, 255, 255, 1);
+			text-align: center;
+			line-height: 98rpx;
+		}
+	}
+	.refunds-option {
+		flex: 1;
+		padding: 88rpx 30rpx;
+		background-color: #ffffff;
+		display: flex;
+		> view {
+			width: 335rpx;
+			height: 80rpx;
+			border: 1rpx solid rgba(236, 236, 236, 1);
+			background: rgba(236, 236, 236, 1);
+			border-radius: 6rpx;
+			font-size: 30rpx;
+			color: rgba(0, 0, 51, 1);
+			line-height: 80rpx;
+			text-align: center;
+			margin-right: 20rpx;
+		}
+		.active {
+			border: 1rpx solid #ff780f;
+			color: #ff780f;
+			background: #fff1e6;
+		}
+	}
+	.delivery-popup {
+		.title {
+			width: 420rpx;
+			font-size: 30rpx;
+			font-weight: 500;
+			color: rgba(51, 51, 51, 1);
+			text-align: center;
+			line-height: 88rpx;
+			border-bottom: 2rpx solid #ececec;
+		}
+		.input-info {
+			> input {
+				font-size: 26rpx;
+				line-height: 88rpx;
+				padding: 30rpx;
+				border-bottom: 2rpx solid #ececec;
+			}
+		}
+		.btn {
+			margin: 20rpx auto;
+			width: 200rpx;
+			height: 60rpx;
+			background: rgba(255, 120, 15, 1);
+			border-radius: 30rpx;
+			font-size: 28rpx;
+			color: rgba(255, 255, 255, 1);
+			line-height: 60rpx;
+			text-align: center;
+		}
+	}
+	.refunds-popup {
+		.popup-tips {
+			width: 420rpx;
+			text-align: center;
+			font-size: 28rpx;
+			color: rgba(102, 102, 102, 1);
+			line-height: 42rpx;
+			padding: 30rpx 0;
+		}
+		.popup-btn {
+			width: 420rpx;
+			display: flex;
+			border-top: 2rpx solid #ececec;
+			> view {
+				flex: 1;
+				height: 98rpx;
+				text-align: center;
+				line-height: 98rpx;
+				&:first-child {
+					border-right: 2rpx solid #ececec;
+				}
+			}
+			.determine {
+				color: #ff780f;
+			}
+		}
+	}
+}
+</style>

pages/login/login.vue

@@ -2,22 +2,43 @@
 	<!-- login页面 -->
 	<view>
 		<view class="login">
-			<image class="images" src=""></image>
+			<image class="images" :src="url"></image>
 			<view class="backes"></view>
-			<view class="content">
 			<view class="title_top">德铭阳光在线-商家端</view>
-				<view class="title">账号登录</view>
+			<view class="content">
+				<view class="title">
+					<view v-bind:class="[state==0 ? 'show' : '']" @click="changetab(0)">
+						商家登录
+					</view>
+					<view v-bind:class="[state==1 ? 'show' : '']" @click="changetab(1)">
+						达人登录
+					</view>
+				</view>
+				<view class="" v-if="state==0">
 					<view class="labales">
-					<image src=""></image>
-					<input v-model="zhanghao" type="tel" placeholder="请输入账号" />
+						<image src="../../static/image/login/login(3).png"></image>
+						<input v-model="zhanghao" type="text" placeholder="请输入账号" />
 					</view>
 					<view class="labales">
-					<image src=""></image>
+						<image src="../../static/image/login/login(1).png"></image>
 						<input v-model="mima" type="password" placeholder="请输入密码" />
 					</view>
 				</view>
+				<view class="" v-else>
+					<view class="labales">
+						<image src="../../static/image/login/login(3).png"></image>
+						<input v-model="zhanghaoA" type="text" placeholder="请输入账号" />
+					</view>
+					<view class="labales">
+						<image src="../../static/image/login/login(1).png"></image>
+						<input v-model="mimaA" type="password" placeholder="请输入密码" />
+					</view>
+				</view>
+
+			</view>
 			<!-- denglu QQ weixin -->
-			<u-button @click="logins">{{login}}</u-button>
+			<button @click="logins">{{ login }}</button> 
+			<!-- <u-button :custom-style="customStyle" ></u-button> -->
 			<u-toast ref="uToast" />
 		</view>
 	</view>
@@ -26,19 +47,29 @@
 export default {
 	data() {
 		return {
-				list: [{
+			list: [
+				{
 					checked: false,
 					disabled: false
-				}],
+				}
+			],
 			value: '',
 			login: '登录',
 			show: false,
-				zhanghao:"",
-				mima:""
-				
+			zhanghao: 'seller',
+			mima: '123456',
+			zhanghaoA: '18953829598 ',
+			mimaA: '123456',
+			url: '',
+			state:0,
+			clickstate:false
 		};
 	},
 	methods: {
+		// 改变登陆类型
+		changetab(num){
+			this.state = num
+		},
 		// 选中某个复选框时，由checkbox时触发
 		checkboxChange(e) {
 			//console.log(e);
@@ -48,35 +79,68 @@
 			// console.log(e);
 		},
 		mask_u() {
-				this.show = !this.show
+			this.show = !this.show;
 		},
 		// 获取验证码倒计时
 		getCode() {
-				console.log("11")
-				this.loading()
-			},
-			loading(){
-				
+			console.log('11');
+			this.loading();
 		},
+		loading() {},
 		logins() {
-				this.$u.api.login({member_name:this.zhanghao,member_password:this.mima}).then((res)=>{
-					console.log(res)
+			// 判断是否可以点击
+			if(this.clickstate==false){
+				this.clickstate=true
+			}else{
+				this.$refs.uToast.show({
+					title: "不能重复提交",
+					type: 'error'
+				});
+				return
+			}
+			// 清除本地存储才可以正常登陆（具体原因没有仔细检查）
+			uni.clearStorage();
+			// 账号登录1达人0商家
+			if(this.state==1){
+				this.$u.api.login({ member_name: this.zhanghaoA, member_password: this.mimaA }).then(res => {
 					if (res.errCode != 0) {
+						// 恢复按钮可点击状态
+						this.clickstate=false
 						this.$refs.uToast.show({
 							title: res.message,
 							type: 'error'
-						})
+						});
 					} else {
-						uni.setStorageSync("token",res.data.token)
-						uni.setStorageSync("userinfo",res.data)
-						uni.setStorageSync('rongyun',res.data.rongcloud_token)
+
+						uni.setStorageSync('token', res.data.token);
+						uni.setStorageSync('userinfo', res.data);
+						uni.setStorageSync('rongyun', res.data.rongcloud_token);
 						this.$u.route({
-							url:"/pages/index/index",
-							type:"switchTab"
-						})
+							url: '/pages/user/myinfo'
+						});
+					}
+				});
+			}else{
+				this.$u.api.shoplogin({ member_name: this.zhanghao, member_password: this.mima }).then(res => {
+					if (res.errCode != 0) {
+						// 恢复按钮可点击状态
+						this.clickstate=false
+						this.$refs.uToast.show({
+							title: res.message,
+							type: 'error'
+						});
+					} else {
+						uni.setStorageSync('token', res.data.token);
+						uni.setStorageSync('userinfo', res.data);
+						uni.setStorageSync('rongyun', res.data.rongcloud_token);
+						this.$u.route({
+							url: '/pages/index/index',
+							type: 'switchTab'
+						});
+					}
+				});
 			}
 
-				})	
 		}
 	},
 	onLoad() {
@@ -84,17 +148,15 @@
 
 		if (token != undefined && token) {
 			this.$u.route({
-					url:"/pages/index/index"
-				})
+				url: '/pages/index/index'
+			});
 		}
 	}
 };
 </script>
 
 <style lang="scss" scoped>
-	
 .login {
-
 	// background: url(../../static/pageA/loginbackground.png) no-repeat!important;
 	.images {
 		position: fixed;
@@ -111,7 +173,6 @@
 		width: 100%;
 		height: 100%;
 		z-index: -1;
-
 	}
 
 	text {
@@ -146,7 +207,18 @@
 	font-weight: bold;
 	margin-bottom: 150rpx;
 	color: #fff;
-		letter-spacing: 3rpx;
+	display: flex;
+	justify-content: flex-start;
+}
+.title view{
+	height: 100rpx;
+	line-height: 100rpx;
+	font-size: 24rpx;
+	padding: 0 20rpx;
+}
+.title .show{
+	font-size: 34rpx;
+	font-weight: bold;
 }
 
 .content {
@@ -198,7 +270,8 @@
 		line-height: 20px;
 	}
 }
-	.uni-input-input, .uni-input-placeholder{
+.uni-input-input,
+.uni-input-placeholder {
 	color: #fff !important;
 	letter-spacing: 2rpx;
 }
@@ -279,7 +352,6 @@
 			width: 45rpx;
 			height: 53rpx;
 			display: inline-block;
-			
 		}
 		flex: 1;
 		margin-top: 77rpx;
@@ -302,10 +374,10 @@
 		color: #666;
 		font-size: 24rpx;
 		margin-top: 30rpx;
-			
 	}
 }
-	.rect_view:nth-child(1) image,.rect_view:nth-child(1) view{
+.rect_view:nth-child(1) image,
+.rect_view:nth-child(1) view {
 	float: right;
 }
 .rect_view:nth-child(1) image {
@@ -320,7 +392,8 @@
 	bottom: 0;
 	right: 0;
 }
-	.rect_view:nth-child(2) image,.rect_view:nth-child(2) view{
+.rect_view:nth-child(2) image,
+.rect_view:nth-child(2) view {
 	float: left;
 }
 .rect_view:nth-child(2) image {
@@ -336,7 +409,7 @@
 }
 .title_top {
 	position: fixed;
-			top: 36rpx;
+	top: calc(var(--status-bar-height) + 18px);
 	left: 0;
 	right: 0;
 	margin: auto;
@@ -351,4 +424,16 @@
 	background: none;
 	letter-spacing: 4rpx;
 }
+button{
+	width: 670rpx;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	cursor: pointer;
+	border-radius: 50rpx;
+	height: 100rpx;
+	padding: 0 40rpx;
+	background-color: #ff780f;
+	color: #FFFFFF;
+}
 </style>

pages/messages/messagesList.vue

@@ -15,6 +15,7 @@
 			<view class="content">{{item.content}}</view>
 			<view class="times">{{item.time}}</view>
 		</view>
+		<u-toast ref="uToast" />
 	</view>
 </template>
 <script>

pages/release/index.vue

@@ -1,74 +1,87 @@
 <template>
 	<view id="release">
 		<u-form :model="form" ref="uForm">
-			<u-form-item label="标题" label-position="right">
-				<u-input v-model="form.name" placeholder="请输入标题" />
-			</u-form-item>
+			<u-form-item label="标题" label-position="right"><u-input v-model="form.name" placeholder="请输入标题" /></u-form-item>
+			<!-- form-data -->
+			<view class="titles">封面</view>
+			<u-upload
+				:form-data="coverformdata"
+				:max-count="1"
+				:header="header"
+				name="article_cover"
+				:action="action"
+				del-color="#ececec"
+				upload-text="选择图片"
+				del-bg-color="#fff"
+				:file-list="fileListA"
+				@on-success="uploadcover"
+			></u-upload>
 			<view class="titles">图片</view>
-			<u-upload :action="action" del-color="#ececec" upload-text="选择图片" del-bg-color="#fff" :file-list="fileList"></u-upload>
+			<u-upload
+				:form-data="imgformdata"
+				name="article_image"
+				:header="header"
+				:action="action"
+				@on-success="uploadphoto"
+				del-color="#ececec"
+				upload-text="选择图片"
+				del-bg-color="#fff"
+				:max-count="5"
+				:file-list="fileListB"
+			></u-upload>
 			<!-- 标签 -->
 			<view>
 				<view class="titles">标签</view>
 				<view class="form-view" @click="show_add()">+ 新建标签</view>
-				<view class="form-view" v-for="(item,index) in fileListes" :key="index">{{item}}</view>
+				<view :class="[item.state == true ? 'active' : '', 'form-view']" v-for="(item, index) in fileListes" :key="index" @click="changeselect(index)">
+					{{ item.name }}
+				</view>
 			</view>
 			<!-- 简介 -->
 			<view class="titles">简介</view>
-			<view class="titles_border">
-				<textarea placeholder="请输入内容..."></textarea>
-			</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">
-					<view class="title">
-						<text>选择商品</text>
-					</view>
+					<view class="title"><text>选择商品</text></view>
 					<!-- 商品列表 -->
+					<scroll-view :scroll-top="scrollTop" scroll-y="true" class="scroll">
 						<view class="listes_shoping" v-for="(item, index) in list" :key="index">
 							<view>
-							<u-checkbox-group @change="checkboxGroupChange">
-								<u-checkbox @change="checkboxChange" shape="circle" active-color="#FF780F" v-model="item.checked" :name="item.id"></u-checkbox>
+								<u-checkbox-group>
+									<u-checkbox @change="checkboxChange" shape="circle" active-color="#FF780F" v-model="item.checked" :name="item.goods_id"></u-checkbox>
 								</u-checkbox-group>
 							</view>
-						<view>
-							<image :src="item.url" mode="widthFix"></image>
-						</view>
-						<view class="contentes">{{item.content}}</view>
+							<view><image :src="item.goods_image" mode="widthFix"></image></view>
+							<view class="contentes">{{ item.goods_name }}</view>
 						</view>
+					</scroll-view>
+
 					<!-- 提交按钮 -->
 					<view class="u-button" @click="changes()">确定</view>
 				</u-popup>
 				<!-- 底部选择商品列表 -->
-				<view @click="show_two = true">选择商品
+				<view @click="show_two = true">
+					选择商品
 					<image class="images" src="../../static/image/tosign/bhottom.png"></image>
 				</view>
 				<!-- 选择后的列表 -->
-				<view class="List_tosign" v-if="List_tosign != ''">
-					<view>
-						<image src="../../static/image/tosign/tosigin(5).png" mode="scaleToFill"></image>
-					</view>
-					<view>
-						木糖少女小紫薯西装领连衣裙夏季新款女装夏收腰格子格纹裙子
-					</view>
-					<view>
-						<image src="../../static/image/tosign/delete.png" mode="widthFix"></image>
-					</view>
+				<view class="List_tosign" v-for="list in shoplist">
+					<view><image :src="list.goods_image" mode="scaleToFill"></image></view>
+					<view>{{ list.goods_name }}</view>
+					<view><image src="../../static/image/tosign/delete.png" mode="widthFix" @click="delarr(list.goods_id)"></image></view>
 				</view>
 			</view>
 			<!-- 提交 -->
-			<u-button class="custom-style" shape="circle" size="default">发表</u-button>
-
+			<u-button class="custom-style" shape="circle" size="default" @click="publish">发表</u-button>
 		</u-form>
 		<!-- 添加标签的按钮 -->
 		<u-popup v-model="show" mode="center" border-radius="14">
-			<view class="text">
-				创建属于你的标签吧
-			</view>
-			<view class="u-inputes">
-				<u-input v-model="form.name" />
-			</view>
-			<u-button class="custom-style-button" shape="circle" size="default">确定</u-button>
+			<view class="text">创建属于你的标签吧</view>
+			<view class="u-inputes"><u-input v-model="tagcontent" /></view>
+			<u-button class="custom-style-button" shape="circle" size="default" @click="addLiveSpec">确定</u-button>
 		</u-popup>
+		<u-toast ref="uToast" />
 	</view>
 </template>
 
@@ -82,100 +95,210 @@
 				sex: ''
 			},
 			// 演示地址，请勿直接使用
-				action: 'http://www.example.com/upload',
-				fileList: [],
-				fileListes: ["美妆", "博主穿搭", "美妆", "美妆", "美妆", "美妆", "美妆", "博主穿搭"],
+			action: 'https://dmmall.sdbairui.com/storeapi/Upload/uploadFile',
+			coverformdata: {
+				name: 'article_cover'
+			},
+			imgformdata: {
+				name: 'article_image'
+			},
+			fileListA: [],
+			fileListB: [],
+			imgarrA: [],
+			imgarrB: [],
+			header: {
+				Authorization: 'Bearer' + ' ' + uni.getStorageSync('token')
+			},
+			fileListes: [],
 			show: false,
 			show_two: false,
 			filesList: [],
 			arres_list: [],
+			shoplist: [],
 			checked: false,
-				list: [{
-						name: 'apple',
-						checked: false,
-						disabled: false,
-						content: "木糖少女小紫薯西装领连衣裙夏季新款女装装领连衣裙夏季装领连衣裙夏季装领连衣裙夏季夏收腰格子格纹裙子",
-						url: '../../static/image/tosign/tosigin(5).png',
-						id : '1'
-					},
-					{
-						name: 'apple2',
-						checked: false,
-						disabled: false,
-						content: "木糖少女小紫薯西装领连衣裙夏季新款女装夏收腰格子格纹裙子",
-						url: '../../static/image/tosign/tosigin(5).png',
-						id : '2'
-					},
-					{
-						name: 'appl3e',
-						checked: false,
-						disabled: false,
-						content: "木糖少女小紫薯西装领连衣裙夏季新款女装夏收腰格子格纹裙子",
-						url: '../../static/image/tosign/tosigin(5).png',
-						id : '3'
-					},
-				],
-				List_tosign : []
-			}
-			
+			list: [],
+			List_tosign: [],
+			scrollTop: 0,
+			imgarr: [], //上传图片数组
+			cover: '', //图文封面
+			selectarr: [], //选中标签
+			tagcontent: ''
+		};
 	},
 	onLoad() {
 		// 缓存取选择好的数据
-			this.tosign()
+		this.tosign();
+		this.getLiveSpec();
 	},
 	methods: {
+		publish() {
+			let arr = this.imgarrB;
+			let newarr = [];
+			for (let index in arr) {
+				newarr.push(arr[index].file_id);
+			}
+			this.$u.api.publishphoto({
+				article_title: this.form.name,
+				article_content: this.form.intro,
+				article_pic: this.imgarrA[0].file_name,
+				file_id: newarr,
+				goods_id_arr: this.arres_list,
+				label_arr: this.selectarr
+			}).then(res => {
+				if (res.errCode != 0) {
+					this.$refs.uToast.show({
+						title: res.message,
+						type: 'error'
+					});
+				} else {
+					this.$refs.uToast.show({
+						title: res.message,
+						type: 'success'
+					});
+					setTimeout(function(){
+						uni.navigateBack({
+							delta:1
+						})
+					},1000)
+				}
+			});
+		},
+		// 获取商品数组变化
+		getshoplist() {
+			let arr = this.arres_list;
+			let newarr = this.list;
+			this.shoplist = [];
+			for (let index in arr) {
+				for (let i in newarr) {
+					if (arr[index] == newarr[i].goods_id) {
+						this.shoplist.push(newarr[i]);
+					}
+				}
+			}
+		},
+		// 改变选中状态
+		changeselect(num) {
+			if (this.fileListes[num].state == true) {
+				this.fileListes[num].state = false;
+				let index = this.selectarr.indexOf(this.fileListes[num].id);
+				this.selectarr.splice(index, 1);
+			} else {
+				this.fileListes[num].state = true;
+				this.selectarr.push(this.fileListes[num].id);
+			}
+		},
+		// 获取标签
+		getLiveSpec() {
+			let that = this;
+			this.$u.api.getLiveSpec({}).then(res => {
+				if (res.errCode != 0) {
+					this.$refs.uToast.show({
+						title: res.message,
+						type: 'error'
+					});
+				} else {
+					let arr = res.data;
+					for (let index in arr) {
+						arr[index].state = false;
+					}
+					that.fileListes = arr;
+				}
+			});
+		},
+		// 创建标签
+		addLiveSpec() {
+			this.$u.api.createLivesp({
+				spec_name: this.tagcontent
+			}).then(res => {
+				if (res.errCode != 0) {
+					this.$refs.uToast.show({
+						title: res.message,
+						type: 'error'
+					});
+				} else {
+					this.tagcontent = '';
+					this.show = false;
+					this.$refs.uToast.show({
+						title: res.message,
+						type: 'success'
+					});
+				}
+			});
+		},
+		// 上传封面
+		uploadcover(data) {
+			let obj = data.data;
+			obj.url = obj.file_path;
+			this.imgarrA.push(obj);
+		},
+		// 上传图片
+		uploadphoto(data) {
+			let obj = data.data;
+			obj.url = obj.file_path;
+			this.imgarrB.push(obj);
+		},
 		changes() {
 			let that = this;
 			that.show_two = false;
-				console.log(that.arres_list);
-				// 过滤数组
-				that.arres_list = [...new Set(that.arres_list)];
-				console.log(that.arres_list)
 		},
 		show_add() {
-				console.log(this.show)
-				this.show = !this.show
+			this.show = !this.show;
 		},
 		// 选中某个复选框时，由checkbox时触发
 		checkboxChange(e) {
-				console.log(e);
-				if(e.value == true){
 			let id = e.name;
-					this.pushes(id)
+			if (e.value == true) {
+				this.pushes(id);
+			} else {
+				this.delarr(id);
 			}
 		},
+		// 删除直播商品
+		delarr(id) {
+			var that = this;
+			if (id == '') {
+				console.log('为空');
+			} else {
+				let index = that.arres_list.indexOf(id);
+				that.arres_list.splice(index, 1);
+				that.getshoplist();
+			}
+		},
+		// 增加直播商品
 		pushes(id) {
 			var that = this;
-				console.log(id)
 			if (id == '') {
-					console.log("为空")
+				console.log('为空');
 			} else {
 				that.arres_list.push(id);
+				that.getshoplist();
 			}
 		},
-			// 选中任一checkbox时，由checkbox-group触发
-			checkboxGroupChange(e) {
-				console.log(e);
-				
-			},
 		tosign() {
-				console.log("111") 
-				this.$u.api.documentInfo({
-					document_code: 'privacy'
-				}).then((res)=>{
-					console.log(res)
-				})
-				try {
-				    const value = uni.getStorageSync('list_tosign');
-				    if (value) {
-				        console.log(value);
-				    }
-				} catch (e) {
-				    // error
-				}
+			this.$u.api.canselectgood({}).then(res => {
+				if (res.data.live_stataes == 0) {
+					this.$u.route({
+						url: `/pages/${url}`
+					});
+				} else {
+					let arr = res.data.list;
+					for (let index in arr) {
+						arr[index].checked = false;
 					}
+					this.list = arr;
+				}
+			});
+			// try {
+			// 	const value = uni.getStorageSync('list_tosign');
+			// 	if (value) {
+			// 		console.log(value);
+			// 	}
+			// } catch (e) {
+			// 	// error
+			// }
 		}
 	}
+};
 </script>
 
 <style lang="scss" scoped>
@@ -193,7 +316,13 @@
 		margin-bottom: 28rpx;
 		color: #fff;
 	}
-
+	.active {
+		background: red;
+	}
+	.scroll {
+		width: 100%;
+		height: 400px;
+	}
 	.titles {
 		font-size: 30rpx;
 		font-weight: 400;
@@ -223,7 +352,7 @@
 
 	.show_two .title {
 		width: 100%;
-			border-bottom: solid 1px #ECECEC;
+		border-bottom: solid 1px #ececec;
 		margin-bottom: 30rpx;
 	}
 
@@ -274,14 +403,14 @@
 	}
 
 	.u-button {
-			background: #FF780F;
+		background: #ff780f;
 		width: 690rpx;
 		height: 98rpx;
 		line-height: 98rpx;
 		background: rgba(255, 120, 15, 1);
 		border-radius: 49px;
 		font-size: 36rpx;
-			color: #FFFFFF;
+		color: #ffffff;
 		text-align: center;
 		margin: 0 auto 20rpx;
 	}
@@ -301,7 +430,7 @@
 
 .titles_border,
 .uni-textarea-compute {
-		border: 1px #BABABA solid !important;
+	border: 1px #bababa solid !important;
 	padding: 10rpx;
 	border-radius: 10rpx;
 }

pages/release/tosign.vue

@@ -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://dmmall.sdbairui.com/storeapi/Upload/uploadFile' name="article_cover" :max-count="1" :show-progress="false" @on-change="tupian" del-color="#ececec" upload-text="上传" del-bg-color="#fff"></u-upload>
+				<u-upload :form-data="{'name':'article_cover'}" action='https://dmmall.sdbairui.com/storeapi/Upload/uploadFile'  name="article_cover" :header="{'Authorization' : 'Bearer' +  ' ' + token}" :max-count="1" :show-progress="true" @on-change="tupian" del-color="#ececec" upload-text="上传" del-bg-color="#fff"></u-upload>
 			</view>
 			<view class="button-uview">
 				<u-button @click="kaibo">{{relerest}}</u-button>
@@ -60,7 +60,8 @@
 				relerest: '开始直播',
 				fileListes:[],
 				rSelect:[],
-				image:""
+				image:"",
+				token:""
 			};
 		},
 		methods: {
@@ -90,7 +91,7 @@
 				this.init()
 			},
 			tupian(a){
-				console.log(JSON.parse(a.data).data)
+				console.log(JSON.parse(a.data))
 				this.image = JSON.parse(a.data).data.file_name
 			},
 			navto(url){
@@ -111,7 +112,8 @@
 						url:"/pages/release/zhibo",
 						params:{
 							url:res.data.url.replace("&","*"),
-							id:res.data.chat_id
+							id:res.data.chat_id,
+							live_id: res.data.live_id
 						}
 					})
 				})
@@ -137,6 +139,14 @@
 		onLoad(){
 			this.init()
 			uni.removeStorageSync('gouwudai')
+			//
+
+			this.token = uni.getStorageSync('token');
+			 var config = {
+                appkey: 'mgb7ka1',
+                debug:true
+            };
+
 		}
 	};
 </script>
@@ -472,5 +482,6 @@
 		left: 0;
 		right: 0;
 		margin: auto;
+		z-index: 10;
 	}
 </style>

pages/release/video.vue

@@ -1,33 +1,78 @@
 <template>
 	<view id="release">
 		<u-form :model="form" ref="uForm">
-				<u-form-item label="标题" label-position="right">
-					<u-input v-model="form.name" placeholder="请输入标题" />
-				</u-form-item>
-				<view class="titles">图片</view>
-					<u-upload :action="action" del-color="#ececec" upload-text="选择图片" del-bg-color="#fff" :file-list="fileList" ></u-upload>
+			<u-form-item label="标题" label-position="right"><u-input v-model="form.name" placeholder="请输入标题" /></u-form-item>
+			<view class="titles">封面</view>
+			<u-upload
+				:form-data="coverformdata"
+				:max-count="1"
+				:header="header"
+				name="article_cover"
+				:action="action"
+				del-color="#ececec"
+				upload-text="选择图片"
+				del-bg-color="#fff"
+				:file-list="fileListA"
+				@on-success="uploadcover"
+			></u-upload>
+			<view class="titles">视频</view>
+			<view class="videobox" v-if="videostate == false" @click="uploadvideo">
+				<u-icon name="plus" class="u-add-btn" size="40"></u-icon>
+				<view class="videotext">选择视频</view>
+			</view>
+			<view class="videobox" v-else @click="uploadvideo"><video :src="videopath" controls></video></view>
 			<!-- 标签 -->
 			<view>
 				<view class="titles">标签</view>
 				<view class="form-view" @click="show_add()">+ 新建标签</view>
-					<view class="form-view" v-for="(item,index) in fileListes" :key="index">{{item}}</view>
+				<view :class="[item.state == true ? 'active' : '', 'form-view']" v-for="(item, index) in fileListes" :key="index" @click="changeselect(index)">
+					{{ item.name }}
+				</view>
 			</view>
 			<!-- 简介 -->
 			<view class="titles">正文</view>
-				<textarea placeholder="请输入内容..."></textarea>
+			<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">
+					<view class="title"><text>选择商品</text></view>
+					<!-- 商品列表 -->
+					<scroll-view :scroll-top="scrollTop" scroll-y="true" class="scroll">
+						<view class="listes_shoping" v-for="(item, index) in list" :key="index">
+							<view>
+								<u-checkbox-group>
+									<u-checkbox @change="checkboxChange" shape="circle" active-color="#FF780F" v-model="item.checked" :name="item.goods_id"></u-checkbox>
+								</u-checkbox-group>
+							</view>
+							<view><image :src="item.goods_image" mode="widthFix"></image></view>
+							<view class="contentes">{{ item.goods_name }}</view>
+						</view>
+					</scroll-view>
+
+					<!-- 提交按钮 -->
+					<view class="u-button" @click="changes()">确定</view>
+				</u-popup>
+				<!-- 底部选择商品列表 -->
+				<view @click="show_two = true">
+					选择商品
+					<image class="images" src="../../static/image/tosign/bhottom.png"></image>
+				</view>
+				<!-- 选择后的列表 -->
+				<view class="List_tosign" v-for="list in shoplist">
+					<view><image :src="list.goods_image" mode="scaleToFill"></image></view>
+					<view>{{ list.goods_name }}</view>
+					<view><image src="../../static/image/tosign/delete.png" mode="widthFix" @click="delarr(list.goods_id)"></image></view>
+				</view>
+			</view>
 			<!-- 提交 -->
-				<u-button class="custom-style" shape="circle" size="default">发表</u-button>
+			<u-button class="custom-style" shape="circle" size="default" @click="publish">发表</u-button>
 		</u-form>
 		<!-- 添加标签的按钮 -->
 		<u-popup v-model="show" mode="center" border-radius="14" :closeable="true">
-				<view class="text">
-					创建属于你的标签吧
-				</view>
-				<view class="u-inputes">
-					<u-input v-model="form.name" />
-				</view>
-				<u-button class="custom-style-button" shape="circle" size="default">确定</u-button>
+			<view class="text">创建属于你的标签吧</view>
+			<view class="u-inputes"><u-input v-model="tagcontent" /></view>
+			<u-button class="custom-style-button" shape="circle" size="default" @click="addLiveSpec">确定</u-button>
 		</u-popup>
+		<u-toast ref="uToast" />
 	</view>
 </template>
 
@@ -40,28 +85,353 @@
 				intro: '',
 				sex: ''
 			},
+			coverformdata: {
+				name: 'article_cover'
+			},
+			header: {
+				Authorization: 'Bearer' + ' ' + uni.getStorageSync('token')
+			},
 			// 演示地址，请勿直接使用
-					action: 'http://www.example.com/upload',
-					fileList: [],
-					fileListes:["美妆","博主穿搭","美妆","美妆","美妆","美妆","美妆","博主穿搭"],
-					show: false
-				}
+			action: 'https://dmmall.sdbairui.com/storeapi/Upload/uploadFile',
+			fileListA: [],
+			imgarrA: [],
+			videopath: '', //视频链接
+			fileListes: [],
+			show: false,
+			show_two: false,
+			arres_list: [],
+			shoplist: [], //选择商品列表
+			list: [],
+			scrollTop: 0,
+			selectarr: [], //选中标签
+			tagcontent: '', //新建标签名字
+			selectvideo: '', //视频名字
+			videostate: false //视频状态
+		};
+	},
+	onLoad() {
+		this.getLiveSpec();
+		this.resetgood();
 	},
 	methods: {
-				show_add(){
-					console.log(this.show)
-					this.show = !this.show
+		// 获取可以推荐的商品
+		resetgood() {
+			this.$u.api.canselectgood({}).then(res => {
+				if (res.data.live_stataes == 0) {
+					this.$u.route({
+						url: `/pages/${url}`
+					});
+				} else {
+					let arr = res.data.list;
+					for (let index in arr) {
+						arr[index].checked = false;
+					}
+					this.list = arr;
+				}
+			});
+		},
+		// 发布短视频
+		publish() {
+			this.$u.api.publishvideo({
+				article_title: this.form.name,
+				article_content: this.form.intro,
+				article_pic: this.imgarrA[0].file_name,
+				video_path: this.videopath,
+				goods_id_arr: this.arres_list,
+				label_arr: this.selectarr
+			}).then(res => {
+				if (res.errCode != 0) {
+					this.$refs.uToast.show({
+						title: res.message,
+						type: 'error'
+					});
+				} else {
+					this.$refs.uToast.show({
+						title: res.message,
+						type: 'success'
+					});
+					setTimeout(function(){
+						uni.navigateBack({
+							delta:1
+						})
+					},1000)
+				}
+			});
+		},
+		// 获取商品数组变化
+		getshoplist() {
+			let arr = this.arres_list;
+			let newarr = this.list;
+			this.shoplist = [];
+			for (let index in arr) {
+				for (let i in newarr) {
+					if (arr[index] == newarr[i].goods_id) {
+						this.shoplist.push(newarr[i]);
+					}
+				}
 			}
 		},
-			components: {  
+		// 改变选中状态
+		changeselect(num) {
+			if (this.fileListes[num].state == true) {
+				this.fileListes[num].state = false;
+				let index = this.selectarr.indexOf(this.fileListes[num].id);
+				this.selectarr.splice(index, 1);
+			} else {
+				this.fileListes[num].state = true;
+				this.selectarr.push(this.fileListes[num].id);
+			}
+		},
+		// 创建标签
+		addLiveSpec() {
+			this.$u.api.createLivesp({
+				spec_name: this.tagcontent
+			}).then(res => {
+				if (res.errCode != 0) {
+					this.$refs.uToast.show({
+						title: res.message,
+						type: 'error'
+					});
+				} else {
+					this.tagcontent = '';
+					this.show = false;
+					this.$refs.uToast.show({
+						title: res.message,
+						type: 'success'
+					});
+				}
+			});
+		},
+		// 获取标签
+		getLiveSpec() {
+			let that = this;
+			this.$u.api.getLiveSpec({}).then(res => {
+				if (res.errCode != 0) {
+					this.$refs.uToast.show({
+						title: res.message,
+						type: 'error'
+					});
+				} else {
+					let arr = res.data;
+					for (let index in arr) {
+						arr[index].state = false;
+					}
+					that.fileListes = arr;
+				}
+			});
+		},
+		// 上传封面
+		uploadcover(data) {
+			let obj = data.data;
+			obj.url = obj.file_path;
+			this.imgarrA.push(obj);
+		},
+		// 上传视频
+		uploadvideo() {
+			let url = this.action;
+			let that = this;
+			uni.chooseVideo({
+				count: 1,
+				sourceType: ['camera', 'album'],
+				success: function(res) {
+					self.src = res.tempFilePath;
+					const tempFilePaths = res.tempFilePath;
+					uni.uploadFile({
+						url: url, //仅为示例，非真实的接口地址
+						filePath: tempFilePaths,
+						name: 'article_video',
+						formData: {
+							name: 'article_video'
+						},
+						header: {
+							Authorization: 'Bearer' + ' ' + uni.getStorageSync('token')
+						},
+						success: uploadFileRes => {
+							let obj = JSON.parse(uploadFileRes.data);
+							that.videopath = obj.data.url;
+							that.selectvideo = obj.data.key;
+							that.videostate = true;
+						},
+						fail: function(error) {
+							console.log(error);
+						}
+					});
+				}
+			});
+		},
+		// 新建标签
+		show_add() {
+			this.show = !this.show;
+		},
+		// 选择直播商品点击确定
+		changes() {
+			let that = this;
+			that.show_two = false;
+		},
+		// 选中某个复选框时，由checkbox时触发
+		checkboxChange(e) {
+			let id = e.name;
+			if (e.value == true) {
+				this.pushes(id);
+			} else {
+				this.delarr(id);
+			}
+		},
+		// 删除直播商品
+		delarr(id) {
+			var that = this;
+			if (id == '') {
+				console.log('为空');
+			} else {
+				let index = that.arres_list.indexOf(id);
+				that.arres_list.splice(index, 1);
+				that.getshoplist();
+			}
+		},
+		// 增加直播商品
+		pushes(id) {
+			var that = this;
+			if (id == '') {
+				console.log('为空');
+			} else {
+				that.arres_list.push(id);
+				that.getshoplist();
 			}
 		}
+	},
+	components: {}
+};
 </script>
 
 <style lang="scss" scoped>
 #release {
 	width: 690rpx;
 	margin: 0 auto;
+	.titles_border,
+	.uni-textarea-compute {
+		border: 1px #bababa solid !important;
+		padding: 10rpx;
+		border-radius: 10rpx;
+	}
+	.show_two {
+		padding: 30rpx 0 70rpx 0;
+	}
+	.scroll {
+		width: 100%;
+		height: 400px;
+	}
+	.u-button {
+		background: #ff780f;
+		width: 690rpx;
+		height: 98rpx;
+		line-height: 98rpx;
+		background: rgba(255, 120, 15, 1);
+		border-radius: 49px;
+		font-size: 36rpx;
+		color: #ffffff;
+		text-align: center;
+		margin: 0 auto 20rpx;
+	}
+	.show_two .title {
+		width: 100%;
+		border-bottom: solid 1px #ececec;
+		margin-bottom: 30rpx;
+	}
+
+	.show_two .title > text {
+		font-size: 30rpx;
+		padding: 30rpx;
+		display: block;
+	}
+	.show_two > view {
+		font-size: 30rpx;
+		font-weight: 400;
+		color: rgba(51, 51, 51, 1);
+	}
+
+	.show_two .images {
+		width: 22rpx;
+		height: 12rpx;
+		float: right;
+		top: 14rpx;
+	}
+	.List_tosign {
+		overflow: hidden;
+		zoom: 1;
+		margin-top: 21rpx;
+		position: relative;
+	}
+	.List_tosign > view {
+		float: left;
+	}
+	.List_tosign > view:nth-child(1) {
+		width: 180rpx;
+		height: 160rpx;
+		margin-bottom: 30rpx;
+		image {
+			border-radius: 15rpx;
+			width: 100%;
+			height: 100%;
+		}
+	}
+	.List_tosign > view:nth-child(2) {
+		width: 420rpx;
+		height: 76rpx;
+		margin: 43rpx 43rpx 0 21rpx;
+	}
+	.List_tosign > view:nth-child(3) {
+		width: 26rpx;
+		height: 27rpx;
+		position: absolute;
+		top: 0;
+		right: 0;
+		bottom: 0;
+		margin: auto;
+		image {
+			width: 100%;
+			height: 100%;
+			display: block;
+		}
+	}
+	.listes_shoping {
+		overflow: hidden;
+		zoom: 1;
+		margin-bottom: 30rpx;
+		height: 160rpx;
+		position: relative;
+	}
+
+	.listes_shoping > view {
+		float: left;
+	}
+
+	.listes_shoping > view:nth-child(1) {
+		width: 36rpx;
+		height: 36rpx;
+		margin-top: 62rpx;
+		margin-left: 30rpx;
+	}
+
+	.listes_shoping > view:nth-child(2) {
+		width: 180rpx;
+		height: 160rpx;
+		margin: 0 31rpx 0 19rpx;
+	}
+
+	.listes_shoping > view:nth-child(2) image {
+		width: 100%;
+	}
+
+	.listes_shoping > view:nth-child(3) {
+		width: 425rpx;
+		margin-top: 43rpx;
+		overflow: hidden;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 2;
+	}
 	.form-view {
 		background: rgba(255, 120, 15, 1);
 		border-radius: 6rpx;
@@ -72,12 +442,33 @@
 		margin-bottom: 28rpx;
 		color: #fff;
 	}
+	.active {
+		background: red;
+	}
 	.titles {
 		font-size: 30rpx;
 		font-weight: 400;
 		color: rgba(51, 51, 51, 1);
 		margin: 30rpx 0;
 	}
+	.videobox {
+		width: 200rpx;
+		height: 200rpx;
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		background: #f4f5f6;
+		margin-left: 10rpx;
+		border-radius: 10rpx;
+	}
+	.videotext {
+		margin-top: 10rpx;
+	}
+	.videobox video {
+		width: 200rpx;
+		height: 200rpx;
+	}
 	textarea {
 		font-size: 26rpx;
 	}

pages/release/zhibo.nvue

@@ -1,7 +1,7 @@
 <template>
     <div>
         <live-pusher id='livePusher' ref="livePusher" class="livePusher" :url="url"
-        mode="SD" :muted="true" :enable-camera="true" :auto-focus="true" :beauty="1" whiteness="2"
+        mode="SD" :muted="false" :enable-camera="true" :auto-focus="true" :beauty="meiyan + 1" whiteness="2"
         aspect="9:16" @statechange="statechange" @netstatus="netstatus" @error = "error"
         :style="{'height':height + 'px'}"
         ></live-pusher>
@@ -41,9 +41,37 @@
             <image class="userhead" :src="info.member_avatar"></image>
             <div class="userinfo">
                 <text class="username">{{info.member_name}}</text>
-                <text class="username" style="font-size:20rpx">asdasdsa | sadasdas</text>
+                <text class="username" style="font-size:20rpx">{{time}} | sadasdas</text>
             </div>
         </div>
+        <image class="closeimg" src="../../static/image/close.png" @click="closes"></image>
+        <image class="menuimg" src="../../static/image/menu.png" @click="tool = true"></image>
+        <image class="shoptapimg" @click="xianshi" src="../../static/image/shop.png"></image>
+        <text style="font-size:26rpx;color:#fff;width:512rpx;position:fixed;left:30rpx;top:793rpx">德铭阳光在线绿色直播，请遵循相关法律法规，警察叔叔24小时巡查哦。为了保障直播系统稳定，现将全局开放防主播沉迷功能。主播积累直播16小时将自动下播休息2小时后方可继续开播。请大家注意休息/避免空播。
+        </text>
+        <div class="danmulist">
+            <text class="danmuitem" v-for="(i,j) in danmulist" :key="j">{{i.senderNickname}}:{{i.content}}</text>
+            
+        </div>
+        <div class="bottom" :style="{'height':height + 'px'}" v-if="tool" @click="tool = false">
+        <view class="menu" @click="zuzhi">
+            <view class="menuback"></view>
+            <text class="menutitle">直播工具</text>
+            <view class="menutool">
+                <view class="menutoolitem" @click="switchCamera">
+                    <image class="menutoolitemimg"></image>
+                    <text class="menutoolitemtitle">翻转</text>
+                </view>
+                 <picker @change="bindPickerChange" :value="meiyan" :range="[1,2,3,4,5,6,7,8,9]">
+                        <view class="menutoolitem">
+                            <image class="menutoolitemimg"></image>
+                            <text class="menutoolitemtitle">美颜</text>
+                        </view>
+                </picker>
+               
+            </view>
+        </view>
+        </div>
         <!-- <button class="btn" @click="start">开始推流1</button>
         <button class="btn" @click="pause">暂停推流</button>
         <button class="btn" @click="resume">resume</button>
@@ -56,6 +84,27 @@
     </div>
 </template>
 <style lang="scss" scoped>
+.shoptapimg{
+    width: 65rpx;
+    height: 65rpx;
+    position: fixed;
+    right: 26rpx;
+    bottom: 24rpx;
+}
+.menuimg{
+    width: 60rpx;
+    height: 55rpx;
+    position: fixed;
+    left: 26rpx;
+    bottom: 24rpx;
+}
+.closeimg{
+    position: fixed;
+    top: 70rpx;
+    right: 31rpx;
+    width: 31rpx;
+    height: 31rpx;
+}
 .username{
     font-size: 24rpx;
     color: #fff;
@@ -97,7 +146,6 @@
 .shopimg{
     width: 160rpx;
     height: 160rpx;
-    background-color: #0f0;
     
 
 }
@@ -164,18 +212,83 @@
     z-index: 20;
     
 }
+.menu{
+    width: 750rpx;
+    height: 335rpx;
+    border-top-left-radius: 20rpx;
+    border-top-right-radius: 20rpx;
+    overflow: hidden;
+    position: fixed;
+    bottom: 0;
+    left: 0;
+}
+.menuback{
+    background-color: #000;
+    opacity: 0.8;
+    position: absolute;
+    border-top-left-radius: 20rpx;
+    border-top-right-radius: 20rpx;
+    overflow: hidden;
+    top: 0;
+    left: 0;
+}
+.menutitle{
+    font-size: 30rpx;
+    color: #fff;
+    margin-left: 30rpx;
+    margin-top: 30rpx;
+}
+.menutool{
+    flex-direction: row;
+    margin-top: 59rpx;
+    margin-left: 30rpx;
+}
+.menutoolitem{
+    align-items: center;
+    margin-right: 60rpx;
+}
+.menutoolitemtitle{
+    margin-top: 30rpx;
+    font-size: 28rpx;
+    color: #fff;
+}
+.menutoolitemimg{
+    width: 100rpx;
+    height: 100rpx;
+}
+.danmulist{
+    position: fixed;
+    left: 30rpx;
+    bottom: 118rpx;
+}
+.danmuitem{
+    font-size: 26rpx;
+    color: #fff;
+    flex-direction: column-reverse;
+}
+.livePusher{
+    width: 750rpx;
+}
 </style>
 <script>
-const RongIMLib = require('../../static/rongyun.js');
+    const ChatRoomService =require('../../static/chatservice');
     export default {
         data: {
             fil: true,
             url:'',
             height:0,
-            show:true,
+            show:false,
             list:[],
             info:{},
-            im:{}
+            im:{},
+            chatroom_id:0,
+            live_id:0,
+            tool:false,
+            meiyan:0,
+            time:'00:00:00',
+            room:{},
+            chatRoomService:{},
+            danmulist:[]
         },
         onReady() {
             // 注意：需要在onReady中 或 onLoad 延时
@@ -191,14 +304,18 @@ const RongIMLib = require('../../static/rongyun.js');
                 }
             })
         },
+        
         onLoad(a){
             this.url = a.url.replace("*","&")
             let that = this
             const token = uni.getStorageSync('token');
+            console.log('Bearer' + " " + token)
+            this.chatroom_id = a.id
+            this.live_id = a.live_id
             uni.request({
-                url:"https://dmmall.sdbairui.com//storeapi/Streaming/liveStreamList",
+                url:"https://dmmall.sdbairui.com/storeapi/Streaming/liveStreamList",
                 method:"POST",
-                headers:{
+                header:{
                     'Authorization' : 'Bearer' + " " + token
                 },
                 success(res){
@@ -209,56 +326,168 @@ const RongIMLib = require('../../static/rongyun.js');
              uni.request({
                 url:"https://dmmall.sdbairui.com/storeapi/member/memberInfo",
                 method:"POST",
-                headers:{
+                header:{
                     'Authorization' : 'Bearer' + " " + token
                 },
                 success(res){
-                    console.log(res.data.data.memberInfo)
+                    console.log(res.data)
                     that.info = res.data.data.memberInfo
+                    
+                    console.log(uni.getStorageSync('userinfo'),123)
+                    //当前用户
+                    var currentUser = {
+                        id : res.data.data.memberInfo.member_id + "",
+                        nickname : res.data.data.memberInfo.member_nickname + "",
+                        avatar: res.data.data.memberInfo.member_avatar
+                    };
+
+                    var room = {
+                        id : a.id + "",
+                        name : a.id + ""
+                    };
+                    console.log(room)
+                    //构造chatRoomService
+                    that.chatRoomService = new ChatRoomService(room, currentUser);
+                    that.chatRoomService.initialWhenNewMessage(that.whenNewMessage);
+                    that.chatRoomService.connectGoEasyIM();
+                    //获取当前聊天室数据
+                    that.room = that.chatRoomService.room;
                 }
             })
-            var config = {
-                appkey: 'mgb7ka1',
-                debug:true
-            };
-            var im = RongIMLib.init(config);
-            var conversationList = []; // 当前已存在的会话列表
-            im.watch({
-                conversation: function(event){
-                    var updatedConversationList = event.updatedConversationList; // 更新的会话列表
-                    console.log('更新会话汇总:', updatedConversationList);
-                    console.log('最新会话列表:', im.Conversation.merge({
-                    conversationList,
-                    updatedConversationList
-                    }));
-                },
-                message: function(event){
-                    var message = event.message;
-                    console.log('收到新消息:', message);
-                },
-                status: function(event){
-                    var status = event.status;
-                    console.log('连接状态码:', status);
+            let shi = 0;
+            let fen = 0;
+            let miao = 0;
+            setInterval(() => {
+                shi = parseInt(shi)
+                fen = parseInt(fen)
+                miao = parseInt(miao)
+                miao = miao + 1 
+                // console.log(miao)
+                if(miao == 60){
+                    miao = 0;
+                    fen +=1
                 }
-            });
-            var user = {
-                token: uni.getStorageSync('rongyun')
-            };
-            im.connect(user).then(function(user) {
-                console.log('链接成功, 链接用户 id 为: ', user.id);
-            }).catch(function(error) {
-                console.log('链接失败: ', error.code, error.msg);
-            });
-            var chatRoom = im.ChatRoom.get({
-                id: a.id
-            });
-            chatRoom.join({
-                count: 20 // 进入后, 自动拉取 20 条聊天室最新消息
-            }).then(function() {
-                console.log('加入聊天室成功');
-            });
+                if(fen == 60){
+                    shi += 1
+                    fen = 0
+                }
+                if(shi < 10){
+                    shi = '0' + shi
+                }
+                if(fen < 10){
+                    fen = '0' + fen
+                }
+                if(miao < 10){
+                    miao = '0' + miao
+                }
+                that.time = shi + ":" + fen + ":" + miao
+            }, 1000);
+            // var roomToken = JSON.parse(options.roomToken);
+	
+
+			// //获取当前聊天室数据
+            // this.room = this.chatRoomService.room;
+            // var config = {
+            //     appkey: 'mgb7ka1',
+            //     debug:true
+            // };
+            // var im = RongIMLib.init(config);
+            // var conversationList = []; // 当前已存在的会话列表
+            // im.watch({
+            //     conversation: function(event){
+            //         var updatedConversationList = event.updatedConversationList; // 更新的会话列表
+            //         console.log('更新会话汇总:', updatedConversationList);
+            //         console.log('最新会话列表:', im.Conversation.merge({
+            //         conversationList,
+            //         updatedConversationList
+            //         }));
+            //     },
+            //     message: function(event){
+            //         var message = event.message;
+            //         console.log('收到新消息:', message);
+            //     },
+            //     status: function(event){
+            //         var status = event.status;
+            //         console.log('连接状态码:', status);
+            //     }
+            // });
+            // var user = {
+            //     token: uni.getStorageSync('rongyun')
+            // };
+            // console.log(user,123)
+            // im.connect(user).then(function(user) {
+            //     console.log('链接成功, 链接用户 id 为: ', user.id);
+            // }).catch(function(error) {
+            //     console.log('链接失败: ', error.code, error);
+            // });
+            // var chatRoom = im.ChatRoom.get({
+            //     id: a.id
+            // })
+            // chatRoom.join({
+            //     count: 20 // 进入后, 自动拉取 20 条聊天室最新消息
+            // }).then(function() {
+            //     console.log('加入聊天室成功');
+            // }).catch((err)=>{
+            //     console.log(err,262)
+            // })
+
         },  
         methods: {
+            whenNewMessage (message) {//新消息监听
+				// if(message.type == this.room.MessageType.PROP){
+				// 	this.propAnimation(parseInt(message.content))
+				// }
+				// setTimeout(() => {
+				// 	this.contentPosition = 'message-box'+(this.room.messages.length-1);
+                // }, 300)
+				console.log(message)
+                this.danmulist.push(message)
+                if(this.danmulist.length > 7){
+                    this.danmulist = this.danmulist.slice(this.danmulist.length - 7)
+                }
+			},
+            bindPickerChange(a){
+                console.log(a.detail.value)
+                this.meiyan = a.detail.value
+                uni.showToast({
+                    title: '切换成功',
+                    duration: 2000
+                });
+            },
+            closes(){
+                const token = uni.getStorageSync('token');
+                let that = this
+                console.log(that.url)
+                uni.showModal({
+                    title: '提示',
+                    content: '是否关闭直播',
+                    success: function (res) {
+                        if (res.confirm) {
+                             uni.request({
+                                url:"https://dmmall.sdbairui.com/storeapi/Streaming/destroyChatRoom",
+                                data:{
+                                    chatroom_id:that.chatroom_id,
+                                    live_id:that.live_id,
+                                    url: that.url
+                                },
+                                method:"POST",
+                                header:{
+                                    "Authorization" : 'Bearer' + " " + token
+                                },
+                                success(res){
+                                    console.log(res)
+                                    uni.navigateBack({
+                                        delta: 1
+                                    });
+                                    // that.list= res.data.data
+                                }
+                            })
+                        } else if (res.cancel) {
+                            console.log('用户点击取消');
+                        }
+                    }
+                }); 
+            },
             statechange(e) {
                 console.log("statechange:" + JSON.stringify(e));
             },
@@ -338,6 +567,10 @@ const RongIMLib = require('../../static/rongyun.js');
                     }
                 });
             },
+            xianshi(){
+                this.show = true;
+                console.log(111)
+            },
             guanbi(){
                 this.show = false
                 console.log(123)
@@ -361,7 +594,7 @@ const RongIMLib = require('../../static/rongyun.js');
                     data:{
                         goods_id:arr.join(',')
                     },
-                    headers:{
+                    header:{
                         'Authorization' : 'Bearer' + " " + token
                     },
                     success(res){
@@ -369,7 +602,7 @@ const RongIMLib = require('../../static/rongyun.js');
                         uni.request({
                             url:"https://dmmall.sdbairui.com//storeapi/Streaming/liveStreamList",
                             method:"POST",
-                            headers:{
+                            header:{
                                 'Authorization' : 'Bearer' + " " + token
                             },
                             success(res){

pages/user/complaint.vue

@@ -1,23 +1,47 @@
 <template>
 	<view class="complaint">
-		<view class="complaint-item" v-for="(item, index) in 4" :key="index" @click="toDetailsPage">
-			<ComplaintItem></ComplaintItem>
+		<view class="complaint-item" v-for="(item, index) in list" :key="index" @click="toDetailsPage(item.complain_id)">
+			<ComplaintItem :info="item"></ComplaintItem>
 		</view>
+		<u-toast ref="uToast" />
 	</view>
 </template>
 <script>
 import ComplaintItem from '@/components/complaint-item/index'
 export default {
 	data() {
-		return {}
+		return {
+			list:[]
+		}
 	},
 	components: {
 		ComplaintItem
 	},
+	onLoad() {
+		this.getlist()
+	},
 	methods: {
-		toDetailsPage() {
+		// 获取投诉列表
+		getlist(){
+			this.$u.api.reportlist({}).then(res => {
+				console.log(res)
+				if (res.errCode != 0) {
+					this.$refs.uToast.show({
+						title: res.message,
+						type: 'error'
+					});
+				} else {
+					let arr = res.data.dataList
+					for(let index in arr){
+						this.list.push(arr[index])
+					}
+					
+				}
+			});
+		},
+		toDetailsPage(id) {
 			uni.navigateTo({
-				url: '/pages/user/complaintDetails'
+				url: '/pages/user/complaintDetails?id='+id
 			});
 		}
 	},

pages/user/complaintDetails.vue

@@ -1,10 +1,10 @@
 <template>
 	<view class="details">
 		<view class="goods-info">
-			<image></image>
+			<image :src="info.complain_goods_image"></image>
 			<view class="text">
-				<view class="name u-line-1">心机小黑裙连衣裙赫本风夏季爆款dlk...</view>
-				<view class="num">共一件商品</view>
+				<view class="name u-line-1">{{info.complain_goods_name}}</view>
+				<view class="num">共{{info.complain_goods_num}}件商品</view>
 			</view>
 		</view>
 		<view class="worker-info">
@@ -12,28 +12,51 @@
 			<view class="item">
 				<view>
 					<view class="item-title">姓名</view>
-					<view class="value">李先生</view>
+					<view class="value">{{info.takeawayer_name}}</view>
 				</view>
 				<view>
 					<view class="item-title">手机号</view>
-					<view class="value">1561</view>
+					<view class="value">{{info.takeawayer_mobile}}</view>
 				</view>
 				<view>
 					<view class="item-title">公司名称</view>
-					<view class="value">申通快递公司</view>
+					<view class="value">{{info.company}}</view>
 				</view>
 			</view>
 		</view>
 		<view class="reason">
 			<view class="title">投诉原因</view>
-			<view class="value u-line-4">太慢了太慢了！！！！</view>
+			<view class="value u-line-4">{{info.complain_desc}}</view>
 		</view>
+		<u-toast ref="uToast" />
 	</view>
 </template>
 <script>
 export default {
 	data() {
-		return {}
+		return {
+			info:{}
+		}
+	},
+	onLoad(option) {
+		this.getinfo(option.id)
+	},
+	methods:{
+		getinfo(id){
+			let that = this;
+			this.$u.api.reportdetail({
+				id: id
+			}).then(res => {
+				if (res.errCode != 0) {
+					this.$refs.uToast.show({
+						title: res.message,
+						type: 'error'
+					});
+				} else {
+					this.info = res.data.info;
+				}
+			});
+		}
 	}
 };
 </script>

pages/user/content.vue

@@ -1,80 +1,153 @@
 <template>
 	<view class="content">
 		<view class="tab-swiper">
-			<u-tabs-swiper ref="uTabs" :list="list" :current="current" @change="tabsChange" active-color="#FF780F" inactive-color="#333333" font-size="30" gutter="317" height="98" :show-bar="false" swiperWidth="750" :is-scroll=false></u-tabs-swiper>
+			<u-tabs-swiper
+				ref="uTabs"
+				:list="list"
+				:current="current"
+				@change="tabsChange"
+				active-color="#FF780F"
+				inactive-color="#333333"
+				font-size="30"
+				gutter="317"
+				height="98"
+				:show-bar="false"
+				swiperWidth="750"
+				:is-scroll="false"
+			></u-tabs-swiper>
 		</view>
-		<swiper :current="swiperCurrent" @animationfinish="animationfinish">
-			<swiper-item class="swiper-item">
-				<scroll-view scroll-y style="height: 100%;width: 100%;" class="list">
-					<view v-for="(item, index) in 5" :key="index">
-						<ContentItem :cur="current" :delItem="showPopup"></ContentItem>
+		<view class="box">
+			<view v-for="(item, index) in newlist" :key="index"><ContentItem :info="item" :type="type" @del="del"></ContentItem></view>
 		</view>
-				</scroll-view>
-			</swiper-item>
-			<swiper-item class="swiper-item">
-				<scroll-view scroll-y style="height: 100%;width: 100%;" class="video-list">
-					<view v-for="(item, index) in 5" :key="index">
-						<ContentItem :cur="current" :delItem="showPopup"></ContentItem>
-					</view>
-				</scroll-view>
-			</swiper-item>
-		</swiper>
 		<u-popup v-model="show" mode="center">
 			<view class="close-popup">
-				<view class="tips">确定要删除该视频吗</view>
+				<view class="tips">{{msg}}</view>
 				<view class="btn">
 					<view class="cancel" @click="show = false">取消</view>
-					<view class="confirm">确定</view>
+					<view class="confirm" @click="delarticle">确定</view>
 				</view>
 			</view>
 		</u-popup>
+		<u-toast ref="uToast" />
 	</view>
 </template>
 <script>
-import ContentItem from '@/components/content-item/index'
+import ContentItem from '@/components/content-item/index';
 export default {
 	data() {
 		return {
 			show: false,
 			current: 0,
 			swiperCurrent: 0,
-			list: [{
+			list: [
+				{
 					name: '图文'
-			}, {
+				},
+				{
 					name: '视频'
-			}],
 				}
+			],
+			type: 1,
+			num: 1,
+			newlist: [],
+			delid:null,
+			msg:""
+		};
 	},
 	components: {
 		ContentItem
 	},
+	onLoad() {
+		this.getlist();
+	},
+	onReachBottom() {
+		this.num++;
+		this.getlist();
+	},
 	methods: {
-		showPopup() {
+		getlist() {
+			let that = this;
+			this.$u.api.articlelist({
+				type: that.type,
+				page: that.num
+			}).then(res => {
+				if (res.errCode != 0) {
+					this.$refs.uToast.show({
+						title: res.message,
+						type: 'error'
+					});
+				} else {
+					let arr = res.data.articleList;
+					for (let index in arr) {
+						that.newlist.push(arr[index]);
+					}
+				}
+			});
+		},
+		del(e) {
+			// 提示是否删除弹窗
+			if(this.type==1){
+				this.msg="确定要删除该图文吗?"
+			}else{
+				this.msg="确定要删除该视频吗?"
+			}
 			this.show = true;
+			this.delid = e
+		},
+		// 删除文章
+		delarticle(){
+			let that = this;
+			that.show = false;
+			this.$u.api.delarticle({
+				article_id: that.delid
+			}).then(res => {
+				console.log(res)
+				if (res.errCode != 0) {
+					this.$refs.uToast.show({
+						title: res.message,
+						type: 'error'
+					});
+				} else {
+					this.$refs.uToast.show({
+						title: res.message,
+						type: 'success'
+					});
+					// 删除后更新页面
+					this.delid = null
+					this.newlist = [];
+					that.num=1
+					that.getlist()
+				}
+			});
 		},
 		tabsChange(index) {
-			this.swiperCurrent = index;
-		},
-		animationfinish(e) {
-			let current = e.detail.current;
-			// this.$refs.uTabs.setFinishCurrent(current);
-			this.swiperCurrent = current;
-			this.current = current;
-		},
-	},
+			this.current = index;
+			this.type = index + 1;
+			this.num = 0;
+			this.newlist = [];
+			this.getlist();
+		}
+	}
 };
 </script>
 <style lang="scss" scoped>
+.tab-swiper {
+	width: 100%;
+	position: fixed;
+	top: 0;
+	margin-bottom: 20rpx;
+	z-index: 1000;
+}
 .content {
 	min-height: calc(100vh - var(--window-top));
-	background-color: #ECECEC;
+	background-color: #ececec;
 	display: flex;
 	flex-direction: column;
 	> uni-swiper {
 		flex: 1;
 	}
-	.tab-swiper {
-		margin: 2rpx 0 20rpx 0;
+	.box{
+		padding-top: 120rpx;
 	}
 	.close-popup {
 		background: rgba(255, 255, 255, 1);
@@ -88,7 +161,7 @@ export default {
 		}
 		.btn {
 			width: 420rpx;
-			border-top: 2rpx #ECECEC solid;
+			border-top: 2rpx #ececec solid;
 			display: flex;
 			> view {
 				font-size: 26rpx;
@@ -98,10 +171,10 @@ export default {
 			}
 			.cancel {
 				color: #333333;
-				border-right: 2rpx #ECECEC solid;
+				border-right: 2rpx #ececec solid;
 			}
 			.confirm {
-				color: #FF780F;
+				color: #ff780f;
 			}
 		}
 	}

pages/user/contentDetails.vue

@@ -1,77 +1,179 @@
 <template>
 	<view class="details">
-		<view class="main"></view>
-		<view></view>
+		<view class="main">
+			<view class="title">{{ info.article_title }}</view>
+			<view class="detail">{{ info.article_content }}</view>
+		</view>
+		<view class="imgbox">
+			<view v-if="type==1">
+				<image :src="list" mode="" v-for="list in info.article_image"></image>
+			</view>
+			<view v-else>
+				<video :src="info.video_path" controls></video>
+			</view>
+		</view>
 		<view class="data-list">
 			<view>
 				<image src="/static/image/user/2.png"></image>
-				<text>2.5w</text>
+				<text>{{ info.comment_num }}</text>
 			</view>
 			<view>
 				<image src="/static/image/user/3.png" v-if="0"></image>
 				<image src="/static/image/user/7.png" v-else></image>
-				<text>2.5w</text>
+				<text>{{ info.collect_num }}</text>
 			</view>
 			<view>
 				<image src="/static/image/user/4.png" v-if="0"></image>
 				<image src="/static/image/user/6.png" v-else></image>
-				<text>2.5w</text>
+				<text>{{ info.like_num }}</text>
 			</view>
 		</view>
 		<view class="comment-list">
-			<view class="item" v-for="(item, index) in 4" :key="index">
+			<view class="item" v-for="(item, index) in info.articlecomment" :key="index">
 				<view class="info">
 					<image></image>
 					<view class="center">
-						<view class="name">用户1</view>
-						<view class="time">6小时前</view>
+						<view class="name">{{item.member_nickname}}</view>
+						<view class="time">{{item.create_time}}</view>
 					</view>
-					<view class="btn" @click="showChat=true">回复</view>
+					<view class="btn" @click="showreply(item.id)">回复</view>
 				</view>
-				<view class="content u-line-1">德铭阳光赞德铭阳光赞德铭阳光赞</view>
+				<view class="content u-line-1">{{item.content}}</view>
 			</view>
 		</view>
-		<u-popup v-model="showChat" mode="bottom" :mask=false>
+		<u-popup v-model="showChat" mode="bottom" :mask="false">
 			<view class="chat">
 				<view class="input-box">
-					<input type="text">
-					<view class="btn">发送</view>
+					<input type="text" v-model="content"/>
+					<view class="btn" @click="reply">发送</view>
 				</view>
 			</view>
 		</u-popup>
+		<u-toast ref="uToast" />
 	</view>
 </template>
 <script>
 export default {
 	data() {
 		return {
-			showChat: false
-		}
+			showChat: false,
+			id: 0,
+			info: {
+				article_image: []
+			},
+			type:1,
+			content:"",
+			pid:null
+		};
 	},
 	onLoad(option) {
 		this.setNavTitle(option.current);
+		this.type = option.current
+		this.id = option.id;
+		this.getdetail();
 	},
 	methods: {
-		setNavTitle(current) {
-			uni.setNavigationBarTitle({
-				title: current == 0 ? "图文详情" : "视频详情"
+		// 展示回复弹框
+		showreply(id){
+			this.showChat = true
+			this.pid = id
+		},
+		// 回复评论
+		reply(){
+			if(this.content==""){
+				this.$refs.uToast.show({
+					title:"内容不能为空",
+					type: 'error'
+				});
+				return
+			}
+			let that = this;
+			this.$u.api.reply({
+				pid:that.pid,
+				content:that.content,
+				article_id: that.id
+			}).then(res => {
+				if (res.errCode != 0) {
+					this.$refs.uToast.show({
+						title: res.message,
+						type: 'error'
+					});
+				} else {
+					this.pid = "";
+					this.content = "";
+					this.$refs.uToast.show({
+						title: res.message,
+						type: 'success'
 					});
 				}
+			});
 		},
+		// 设置顶部标题
+		setNavTitle(current) {
+			uni.setNavigationBarTitle({
+				title: current == 1 ? '图文详情' : '视频详情'
+			});
+		},
+		// 获取文章详情
+		getdetail() {
+			let that = this;
+			this.$u.api.getdetail({
+				article_id: that.id
+			}).then(res => {
+				if (res.errCode != 0) {
+					this.$refs.uToast.show({
+						title: res.message,
+						type: 'error'
+					});
+				} else {
+					this.info = res.data.article[0];
+				}
+			});
+		}
+	}
 };
 </script>
 <style lang="scss" scoped>
 .details {
 	min-height: calc(100vh - var(--window-top));
-	background-color: #ECECEC;
+	background-color: #ececec;
 	.main {
-		height: 740rpx;
-		margin: 2rpx 0rpx; 
+		margin: 2rpx 0rpx 0;
+		background-color: #ffffff;
+		.title {
+			width: 100%;
+			text-align: center;
+			font-weight: bold;
+			font-size: 34rpx;
+			padding: 30rpx 0;
+		}
+		.detail {
+			width: 100%;
+			text-indent: 40rpx;
+			font-size: 26rpx;
+			text-align: justify;
+			padding: 0 30rpx 85rpx;
+		}
+	}
+	.imgbox {
+		width: 750rpx;
+		display: flex;
+		justify-content: flex-start;
 		background-color: #FFFFFF;
+		image {
+			width: 210rpx;
+			height: 210rpx;
+			margin: 10rpx 15rpx;
+		}
+		video {
+			width: 210rpx;
+			height: 210rpx;
+			margin: 10rpx 15rpx;
+		}
 	}
 	.comment-list {
 		.item {
-			background-color: #FFFFFF;
+			background-color: #ffffff;
 			padding: 30rpx;
 			margin-bottom: 2rpx;
 			.info {
@@ -109,7 +211,7 @@ export default {
 		}
 	}
 	.data-list {
-		background-color: #FFFFFF;
+		background-color: #ffffff;
 		display: flex;
 		height: 88rpx;
 		padding: 0 30rpx;
@@ -141,12 +243,12 @@ export default {
 		}
 	}
 	.chat {
-		background-color: #ECECEC;
+		background-color: #ececec;
 		width: 100%;
 		height: 98rpx;
 		padding: 19rpx 30rpx;
 		.input-box {
-			background-color: #FFFFFF;
+			background-color: #ffffff;
 			width: 690rpx;
 			height: 60rpx;
 			background: rgba(255, 255, 255, 1);

pages/user/fans.vue

@@ -3,29 +3,54 @@
 		<view class="lately">
 			<view class="title">最新</view>
 			<view class="items">
-				<view v-for="(item, index) in 3" :key="index">
-					<FansItem></FansItem>
+				<view v-for="(item, index) in newfans" :key="index">
+					<FansItem :info="item"></FansItem>
 				</view>
 			</view>
 		</view>
 		<view class="before">
 			<view class="title">早前</view>
 			<view class="items">
-				<view v-for="(item, index) in 13" :key="index">
-					<FansItem></FansItem>
+				<view v-for="(item, index) in myfans" :key="index">
+					<FansItem :info="item"></FansItem>
 				</view>
 			</view>
 		</view>
+		<u-toast ref="uToast" />
 	</view>
 </template>
 <script>
 import FansItem from '@/components/fans-item/index'
 export default {
 	data() {
-		return {}
+		return {
+			myfans:[],
+			newfans:[]
+		}
 	},
 	components: {
 		FansItem
+	},
+	onLoad() {
+		this.fans()
+	},
+	methods:{
+		fans(){
+			let that = this;
+			this.$u.api.myfanlist({}).then(res => {
+				console.log(res);
+				if (res.errCode != 0) {
+					this.$refs.uToast.show({
+						title: res.message,
+						type: 'error'
+					});
+				} else {
+					that.myfans = res.data.fans
+					that.newfans = res.data.fansNewest
+					console.log(that.myfans,that.newfans)
+				}
+			});
+		}
 	}
 };
 </script>

pages/user/index.vue

@@ -2,11 +2,11 @@
     <view class="user">
         <view class="head" @click="toOthersPage('info')">
             <view class="info">
-                <image></image>
+                <image :src="info.member_avatar"></image>
                 <view class="name">
-                    <text>萨大赛</text>
-                    <text>账号：123456789</text>
-                    <text>个性签名：为梦努力</text>
+                    <text>{{info.member_nickname==null?"新用户":info.member_nickname}}</text>
+                    <text>账号：{{info.member_name}}</text>
+                    <text>个性签名：{{info.signature==""?"该用户很懒没有签名！":info.signature}}</text>
                 </view>
             </view>
             <image src="/static/image/user/1.png"></image>
@@ -23,12 +23,36 @@
 			<text>骑手投诉</text>
 			<image src="/static/image/user/1.png"></image>
 		</view>
+		<u-toast ref="uToast" />
     </view>
 </template>
 <script>
 export default {
 	name:"user",
+	data() {
+		return {
+			info:{}
+		}
+	},
+	onLoad() {
+		this.getmyinfo()
+	},
 	methods: {
+		// 获取个人信息
+		getmyinfo(){
+			let that = this;
+			this.$u.api.getshopinfo({}).then(res => {
+				console.log(res);
+				if (res.errCode != 0) {
+					this.$refs.uToast.show({
+						title: res.message,
+						type: 'error'
+					});
+				} else {
+					this.info = res.data.memberInfo
+				}
+			});
+		},
 		toOthersPage(url) {
 			uni.navigateTo({
 				url: '/pages/user/' + url
@@ -57,7 +81,6 @@ export default {
                 width: 110rpx;
                 height: 110rpx;
                 border-radius: 50%;
-				background-color: #0f0;
             }
             .name{
                 font-size: 24rpx;

pages/user/info.vue

@@ -1,45 +1,105 @@
 <template>
 	<view class="info">
-        <view class="head" @click="showImage=true">
-            <image></image>
+		<view class="head" @click="chooseImage">
+			<image :src="fileurl" :key="num"></image>
 			<text>更换头像</text>
 		</view>
 		<view class="item">
 			<text class="title">用户名</text>
-            <text class="value">兽兽</text>
+			<input type="text" value="" v-model="info.member_nickname" placeholder="请输入用户名"/>
 		</view>
 		<view class="item">
 			<text class="title">个性签名</text>
-            <text class="value">变瘦变高变有钱</text>
+			<input type="text" value="" v-model="info.signature" placeholder="请输入个性签名"/>
 		</view>
 		<view class="password" @click="updatePwd">
 			<text>修改密码</text>
 			<image src="/static/image/user/1.png"></image>
 		</view>
-		<u-popup v-model="showImage" mode="bottom">
-			<view class="image-popup">
-				<view @click="chooseImage('camera')">拍摄新照片</view>
-				<view @click="chooseImage('album')">从相册选取</view>
-			</view>
-		</u-popup>
+		<u-toast ref="uToast" />
 	</view>
 </template>
 <script>
 export default {
-    name:"info",
+	name: 'info',
 	data() {
 		return {
-			showImage: false
+			fileurl: "",
+			filename:"",
+			info:{},
+			num:0
+		};
+	},
+	onLoad() {
+		this.getmyinfo()
+	},
+	onNavigationBarButtonTap() {
+		let that = this;
+		this.$u.api.changeinfo({
+			nickname:that.info.member_nickname,
+			avatar:that.filename,
+			signature:that.info.signature
+		}).then(res => {
+			console.log(res);
+			if (res.errCode != 0) {
+				this.$refs.uToast.show({
+					title: res.message,
+					type: 'error'
+				});
+			} else {
+				this.$refs.uToast.show({
+					title: res.message,
+					type: 'success'
+				});
 			}
+		});
 	},
 	methods: {
+		// 获取个人信息
+		getmyinfo(){
+			let that = this;
+			this.$u.api.getshopinfo({}).then(res => {
+				console.log(res);
+				if (res.errCode != 0) {
+					this.$refs.uToast.show({
+						title: res.message,
+						type: 'error'
+					});
+				} else {
+					this.info = res.data.memberInfo
+					this.fileurl = res.data.memberInfo.member_avatar
+				}
+			});
+		},
+		// 获取图片,上传图片
 		chooseImage(sourceType) {
+			let that = this
+			const token = uni.getStorageSync('token');
 			uni.chooseImage({
 				count: 1,
 				sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
-				sourceType: [sourceType],
 				success: function(res) {
 					console.log(JSON.stringify(res.tempFilePaths));
+					const tempFilePaths = res.tempFilePaths;
+					that.fileurl = tempFilePaths[0]
+					uni.uploadFile({
+						url: 'https://dmmall.sdbairui.com/storeapi/Upload/uploadFile',
+						filePath: tempFilePaths[0],
+						name: 'avatar',
+						formData:{
+							name:"avatar"
+						},
+						header:{
+							Authorization:'Bearer' + " " + token
+						},
+						success: uploadFileRes => {
+							let obj = JSON.parse(uploadFileRes.data)
+							that.fileurl = obj.data.file_path
+							that.filename =  obj.data.file_name
+							that.num++
+							console.log(that.fileurl,that.filename)
+						}
+					});
 				}
 			});
 		},
@@ -48,8 +108,8 @@ export default {
 				url: '/pages/user/updatePassword'
 			});
 		}
-	},
 	}
+};
 </script>
 <style lang="scss" scoped>
 .info {
@@ -67,11 +127,10 @@ export default {
 			width: 120rpx;
 			height: 120rpx;
 			border-radius: 50%;
-			background-color: #0f0;
 		}
 		> text {
 			font-size: 24rpx;
-            color: #FF780F;
+			color: #ff780f;
 			margin-top: 20rpx;
 		}
 		margin-bottom: 2rpx;
@@ -114,12 +173,12 @@ export default {
 	.image-popup {
 		padding: 0 30rpx;
 		> view {
-			font-size:　28rpx;
+			font-size: 28rpx;
 			color: rgba(51, 51, 51, 1);
 			line-height: 98rpx;
 			text-align: center;
 			&:first-child {
-				border-bottom: 2rpx solid #EBEBEB;
+				border-bottom: 2rpx solid #ebebeb;
 			}
 		}
 	}

pages/user/myinfo.vue

@@ -0,0 +1,244 @@
+<template>
+    <view class="user">
+        <view class="head" @click="toOthersPage('info')">
+            <view class="info">
+                <image :src="info.member_avatar"></image>
+                <view class="name">
+                    <text>{{info.member_nickname==null?"新用户":info.member_nickname}}</text>
+                    <text>账号：{{info.member_name}}</text>
+                    <text>个性签名：{{info.signature==""?"该用户很懒没有签名！":info.signature}}</text>
+                </view>
+            </view>
+            <image src="/static/image/user/1.png"></image>
+        </view>
+        <view class="nav" @click="toOthersPage('fans')">
+			<text>我的粉丝</text>
+			<image src="/static/image/user/1.png"></image>
+		</view>
+		<view class="nav" @click="toOthersPage('content')">
+			<text>内容管理</text>
+			<image src="/static/image/user/1.png"></image>
+		</view>
+		<view class="release-btn" @click="publish">
+			<image src="../../static/image/index/publish.png"></image>
+			<view class="text">发布</view>
+		</view>
+		<u-popup v-model="publishstate" mode="bottom">
+			<view class="publish">
+				<view class="list">
+					<view @click="navto('release/tosign')">
+						<image src="../../static/image/index/live.png"></image>
+						<text>直播</text>
+					</view>
+					<view @click="navto('release/index')">
+						<image src="../../static/image/index/photo.png"></image>
+						<text>图文</text>
+					</view>
+					<view @click="navto('release/video')">
+						<image src="../../static/image/index/video.png"></image>
+						<text>视频</text>
+					</view>
+				</view>
+				<image src="../../static/image/index/close.png" class="off" @click="close"></image>
+			</view>
+		</u-popup>
+		<u-toast ref="uToast" />
+    </view>
+</template>
+<script>
+export default {
+	name:"user",
+	data() {
+		return {
+			publishstate:false,
+			info:{},
+		}
+	},
+	onLoad() {
+		this.getmyinfo()
+	},
+	methods: {
+		// 获取个人信息
+		getmyinfo(){
+			let that = this;
+			this.$u.api.getshopinfo({
+			}).then(res => {
+				console.log(res);
+				if (res.errCode != 0) {
+					this.$refs.uToast.show({
+						title: res.message,
+						type: 'error'
+					});
+				} else {
+					this.info = res.data.memberInfo
+				}
+			});
+		},
+		toOthersPage(url) {
+			uni.navigateTo({
+				url: '/pages/user/' + url
+			});
+		},
+		// 打开发布弹窗
+		publish() {
+			this.publishstate = true;
+		},
+		// 关闭发布弹窗
+		close() {
+			this.publishstate = false;
+		},
+		// 跳转发布页面
+		navto(url) {
+			// 判断直播权限
+			if(url=="release/tosign"){
+				this.$u.api.canlive({}).then(res => {
+					console.log(res);
+					if (res.errCode != 0) {
+						this.$refs.uToast.show({
+							title: res.message,
+							type: 'error'
+						});
+					} else {
+						if(res.data.live_stataes==0){
+							this.$u.route({
+								url: `/pages/${url}`
+							});
+						}else{
+							this.$refs.uToast.show({
+								title: "当前用户没有直播权限",
+								type: 'error'
+							});
+						}
+					}
+				});
+			}else{
+				this.$u.route({
+					url: `/pages/${url}`
+				});
+			}
+			
+			
+		}
+	},
+}
+</script>
+<style lang="scss" scoped>
+	.release-btn {
+		position: fixed;
+		bottom: 475rpx;
+		right: 30rpx;
+		width: 100rpx;
+		height: 100rpx;
+		background: rgba(255, 120, 15, 1);
+		box-shadow: 0rpx 6rpx 6rpx 0rpx rgba(255, 120, 15, 0.22);
+		border-radius: 50%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		> image {
+			width: 36rpx;
+			height: 36rpx;
+			flex-shrink: 0;
+			margin-bottom: 2rpx;
+		}
+		.text {
+			font-size: 20rpx;
+			color: rgba(255, 255, 255, 1);
+		}
+	}
+	.publish {
+		display: flex;
+		flex-direction: column;
+		justify-content: space-between;
+		align-items: center;
+		padding: 50rpx 84rpx 31rpx 78rpx;
+		image {
+		}
+		.list {
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			width: 100%;
+			> view {
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				> image {
+					width: 94rpx;
+					height: 80rpx;
+				}
+				> text {
+					margin-top: 10rpx;
+					font-size: 28rpx;
+					color: #333;
+					font-weight: 400;
+				}
+			}
+		}
+		.off {
+			margin-top: 81rpx;
+			width: 37rpx;
+			height: 37rpx;
+		}
+	}
+.user{
+    min-height: calc(100vh - var(--window-top));
+    background: #ececec;
+    .head{
+        width: 100%;
+        height: 220rpx;
+        background-color: #FF780F;
+        padding: 0 30rpx;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        .info{
+            display: flex;
+            align-items: center;
+            
+            >image{
+                width: 110rpx;
+                height: 110rpx;
+                border-radius: 50%;
+				background-color: #0f0;
+            }
+            .name{
+                font-size: 24rpx;
+                color: #fff;
+                display: flex;
+                flex-direction: column;
+                margin-left: 26rpx;
+                >text{
+                    margin-top: 14rpx;
+                }
+                >text:first-child{
+                    font-size: 28rpx;
+                    margin-top: 0;
+                }
+            }
+
+        }
+        >image{
+            width: 12rpx;
+            height: 20rpx;
+        }
+    }
+	.nav{
+		width: 100%;
+		height: 100rpx;
+		display: flex;
+		padding: 30rpx;
+		align-items: center;
+		justify-content: space-between;
+		font-size: 30rpx;
+		margin-bottom: 2rpx;
+		color:#333;
+		background-color: #fff;
+		>image{
+			width: 13rpx;
+			height: 25rpx;
+		}
+	}
+}
+</style>

pages/user/updatePassword.vue

@@ -15,7 +15,8 @@
 			</u-form>
 		</view>
 		<text class="tips">密码必须是8-16位，至少含数字/字母/字符两种组合</text>
-		<view class="btn">确定</view>
+		<view class="btn" @click="update">确定</view>
+		<u-toast ref="uToast" />
 	</view>
 </template>
 <script>
@@ -28,6 +29,29 @@ export default {
 				rePassword: ''
 			},
 		}
+	},
+	methods:{
+		update(){
+			let that = this;
+			this.$u.api.editpassword({
+				old_password:that.model.password,
+				password:that.model.newPassword,
+				repassword:that.model.rePassword
+			}).then(res => {
+				console.log(res);
+				if (res.errCode != 0) {
+					this.$refs.uToast.show({
+						title: res.message,
+						type: 'error'
+					});
+				} else {
+					this.$refs.uToast.show({
+						title: res.message,
+						type: 'success'
+					});
+				}
+			});
+		},
 	}
 };
 </script>

static/chatservice.js

@@ -0,0 +1,276 @@
+/*
+ * @Author: jack.lu
+ * @Date: 2020-4-21 10:10:20
+ * @Last Modified by: jack.lu
+ * @Last Modified time: 2020-4-21 15:01:41
+ */
+
+
+import GoEasyIM from './goeasy-im-1.0.9.js'
+
+//用户
+function User(id, nickname, avatar) {
+    this.id = id;
+    this.nickname = nickname;
+    this.avatar = avatar;
+}
+
+//消息
+function Message(senderUserId, senderNickname, content, type) {
+    this.senderNickname = senderNickname;
+    this.senderUserId = senderUserId;
+    this.content = content;
+    this.type = type
+}
+
+//聊天室
+function Room(id, name, currentUser) {
+
+    this.id = id;
+    this.name = name;
+    this.currentUser = currentUser;
+
+    this.onlineUsers = {
+        count: 0,
+        users: []
+    };
+
+    this.messages = [];
+
+    this.MessageType = {
+        CHAT: 0,//文字聊天
+        PROP: 1//道具
+    };
+
+    this.Prop = {
+        HEART: 0,//桃心
+        ROCKET: 1//火箭
+    };
+}
+
+function ChatRoomService(room, user) {
+    this.room = new Room(room.id, room.name, user);
+    this.whenNewMessage = function () {
+
+    };
+    this.whenOnlineUserChange = function () {
+
+    };
+
+}
+
+//获取实例
+ChatRoomService.prototype.connectGoEasyIM = function () {
+    this.im = GoEasyIM.getInstance({
+        appkey: 'BC-453aa755c4ea48148abefc55a86df283',
+        host: 'hangzhou.goeasy.io'
+    });
+
+    //监听网络连接成功
+    this.im.on(GoEasyIM.EVENT.CONNECTED, () => {
+        console.log('GoEasyIM网络连接成功');
+        //连接成功后，更新在线用户数和用户头像
+        this.initialOnlineUsers(this.room.id);
+    });
+
+    //监听网络连接断开
+    this.im.on(GoEasyIM.EVENT.DISCONNECTED, () => {
+        console.log('GoEasyIM网络断开')
+    });
+
+    //监听上下线提醒
+    this.listenerGroupPresence();
+
+    //监听新消息
+    this.listenerNewMessage();
+
+    var currentUser = this.room.currentUser;
+    //连接GoEasyIM
+    this.im.connect({
+        id: currentUser.id,
+        data: {
+            avatar: currentUser.avatar,
+            nickname: currentUser.nickname
+        }
+    }).then(() => {
+        console.log('连接成功');
+        this.initialChatHistory(this.room.id);
+
+        //订阅用户上下线事件
+        this.subscribePresence(this.room.id);
+        //订阅聊天室消息
+        this.subscribeRoomMessage(this.room.id);
+
+
+    }).catch(e => {
+        console.log(e);
+        console.log('连接失败');
+    });
+};
+
+ChatRoomService.prototype.initialWhenNewMessage = function (whenNewMessage) {
+    this.whenNewMessage = whenNewMessage;
+};
+
+ChatRoomService.prototype.initialWhenOnlineUserChange = function (whenOnlineUserChange) {
+    this.whenOnlineUserChange = whenOnlineUserChange;
+};
+
+
+//监听新消息
+ChatRoomService.prototype.listenerNewMessage = function () {
+
+    this.im.on(GoEasyIM.EVENT.GROUP_MESSAGE_RECEIVED, (message) => {
+		var content = JSON.parse(message.payload.text);
+        this.addNewMessage(message);
+        this.whenNewMessage(content);
+    })
+}
+
+ChatRoomService.prototype.addNewMessage = function (message) {
+    var content = JSON.parse(message.payload.text);
+    let messageContent = "";
+    //聊天消息
+    if (content.type == this.room.MessageType.CHAT) {
+        messageContent = content.content;
+    }
+    //道具消息
+    if (content.type == this.room.MessageType.PROP) {
+        if (content.content == this.room.Prop.ROCKET) {
+            messageContent = "送出了一枚大火箭";
+        }
+        if (content.content == this.room.Prop.HEART) {
+            messageContent = "送出了一个大大的比心";
+        }
+    }
+    //添加消息
+    let newMessage = new Message(message.senderId, content.senderNickname, messageContent);
+    this.room.messages.push(newMessage);
+};
+
+//监听用户上下线
+ChatRoomService.prototype.listenerGroupPresence = function () {
+    this.im.on(GoEasyIM.EVENT.GROUP_PRESENCE, (event) => {
+        //更新在线用户数
+        this.room.onlineUsers.count = event.groupOnlineCount;
+
+        if (event.action == 'join' || event.action == 'online') {
+            let userData = JSON.parse(event.userData);
+            //添加新用户
+            let user = new User(event.userId, userData.nickname, userData.avatar);
+
+            //添加在线用户，避免用户重复
+            if (!this.room.onlineUsers.users.find(item => item.id == event.userId)) {
+                this.room.onlineUsers.users.push(user);
+            }
+
+            //添加进入房间的消息
+            let message = new Message(event.userId, userData.nickname, " 进入房间", this.room.MessageType.CHAT);
+            this.room.messages.push(message);
+        } else {
+            let offlineUserIndex = this.room.onlineUsers.users.findIndex(item => item.id == event.userId);
+            if (offlineUserIndex > -1) {
+                //将离开的用户从onlineUsers中删掉
+                let offlineUser = Object.assign(this.room.onlineUsers.users[offlineUserIndex]);
+                this.room.onlineUsers.users.splice(offlineUserIndex, 1);
+                //添加离开消息
+                let message = new Message(offlineUser.id, offlineUser.nickname, " 离开房间", this.room.MessageType.CHAT)
+                this.room.messages.push(message);
+            }
+        }
+        this.whenOnlineUserChange(this.room.onlineUsers);
+    })
+};
+
+//查询和初始化在线用户列表和在线用户数
+ChatRoomService.prototype.initialOnlineUsers = function (roomId) {
+    let self = this;
+
+    //查询最新上线的用户列表
+    this.im.groupHereNow(roomId)
+        .then(result => {
+            if (result.code == 200) {
+                let users = [];
+                result.content && result.content.map(function (onlineUser) {
+                    let userData = JSON.parse(onlineUser.userData);
+                    let user = new User(onlineUser.userId, userData.nickname, userData.avatar);
+                    users.push(user);
+                });
+                self.room.onlineUsers = {
+                    users: users
+                };
+            }
+        }).catch(e => {
+        if (e.code == 401) {
+            console.log("您还没有开通用户在线状态提醒，登录goeasy->我的应用->查看详情->高级功能，自助开通.");
+        } else {
+            console.log(e);
+        }
+    });
+    //获取聊天室在线用户数
+    this.im.groupOnlineCount(roomId)
+        .then(result => {
+            this.room.onlineUsers.count = result.content.onlineCount;
+        }).catch(e => {
+        console.log(e)
+    })
+};
+
+//订阅聊天室成员上下线
+ChatRoomService.prototype.subscribePresence = function (roomId) {
+    this.im.subscribeGroupPresence([roomId])
+        .then(() => {
+            console.log('成员上下线订阅成功')
+        }).catch(e => {
+        console.log(e)
+    })
+}
+
+//订阅聊天室消息
+ChatRoomService.prototype.subscribeRoomMessage = function (roomId) {
+    this.im.subscribeGroup([roomId])
+        .then(result => {
+            console.log('消息订阅成功')
+        }).catch(e => {
+        console.log(e)
+    })
+}
+
+//历史消息
+ChatRoomService.prototype.initialChatHistory = function (roomId) {
+    var self = this;
+    this.im.history({
+        groupId: roomId
+    }).then(res => {
+        res.content.forEach(function (message) {
+            self.addNewMessage(message);
+        })
+    }).catch(function (error) {
+        if (error.code == 401) {
+            console.log("您还没有开通历史消息的权限，登录goeasy->我的应用->查看详情->高级功能，自助开通.");
+        } else {
+            console.log(error);
+        }
+    })
+};
+
+//发送消息
+ChatRoomService.prototype.sendMessages = function (roomId, content) {
+	var contentMessage = {
+		text: JSON.stringify(content)
+	};
+	let message = this.im.createTextMessage(contentMessage);
+    this.im.sendGroupMessage(roomId, message)
+        .then(() => {
+            console.log('消息发送成功')
+        }).catch(e => {
+        console.log(e);
+    })
+};
+
+//退出聊天室
+ChatRoomService.prototype.quitRoom = function (roomId) {
+    this.im.disconnect()
+};
+
+module.exports = ChatRoomService;