12/20

pages.json

@@ -13,17 +13,30 @@
 		{
 			"path": "pages/tabbar/mine/mine",
 			"style": {
-				"navigationBarTitleText": "我的"
+				"navigationBarTitleText": "我的",
+				"navigationStyle": "custom"
 			}
 		}
 	    ,{
             "path" : "pages/login/login/login",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "密码登录"
+                "navigationBarTitleText": "",
+				"navigationBarBackgroundColor": "#fff"
+				// "navigationStyle": "custom"
             }
             
         }
+		,{
+		    "path" : "pages/login/codeLogin/codeLogin",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "",
+				"navigationBarBackgroundColor": "#fff"
+				// "navigationStyle": "custom"
+		    }
+		    
+		}
         ,{
             "path" : "pages/login/forgot/forgot",
             "style" :                                                                                    
@@ -67,7 +80,16 @@
                 "enablePullDownRefresh": false
             }
             
-        }
+        },
+		{
+		    "path" : "pages/good/add",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "添加商品",
+		        "enablePullDownRefresh": false
+		    }
+		    
+		}
     ],
 	"tabBar": {
 		"custom": true,

pages/good/add.vue

@@ -0,0 +1,27 @@
+<template>
+	<view class="content">
+		
+	</view>
+</template>
+
+<script>
+	import $api from '@/static/js/api.js'
+	var that = ''
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		onLoad() {
+			that = this
+		},
+		methods: {
+			
+		},
+	}
+</script>
+
+<style lang="scss" scoped>
+	.content {}
+</style>

pages/login/codeLogin/codeLogin.vue

@@ -1,22 +1,211 @@
 <template>
-	<view>
-		
+	<view class="content">
+		<view class="title">验证码登录</view>
+		<view class="form vflex">
+			<u-input v-model="userInfo.name" placeholder="用户名/手机号"></u-input>
+			<u-input v-model="code" placeholder="请输入验证码">
+				<template slot="suffix">
+					<u-code ref="uCode" @change="codeChange" seconds="60" changeText="X秒重新获取"></u-code>
+					<view class="code" @tap="getCode" >{{tips}}</view>
+				</template>
+			</u-input>
+		</view>
+		<view class="hflex acenter">
+			<u-checkbox-group @change="checkboxChange">
+				<u-checkbox v-model="agree" shape="circle"></u-checkbox>
+			</u-checkbox-group>
+			<view class="text">阅读并同意<span class="read" @click="open(0)">《用户服务协议》</span>、<span class="read" @click="open(1)">《个人信息保护政策》</span></view>
+		</view>
+		<view class="button hflex acenter jcenter" @click="login">
+			<view>登录</view>
+		</view>
+		<view class="hflex acenter jcenter bottom">
+			<view class="text_style1" @click="pwdLogin">账号密码登录</view>
+		</view>
+		<!-- 弹出层 -->
+		<u-modal :show="showProtocol" :title="protocolTitle" confirmColor="#2988FE" @confirm="isRead" confirmText="我已阅读">
+			<view class="slot-content">
+				<rich-text :nodes="protocolContent"></rich-text>
+			</view>
+		</u-modal>
 	</view>
 </template>
 
 <script>
