From bf64d6be548498e05d20ac1b387c6ad2b90c1cf3 Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Wed, 4 Dec 2024 15:43:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/product/productItem.vue             | 108 +++++-----
 pages.json                                     |  15 ++
 pages/index/center.vue                         |  21 +-
 pages/index/index.vue                          |   6 +-
 pages_order/components/address/addressList.vue |   2 +-
 pages_order/components/product/submit.vue      |  10 +-
 pages_order/home/Worknotice.vue                |  44 ----
 pages_order/home/journalism.vue                |  12 +-
 pages_order/mine/balance.vue                   | 132 ++++++++++++
 pages_order/mine/commission.vue                | 134 ++++++++++++
 pages_order/mine/recharge.vue                  | 168 +++++++++++++++
 pages_order/mine/recommend.vue                 |  13 +-
 pages_order/mine/withdraw.vue                  | 168 +++++++++++++++
 pages_order/order/createOrder.vue              | 288 +++++++++++++++++++++++++
 pages_order/product/productDetail.vue          |  46 ++--
 pages_order/static/address/icon1.png           | Bin 0 -> 7285 bytes
 store/store.js                                 |  16 ++
 uni.scss                                       |  20 ++
 18 files changed, 1073 insertions(+), 130 deletions(-)
 delete mode 100644 pages_order/home/Worknotice.vue
 create mode 100644 pages_order/mine/balance.vue
 create mode 100644 pages_order/mine/commission.vue
 create mode 100644 pages_order/mine/recharge.vue
 create mode 100644 pages_order/mine/withdraw.vue
 create mode 100644 pages_order/order/createOrder.vue
 create mode 100644 pages_order/static/address/icon1.png

diff --git a/components/product/productItem.vue b/components/product/productItem.vue
index 65afa25..f3da87d 100644
--- a/components/product/productItem.vue
+++ b/components/product/productItem.vue
@@ -1,22 +1,19 @@
 <template>
-	<view class="item"
-	@click="$emit('click')">
-		
+	<view class="item" @click="$emit('click')">
 		<view class="item-image">
-			<image 
-			:src="item.image || 'https://img95.699pic.com/photo/50058/1378.jpg_wh860.jpg'" 
-			mode="aspectFill"></image>
+			<image :src="item.image || 'https://img95.699pic.com/photo/50058/1378.jpg_wh860.jpg'" mode="aspectFill">
+			</image>
 		</view>
-		
+
 		<view class="info">
 			<view class="title">
-				小青蛙大米
+				{{ item.title }}
 			</view>
 			<view class="desc">
-				500g每罐*2罐
+				{{ item.sku }}
 			</view>
 			<view class="price">
-				￥19.9
+				{{ item.price }}
 			</view>
 		</view>
 	</view>
