zhangdan 4 سال پیش
والد
کامیت
84993e2bdd

+ 106 - 0
App.vue

@@ -51,4 +51,110 @@
 	.content {
 		padding: 20upx;
 	}
+	.form-input {
+		font-size: 28rpx;
+		color: #333;
+		// text-align: right;
+		width: 95%;
+		box-sizing: border-box;
+		height: 60rpx;
+		line-height: 60rpx;
+		&.textarea{
+			height: 240rpx;
+			padding: 24rpx 0;
+			text-align: left;
+		}
+	}
+	
+	.form-input-placeholder {
+		font-size: 28rpx;
+		color: #999;
+	}
+	/* 显示一行省略号 */
+	.ellipsis-one{
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		overflow: hidden;
+		word-break: break-all;
+	}
+	/* 显示两行,省略号 */
+	.ellipsis-two{
+		overflow: hidden;
+		text-overflow: ellipsis;
+		display: -webkit-box;
+		-webkit-line-clamp: 2;
+		line-clamp: 2;
+		-webkit-box-orient: vertical;
+	}
+	/* felx布局 */
+	.flex{
+		display: -webkit-flex; /* Chrome 21+, Safari 6.1+, iOS Safari 7+, Opera 15/16 */  
+		display: -moz-flex; /* Firefox 18+ */  
+		display: -ms-flexbox; /* IE 10 */  
+		display: flex; /* Chrome 29+, Firefox 22+, IE 11+, Opera 12.1/17/18, Android 4.4+ */
+	}
+	/*伸缩流方向*/
+	.flex_column{
+	    -webkit-box-orient: vertical;
+	    -ms-flex-direction: column;
+	    -webkit-flex-direction: column;
+	    flex-direction: column;
+	}
+	/*主轴对齐*/
+	.justify_center{
+	    -webkit-box-pack: center;
+	    -ms-flex-pack: center;
+	    -webkit-justify-content: center;
+	    justify-content: center;
+	}
+	.justify_end{
+	    -webkit-box-pack: end;
+	    -ms-flex-pack: end;
+	    -webkit-justify-content: flex-end;
+	    justify-content: flex-end;
+	}
+	.justify_between{
+	    -webkit-box-pack: justify;
+	    -ms-flex-pack: justify;
+	    -webkit-justify-content: space-between;
+	    justify-content: space-between;
+	}
+	/*侧轴对齐*/
+	.align_start{
+	    -webkit-box-align: start;
+	    -ms-flex-align: start;
+	    -webkit-align-items: flex-start;
+	    align-items: flex-start;
+	}
+	.align_end{
+	    -webkit-box-align: end;
+	    -ms-flex-align: end;
+	    -webkit-align-items: flex-end;
+	    align-items: flex-end;
+	}
+	.align_center{
+	    -webkit-box-align: center;
+	    -ms-flex-align: center;
+	    -webkit-align-items: center;
+	    align-items: center;
+	}
+	.align_baseline{
+	    -webkit-box-align: baseline;
+	    -ms-flex-align: baseline;
+	    -webkit-align-items: baseline;
+	    align-items: baseline;
+	}
+	/*伸缩性*/
+	.flex_auto{
+	    -webkit-box-flex: 1;
+	    -ms-flex: auto;
+	    -webkit-flex: auto;
+	    flex: auto;
+	}
+	.flex_1{
+	    -webkit-box-flex: 1;
+	    -ms-flex: 1;
+	    -webkit-flex: 1;
+	    flex: 1;    
+	}
 </style>

+ 8 - 6
pages.json

@@ -7,6 +7,8 @@
 			"path": "pages/index/index", // 首页
 			"style": {
 				"navigationBarTitleText": "乐色超人",
+				"navigationBarBackgroundColor": "#4F88F7",
+				"navigationBarTextStyle": "white",
 				"enablePullDownRefresh": false
 			}
 		},