+	import $api from '@/static/js/api.js'
+	var that = ''
 	export default {
 		data() {
 			return {
-				
+				userInfo: {
+					name: '',
+				},
+				code: '',
+				tips: '',
+				agree: false,
+				showProtocol: false,
+				protocolTitle: '',
+				protocolContent: '',
 			}
 		},
+		onLoad() {
+			that = this
+		},
 		methods: {
-			
-		}
+			// 验证码文字
+			codeChange(text) {
+				that.tips = text
+			},
+			// 获取验证码
+			getCode() {
+				if(that.$refs.uCode.canGetCode) {
+					uni.showLoading({
+						title: '正在获取验证码'
+					})
+					$api.req({
+						url: '/data/api.Login/sendsms',
+						data: {
+							phone: that.userInfo.phone,
+							type: 1
+						}
+					}, function(res) {
+						uni.hideLoading();
+						if(res.code == 1) {
+							uni.$u.toast('验证码已发送')
+							that.$refs.uCode.start()
+						} else {
+							uni.$u.toast('验证码发送失败')
+						}
+					})
+				} else {
+					uni.$u.toast('倒计时结束后再发送')
+				}
+			},
+			// 阅读并同意
+			checkboxChange(n) {
+				this.agree = !this.agree
+			},
+			// 打开弹出层
+			open(index) {
+				const that = this
+				// if(index == 0) {
+				// 	$api.req({
+				// 		url: '/api/Publics/config_info'
+				// 	}, function(res) {
+				// 		if (res.code == 1) {
+				// 			that.protocolTitle = '用户协议'
+				// 			that.protocolContent = res.data.xieyi
+				// 		}
+				// 	})
+					
+				// } else {
+				// 	that.protocolTitle = '隐私政策'
+				// 	that.protocolContent = ''
+				// }
+				// that.showProtocol = true
+			},
+			// 登录
+			login() {
+				if ($api.formCheck(that.userInfo.name,"phone") && $api.formCheck(that.code, "code4")) {
+					if (!that.agree) {
+						$api.info('请先阅读并同意用户协议和隐私协议')
+					} else {
+						$api.req({
+							url: '/data/api.business.Login/login',
+							method: 'POST',
+							data: {
+								mobile: that.userInfo.name,
+								type: 2,
+								code: that.code,
+							}
+						}, function(res) {
+							console.log(res)
+							if(res.code == 1) {
+								wx.setStorageSync("token",res.data.token)
+								wx.setStorageSync("id",res.data.id)
+								var options = {
+								  user: res.data.id.toString(),
+								  pwd: '123456',
+								  appKey: uni.WebIM.config.appkey,
+								  success: function (res2) {
+									wx.setStorageSync("HXtoken",res2.access_token)
+									$api.jump('/pages/tabbar/mine/mine',3)
+								  },
+								  error: function(error){
+									  console.log(error);
+								  }
+								};
+								uni.WebIM.conn.open(options);
+							}
+						})
+					}
+				}
+			},
+			// 账号密码登录
+			pwdLogin() {
+				$api.jump('/pages/login/login/login')
+			},
+		},
 	}
 </script>
 
-<style>
-
-</style>
+<style lang="scss" scoped>
+	.content::v-deep {
+		padding: 0 60rpx;
+		.title {
+			margin: 64rpx 0;
+			font-size: 52rpx;
+			color: #222;
+		}
+		.form {
+			margin-bottom: 100rpx;
+			.u-input {
+				width: 630rpx !important;
+				height: 104rpx !important;
+				background-color: #f4f4f4;
+				border-radius: 52rpx;
+				font-size: 30rpx !important;
+				box-sizing: border-box;
+				padding: 30rpx 48rpx !important;
+				margin: 26rpx 0;
+			}
+			.pwd_icon {
+				width: 40rpx;
+				height: 40rpx;
+			}
+			.code {
+				font-size: 30rpx;
+				color: #506dff;
+			}
+		}
+		.text {
+			font-size: 24rpx;
+			color: #9c9c9c;
+		}
+		.read {
+			color: #2a63f3;
+		}
+		.button {
+			width: 100%;
+			height: 96rpx;
+			background-color: #506dff;
+			border-radius: 50rpx;
+			box-shadow: 0 4rpx 28rpx 0 rgba(132,123,255,0.4);
+			font-size: 40rpx;
+			color: #fff;
+			margin: 40rpx 0 36rpx;
+		}
+		.bottom {
+			width: 100%;
+			.text_style1 {
+				font-size: 24rpx;
+				color: #555;
+			}
+			.text_style2 {
+				font-size: 24rpx;
+				color: #506dff;
+			}
+		}
+		
+	}
+</style>

pages/login/forgot/forgot.vue

@@ -1,22 +1,143 @@
 <template>
