浏览代码

页面增加

1004749546@qq.com 4 年之前
父节点
当前提交
33888b46b5
共有 47 个文件被更改,包括 1426 次插入175 次删除
  1. 90 2
      App.vue
  2. 26 10
      pages.json
  3. 408 0
      pages/historyOrder/hisOrderDetail.vue
  4. 196 0
      pages/historyOrder/index.vue
  5. 204 150
      pages/index/index.vue
  6. 419 0
      pages/recoveryPrice/index.vue
  7. 62 13
      pages/userCenter/index.vue
  8. 二进制
      static/home_bg_expressage.png
  9. 21 0
      static/iconfont/iconfont-weapp-icon.css
  10. 二进制
      static/login_icon.png
  11. 二进制
      static/login_slogan.png
  12. 二进制
      static/logo.png
  13. 二进制
      static/price/bg__book.png
  14. 二进制
      static/price/bg__steel.png
  15. 二进制
      static/price/bg_aper_flower.png
  16. 二进制
      static/price/bg_aper_miscellaneous.png
  17. 二进制
      static/price/bg_aper_thick.png
  18. 二进制
      static/price/bg_aper_yellow.png
  19. 二进制
      static/price/bg_clothes.png
  20. 二进制
      static/price/bg_magazine.png
  21. 二进制
      static/price/bg_newspaper.png
  22. 二进制
      static/price/bg_thin.png
  23. 二进制
      static/price/icon_acrylic.png
  24. 二进制
      static/price/icon_aper_flower.png
  25. 二进制
      static/price/icon_aper_miscellaneous.png
  26. 二进制
      static/price/icon_aper_yellow.png
  27. 二进制
      static/price/icon_book.png
  28. 二进制
      static/price/icon_bottle.png
  29. 二进制
      static/price/icon_clothes.png
  30. 二进制
      static/price/icon_frame_black.png
  31. 二进制
      static/price/icon_frame_white.png
  32. 二进制
      static/price/icon_iron_thick.png
  33. 二进制
      static/price/icon_iron_thin.png
  34. 二进制
      static/price/icon_magazine.png
  35. 二进制
      static/price/icon_newspaper.png
  36. 二进制
      static/price/icon_steel.png
  37. 二进制
      static/tabbar/home-active.png
  38. 二进制
      static/tabbar/home.png
  39. 二进制
      static/tabbar/shop-active.png
  40. 二进制
      static/tabbar/shop.png
  41. 二进制
      static/tabbar/tab_home_normal.png
  42. 二进制
      static/tabbar/tab_home_pressed.png
  43. 二进制
      static/tabbar/tab_personal_normal.png
  44. 二进制
      static/tabbar/tab_personal_pressed.png
  45. 二进制
      static/tabbar/user-active.png
  46. 二进制
      static/tabbar/user.png
  47. 二进制
      static/user_icon_number.png

+ 90 - 2
App.vue

@@ -1,6 +1,6 @@
 <script>
-	// const uat_domain = 'https://gather.test.sxzxyj.net' // 预发布
-	const uat_domain = 'http://192.168.16.217:8305' // 本地
+	const uat_domain = 'https://rider.test.sxzxyj.net' // 预发布
+	// const uat_domain = 'http://192.168.16.217:8305' // 本地
 	const pro_domain = 'https://gather.zyucgj.cn' // 生产
 	const uat_URL = uat_domain+'/gc-gather/' // 预发布
 	const pro_URL = pro_domain+'/gc-gather/'  // 生产
@@ -41,6 +41,7 @@
 
 <style lang="scss">
 	@import "uview-ui/index.scss";
+	@import "/static/iconfont/iconfont-weapp-icon.css";
 	/*每个页面公共css */
 	page {
 		min-height: 100%;
@@ -50,4 +51,91 @@
 	.content {
 		padding: 20upx;
 	}
+	/* 显示一行省略号 */
+	.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>

+ 26 - 10
pages.json

@@ -6,7 +6,7 @@
 		{
 			"path": "pages/index/index", // 首页
 			"style": {
-				"navigationBarTitleText": "分类垃圾录入端",
+				"navigationBarTitleText": "乐色超人骑手端",
 				"enablePullDownRefresh": false
 			}
 		},
@@ -31,9 +31,7 @@
 		{
 			"path": "pages/userCenter/index",
 			"style": {
-				"navigationBarTitleText": "个人中心",
-				"navigationBarBackgroundColor": "#0DC55F",
-				"navigationBarTextStyle": "white"
+				"navigationBarTitleText": "个人中心"
 			}
 		},
 		{
@@ -53,6 +51,24 @@
 			"style": {
 				"navigationBarTitleText": "修改密码"
 			}
+		},
+		{
+			"path": "pages/recoveryPrice/index",		
+			"style": {
+				"navigationBarTitleText": "今日回收价格"
+			}
+		},
+		{
+			"path": "pages/historyOrder/index",		
+			"style": {
+				"navigationBarTitleText": "历史订单"
+			}
+		},
+		{
+			"path": "pages/historyOrder/hisOrderDetail",		
+			"style": {
+				"navigationBarTitleText": "订单详情"
+			}
 		}
     ],
 	"globalStyle": {
@@ -67,21 +83,21 @@
 		}
 	},
 	"tabBar": {
-		"color": "#7A7E83",
-		"selectedColor": "##0DC55F",
+		"color": "#999999",
+		"selectedColor": "#4F88F7",
 		"backgroundColor": "#ffffff",
 		"fontSize": "14px",
 		"list": [
 		{
 			"pagePath": "pages/index/index",
-			"iconPath": "static/index/logo.png",
-			"selectedIconPath": "static/index/logo-active.png",
+			"iconPath": "static/tabbar/tab_home_normal.png",
+			"selectedIconPath": "static/tabbar/tab_home_pressed.png",
 			"text": "首页"
 		}, 
 		{
 			"pagePath": "pages/userCenter/index",
-			"iconPath": "static/tabbar/user.png",
-			"selectedIconPath": "static/tabbar/user-active.png",
+			"iconPath": "static/tabbar/tab_personal_normal.png",
+			"selectedIconPath": "static/tabbar/tab_personal_pressed.png",
 			"text": "我的"
 		}]
 	}

+ 408 - 0
pages/historyOrder/hisOrderDetail.vue

