直播

添加进度条
直播完成
2020-08-03 16:47:46 +08:00 · 2020-07-30 15:55:16 +08:00 · 2020-07-30 15:54:32 +08:00 · 2020-07-30 09:33:13 +08:00 · 2020-07-30 09:32:16 +08:00 · 2020-07-30 09:32:11 +08:00
31 changed files with 1722 additions and 11387 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 .vscode
 node_modules
+unpackage
--- a/App.vue
+++ b/App.vue
@@ -1,18 +1,18 @@
 <script>
-	export default {
+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";
+/*每个页面公共css */
+@import 'uview-ui/index.scss';
 </style>
--- a/common/http.api.js
+++ b/common/http.api.js
@@ -8,7 +8,7 @@ const install = (Vue, vm) => {
            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 +21,40 @@ const install = (Vue, vm) => {
        },
        liveStreamList(){
            return vm.$u.post("Streaming/liveStreamList")
-        }
+        },
+		// 获取订单列表
+		getorderlist(){
+			return vm.$u.get("/Order/orderList")
+		},
+		// 获取轮播图列表
+		getswiper(){
+			return vm.$u.get("/Order/orderList")
+		},
+		// 商家登陆
+		shoplogin(obj){
+		    return vm.$u.get("/Login/storeLogin",obj)
+		},
+		// 获取个人信息
+		getshopinfo(obj){
+		    return vm.$u.post("/member/memberInfo",obj)
+		},
+		// 获取粉丝列表
+		myfanlist(obj){
+		    return vm.$u.post("/member/myFansList",obj)
+		},
+		// 商家登陆
+		getshopinfo(obj){
+		    return vm.$u.post("/member/memberInfo",obj)
+		},
+		// 修改个人信息
+		changeinfo(obj){
+		    return vm.$u.post("/Member/changeMemberInfo",obj)
+		},
+		// 获取内容列表
+		articlelist(obj){
+		    return vm.$u.post("/Article/articleList",obj)
+		},
+		
    }
 	// 将各个定义的接口名称，统一放进对象挂载到vm.$u.api(因为vm就是this，也即this.$u.api)下
 	vm.$u.api = api;