-	<view>
-		
+	<view class="content">
+		<view class="form vflex">
+			<u-input v-model="userInfo.name" placeholder="用户名/手机号"></u-input>
+			<u-input v-model="code" placeholder="请输入验证码">
+				<template slot="suffix">
+					<u-code ref="uCode" @change="codeChange" seconds="60" changeText="X秒重新获取"></u-code>
+					<view class="code" @tap="getCode" >{{tips}}</view>
+				</template>
+			</u-input>
+			<u-input :type="pwd_type" v-model="userInfo.password" placeholder="请输入密码">
+				<template slot="suffix">
+					<view @click="show_pwd" v-if="pwd_type == 'password'">
+						<image src="/static/images/login/biyanjing.png" class="pwd_icon"></image>
+					</view>
+					<view @click="show_pwd" v-if="pwd_type == 'text'">
+						<image src="/static/images/login/yanjing.png" class="pwd_icon"></image>
+					</view>
+				</template>
+			</u-input>
+		</view>
+		<view class="button hflex acenter jcenter" @click="submit">
+			<view>提交</view>
+		</view>
 	</view>
 </template>
 
 <script>
+	import $api from '@/static/js/api.js'
+	var that = ''
 	export default {
 		data() {
 			return {
+				userInfo: {
+					name: '',
+					password: ''
+				},
+				code: '',
+				tips: '获取验证码',
+				pwd_type: 'password',
+			}
+		},
+		onLoad() {
+			that = this
+		},
+		watch: {
+			value(newValue,oldValue) {
 				
 			}
 		},
 		methods: {
-			
-		}
+			// 验证码文字
+			codeChange(text) {
+				that.tips = text
+			},
+			// 获取验证码
+			getCode() {
+				if(that.$refs.uCode.canGetCode) {
+					uni.showLoading({
+						title: '正在获取验证码'
+					})
+					$api.req({
+						url: '/data/api.Login/sendsms',
+						data: {
+							phone: that.userInfo.phone,
+							type: 3
+						}
+					}, function(res) {
+						uni.hideLoading();
+						if(res.code == 1) {
+							uni.$u.toast('验证码已发送')
+							that.$refs.uCode.start()
+						} else {
+							uni.$u.toast('验证码发送失败')
+						}
+					})
+				} else {
+					uni.$u.toast('倒计时结束后再发送')
+				}
+			},
+			// 提交
+			submit() {
+				if ($api.formCheck(that.userInfo.name,"require") && $api.formCheck(that.userInfo.password, "password") && $api.formCheck(that.code, "code4")) {
+					$api.req({
+						url: '/data/api.Login/findpwd',
+						method: 'POST',
+						data: {
+							phone: that.userInfo.name,
+							verify: that.code,
+							password: that.userInfo.password,
+						}
+					}, function(res) {
+						console.log(res)
+						if(res.code == 1) {
+							$api.info('修改成功'),
+							$api.jump(1,-1)
+						} else {
+							
+						}
+					})
+				}
+			}
+		},
 	}
 </script>
 
-<style>
-
-</style>
+<style lang="scss" scoped>
+	.content::v-deep {
+		padding: 0 60rpx;
+		.form {
+			width: 100%;
+			padding-top: 64rpx;
+			.u-input {
+				width: 630rpx !important;
+				height: 104rpx !important;
+				background-color: #f4f4f4;
+				border-radius: 52rpx;
+				font-size: 30rpx !important;
+				box-sizing: border-box;
+				padding: 30rpx 48rpx !important;
+				margin: 26rpx 0;
+			}
+			.pwd_icon {
+				width: 40rpx;
+				height: 40rpx;
+			}
+			.code {
+				font-size: 30rpx;
+				color: #506dff;
+			}
+		}
+		.button {
+			width: 100%;
+			height: 96rpx;
+			background-color: #506dff;
+			border-radius: 50rpx;
+			box-shadow: 0 4rpx 28rpx 0 rgba(132,123,255,0.4);
+			font-size: 40rpx;
+			color: #fff;
+			margin: 40rpx 0 36rpx;
+		}
+	}
+</style>

pages/login/login/login.vue

@@ -1,22 +1,200 @@
 <template>
