diff --git a/.gitignore b/.gitignore
index 7f32e4b..1f4db68 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 .vscode
-node_modules
\ No newline at end of file
+node_modules
+unpackage
\ No newline at end of file
diff --git a/App.vue b/App.vue
index 1b2489c..91b6b40 100644
--- a/App.vue
+++ b/App.vue
@@ -1,18 +1,18 @@
 <script>
-	export default {
-		onLaunch: function() {
-			console.log('App Launch')
-		},
-		onShow: function() {
-			console.log('App Show')
-		},
-		onHide: function() {
-			console.log('App Hide')
-		}
+export default {
+	onLaunch: function() {
+		console.log('App Launch');
+	},
+	onShow: function() {
+		console.log('App Show');
+	},
+	onHide: function() {
+		console.log('App Hide');
 	}
+};
 </script>
 
 <style lang="scss">
-	/*每个页面公共css */
-	@import "uview-ui/index.scss";
-</style>
+/*每个页面公共css */
+@import 'uview-ui/index.scss';
+</style>
diff --git a/common/http.api.js b/common/http.api.js
index aa1fa72..b7fac75 100644
--- 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;
diff --git a/common/http.interceptor.js b/common/http.interceptor.js
index 5b4e2b9..4d23618 100644
--- a/common/http.interceptor.js
+++ b/common/http.interceptor.js
@@ -1,7 +1,7 @@
 const install = (Vue, vm) => {
 	// 此为自定义配置参数，具体参数见上方说明
 	Vue.prototype.$u.http.setConfig({
-        baseUrl: 'https://dmmall.sdbairui.com//storeapi',
+        baseUrl: 'https://dmmall.sdbairui.com/storeapi',
 		loadingText: '努力加载中~',
 		loadingTime: 800,
 		originalData: true,
diff --git a/package-lock.json b/package-lock.json
index 5f7bbf4..46ce289 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6,13 +6,8 @@
   "dependencies": {
     "uview-ui": {
       "version": "1.5.2",
-<<<<<<< HEAD
       "resolved": "https://registry.npmjs.org/uview-ui/-/uview-ui-1.5.2.tgz",
       "integrity": "sha512-FV9G+gZTAZKEE2m85ahIbIRiC/fdzTl+eNXDIMBoyc9b+fQWQhEtmAfu6huu7AtKuTI6gfqaYn6WGcmqYvr76w=="
-=======
-      "resolved": "https://registry.npm.taobao.org/uview-ui/download/uview-ui-1.5.2.tgz?cache=0&sync_timestamp=1594781920423&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fuview-ui%2Fdownload%2Fuview-ui-1.5.2.tgz",
-      "integrity": "sha1-4jDud0TIBjMJe74GU+IyvJSyAwk="
->>>>>>> fa383397b331ec0091096becf886f978cc1277fc
     }
   }
 }
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 08b2f6d..fc85544 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,31 +1,35 @@
 <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">
@@ -34,41 +38,37 @@
 						<view class="select-container">
 							<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>{{ worker.company + ' ' + worker.name }}</view>
+								<u-icon name="edit-pen" @click="worker = {}"></u-icon>
 							</view>
-							<view v-else class="select" @click="showSelect=true">
+							<view v-else class="select" @click="showSelect = true">
 								<view>请选择</view>
 								<image src="/static/image/home/5.png"></image>
 							</view>
 						</view>
 						<view class="textarea">
 							<view class="title">投诉简介</view>
-							 <textarea placeholder-style="color:#999999" placeholder="请输入内容" />
+							<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="showComplaint" mode="center" border-radius="10">
@@ -84,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>
+					<view @click="navto('release/index')">
+						<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: [{
-				name: '全部订单'
-			}, {
-				name: '试穿订单'
-			}, {
-				name: '待处理订单'
-			}, {
-				name: '投诉骑手'
-			}, {
-				name: '已完成订单'
-			}, {
-				name: '退货订单'
-			}],
-			imageList: [
-				{}, {}, {}
+			list: [
+				{
+					name: '全部订单'
+				},
+				{
+					name: '试穿订单'
+				},
+				{
+					name: '待处理订单'
+				},
+				{
+					name: '投诉骑手'
+				},
+				{
+					name: '已完成订单'
+				},
+				{
+					name: '退货订单'
+				}
 			],
+			imageList: [],
 			showSelect: false,
 			current: 0,
 			swiperCurrent: 0,
@@ -157,28 +162,75 @@ export default {
 					]
 				}
 			],
-			publishstate:true
-		}
+			publishstate: false,
+			num: 0
+		};
 	},
 	components: {
 		OrderItem
 	},
 	onLoad() {
-
+		this.getswiper();
+		this.getallorder();
+		this.getorderlist();
 	},
 	methods: {
-		release(){
-			this.publishstate = true
+		// 关闭发布弹窗
+		close() {
+			this.publishstate = false;
 		},
-		publish(){
-
+		// 获取订单列表
+		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 {
+					}
+				});
+		},
+		// 获取全部订单
+		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;
@@ -189,22 +241,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;
@@ -229,14 +281,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: 490rpx;
 					height: 60rpx;