@@ -0,0 +1,408 @@
+<template>
+	<view class="order-pages">
+		<view class="order-info">
+			<!-- 订单状态 -->
+			<view class="order-status">
+				<view class="status-title flex align_center justify_center">
+					<view class="t-icon icon t-icon-icon_complete"></view>
+				{{orderInfo.orderStateDictValue}}
+				</view>
+				<view class="status-care">
+					预约时间:2021-05-10 15:10:05
+				</view>
+			</view>
+			<!-- 服务信息 -->
+			<view class="info-main">
+				<view class="flex align_center">
+					<view class="new-left">
+						陕西省西安市未央区华
+						帝金座602室
+					</view>
+				</view>
+				<view class="time flex align_center justify_between">
+					<text>百果园(贞观路店)</text>
+					<view class="flex align_center">
+						<view class="t-icon phone t-icon-icon_phone"></view>
+						<text>18092252287</text>
+					</view>
+				</view>
+			</view>
+			<!-- 预约信息 -->
+			<view class="item-info">
+				<view class="item flex justify_between">
+					<text>预约品类</text>
+					<text>纸品类,金属类</text>
+				</view>
+				<view class="item flex justify_between">
+					<text>预约重量</text>
+					<text>50-100kg</text>
+				</view>
+			</view>
+			<!-- 订单信息 -->
+			<view class="item-info">
+				<!-- <view class="item flex justify_between">
+					<text class="item-title">订单信息</text>
+				</view> -->
+				<view class="item flex justify_between">
+					<text>订单编号</text>
+					<text>202102022225</text>
+				</view>
+				<view class="item flex justify_between">
+					<text>下单时间</text>
+					<text>2021-04-19 15:33</text>
+				</view>
+				<view class="item flex justify_between">
+					<text>服务时间</text>
+					<text>2021-04-19 15:33</text>
+				</view>
+			</view>
+			<!-- 图片 -->
+			<view class="item-info">
+				<view class="item flex justify_between">
+					<text class="item-title">图片</text>
+				</view>
+				<view class="item flex">
+					<u-image class="img-icon" :src="item.icon?item.icon:'../../static/img/mddef.jpg'" border-radius="16" width="160" height="160"></u-image>
+				</view>
+			</view>
+			<!-- 回收品类明细 -->
+			<view class="item-info">
+				<view class="item flex justify_between">
+					<text class="item-title">回收品类明细</text>
+				</view>
+				<view class="item flex">
+				</view>
+			</view>
+			<!-- 金额 -->
+			<view class="item-info">
+				<view class="item flex justify_between">
+					<text>应付金额</text>
+					<text>22.20 元</text>
+				</view>
+				<view class="item flex justify_between">
+					<text>支付方式</text>
+					<text>线下</text>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import moment from 'moment'
+	export default {
+		data() {
+			return {
+				orderInfo: {
+					id: '',
+					createDate: '2021-05-10 15:22',
+					orderStateDictValue: '已完成',
+					storeName: '昆仑润滑·车领主 (西咸新区-...',
+					location: '2.9km',
+					orderState:'WAIT_PAY',
+					orderGoodsList: [
+						{
+							goodsImages: '',
+							goodsName: '水蜡免擦洗车(轿车)',
+							payGold: 200,
+							buyQty: 2,
+							goodsNum: 5,
+						},
+						{
+							goodsImages: '',
+							goodsName: '水蜡免擦洗车(轿车)',
+							payGold: 200,
+							buyQty: 2,
+							goodsNum: 5,
+						},
+					],
+					payGold: 450
+				},
+				totalPrice: 0, // 支付合计
+				password: '', // 支付密码
+				showSetPswModal: false,  // 设置支付密码弹窗
+				showInputPsw: false, // 打开输入密码弹窗
+				showLeavePsw: false, // 打开确定放弃弹窗
+				orderId: '', // 订单id
+				leftTime: null,
+				payFinish: false , // 是否支付成功
+				focus: false
+			}
+		},
+		onLoad(options) {
+			// 监听设置密码是否成功
+			uni.$once('setPswSuccess', this.setPsw)
+			if (options.id) {
+				console.log(options.id)
+				this.orderId = options.id
+				// this.getOrderDetail()
+			}
+			// 开启分享
+			uni.showShareMenu({
+				withShareTicket: true,
+				menus: ['shareAppMessage', 'shareTimeline']
+			})
+		},
+		computed: {
+			
+		},
+		methods: {
+			// 支付剩余时间
+			leftTimeFun() {
+				const date1 = moment().toArray()  //  当前时间 数组形式
+				const date2 = moment(this.orderInfo.orderTime).toDate()  //  下单时间  日期格式
+				const date3 = moment(date2).toArray()  //  下单时间  数组形式
+				const date4 = moment(date1).diff(moment(date3), 'seconds')//计算相差的秒数
+				const tt = 30 - Math.ceil(date4/60)  //向上取整
+				if (tt > 0) {
+					this.leftTime = tt
+				} else {
+					// this.getOrderDetail()
+					this.leftTime = '00'
+				}
+			},
+			// 获取订单详情
+			getOrderDetail() {
+				orderDetail({
+					id: this.orderId
+				}).then(res => {
+					console.log(res,'rrrrrrrr')
+					if (res.status == 200) {
+						this.orderInfo = res.data
+						if(this.orderInfo.orderState=='WAIT_PAY') {
+							this.leftTimeFun()
+						}
+					} 
+				})
+			},
+			// 跳转到设置支付密码页
+			toSetPwd () {
+				uni.navigateTo({
+					url:"/pages/userCenter/userInfo/smsVerification"
+				})
+			},
+			// 设置密码成功, 打开输入密码弹窗
+			setPsw (e) {
+				if (e.success) {
+					this.showInputPsw = true
+					setTimeout(()=>{
+						this.focus = true
+					},300)
+				}
+			},
+			// 关闭输入密码弹窗
+			closePayModal(){
+				if(!this.payFinish) {
+					this.showLeavePsw = true
+				} 
+			},
+			//确认放弃
+			canclePay() {
+				this.password = ''
+				this.showLeavePsw = false
+				this.showInputPsw = false
+				this.focus = false
+			},
+			// 继续支付
+			payAgain () {
+				this.focus = false
+				this.showLeavePsw = false
+				this.showInputPsw = true
+				setTimeout(()=>{
+					this.focus = true
+				},300)
+			},
+			// 支付 判断用户是否设置过支付密码
+			toPay() {
+				this.totalPrice = this.orderInfo.originalGold
+				this.payFinish = false
+				// 判断用户是否设置过支付密码
+				existPayPwd().then(res=>{
+					console.log(res,'rrrrrr')
+					if(res.status == 200) {
+						// 设置过支付密码,输入密码
+						if(res.data) {
+							this.showInputPsw = true
+							setTimeout(()=>{
+								this.focus = true
+							},300)
+						} else {
+							// 没设置过支付密码,提示设置密码
+							 this.showSetPswModal = true
+						}
+					} 
+				})
+			},
+			// 支付
+			toPayOrder() {
+				if (this.password === '') {
+					uni.showToast({
+						title: '请先输入支付密码',
+						icon: 'none'
+					})
+					return false
+				}
+				let id = this.orderInfo.id
+				let params = {
+					payPwd: this.password,
+					id: id
+				}
+				signPay(params).then(res=>{
+					this.btnLoading = false
+					if(res.status == 200) {
+						// 关闭弹窗 刷新页面
+						this.payFinish = true
+						this.showInputPsw = false
+						this.getOrderDetail()
+						// 刷新订单列表
+						uni.$emit('refresh')
+						// 跳转到支付完成界面
+						uni.navigateTo({
+							url:"/pagesA/toOrder/payFinish?id=" + id
+						})
+					} else{
+						this.password = ''
+					}
+				})
+			},
+		},
+	}
+</script>
+
+<style lang="scss">
+
+	.order-pages {
+		width: 100%;
+		height: 100vh;
+		display: flex;
+		flex-direction: column;
+		background-color: #F5F5F5;
+		.order-info {
+			width: 100%;
+			flex: 1;
+			overflow-y: scroll;
+			// 订单内容
+			.info-main{
+				background: #ffffff;
+				padding: 10upx 32upx;
+				margin: 20upx 32upx 0;
+				border-radius: 24upx;
+				box-shadow: 1px 1px 3px #EEEEEE;
+				font-size: 28upx;
+				background-image: url(../../static/home_bg_expressage.png);
+				background-repeat: no-repeat;
+				.new-left{
+					width: 360rpx;
+					font-size: 36rpx;
+					color: #191919;
+					font-weight: 600;
+					line-height: 44rpx;
+					margin-top: 30rpx;
+				}
+				.time{
+					padding: 20rpx 0;
+					font-size: 32rpx;
+					color: #7C7D7E;
+				}
+			}
+			// 状态
+			.order-status {
+				padding: 30upx 0;
+				text-align: center;
+
+				.status-title {
+					font-size: 42upx;
+					color: #191919;
+					.icon{
+						width: 48rpx;
+						height: 48rpx;
+						margin-right: 10rpx;
+					}
+				}
+
+				.status-care {
+					font-size: 28upx;
+					margin-top: 10upx;
+					color: #191919;
+
+					>text {
+						color: red;
+					}
+				}
+			}
+
+			// 订单信息列
+			.item-info{
+				border-radius: 24rpx;
+				margin: 20rpx 32rpx 0;
+				padding: 0rpx 32rpx;
+				background-color: #fff;
+				.item{
+					padding: 28rpx 0;
+					font-size: 32rpx;
+					// border-bottom: 1px solid #EBEBEB;
+					:first-child{
+						color: #7C7D7E;
+					}
+					:last-child-child{
+						color: #222222;
+					}
+					&:last-child{
+						border-bottom: none;
+					}
+					.item-title{
+						color: #181818;
+					}
+				}
+				
+			}
+			.price-text {
+				font-size: 20upx;
+				margin-left: 10upx;
+			}
+
+			.price-num {
+				font-size: 32upx;
+				color: red;
+				font-weight: 600;
+				margin-right: 6rpx;
+			}
+
+			.u-cell {
+				padding: 10rpx 32rpx;
+			}
+		}
+		.footer {
+			padding: 20rpx 32rpx;
+			display: flex;
+			background-color: #fff;
+			.btn{
+				flex: 1;
+				height: 84rpx;
+				font-size: 32rpx;
+				text-align: center;
+				line-height: 84rpx;
+			}
+			.btnCancleStyle{
+				color: #666666;
+				background: #E5E5E5;
+				border-radius: 60rpx 0px 0px 60rpx;
+			}
+			.btnPayStyle{
+				color: #191919;
+				background: #FFD100;
+				border-radius: 0rpx 60px 60px 0rpx;
+			}
+			.useBtn{
+				width: 100%;
+				height: 84rpx;
+				font-size: 32rpx;
+				text-align: center;
+				line-height: 84rpx;
+				color: #191919;
+				background: #FFD100;
+				border-radius: 60rpx
+			}
+		}
+	}
+</style>