-	<view>
-		
+	<view class="content">
+		<view class="title">密码登录</view>
+		<view class="form vflex">
+			<u-input v-model="userInfo.name" placeholder="用户名/手机号"></u-input>
+			<u-input :type="pwd_type" v-model="userInfo.password" placeholder="请输入密码">
+				<template slot="suffix">
+					<view @click="show_pwd" v-if="pwd_type == 'password'">
+						<image src="/static/images/login/biyanjing.png" class="pwd_icon"></image>
+					</view>
+					<view @click="show_pwd" v-if="pwd_type == 'text'">
+						<image src="/static/images/login/yanjing.png" class="pwd_icon"></image>
+					</view>
+				</template>
+			</u-input>
+		</view>
+		<view class="hflex acenter">
+			<u-checkbox-group @change="checkboxChange">
+				<u-checkbox v-model="agree" shape="circle"></u-checkbox>
+			</u-checkbox-group>
+			<view class="text">阅读并同意<span class="read" @click="open(0)">《用户服务协议》</span>、<span class="read" @click="open(1)">《个人信息保护政策》</span></view>
+		</view>
+		<view class="button hflex acenter jcenter" @click="login">
+			<view>登录</view>
+		</view>
+		<view class="hflex acenter jcenter bottom">
+			<view class="text_style1" @click="codeLogin">验证码登录</view>
+			<view style="margin: 0 10rpx;">|</view>
+			<view class="text_style2" @click="forgotPwd">忘记密码</view>
+		</view>
+		<!-- 弹出层 -->
+		<u-modal :show="showProtocol" :title="protocolTitle" confirmColor="#2988FE" @confirm="isRead" confirmText="我已阅读">
+			<view class="slot-content">
+				<rich-text :nodes="protocolContent"></rich-text>
+			</view>
+		</u-modal>
 	</view>
 </template>
 
 <script>
+	import $api from '@/static/js/api.js'
+	var that = ''
 	export default {
 		data() {
 			return {
-				
+				userInfo: {
+					name: '',
+					password: ''
+				},
+				pwd_type: 'password',
+				agree: false,
+				showProtocol: false,
+				protocolTitle: '',
+				protocolContent: '',
 			}
 		},
+		onLoad() {
+			that = this
+		},
 		methods: {
-			
-		}
+			// 查看密码
+			show_pwd() {
+				if(that.pwd_type == 'text') {
+					that.pwd_type = 'password'
+				} else {
+					that.pwd_type = 'text'
+				}
+			},
+			// 阅读并同意
+			checkboxChange(n) {
+				this.agree = !this.agree
+			},
+			// 打开弹出层
+			open(index) {
+				const that = this
+				// if(index == 0) {
+				// 	$api.req({
+				// 		url: '/api/Publics/config_info'
+				// 	}, function(res) {
+				// 		if (res.code == 1) {
+				// 			that.protocolTitle = '用户协议'
+				// 			that.protocolContent = res.data.xieyi
+				// 		}
+				// 	})
+					
+				// } else {
+				// 	that.protocolTitle = '隐私政策'
+				// 	that.protocolContent = ''
+				// }
+				// that.showProtocol = true
+			},
+			// 登录
+			login() {
+				if ($api.formCheck(that.userInfo.name,"required") && $api.formCheck(that.userInfo.password, "password")) {
+					if (!that.agree) {
+						$api.info('请先阅读并同意用户协议和隐私协议')
+					} else {
+						$api.req({
+							url: '/data/api.business.Login/login',
+							method: 'POST',
+							data: {
+								mobile: that.userInfo.name,
+								type: 1,
+								password: that.userInfo.password,
+							}
+						}, function(res) {
+							if(res.code == 1) {
+								wx.setStorageSync("token",res.data.token)
+								wx.setStorageSync("id",res.data.id)
+								var options = { 
+								  user: res.data.id.toString(),
+								  pwd: '123456',
+								  appKey: uni.WebIM.config.appkey,
+								  success: function (res2) {
+									wx.setStorageSync("HXtoken",res2.access_token)
+									$api.jump('/pages/tabbar/mine/mine',3)
+								  },
+								  error: function(){
+								  }
+								};
+								uni.WebIM.conn.open(options);
+							} else {
+								$api.info(res.info)
+							}
+						})
+					}
+				}
+			},
+			// 已阅读
+			isRead() {
+				that.showProtocol = false
+				that.agree = true
+			},
+			// 去验证码登录
+			codeLogin() {
+				$api.jump('/pages/login/codeLogin/codeLogin')
+			},
+			// 忘记密码
+			forgotPwd() {
+				$api.jump('/pages/login/forgot/forgot')
+			}
+		},
 	}
 </script>
 