-					background: rgba(236,236,236,1);
+					background: rgba(236, 236, 236, 1);
 					border-radius: 6rpx;
 					display: flex;
 					align-items: center;
@@ -255,7 +307,7 @@ export default {
 					align-items: center;
 					> view {
 						font-size: 30rpx;
-						color: rgba(51,51,51,1);
+						color: rgba(51, 51, 51, 1);
 						margin-right: 20rpx;
 					}
 				}
@@ -265,7 +317,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 {
@@ -280,10 +332,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;
 			}
@@ -295,8 +347,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;
@@ -310,7 +362,7 @@ export default {
 		}
 		.text {
 			font-size: 20rpx;
-			color: rgba(255,255,255,1);
+			color: rgba(255, 255, 255, 1);
 		}
 	}
 	.confirm-complaint {
@@ -321,7 +373,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;
@@ -330,38 +382,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;
@@ -369,11 +420,11 @@ export default {
 				}
 			}
 		}
-		.off{
+		.off {
 			margin-top: 81rpx;
 			width: 37rpx;
 			height: 37rpx;
 		}
 	}
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/pages/login/login.vue b/pages/login/login.vue
index daf7028..4c79254 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -2,355 +2,425 @@
 	<!-- login页面 -->
 	<view>
 		<view class="login">
-			<image class="images" src=""></image>
+			<image class="images" :src="url"></image>
 			<view class="backes"></view>
+			<view class="title_top">德铭阳光在线-商家端</view>
 			<view class="content">
-				<view class="title_top">德铭阳光在线-商家端</view>
-				<view class="title">账号登录</view>
-				<view class="labales">
-					<image src=""></image>
-					<input v-model="zhanghao" type="tel" placeholder="请输入账号" />
+				<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="labales">
-					<image src=""></image>
-					<input v-model="mima" type="password" placeholder="请输入密码" />
+				<view class="" v-if="state==0">
+					<view class="labales">
+						<image src="../../static/image/login/login(3).png"></image>
+						<input v-model="zhanghao" type="text" placeholder="请输入账号" />
+					</view>
+					<view class="labales">
+						<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 {
-		data() {
-			return {
-				list: [{
+export default {
+	data() {
+		return {
+			list: [
+				{
 					checked: false,
 					disabled: false
-				}],
-				value: '',
-				login: '登录',
-				show: false,
-				zhanghao:"",
-				mima:""
-				
-			};
+				}
+			],
+			value: '',
+			login: '登录',
+			show: false,
+			zhanghao: 'seller',
+			mima: '123456',
+			zhanghaoA: '18953829598 ',
+			mimaA: '123456',
+			url: '',
+			state:0
+		};
+	},
+	methods: {
+		// 改变登陆类型
+		changetab(num){
+			this.state = num
 		},
-		methods: {
-			// 选中某个复选框时，由checkbox时触发
-			checkboxChange(e) {
-				//console.log(e);
-			},
-			// 选中任一checkbox时，由checkbox-group触发
-			checkboxGroupChange(e) {
-				// console.log(e);
-			},
-			mask_u(){
-				this.show = !this.show
-			},
-			// 获取验证码倒计时
-			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){
+		// 选中某个复选框时，由checkbox时触发
+		checkboxChange(e) {
+			//console.log(e);
+		},
+		// 选中任一checkbox时，由checkbox-group触发
+		checkboxGroupChange(e) {
+			// console.log(e);
+		},
+		mask_u() {
+			this.show = !this.show;
+		},
+		// 获取验证码倒计时
+		getCode() {
+			console.log('11');
+			this.loading();
+		},
+		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/index/index',
+							type: 'switchTab'
+						});
 					}
-					
-				}).catch((res)=>{
-					console.log(res)
-				})
+				});
+			}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(){
-			let token = uni.getStorageSync('token');
 
-			if(token != undefined && token){
-				this.$u.route({
-					url:"/pages/index/index"
-				})
-			}
 		}