@@ -24,60 +21,65 @@
 
 <script>
 	export default {
-		props : {
-			item : {
-				default : {}
+		props: {
+			item: {
+				default: {}
 			}
 		},
 		data() {
 			return {
-				
+
 			}
 		},
 		methods: {
-			
+
 		}
 	}
 </script>
 
 <style scoped lang="scss">
-.item {
-				padding: 10rpx 20rpx;
-				align-items: center;
-				margin-bottom: 20rpx;
-				display: flex;
+	.item {
+		padding: 10rpx 20rpx;
+		align-items: center;
+		margin-bottom: 20rpx;
+		display: flex;
+		width: 100%;
+		box-sizing: border-box;
+
+		.item-image {
+			width: 140rpx;
+			height: 140rpx;
+			flex-shrink: 0;
+
+			image {
+				height: 100%;
 				width: 100%;
-				box-sizing: border-box;
-				.item-image {
-					width: 140rpx;
-					height: 140rpx;
-					flex-shrink: 0;
-					image{
-						height: 100%;
-						width: 100%;
-						border-radius: 20rpx;
-					}
-				}
-			
-				.info {
-					padding: 20rpx;
-					color: #555;
-					flex: 1;
-					.title{
-						font-size: 28rpx;
-						font-weight: 900;
-					}
-					.desc{
-						font-size: 22rpx;
-						color: #777;
-						margin-top: 10rpx;
-					}
-					.price{
-						text-align: right;
-						color: #f40;
-						font-size: 30rpx;
-						font-weight: 900;
-					}
-				}
+				border-radius: 20rpx;
 			}
-</style>
+		}
+
+		.info {
+			padding: 20rpx;
+			color: #555;
+			flex: 1;
+
+			.title {
+				font-size: 28rpx;
+				font-weight: 900;
+			}
+
+			.desc {
+				font-size: 22rpx;
+				color: #777;
+				margin-top: 10rpx;
+			}
+
+			.price {
+				text-align: right;
+				color: #f40;
+				font-size: 30rpx;
+				font-weight: 900;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages.json b/pages.json
index bc7b143..f48717f 100644
--- a/pages.json
+++ b/pages.json
@@ -86,6 +86,21 @@
 			},
 			{
 				"path" : "home/newsDetail"
+			},
+			{
+				"path" : "order/createOrder"
+			},
+			{
+				"path" : "mine/balance"
+			},
+			{
+				"path": "mine/commission"
+			},
+			{
+				"path": "mine/withdraw"
+			},
+			{
+				"path": "mine/recharge"
 			}
 		]
 	}],
diff --git a/pages/index/center.vue b/pages/index/center.vue
index bec180d..6fab5d2 100644
--- a/pages/index/center.vue
+++ b/pages/index/center.vue
@@ -30,7 +30,8 @@
 				<view>查看权益></view>
 			</view>
 			<view class="deposit">
-				<view class="box">
+				<view class="box"
+					@click="$utils.navigateTo('/pages_order/mine/purse')">
 					<view>
 						<view class="num">1.00</view>
 						<view class="text">收益明细(元)</view>
@@ -38,19 +39,23 @@
 					<view class="boxs">收益明细</view>
 				</view>
 				<view class="box">
-					<view>
+					<view
+					@click="$utils.navigateTo('/pages_order/mine/balance')">
 						<view class="num">1.00</view>
 						<view class="text">余额(元)</view>
 					</view>
-					<view class="boxs">去充值</view>
+					<view class="boxs"
+					@click="$utils.navigateTo('/pages_order/mine/recharge')">去充值</view>
 				</view>
 
 				<view class="box">
-					<view>
+					<view
+					@click="$utils.navigateTo('/pages_order/mine/commission')">
 						<view class="num" style="border: none;">1.00</view>
 						<view class="text">可提现(元)</view>
 					</view>
-					<view class="boxs"  @click="$utils.navigateTo('/pages_order/mine/purse')">去提现</view>
+					<view class="boxs"
+					@click="$utils.navigateTo('/pages_order/mine/withdraw')">去提现</view>
 				</view>
 			</view>
 		</view>
@@ -100,11 +105,17 @@
 			<view class="cell-bottom">
 				<uv-cell-group>
 					<uv-cell icon="share" title="我的邀请码" :isLink="true" arrow-direction="right" />
+					
 					<uv-cell icon="share" title="我的推荐" :isLink="true" arrow-direction="right"
 						@click="$utils.navigateTo('/pages_order/mine/recommend')" />
+					
 					<uv-cell icon="share" title="联系客服" :isLink="true" arrow-direction="right" />
+					
 					<uv-cell icon="share" title="我的地址" :isLink="true" arrow-direction="right" 
 					@click="$utils.navigateTo('/pages_order/mine/address')"/>
+					
+					<uv-cell icon="share" title="退出登录" :isLink="true" arrow-direction="right"
+					@click="$store.commit('logout')"/>
 				</uv-cell-group>
 			</view>
 
diff --git a/pages/index/index.vue b/pages/index/index.vue
index bb76d25..2d97ba6 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -50,6 +50,7 @@
 				<view class="centre">
 					<view class="boxs"
 					:key="index"
+					@click.stop="$utils.navigateTo('/pages_order/product/productDetail?id=' + item.id)"
 					v-for="(item, index) in riceProductList">
 						<view class="box-text">
 							<view>{{ item.title }}</view>
@@ -77,6 +78,7 @@
 				<view class="centre">
 					<view class="boxs"
 					:key="index"
+					@click.stop="$utils.navigateTo('/pages_order/product/productDetail?id=' + item.id)"
 					v-for="(item, index) in commonProductList">
 						<view class="box-text">
 							<view>{{ item.title }}</view>
@@ -99,7 +101,9 @@
 						<view>News trends</view>
 						<view>新闻动态 ___ _</view>
 					</view>
-					<view class="top1" @click="$utils.navigateTo('/pages_order/home/journalism')">
+					<view class="top1" 
+					@click="$utils.navigateTo('/pages_order/home/journalism')"
+					>
 						更多
 					</view>
 				</view>
diff --git a/pages_order/components/address/addressList.vue b/pages_order/components/address/addressList.vue
index a0d95a6..ebd7c03 100644
--- a/pages_order/components/address/addressList.vue
+++ b/pages_order/components/address/addressList.vue
@@ -11,7 +11,7 @@
 				<view class="address-item-top"
 				@click="select(item)">
 					<view class="img-box">
-						<image src="../../static/address/icon.png" mode="aspectFill"></image>
+						<image src="../../static/address/icon1.png" mode="aspectFill"></image>
 					</view>
 		
 					<view class="address-info">
diff --git a/pages_order/components/product/submit.vue b/pages_order/components/product/submit.vue
index b84da63..fac988c 100644
--- a/pages_order/components/product/submit.vue
+++ b/pages_order/components/product/submit.vue
@@ -24,11 +24,13 @@
 		</view> -->
 		
 		<view class="submit-btn"
-		@click="$emit('submit')">
-			<view class="l">
+		>
+			<view class="l"
+			@click="$emit('addCart')">
 				加入购物车
 			</view>
-			<view class="r">
+			<view class="r"
+			@click="$emit('submit')">
 				{{ submiitTitle }}
 			</view>
 		</view>
@@ -40,7 +42,7 @@
 		name:"submit",
 		props : {
 			submiitTitle : {
-				default : '立即租赁',
+				default : '立即购买',
 				type : String,
 			}
 		},
diff --git a/pages_order/home/Worknotice.vue b/pages_order/home/Worknotice.vue
deleted file mode 100644
index a6bb25e..0000000
--- a/pages_order/home/Worknotice.vue
+++ /dev/null
@@ -1,44 +0,0 @@
-<template>
-	<!-- 公告 -->
-	<view class="page">
-		<navbar title="公告" leftClick @leftClick="$utils.navigateBack" />
-		
-		<view style="padding: 20rpx;">
-			<uv-parse :content="NewsById.content"></uv-parse>
-		</view>
-
-	</view>
-</template>
-
-<script>
-	export default {
-		
-		data() {
-			return {
-				NewsById : {},
-				id : 0,
-			}
-		},
-		onLoad(args) {
-			this.id = args.id
-			this.queryNewsById()
-		},
-		methods: {
-			//公告信息-根据id查询公告信息
-			queryNewsById(){
-				this.$api('queryNewsById', {
-					newsId : this.id
-				}, res =>{
-					if(res.code == 200){
-						this.NewsById = res.result
-					}
-				})
-			},
-		}
-	}
-</script>
-
-<style scoped lang="scss">
-	.page {
-	}
-</style>
\ No newline at end of file
diff --git a/pages_order/home/journalism.vue b/pages_order/home/journalism.vue
index d671e0b..ad43b1d 100644
--- a/pages_order/home/journalism.vue
+++ b/pages_order/home/journalism.vue
@@ -1,10 +1,8 @@
 <template>
 	<view class="page">
-		<navbar title="新闻中心" leftClick  @leftClick="$utils.navigateBack" />
-		<view class="card"
-		@click="$utils.navigateTo('/pages_order/home/newsDetail?id=' + item.id)"
-		v-for="(item, index) in list"
-		:key="item.id">
+		<navbar title="新闻中心" leftClick @leftClick="$utils.navigateBack" />
+		<view class="card" @click="$utils.navigateTo('/pages_order/home/newsDetail?id=' + item.id)"
+			v-for="(item, index) in list" :key="item.id">
 			<view class="card-img">
 				<image :src="item.image" mode="aspectFill"></image>
 			</view>
@@ -21,10 +19,10 @@
 <script>
 	import mixinsList from '@/mixins/list.js'
 	export default {
-		mixins : [mixinsList],
+		mixins: [mixinsList],
 		data() {
 			return {
-				mixinsListApi : 'getRiceNewsList',
+				mixinsListApi: 'getRiceNewsList',
 
 			}
 		},
diff --git a/pages_order/mine/balance.vue b/pages_order/mine/balance.vue
new file mode 100644
index 0000000..6c44028
--- /dev/null
+++ b/pages_order/mine/balance.vue
@@ -0,0 +1,132 @@
+<template>
+	<view class="page">
+		<navbar title="余额" 
+		bgColor="#A3D250"
+		color="#fff"
+		leftClick 
+		@leftClick="$utils.navigateBack" />
+		
+		<view class="bg"/>
+		
+		<view class="price">
+			<view class="title">
+				我的余额（元）
+			</view>
+			<view class="num">
+				16666
+			</view>
+		</view>
+		
+		<view class="cell">
+			<view class="cell-top">收支明细</view>
+			<view class="cell-box" 
+			:key="index"
+			v-for="(item,index) in list">
+				<uv-cell-group>
+					<uv-cell 
+					:title="item.title" 
+					:label="item.createTime" 
+					:center="true">
+						<template #value>
+							<view class="cell-text">
+								<view class="price-text">-19.9</view>
+								<view class="tips">已到账</view>
+							</view>
+						</template>
+					</uv-cell>
+				</uv-cell-group>
+			</view>
+		</view>
+		
+	</view>
+</template>
+
+<script>
+	import mixinsList from '@/mixins/list.js'
+	export default {
+		mixins : [mixinsList],
+		data() {
+			return {
+				// mixinsListApi : 'getWaterPageList',
+				list : [
+					{
+						title : '直播收入',
+						type : 0,
+						createTime : '2021-12-12',
+					}
+				],
+				type : ['-', '+'],
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+.page{
+	.bg{
+		background-color: $uni-color;
+		height: 300rpx;
+		position: absolute;
+		left: 0;
+		width: 100%;
+		z-index: -1;
+		border-bottom-left-radius: 30rpx;
+		border-bottom-right-radius: 30rpx;
+	}
+	
+	.price{
+		color: #FFFFFF;
+		padding: 40rpx;
+		.title{
+			color: #eee;
+			font-size: 28rpx;
+		}
+		.num{
+			font-size: 50rpx;
+			font-weight: 900;
+			margin-top: 10rpx;
+		}
+	}
+	
+	.cell {
+		margin: 20rpx;
+		background-color: #FFFFFF;
+		border-radius: 16rpx;
+	
+	
+		.cell-top {
+			padding: 40rpx 34rpx;
+			color: #474747;
+			font-size: 34rpx;
+			font-weight: 600;
+			position: relative;
+			&::after{
+				content: '';
+				display: block;
+				position: absolute;
+				left: 55rpx;
+				bottom: 38rpx;
+				height: 10rpx;
+				width: 120rpx;
+				background: linear-gradient(to right, #fff, $uni-color);
+			}
+		}
+		.cell-text{
+			text-align: right;
+			.price-text{
+				color: #f40;
+				font-size: 32rpx;
+				font-weight: 900;
+			}
+			.tips{
+				font-size: 22rpx;
+				color: #aaa;
+				margin-top: 10rpx;
+			}
+		}
+	}
+}
+</style>
diff --git a/pages_order/mine/commission.vue b/pages_order/mine/commission.vue
new file mode 100644
index 0000000..c3c427a
--- /dev/null
+++ b/pages_order/mine/commission.vue
@@ -0,0 +1,134 @@
+<template>
+	<view class="page">
+		<navbar title="佣金" 
+		bgColor="#A3D250"
+		color="#fff"
+		leftClick 
+		@leftClick="$utils.navigateBack" />
+		
+		<view class="bg"/>
+		
+		<view class="price">
+			<view class="title">
+				我的佣金（元）
+			</view>
+			<view class="num">
+				16666
+			</view>
+		</view>
+		
+		<view class="cell">
+			<view class="cell-top">收支明细</view>
+			<view class="cell-box" 
+			:key="index"
+			v-for="(item,index) in list">
+				<uv-cell-group>
+					<uv-cell 
+					:title="item.title" 
+					:label="item.createTime" 
+					:center="true">
+						<template #value>
+							<view class="cell-text">
+								<view class="price-text">-19.9</view>
+								<view class="tips">已到账</view>
+							</view>
+						</template>
+					</uv-cell>
+				</uv-cell-group>
+			</view>
+		</view>
+		
+	</view>
+</template>
+
+<script>
+	import mixinsList from '@/mixins/list.js'
+	export default {
+		mixins : [mixinsList],
+		data() {
+			return {
+				// mixinsListApi : 'getWaterPageList',
+				list : [
+					{
+						title : '直播收入',
+						type : 0,
+						createTime : '2021-12-12',
+					}
+				],
+				type : ['-', '+'],
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+.page{
+	.bg{
+		background-color: $uni-color;
+		height: 160rpx;
+		position: absolute;
+		left: 0;
+		width: 100%;
+		z-index: -1;
+		border-bottom-left-radius: 30rpx;
+		border-bottom-right-radius: 30rpx;
+	}
+	
+	.price{
+		background-color: #fff;
+		padding: 40rpx;
+		margin: 20rpx;
+		border-radius: 20rpx;
+		.title{
+			color: #777;
+			font-size: 28rpx;
+		}
+		.num{
+			font-size: 50rpx;
+			font-weight: 900;
+			margin-top: 10rpx;
+		}
+	}
+	
+	.cell {
+		margin: 20rpx;
+		background-color: #FFFFFF;
+		border-radius: 16rpx;
+	
+	
+		.cell-top {
+			padding: 40rpx 34rpx;
+			color: #474747;
+			font-size: 34rpx;
+			font-weight: 600;
+			position: relative;
+			&::after{
+				content: '';
+				display: block;
+				position: absolute;
+				left: 55rpx;
+				bottom: 38rpx;
+				height: 10rpx;
+				width: 120rpx;
+				background: linear-gradient(to right, #fff, $uni-color);
+			}
+		}
+		.cell-text{
+			text-align: right;
+			.price-text{
+				color: #f40;
+				font-size: 32rpx;
+				font-weight: 900;
+			}
+			.tips{
+				font-size: 22rpx;
+				color: #aaa;
+				margin-top: 10rpx;
+			}
+		}
+	}
+}
+</style>
diff --git a/pages_order/mine/recharge.vue b/pages_order/mine/recharge.vue
new file mode 100644
index 0000000..0abed93
--- /dev/null
+++ b/pages_order/mine/recharge.vue
@@ -0,0 +1,168 @@
+<template>
+	<view class="page">
+		<navbar title="提现" 
+		bgColor="#A3D250"
+		color="#fff"
+		leftClick 
+		@leftClick="$utils.navigateBack" />
+		
+		<view class="bg"/>
+		
+		<view class="price">
+			<view class="title">
+				请输入提现金额（元）
+			</view>
+			<view class="input-box">
+				<view class="input">
+					<input type="text" />
+				</view>
+				<view class="">
+					全部提现
+				</view>
+			</view>
+			<view class="num">
+				可提现金额：16666
+			</view>
+		</view>
+		
+		<view class="cell">
+			<view class="cell-top">提现说明</view>
+			<view style="padding: 0 20rpx;">
+				<uv-parse :content="configList.withdrawal_instructions"></uv-parse>
+			</view>
+		</view>
+		
+		<view class="cell">
+			<view class="cell-top">提现记录</view>
+			<view class="cell-box" 
+			:key="index"
+			v-for="(item,index) in list">
+				<uv-cell-group>
+					<uv-cell 
+					:title="item.title" 
+					:label="item.createTime" 
+					:center="true">
+						<template #value>
+							<view class="cell-text">
+								<view class="price-text">-19.9</view>
+								<view class="tips">已到账</view>
+							</view>
+						</template>
+					</uv-cell>
+				</uv-cell-group>
+			</view>
+		</view>
+		
+	</view>
+</template>
+
+<script>
+	import mixinsList from '@/mixins/list.js'
+	export default {
+		mixins : [mixinsList],
+		data() {
+			return {
+				// mixinsListApi : 'getWaterPageList',
+				list : [
+					{
+						title : '直播收入',
+						type : 0,
+						createTime : '2021-12-12',
+					}
+				],
+				type : ['-', '+'],
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+.page{
+	.bg{
+		background-color: $uni-color;
+		height: 380rpx;
+		position: absolute;
+		left: 0;
+		width: 100%;
+		z-index: -1;
+		border-bottom-left-radius: 30rpx;
+		border-bottom-right-radius: 30rpx;
+	}
+	
+	.price{
+		color: #FFFFFF;
+		padding: 40rpx;
+		.title{
+			color: #eee;
+			font-size: 28rpx;
+		}
+		.input-box{
+			background-color: #FFFFFF;
+			color: $uni-color;
+			display: flex;
+			justify-content: center;
+			border-radius: 30rpx;
+			align-items: center;
+			padding: 10rpx;
+			margin: 20rpx 0;
+			.input{
+				color: #000;
+				font-size: 40rpx;
+				font-weight: 900;
+				display: flex;
+				flex: 1;
+				input{
+					flex: 1;
+					padding: 14rpx 20rpx;
+				}
+			}
+		}
+		.num{
+			font-size: 30rpx;
+			font-weight: 900;
+			margin-top: 10rpx;
+		}
+	}
+	
+	.cell {
+		margin: 20rpx;
+		background-color: #FFFFFF;
+		border-radius: 16rpx;
+	
+	
+		.cell-top {
+			padding: 40rpx 34rpx;
+			color: #474747;
+			font-size: 34rpx;
+			font-weight: 600;
+			position: relative;
+			&::after{
+				content: '';
+				display: block;
+				position: absolute;
+				left: 55rpx;
+				bottom: 38rpx;
+				height: 10rpx;
+				width: 120rpx;
+				background: linear-gradient(to right, #fff, $uni-color);
+			}
+		}
+		.cell-text{
+			text-align: right;
+			.price-text{
+				color: #f40;
+				font-size: 32rpx;
+				font-weight: 900;
+			}
+			.tips{
+				font-size: 22rpx;
+				color: #aaa;
+				margin-top: 10rpx;
+			}
+		}
+	}
+}
+</style>
diff --git a/pages_order/mine/recommend.vue b/pages_order/mine/recommend.vue
index 09f49a6..0a18224 100644
--- a/pages_order/mine/recommend.vue
+++ b/pages_order/mine/recommend.vue
@@ -9,9 +9,14 @@
 		</view>
 		<view class="cell">
 			<view class="cell-top">推广明细</view>
-			<view class="cell-box" v-for="(item,index) in 10">
+			<view class="cell-box" 
+			:key="index"
+			v-for="(item,index) in list">
 				<uv-cell-group>
-					<uv-cell title="直推：张三" label="2024-11-12 12:56:48" :center="true">
+					<uv-cell 
+					:title="item.nickName" 
+					:label="item.createTime" 
+					:center="true">
 						<template #value>
 							<text style="font-weight: 600; font-size: 28rpx;">黄金会员</text>
 						</template>
@@ -23,10 +28,12 @@
 </template>
 
 <script>
+	import mixinsList from '@/mixins/list.js'
 	export default {
+		mixins : [mixinsList],
 		data() {
 			return {
-
+				mixinsListApi : 'getFansPageList',
 			}
 		},
 		onLoad(e) {},
diff --git a/pages_order/mine/withdraw.vue b/pages_order/mine/withdraw.vue
new file mode 100644
index 0000000..0abed93
--- /dev/null
+++ b/pages_order/mine/withdraw.vue
@@ -0,0 +1,168 @@
+<template>
+	<view class="page">
+		<navbar title="提现" 
+		bgColor="#A3D250"
+		color="#fff"
+		leftClick 
+		@leftClick="$utils.navigateBack" />
+		
+		<view class="bg"/>
+		
+		<view class="price">
+			<view class="title">
+				请输入提现金额（元）
+			</view>
+			<view class="input-box">
+				<view class="input">
+					<input type="text" />
+				</view>
+				<view class="">
+					全部提现
+				</view>
+			</view>
+			<view class="num">
+				可提现金额：16666
+			</view>
+		</view>
+		
+		<view class="cell">
+			<view class="cell-top">提现说明</view>
+			<view style="padding: 0 20rpx;">
+				<uv-parse :content="configList.withdrawal_instructions"></uv-parse>
+			</view>
+		</view>
+		
+		<view class="cell">
+			<view class="cell-top">提现记录</view>
+			<view class="cell-box" 
+			:key="index"
+			v-for="(item,index) in list">
+				<uv-cell-group>
+					<uv-cell 
+					:title="item.title" 
+					:label="item.createTime" 
+					:center="true">
+						<template #value>
+							<view class="cell-text">
+								<view class="price-text">-19.9</view>
+								<view class="tips">已到账</view>
+							</view>
+						</template>
+					</uv-cell>
+				</uv-cell-group>
+			</view>
+		</view>
+		
+	</view>
+</template>
+
+<script>
+	import mixinsList from '@/mixins/list.js'
+	export default {
+		mixins : [mixinsList],
+		data() {
+			return {
+				// mixinsListApi : 'getWaterPageList',
+				list : [
+					{
+						title : '直播收入',
+						type : 0,
+						createTime : '2021-12-12',
+					}
+				],
+				type : ['-', '+'],
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+.page{
+	.bg{
+		background-color: $uni-color;
+		height: 380rpx;
+		position: absolute;
+		left: 0;
+		width: 100%;
+		z-index: -1;
+		border-bottom-left-radius: 30rpx;
+		border-bottom-right-radius: 30rpx;
+	}
+	
+	.price{
+		color: #FFFFFF;
+		padding: 40rpx;
+		.title{
+			color: #eee;
+			font-size: 28rpx;
+		}
+		.input-box{
+			background-color: #FFFFFF;
+			color: $uni-color;
+			display: flex;
+			justify-content: center;
+			border-radius: 30rpx;
+			align-items: center;
+			padding: 10rpx;
+			margin: 20rpx 0;
+			.input{
+				color: #000;
+				font-size: 40rpx;
+				font-weight: 900;
+				display: flex;
+				flex: 1;
+				input{
+					flex: 1;
+					padding: 14rpx 20rpx;
+				}
+			}
+		}
+		.num{
+			font-size: 30rpx;
+			font-weight: 900;
+			margin-top: 10rpx;
+		}
+	}
+	
+	.cell {
+		margin: 20rpx;
+		background-color: #FFFFFF;
+		border-radius: 16rpx;
+	
+	
+		.cell-top {
+			padding: 40rpx 34rpx;
+			color: #474747;
+			font-size: 34rpx;
+			font-weight: 600;
+			position: relative;
+			&::after{
+				content: '';
+				display: block;
+				position: absolute;
+				left: 55rpx;
+				bottom: 38rpx;
+				height: 10rpx;
+				width: 120rpx;
+				background: linear-gradient(to right, #fff, $uni-color);
+			}
+		}
+		.cell-text{
+			text-align: right;
+			.price-text{
+				color: #f40;
+				font-size: 32rpx;
+				font-weight: 900;
+			}
+			.tips{
+				font-size: 22rpx;
+				color: #aaa;
+				margin-top: 10rpx;
+			}
+		}
+	}
+}
+</style>
diff --git a/pages_order/order/createOrder.vue b/pages_order/order/createOrder.vue
new file mode 100644
index 0000000..83469e7
--- /dev/null
+++ b/pages_order/order/createOrder.vue
@@ -0,0 +1,288 @@
+<template>
+	<view class="page">
+		<navbar title="下单支付" leftClick @leftClick="$utils.navigateBack" />
+
+		<view class="box">
+			<!-- 地址 -->
+			<view class="address" @click="openAddress">
+				<image src="../static/address/icon1.png" mode=""></image>
+				<view class="">
+					{{ address.name }}
+				</view>
+				<view class="">
+					{{ address.addressDetail }}
+				</view>
+				<view class="icon">
+					<uv-icon size="30rpx" name="arrow-right"></uv-icon>
+				</view>
+			</view>
+
+			<view class="productList">
+				<view class="item"
+				:key="index"
+				v-for="(item, index) in productList">
+					<view class="item-image">
+						<image :src="item.image || 'https://img95.699pic.com/photo/50058/1378.jpg_wh860.jpg'"
+							mode="aspectFill"></image>
+					</view>
+
+					<view class="info">
+						<view class="title">
+							{{ item.title }}
+						</view>
+						<view class="desc">
+							{{ item.sku }}
+						</view>
+						<view class="price">
+							<view class="">
+								<uv-number-box 
+								v-model="num"
+								></uv-number-box>
+							</view>
+							<view class="">
+								￥{{ item.price }}
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			
+			<view class="submit-box">
+				<view class="peis">
+					<view class="">
+						配送方式
+					</view>
+					<view class="">
+						商家自行配送
+					</view>
+				</view>
+				<view class="priceInfo">
+					<view class="">
+						付款金额
+					</view>
+					<view class="totalPrice">
+						￥{{ totalPrice }}
+					</view>
+				</view>
+				<view class="remark">
+					<input type="text" 
+					placeholder="请输入备注"
+					v-model="remark"/>
+				</view>
+			</view>
+			
+			
+			<view class="uni-color-btn">
+				确认下单
+			</view>
+		</view>
+
+
+
+
+		<!-- 地址选择 -->
+		<uv-popup ref="addressPopup" :round="30">
+			<addressList ref="addressList" height="60vh" @select="selectAddress" />
+		</uv-popup>
+
+	</view>
+</template>
+
+<script>
+	import addressList from '../components/address/addressList.vue'
+	export default {
+		components: {
+			addressList,
+		},
+		data() {
+			return {
+				pids: [],
+				productList: [],
+				address: {
+					name: '请选择地址',
+					addressDetail: '',
+				},
+				addressTotal: 0,
+				remark : '',
+				num : 1,
+			}
+		},
+		computed : {
+			totalPrice(){
+				let price = 0
+				
+				this.productList.forEach(n => {
+					price += n.price * this.num
+				})
+				
+				return Number(price).toFixed(2)
+			},
+		},
+		onLoad({
+			pid
+		}) {
+			this.pids = pid ? pid.split(',') : [],
+			this.getRiceProductDetail()
+		},
+		onShow() {
+			this.getAddressList()
+		},
+		methods: {
+			// 获取商品
+			getRiceProductDetail() {
+				this.pids.forEach(id => {
+					this.$api('getRiceProductDetail', {
+						id
+					}, res => {
+						if (res.code == 200) {
+							this.productList.push(res.result)
+						}
+					})
+				})
+			},
+			// 打开
+			getAddressList() {
+				// 获取地址列表
+				this.$refs.addressList.getAddressList().then(res => {
+					this.addressTotal = res.total
+					if (this.addressTotal != 0) {
+						this.address = res.records[0]
+					}
+				})
+			},
+			// 打开选择地址
+			openAddress() {
+				if (this.addressTotal == 0) {
+					return uni.navigateTo({
+						url: '/pages_order/mine/address?type=back'
+					})
+				}
+				this.$refs.addressPopup.open('bottom')
+			},
+			// 选择地址
+			selectAddress(e) {
+				this.address = e
+				this.$refs.addressPopup.close()
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.page {
+		.box {
+			padding: 20rpx;
+
+			.address {
+				display: flex;
+				padding: 20rpx;
+				background-color: #fff;
+				align-items: center;
+				border-radius: 20rpx;
+
+				image {
+					width: 40rpx;
+					height: 40rpx;
+					margin: 20rpx;
+				}
+
+				view {
+					margin: 20rpx;
+					overflow: hidden; //超出的文本隐藏
+					text-overflow: ellipsis; //溢出用省略号显示
+					white-space: nowrap; //溢出不换行
+				}
+
+				.icon {
+					margin-left: auto;
+				}
+			}
+
+			.productList {
+				margin-top: 20rpx;
+				background-color: #fff;
+				border-radius: 20rpx;
+				.item {
+					padding: 10rpx 20rpx;
+					align-items: center;
+					margin-bottom: 20rpx;
+					display: flex;
+					width: 100%;
+					box-sizing: border-box;
+					.item-image {
+						width: 140rpx;
+						height: 140rpx;
+						flex-shrink: 0;
+
+						image {
+							height: 100%;
+							width: 100%;
+							border-radius: 20rpx;
+						}
+					}
+
+					.info {
+						padding: 20rpx;
+						color: #555;
+						flex: 1;
+
+						.title {
+							font-size: 28rpx;
+							font-weight: 900;
+						}
+
+						.desc {
+							font-size: 22rpx;
+							color: #777;
+							margin-top: 10rpx;
+						}
+
+						.price {
+							display: flex;
+							justify-content: space-between;
+							color: #f40;
+							font-size: 30rpx;
+							font-weight: 900;
+						}
+					}
+				}
+			}
+			
+			.submit-box{
+				background-color: #fff;
+				padding: 20rpx;
+				border-radius: 20rpx;
+				&>view:nth-child(2){
+					margin-top: 20rpx;
+				}
+				&>view{
+					display: flex;
+					justify-content: space-between;
+					align-items: center;
+					font-size: 28rpx;
+					&>view:nth-child(1){
+						font-weight: 900;
+					}
+					&>view:nth-child(2){
+						color: #999;
+						font-size: 24rpx;
+					}
+					.totalPrice{
+						color: #f40 !important;
+						font-size: 34rpx !important;
+						font-weight: 900;
+					}
+				}
+				.remark{
+					margin-top: 30rpx;
+					input{
+						background-color: #f3f3f3;
+						padding: 14rpx 20rpx;
+						border-radius: 20rpx;
+						flex: 1;
+					}
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages_order/product/productDetail.vue b/pages_order/product/productDetail.vue
index bc6f53a..5cfe1d1 100644
--- a/pages_order/product/productDetail.vue
+++ b/pages_order/product/productDetail.vue
@@ -15,31 +15,37 @@
 		<view class="info">
 			<view class="">
 				<view class="title">
-					三只青蛙低GI大米
+					{{ productDetail.title }}
 				</view>
 				<view class="desc">
-					三只青蛙低GI大米500g每罐
+					{{ productDetail.sku }}
 				</view>
 			</view>
 			<view class="">
 				<view class="price">
-					￥<text>9.9</text>起
+					会员价￥<text>{{ productDetail.price }}</text>
 				</view>
 				<view class="oldPrice">
-					￥<text>45.9</text>起
+					零售价￥<text>{{ productDetail.oldPrice }}</text>
 				</view>
 			</view>
 		</view>
 		
-		<uv-parse :content="productDetail.content"></uv-parse>
+		<uv-parse :content="productDetail.details"></uv-parse>
 		
-		<!-- 分享和租赁按钮 -->
+		<!-- 分享和购买按钮 -->
 		<submit 
+		@submit="$utils.navigateTo('/pages_order/order/createOrder?pid=' + id)"
+		/>
+		
+		<!-- <submit
 		@submit="$refs.submitUnitSelect.open()"
-		@share="share"/>
+		@share="share"/> -->
 		
 		<!-- 选择规格 -->
-		<submitUnitSelect ref="submitUnitSelect"/>
+		<!-- <submitUnitSelect 
+		:detail="productDetail"
+		ref="submitUnitSelect"/> -->
 	</view>
 </template>
 
@@ -55,12 +61,16 @@
 			return {
 				productDetail : {
 					image : 'https://cdn.uviewui.com/uview/swiper/swiper3.png,https://cdn.uviewui.com/uview/swiper/swiper2.png',
-					content : '',
-				}
+					details : '',
+				},
+				id : 0,
 			}
 		},
 		onLoad(args) {
-			console.log(args);
+			this.id = args.id
+		},
+		onShow() {
+			this.getRiceProductDetail()
 		},
 		methods: {
 			// 分享商品
@@ -70,7 +80,17 @@
 			// 选择完成规格立即租赁下单
 			submit(){
 				
-			}
+			},
+			// 获取商品
+			getRiceProductDetail(){
+				this.$api('getRiceProductDetail', {
+					id : this.id
+				}, res => {
+					if(res.code == 200){
+						this.productDetail = res.result
+					}
+				})
+			},
 		}
 	}
 </script>
@@ -100,10 +120,12 @@
 			color: #999;
 			text-align: right;
 			text-decoration: line-through;
+			margin-top: 14rpx;
 		}
 		.desc{
 			font-size: 26rpx;
 			color: #777;
+			margin-top: 20rpx;
 		}
 	}
 	.info-unit{
diff --git a/pages_order/static/address/icon1.png b/pages_order/static/address/icon1.png
new file mode 100644
index 0000000000000000000000000000000000000000..4d52c10750b61ae9404c17c3f2fb3774d14d8e52
GIT binary patch
literal 7285
zcmV-*9E#(KP)<h;3K|Lk000e1NJLTq003nG003_Y1^@s6_2&+$00001b5ch_0Itp)
z=>Py6FG)l}RCr$PJqdVJ)z#<RH<<}rf;O?zT9;~FKtPKYC~5~Xd2a$lpf+w8aH&;)
zOI_<yx76KQwX|AW>I$e8T4fP3?@fYf6{$-sglbXI>aVpf;RgapGBfX<e@=MAA29Ro
zdoz=S{`P#|e3Q((%enWwd+*sV!k!N}Zrr$m#l^*=g%AfL;sF3~kn=eZ5x>0K5IO+h
zJplNJ^Ldwu-nDIeZDV8O-<`6wCl4F<K;%SCO$~0{y7kypDy1W$4glXm#G(S=`XLcD
zAYy|MA~t&T=nZvsbxfc=ib#6|QR?dI#L}fpwY~S=d!!KJdqi|PB7Us^L~v^&MMM@6
zJ+XcJ_GLqc3~5`qaG~522-K%Usi~>aHgDcs3;^E)fLVw*s)q^DZSzF5RS5BLDwVo_
z<Hn8ao12?ceMy`?A&Rpyip$E%cvW1FhzIutF}mrKSI>iqMB;V;_@Jq&iHXze(Az}8
za5x+)E-sz`0Jjs-@LnIWw+`Eg=(^I<(ual(8}?aUT^(<0y#~ET6yB;fY}l}GQBl!t
z08ra&Bh0U(7m4U1P19D_*Vi*w*DKH~M5(H(3K7v*B6=7A4lK~f`0dTS!Ckp09ut3r
z^PO*ZNnX_*9UXT!H8pMSjkBi5i4qQn2L^+|^AV9(NFc`<;>qXzohOJt2>|#f0DOdq
z?NZ7PL`)J<KSX54VF1fBL^RmxGw6Kh+CLD{bID}#+_JK=^$Qm+v~wJXr)oV(6r40^
z(%@7obyr%LJIfO`yB1<X@Z@hNq7Q`-tEH4L1OkB<i0JQLwiClJh7i$FMD!gY1ao%7
z0ALURga9BHx#xW%s!1dg%{|Ek^b}FhFpPZx;CBEp$tOX0MSKPT?<3-hR4Vm&Lqo$~
ze74bT@o+diI1~z<iip)x%3~0*#37L9c_5-qh*;Cw+WM#F=4M{C1qaW_`02T_vhpj4
z_<KY=-bX#&650^4MN0W_B9VBkC*MZHFb)BL%K%^^5tSoiKOeY$X50438#ivWdV(+o
zCyK7?`vAZ^M?K<YoP0=cC8F2UXTlxvc>HNEl?qjcw>SW}4gjVBz?ZykYb<aAz?9O`
z(mxgYj43EljyvwSy#@>z@EZU)+2f?~R`mf9{r12E54>y6oH;$R9eBZ|va<3RAp{GJ
zqXA%`mpW-J#0Dv4G#-yP7m_P07*TXx9{>QiBI1uc4(Kx?dIbP3v@Gjy9_#dIF-Prl
z6CyHW!YiKHY89-rZQE#QX!vhcL9fpXLX>bg90&%3=OW^-y>!fnB>+5GT3UL^!i5XB
zd#Tf#WemfJ0>C{0z~_z^HhNJg6q>PQ$&xLFz_TDkF%08d0PrjT^!I?&CjfA_X_|L<
zDBEX648s_Ph!039M|m+D5YdkliNr4o!JOnx6lOEi2B>->8l##)BKnw!E{VtEPpHc7
z3D2vmtILwf<dZ~nf@;MO(RM@(o2L0vzPRT_6xQ~xTD9tO0PynGe~O4##A2~W@<qBg
z>rb0DZJ%x1wmpT2V?CTPt8Ck@YG`O+bxh8X7g4IJst&eo`xQiFb%q;kv2FYMhK7b;
z<cw(_R@8O<AVhoy0EVj2K*Wn;vDmNj;l^?%3LoyFQ0V?NOZ$B{M2U#m+=ng8I!`sA
zJ^8t=>y<)?$BC#+f#-)(%46g4_=mZUCugD<hB1<eURE7~h`6$-s7PPBbSbM&@&+Qn
zInCAm_9`tN@L7AZL`dw1fUI!r1Pzm)A&PD7Dcmw3SoGP+!xpmstRP?*#!u2K;D$8o
zzq7wA4c}^-=C!%5mYj&<oF#lVsO%yeSkDxT#a87zE6+X~4!k>{e_3!qaDQ9EVJK+?
zAbbk|4|imW&Mt^(oj|dcNWO$Ztdjt5i{kcwPCul63u1l_63*@r2Y|3*JfE-u&$2A$
zG<`!(L<xt(2c{K!>l|fXwoX~gd#7odSNX=OO9g%b4n67BavQV}L{tp`XW|Y`uO}d&
zbsEC`DVv@{EPZpv$a&j5Rm@VTqN3v1Kp?OT0Lm5ZTx^==>|FZFi72|R*C8S=V>fsg
z07jXn`9HZJ#&s6FRui<P9FZb<IspC9t6r+x{s`U!#GlGUvT??!XWq|e)kLGw+tMuX
zl?o%;>W+?%u}w`)?S9Aan<&-Q)%_ER#2QE1?Y2Kelv2toEzA13UxYH{A6$3hpkN1#
z2Z471AxqYUg87M5>gR*j_xsz)C+B9YibNv&3n5<W#u0EA91-!`xoq9Oi4uuK!kVVB
z^zH`l1He(au95|>)eKBf>NK)xHX!&>se2{d3o?b5|KsS9FV<mhP7%>)^v<-Vm}RuA
zKt%UgmUXFDq%!4v6Ghkc*(#-D+9Z2>EEc=kFEU*Imv2>t%C-kjw*h~f*LJ1ud@Ts9
ztv&K-UiH4AqM~AGAP{(2p;~&QwY7D)Uz>|BqOcaVt*wnUy3Fxp1KvZ&n5OA}umm{o
z^=Ss#w7}0{?t4c6uR@~?70sM^*h04V`vzUtn-K9kiq&$2Wm(J=c?MrZIpKs8zSgf_
zKX#tZS})BZHCvW-jAsnG6#U(q>VrZkmg5dKR|$Mr6FJTlM36qnnduDyf~KszbFaWV
zLn3f(F7k}7>pwv3T+wbY%QVe<J>%oo1xMF)wr{&C6VtO)XIa)y{UE_*7c8jJ+7C_4
zMu8W4s4D@1xw_YY;A22+BPmJja01^85Dp-M!_qoAFXz#ADO38)qn>%*L%+Kesi>&<
zdLR(sRp91?@wjQ4)BUvVYo!>5!Ja8@2Ny{xkB`UWEBzqBWgl5xJxoLGWe*2?0tr_V
z((}|G@11eT)1MR2=B=IbZ6Z7u0FFn1ud7}@Br>-pzg&IZG5#%|(P;DyB0AJ%yl<GM
zd4wP7-WO4HUANL|lgexeu-!V5NR;Qoo6lc6^*$o_F9k6ZfUr~~#bwjK`4n%Xt}u7?
z)LIm986u2e^-R{n1gVsSW6wHz(P~wjyFah2tb9la;pRe>3<iUP{ivCI5ydbJ76>_L
zCmXCWP4g(f1DpSssuJp7{2Bo5=Tes)Eb0?MdFnZbd$;h-T|LD>4dwvh{%&|lg4r`i
zF1pw+?uKEoM~tgHmiFv9JQj<+;k9kgL>V<|R8e_(IeVRCRmQPfQM&Wfymp=`H+N0-
z1VpXTwI0HI1Xwj=_|utaEYID{TRY`)AY`WqHwNI1w>NA$vTnRTPkUY0C#OR=mMV~`
zG)=R?E5e?M!mdMz__3nlJ95!=&2O1<Jpn4119?;Jh$Yv19az_Lohxxb=oKLNhFkpr
z(*CCnU(AB9XQ-;G8Y-oHO;KUGX_}9FZPYVSDl03$A%u8S(eO2<Y2NC!^GvyUYp4DJ
z2u^aTmnbU2;in$)w5tECP0U|A^;RNq7idvVt{uLFm5rXEs;a77O6jT%mQr3EkH<YL
zCksuKOH9-BZC#w#GUa6e%r4syyjMGNQC{Bq^IN7?5x{cAY@b&<V$mGW6iM^sH8nNC
zwzf9*$Z>N=y2Y`tcxu`+Q5<zWN8GxBZ$XJ0o401_yDVE|YZ!@Eo-uOqah^t$rO^DA
zDZ>e{#k~!>s&>R;Fa8F*G-DVB$F8^;zGj=I>6wY}LzI0(q0qnF2E}eRxoC#xwoF}*
z09ixqh~T9eBNwsfV$Lvk&9oyCX>Fm2;uyY|C~hmo*IDbCC{<NeB~nV2m&T2zX{zij
zpPQGtYp1-7lzsamppV{p>gccL6XrIrW$IJ_aP?CrgzwK7zUV<els61xZ+2f*ysXz+
zmUWBQc0Citc_Y}VnPWS;1@;NHEbDx)ooC9;Upw`WMDSg=dN#r#XAWQVw%@ih<>#)R
zdIt))!gcb1Ce0YJSat5~(nKT@8LnxXVq1g@Ow(i^Yfs>rDBPN17%WA*31Oybn(XrF
z3+AnzdPCZJUZ<F_+h+`4{1eE*&c5KSn(~hA$rS)_WcEHNg`^#H#>l5W@PoXr>r)X?
z6)7;;G)>Q3onNB-ne|C7NWW*ACa37|mBHcB)hCYEG|}j)3IX^~XfSE|Fn_8LqB=3Z
zWzA)P^fSeIvc7i2Vpln)yZXAWUxSD@yS1H4rG_;&Hooqa*uIFO>-qzTc#ccsQV6kc
zeSQ6>UJ>AOJ50Y~ts4jCw6`c_Yge3g^dH~y(moSp-fMrIgc5n{_==*=-L)eYvC703
zq+P9emGF6$4Yq|sp&@>pzx@)0vqJn*f%R0=G#C3C834>}Iq?nz;kxJVXcHfn8vUl<
z(4yv(F}sa@!TUA+lADs8JmE?L<XFe7fB@SyO^!Ql*pk2c!Q1gyV4YT0ogERawk+#t
zKkfP=N<~G*SPler>wt*vPy0Kmw7s8eV(ywrM<NzAInh*#F;ENumq`s*w{K6q3ZsT3
z4{dsrKHaBWq-4ilDbh|LkOylZE+HU}Gf}m-ymrK5zp<GRiA2U|nx^t;d%!eJHY0cj
zUql%_dUVO)!Gl?VWHvAxyxq~!aa2=N6LV_5VE)=^vjJ$9;%v#ZnIeFd0x?b!5-8Zr
z1sVcyswvL(;;I$yg4iY?I<a=-;^%xJ3jn&V{|pg-tf)8BG|jnw+V({hZdliKQx(rB
zrHsVmad)k6H&{N@^4+f&f&HYb%Eiy<)MW{Peo;GOv2TwP&JPd@g<b{7uH@wK2mm<D
zvMgUpPTxc^4C5jIQ0cdxFirDx^_+aZ#N0JgssUjR0&>WAj{+h!P=_|7_L!$!H5J_<
z;YDRnM1Qd?i$f@UK`ul&gos)cA<i39snnRp#>Skqx^r8mT$1*Ir~?9yb1yjT@Ueg<
zK)R-O_+r;HGE3(o9lgdvrlCOYa?>=~gzgJ`6UEuWl&&?rnoQHY#1}SBVRq*J=a=@n
zT!Or)2UZMwz%*(oZ<;=03Cmr+LD%&Y5Ro0d-IS19gb+v9*Vp^jLgYl0Xf%2T5zSMK
z<`XI9q<B2e5x_aY+?FX9BH<~3z#8J5aNVurBmg}mK|DHh#M3ISsau>KHh2jDRJaX_
zh@P=5iyhK^Lrw#&sHpgorfKX;%bp@`utW%PvX?w6*&2Cl^@-!9h7*C{3?SS$N7C?t
z{u~gk(2D84(+^wP>U*Y~3ejkErjw1y&G(Hp8ir+AyqbJNPDJ5e48vg4tjfPjBI3+g
zEH>XaW?d>g{Eu+4wzcF;l-kz-X%Z2PL{FGwI}t5M0j#obsvW+F<)ECQqN3u^Kp?<^
zvC3KSrPkKg<NUg-W)Sl<wC+X`jYbdT#F%a@p;Pa5Ddo(3wy{kAb<c(a2M-=R83c^v
z?TnDhknnIo8bAPpf$(EM*n~jqBw@Qi+D?>OHe=+nypt!49Xqz)ph1IvgNQQ}+ZGYg
zN%^ER$(bn5YVpDzvv28g+qP#lHa5PK^K05o#mC>ME=z6?9F74wfKo6Rh4@IbX>(%m
zrgdi><UcON4L1(0Bch+Cm5-`q2aP2qB@-7e%ss3xFQRaqc_NW`N})OK94iscPb3nv
znwpw8+r+;WL?V&1G)?0S6s3w)!di?;mSyF{)#bf?Wg5_ReF7pba*~_5;mqgD-R<q|
zR~I5HLvK;lFbvj-aR@e>BwT@rerZ`2+v0thE_QD;ua)97hPtlbg@{U-1QEB}wta0p
z9=}^Pz&+u4G#cf+m+TsJtO_4Qe1#KTFJHb~=}xO`OI5(ja}GDtG;JZLKlf0cBWEwQ
zEbB23W&5lM`?(?FeQv(f8RS^UC4@LN7K^d`k~b7$rF0?@jYe7J@M|Jc$u3;{4coRa
zYG`OM^BzGDG~lE)%;YUo%@J=^H@CL7-jpi~+!Nc^&hsf6jh;e8JQ&vlkt?vWj)-Oz
zf>kagUD#*3tgMVp$Fmf^$DQ3G;v>mq^76*UMpus(KRBx10zYlBw;+e#acK3O9^(~b
zY5(L4VzC%|^Y0O$>-yD*$k`&4X|jlDDG^;3kH<Zkr@aoaphV$LM~xcQzr4KsIwJCt
z)PR@%6I-`#J%8oOl?6#)=5^rRl`{;3Gib0@SCzP+bEN~o57YWBPE}Y?C^%6VJ14p4
zohs?q83`wOzPGfr^v8uxkm+ZpB9VxpX&Q4{9G0how-NEYSS;q-kf&<6b4&D6D3>zh
z$B#cO6bju<L=#o@IRcE`bowe=9;f!uH0@W2=*2a56A_(jSr!Y;J#sNYj}e6l5sgNV
z<yGK?RpzXDZ0|NrQ)LoR(b(7X$&)AVpGYJgL_}7_tLB4O^~H%qVopyAz$zqs4X~TS
zoXML9%bC2rgfgrXLR?f|U(brp9tX}4i-?TdDIT)kF+Mj1gTdSV#4qMDh@K`2a2BHH
zpMU;)nx;MAK^4Pe;Oj9sEpEXN(5@5Yq{m_|k-0@x{x0CG;_1r{uF5rClpo^sI8hiG
zhxg~qc<gYYN<6?EStAjh?bi#$&%kwEzuaMcl`>UY&BA`boGNO)pFVOe+bcw2<Z5ba
z2DY`ead;bNms5dFM1M$MLU4{{S$XB>>aHVB(jbKRIT3wTg-CC$+^%@^8d12@i4!O8
zn@Xi_XKSQ~$>2Lt=8PFL=Hh(fQg-jhFpTktcrOuoNz%ze?OCx{>`(b>em#tLXOUhd
z3irw;Rh9=3(M!n0mUM{tt(IkRxOLtTjYc`U9>+8)SzknCVRq)AL4%g`w*1uVMB$m$
zb)B<fbD|k9R|vAB+?DyV${fXO+xBBZhzcT7<*?`Nb5?0->4W)L5OaNt`h+Mf4;Y3K
zPG2QB&*Q%SCK0hpBPZ{Wp+koT_uFqjmPJlgW#Z<EB%+(QZQJ&<zEb`46;V2smzy_l
zo`#5zdQtuXK(mzc`|)_(cm5Q1#Aepl<Ha?PghHXKmMmGKO5~91LQvN0GomnNe5;*p
z+h_B^s}kNgFC`K2fy>z&Jp29{hQV?OyF$4|3S=fK#wz>XVtunwr%#FE5Qd|UIdiEO
zR+(=sU6e>9YQ1DiibkW~<vfla!y^7Fr93;Am8g96eHQ3*qGVWQ+qQX&Q6-<|;+zig
zLDMwZ2$j`AA)N;6+l~rF$@&7oztTyjPqi$IV^s2TdSC?k3_IX}1NQmklTSX*#Tx00
zD3z6!HE9O{&f3E|qjuZ2UoDgq1YcZ6M8Ec86Xy%ni0HO#tn!2j6Algp0*@gg`wXbY
z$TuEMPb3o0<f~+yG-=XasZ{D#Hi-)%1~~V2u|Dq>KXITcgm*4HUDq#Qj};=?&v8iO
z+vYfB;M1mQ^1hunR903VC4}H~?d$=mf{!=_?d}d3P7;PE0f3XmxvF&7l`*ZIz90|?
zJd%&UGb73#lqDr4^ZBJBBEHj$=ayF;-^llTFc>_|YcQ%OqEuB?jgeCFK)VZB<G1!a
z%d&p2nne%KIqqW|5iL|DVs_fv#n|L<bj<p4&M~Euk?#-_LflbbU*F~dH`gMONMwel
zX)Ks_m;8Zm#<<#Rtcn++uuM_!79hiJsg`B=4&>}^l$_b3sHmt~)3nF<+F1{i)xz5k
zU$&;}`pt;Q&TxEbn+jM);+2-uB>}rPuIoB)mu}H(?*{^b@Umsgl&-r<qUgGQiV)&q
z#RRQ4P1AQ`fNZlC4u^|Fq0pHC!1uGLfUSRgbuDXhS@X+xHL9Q?l}epgNZ)3|FxVUa
zM3;_vD`N&l87b^alt?5}s%aW$PIZk#C!!b9()KvjO!#@uXM=6qS0SR8OyGQ9B%g1}
z@a(ilJcmV`Zdn#*v&);)%8W_Zb-s#_y<psc6An!?P17|ky(>{FD=V)PLU2|h)q%-I
zDNol4`XP+tfN_svTkzB5r&7vk@pzo0xC&}tcQ`&TS7ANZ(a|x%jnm6Ylt?6Ugb?Cc
z)q%@Cv_xd&df9+#MmY{fO38=!1XWqZ^A46p3c>nz*AH7VUwGk#>pBBy-GOgDy3jOD
zw#0S|S&3p826Iz<-K^VcVwRF!|Ctf!DPTrpsKb$Q(&b!$lUQGnOeP=oq6x^Q1Fqw&
zY!1?O#gmBmupgU^$>?^%D=RA}3LzGF;9?fEwY8nOYSpS9z17rt3;7<&B_0p*-RJd=
zty{O=(hFK&et~NEwpRsVdF#B#G|g_W`uH4CSV<_Q<k<3WDjMc%0!KGAH2BUFoXeZ&
zT!kBTZjkeQ{Zl%b%>x}B9UK#rbMUDjd>s!NHf5`fc+8k^zGBW=u?u{TD7voy2oc$J
zQx!&bV@XNLjlF4=bF|7Fq{RENDpeF~m2XQV68APWHGSk~V)HHQ+}O=rt4e@fW}4<?
zSE7W&;r&9P5OXGO>CL%~H-!+#`O)X(JJ3vhPC2`2)25+_c&-qlmWXy)HBLShb{uEv
z`lX&?K-|W|tGc+jcs3EKvN>_|a;;@qys~z}E-OXXb&h`hfl7(zXjJ*kDHxyclV~Cw
z4)3jL+CG6mfNv`uWZQPJrfF?b$~O^lLrF==hQ2W6X2wxfRkfd#lJ5~7;x;xS;_d&~
zu3kGki4uuKjtc|=%XfeCx@j;L3<gi?X)i&KM8cYynxaoX{ZtGZG)SaUDZ9SDo>|Vm
zdRcaP;j5~ueki3>C9SiWjgG})J5wHZ62;+en3Z$O56MLn$z*cuiWMt9cQ|>R#4l8_
zapT4f8aQwuCsa@|O|8jfa?FYqD?0PIbP~ldj2UT_Jm-gWyD^6y3VxMHBreU@?(jvT
zj1ywPW@gu2jN^1NHxi+fOpNpDszQ?UzNq+%M2xPC$>z<QS%b{k`m%x(IbF@k>sZ*~
z<j(i092caN=f~r5=4keW{rcaEzRryroHSHrQuuRPS^1retwbg0yx7{>I-$9_xga-X
z|69#y0g!b({BHz+YZT3K{L2U?3i~&?s=S2|;rjY|cJKKQ<TwM4{hq@+T#pIcw$EXr
zur0z(HNT$SbciV7+zCuV2u|t25;K1jfB3Rs{@wYF|Ly!e^M9r+Kj3FvmOr*_cmAEJ
z&tuj!t@D5Wwr!isQ7V<9?tbs`oXc}L83+U<fAjzC?d=o{24y0Vko;X-Tr7)<ifHTB
zt<=ANf7#yNE<>RZZP~I#mY0{yciwr2a`8a%Kr5`Qteh@{aE(+WqFXqH$3{dP?9wPZ
zNMvq`b~{gc^cm+E+#Q(cE_fIE8Na-pZ8|R`|DE};f^p|dxWn@`eW4X%=kE;sH*>d&
z>j$~{yLhF%=p`o6!<+C$D&mXT>H6}hoXgYR{+BUPykxlhB29Roj+F&?JpTCOhxG5?
zpTowK85a5!+b>4vZ<Umk9KjMjA3#?KAqo<h^Tn9Eo*5+(ox#q9ooW{679qBlx!(5E
zGpPKhRc8j~mXws7&GxCCT4MIK3I>BWa9Hwxrm1&l01?@T`qGT+?CzFFoH%jfs8lL-
znd3d8^rPxs^#9-W_OTP8wo6KpY@RBezgJXLu=M#=P1BgaMkys~n#SLP|L4E?n?FK`
z&hu%93@LX0zIz!iyMxuo&NjN%-NDZ9_`Ng5t<!F%9J7;M+s^d4dp&MsxB8uJI={P_
zxdUD6I(TN<5?!Bl`8(V1ony)1(WN}gE`0CTiywUOLF4PMzs~lbUEqHKe@qEup&evy
P00000NkvXXu0mjfITH}-

literal 0
HcmV?d00001

diff --git a/store/store.js b/store/store.js
index bcace15..52d26fc 100644
--- a/store/store.js
+++ b/store/store.js
@@ -74,6 +74,22 @@ const store = new Vuex.Store({
 				}
 			})
 		},
+		// 退出登录
+		logout(state){
+			uni.showModal({
+				title: '确认退出登录吗',
+				success(r) {
+					if(r.confirm){
+						state.userInfo = {}
+						state.role = false
+						uni.removeStorageSync('token')
+						uni.reLaunch({
+							url: '/pages/index/index'
+						})
+					}
+				}
+			})
+		},
 	},
 	actions: {},
 })
diff --git a/uni.scss b/uni.scss
index 59369be..1b92e86 100644
--- a/uni.scss
+++ b/uni.scss
@@ -74,3 +74,23 @@ $uni-color-subtitle: #555555; // 二级标题颜色
 $uni-font-size-subtitle:26px;
 $uni-color-paragraph: #3F536E; // 文章段落颜色
 $uni-font-size-paragraph:15px;
+
+
+.uni-color-btn{
+	border-radius: 40rpx;
+	padding: 20rpx;
+	margin: 40rpx;
+	background: $uni-color;
+	color: #fff;
+	text-align: center;
+	font-size: 28rpx;
+}
+.uni-uncolor-btn{
+	border-radius: 40rpx;
+	padding: 20rpx;
+	margin: 40rpx;
+	border: 1px solid $uni-color;
+	color: $uni-color;
+	text-align: center;
+	font-size: 28rpx;
+}
\ No newline at end of file