-<style>
-
-</style>
+<style lang="scss" scoped>
+	.content::v-deep {
+		padding: 0 60rpx;
+		.title {
+			margin: 64rpx 0;
+			font-size: 52rpx;
+			color: #222;
+		}
+		.form {
+			margin-bottom: 100rpx;
+			.u-input {
+				width: 630rpx !important;
+				height: 104rpx !important;
+				background-color: #f4f4f4;
+				border-radius: 52rpx;
+				font-size: 30rpx !important;
+				box-sizing: border-box;
+				padding: 30rpx 48rpx !important;
+				margin: 26rpx 0;
+			}
+			.pwd_icon {
+				width: 40rpx;
+				height: 40rpx;
+			}
+		}
+		.text {
+			font-size: 24rpx;
+			color: #9c9c9c;
+		}
+		.read {
+			color: #2a63f3;
+		}
+		.button {
+			width: 100%;
+			height: 96rpx;
+			background-color: #506dff;
+			border-radius: 50rpx;
+			box-shadow: 0 4rpx 28rpx 0 rgba(132,123,255,0.4);
+			font-size: 40rpx;
+			color: #fff;
+			margin: 40rpx 0 36rpx;
+		}
+		.bottom {
+			width: 100%;
+			.text_style1 {
+				font-size: 24rpx;
+				color: #555;
+			}
+			.text_style2 {
+				font-size: 24rpx;
+				color: #506dff;
+			}
+		}
+	}
+</style>

pages/tabbar/index/index.vue

@@ -1,6 +1,53 @@
 <template>
 	<view class="content">
-		<view class="top"></view>
+		<view class="top hflex acenter">
+			<u-navbar :placeholder="true">
+				<view class="u-nav-slot" slot="left">
+					<image src="/static/images/common/logo.png" class="logo"></image>
+				</view>
+				<view class="u-nav-slot" slot="right">
+					<u-search placeholder="请输入搜索内容" :showAction="false" v-model="search"></u-search>
+				</view>
+			</u-navbar>
+		</view>
+		<view class="tabs">
+			<u-tabs :list="tabs" @click="clickTab" lineWidth="0" :activeStyle="{color:'#222222',fontSize: '30rpx'}" :inactiveStyle="{color: '#888888'}">
+			</u-tabs>
+		</view>
+		<view class="menuList hflex acenter jbetween">
+			<scroll-view scroll-y="true" class="menu_left">
+				<view class="vflex">
+					<block v-for="(item,index) in cateList" :key="index">
+						<view class="left_item hflex acenter jcenter" :class="index == left_active? 'left_active':''">{{item.name}}</view>
+					</block>
+				</view>
+			</scroll-view>
+			<scroll-view scroll-y="true" class="menu_right">
+				<u-tabs :list="cateList[left_active].sub" @click="clickTab2" lineWidth="0" :activeStyle="{
+					background: '#E7EBFF',borderRadius: '24px',border: '1px solid #5471FF',color: '#5B77FF',padding: '0 24rpx'
+				}" :inactiveStyle="{
+					color: '#393939',background: '#F3F3F7',borderRadius: '24px'}">
+					<view slot="right" style="padding-left: 4px;" @tap="open">
+						<view class="tabs_text hflex acenter jcenter">全部</view>
+					</view>
+				</u-tabs>
+				<view class="vflex">
+					<block v-for="(item,index) in pageList" :key="index">
+						
+					</block>
+				</view>
+			</scroll-view>
+		</view>
+		<view class="hover hflex acenter jbetween">
+			<view class="hflex acenter">
+				<image src="/static/images/common/sort_icon.png" class="hover_icon"></image>
+				<view class="hover_text">批量管理</view>
+			</view>
+			<view class="hflex acenter">
+				<image src="/static/images/common/add_icon.png" class="hover_icon"></image>
+				<view class="hover_text">添加商品</view>
+			</view>
+		</view>
 		<custom-tab-bar :current="1" />
 	</view>
 </template>