@@ -88,20 +90,20 @@
 		"list": [
 		{
 			"pagePath": "pages/index/index",
-			"iconPath": "static/home.png",
-			"selectedIconPath": "static/home_current.png",
+			"iconPath": "static/pressed.png",
+			"selectedIconPath": "static/home_pressed.png",
 			"text": "首页"
 		},
 		 {
 		 	"pagePath": "pages/order/index",
-		 	"iconPath": "static/order.png",
-		 	"selectedIconPath": "static/order_current.png",
+		 	"iconPath": "static/marketing.png",
+		 	"selectedIconPath": "static/marketing_pressed.png",
 		 	"text": "订单"
 		 },
 		{
 			"pagePath": "pages/userCenter/index",
-			"iconPath": "static/person.png",
-			"selectedIconPath": "static/person_current.png",
+			"iconPath": "static/personal.png",
+			"selectedIconPath": "static/personal_pressed.png",
 			"text": "我的"
 		}]
 	}

+ 6 - 4
pages/index/index.vue

@@ -55,9 +55,9 @@
 					</view>
 				</view>
 			</view>
-			<!-- <view class="nodata">
-				<u-empty :text="noDataText" mode="data"></u-empty>
-			</view> -->
+			<view class="nodata" v-if="rubbishPriceList.length==0">
+				<u-empty src="/static/def_result.png" :text="noDataText" icon-size="260" ></u-empty>
+			</view>
 		</view>
 	</view>
 </template>
@@ -86,7 +86,8 @@
 				rubbishPaperList:[],
 				rubbishSLList:[],
 				rubbishYWList:[],
-				rubbishJSList:[]
+				rubbishJSList:[],
+				rubbishPriceList:[]
 			}
 		},
 		onLoad() {
@@ -140,6 +141,7 @@
 				geRubbishType().then(res=>{
 					if(res.status==200){
 						console.log(res,'---------垃圾类型')
+						this.rubbishPriceList=res.data
 						const a= res.data.find(item=>item.code=='PAPER')
 						const b= res.data.find(item=>item.code=='PLASTIC')
 						const c= res.data.find(item=>item.code=='CLOTHES')

+ 16 - 33
pages/index/userInfo.vue

@@ -7,26 +7,26 @@
 							<v-select ref="addressType" placeholder="请选择用户类型" @itemChange="chooseType" code="ORDER_ADDRESS_TYPE" style="width: 100%" :disabled="true"></v-select>	
 						</u-form-item>
 						<u-form-item prop="contactName" label="用户名称:" required>
-							<u-input placeholder="请输入用户名称"  v-model="form.contactName"/>
+							<u-input placeholder="请输入用户名称"  v-model="form.contactName" maxlength="15"/>
 						</u-form-item>
 						<u-form-item prop="contactMobile" label="联系电话:" required>
-							<u-input placeholder="请输入联系电话" v-model="form.contactMobile"/>
+							<u-input placeholder="请输入联系电话" v-model="form.contactMobile" maxlength="11" type="number"/>
 						</u-form-item>
 				</u-form>
 			</view>
 			<view class="form-data">
 				<u-form :model="form" ref="uForm" :label-width="140" :error-type="['toast']">
-						<u-form-item prop="contactAddress" label="通地址:" required>
-							<u-input placeholder="请选择通地址" v-model="form.contactAddress" @click="selectAddress" :disabled="true"/>
+						<u-form-item prop="contactAddress" label="通地址:" required>
+							<u-input placeholder="请选择通地址" v-model="form.contactAddress" @click="selectAddress" :disabled="true"/>
 							<u-icon name="arrow-right" slot="right"></u-icon>
 						</u-form-item>
 						<u-form-item prop="houseAddress" label="详细信息:" required>
-							<u-input placeholder="请输入详细信息" v-model="form.houseAddress"/>
+							<u-input placeholder="请输入详细信息" v-model="form.houseAddress" maxlength="30"/>
 						</u-form-item>
 				</u-form>
 			</view>
 			<view class="form-data qyImg">
-				<view> 上传图片 <text style="color: #a6a6a6;">(仅可上传1张,10MB以内)</text></view> 
+				<view> 门头照片 <text style="color: #a6a6a6;">(仅可上传1张,10MB以内)</text></view> 
 				<view class="info-main">
 					<view class="camera-btn" v-if="photograph.length<1">
 						<view @click="goPhotograph" class="photograph-camera">
@@ -84,17 +84,8 @@
 			console.log(option,option.id,'ppppppppp')
 			// this.userDetailInfo={}
 			this.getDetailData()
-			// 查看
-			// if(option && option.id){
-			// 	this.isView = true
-			// 	this.itemId=option.id
-			// 	// this.getDetailData()
-			// }else {
-			// 	console.log('--------新增')
-			// 	this.photograph = []
-			// 	// this.form.remarks = ''
-			// 	this.$refs.uForm.resetFields()
-			// }
+		},
+		onShow() {
 		},
 		onUnload() {
 		},
@@ -111,10 +102,9 @@
 						this.form.contactName=res.data.contactName
 						this.form.contactAddress=res.data.contactAddress
 						this.form.houseAddress=res.data.houseAddress
-						this.photograph=res.data.imageHeader.split()
+						this.photograph=res.data.imageHeader ?res.data.imageHeader.split() :''
 						this.form.lat=res.data.latitude
 						this.form.lng=res.data.longitude
-						console.log(res,'------------------------res')
 					}
 				})
 			},
