直播修改

Merge branch 'master' of http://git.luyuan.tk/luyuan/demingshangjia into xbx
Merge pull request 'cmx' (#12 ) from cmx into master
2020-07-30 08:46:35 +08:00 · 2020-07-29 15:28:31 +08:00 · 2020-07-29 15:26:56 +08:00 · 2020-07-29 15:21:40 +08:00 · 2020-07-29 10:42:37 +08:00 · 2020-07-29 10:40:55 +08:00
16 changed files with 605 additions and 649 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 {
 	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>
--- 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,19 @@ 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)
+		},
    }
 	// 将各个定义的接口名称，统一放进对象挂载到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/order-item/index.vue
+++ b/components/order-item/index.vue
@@ -2,14 +2,7 @@
 	<view class="item" @click="toDetailsPage">
 		<image></image>
 		<view class="goods">
-			
-			<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="status" v-if="cur==4">待处理订单</view>
 			<view class="name u-line-1">心机小黑裙连衣裙赫本风夏季爆款...</view>
 			<view class="info">
 				<view class="num">共一件商品</view>
@@ -57,26 +50,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/index/index.vue
+++ b/pages/index/index.vue
@@ -1,45 +1,47 @@
 <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>
+					<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 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>
@@ -55,51 +57,20 @@
 			</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 +84,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 +135,105 @@ 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
+		};
 	},
 	components: {
 		OrderItem
 	},
 	onLoad() {
-
+		this.getswiper();
+		this.getallorder();
+		this.getorderlist();
 	},
 	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
+		// 获取订单列表
+		getorderlist(type) {
+			let that = this;
+			this.$u.api
+				.getorderlist({
+					page: that.num,
+					state_type: type
+				})
+				.then(res => {
+					console.log(res);
+					if (res.errCode != 0) {
+					} else {
 					}
+				});
 		},
-		// 选中任一radio时，由radio-group触发
-		radioGroupChange(e) {
-			// console.log(e);
+		// 获取全部订单
+		getallorder() {
+			let that = this;
+			this.$u.api
+				.getorderlist({
+					page: that.num
+				})
+				.then(res => {
+					console.log(res);
+					if (res.errCode != 0) {
+					} else {
+					}
+				});
 		},
+		// 获取轮播图
+		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) {
 			// 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;
@@ -250,19 +244,19 @@ export default {
 		navto(url) {
 			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;
@@ -278,7 +272,7 @@ export default {
 	}
 	.swiper-item {
 		.complaint {
-			margin: 0rpx 30rpx 0;
+			margin: 0 30rpx;
 			padding: 75rpx 30rpx;
 			background-color: #ffffff;
 			.select-container {
@@ -292,7 +286,7 @@ export default {
 				}
 				.select {
 					padding: 18rpx 20rpx;
-					width: 470rpx;
+					width: 490rpx;
 					height: 60rpx;
 					background: rgba(236, 236, 236, 1);
 					border-radius: 6rpx;
@@ -307,11 +301,6 @@ export default {
 						width: 24rpx;
 						height: 13rpx;
 					}
-					.order_num{
-						width: 367rpx;
-						display: flex;
-						justify-content: space-between;
-					}
 				}
 				.worker {
 					display: flex;
@@ -409,7 +398,6 @@ export default {
 		align-items: center;
 		padding: 50rpx 84rpx 31rpx 78rpx;
 		image {
-			background-color: #0f0;
 		}
 		.list {
 			display: flex;
@@ -438,110 +426,5 @@ export default {
 			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,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,28 @@
 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
 		};
 	},
 	methods: {
+		// 改变登陆类型
+		changetab(num){
+			this.state = num
+		},
 		// 选中某个复选框时，由checkbox时触发
 		checkboxChange(e) {
 			//console.log(e);
@@ -48,35 +78,56 @@
 			// 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)
+			// 清除本地存储才可以正常登陆（具体原因没有仔细检查）
+			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)
+						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/index/index',
+							type: 'switchTab'
+						});
+					}
+				});
+			}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() {
@@ -84,17 +135,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 +160,6 @@
 		width: 100%;
 		height: 100%;
 		z-index: -1;
-
 	}

 	text {
@@ -146,7 +194,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 +257,8 @@
 		line-height: 20px;
 	}
 }
-	.uni-input-input, .uni-input-placeholder{
+.uni-input-input,
+.uni-input-placeholder {
 	color: #fff !important;
 	letter-spacing: 2rpx;
 }
@@ -279,7 +339,6 @@
 			width: 45rpx;
 			height: 53rpx;
 			display: inline-block;
-			
 		}
 		flex: 1;
 		margin-top: 77rpx;
@@ -302,10 +361,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 +379,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 +396,7 @@
 }
 .title_top {
 	position: fixed;
-			top: 36rpx;
+	top: calc(var(--status-bar-height) + 18px);
 	left: 0;
 	right: 0;
 	margin: auto;
@@ -351,4 +411,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>
--- 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="false" @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){
@@ -137,6 +138,14 @@
 		onLoad(){
 			this.init()
 			uni.removeStorageSync('gouwudai')
+			//
+
+			this.token = uni.getStorageSync('token');
+			 var config = {
+                appkey: 'mgb7ka1',
+                debug:true
+            };
+
 		}
 	};
 </script>
@@ -472,5 +481,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="1" whiteness="2"
        aspect="9:16" @statechange="statechange" @netstatus="netstatus" @error = "error"
        :style="{'height':height + 'px'}"
        ></live-pusher>
@@ -195,28 +195,29 @@ const RongIMLib = require('../../static/rongyun.js');
            this.url = a.url.replace("*","&")
            let that = this
            const token = uni.getStorageSync('token');
-            uni.request({
-                url:"https://dmmall.sdbairui.com//storeapi/Streaming/liveStreamList",
-                method:"POST",
-                headers:{
-                    'Authorization' : 'Bearer' + " " + token
-                },
-                success(res){
-                    console.log(res)
-                    that.list= res.data.data
-                }
-            })
-             uni.request({
-                url:"https://dmmall.sdbairui.com/storeapi/member/memberInfo",
-                method:"POST",
-                headers:{
-                    'Authorization' : 'Bearer' + " " + token
-                },
-                success(res){
-                    console.log(res.data.data.memberInfo)
-                    that.info = res.data.data.memberInfo
-                }
-            })
+            console.log('Bearer' + " " + token)
+            // uni.request({
+            //     url:"https://dmmall.sdbairui.com/storeapi/Streaming/liveStreamList",
+            //     method:"POST",
+            //     headers:{
+            //         'Authorization' : 'Bearer' + " " + token
+            //     },
+            //     success(res){
+            //         console.log(res)
+            //         that.list= res.data.data
+            //     }
+            // })
+            //  uni.request({
+            //     url:"https://dmmall.sdbairui.com/storeapi/member/memberInfo",
+            //     method:"POST",
+            //     headers:{
+            //         'Authorization' : 'Bearer' + " " + token
+            //     },
+            //     success(res){
+            //         console.log(res.data.data.memberInfo)
+            //         that.info = res.data.data.memberInfo
+            //     }
+            // })
            var config = {
                appkey: 'mgb7ka1',
                debug:true
@@ -244,19 +245,22 @@ const RongIMLib = require('../../static/rongyun.js');
            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.msg);
+                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: {
            statechange(e) {
--- 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
Author	SHA1	Message	Date
luyuan	519ec0abe8	直播修改	2020-07-30 08:46:35 +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