@@ -11,18 +58,158 @@
 	export default {
 		data() {
 			return {
-				
+				search: '',
+				tabs: [
+					{
+						index: 0,
+						name: '全部',
+						badge: {
+							value: 452,
+							bgColor: '#393939',
+							color: '#FFFFFF'
+						}
+					},
+					{
+						index: 1,
+						name: '售卖中',
+						badge: {
+							value: 126,
+							bgColor: '#EDEDED',
+							color: '#888888'
+						}
+					},
+					{
+						index: 2,
+						name: '已下架',
+						badge: {
+							value: 59,
+							bgColor: '#EDEDED',
+							color: '#888888'
+						}
+					},
+					{
+						index: 3,
+						name: '已售罄',
+						badge: {
+							value: 59,
+							bgColor: '#EDEDED',
+							color: '#888888'
+						}
+					},
+					
+				],
+				current: 0,
+				cateList: [],
+				left_active: 0,
+				pageList: [],
+				cate_show: false
 			}
 		},
 		onLoad() {
 			that = this
+			that.getCate()
 		},
 		methods: {
-			
+			getCate() {
+				$api.req({
+					url: '/data/api.business.Goods/getCate'
+				}, function(res) {
+					if(res.code == 1) {
+						that.cateList = res.data
+					}
+				})
+			},
+			clickTab(e) {
+				var index = e.index
+				for(var i=0;i<that.tabs.length;i++) {
+					if (that.tabs[i].index == index) {
+						that.$set(that.tabs[i].badge,"bgColor",'#393939')
+						that.$set(that.tabs[i].badge,"color",'#FFFFFF')
+					} else {
+						that.$set(that.tabs[i].badge,"bgColor",'#EDEDED')
+						that.$set(that.tabs[i].badge,"color",'#888888')
+					}
+				}
+			},
+			open() {
+				that.cate_show = !that.cate_show
+			}
 		},
 	}
 </script>
 
 <style lang="scss" scoped>
-	.content {}
+	.content::v-deep {
+		position: relative;
+		.top {
+			.logo {
+				width: 160rpx;
+				height: 60rpx;
+			}
+			.u-navbar__content__right {
+				width: 490rpx;
+				padding: 0 30rpx !important;
+			}
+		}
+		.tabs {
+		}
+		.menuList {
+			width: 100%;
+			.menu_left {
+				width: 180rpx;
+				height: 1078rpx;
+				background: #F5F5F5;
+				border-radius: 0px 28rpx 0px 0px;
+				.left_item {
+					font-size: 28rpx;
+					font-weight: 400;
+					color: #222222;
+					line-height: 40rpx;
+					padding: 30rpx 0;
+				}
+				.left_active {
+					color: #506DFF;
+					background: #fff;
+				}
+			}
+			.menu_right {
+				width: 570rpx;
+				height: 1078rpx;
+				background: #FFFFFF;
+				.tabs_text {
+					width: 80rpx;
+					height: 56rpx;
+					background: #FFFFFF;
+					font-size: 20rpx;
+					font-weight: 400;
+					color: #393939;
+					line-height: 28rpx;
+				}
+			}
+		}
+		.hover {
+			position: fixed;
+			bottom: 214rpx;
+			left: 50rpx;
+			width: 650rpx;
+			height: 92rpx;
+			z-index: 999;
+			background: #FFFFFF;
+			box-shadow: 0px 0px 28rpx 0px rgba(0,0,0,0.11);
+			border-radius: 46rpx;
+			box-sizing: border-box;
+			padding: 0 88rpx;
+			.hover_icon {
+				width: 36rpx;
+				height: 36rpx;
+			}
+			.hover_text {
+				padding-left: 2rpx;
+				font-size: 28rpx;
+				font-weight: 400;
+				color: #333333;
+				line-height: 40rpx;
+			}
+		}
+	}
 </style>