--- a/common/http.interceptor.js
+++ b/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 {
--- a/components/content-item/index.vue
+++ b/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"></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,15 +30,23 @@ 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({
--- a/components/fans-item/index.vue
+++ b/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>
--- a/components/order-item/index.vue
+++ b/components/order-item/index.vue
@@ -2,18 +2,17 @@
 	<view class="item" @click="toDetailsPage">
 		<image></image>
 		<view class="goods">
+			<view class="">
+				<view class="">
+					编号：{{info.order_sn}}
+				</view>
+				<view class="status" v-if="cur==4">待处理订单</view>
+			</view>
 			
-			<view class="goods_num">
-				<view class="number">
-					编号:1234567890123456
-				</view>
-				<view class="order" v-if="cur==4">已完成订单</view>
-				<view class="order" v-else>待处理订单</view>
-			</view>
-			<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>
@@ -24,10 +23,12 @@ export default {
 		return {}
 	},
 	props: {
-		cur: [Number, String]
+		cur: [Number, String],
+		info: Object
 	},
 	methods: {
 		toDetailsPage() {
+			console.log(this.info)
 			uni.navigateTo({
 				url: '/pages/index/details?current=' + this.cur
 			});
@@ -57,26 +58,6 @@ export default {
 		flex-direction: column;
 		align-items: flex-start;
 		justify-content: center;
-		.goods_num{
-			display: flex;
-			justify-content: space-between;
-			width: 100%;
-			margin-bottom: 18rpx;
-			.number{
-				font-size:22rpx;
-				font-family:PingFang SC;
-				font-weight:400;
-				color:rgba(153,153,153,1);
-				line-height:36rpx;
-			}
-			.order{
-				font-size:26rpx;
-				font-family:PingFang SC;
-				font-weight:400;
-				color:rgba(255,49,49,1);
-				line-height:36rpx;
-			}
-		}
 		.status {
 			align-self: flex-end;
 			font-size: 26rpx;
--- a/package-lock.json
+++ b/package-lock.json
@@ -6,8 +6,8 @@
  "dependencies": {
    "uview-ui": {
      "version": "1.5.2",
-      "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="
+      "resolved": "https://registry.npmjs.org/uview-ui/-/uview-ui-1.5.2.tgz",
+      "integrity": "sha512-FV9G+gZTAZKEE2m85ahIbIRiC/fdzTl+eNXDIMBoyc9b+fQWQhEtmAfu6huu7AtKuTI6gfqaYn6WGcmqYvr76w=="
    }
  }
 }
--- a/pages.json
+++ b/pages.json
@@ -2,8 +2,7 @@
 	"easycom": {
 		"^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
 	},
-	"pages": [ 
-		{
+	"pages": [{
 			"path": "pages/login/login",
 			"style": {
 				"navigationBarTitleText": "",
@@ -91,6 +90,7 @@

 		{
 			"path": "pages/user/index",
+
 			"style": {
 				"navigationBarTitleText": "个人中心",
 				"app-plus": {
@@ -101,6 +101,18 @@
 				}
 			}
 		},
+		{
+			"path": "pages/user/myinfo",
+			"style": {
+				"navigationBarTitleText": "达人中心",
+				"app-plus": {
+					"titleNView": {
+						"backgroundColor": "#FFFFFF",
+						"titleColor": "#333333"
+					}
+				}
+			}
+		},
 		{
 			"path": "pages/release/tosign",
 			"style": {
@@ -120,7 +132,13 @@
 				"app-plus": {
 					"titleNView": {
 						"backgroundColor": "#FFFFFF",
-                        "titleColor": "#333333"
+						"titleColor": "#333333",
+						"buttons": [ //原生标题栏按钮配置,
+							{
+								"text": "保存",
+								"fontSize":"14px"
+							}
+						]
 					}
 				}
 			}
@@ -226,7 +244,7 @@
 		"navigationBarBackgroundColor": "#F8F8F8",
 		"backgroundColor": "#F8F8F8"
 	},
-	"tabBar":{
+	"tabBar": {
 		"color": "#7A7E83",
 		"selectedColor": "#3cc51f",
 		"borderStyle": "black",
@@ -240,13 +258,19 @@
 			"iconPath": "",
 			"selectedIconPath": "",
 			"text": "首页",
-			"selectedColor":"#FBFBFB"
+			"selectedColor": "#FBFBFB"
+		}, {
+			"pagePath": "pages/messages/messagesList",
+			"iconPath": "",
+			"selectedIconPath": "",
+			"text": "消息",
+			"selectedColor": "#FBFBFB"
 		}, {
 			"pagePath": "pages/user/index",
 			"iconPath": "",
 			"selectedIconPath": "",
 			"text": "我的",
-			"selectedColor":"#FBFBFB"
+			"selectedColor": "#FBFBFB"
 		}]

 	}
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,45 +1,49 @@
 <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 v-for="(item, index) in allorder" :key="index">
+						<OrderItem :info="item"></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 5" :key="index">
-						<OrderItem :cur="current"></OrderItem>
-					</view>
+					<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 5" :key="index">
-						<OrderItem :cur="current"></OrderItem>
-					</view>
+					<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 class="complaint">
 						<view class="select-container">
-							<view class="title">选择订单号</view>
-							<view class="select" v-if="JSON.stringify(worker) != '{}'">
-								<!-- <view>{{ worker.label + " " + worker.name }}</view>
-								<u-icon name="edit-pen"></u-icon> -->
-								<view class="order_num"><text>{{ worker.label}}</text><text> {{ worker.name }}</text></view>
-								<image src="/static/image/home/5.png" @click="open()"></image>
+							<view class="title">选择骑手</view>
+							<view class="worker" v-if="JSON.stringify(worker) != '{}'">
+								<view>{{ worker.company + ' ' + worker.name }}</view>
+								<u-icon name="edit-pen" @click="worker = {}"></u-icon>
 							</view>
-							<view v-else class="select" @click="show = true">
+							<view v-else class="select" @click="showSelect = true">
 								<view>请选择</view>
 								<image src="/static/image/home/5.png"></image>
 							</view>
@@ -49,57 +53,26 @@
 							<textarea placeholder-style="color:#999999" placeholder="请输入内容" />
 						</view>
 						<!-- 事件 -->
-						<view class="btn" @click="showComplaint=true">确定</view>
+						<view class="btn" @click="showComplaint = true">确定</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>
+					<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>
+					<view v-for="(item, index) in 15" :key="index"><OrderItem :cur="current"></OrderItem></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-popup v-model="show" mode="bottom" >
-			<view class="popup_cont" >
-				<view class="rider">
-					<text>选择骑手</text>
-					<image src="../../static/image/tosign/noes.png" @click="show = false"></image>
-				</view>
-				<swiper  style="height: 30vh"   vertical="true">
-					<swiper-item class="swiper-item" >
-						<scroll-view scroll-y class="order-list">
-							<view class="checkd">
-								<u-radio-group v-model="value" @change="radioGroupChange" class="posi">
-									<label v-for="(item, index) in workerList" :key="index" class="check" @confirm="setWorker">
-										<view class="">{{item.name}}</view>
-										<view class="">{{item.label}}</view>
-										<view class="">{{item.company}}</view>
-										<u-radio @change="radioChange(item)" :name="item.id":disabled="item.disabled" shape="circle" active-color="rgba(255, 120, 15, 1)" wrap ="true"></u-radio>
-									</label>
-								</u-radio-group>
-							</view>
-						</scroll-view>
-					</swiper-item>
-				</swiper>
-				<view class="bottom_btn" style="width: 100%;background-color: #fff;">
-					<view class="wash-btn" @click="confirm()">确认</view>
-				</view>
-			</view>
-		</u-popup>
+		<u-select v-model="showSelect" mode="mutil-column-auto" :list="workerList" @confirm="setWorker"></u-select>
 		<u-popup v-model="showComplaint" mode="center" border-radius="10">
 			<view class="confirm-complaint">
 				<view class="text">
@@ -113,45 +86,50 @@
 			<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>
 	</view>
 </template>

 <script>
-import OrderItem from '@/components/order-item/index'
+import OrderItem from '@/components/order-item/index';
 export default {
 	data() {
 		return {
-			list: [{
+			list: [
+				{
 					name: '全部订单'
-			}, {
+				},
+				{
 					name: '试穿订单'
-			}, {
+				},
+				{
 					name: '待处理订单'
-			}, {
+				},
+				{
 					name: '投诉骑手'
-			}, {
+				},
+				{
 					name: '已完成订单'
-			}, {
+				},
+				{
 					name: '退货订单'
-			}],
-			imageList: [
-				{}, {}, {}
+				}
 			],
+			imageList: [],
 			showSelect: false,
 			current: 0,
 			swiperCurrent: 0,
@@ -159,87 +137,97 @@ export default {
 			worker: {},
 			workerList: [
 				{
-					label: '1826789742312345',
-					id:'1',
-					name:'芳芳',
-					disabled: false
+					label: '百世快递公司',
+					children: [
+						{
+							label: '小米'
 						},
 						{
-					label: '1826789742312345',
-					id:'2',
-					name:'张三',
-					disabled: false
+							label: '小亮'
+						}
+					]
 				},
 				{
-					label: '1826789742312345',
-					id:'3',
-					name:'李四',
-					disabled: false
+					label: '中通快递公司',
+					children: [
+						{
+							label: '小红'
+						}
+					]
 				},
 				{
-					label: '1826789742312345',
-					id:'4',
-					name:'王五',
-					disabled: false
-				},
+					label: '申通快递公司',
+					children: [
 						{
-					label: '1826789742312345',
-					id:'5',
-					name:'阿郎',
-					disabled: false
-				},
-				{
-					label: '1826789742312345',
-					id:'6',
-					name:'阿娘',
-					disabled: false
+							label: '小蓝'
+						}
+					]
 				}
 			],
-			publishstate:true,
-			value: 'orange',
-			show: false
-		}
+			publishstate: false,
+			num: 0,
+			allorder:[],//所有订单
+		};
 	},
 	components: {
 		OrderItem
 	},
 	onLoad() {
-
+		this.getswiper();
+		this.getallorder();
+		// 订单状态：0:已取消 10:未付款 20:已付款 30:已发货 40:已收货
+	},
+	onReachBottom() {
+		this.num++
 	},
 	methods: {
-		release(){
-			this.publishstate = true
+		// 关闭发布弹窗
+		close() {
+			this.publishstate = false;
 		},
-		confirm(){
-			this.show=false
-		},
-		open(){
-			this.show = true
-		},
-		// 选中某个单选框时，由radio时触发
-		radioChange(e) {
-			this.worker = {
-				label: e.label,
-				name: e.name,
-				company:e.company
+		// 获取全部订单
+		getallorder() {
+			let that = this;
+			this.$u.api.getorderlist({
+				page: that.num
+			}).then(res => {
+				console.log(res);
+				if (res.errCode != 0) {
+					this.$refs.uToast.show({
+						title: res.message,
+						type: 'error'
+					});
+				} else {
+					this.allorder = res.data
 				}
+			});
 		},
-		// 选中任一radio时，由radio-group触发
-		radioGroupChange(e) {
-			// console.log(e);
+		// 获取轮播图
+		getswiper() {
+			this.imageList =[{
+						image: '../../static/image/index/swiper.png'
 					},
-		publish(){
-
+					{
+						image: '../../static/image/index/swiper.png'
+					},
+					{
+						image: '../../static/image/index/swiper.png'
+					}
+				]
+		},
+		// 打开发布弹窗
+		publish() {
+			this.publishstate = true;
 		},
 		setWorker(e) {
 			// console.log(e);
-			
+			this.worker = {
+				company: e[0].label,
+				name: e[1].label
+			};
 		},
 		tabsChange(index) {
 			this.swiperCurrent = index;
-			if(this.swiperCurrent == 3){
-				this.worker ={}
-			}
 		},
 		animationfinish(e) {
 			let current = e.detail.current;
@@ -247,22 +235,22 @@ export default {
 			this.swiperCurrent = current;
 			this.current = current;
 		},
-		navto(url){
+		navto(url) {
 			this.$u.route({
-				url:`/pages/${url}`
-			})
+				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;
@@ -278,7 +266,7 @@ export default {
 	}
 	.swiper-item {
 		.complaint {
-			margin: 0rpx 30rpx 0;
+			margin: 0 30rpx;
 			padding: 75rpx 30rpx;
 			background-color: #ffffff;
 			.select-container {
@@ -287,14 +275,14 @@ export default {
 				margin-bottom: 60rpx;
 				.title {
 					font-size: 30rpx;
-					color: rgba(51,51,51,1);
+					color: rgba(51, 51, 51, 1);
 					margin-right: 20rpx;
 				}
 				.select {
 					padding: 18rpx 20rpx;
-					width: 470rpx;
+					width: 490rpx;
 					height: 60rpx;
-					background: rgba(236,236,236,1);
+					background: rgba(236, 236, 236, 1);
 					border-radius: 6rpx;
 					display: flex;
 					align-items: center;
@@ -307,18 +295,13 @@ export default {
 						width: 24rpx;
 						height: 13rpx;
 					}
-					.order_num{
-						width: 367rpx;
-						display: flex;
-						justify-content: space-between;
-					}
 				}
 				.worker {
 					display: flex;
 					align-items: center;
 					> view {
 						font-size: 30rpx;
-						color: rgba(51,51,51,1);
+						color: rgba(51, 51, 51, 1);
 						margin-right: 20rpx;
 					}
 				}
@@ -328,7 +311,7 @@ export default {
 				display: flex;
 				.title {
 					font-size: 30rpx;
-					color: rgba(51,51,51,1);
+					color: rgba(51, 51, 51, 1);
 					margin-right: 20rpx;
 				}
 				> textarea {
@@ -343,10 +326,10 @@ export default {
 				margin: 90rpx auto 0;
 				width: 630rpx;
 				height: 88rpx;
-				background: rgba(255,120,15,1);
+				background: rgba(255, 120, 15, 1);
 				border-radius: 44rpx;
 				font-size: 36rpx;
-				color: rgba(255,255,255,1);
+				color: rgba(255, 255, 255, 1);
 				line-height: 88rpx;
 				text-align: center;
 			}
@@ -358,8 +341,8 @@ export default {
 		right: 30rpx;
 		width: 100rpx;
 		height: 100rpx;
-		background: rgba(255,120,15,1);
-		box-shadow: 0rpx 6rpx 6rpx 0rpx rgba(255,120,15,0.22);
+		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;
@@ -373,7 +356,7 @@ export default {
 		}
 		.text {
 			font-size: 20rpx;
-			color: rgba(255,255,255,1);
+			color: rgba(255, 255, 255, 1);
 		}
 	}
 	.confirm-complaint {
@@ -384,7 +367,7 @@ export default {
 			width: 420rpx;
 			padding: 55rpx 112rpx;
 			font-size: 28rpx;
-			color: rgba(51,51,51,1);
+			color: rgba(51, 51, 51, 1);
 			line-height: 4r2px;
 			> view:first-child {
 				margin-bottom: 20rpx;
@@ -393,38 +376,37 @@ export default {
 		.btn {
 			width: 200rpx;
 			height: 60rpx;
-			background: rgba(255,120,15,1);
+			background: rgba(255, 120, 15, 1);
 			border-radius: 30rpx;
 			text-align: center;
 			line-height: 60rpx;
 			font-size: 28rpx;
-			color: rgba(255,255,255,1);
+			color: rgba(255, 255, 255, 1);
 			margin: 0 auto;
 		}
 	}
-	.publish{
+	.publish {
 		display: flex;
 		flex-direction: column;
 		justify-content: space-between;
 		align-items: center;
 		padding: 50rpx 84rpx 31rpx 78rpx;
-		image{
-			background-color: #0f0;
+		image {
 		}
-		.list{
+		.list {
 			display: flex;
 			align-items: center;
 			justify-content: space-between;
 			width: 100%;
-			>view{
+			> view {
 				display: flex;
 				flex-direction: column;
 				align-items: center;
-				>image{
+				> image {
 					width: 94rpx;
 					height: 80rpx;
 				}
-				>text{
+				> text {
 					margin-top: 10rpx;
 					font-size: 28rpx;
 					color: #333;
@@ -432,116 +414,11 @@ export default {
 				}
 			}
 		}
-		.off{
+		.off {
 			margin-top: 81rpx;
 			width: 37rpx;
 			height: 37rpx;
 		}
 	}
-		.popup_cont{
-			border-top: 1px solid RGBA(239, 236, 240, 1);
-			background-color: #fff;
-			width: 100%;
-			height: 562rpx;
-			line-height: 80rpx;
-			font-size:28rpx;
-			font-family:PingFang SC;
-			font-weight:400;
-			color:rgba(102,102,102,1);
-			transform: scale(1);
-			/* top: 0px; */
-			transition-duration: 0.3s;
-			
-			> uni-swiper {
-				flex: 1;
-				height: 100vh;
-				
-				.order-list{
-					height: 30vh;
-					padding-bottom: 140rpx;
-				}
-			}
-			.rider{
-				border-radius:20px 20px 0px 0px;
-				font-size:30rpx;
-				font-family:PingFang SC;
-				font-weight:500;
-				color:rgba(51,51,51,1);
-				height:88rpx;
-				width: 100%;
-				padding-left: 30rpx;
-				border-bottom: 1px solid rgba(236, 236, 236, 1);
-				
-				>image{
-					width: 32rpx;
-					height: 32rpx;
-					vertical-align: middle;
-					float: right;
-					padding-top: 30rpx;
-					padding-right:30rpx
-					
-				}
-			}
-			
-			.store{
-				>view{
-					padding-left: 30rpx;
-					padding-top: 30rpx;
-					>image{
-					width:60rpx;
-					height:60rpx;
-					border-radius:50%;
-					vertical-align: middle;
-					padding-right:13rpx
-					}
-				}
-				
-				font-size:28rpx;
-				font-family:PingFang SC;
-				font-weight:400;
-				color:rgba(51,51,51,1);
-				line-height: 60rpx;
-				
-			}
-			.checkd{
-				>radio-group .uni-list-cell{
-					display: flex;
-					flex-wrap: nowrap;
-					width: 100%;
-					padding-bottom: 140rpx;
-				}
-				.posi{
-					margin-bottom: 80rpx;
-					
-					.check{
-					display: flex;
-					width: 100%;
-					justify-content: space-around;
-				}
-				}
-				
-			}
-			.bottom_btn{
-				position: fixed;
-				width: 100%;
-				height: 140rpx;
-				bottom: 0;
-				
-			}
-			.wash-btn {
-				width: 690rpx;
-				height: 98rpx;
-				background: rgba(255,120,15,1);
-				border-radius: 49rpx;
-				position: absolute;
-				bottom: 40rpx;
-				left: 50%;
-				transform: translate(-50%, 0);
-				font-size: 36rpx;
-				color:rgba(255,255,255,1);
-				text-align: center;
-				line-height: 98rpx;
-			}
-		}
 }
 </style>
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -2,43 +2,73 @@
 	<!-- 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>
 </template>
 <script>
-	export default {
+export default {
 	data() {
 		return {
-				list: [{
+			list: [
+				{
 					checked: false,
 					disabled: false
-				}],
+				}
+			],
 			value: '',
 			login: '登录',
 			show: false,
-				zhanghao:"",
-				mima:""
-				
+			zhanghao: 'seller',
+			mima: '123456789',
+			zhanghaoA: '18953829598 ',
+			mimaA: '123456',
+			url: '',
+			state:0
 		};
 	},
 	methods: {
+		// 改变登陆类型
+		changetab(num){
+			this.state = num
+		},
 		// 选中某个复选框时，由checkbox时触发
 		checkboxChange(e) {
 			//console.log(e);
@@ -47,54 +77,72 @@
 		checkboxGroupChange(e) {
 			// console.log(e);
 		},
-			mask_u(){
-				this.show = !this.show
+		mask_u() {
+			this.show = !this.show;
 		},
 		// 获取验证码倒计时
-			getCode(){
-				console.log("11")
-				this.loading()
+		getCode() {
+			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(res.errCode != 0){
+		loading() {},
+		logins() {
+			// 清除本地存储才可以正常登陆（具体原因没有仔细检查）
+			uni.clearStorage();
+			// 账号登录1达人0商家
+			if(this.state==1){
+				this.$u.api.login({ member_name: this.zhanghaoA, member_password: this.mimaA }).then(res => {
+					console.log(res);
+					if (res.errCode != 0) {
 						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)
+						});
+					} 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"
-						})
+							url: '/pages/user/myinfo'
+						});
+					}
+				});
+			}else{
+				this.$u.api.shoplogin({ member_name: this.zhanghao, member_password: this.mima }).then(res => {
+					console.log(res);
+					if (res.errCode != 0) {
+						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(){
+	onLoad() {
 		let token = uni.getStorageSync('token');

-			if(token != undefined && token){
+		if (token != undefined && token) {
 			this.$u.route({
-					url:"/pages/index/index"
-				})
+				url: '/pages/index/index'
+			});
 		}
 	}
-	};
+};
 </script>

 <style lang="scss" scoped>
-	
-	.login {
-
+.login {
 	// background: url(../../static/pageA/loginbackground.png) no-repeat!important;
 	.images {
 		position: fixed;
@@ -111,7 +159,6 @@
 		width: 100%;
 		height: 100%;
 		z-index: -1;
-
 	}

 	text {
@@ -139,17 +186,28 @@
 	.more_Login .other {
 		text-align: right;
 	}
-	}
+}

-	.title {
+.title {
 	font-size: 36rpx;
 	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 {
+.content {
 	width: 630rpx;
 	z-index: 99999;
 	margin: 0 auto;
@@ -165,7 +223,7 @@
 		height: 70rpx;
 		line-height: 70rpx;
 		position: relative;
-			input{
+		input {
 			width: 80%;
 			margin-left: 60rpx;
 			color: #fff;
@@ -173,7 +231,7 @@
 			background-color: none;
 		}
 	}
-		.labales image{
+	.labales image {
 		position: absolute;
 		left: 0;
 		top: 0;
@@ -197,50 +255,51 @@
 		color: rgba(255, 120, 15, 1);
 		line-height: 20px;
 	}
-	}
-	.uni-input-input, .uni-input-placeholder{
-	            color:#fff!important;
+}
+.uni-input-input,
+.uni-input-placeholder {
+	color: #fff !important;
 	letter-spacing: 2rpx;
-	        }
+}

-	.pact text {
+.pact text {
 	font-size: 22rpx;
 	font-weight: 400;
 	color: rgba(255, 255, 255, 1);
 	line-height: 36px;
-	}
+}

-	.pact_text {
+.pact_text {
 	font-size: 22px;
 	font-weight: 400;
 	color: rgba(129, 188, 253, 1) !important;
 	line-height: 36px;
-	}
+}

-	//单选框的样式
-	.pact {
+//单选框的样式
+.pact {
 	position: relative;
 	padding-left: 40rpx;
-		overflow:hidden; //超出的文本隐藏
-		text-overflow:ellipsis; //溢出用省略号显示
-		white-space:nowrap; //溢出不换行
-	}
+	overflow: hidden; //超出的文本隐藏
+	text-overflow: ellipsis; //溢出用省略号显示
+	white-space: nowrap; //溢出不换行
+}

-	.u-checkbox-group {
+.u-checkbox-group {
 	position: absolute;
 	left: 0;
 	top: 0;
 	bottom: 0;
 	margin: auto;
-	}
+}

-	.u-checkbox__icon--square {
+.u-checkbox__icon--square {
 	border-radius: 50rpx !important;
 	width: 22rpx;
 	height: 22rpx;
-	}
+}

-	.u-btn {
+.u-btn {
 	width: 628rpx;
 	height: 98rpx;
 	background: rgba(255, 120, 15, 1) !important;
@@ -252,16 +311,16 @@
 	border: 1px #ff780f solid;
 	outline: none;
 	border-color: rgba(255, 120, 15, 1) !important;
-	}
+}

-	.warp {
+.warp {
 	display: flex;
 	align-items: center;
 	justify-content: center;
 	height: 100%;
-	}
+}

-	.rect {
+.rect {
 	width: 558rpx;
 	height: 300rpx;
 	background-color: #fff;
@@ -270,26 +329,25 @@
 	zoom: 1;
 	position: relative;
 	display: flex;
-		 flex-wrap:wrap;
+	flex-wrap: wrap;
 	display: -webkit-flex; /* Safari */
-		.rect_view{
+	.rect_view {
 		width: 100rpx;
 		height: 100rpx;
-			.image{
+		.image {
 			width: 45rpx;
 			height: 53rpx;
 			display: inline-block;
-			
 		}
-			flex:1;
+		flex: 1;
 		margin-top: 77rpx;
 	}
-		.rect_view:nth-child(2) image{
+	.rect_view:nth-child(2) image {
 		width: 57rpx;
 		height: 45rpx;
 	}

-		.rect_butoon{
+	.rect_butoon {
 		width: 100%;
 		position: absolute;
 		bottom: 0;
@@ -298,50 +356,51 @@
 		line-height: 85rpx;
 		border-top: 1px #999999 solid;
 	}
-		view{
+	view {
 		color: #666;
-			font-size:24rpx;
+		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{
+}
+.rect_view:nth-child(1) image {
 	margin-right: 20rpx;
-	}
-	.rect_view:nth-child(1){
+}
+.rect_view:nth-child(1) {
 	position: relative;
 	margin-right: 79rpx;
-	}
-	.rect_view:nth-child(1) view{
+}
+.rect_view:nth-child(1) view {
 	position: absolute;
 	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{
+}
+.rect_view:nth-child(2) image {
 	margin-left: 20rpx;
-	}
-	.rect_view:nth-child(2){
+}
+.rect_view:nth-child(2) {
 	position: relative;
-	}
-	.rect_view:nth-child(2) view{
+}
+.rect_view:nth-child(2) view {
 	position: absolute;
 	bottom: 0;
 	left: 0;
-	}
-	.title_top {
+}
+.title_top {
 	position: fixed;
-			top: 36rpx;
+	top: calc(var(--status-bar-height) + 18px);
 	left: 0;
 	right: 0;
 	margin: auto;
-			font-size:36rpx;
-			color:rgba(255,255,255,1);
+	font-size: 36rpx;
+	color: rgba(255, 255, 255, 1);
 	text-align: center;
 	width: 100%;
 	/* 如果您想让slot内容占满整个导航栏的宽度 */
@@ -350,5 +409,17 @@
 	/* padding: 0 30rpx; */
 	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>
--- a/pages/release/tosign.vue
+++ b/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>
--- a/pages/release/zhibo.nvue
+++ b/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,80 @@
    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;
+}
 </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 +301,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 +323,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 +564,10 @@ const RongIMLib = require('../../static/rongyun.js');
                    }
                });
            },
+            xianshi(){
+                this.show = true;
+                console.log(111)
+            },
            guanbi(){
                this.show = false
                console.log(123)
@@ -361,7 +591,7 @@ const RongIMLib = require('../../static/rongyun.js');
                    data:{
                        goods_id:arr.join(',')
                    },
-                    headers:{
+                    header:{
                        'Authorization' : 'Bearer' + " " + token
                    },
                    success(res){
@@ -369,7 +599,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){
--- a/pages/user/content.vue
+++ b/pages/user/content.vue
@@ -1,20 +1,20 @@
 <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 :current="swiperCurrent" >
 			<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 v-for="(item, index) in newlist" :key="index">
+						<ContentItem :info="item" :type="type" del="del"></ContentItem>
 					</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 v-for="(item, index) in newlist" :key="index">
+						<ContentItem :info="item" :type="type" @del="del"></ContentItem>
 					</view>
 				</scroll-view>
 			</swiper-item>
@@ -43,23 +43,61 @@ export default {
 			}, {
 				name: '视频'
 			}],
+			type:1,
+			num:1,
+			newlist:[]
 		}
 	},
 	components: {
 		ContentItem
 	},
+	onLoad() {
+		this.getlist()
+	},
+	onReachBottom() {
+		this.num++
+		this.getlist()
+	},
 	methods: {
-		showPopup() {
-			this.show = true;
+		getlist(){
+			let that = this;
+			this.$u.api.articlelist({
+				type:that.type,
+				page:that.num
+			}).then(res => {
+				console.log(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) {
+			// 删除元素
+			this.show=true
+			console.log(e)
 		},
 		tabsChange(index) {
 			this.swiperCurrent = index;
+			this.type=index+1;
+			this.num=0
+			this.newlist=[]
+			this.getlist()
 		},
 		animationfinish(e) {
+			console.log(12345666)
 			let current = e.detail.current;
-			// this.$refs.uTabs.setFinishCurrent(current);
 			this.swiperCurrent = current;
 			this.current = current;
+			this.type=current+1;
 		},
 	},
 };
--- a/pages/user/fans.vue
+++ b/pages/user/fans.vue
@@ -3,16 +3,16 @@
 		<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 myfans" :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 newfans" :key="index">
+					<FansItem :info="item"></FansItem>
 				</view>
 			</view>
 		</view>
@@ -22,10 +22,35 @@
 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>
--- a/pages/user/index.vue
+++ b/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>
@@ -28,7 +28,31 @@
 <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
--- a/pages/user/info.vue
+++ b/pages/user/info.vue
@@ -1,45 +1,106 @@
 <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="info.member_nickname==null?'新用户':info.member_nickname" />
 		</view>
 		<view class="item">
 			<text class="title">个性签名</text>
-            <text class="value">变瘦变高变有钱</text>
+			<input type="text" :value="info.signature==''?'该用户很懒没有签名！':info.signature" />
 		</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) {
+				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,14 +109,14 @@ export default {
 				url: '/pages/user/updatePassword'
 			});
 		}
-	},
-}
+	}
+};
 </script>
 <style lang="scss" scoped>
-.info{
+.info {
 	min-height: calc(100vh - var(--window-top));
 	background: #ececec;
-    .head{
+	.head {
 		height: 202rpx;
 		display: flex;
 		flex-direction: column;
@@ -63,15 +124,14 @@ export default {
 		justify-content: center;
 		background-color: #fff;
 		margin-bottom: 2rpx;
-        >image{
+		> image {
 			width: 120rpx;
 			height: 120rpx;
 			border-radius: 50%;
-			background-color: #0f0;
 		}
-        >text{
+		> text {
 			font-size: 24rpx;
-            color: #FF780F;
+			color: #ff780f;
 			margin-top: 20rpx;
 		}
 		margin-bottom: 2rpx;
@@ -80,18 +140,18 @@ export default {
 		display: flex;
 		align-items: center;
 		height: 98rpx;
-		background: rgba(255,255,255,1);
+		background: rgba(255, 255, 255, 1);
 		padding: 0 30rpx;
 		margin-bottom: 2rpx;
 		.title {
 			width: 120rpx;
 			font-size: 30rpx;
-			color: rgba(51,51,51,1);
+			color: rgba(51, 51, 51, 1);
 			margin-right: 120rpx;
 		}
 		.value {
 			font-size: 30rpx;
-			color: rgba(101,101,101,1);
+			color: rgba(101, 101, 101, 1);
 		}
 	}
 	.password {
@@ -101,10 +161,10 @@ export default {
 		display: flex;
 		align-items: center;
 		justify-content: space-between;
-		background: rgba(255,255,255,1);
+		background: rgba(255, 255, 255, 1);
 		> text {
 			font-size: 30rpx;
-			color: rgba(51,51,51,1);
+			color: rgba(51, 51, 51, 1);
 		}
 		> image {
 			width: 11rpx;
@@ -114,12 +174,12 @@ export default {
 	.image-popup {
 		padding: 0 30rpx;
 		> view {
-			font-size:　28rpx;
-			color: rgba(51,51,51,1);
+			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;
 			}
 		}
 	}
--- a/pages/user/myinfo.vue
+++ b/pages/user/myinfo.vue
@@ -0,0 +1,217 @@
+<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>
+    </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) {
+			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>
--- a/pages/user/updatePassword.vue
+++ b/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>
--- a/static/chatservice.js
+++ b/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;
--- a/static/goeasy-im-1.0.9.js
+++ b/static/goeasy-im-1.0.9.js
--- a/static/image/close.png
+++ b/static/image/close.png
--- a/static/image/index/close.png
+++ b/static/image/index/close.png
--- a/static/image/index/live.png
+++ b/static/image/index/live.png
--- a/static/image/index/photo.png
+++ b/static/image/index/photo.png
--- a/static/image/index/publish.png
+++ b/static/image/index/publish.png
--- a/static/image/index/swiper.png
+++ b/static/image/index/swiper.png
--- a/static/image/index/video.png
+++ b/static/image/index/video.png
--- a/static/image/menu.png
+++ b/static/image/menu.png
--- a/static/image/shop.png
+++ b/static/image/shop.png
--- a/static/rongyun.js
+++ b/static/rongyun.js
Author	SHA1	Message	Date
luyuan	385653d391	直播	2020-08-03 16:47:46 +08:00
luyuan	5520e7ab7c	添加进度条	2020-07-30 15:55:16 +08:00
luyuan	1d9edefd7f	直播完成	2020-07-30 15:54:32 +08:00
luyuan	b605f68e72	Merge branch 'master' of http://git.luyuan.tk/luyuan/demingshangjia into xbx	2020-07-30 09:33:13 +08:00
luyuan	2525db391c	Merge pull request 'update api' (#13 ) from cmx into master Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/13	2020-07-30 09:32:16 +08:00
luyuan	dbffca53c8	Merge branch 'master' into cmx	2020-07-30 09:32:11 +08:00
luyuan	519ec0abe8	直播修改	2020-07-30 08:46:35 +08:00
cmxdd	243e1f93bd	update api	2020-07-29 20:35:33 +08:00
luyuan	74fbd629d6	Merge branch 'master' of http://git.luyuan.tk/luyuan/demingshangjia into xbx	2020-07-29 15:28:31 +08:00
cmx	e71a43eb85	Merge pull request 'cmx' (#12 ) from cmx into master Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/12	2020-07-29 15:26:56 +08:00
cmxdd	fef56d1b52	update two login style	2020-07-29 15:21:40 +08:00
cmxdd	cc7a293e18	update	2020-07-29 10:42:37 +08:00
cmxdd	8660e95d02	test	2020-07-29 10:40:55 +08:00
luyuan	96adf9e6a9	修正了错误弹窗	2020-07-29 09:37:59 +08:00