-	};
+	},
+	onLoad() {
+		let token = uni.getStorageSync('token');
+
+		if (token != undefined && token) {
+			this.$u.route({
+				url: '/pages/index/index'
+			});
+		}
+	}
+};
 </script>
 
 <style lang="scss" scoped>
-	
-	.login {
-
-		// background: url(../../static/pageA/loginbackground.png) no-repeat!important;
-		.images {
-			position: fixed;
-			width: 100%;
-			height: 100%;
-			top: 0;
-			left: 0;
-			z-index: -1;
-		}
-
-		.backes {
-			background: rgba(0, 0, 0, 0.4);
-			position: fixed;
-			width: 100%;
-			height: 100%;
-			z-index: -1;
-
-		}
-
-		text {
-			z-index: 9;
-			color: #fff;
-		}
-
-		.more_Login {
-			overflow: hidden;
-			zoom: 1;
-			width: 630rpx;
-			margin: 0 auto;
-		}
-
-		.more_Login text {
-			display: inline-block;
-			width: 50%;
-			float: left;
-			font-size: 30rpx;
-			color: rgba(255, 255, 255, 1);
-			line-height: 36px;
-			margin: 97rpx 0;
-		}
-
-		.more_Login .other {
-			text-align: right;
-		}
+.login {
+	// background: url(../../static/pageA/loginbackground.png) no-repeat!important;
+	.images {
+		position: fixed;
+		width: 100%;
+		height: 100%;
+		top: 0;
+		left: 0;
+		z-index: -1;
 	}
 
-	.title {
-		font-size: 36rpx;
-		font-weight: bold;
-		margin-bottom: 150rpx;
+	.backes {
+		background: rgba(0, 0, 0, 0.4);
+		position: fixed;
+		width: 100%;
+		height: 100%;
+		z-index: -1;
+	}
+
+	text {
+		z-index: 9;
 		color: #fff;
-		letter-spacing: 3rpx;
 	}
 
-	.content {
+	.more_Login {
+		overflow: hidden;
+		zoom: 1;
 		width: 630rpx;
-		z-index: 99999;
 		margin: 0 auto;
-		padding-top: 300rpx;
-
-		.labales text {
-			font-size: 30rpx;
-		}
-
-		.labales {
-			border-bottom: 1px #fff solid;
-			margin-bottom: 180rpx;
-			height: 70rpx;
-			line-height: 70rpx;
-			position: relative;
-			input{
-				width: 80%;
-				margin-left: 60rpx;
-				color: #fff;
-				letter-spacing: 2rpx;
-				background-color: none;
-			}
-		}
-		.labales image{
-			position: absolute;
-			left: 0;
-			top: 0;
-			bottom: 0;
-			width: 39rpx;
-			height: 40rpx;
-		}
-		.labales:nth-child(3) {
-			position: relative;
-			margin-bottom: 60rpx;
-		}
-
-		.identifying {
-			position: absolute;
-			right: 0;
-			top: 0;
-			bottom: 0;
-			margin: auto;
-			font-size: 30rpx;
-			font-weight: 500;
-			color: rgba(255, 120, 15, 1);
-			line-height: 20px;
-		}
 	}
-	.uni-input-input, .uni-input-placeholder{
-	            color:#fff!important;
-				letter-spacing: 2rpx;
-	        }
 
-	.pact text {
-		font-size: 22rpx;
-		font-weight: 400;
+	.more_Login text {
+		display: inline-block;
+		width: 50%;
+		float: left;
+		font-size: 30rpx;
 		color: rgba(255, 255, 255, 1);
 		line-height: 36px;
+		margin: 97rpx 0;
 	}
 
-	.pact_text {
-		font-size: 22px;
-		font-weight: 400;
-		color: rgba(129, 188, 253, 1) !important;
-		line-height: 36px;
+	.more_Login .other {
+		text-align: right;
+	}
+}
+
+.title {
+	font-size: 36rpx;
+	font-weight: bold;
+	margin-bottom: 150rpx;
+	color: #fff;
+	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 {
+	width: 630rpx;
+	z-index: 99999;
+	margin: 0 auto;
+	padding-top: 300rpx;
+
+	.labales text {
+		font-size: 30rpx;
 	}
 
-	//单选框的样式
-	.pact {
+	.labales {
+		border-bottom: 1px #fff solid;
+		margin-bottom: 180rpx;
+		height: 70rpx;
+		line-height: 70rpx;
 		position: relative;
-		padding-left: 40rpx;
-		overflow:hidden; //超出的文本隐藏
-		text-overflow:ellipsis; //溢出用省略号显示
-		white-space:nowrap; //溢出不换行
+		input {
+			width: 80%;
+			margin-left: 60rpx;
+			color: #fff;
+			letter-spacing: 2rpx;
+			background-color: none;
+		}
 	}
-
-	.u-checkbox-group {
+	.labales image {
 		position: absolute;
 		left: 0;
 		top: 0;
 		bottom: 0;
-		margin: auto;
+		width: 39rpx;
+		height: 40rpx;
 	}
-
-	.u-checkbox__icon--square {
-		border-radius: 50rpx !important;
-		width: 22rpx;
-		height: 22rpx;
-	}
-
-	.u-btn {
-		width: 628rpx;
-		height: 98rpx;
-		background: rgba(255, 120, 15, 1) !important;
-		border-radius: 49rpx;
-		margin: 0 auto;
-		font-size: 36rpx;
-		color: rgba(255, 255, 255, 1) !important;
-		line-height: 36px;
-		border: 1px #ff780f solid;
-		outline: none;
-		border-color: rgba(255, 120, 15, 1) !important;
-	}
-
-	.warp {
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		height: 100%;
-	}
-
-	.rect {
-		width: 558rpx;
-		height: 300rpx;
-		background-color: #fff;
-		border-radius: 20rpx;
-		overflow: hidden;
-		zoom: 1;
+	.labales:nth-child(3) {
 		position: relative;
-		display: flex;
-		 flex-wrap:wrap;
-		 display: -webkit-flex; /* Safari */
-		.rect_view{
-			width: 100rpx;
-			height: 100rpx;
-			.image{
+		margin-bottom: 60rpx;
+	}
+
+	.identifying {
+		position: absolute;
+		right: 0;
+		top: 0;
+		bottom: 0;
+		margin: auto;
+		font-size: 30rpx;
+		font-weight: 500;
+		color: rgba(255, 120, 15, 1);
+		line-height: 20px;
+	}
+}
+.uni-input-input,
+.uni-input-placeholder {
+	color: #fff !important;
+	letter-spacing: 2rpx;
+}
+
+.pact text {
+	font-size: 22rpx;
+	font-weight: 400;
+	color: rgba(255, 255, 255, 1);
+	line-height: 36px;
+}
+
+.pact_text {
+	font-size: 22px;
+	font-weight: 400;
+	color: rgba(129, 188, 253, 1) !important;
+	line-height: 36px;
+}
+
+//单选框的样式
+.pact {
+	position: relative;
+	padding-left: 40rpx;
+	overflow: hidden; //超出的文本隐藏
+	text-overflow: ellipsis; //溢出用省略号显示
+	white-space: nowrap; //溢出不换行
+}
+
+.u-checkbox-group {
+	position: absolute;
+	left: 0;
+	top: 0;
+	bottom: 0;
+	margin: auto;
+}
+
+.u-checkbox__icon--square {
+	border-radius: 50rpx !important;
+	width: 22rpx;
+	height: 22rpx;
+}
+
+.u-btn {
+	width: 628rpx;
+	height: 98rpx;
+	background: rgba(255, 120, 15, 1) !important;
+	border-radius: 49rpx;
+	margin: 0 auto;
+	font-size: 36rpx;
+	color: rgba(255, 255, 255, 1) !important;
+	line-height: 36px;
+	border: 1px #ff780f solid;
+	outline: none;
+	border-color: rgba(255, 120, 15, 1) !important;
+}
+
+.warp {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	height: 100%;
+}
+
+.rect {
+	width: 558rpx;
+	height: 300rpx;
+	background-color: #fff;
+	border-radius: 20rpx;
+	overflow: hidden;
+	zoom: 1;
+	position: relative;
+	display: flex;
+	flex-wrap: wrap;
+	display: -webkit-flex; /* Safari */
+	.rect_view {
+		width: 100rpx;
+		height: 100rpx;
+		.image {
 			width: 45rpx;
 			height: 53rpx;
 			display: inline-block;
-			
-			}
-			flex:1;
-			margin-top: 77rpx;
-		}
-		.rect_view:nth-child(2) image{
-			width: 57rpx;
-			height: 45rpx;
-		}
-		
-		.rect_butoon{
-			width: 100%;
-			position: absolute;
-			bottom: 0;
-			height: 85rpx;
-			text-align: center;
-			line-height: 85rpx;
-			border-top: 1px #999999 solid;
-		}
-		view{
-			color: #666;
-			font-size:24rpx;
-			margin-top: 30rpx;
-			
 		}
+		flex: 1;
+		margin-top: 77rpx;
 	}
-	.rect_view:nth-child(1) image,.rect_view:nth-child(1) view{
-		float: right;
+	.rect_view:nth-child(2) image {
+		width: 57rpx;
+		height: 45rpx;
 	}
-	.rect_view:nth-child(1) image{
-		margin-right: 20rpx;
-	}
-	.rect_view:nth-child(1){
-		position: relative;
-		margin-right: 79rpx;
-	}
-	.rect_view:nth-child(1) view{
+
+	.rect_butoon {
+		width: 100%;
 		position: absolute;
 		bottom: 0;
-		right: 0;
+		height: 85rpx;
+		text-align: center;
+		line-height: 85rpx;
+		border-top: 1px #999999 solid;
 	}
-	.rect_view:nth-child(2) image,.rect_view:nth-child(2) view{
-		float: left;
+	view {
+		color: #666;
+		font-size: 24rpx;
+		margin-top: 30rpx;
 	}
-	.rect_view:nth-child(2) image{
-		margin-left: 20rpx;
-	}
-	.rect_view:nth-child(2){
-		position: relative;
-	}
-	.rect_view:nth-child(2) view{
-		position: absolute;
-		bottom: 0;
-		left: 0;
-	}
-	.title_top {
-			position: fixed;
-			top: 36rpx;
-			left: 0;
-			right: 0;
-			margin: auto;
-			font-size:36rpx;
-			color:rgba(255,255,255,1);
-			text-align: center;
-			width: 100%;
-			/* 如果您想让slot内容占满整个导航栏的宽度 */
-			/* flex: 1; */
-			/* 如果您想让slot内容与导航栏左右有空隙 */
-			/* padding: 0 30rpx; */
-			background: none;
-			letter-spacing: 4rpx;
-		}
+}
+.rect_view:nth-child(1) image,
+.rect_view:nth-child(1) view {
+	float: right;
+}
+.rect_view:nth-child(1) image {
+	margin-right: 20rpx;
+}
+.rect_view:nth-child(1) {
+	position: relative;
+	margin-right: 79rpx;
+}
+.rect_view:nth-child(1) view {
+	position: absolute;
+	bottom: 0;
+	right: 0;
+}
+.rect_view:nth-child(2) image,
+.rect_view:nth-child(2) view {
+	float: left;
+}
+.rect_view:nth-child(2) image {
+	margin-left: 20rpx;
+}
+.rect_view:nth-child(2) {
+	position: relative;
+}
+.rect_view:nth-child(2) view {
+	position: absolute;
+	bottom: 0;
+	left: 0;
+}
+.title_top {
+	position: fixed;
+	top: calc(var(--status-bar-height) + 18px);
+	left: 0;
+	right: 0;
+	margin: auto;
+	font-size: 36rpx;
+	color: rgba(255, 255, 255, 1);
+	text-align: center;
+	width: 100%;
+	/* 如果您想让slot内容占满整个导航栏的宽度 */
+	/* flex: 1; */
+	/* 如果您想让slot内容与导航栏左右有空隙 */
+	/* 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>
diff --git a/static/image/index/close.png b/static/image/index/close.png
new file mode 100644
index 0000000..cc1c185
Binary files /dev/null and b/static/image/index/close.png differ
diff --git a/static/image/index/live.png b/static/image/index/live.png
new file mode 100644
index 0000000..f01d90e
Binary files /dev/null and b/static/image/index/live.png differ
diff --git a/static/image/index/photo.png b/static/image/index/photo.png
new file mode 100644
index 0000000..8c1ae36
Binary files /dev/null and b/static/image/index/photo.png differ
diff --git a/static/image/index/publish.png b/static/image/index/publish.png
new file mode 100644
index 0000000..8c30bac
Binary files /dev/null and b/static/image/index/publish.png differ
diff --git a/static/image/index/swiper.png b/static/image/index/swiper.png
new file mode 100644
index 0000000..b1f6b57
Binary files /dev/null and b/static/image/index/swiper.png differ
diff --git a/static/image/index/video.png b/static/image/index/video.png
new file mode 100644
index 0000000..d55e0dd
Binary files /dev/null and b/static/image/index/video.png differ