pages/tabbar/mine/mine.vue

@@ -1,5 +1,73 @@
 <template>
 	<view class="content">
+		<view class="top hflex acenter jbetween">
+			<view class="hflex acenter" @click="toLogin">
+				<u-avatar :src="user.headimg"></u-avatar>
+				<view class="user_name">{{user.nickname?user.nickname:'请先登录'}}</view>
+			</view>
+			<view class="message hflex acenter jcenter">
+				<image src="/static/images/mine/message.png" style="width: 48rpx;height: 48rpx;"></image>
+				<u-badge max="99" :absolute="true" :offset="[1,1]" :value="user.message_num" v-if="user.message_num>0"></u-badge>
+			</view>
+		</view>
+		<view class="box">
+			<view class="amount hflex acenter jbetween">
+				<view class="amount_left">我的余额</view>
+				<view class="amount_right">￥{{user.money}}</view>
+			</view>
+			<view class="order">
+				<view class="order_top hflex acenter jbetween">
+					<view class="order_title">商城订单</view>
+					<view class="order_right">查看全部</view>
+				</view>
+				<view class="order_list hflex acenter jcenter">
+					<block v-for="(item,index) in orderList" :key="index">
+						<view class="order_item vflex acenter jcenter">
+							<image :src="item.img" style="width: 52rpx;height: 52rpx;"></image>
+							<u-badge :absolute="true" :offset="[1,20]" max="99" :value="item.number" v-if="item.number>0"></u-badge>
+							<view class="order_text">{{item.name}}</view>
+						</view>
+					</block>
+				</view>
+			</view>
+			<view class="cell">
+				<view class="cell_item hflex acenter jbetween">
+					<view class="hflex acenter">
+						<image src="/static/images/mine/cell1.png" style="width: 40rpx;height: 40rpx;"></image>
+						<view class="cell_text">采购订单</view>
+					</view>
+					<u-icon name="arrow-right" color="#888888" size="12"></u-icon>
+				</view>
+				<view class="cell_item hflex acenter jbetween">
+					<view class="hflex acenter">
+						<image src="/static/images/mine/cell2.png" style="width: 40rpx;height: 40rpx;"></image>
+						<view class="cell_text">商家详情</view>
+					</view>
+					<u-icon name="arrow-right" color="#888888" size="12"></u-icon>
+				</view>
+				<view class="cell_item hflex acenter jbetween">
+					<view class="hflex acenter">
+						<image src="/static/images/mine/cell3.png" style="width: 40rpx;height: 40rpx;"></image>
+						<view class="cell_text">意见反馈</view>
+					</view>
+					<u-icon name="arrow-right" color="#888888" size="12"></u-icon>
+				</view>
+				<view class="cell_item hflex acenter jbetween">
+					<view class="hflex acenter">
+						<image src="/static/images/mine/cell4.png" style="width: 40rpx;height: 40rpx;"></image>
+						<view class="cell_text">平台规则</view>
+					</view>
+					<u-icon name="arrow-right" color="#888888" size="12"></u-icon>
+				</view>
+				<view class="cell_item hflex acenter jbetween">
+					<view class="hflex acenter">
+						<image src="/static/images/mine/cell5.png" style="width: 40rpx;height: 40rpx;"></image>
+						<view class="cell_text">设置</view>
+					</view>
+					<u-icon name="arrow-right" color="#888888" size="12"></u-icon>
+				</view>
+			</view>
+		</view>
 		<custom-tab-bar :current="3" />
 	</view>
 </template>