@@ -154,10 +144,7 @@
 				    count: 1, //默认9
 				    sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图,默认二者都有
 				    sourceType: ['album','camera'], //从相册选择
-				    success:  (res) =>{
-						console.log(res,'rrrrrrrrrrr')
-				        console.log(JSON.stringify(res.tempFilePaths),'----------------------------------');
-						console.log(this.photograph.length,'this.photograph')
+				    success: (res) =>{
 						if(res.tempFiles[0].size>10485760){
 							uni.showToast({
 								title: '图片过大无法上传!',
@@ -170,11 +157,10 @@
 							mask: true
 						})
 						saveImgToAliOss(res.tempFilePaths[0],(ret)=>{
-							this.photograph.push(res.tempFilePaths[0])
-							this.imageHeader = res.tempFilePaths[0]
+							console.log(res,'-----------上传照片')
+							this.photograph=res.tempFilePaths
 							uni.hideLoading()
 						})
-						console.log(this.photograph,res.tempFilePaths[0],this.photograph.toString(),'-------------this.photograph')
 				    }
 				});
 			},
@@ -193,7 +179,6 @@
 			},
 			// 提交
 			submit(){
-				console.log(this.form.addressType,'-------------this.form.addressType')
 				this.$refs.uForm.validate(valid => {
 					if (valid) {
 						console.log('验证通过');
@@ -222,7 +207,7 @@
 						}
 						if (this.form.contactAddress ==='') {
 							uni.showToast({
-								title: '请输入通讯地址',
+								title: '请选择通信地址',
 								icon: 'none'
 							})
 							return false
@@ -234,21 +219,19 @@
 							})
 							return false
 						}
-						const params=this.form
+						const params=Object.assign(this.form,{lat:this.form.lat,lng:this.form.lng})
 						if(this.photograph){
-							params.imageHeader=this.imageHeader
+							params.imageHeader=this.photograph[0]
 						}
-						console.log(params,'--------用户信息')
 						userInfoSave(params).then(res=>{
 							if(res.status==200){
-								uni.$emit('add', {data: 'userInfo' })
+								uni.$emit('pageType', {data: 'userInfo' })
 								setTimeout(()=>{
 									uni.navigateBack({
 										
 									})
 								},300)
 							}
-							console.log(res,'------------res')
 						})
 						
 					} else {

+ 99 - 51
pages/index/yuyue.vue

@@ -11,7 +11,7 @@
 			<view class="form-data">
 				<u-form :model="form" ref="uForm" :label-width="140" :error-type="['toast']">
 						<u-form-item prop="time" label="预约时间:" required>
-							<u-select v-model="show"  mode="mutil-column-auto" :list="list" @confirm="confirm"></u-select>
+							<u-select v-model="show"  mode="mutil-column-auto" :list="list" @confirm="confirm" confirm-color="#07C160"></u-select>
 							<u-input placeholder="请选择预约时间" v-model="time" @click="selectTime" :disabled="true"/>
 							<u-icon name="arrow-right" slot="right"  @click="selectTime"></u-icon>
 						</u-form-item>
@@ -48,10 +48,10 @@
 				</view>
 			</view>
 		</view>
-		<view style="color:#FF2C5C;text-align: center;margin-bottom: 10upx;" v-if="!hasRider">当前地址/时段无可上门骑手,暂不能下单</view>
+		<view style="color:#FF2C5C;text-align: center;margin-bottom: 10upx;" v-if="!hasRider">当前无可上门骑手,暂不能下单</view>
 		<view class="btns">
-			<u-button @click="submit" :loading="loading" :custom-style="submitBtn" :disabled="!hasRider">提交</u-button>
-			<!-- <u-button @click="submit" :loading="loading" :custom-style="submitBtn">提交</u-button> -->
+			<u-button @click="submit" :loading="loading" :custom-style="submitBtn" v-if="hasRider">立即下单</u-button>
+			<u-button :loading="loading" :custom-style="disabledBtn" v-if="!hasRider" :disabled="true">立即下单</u-button>
 		</view>
 	</view>
 </template>
@@ -72,6 +72,8 @@
 				rubbishweightList:[], // 重量分类
 				latitude:'', // 当前位置经度
 				longitude:'' ,// 当前位置维度
+				userLatitude:'' , // 用户位置经度
+				userLongitude:'', // 用户位置维度
 				day:'', // 今天、明天,后天
 				timeType:'', // 上午、下午
 				reserveDateBegin:'', // 预约开始时间
@@ -87,12 +89,18 @@
 				reserveWeight:'',
 				isView: false ,// 是否是查看详情
 				hasRider:true, // 是否有骑手
+				currentTime:'', // 当前时间戳
 				itemId:'',
 				submitBtn:{
 					backgroundColor: '#4F88F7',
 					color: '#fff',
 					borderRadius: '12px'
 				},
+				disabledBtn:{
+					backgroundColor: '#999',
+					color: '#fff',
+					borderRadius: '12px'
+				},
 				show: false,
 				val:'',
 				list: [
@@ -142,38 +150,13 @@
 			};
 		},
 		onLoad(option) {
-			console.log(option,option.pageType,'ppppppppp')
-			// this.pageInfo()
-			// if(!option.pageType){
-			// 	this.pageInfo()
-			// }
+			this.rubbishType()
+			this.rubbishWeightType()
 			uni.$on('pageType', this.pageType)
-			
-			// 查看
-			// if(option && option.id){
-			// 	this.isView = true
-			// 	this.itemId=option.id
-			// }else {
-			// 	console.log('--------新增')
-			// 	this.photograph = []
-			// 	this.$refs.uForm.resetFields()
-			// }
-			wx.getLocation({
-			 type: 'wgs84',
-			 success:(res=> {
-			   if(res.latitude && res.longitude){
-			     this.latitude = res.latitude
-			     this.longitude = res.longitude
-			   }
-			   console.log(res,'位置信息',this.latitude,this.longitude)
-			 })
-			})
-			setTimeout(()=>{
-				this.getRiderStatus()
-			},300)
+			console.log(uni.$on('pageType', this.pageType))
 		},
 		onShow() {
-			this.pageInfo()
+			this.getDetailData()
 		},
 		onUnload() {
 		},