+ 196 - 0
pages/historyOrder/index.vue

@@ -0,0 +1,196 @@
+<template>
+	<view class="order-content">
+		<view class="total">
+			总计:12000.00kg,222.00元
+		</view>
+		<scroll-view scroll-y class="list" @scrolltolower="onreachBottom">
+			<view class="list-item" @click="intoDetail()">
+				<view class="cont title flex align_center justify_between">
+					<text>2020-12-30 15:29:16</text>
+					<view class="flex align_center">
+						<text>查看详情</text>
+						<u-icon class="arrow-right" name="arrow-right" color="#999999" size="32"></u-icon>
+					</view>
+				</view>
+				<view class="cont">
+					<view class="cont-top flex align_center justify_between">
+						<text>百果园(贞观路店)</text>
+						<text>¥260.00</text>
+					</view>
+					<view class="cont-bot flex align_center justify_between">
+						<view class="flex align_center">
+							<view class="t-icon phone t-icon-icon_phone"></view>
+							<text>18092252287</text>
+						</view>
+						<text>线下支付</text>
+					</view>
+				</view>
+			</view>
+			<u-empty style="padding-top: 10vh;height: auto;" src="/static/img/def_result.png" :text="noDataText" img-width="252" img-height="176" v-if="list.length==0 && status!='loading'"
+			 mode="list"></u-empty>
+			<view v-if="index==current" style="padding: 20upx;">
+				<u-loadmore v-if="total>pageSize || status=='loading'" :status="status" />
+			</view>
+		</scroll-view>
+		<view class="list">
+			
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		onLoad() {
+			// this.pageInit()
+			// 开启分享
+			uni.showShareMenu({
+				withShareTicket: true,
+				menus: ['shareAppMessage', 'shareTimeline']
+			})
+		},
+		methods: {
+			// 进入详情
+			intoDetail() {
+				uni.navigateTo({
+					url: '/pages/historyOrder/hisOrderDetail'
+				})
+			},
+			// scroll-view到底部加载更多
+			onreachBottom() {
+				this.action = 'onreachBottom'
+				if (this.list.length < this.total) {
+					this.pageNo += 1
+					this.getRow()
+				} else {
+					if(this.list.length) {
+						uni.showToast({
+							title: '已经到底了',
+							icon: 'none'
+						});
+					}
+					this.status = "nomore"
+				}
+			},
+			// 查询列表
+			getRow(pageNo) {
+				this.status = "loadmore"
+				if (pageNo) {
+					this.pageNo = pageNo
+				}
+				let params = {
+					pageNo: this.pageNo,
+					pageSize: this.pageSize,
+					orderStateList: this.tabList[this.current].queryLabel, // tab分类
+				}
+				this.noDataText = '暂无数据'
+				this.status = "loading"
+				getOrderList(params).then(res => {
+					if (res.status == 200) {
+						if (this.pageNo > 1) {
+							this.list = this.list.concat(res.data.list || [])
+						} else {
+							this.list = res.data.list || []
+						}
+						const date1 = moment().toArray()  //  当前时间 数组形式
+						this.list.map(item=>{ 
+							const date2 = moment(item.orderTime).toDate()  //  下单时间  日期格式
+							const date3 = moment(date2).toArray()  //  下单时间  数组形式
+							const tt = 1800 - moment(date1).diff(moment(date3), 'seconds')//   距离30分钟支付   当前剩余秒数 = 1800秒 - 计算相差的秒数(当前时间-支付时间)
+							item.leftTimeT = tt > 0 ? tt : 0
+						})
+						this.total = res.data.count || 0
+					} else {
+						this.list = []
+						this.total = 0
+						this.noDataText = res.message
+					}
+					this.status = "loadmore"
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	page{
+		height: 100%;
+		width: 100%;
+	}
+	.order-content{
+		width: 100%;
+		height: 100%;
+		background-color: #F5F5F5;
+		display: flex;
+		flex-direction: column;
+		.total{
+			width: 100%;
+			height: 80rpx;
+			background: rgba(255, 209, 0, 0.4);
+			opacity: 1;
+			padding-left: 32rpx;
+			line-height: 80rpx;
+			font-size: 30rpx;
+			color: #191919;
+		}
+		
+		.list{
+			flex: 1;
+			width: 100%;
+			overflow: auto;
+			padding: 0 26rpx;
+			box-sizing: border-box;
+			.list-item{
+				width: 100%;
+				border-radius: 24rpx;
+				margin-top: 20rpx;
+				background-color: #fff;
+				.cont{
+					padding: 24rpx 32rpx;
+				}
+				.title{
+					text{
+						color: #666E75;
+						font-size: 28rpx;
+					}
+					view{
+						color: #999999;
+						font-size: 32rpx;
+						.arrow-right{
+							margin-left: 10rpx;
+						}
+					}
+				}
+				.cont-top{
+					text:first-child{
+						font-size: 36rpx;
+						color: #222222;
+						font-weight: 600;
+					}
+					text:last-child{
+						font-size: 32rpx;
+						color: #222222;
+					}
+				}
+				.cont-bot{
+					font-size: 28rpx;
+					color: #4C4C4C;
+					margin-top: 20rpx;
+					.phone{
+						width: 28rpx;
+						height: 28rpx;
+						margin-right: 10rpx;
+					}
+					text:last-child{
+						font-size: 24rpx;
+						color: #666E75;
+					}
+				}
+			}
+		}
+	}
+</style>

+ 204 - 150
pages/index/index.vue

@@ -1,71 +1,68 @@
 <template>
 	<view class="content">
-		<view class="header">
-			<view @click="openSearch">
-				<text v-if="searchForm.beginDate">{{searchForm.beginDate}}至{{searchForm.endDate}}</text>
-				<text v-else>全部</text>
-				<!-- <u-icon name="arrow-right" color="#999999" size="28"></u-icon> -->
-				<u-image v-if="hasLogin" @click="openScreen=true" class="filter-img" width="36rpx" height="36rpx" src="/static/filter.png"></u-image>
+		<view class="header" @click="openPrice">
+			<text >今日回收价格</text>
+			<view>
+				<text>查看详情</text>
+				<u-icon name="arrow-right" color="#4F88F7" size="28"></u-icon>
 			</view>
-			<!-- 总计 -->
+			<!-- <u-image v-if="hasLogin" @click="openScreen=true" class="filter-img" width="36rpx" height="36rpx" src="/static/filter.png"></u-image> -->
+		</view>
+		<!-- 总计 -->
+		<view class="header-total">
+			<view class="title">今日统计</view>
 			<view class="header-cont">
 				<view class="cont-item">
-					<text>其它垃圾</text>
-					<text v-if="!titleStatus" class="other">{{otherTotal}}kg</text>
+					<text v-if="!titleStatus" >{{otherTotal}}</text>
+					<text>完成订单数(个)</text>
 					<u-loading :show="titleStatus"></u-loading>
 				</view>
 				<view class="cont-item">
-					<text>厨余垃圾</text>
-					<text v-if="!titleStatus" class="chuyu">{{chuyuTotal}}kg</text>
+					<text v-if="!titleStatus" >{{chuyuTotal}}</text>
+					<text>回收重量(kg)</text>
 					<u-loading :show="titleStatus"></u-loading>
 				</view>
 				<view class="cont-item">
-					<text>建筑垃圾</text>
-					<text v-if="!titleStatus" class="jianzhu">{{jianzhuTotal}}kg</text>
+					<text v-if="!titleStatus" >{{jianzhuTotal}}</text>
+					<text>交易金额(元)</text>
 					<u-loading :show="titleStatus"></u-loading>
 				</view>
 			</view>
 		</view>
-		<scroll-view  class="scroll-con" :scroll-top="scrollTop" scroll-y @scrolltolower="onreachBottom">
-			<!-- 列表数据 -->
-			<view class="cell-item" v-for="item in listdata">
-				<view class="cell-item-title" >
-					<view>
-						<text>{{item.createDate}}</text>
-					</view>
-					<view @click="intoPage(item)">
-						<span class="view">查看详情</span>
-						<u-icon name="arrow-right" color="#999999" size="28"></u-icon>
-					</view>
-				</view>
-				<view class="cell-item-cont">
-					<!-- 其他垃圾 -->
-					<view class="cont-item">
-						<u-image src="/static/index/other.png"></u-image>
-						<text>{{item.gatherOther? (item.gatherOther/1000).toFixed(3)/1 :0}}kg</text>
-					</view>
-					<!-- 厨余垃圾 -->
-					<view class="cont-item">
-						<u-image src="/static/index/chuyu.png"></u-image>
-						<text>{{item.gatherKitchen ? (item.gatherKitchen/1000).toFixed(3)/1 :0}}kg</text>
-					</view>
-					<!-- 建筑垃圾 -->
-					<view class="cont-item">
-						<u-image src="/static/index/jianzhu.png"></u-image>
-						<text>{{item.gatherBuilding ? (item.gatherBuilding/1000).toFixed(3)/1 :0}}kg</text>
+		<!-- 接单按钮 -->
+		<view class="btn-view start-btn">
+			点击开始接单
+		</view>
+		<!-- 待处理订单 -->
+		<view class="list">
+			<view class="title">
+				<view>待处理订单(10个)</view>
+			</view>
+			<view class="list-item" v-for="item in listdata" :key="item.id">
+				<u-image class="img-icon" :src="item.icon?item.icon:'../../static/logo.jpg'" border-radius="16" width="160" height="160"></u-image>
+				<view class="cont-item-right flex_1 flex flex_column justify_between">
+					<view class="flex align_center justify_between">
+						<view class="flex_1 bold ellipsis-one">{{item.name}}</view>
+						<view class="do-btn">去处理</view>
 					</view>
+					 <view class="greey-font flex align_center justify_between">
+						 <view class="dizhi ellipsis-one">{{item.addrDetail}}</view>
+						 <view class="flex align_center">
+							 <view class="t-icon t-icon-icon_coordinate location-icon"></view>
+							 <text>2.9KM</text>
+						 </view>
+					 </view>
+					 <view class="greey-font">2021.05.10 上午,预估50~100kg</view>
+					 <view class="flex">
+						 <view class="mark">
+						 	纸张类
+						 </view>
+						 <view class="mark">
+						 	金属类
+						 </view>
+					 </view>
 				</view>
 			</view>
-			<view class="nodata" v-if="listdata.length==0 && status!='loading'">
-				<u-empty :text="noDataText" mode="list"></u-empty>
-			</view>
-			<view class="loadmore">
-				<u-loadmore v-if="total>pageSize || status=='loading'" :status="status" />
-			</view>
-		</scroll-view>
-		<view @click="intoPage()" class="footer">
-			<!-- <u-icon name="edit-pen" size="30"></u-icon> -->
-			<text>垃圾数据录入</text>
 		</view>
 		<!-- 筛选弹框 -->
 		<search-modal v-if="openScreen" :visible="openScreen" :defaultParams="searchForm" @refresh="refresh" @close="openScreen=false"></search-modal>
@@ -83,7 +80,16 @@
 		data() {
 			return {
 				hasLogin: false, // 是否登录
-				listdata: [], // 列表数据
+				listdata: [
+					{
+						name: '百果园(未央路店)',
+						addrDetail: '西安市未央区凤城八路海圣诞节回复多少积分',
+					},
+					{
+						name: '百果园(未央路店)',
+						addrDetail: '西安市未央区凤城八路海圣诞节回复多少积分',
+					}
+				], // 列表数据
 				otherTotal: 0, // 其它垃圾总和
 				jianzhuTotal: 0, // 建筑垃圾总和
 				chuyuTotal: 0, // 厨余垃圾总和
@@ -175,11 +181,16 @@
 				      })
 				    }
 			},
-			// 打开查询弹窗
-			openSearch(){
-				if(this.hasLogin){
-					this.openScreen = true
-				}
+			// 打开回收价格页面
+			openPrice(){
+				uni.navigateTo({
+					url: '/pages/recoveryPrice/index'
+				})
+				// if(this.hasLogin){
+				// 	uni.navigateTo({
+				// 		url: '/pages/recoveryPrice/index'
+				// 	})
+				// }
 			},
 			// 获取查询参数 刷新列表
 			refresh(params){
@@ -283,116 +294,159 @@
 		height: 100vh;
 		display: flex;
 		flex-direction: column;
-		justify-content: center;
-		align-items: center;
+		background-color: #fff;
+		padding: 0 32rpx;
+		color: #191919;
 		.header{
 			width: 100%;
-			background-color: #FFFFFF;
+			font-size: 36rpx;
 			display: flex;
-			flex-direction: column;
-			border-radius: 15upx;
-			padding: 30upx;
-			box-shadow: 0upx 3upx 6upx #eee;
-			margin-bottom: 20upx;
-			:first-child {
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
+			justify-content: space-between;
+			align-items: center;
+			padding: 16upx 0;
+			view:last-of-type {
+				font-size: 32rpx;
+				color: #4F88F7;
+				text{
+					margin-right: 10rpx;
+				}
 			}
-			.header-cont{
-				margin-top: 20upx;
+			
+		}
+		.header-total{
+			width: 100%;
+			background: linear-gradient(214deg, #4F88F7 0%, #2D74FE 100%);
+			border-radius: 24rpx;
+			color: #fff;
+			margin: 20rpx 0;
+			.title {
+				padding: 18rpx 34rpx;
+				font-size: 32rpx;
+			}
+		}
+		.header-cont{
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			padding: 20rpx 34rpx;
+			.cont-item{
 				display: flex;
+				flex-direction: column;
 				align-items: center;
-				justify-content: space-around;
-				.cont-item{
-					display: flex;
-					flex-direction: column;
-					align-items: center;
-					text{
-						line-height: 50upx;
-					}
-					text:last-child{
-						font-weight: 600;
-						font-size: 28upx;
-					}
+				text{
+					line-height: 50upx;
 				}
-				.other{
-					color: #FB1E1E;
+				text:last-of-type{
+					font-size: 24upx;
 				}
-				.chuyu{
-					color: #FCAE53;
+				text:first-of-type{
+					font-size: 48upx;
+					font-family: Arial;
+					font-style:italic;
 				}
-				.jianzhu{
-					color: #4EACFA;
-				}
-			}
-			.filter-img{
-				padding: 10upx;
 			}
 		}
-		.scroll-con{
-			flex: 1;
+		.btn-view{
 			width: 100%;
-			-webkit-box-flex:1;
-			-webkit-flex:1;
-			-ms-flex:1;
-			overflow: auto;
-			.cell-item{
-				width: 100%;
-				background-color: #fff;
-				border-radius: 15upx;
-				// padding: 20upx;
-				box-shadow: 0upx 3upx 6upx #eee;
-				.cell-item-title{
-					padding: 20upx 20upx 10upx;
-					width: 100%;
-					display: flex;
-					justify-content: space-between;
-					// border-bottom: 1px solid #e6e6e6;
-					.view{
-						color: #999999;
-						margin-right: 12upx;
-					}
-				}
-				.cell-item-cont{
-					width: 100%;
-					display: flex;
-					justify-content: space-between;
-					padding: 20upx;
-					margin-bottom: 20upx;
-					.cont-item{
-						display: flex;
-						flex-direction: column;
-						align-items: center;
-						width: 33%;
-						// border-right: 1px solid #e6e6e6;
-						:first-child {
-							width: 120upx;
-							height: 120upx;
-							margin-bottom: 20upx;
-						}
-					}
-					:last-child {
-						border: none;
-					}
-				}
+			height: 100rpx;
+			border-radius: 24rpx;
+			text-align: center;
+			line-height: 100rpx;
+			font-size: 36rpx;
+			margin: 20rpx 0;
+		}
+		.start-btn{
+			border: 1px solid #4F88F7;
+			color: #4F88F7;
+		}
+		.end-btn{
+			border: 1px solid #FF2C5C;
+			color: #FF2C5C;
+		}
+		// item样式
+		.list{
+			.title{
+				padding: 24rpx;
+				font-size: 36rpx;
 			}
 		}
-		.footer{
-			z-index: 9999;
-			// position: absolute;
-			// bottom: 30upx;
-			// margin: 20upx;
-			width: 95%;
-			height: 80upx;
-			background-color: #0DC55F;
-			opacity: 1;
-			border-radius: 50upx;
-			color: #fff;
-			font-size: 30rpx;
+		.list-item {
 			display: flex;
 			align-items: center;
-			justify-content: center;
+			font-size: 28upx;
+			.cont-item-right{
+				padding: 30upx 0upx;
+				min-height: 220rpx;
+				margin-left: 20upx;
+				border-bottom: 1px solid #E5E5E5;
+				font-size: 34rpx;
+				color: #222222;
+				width: 0;
+				.location-icon{
+					width: 20rpx;
+					height: 20rpx;
+					margin: 0 10rpx;
+				}
+				.do-btn{
+					width: 120rpx;
+					height: 48rpx;
+					border: 1px solid #4F88F7;
+					border-radius: 28rpx;
+					font-size: 24rpx;
+					color: #4F88F7;
+					text-align: center;
+					line-height: 48rpx;
+				}
+				.bold{
+					font-weight: 600;
+				}
+				.greey{
+					font-size: 28rpx;
+					color: #424D5E;
+				}
+				.greey-font{
+					font-size: 28rpx;
+					color: #666666;
+					line-height: 44rpx;
+				}
+				.dizhi{
+					margin-right: 36rpx;
+					flex: 1;
+					line-height: 44rpx;
+				}
+				.btn{
+					width: 132rpx;
+					height: 52rpx;
+					background: #FFD100;
+					opacity: 1;
+					border-radius: 28rpx;
+					text-align: center;
+					line-height: 52rpx;
+					color: #191919;
+					font-size: 28rpx;
+				}
+			}
+			&:last-child .cont-item-right {
+				border-bottom: none;
+			}
+			.mark{
+				padding: 6rpx 16rpx;
+				border-radius: 12rpx;
+				font-size: 22rpx;
+				margin-top: 12rpx;
+				background-color: #EFEFEF;
+				color: #666666;
+				margin-right: 20rpx;
+			}
+			.mark-left{
+				border: 1px solid #BB8415;
+				color: #BB8415;
+				margin-right: 20rpx;
+			}
+			.mark-right{
+				border: 1px solid #FF6824;
+				color: #FF6824;
+			}
 		}
 	}
 </style>

+ 419 - 0
pages/recoveryPrice/index.vue

@@ -0,0 +1,419 @@
+<template>
+	<view class="pagesCons">
+		<view class="tab-body">
+			<view class="uTabs">
+				<u-tabs-swiper ref="uTabs" bar-width="80" :list="tabList" inactive-color="#9DA8B5" name="dispName" active-color="#4F88F7" :current="current" @change="tabsChange" :is-scroll="false"
+				 swiperWidth="750"></u-tabs-swiper>
+			</view>
+			<swiper class="check-list" :current="swiperCurrent" @transition="transition" @change="swiperChange" @animationfinish="animationfinish">
+				<swiper-item class="swiper-item flex" v-for="(tabs, index) in tabList" :key="index">
+					<!-- 左侧 -->
+					<scroll-view scroll-y v-if="index==current" class="nav-left">
+						<view :class="['nav-left-item', curType == item.id ? 'active' : '']" v-for="(item, index) in typeData" :key="index" @click="selType(item.id)">
+							{{item.label}}
+						</view>
+					</scroll-view>
+					<!-- 右侧 -->
+					<scroll-view scroll-y class="nav-right flex_1" v-if="index==current" @scrolltolower="onreachBottom">
+						<!-- 纸质 -->
+						<view class="check-order-list" 
+						 >
+							<view class="list-item flex align_center">
+								<u-image width="36" height="36" src="/static/price/icon_aper_yellow.png" ></u-image>
+								<view class="item-cont">
+									<view>黄纸</view>
+									<view>1.24元/kg</view>
+								</view>
+							</view>
+							<view class="list-item flex align_center">
+								<u-image width="36" height="36" src="/static/price/icon_aper_flower.png" ></u-image>
+								<view class="item-cont">
+									<view>花纸</view>
+									<view>1.24元/kg</view>
+								</view>
+							</view>
+							<view class="list-item flex align_center">
+								<u-image width="36" height="36" src="/static/price/icon_book.png" ></u-image>
+								<view class="item-cont">
+									<view>书纸</view>
+									<view>1.24元/kg</view>
+								</view>
+							</view>
+							<view class="list-item flex align_center">
+								<u-image width="36" height="36" src="/static/price/icon_magazine.png" ></u-image>
+								<view class="item-cont">
+									<view>杂志</view>
+									<view>1.24元/kg</view>
+								</view>
+							</view>
+							<view class="list-item flex align_center">
+								<u-image width="36" height="36" src="/static/price/icon_newspaper.png" ></u-image>
+								<view class="item-cont">
+									<view>报纸</view>
+									<view>1.24元/kg</view>
+								</view>
+							</view>
+							<view class="list-item flex align_center">
+								<u-image width="36" height="36" src="/static/price/icon_aper_miscellaneous.png" ></u-image>
+								<view class="item-cont">
+									<view>杂纸</view>
+									<view>1.24元/kg</view>
+								</view>
+							</view>
+						</view>
+						<u-empty style="padding-top: 10vh;height: auto;" src="/static/img/def_result.png" :text="noDataText" img-width="252" img-height="176" v-if="list.length==0 && status!='loading'"
+						 mode="list"></u-empty>
+						<view v-if="index==current" style="padding: 20upx;">
+							<u-loadmore v-if="total>pageSize || status=='loading'" :status="status" />
+						</view>
+					</scroll-view>
+				</swiper-item>
+			</swiper>
+		</view>
+	</view>
+</template>
+<script>
+	// import md5 from 'md5'
+	export default {
+		data() {
+			return {
+				status: 'loadmore',
+				noDataText: '暂无数据',
+				tabList: [
+					{
+						dispName: '上门回收价格',
+						typeId: 1,
+						queryLabel: ['WAIT_PAY'] // tab参数
+					},
+					{
+						dispName: '工厂回收价格',
+						typeId: 3,
+						queryLabel: ['WAIT_SEND'] // tab参数
+					},
+				],
+				typeData: [
+					{
+						id: '1',
+						label: '纸品类',
+					},
+					{
+						id: '12',
+						label: '衣物类',
+					},
+					{
+						id: '13',
+						label: '金属类',
+					},
+					{
+						id: '16',
+						label: '塑料类',
+					}
+				], // 左侧类型数据
+				curType: '', // 当前类型
+				current: 0,
+				swiperCurrent: 0,
+				pageNo: 1,
+				pageSize: 10,
+				typeList: [{
+					id: '122',
+					createDate: '2021-05-10 15:22',
+					orderStateDictValue: '待付款',
+					storeName: '昆仑润滑·车领主 (西咸新区-...',
+					location: '2.9km',
+					orderState:'WAIT_PAY',
+					isUp: true,
+					orderGoodsList: [
+						{
+							id: '1',
+							goodsImages: '',
+							goodsName: '水蜡免擦洗车(轿车)',
+							payGold: 200,
+							buyQty: 2,
+							goodsNum: 5,
+							checked: false
+						},
+						{
+							id: '12',
+							goodsImages: '',
+							goodsName: '水蜡免擦洗车(轿车)',
+							payGold: 200,
+							buyQty: 2,
+							goodsNum: 5,
+							checked: false
+						},
+					],
+					payGold: 450
+					
+				},{
+					id: '156',
+					createDate: '2021-05-10 15:22',
+					orderStateDictValue: '待付款',
+					storeName: '昆仑润滑·车领主 (西咸新区-...',
+					location: '2.9km',
+					orderState:'WAIT_PAY',
+					isUp: false,
+					orderGoodsList: [
+						{
+							id: '13',
+							goodsImages: '',
+							goodsName: '水蜡免擦洗车(轿车)',
+							payGold: 200,
+							buyQty: 2,
+							goodsNum: 5,
+							checked: false
+						},
+						{
+							id: '15',
+							goodsImages: '',
+							goodsName: '水蜡免擦洗车(轿车)',
+							payGold: 200,
+							buyQty: 2,
+							goodsNum: 5,
+							checked: false
+						},
+					],
+					payGold: 450
+					
+				}],
+			}
+		},
+		onLoad() {
+			// this.pageInit()
+			// 开启分享
+			uni.showShareMenu({
+				withShareTicket: true,
+				menus: ['shareAppMessage', 'shareTimeline']
+			})
+		},
+		onUnload() {
+		},
+		onShow() {
+		},
+		// 下拉刷新
+		onPullDownRefresh() {
+			console.log('refresh')
+			this.pageNo = 1
+			this.getRow()
+			setTimeout(function () {
+				uni.stopPullDownRefresh()
+			}, 200)
+		},
+		methods: {
+			pageInit() {
+				this.sortIndex = 1
+				this.pageNo = 1
+				this.getRow()
+			},
+			handleRefresh() {
+				this.getRow()
+			},
+			// tabs通知swiper切换
+			tabsChange(index) {
+				this.swiperCurrent = index;
+			},
+			swiperChange(event) {
+				this.action = 'swiperChange'
+				this.status = 'loading'
+			},
+			// swiper-item左右移动,通知tabs的滑块跟随移动
+			transition(e) {
+				let dx = e.detail.dx;
+				this.$refs.uTabs.setDx(dx);
+			},
+			// 由于swiper的内部机制问题,快速切换swiper不会触发dx的连续变化,需要在结束时重置状态
+			// swiper滑动结束,分别设置tabs和swiper的状态
+			animationfinish(e) {
+				let current = e.detail.current;
+				let isCurtab = this.current == current
+				if (this.status != "nomore") {
+					let loadData = this.action == 'swiperChange' ? !isCurtab : isCurtab;
+					if (loadData) {
+						this.$refs.uTabs.setFinishCurrent(current);
+						this.swiperCurrent = current;
+						this.current = current;
+						this.resetPage();
+					}
+				}
+			},
+			// 单击左侧菜单
+			selType (v) {
+				this.partList = []
+				this.curType = v
+				
+			},
+			// scroll-view到底部加载更多
+			onreachBottom() {
+				this.action = 'onreachBottom'
+				if (this.list.length < this.total) {
+					this.pageNo += 1
+					this.getRow()
+				} else {
+					if(this.list.length) {
+						uni.showToast({
+							title: '已经到底了',
+							icon: 'none'
+						});
+					}
+					this.status = "nomore"
+				}
+			},
+			// 查询列表
+			getRow(pageNo) {
+				this.status = "loadmore"
+				if (pageNo) {
+					this.pageNo = pageNo
+				}
+				let params = {
+					pageNo: this.pageNo,
+					pageSize: this.pageSize,
+					orderStateList: this.tabList[this.current].queryLabel, // tab分类
+				}
+				this.noDataText = '暂无数据'
+				this.status = "loading"
+				getOrderList(params).then(res => {
+					if (res.status == 200) {
+						if (this.pageNo > 1) {
+							this.list = this.list.concat(res.data.list || [])
+						} else {
+							this.list = res.data.list || []
+						}
+						const date1 = moment().toArray()  //  当前时间 数组形式
+						this.list.map(item=>{ 
+							const date2 = moment(item.orderTime).toDate()  //  下单时间  日期格式
+							const date3 = moment(date2).toArray()  //  下单时间  数组形式
+							const tt = 1800 - moment(date1).diff(moment(date3), 'seconds')//   距离30分钟支付   当前剩余秒数 = 1800秒 - 计算相差的秒数(当前时间-支付时间)
+							item.leftTimeT = tt > 0 ? tt : 0
+						})
+						this.total = res.data.count || 0
+					} else {
+						this.list = []
+						this.total = 0
+						this.noDataText = res.message
+					}
+					this.status = "loadmore"
+				})
+			},
+			resetPage() {
+				this.status = 'loading';
+				// 上划分页
+				if (this.action == 'onreachBottom') {
+					// this.getRow();
+				}
+				// 左右切换tab
+				if (this.action == 'swiperChange') {
+					this.list = [];
+					// this.getRow(1);
+				}
+			},
+			itemChange(item) {
+				// item.isUp = !item.isUp
+				this.$nextTick(function(){
+					item.isUp = !item.isUp
+				})
+			},
+			// 详细页
+			viewRow(item) {
+				console.log(item, '111111')
+				// 已完成的
+				uni.navigateTo({
+					url: "/pages/order/orderDetail?id=" + item.id
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	
+	.pagesCons {
+		height: 100vh;
+		width: 100%;
+		background: #fff;
+		display: flex;
+		flex-direction: column;
+		.text-right {
+			float: right;
+		}
+
+		.tab-body {
+			flex: 1;
+			display: flex;
+			flex-direction: column;
+
+			.uTabs {
+				border-bottom: 1px solid #EEEEEE;
+				box-shadow: 1px 1px 3px #eeeeee;
+			}
+
+			.check-list {
+				flex: 1;
+				overflow-y: scroll;
+
+				.swiper-item {
+					width: 100%;
+					height: 100%;
+					overflow: hidden;
+
+					.scroll-view {
+						width: 100%;
+						height: 100%;
+						overflow: auto;
+					}
+					.nav-left{
+						width: 220rpx;
+						height: 100%;
+						background-color: #F5F6F7;
+						.nav-left-item{
+							color: #303133;
+							padding: 26upx 32upx;
+							position: relative;
+							font-size: 34rpx;
+							color: #666E75;
+						}
+						.nav-left-item.active{
+							color: #4F88F7;
+							background: #fff;
+						}
+						.nav-left-item.active:after{
+							content: '';
+							display: block;
+							width: 2px;
+							position: absolute;
+							top: 0;
+							bottom: 0;
+							left: 0;
+							background: #4F88F7;
+						}
+					}
+					.nav-right{
+						.check-order-list{
+							width: 100%;
+							height: 100%;
+							padding: 30rpx 10rpx 30rpx 32rpx;
+							.list-item{
+								float: left;
+								margin-right: 20rpx;
+								margin-bottom: 20rpx;
+								width: 45%;
+								height: 120rpx;
+								border-radius: 12rpx;
+								background-image: url(../../static/price/bg__book.png);
+								background-repeat: no-repeat;
+								padding-left: 20rpx;
+								color: #fff;
+								font-size: 24rpx;
+								.item-cont{
+									margin-left: 12rpx;
+									view{
+										line-height: 32rpx;
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+
+		}
+	}
+</style>

+ 62 - 13
pages/userCenter/index.vue

@@ -9,16 +9,42 @@
 			<view class="user-info">
 				<view v-if="hasLogin" class="user-info-item">{{userData.stationName || ''}}</view>
 				<view v-if="hasLogin" class="user-info-item">{{userData.gatherName||''}} {{userData.gatherPhone || ''}}</view>
-				<u-button v-else="!hasLogin" plain size="mini" shape="circle" @click="toLoginPage">立即登录</u-button>
+				<view v-if="!hasLogin"  class="user-info-item">
+					请点击登录
+				</view>
+				<!-- <u-button v-else="!hasLogin" plain size="mini" shape="circle" @click="toLoginPage">立即登录</u-button> -->
 			</view>
 		</view>
 		<!-- 列表 -->
-		<view class="user-list">
-			<u-cell-group>
-				<u-cell-item icon="file-text" icon-size="40" :icon-style="{color:'#ffaa00'}" index="0" @click="toPage" title="服务协议及隐私政策"></u-cell-item>
-				<u-cell-item  v-if="hasLogin" icon="lock" icon-size="38" :icon-style="{color:'#00aaff'}" index="1" @click="toPage" title="修改密码"></u-cell-item>
-				<u-cell-item  icon="error-circle" icon-size="38" :icon-style="{color:'#aaaaff'}" :value="version" @click="checkUpdate" title="版本检查"></u-cell-item>
-			</u-cell-group>
+		<view class="list-container">
+			<navigator url="/pages/historyOrder/index" class="list-item margin-bot flex align_center justify_between">
+				<view class="flex align_center">
+					<view class="t-icon icon t-icon-icon_order"></view>
+					<text>历史订单</text>
+				</view>
+				<u-icon name="arrow-right" color="#9DA8B5" size="32"></u-icon>
+			</navigator>
+			<navigator class="list-item flex align_center justify_between">
+				<view class="flex align_center">
+					<view class="t-icon icon t-icon-icon_statistics"></view>
+					<text>回收统计</text>
+				</view>
+				<u-icon name="arrow-right" color="#9DA8B5" size="32"></u-icon>
+			</navigator>
+			<navigator url="/pages/userCenter/changePwd" class="list-item margin-bot flex align_center justify_between">
+				<view class="flex align_center">
+					<view class="t-icon icon t-icon-icon_modify"></view>
+					<text>修改密码</text>
+				</view>
+				<u-icon name="arrow-right" color="#9DA8B5" size="32"></u-icon>
+			</navigator>
+			<view class="list-item margin-bot 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>
 		</view>
 		<view class="user-list quit">
 			<u-cell-group>
@@ -166,8 +192,9 @@
 <style lang="scss">
 	.user-content{
 		width: 100%;
+		height: 100vh;
+		background-color: #fff;
 		.user-head{
-			background: #0DC55F;
 			display: flex;
 			align-items: center;
 			padding: 35rpx 55rpx;
@@ -177,19 +204,41 @@
 				color: #FFFFFF;
 				.user-info-item{
 					margin: 10rpx 0;
-					:first-child{
-						font-size: 34upx;
-					}
+					color: #666666;
+					font-size: 32upx;
+				}
+				:first-child{
+					color: #000000;
+					font-size: 48upx;
 				}
 			}
 			.user-photo{
 				display: block;
-				width: 100rpx;
-				height: 100rpx;
+				width: 146rpx;
+				height: 146rpx;
 				border-radius: 50%;
 				overflow: hidden;
 			}
 		}
+		.list-container{
+			width: 100%;
+			.icon{
+				width: 48rpx;
+				height: 48rpx;
+			}
+			.list-item{
+				padding: 32rpx 36rpx;
+				background-color: #fff;
+				text{
+					font-size: 34rpx;
+					color: #191919;
+					margin-left: 30rpx;
+				}
+			}
+			.margin-bot{
+				margin-bottom: 20rpx;
+			}
+		}
 		.my-ledou{
 			background: #FFFFFF;
 			border-radius: 15upx;

二进制
static/home_bg_expressage.png


文件差异内容过多而无法显示
+ 21 - 0
static/iconfont/iconfont-weapp-icon.css


二进制
static/login_icon.png


二进制
static/login_slogan.png


二进制
static/logo.png


二进制
static/price/bg__book.png


二进制
static/price/bg__steel.png


二进制
static/price/bg_aper_flower.png


二进制
static/price/bg_aper_miscellaneous.png


二进制
static/price/bg_aper_thick.png


二进制
static/price/bg_aper_yellow.png


二进制
static/price/bg_clothes.png


二进制
static/price/bg_magazine.png


二进制
static/price/bg_newspaper.png


二进制
static/price/bg_thin.png


二进制
static/price/icon_acrylic.png


二进制
static/price/icon_aper_flower.png


二进制
static/price/icon_aper_miscellaneous.png


二进制
static/price/icon_aper_yellow.png


二进制
static/price/icon_book.png


二进制
static/price/icon_bottle.png


二进制
static/price/icon_clothes.png


二进制
static/price/icon_frame_black.png


二进制
static/price/icon_frame_white.png


二进制
static/price/icon_iron_thick.png


二进制
static/price/icon_iron_thin.png


二进制
static/price/icon_magazine.png


二进制
static/price/icon_newspaper.png


二进制
static/price/icon_steel.png


二进制
static/tabbar/home-active.png


二进制
static/tabbar/home.png


二进制
static/tabbar/shop-active.png


二进制
static/tabbar/shop.png


二进制
static/tabbar/tab_home_normal.png


二进制
static/tabbar/tab_home_pressed.png


二进制
static/tabbar/tab_personal_normal.png


二进制
static/tabbar/tab_personal_pressed.png


二进制
static/tabbar/user-active.png


二进制
static/tabbar/user.png


二进制
static/user_icon_number.png


部分文件因为文件数量过多而无法显示