@@ -10,18 +78,175 @@
 	export default {
 		data() {
 			return {
-				
+				user: {
+					message_num: 12
+				},
+				login: true,
+				orderList: [
+					{
+						img: '/static/images/mine/order1.png',
+						name: '待付款',
+						number: 12
+					},
+					{
+						img: '/static/images/mine/order2.png',
+						name: '待发货',
+						number: 4
+					},
+					{
+						img: '/static/images/mine/order3.png',
+						name: '待收货',
+						number: 0
+					},
+					{
+						img: '/static/images/mine/order4.png',
+						name: '退款/售后',
+						number: 0
+					}
+				]
 			}
 		},
 		onLoad() {
 			that = this
+			that.getUser()
+		},
+		onShow() {
+			that.isLogin()
 		},
 		methods: {
-			
+			getUser() {
+				$api.req({
+					url: '/data/api.business.User/user_info'
+				}, function(res) {
+					if(res.code == 1) {
+						// that.user = res.data
+					}
+				})
+			},
+			isLogin() {
+				var token = uni.getStorageSync('token')
+				if(token) {
+					that.login = true
+				} else {
+					that.login = false
+				}
+			},
+			toLogin() {
+				if(!that.login) {
+					$api.jump('/pages/login/login/login')
+				}
+			}
 		},
 	}
 </script>
 
 <style lang="scss" scoped>
-	.content {}
+	.content {
+		background: url('/static/images/mine/bg.png') no-repeat;
+		background-size: 100%;
+		// padding: 0 30rpx;
+		.top {
+			width: 100%;
+			padding: 188rpx 0 0 30rpx;
+			.user_name {
+				font-size: 36rpx;
+				font-weight: 500;
+				color: #222222;
+				line-height: 50rpx;
+				padding-left: 16rpx;
+			}
+			.message {
+				width: 104rpx;
+				height: 68rpx;
+				background: rgba(255,255,255,0.6);
+				border-radius: 28rpx 0px 0px 28rpx;
+				position: relative;
+			}
+		}
+		.box {
+			width: 100%;
+			box-sizing: border-box;
+			padding: 0 30rpx;
+			.amount {
+				width: 100%;
+				height: 144rpx;
+				box-sizing: border-box;
+				padding: 0 24rpx;
+				margin: 36rpx 0 20rpx;
+				background: url('/static/images/mine/amount_bg.png') no-repeat;
+				background-size: 100%;
+				.amount_left {
+					font-size: 30rpx;
+					font-weight: 400;
+					color: #FFFFFF;
+					line-height: 42rpx;
+				}
+				.amount_right {
+					font-size: 48rpx;
+					font-weight: 400;
+					color: #FFFFFF;
+					line-height: 58rpx;
+				}
+			}
+			.order {
+				width: 100%;
+				height: 240rpx;
+				background: #FFFFFF;
+				border-radius: 20rpx;
+				.order_top {
+					padding: 24rpx 30rpx 0;
+					.order_title {
+						font-size: 28rpx;
+						font-weight: 500;
+						color: #0A0A0A;
+						line-height: 40rpx;
+					}
+					.order_right {
+						font-size: 22rpx;
+						font-weight: 400;
+						color: #B4B4B4;
+						line-height: 32rpx;
+					}
+				}
+				.order_list {
+					padding: 32rpx 0;
+					.order_item {
+						width: 25%;
+						position: relative;
+						.order_text {
+							font-size: 24rpx;
+							font-weight: 400;
+							color: #0A0A0A;
+							line-height: 34rpx;
+							padding-top: 26rpx;
+						}
+					}
+				}
+			}
+			.cell {
+				margin: 20rpx 0 110rpx;
+				width: 100%;
+				height: 588rpx;
+				background: #FFFFFF;
+				border-radius: 20px;
+				box-sizing: border-box;
+				padding: 0 30rpx;
+				.cell_item {
+					height: 116rpx;
+					padding: 34rpx 0;
+					border-bottom: 1rpx solid #F4F4F4;
+					.cell_text {
+						padding-left: 20rpx;
+						font-size: 26rpx;
+						font-weight: 400;
+						color: #222222;
+						line-height: 36rpx;
+					}
+				}
+				.cell_item:nth-last-child(1) {
+					border-bottom: none;
+				}
+			}
+		}
+	}
 </style>