@@ -189,16 +172,14 @@
 				this.rubbishTypeListData=[]
 				this.latitude=''  // 当前位置经度
 				this.longitude='' // 当前位置维度
-				this.rubbishType()
-				this.getDetailData()
-				this.rubbishWeightType()
+				this.userLatitude=''  // 用户位置经度
+				this.userLongitude='' // 用户位置维度
 			},
 			pageType(e){
 				this.val += e.data
-				if(this.val!='userInfo'){
+				if(e && e.data!='userInfo'){
 					this.pageInfo()
 				}
-				console.log(this.val,'----------',e)
 			},
 			// 获取垃圾分类
 			rubbishType () {
@@ -229,7 +210,7 @@
 			},
 			// 查询附近有无骑手可接单
 			getRiderStatus(){
-				searchRider({lng:this.longitude,lat:this.latitude}).then(res=>{
+				searchRider({lat:this.userLatitude,lng:this.userLongitude}).then(res=>{
 					if(res.status==200){
 						this.hasRider=res.data
 					}
@@ -238,6 +219,66 @@
 			// 选择时间
 			selectTime(){
 				wx.hideKeyboard()
+				const date = new Date()
+				const year = date.getFullYear()
+				const month = date.getMonth()+1
+				const day = date.getDate()
+				const amMax = [year,month,day].join('-') + ' ' + '12:59:59'
+				const pmMax = [year,month,day].join('-') + ' ' + '18:00:00'
+				const nowTime = date.getTime()
+				console.log([year,month,day].join('-'))
+				console.log(date.getTime(),'now time')
+				console.log(new Date(amMax).getTime(),'am time')
+				console.log(new Date(pmMax).getTime(),'pm time')
+				const list = [
+					{
+						value: 4,
+						label: '明天',
+						children: [
+							{
+								value: 5,
+								label: '上午(08-13点)',
+							},
+							{
+								value: 6,
+								label: '下午(13-18点)',
+							}
+						]
+					},
+					{
+						value: 7,
+						label: '后天',
+						children: [
+							{
+								value: 8,
+								label: '上午(08-13点)',
+							},
+							{
+								value: 9,
+								label: '下午(13-18点)',
+							}
+						]
+					},
+				]
+				 
+				if(nowTime > new Date(pmMax).getTime()){
+					this.list = list
+				}else{
+					if(nowTime > new Date(amMax).getTime()){
+						this.list = list
+						this.list.unshift({
+								value: 1,
+								label: '今天',
+								children: [
+									{
+										value: 3,
+										label: '下午(13-18点)',
+									}
+								]
+							})
+					}
+				}
+				// return
 				this.show=true
 			},
 			confirm(e) {
@@ -257,7 +298,6 @@
 							this.reserveDateBegin=this.nowDate = year + "-" +( month<10? '0'+month:month ) + "-" + (day<10? '0'+day:day)+' 13:00:00';
 							this.reserveDateEnd=this.nowDate = year + "-" +( month<10? '0'+month:month ) + "-" + (day<10? '0'+day:day)+' 18:00:00';
 						}
-						
 					}
 					if(e[0].label=='明天'){
 						if(this.timeType=='上午'){
@@ -277,7 +317,22 @@
 							this.reserveDateEnd=this.nowDate = year + "-" +( month<10? '0'+month:month ) + "-" + (day<10? '0'+(day+2):day+2)+' 18:00:00';
 						}
 					}
+					console.log(new Date(this.reserveDateEnd).getTime(),'--------------结束时间戳')
+					// if((new Date(this.reserveDateEnd).getTime())-(new Date().getTime())<=0){
+					// 	this.time=''
+					// 	this.show=true
+					// 	console.log(this.show,'------------展开')
+					// 	uni.showToast({
+					// 		title: '请选择合适的预约时间',
+					// 		icon: 'none'
+					// 	})
+					// 	return false
+					// }else{
+					// 	this.time=e[0].label + e[1].label
+					// }
 				}
+				
+				
 			},
 			// 选择用户信息
 			selectUserInfo(){
@@ -288,11 +343,9 @@
 			// 选择垃圾分类
 			itemRubbishChange(item){
 				item.check=!item.check
-				console.log(item,item.code,'--------------',this.check)
 			},
 			itemRubbishWeightChange(item){
 				this.checkWeightType=item.code
-				console.log(item,item.code,'--------------',this.check,this.checkWeightType)
 			},
 			// 获取详情数据
 			getDetailData(){
@@ -300,8 +353,11 @@
 					if(res.status==200){
 						this.form.info=res.data.contactName
 						this.userId=res.data.id
+						this.userLatitude=res.data.lat    // 用户位置经度
+						this.userLongitude=res.data.lng  // 用户位置维度
 						delete res.data.id
 						this.userDetailInfo=res.data
+						this.getRiderStatus()
 						console.log(res)
 					}
 				})
@@ -350,10 +406,8 @@
 			// 提交
 			submit(){
 				this.rubbishTypeList=[]
-				console.log('-------------提交')
 				this.$refs.uForm.validate(valid => {
 					const params= Object.assign(this.userDetailInfo, this.form,{userId:this.userId})
-					console.log('-------------校验')
 					if (valid) {
 						if(this.time ==''){
 							uni.showToast({
@@ -362,7 +416,6 @@
 							})
 							return false
 						}
-						console.log('-------------时间校验')
 						if(this.form.info ==''){
 							uni.showToast({
 								title: '请选择用户信息',
@@ -370,7 +423,6 @@
 							})
 							return false
 						}
-						console.log('-------------用户校验')
 						if(this.checkWeightType ==''){
 							uni.showToast({
 								title: '请选择预估重量',
@@ -378,25 +430,21 @@
 							})
 							return false
 						}
-						console.log('-------------重量校验')
 						if(this.rubbishTypeListData){
 							this.rubbishTypeListData.map(item=>{
 								if(item.check==true){
 									this.rubbishTypeList.push(item.code)
 								}
 							})
-							console.log(this.rubbishTypeListData,this.rubbishTypeList,'--------选中垃圾分类')
 							params.rubbishTypeList=this.rubbishTypeList
 						}
-						console.log(params,'----------params垃圾类型')
-						if(this.rubbishTypeList ==[]){
+						if(this.rubbishTypeList.length ==0){
 							uni.showToast({
 								title: '请选择回收分类',
 								icon: 'none'
 							})
 							return false
 						}
-						console.log(params,'----------params垃圾类型')
 						if(this.time){
 							params.reserveDateBegin=this.reserveDateBegin
 							params.reserveDateEnd=this.reserveDateEnd

+ 10 - 3
pages/order/index.vue

@@ -37,14 +37,14 @@
 					<u-image :src="img" v-for=" img in item.imageList" width="120" height="120" class="detail-image"></u-image>
 				</view>
 				<u-line color="#e5e5e5"/>
-				<!-- <view class="userInfo cancelBtn" :showBtn="true"><u-button :custom-style="cancelBtn" :hair-line="false"  @click="cancelOrder">取消订单</u-button></view> -->
 				<view class="btn">
 					<v-select :showSelete="false" :showBtn="true" class="cancelBtn" @itemChange="chooseReason()" code="CANCEL_REASON" ></v-select>
 				</view>
 			</view>
 		</view>
-		<view class="nodata" v-if="!hasLogin && orderList.length==[] ">
-			<u-empty :text="noDataText" mode="data"></u-empty>
+		<view class="nodata" v-if="!hasLogin && orderList.length==0 ">
+			<!-- <u-empty :text="noDataText" mode="data"></u-empty> -->
+			<u-empty src="/static/def_result.png" :text="noDataText" icon-size="260" ></u-empty>
 		</view>
 	</view>
 </template>
@@ -203,5 +203,12 @@
 				background-color: #e5e5e5;
 			}
 		}
+		.nodata{
+			width: 100%;
+			height: 100vh;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+		}
 	}
 </style>

+ 35 - 48
pages/userCenter/index.vue

@@ -18,11 +18,28 @@
 			</view>
 		</view>
 		<!-- 列表 -->
-		<view class="user-list">
-			<u-cell-group>
+		<view class="list-container">
+			<view @click="checkUpdate" class="list-item flex align_center justify_between">
+				<view class="flex align_center">
+					<u-icon class="icon" name="error-circle" color="#5c655eb0" size="48"></u-icon>
+					<text>版本检查</text>
+				</view>
+				<view>
+					<text>{{version}}</text>
+					<u-icon name="arrow-right" color="#9DA8B5" size="32"></u-icon>
+				</view>
+			</view>
+			<view v-if="hasLogin" @click="quitSys" class="list-item flex align_center justify_between">
+				<view class="flex align_center">
+					<view class="t-icon icon t-icon-icon_out"></view>
+					<text>退出登录</text>
+				</view>
+				<u-icon name="arrow-right" color="#9DA8B5" size="32"></u-icon>
+			</view>
+			<!-- <u-cell-group>
 				<u-cell-item  icon="error-circle" icon-size="38" :value="version" @click="checkUpdate" title="版本检查"></u-cell-item>
 				<u-cell-item  v-if="hasLogin" icon="minus-circle" icon-size="38"  @click="quitSys" title="退出登录"></u-cell-item>
-			</u-cell-group>
+			</u-cell-group> -->
 		</view>
 	</view>
 </template>
@@ -123,17 +140,6 @@
 					}
 				})
 			},
-			// 打开对应的页面
-			toPage(index){
-				console.log(index)
-				let pageUrl=[
-					'/pages/agreement/agreement?fromPage=usercenter',
-					'/pages/userCenter/changePwd',
-					]
-				uni.navigateTo({
-					url: pageUrl[index]
-				})
-			},
 			// 退出登录
 			quitSys(){
 				let _this = this
@@ -168,8 +174,8 @@
 <style lang="scss">
 	.user-content{
 		width: 100%;
+		background: #fff;
 		.user-head{
-			background: #fff;
 			display: flex;
 			align-items: center;
 			padding: 35rpx 0rpx 35rpx 55rpx;
@@ -179,7 +185,6 @@
 				align-items: center;
 				flex-grow: 1;
 				padding-left: 20rpx;
-				// color: #FFFFFF;
 				.user-info-item{
 					margin: 10rpx 0;
 					:first-child{
@@ -198,42 +203,24 @@
 				overflow: hidden;
 			}
 		}
-		.my-ledou{
-			background: #FFFFFF;
-			border-radius: 15upx;
-			display: flex;
-			align-items: center;
-			justify-content: space-between;
-			padding: 20upx;
-			margin: 20upx;
-			box-shadow: 0upx 3upx 6upx #eee;
-			.user-jifen{
-				display: flex;
-				align-items: center;
+		.list-container{
+			width: 100%;
+			.icon{
+				width: 48rpx;
+				height: 48rpx;
+				margin-right: 30rpx;
+			}
+			.list-item{
+				padding: 32rpx 36rpx;
+				background-color: #fff;
 				text{
-					font-size: 40upx;
-					font-weight: bold;
-					color: red;
-				}
-				>view{
-					&:first-child{
-						display: flex;
-						align-items: center;
-					}
+					font-size: 34rpx;
+					color: #191919;
 				}
 			}
-		}
-		.user-list{
-			border-radius: 15upx;
-			margin: 20upx;
-			overflow: hidden;
-			box-shadow: 0upx 3upx 6upx #eee;
-			.quit{
-				margin-top: 20upx;
+			.margin-bot{
+				margin-bottom: 20rpx;
 			}
 		}
-		.user-btn{
-			padding: 85rpx 200rpx;
-		}
 	}
 </style>

BIN
static/def_result.png


BIN
static/home.png


BIN
static/home_current.png


BIN
static/home_pressed.png


BIN
static/houme_bg_guide.png


BIN
static/marketing.png


BIN
static/marketing_pressed.png


BIN
static/order.png


BIN
static/person.png


BIN
static/person_current.png


BIN
static/personal.png


BIN
static/personal_pressed.png


BIN
static/pressed.png


BIN
static/stepFour.png


BIN
static/stepOne.png


BIN
static/stepThree.png


BIN
static/stepTwo.png