zhangdan 4 lat temu
rodzic
commit
84b59fdf0d

+ 224 - 0
components/uni-nav-bar/uni-nav-bar.vue

@@ -0,0 +1,224 @@
+<template>
+	<view class="uni-navbar">
+		<view :class="{ 'uni-navbar--fixed': fixed, 'uni-navbar--shadow': shadow, 'uni-navbar--border': border }" :style="{ 'background-color': backgroundColor }"
+		 class="uni-navbar__content">
+			<uni-status-bar v-if="statusBar" />
+			<view :style="{ color: color,backgroundColor: backgroundColor }" class="uni-navbar__header uni-navbar__content_view">
+				<view @tap="onClickLeft" class="uni-navbar__header-btns uni-navbar__header-btns-left uni-navbar__content_view">
+					<view class="uni-navbar__content_view" v-if="leftIcon.length">
+						<uni-icons :color="color" :type="leftIcon" size="24" />
+					</view>
+					<view :class="{ 'uni-navbar-btn-icon-left': !leftIcon.length }" class="uni-navbar-btn-text uni-navbar__content_view"
+					 v-if="leftText.length">
+						<text :style="{ color: color, fontSize: '14px' }">{{ leftText }}</text>
+					</view>
+					<slot name="left" />
+				</view>
+				<view class="uni-navbar__header-container uni-navbar__content_view">
+					<view class="uni-navbar__header-container-inner uni-navbar__content_view" v-if="title.length">
+						<text class="uni-nav-bar-text" :style="{color: color }">{{ title }}</text>
+					</view>
+					<!-- 标题插槽 -->
+					<slot />
+				</view>
+				<view :class="title.length ? 'uni-navbar__header-btns-right' : ''" @tap="onClickRight" class="uni-navbar__header-btns uni-navbar__content_view">
+					<view class="uni-navbar__content_view" v-if="rightIcon.length">
+						<uni-icons :color="color" :type="rightIcon" size="24" />
+					</view>
+					<!-- 优先显示图标 -->
+					<view class="uni-navbar-btn-text uni-navbar__content_view" v-if="rightText.length && !rightIcon.length">
+						<text class="uni-nav-bar-right-text">{{ rightText }}</text>
+					</view>
+					<slot name="right" />
+				</view>
+			</view>
+		</view>
+		<view class="uni-navbar__placeholder" v-if="fixed">
+			<uni-status-bar v-if="statusBar" />
+			<view class="uni-navbar__placeholder-view" />
+		</view>
+	</view>
+</template>
+
+<script>
+	import uniStatusBar from "../uni-status-bar/uni-status-bar.vue";
+	import uniIcons from "../uni-icons/uni-icons.vue";
+
+	export default {
+		name: "UniNavBar",
+		components: {
+			uniStatusBar,
+			uniIcons
+		},
+		props: {
+			title: {
+				type: String,
+				default: ""
+			},
+			leftText: {
+				type: String,
+				default: ""
+			},
+			rightText: {
+				type: String,
+				default: ""
+			},
+			leftIcon: {
+				type: String,
+				default: ""
+			},
+			rightIcon: {
+				type: String,
+				default: ""
+			},
+			fixed: {
+				type: [Boolean, String],
+				default: false
+			},
+			color: {
+				type: String,
+				default: "#000000"
+			},
+			backgroundColor: {
+				type: String,
+				default: "#FFFFFF"
+			},
+			statusBar: {
+				type: [Boolean, String],
+				default: false
+			},
+			shadow: {
+				type: [String, Boolean],
+				default: false
+			},
+			border: {
+				type: [String, Boolean],
+				default: true
+			}
+		},
+        mounted() {
+          if(uni.report && this.title !== '') {
+              uni.report('title', this.title)
+          }
+        },
+		methods: {
+			onClickLeft() {
+				this.$emit("clickLeft");
+			},
+			onClickRight() {
+				this.$emit("clickRight");
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	$nav-height: 44px;
+	.uni-nav-bar-text {
+		/* #ifdef APP-PLUS */
+		font-size: 34rpx;
+		/* #endif */
+		/* #ifndef APP-PLUS */
+		font-size: $uni-font-size-lg;
+		/* #endif */
+	}
+	.uni-nav-bar-right-text {
+		font-size: $uni-font-size-base;
+	}
+
+	.uni-navbar {
+		width: 750rpx;
+	}
+
+	.uni-navbar__content {
+		position: relative;
+		width: 750rpx;
+		background-color: $uni-bg-color;
+		overflow: hidden;
+	}
+
+	.uni-navbar__content_view {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		align-items: center;
+		flex-direction: row;
+		// background-color: #FFFFFF;
+	}
+
+	.uni-navbar__header {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		width: 750rpx;
+		height: $nav-height;
+		line-height: $nav-height;
+		font-size: 16px;
+		// background-color: #ffffff;
+	}
+
+	.uni-navbar__header-btns {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-wrap: nowrap;
+		width: 120rpx;
+		padding: 0 6px;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.uni-navbar__header-btns-left {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		width: 150rpx;
+		justify-content: flex-start;
+	}
+
+	.uni-navbar__header-btns-right {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		width: 150rpx;
+		padding-right: 30rpx;
+		justify-content: flex-end;
+	}
+
+	.uni-navbar__header-container {
+		flex: 1;
+	}
+
+	.uni-navbar__header-container-inner {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex: 1;
+		align-items: center;
+		justify-content: center;
+		font-size: $uni-font-size-base;
+	}
+
+
+	.uni-navbar__placeholder-view {
+		height: $nav-height;
+	}
+
+	.uni-navbar--fixed {
+		position: fixed;
+		z-index: 998;
+	}
+
+	.uni-navbar--shadow {
+		/* #ifndef APP-NVUE */
+		box-shadow: 0 1px 6px #ccc;
+		/* #endif */
+	}
+
+	.uni-navbar--border {
+		border-bottom-width: 1rpx;
+		border-bottom-style: solid;
+		border-bottom-color: $uni-border-color;
+	}
+</style>

+ 25 - 0
components/uni-status-bar/uni-status-bar.vue

@@ -0,0 +1,25 @@
+<template>
+	<view :style="{ height: statusBarHeight }" class="uni-status-bar">
+		<slot />
+	</view>
+</template>
+
+<script>
+	var statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 'px'
+	export default {
+		name: 'UniStatusBar',
+		data() {
+			return {
+				statusBarHeight: statusBarHeight
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.uni-status-bar {
+		width: 750rpx;
+		height: 20px;
+		// height: var(--status-bar-height);
+	}
+</style>

+ 24 - 4
pages.json

@@ -7,15 +7,25 @@
 			"path": "pages/index/index", // 首页
 			"style": {
 				"navigationBarTitleText": "乐色超人",
-				"navigationBarBackgroundColor": "#4F88F7",
-				"navigationBarTextStyle": "white",
+				"navigationBarBackgroundColor": "#FFFFFF",
+				"navigationBarTextStyle": "black",
 				"enablePullDownRefresh": false
 			}
 		},
+		{
+			"path": "pages/index/YY",
+			"style": {
+				"navigationBarTitleText": "下单",
+				"navigationBarBackgroundColor": "#1995FF",
+				"navigationBarTextStyle": "white"
+				 // "navigationStyle":"custom"
+			}
+		},
 		{
 			"path": "pages/index/yuyue",
 			"style": {
-				"navigationBarTitleText": "上门预约"
+				"navigationBarTitleText": "下单",
+				 "navigationStyle":"custom"
 			}
 		},
 		{
@@ -27,7 +37,9 @@
 		{
 			"path": "pages/index/yuyueResult",
 			"style": {
-				"navigationBarTitleText": "预约结果"
+				"navigationBarBackgroundColor": "#1995FF",
+				"navigationBarTextStyle": "white",
+				"navigationBarTitleText": "下单"
 			}
 		},
 		{
@@ -58,6 +70,14 @@
 				"navigationBarTextStyle": "black"
 			}
 		},
+		{
+			"path": "pages/order/orderDetails",
+			"style": {
+				"navigationBarTitleText": "订单详情",
+				"navigationBarBackgroundColor": "#fff",
+				"navigationBarTextStyle": "black"
+			}
+		},
 		{
 			"path": "pages/userCenter/aboutUs",
 			"style": {

+ 443 - 0
pages/index/YY.vue

@@ -0,0 +1,443 @@
+<template>
+	<view class="content-yy">
+		<!-- <uni-nav-bar left-icon="back" title="下单" class="nav-bar"></uni-nav-bar> -->
+		<view class="content-nav">
+			<!-- <view>
+				<u-icon name="arrow-left" color="#fff" size="34"></u-icon>
+				<text style="color: #fff;">下单</text>
+			</view> -->
+			<u-image src="/static/index/bg_order.png" width="100%" height="396" class="nav-image"></u-image>
+		</view>
+		<!-- <scroll-view :scroll-y="true" style="height:100%;"> -->
+			<view class="content-body">
+				<view class="store-image flex flex_column justify_center">
+					<u-image src="/static/index/def_home_shop.png" width="172" height="172" ></u-image>
+					<text>骑手张三的店铺</text>
+				</view>
+				<!-- 表单 -->
+				<view class="list-container">
+					<view class="list-item">
+						<view class="list-item-left phone">
+							<text>联系电话</text>
+						</view>
+					    <view class="list-item-right flex_1">
+							<u-input class="flex_1" :custom-style="inputClass" v-model="form.contactMobile" placeholder="请输入车牌号码" placeholder-style="color:'#bbb';font-size:18px"/>
+					    </view>
+					</view>
+					<view class="list-item">
+						<view class="list-item-left">
+							<text>通信地址</text>
+						</view>
+					    <view class="list-item-right flex_1">
+							<u-input class="flex_1" :custom-style="inputClass" v-model="form.contactAddress" @click="selectAddress" :disabled="true" placeholder="请选择通信地址" placeholder-style="color:'#bbb';font-size:18px"/>
+							<u-icon class="back-img" name="arrow-right" color="#9DA8B5"  @click="selectAddress"></u-icon>
+					    </view>
+					</view>
+					<view class="list-item">
+						<view class="list-item-left">
+							<text>详细地址</text>
+						</view>
+					    <view class="list-item-right flex_1">
+							<u-input class="flex_1" :custom-style="inputClass"  v-model="form.houseAddress" placeholder="街道,楼牌号等" placeholder-style="color:'#bbb';font-size:18px"/>
+					    </view>
+					</view>
+				</view>
+				<!-- 一键预约 -->
+				<u-button :custom-style="yuYueBtn" :hair-line="false" @click="submit">一键预约</u-button>
+				<!-- 今日上门回收价格 -->
+				<view class="statistics-title">今日上门回收价格</view>
+				<view>
+					<!-- 纸张类 -->
+					<view class="statistics-box" v-if="rubbishPaperList.length">
+						<view class="rubbishType-type">
+							{{rubbishPaperName ? rubbishPaperName :''}}
+						</view>
+						<view class="flex rubbish">
+							<view v-for="item in rubbishPaperList" class="rubbishType-item">
+								<u-image :src="item.image" width="92" height="92"></u-image>
+								<span>{{item.name ? item.name :''}}</span><span>{{item.customerPrice ? (item.customerPrice).toFixed(2)/1+'元/kg' :''}} </span>
+							</view>
+						</view>
+					</view>
+					<!-- 塑料类 -->
+					<view class="statistics-box" v-if="rubbishSLList.length">
+						<view class="rubbishType-type">
+							{{rubbishSLName ? rubbishSLName :''}}
+						</view>
+						<view class="flex rubbish">
+							<view v-for="item in rubbishSLList" class="rubbishType-item">
+								<u-image :src="item.image" width="92" height="92"></u-image>
+								<span>{{item.name ? item.name :''}}</span><span>{{item.customerPrice ? (item.customerPrice).toFixed(2)/1+'元/kg' :''}} </span>
+							</view>
+						</view>
+					</view>
+					<!-- 金属类 -->
+					<view class="statistics-box" v-if="rubbishJSList.length">
+						<view class="rubbishType-type">
+							{{rubbishJSName ? rubbishJSName :''}}
+						</view>
+						<view class="flex rubbish">
+							<view v-for="item in rubbishJSList" class="rubbishType-item">
+								<u-image :src="item.image" width="92" height="92"></u-image>
+								<span>{{item.name ? item.name :''}}</span><span>{{item.customerPrice ? (item.customerPrice).toFixed(2)/1+'元/kg' :''}} </span>
+							</view>
+						</view>
+					</view>
+					<!-- 衣物类 -->
+					<view class="statistics-box" v-if="rubbishYWList.length">
+						<view class="rubbishType-type">
+							{{rubbishYWName ? rubbishYWName :''}}
+						</view>
+						<view class="flex rubbish">
+							<view v-for="item in rubbishYWList" class="rubbishType-item">
+								<u-image :src="item.image" width="92" height="92"></u-image>
+								<span>{{item.name ? item.name :''}}</span><span>{{item.customerPrice ? (item.customerPrice).toFixed(2)/1+'元/kg' :''}} </span>
+							</view>
+						</view>
+					</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>
+		<!-- </scroll-view> -->
+	</view>
+</template>
+
+<script>
+	import uniNavBar from '@/components/uni-nav-bar/uni-nav-bar.vue'
+	import {geRubbishType} from '@/api/index'
+	import {userInfoSave} from '@/api/data.js'
+	export default{
+		components: {uniNavBar},
+		data(){
+			return{
+				yuYueBtn:{
+					background: "#1995FF",
+					borderRadius: "8px",
+					color:'#fff',
+				},
+				rubbishPaperName:"",
+				rubbishSLName:"",
+				rubbishYWName:"",
+				rubbishJSName:"",
+				rubbishPaperList:[],
+				rubbishSLList:[],
+				rubbishYWList:[],
+				rubbishJSList:[],
+				rubbishPriceList:[],
+				form: {
+					contactMobile: '', //联系人手机
+					contactAddress:'' ,// 通讯地址
+					lat:'', // 通讯地址的经度
+					lng:'', // 通讯地址的纬度
+					houseAddress:'', // 详细地址
+				},
+				area:{}
+			}
+		},
+		methods:{
+			pageInit() {
+				this.geRubbishTypeList()
+				this.checkUpdate()
+			},
+			//截取省市区
+			getArea(str) {
+			    // let area = {}
+			    let index11 = 0
+			    let index1 = str.indexOf("省")
+			    if (index1 == -1) {
+			      index11 = str.indexOf("自治区")
+			      if (index11 != -1) {
+			        this.area.Province = str.substring(0, index11 + 3)
+			      } else {
+			        this.area.Province = str.substring(0, 0)
+			      }
+			    } else {
+			      this.area.Province = str.substring(0, index1 + 1)
+			    }
+			 
+			    let index2 = str.indexOf("市")
+			    if (index11 == -1) {
+			      this.area.City = str.substring(index11 + 1, index2 + 1)
+			    } else {
+			      if (index11 == 0) {
+			        this.area.City = str.substring(index1 + 1, index2 + 1)
+			      } else {
+			        this.area.City = str.substring(index11 + 3, index2 + 1)
+			      }
+			    }
+			 
+			    let index3 = str.lastIndexOf("区")
+			    if (index3 == -1) {
+			      index3 = str.indexOf("县")
+			      this.area.Country = str.substring(index2 + 1, index3 + 1)
+			    } else {
+			      this.area.Country = str.substring(index2 + 1, index3 + 1)
+			    }
+			    // return this.area;
+				if(this.area.Province==''){
+					this.area.Province=this.area.City
+				}
+				console.log(this.area,'---------------省市区')
+			  },
+			// 选择通信地址
+			selectAddress(){
+				wx.chooseLocation({
+					success:(res)=>{
+						if(res){
+							this.getArea(res.address)
+							console.log(res,'------------------地址信息',this.getArea(res.address))
+							// this.form.contactAddress=res.address
+							this.form.lat=res.latitude
+							this.form.lng=res.longitude
+							this.form.contactAddress=this.area.Province+this.area.City+this.area.Country
+							
+						}
+					}
+				})
+			},
+			// 获取垃圾分类
+			geRubbishTypeList(){
+				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')
+						const d= res.data.find(item=>item.code=='METAL')
+						/* 纸张类 */
+						this.rubbishPaperList=a.rubbishTypeVOList
+						this.rubbishPaperList.map(item=>{
+							if(item.code=='YELLOW_PAPER'){
+								item.image='/static/index/icon_aper_yellow.png'
+							}
+							if(item.code=='COLOUR_PAPER'){
+								item.image='/static/index/icon_aper_flower.png'
+							}
+							if(item.code=='BOOK_PAPER'){
+								item.image='/static/index/icon_book.png'
+							}
+							if(item.code=='MAGAZINE'){
+								item.image='/static/index/icon_magazine.png'
+							}
+							if(item.code=='OTHER_PAPER'){
+								item.image='/static/index/icon_aper_miscellaneous.png'
+							}
+							if(item.code=='NEWS_PAPER'){
+								item.image='/static/index/icon_newspaper.png'
+							}
+						})
+						// 塑料类
+						this.rubbishSLList=b.rubbishTypeVOList
+						this.rubbishSLList.map(item=>{
+							if(item.code=='PLASTIC_WHITE'){
+								item.image='/static/index/icon_frame_white.png'
+							}
+							if(item.code=='PLASTIC_BLACK'){
+								item.image='/static/index/icon_frame_black.png'
+							}
+							if(item.code=='PMMA'){
+								item.image='/static/index/icon_acrylic.png'
+							}
+							if(item.code=='PLASTIC_LUCENCY'){
+								item.image='/static/index/icon_bottle.png'
+							}
+						})
+						// 衣物
+						this.rubbishYWList=c.rubbishTypeVOList
+						this.rubbishYWList.map(item=>{
+							if(item.code=='SIMPLE_CLOTHES'){
+								item.image='/static/index/icon_clothes.png'
+							}
+						})
+						// 金属
+						this.rubbishJSList=d.rubbishTypeVOList
+						this.rubbishJSList.map(item=>{
+							if(item.code=='THIN_IRON'){
+								item.image='/static/index/icon_iron_thin.png'
+							}
+							if(item.code=='THICK_IRON'){
+								item.image='/static/index/icon_iron_thick.png'
+							}
+							if(item.code=='STAINLESS_IRON'){
+								item.image='/static/index/icon_steel.png'
+							}
+						})
+						this.rubbishPaperName=a.name
+						this.rubbishSLName=b.name
+						this.rubbishYWName=c.name
+						this.rubbishJSName=d.name
+					}
+				})
+			},
+			// 预约
+			submit(){
+				uni.navigateTo({
+					url:'/pages/index/yuyueResult'
+				})
+				// const testVal=/^1[34578]\d{9}$/
+				// if (!testVal.test(this.form.contactMobile)) {
+				// 	uni.showToast({
+				// 		title: '请输入正确的联系电话',
+				// 		icon: 'none'
+				// 	})
+				// 	return false
+				// }
+				// const params=Object.assign(this.form,{lat:this.form.lat,lng:this.form.lng})
+				// userInfoSave(params).then(res=>{
+				// 	if(res.status==200){
+				// 		uni.$emit('pageType', {data: 'userInfo' })
+				// 		setTimeout(()=>{
+				// 			uni.navigateBack({
+								
+				// 			})
+				// 		},300)
+				// 	}
+				// })
+			},
+		},
+		
+		onLaunch(){
+			
+		},
+		onLoad() {
+			this.pageInit()
+		},
+	}
+</script>
+
+<style lang="scss">
+	.content-yy{
+			width: 100%;
+			height: 100vh;
+			display: flex;
+			flex-direction: column;
+		.content-nav{
+			width: 750upx;
+			height: 396upx ;
+			position: fixed;
+			top:-120upx;
+			left: 0;
+			background: #1995FF;
+			.nav-image{
+				display: flex;
+				z-index: 100;
+			}
+		}
+		.content-body{
+			width: 750upx;
+			height: 100vh;
+			padding: 0 26upx 30upx;
+			flex:1;
+			overflow-y: scroll;
+			background: #f5f5f5;
+			border-radius: 24px 24px 0px 0px;
+			position: absolute;
+			top:220upx;
+			// padding-top: 270upx;
+			left: 0;
+			.store-image{
+				// display:table-cell;
+				padding:60upx 0;
+				text-align: center;
+			}
+			.list-container{
+				width: 100%;
+				background: #FFFFFF;
+				border-radius: 24upx;
+				margin-bottom: 40upx;
+				box-sizing:border-box;
+				.border-bottom{
+					padding-left: 32rpx;
+					border-bottom: 1px solid #E5E5E5;
+				}
+				.margin-bot{
+					margin-bottom: 20rpx;
+				}
+				.list-item{
+					// width: 100%;
+					background-color: #fff;
+					// display: flex;
+					margin: 0 32upx;
+					padding: 30rpx 0;
+					// justify-content: space-between;
+					// align-items:center;
+					border-bottom: 1px solid #E5E5E5;
+					.user-photo{
+						display: block;
+						width: 100rpx;
+						height: 100rpx;
+						border-radius: 50%;
+						overflow: hidden;
+					}
+					.list-item-left{
+						font-size: 30upx;
+						margin-bottom: 10upx;
+						color: #666E75;
+					}
+					.phone:after {
+					    content: '*';
+					    color: red;
+					    font-size: 36upx;
+						line-height: 30upx;
+					}
+					.list-item-right{
+						font-size: 30rpx;
+						color: #666666;
+						display: flex;
+						align-items: center;
+						// margin-left: 20rpx;
+						.back-img{
+							width: 18rpx;
+							height: 34rpx;
+							margin-left: 20rpx;
+						}
+						.input-box{
+							text-align: right;
+						}
+					}
+					
+				}
+				.list-item:last-child{
+					border-bottom: none;
+				}
+			}
+			.statistics-title{
+				font-size: 36upx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #191919;
+				opacity: 1;
+				margin: 46upx 0 24upx;
+			}
+			.statistics-box{
+				padding: 20upx 30upx;
+				margin-bottom: 30upx;
+				background-color: #FFFFFF;
+				border-radius: 12px;
+				.rubbishType-type{
+					margin-bottom: 36upx;
+					font-size: 28upx;
+					font-weight: 400;
+					color: #000000;
+				}
+				.rubbish{
+					font-size:24upx;
+					overflow-x: scroll;
+					.rubbishType-item{
+						display: flex;
+						flex-direction: column;
+						align-items: center;
+						min-width: 24.5%;
+					}
+				}
+				
+			}
+			.statistics-box:last-child{
+				margin-bottom:0 ;
+			}
+		}
+	}
+</style>

+ 206 - 60
pages/index/index.vue

@@ -7,9 +7,9 @@
 		</view>
 		<view class="content-bottom">
 			<!-- 预约 -->
-			<u-button :custom-style="yuYueBtn" :hair-line="false" @click="gotoYueYu">一键预约</u-button>
+			<!-- <u-button :custom-style="yuYueBtn" :hair-line="false" @click="gotoYueYu">一键预约</u-button> -->
 			<!-- 接单信息 -->
-			<view class="bottom-new-notice" v-if="orderStatusText">
+			<view class="bottom-new-notice" v-if="orderStatusText" @click="checkOrderDetail()">
 				<view class="notice-content">
 					<view class="notice-content-item"><u-icon class="icon" name="home_icon_bells" custom-prefix="custom-icon" size="38" color="#333"></u-icon></span><span class="item-title">最新通知</span></view>
 					<view class="notice-content-item" v-if="itemOrderStatus=='CONFIRM'">订单<span>{{orderStatusText ? orderStatusText :''}},</span>请耐心等待</view>
@@ -22,44 +22,78 @@
 				</view>
 			</view>
 			<!-- 回收指引 -->
-			<view class="bottom-zhiyin" @click="toZY">
+			<!-- <view class="bottom-zhiyin" @click="toZY">
 				<u-image src="/static/houme_bg_guide.png" mode="" height="160"></u-image>
+			</view> -->
+			<!-- 下单 -->
+			<view class="bottom-order flex justify_between align_center">
+				<view class="order-type flex flex_column justify_center" @click="gotoYueYu">
+					<u-image src="/static/index/home_icon_code.png" width="186rpx" height="144rpx"></u-image>
+					<view class="type type-saoma">扫码下单</view>
+					<view class="type-info">在线下单</view>
+				</view>
+				<view class="order-type flex flex_column justify_center"  @click="gotoYueYu">
+					<u-image src="/static/index/home_icon.png" width="176rpx" height="164rpx"></u-image>
+					<view  class="type">自主下单</view>
+					<view class="type-info">免费上门回收</view>
+				</view>
 			</view>
 			<!-- 收回统计 -->
 			<view class="statistics-title">今日上门回收价格</view>
-			<view class="bottom-statistics">
-				<view class="statistics-rubbishType">
-					<view class="statistics-box" v-if="rubbishPaperList.length">
-						<view class="rubbishType-type"><u-icon class="icon" name="home_icon_paper" custom-prefix="custom-icon" size="36" color="#333"></u-icon><span style="display:in;ine-block; margin-left:10upx">{{rubbishPaperName ? rubbishPaperName :''}}</span></view>
-						<view v-for="item in rubbishPaperList" class="rubbishType-item">
-							<span>{{item.name ? item.name :''}}</span><span>{{item.customerPrice ? ':'+(item.customerPrice).toFixed(2)/1+'元/kg' :''}} </span>
-						</view>
+			<view>
+				<!-- 纸张类 -->
+				<view class="statistics-box" v-if="rubbishPaperList.length">
+					<view class="rubbishType-type">
+						{{rubbishPaperName ? rubbishPaperName :''}}
 					</view>
-					<view class="statistics-box" v-if="rubbishYWList.length">
-						<view class="rubbishType-type"><u-icon class="icon" name="home_icon_clothing" custom-prefix="custom-icon" size="36" color="#333"></u-icon><span style="display:in;ine-block; margin-left:10upx">{{rubbishYWName ? rubbishYWName :''}}</span></view>
-						<view v-for="item in rubbishYWList" class="rubbishType-item">
-							<span>{{item.name ? item.name :''}}</span><span>{{item.customerPrice ? ':'+(item.customerPrice).toFixed(2)/1+'元/kg' :''}} </span>
+					<view class="flex rubbish">
+						<view v-for="item in rubbishPaperList" class="rubbishType-item">
+							<u-image :src="item.image" width="92" height="92"></u-image>
+							<span>{{item.name ? item.name :''}}</span><span>{{item.customerPrice ? (item.customerPrice).toFixed(2)/1+'元/kg' :''}} </span>
 						</view>
 					</view>
 				</view>
-				<view class="statistics-rubbishType">
-					<view class="statistics-box" v-if="rubbishSLList.length">
-						<view class="rubbishType-type"><u-icon class="icon" name="home_icon_plastic" custom-prefix="custom-icon" size="36" color="#333"></u-icon><span style="display:in;ine-block; margin-left:10upx">{{rubbishSLName ? rubbishSLName :''}}</span></view>
+				<!-- 塑料类 -->
+				<view class="statistics-box" v-if="rubbishSLList.length">
+					<view class="rubbishType-type">
+						{{rubbishSLName ? rubbishSLName :''}}
+					</view>
+					<view class="flex rubbish">
 						<view v-for="item in rubbishSLList" class="rubbishType-item">
-							<span>{{item.name ? item.name :''}}</span><span>{{item.customerPrice ? ':'+(item.customerPrice).toFixed(2)/1+'元/kg' :''}} </span>
+							<u-image :src="item.image" width="92" height="92"></u-image>
+							<span>{{item.name ? item.name :''}}</span><span>{{item.customerPrice ? (item.customerPrice).toFixed(2)/1+'元/kg' :''}} </span>
 						</view>
 					</view>
-					<view class="statistics-box" v-if="rubbishJSList.length">
-						<view class="rubbishType-type"><u-icon class="icon" name="home_icon_metal" custom-prefix="custom-icon" size="36" color="#333"></u-icon><span style="display:in;ine-block; margin-left:10upx">{{rubbishJSName ? rubbishJSName :''}}</span></view>
+				</view>
+				<!-- 金属类 -->
+				<view class="statistics-box" v-if="rubbishJSList.length">
+					<view class="rubbishType-type">
+						{{rubbishJSName ? rubbishJSName :''}}
+					</view>
+					<view class="flex rubbish">
 						<view v-for="item in rubbishJSList" class="rubbishType-item">
-							<span>{{item.name ? item.name :''}}</span><span>{{item.customerPrice ? ':'+(item.customerPrice).toFixed(2)/1+'元/kg' :''}} </span>
+							<u-image :src="item.image" width="92" height="92"></u-image>
+							<span>{{item.name ? item.name :''}}</span><span>{{item.customerPrice ? (item.customerPrice).toFixed(2)/1+'元/kg' :''}} </span>
 						</view>
 					</view>
 				</view>
+				<!-- 衣物类 -->
+				<view class="statistics-box" v-if="rubbishYWList.length">
+					<view class="rubbishType-type">
+						{{rubbishYWName ? rubbishYWName :''}}
+					</view>
+					<view class="flex rubbish">
+						<view v-for="item in rubbishYWList" class="rubbishType-item">
+							<u-image :src="item.image" width="92" height="92"></u-image>
+							<span>{{item.name ? item.name :''}}</span><span>{{item.customerPrice ? (item.customerPrice).toFixed(2)/1+'元/kg' :''}} </span>
+						</view>
+					</view>
+				</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 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>
@@ -146,6 +180,12 @@
 					}
 				})
 			},
+			// 查看订单详情
+			checkOrderDetail(){
+				uni.navigateTo({
+					url:'/pages/order/orderDetails'
+				})
+			},
 			// 获取垃圾分类
 			geRubbishTypeList(){
 				geRubbishType().then(res=>{
@@ -156,10 +196,64 @@
 						const b= res.data.find(item=>item.code=='PLASTIC')
 						const c= res.data.find(item=>item.code=='CLOTHES')
 						const d= res.data.find(item=>item.code=='METAL')
+						/* 纸张类 */
 						this.rubbishPaperList=a.rubbishTypeVOList
+						this.rubbishPaperList.map(item=>{
+							if(item.code=='YELLOW_PAPER'){
+								item.image='/static/index/icon_aper_yellow.png'
+							}
+							if(item.code=='COLOUR_PAPER'){
+								item.image='/static/index/icon_aper_flower.png'
+							}
+							if(item.code=='BOOK_PAPER'){
+								item.image='/static/index/icon_book.png'
+							}
+							if(item.code=='MAGAZINE'){
+								item.image='/static/index/icon_magazine.png'
+							}
+							if(item.code=='OTHER_PAPER'){
+								item.image='/static/index/icon_aper_miscellaneous.png'
+							}
+							if(item.code=='NEWS_PAPER'){
+								item.image='/static/index/icon_newspaper.png'
+							}
+						})
+						// 塑料类
 						this.rubbishSLList=b.rubbishTypeVOList
+						this.rubbishSLList.map(item=>{
+							if(item.code=='PLASTIC_WHITE'){
+								item.image='/static/index/icon_frame_white.png'
+							}
+							if(item.code=='PLASTIC_BLACK'){
+								item.image='/static/index/icon_frame_black.png'
+							}
+							if(item.code=='PMMA'){
+								item.image='/static/index/icon_acrylic.png'
+							}
+							if(item.code=='PLASTIC_LUCENCY'){
+								item.image='/static/index/icon_bottle.png'
+							}
+						})
+						// 衣物
 						this.rubbishYWList=c.rubbishTypeVOList
+						this.rubbishYWList.map(item=>{
+							if(item.code=='SIMPLE_CLOTHES'){
+								item.image='/static/index/icon_clothes.png'
+							}
+						})
+						// 金属
 						this.rubbishJSList=d.rubbishTypeVOList
+						this.rubbishJSList.map(item=>{
+							if(item.code=='THIN_IRON'){
+								item.image='/static/index/icon_iron_thin.png'
+							}
+							if(item.code=='THICK_IRON'){
+								item.image='/static/index/icon_iron_thick.png'
+							}
+							if(item.code=='STAINLESS_IRON'){
+								item.image='/static/index/icon_steel.png'
+							}
+						})
 						this.rubbishPaperName=a.name
 						this.rubbishSLName=b.name
 						this.rubbishYWName=c.name
@@ -170,7 +264,7 @@
 			gotoYueYu(){
 				if(this.hasLogin){
 					uni.navigateTo({
-					    url: '/pages/index/yuyue'
+					    url: '/pages/index/YY'
 					})
 				}else{
 					this.loginModal()
@@ -245,12 +339,12 @@
 		flex-direction: column;
 		padding: 0;
 			.content-top{
-				width: 100%;
-				height:260upx ;
-				background-color: #4F88F7;
-				border-bottom-left-radius: 50%;  /* 左下角 */
-				border-bottom-right-radius:50%; /* 右下角 */
-				opacity: 1;
+				// width: 100%;
+				// height:260upx ;
+				// background-color: #4F88F7;
+				// border-bottom-left-radius: 50%;  /* 左下角 */
+				// border-bottom-right-radius:50%; /* 右下角 */
+				// opacity: 1;
 				.top-banner{
 					padding: 20upx 30upx 0;
 					.banner{
@@ -260,7 +354,7 @@
 				}
 			}
 			.content-bottom{
-				padding: 30upx;
+				padding: 0 30upx 30upx;
 				background-color: #f5f5f5;
 				.bottom-new-notice{
 					background-image: url('../../static/home_bg_expressage.png');
@@ -303,6 +397,32 @@
 				.bottom-zhiyin{
 					margin: 30upx 0;
 				}
+				.bottom-order{
+					padding: 50upx 86upx;
+					margin:30upx 0 56upx;
+					background: #FFFFFF;
+					box-shadow: 0px 18px 35px rgba(1, 136, 209, 0.1);
+					opacity: 1;
+					border-radius: 12px;
+					.order-type{
+						text-align: center;
+						.type{
+							font-size: 42upx;
+							font-weight: bold;
+							color: #000000;
+							margin-top: 10upx;
+						}	
+						.type-saoma{
+							margin-top: 35upx;
+						}
+						.type-info{
+							color:#999999;
+							font-size: 24upx;
+							font-weight: 400;
+							margin-top: 10upx;
+						}
+					}
+				}
 				.statistics-title{
 					font-size: 36upx;
 					font-family: PingFang SC;
@@ -311,41 +431,67 @@
 					opacity: 1;
 					margin-bottom: 30upx;
 				}
-				.bottom-statistics{
-					display: flex;
-					width: 100%;
-					justify-content: space-between;
-					.statistics-rubbishType{
-						width: 48%;
-						.statistics-box{
-							margin-bottom:30upx ;
-							background-color: #fff;
-							padding: 20upx 10upx 20upx 20upx;
-							border-radius:16upx;
-						}
-						.statistics-box:last-child{
-							margin-bottom:0 ;
-						}
-					}
+				.statistics-box{
+					padding: 20upx 30upx;
+					margin-bottom: 30upx;
+					background-color: #FFFFFF;
+					border-radius: 12px;
 					.rubbishType-type{
-						display: flex;
-						align-items: center;
-						justify-content: flex-start;
+						margin-bottom: 36upx;
 						font-size: 28upx;
-						font-family: PingFang SC;
 						font-weight: 400;
 						color: #000000;
 					}
-					.rubbishType-item{
-						display: flex;
-						justify-content: flex-start;
-						margin:10upx 0 ;
-						font-size: 26upx;
-						font-family: PingFang SC;
-						font-weight: 400;
-						color: #444444;
+					.rubbish{
+						font-size:24upx;
+						overflow-x: scroll;
+						.rubbishType-item{
+							display: flex;
+							flex-direction: column;
+							align-items: center;
+							min-width: 24.5%;
+						}
 					}
+					
+				}
+				.statistics-box:last-child{
+					margin-bottom:0 ;
 				}
+				// .bottom-statistics{
+				// 	display: flex;
+				// 	width: 100%;
+				// 	justify-content: space-between;
+				// 	.statistics-rubbishType{
+				// 		width: 48%;
+				// 		.statistics-box{
+				// 			margin-bottom:30upx ;
+				// 			background-color: #fff;
+				// 			padding: 20upx 10upx 20upx 20upx;
+				// 			border-radius:16upx;
+				// 		}
+				// 		.statistics-box:last-child{
+				// 			margin-bottom:0 ;
+				// 		}
+				// 	}
+				// 	.rubbishType-type{
+				// 		display: flex;
+				// 		align-items: center;
+				// 		justify-content: flex-start;
+				// 		font-size: 28upx;
+				// 		font-family: PingFang SC;
+				// 		font-weight: 400;
+				// 		color: #000000;
+				// 	}
+				// 	.rubbishType-item{
+				// 		display: flex;
+				// 		justify-content: flex-start;
+				// 		margin:10upx 0 ;
+				// 		font-size: 26upx;
+				// 		font-family: PingFang SC;
+				// 		font-weight: 400;
+				// 		color: #444444;
+				// 	}
+				// }
 			}
 		}
 </style>

+ 45 - 0
pages/index/userInfo.vue

@@ -77,6 +77,7 @@
 					borderRadius: '12px'
 				},
 				show: false,
+				area:{}, // 省市区
 			};
 		},
 		onLoad(option) {
@@ -87,6 +88,47 @@
 		onUnload() {
 		},
 		methods: {
+			//截取省市区 
+			 getArea(str) {
+			    // let area = {}
+			    let index11 = 0
+			    let index1 = str.indexOf("省")
+			    if (index1 == -1) {
+			      index11 = str.indexOf("自治区")
+			      if (index11 != -1) {
+			        this.area.Province = str.substring(0, index11 + 3)
+			      } else {
+			        this.area.Province = str.substring(0, 0)
+			      }
+			    } else {
+			      this.area.Province = str.substring(0, index1 + 1)
+			    }
+			 
+			    let index2 = str.indexOf("市")
+			    if (index11 == -1) {
+			      this.area.City = str.substring(index11 + 1, index2 + 1)
+			    } else {
+			      if (index11 == 0) {
+			        this.area.City = str.substring(index1 + 1, index2 + 1)
+			      } else {
+			        this.area.City = str.substring(index11 + 3, index2 + 1)
+			      }
+			    }
+			 
+			    let index3 = str.lastIndexOf("区")
+			    if (index3 == -1) {
+			      index3 = str.indexOf("县")
+			      this.area.Country = str.substring(index2 + 1, index3 + 1)
+			    } else {
+			      this.area.Country = str.substring(index2 + 1, index3 + 1)
+			    }
+			    // return this.area;
+				if(this.area.Province==''){
+					this.area.Province=this.area.City
+				}
+				console.log(this.area,'---------------省市区')
+			  },
+		
 			// 获取详情数据
 			getDetailData(){
 				userDetail().then(res=>{
@@ -110,9 +152,12 @@
 				wx.chooseLocation({
 					success:(res)=>{
 						if(res){
+							this.getArea(res.address)
+							console.log(res,'------------------地址信息',this.getArea(res.address))
 							this.form.contactAddress=res.address
 							this.form.lat=res.latitude
 							this.form.lng=res.longitude
+							
 						}
 					}
 				})

+ 127 - 32
pages/index/yuyueResult.vue

@@ -1,53 +1,148 @@
 <template>
-	<view class="content">
-		<view class="content-result">
-			<u-image src="/static/def_pay_success.png" width="250" height="180"></u-image>
-			<view class="result-yuyue">预约成功</view>
-			<view class="result-yuyueDetail" @click="seeDetail">查看详情</view>
+	<view class="content-yy">
+		<view class="content-nav">
+			<u-image src="/static/index/bg_order.png" width="100%" height="396" class="nav-image"></u-image>
 		</view>
+		<view class="content-body">
+			<view class="body-state">
+				<view class="store-image flex flex_column justify_center">
+					<u-image src="/static/index/def_home_shop.png" width="172" height="172" ></u-image>
+				</view>
+				<view class="result">
+					您于<text>{{'2020-02-02 13:59:56'}}</text>下单成功, 点击<text style="color:#1995FF" @click="checkOrderDetail">查看详情</text>
+				</view>
+			</view>
+			<!-- <view class="content-footer"> -->
+				<!-- <v-select :showSelete="false" :showBtn="true"  class="cancelBtn" @itemChange="chooseReason()" code="CANCEL_REASON" ></v-select> -->
+				<!-- <view class="cancelBtn" @click="cancel">取消订单</view> -->
+			<!-- </view> -->
+			<view class="content-footer"  @itemChange="chooseReason()">
+				<v-select :showSelete="false" :showBtn="true"  class="cancelBtn" @itemChange="chooseReason()" code="CANCEL_REASON" ></v-select>
+			</view>
+		</view>
+		<!-- 取消订单弹窗 -->
+		<uni-popup ref="openModal" type="center">
+			<uni-popup-dialog content="您确定要取消此订单吗?" @confirm="onOk" title="取消订单"></uni-popup-dialog>
+		</uni-popup>
 	</view>
 </template>
 
 <script>
+	import uniPopup from '@/components/uni-popup/uni-popup.vue'
+	import uniPopupDialog from '@/components/uni-popup/uni-popup-dialog.vue'
+	import {cancelOrder} from '@/api/order.js'
+	import vSelect  from  '@/components/select/v-select.vue'
 	export default{
+		components: {uniPopup,uniPopupDialog,vSelect},
 		data(){
 			return{
 				
+				
 			}
 		},
 		methods:{
-			seeDetail(){
-				uni.switchTab({
-				    url: '/pages/order/index'
+			// cancel(){
+			// 	this.$refs.openModal.open()
+			// },
+			// onOk(){
+			// 	this.$refs.openModal.close()
+			// 	this.chooseReason()
+			// },
+			// 查看订单详情
+			checkOrderDetail(){
+				uni.navigateTo({
+					url:'/pages/order/orderDetails'
 				})
-			}
-		}
+			},
+			// 取消订单
+			chooseReason(e){
+				console.log(e,'-------取消订单')
+				cancelOrder({id:this.nowId,cancelReason:e}).then(res=>{
+					if(res.status==200){
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
+						// setTimeout(()=>{
+						// 	this.getOrderListData()
+						// },500)
+					}
+				})
+				
+			},
+		},
+		
+		onLaunch(){
+			
+		},
+		onLoad() {
+		},
 	}
 </script>
 
-<style lang="less">
-	.content{
-		width: 100%;
-		height: 100vh;
-		display: flex;
-		text-align: center;
-		justify-content: center;
-		align-items: center;
-		padding: 0;
-		.content-result{
-			.result-yuyue{
-				margin: 40upx 0 140upx;
-				font-size: 40upx;
-				font-family: PingFang SC;
-				font-weight: bold;
-				color: #222222;
+<style lang="scss">
+	.content-yy{
+			width: 100%;
+			height: 100vh;
+			display: flex;
+			flex-direction: column;
+		.content-nav{
+			width: 750upx;
+			height: 396upx ;
+			position: fixed;
+			top:-120upx;
+			left: 0;
+			background: #1995FF;
+			.nav-image{
+				display: flex;
+				z-index: 100;
+			}
+		}
+		.content-body{
+			width: 750upx;
+			height: 100vh;
+			display: flex;
+			flex-direction: column;
+			flex:1;
+			overflow-y: scroll;
+			background: #f5f5f5;
+			border-radius: 24px 24px 0px 0px;
+			position: absolute;
+			top:220upx;
+			// padding-top: 270upx;
+			left: 0;
+			.body-state{
+				flex: 1;
+				overflow-y:scroll;
+				padding: 0 26rpx 30rpx;
+			}
+			.store-image{
+				// display:table-cell;
+				padding:60upx 0;
+				text-align: center;
+			}
+			.result{
+				background-color: #FFFFFF;
+				padding: 30upx;
+				border-radius: 8px;
 			}
-			.result-yuyueDetail{
-				height: 80upx;
-				line-height: 80upx;
-				background: #4F88F7;
-				border-radius: 30px;
-				color: #fff;
+			.content-footer{
+				width: 100%;
+				padding: 12upx 32upx 32upx;
+				background: #FFFFFF;
+				opacity: 1;
+				.cancelBtn{
+					width: 100%;
+					height: 84upx;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					background: #E5E5E5;
+					color: #666;
+					border-radius: 16upx;
+					font-size: 36upx;
+					font-weight: 500;
+				}
 			}
 		}
 	}

+ 33 - 67
pages/login/login.vue

@@ -1,23 +1,20 @@
 <template>
 	<view class="content">
-		<!-- <view> -->
-			<view>
-				<view class="logo-cont">
-					<u-image src="/static/login_icon_logo.png" width="160" height="160" class="logo"></u-image>
-					<!-- <u-image src="/static/login_slogan.png" mode="aspectFit" width="286" height="36" class="logo_text"></u-image> -->
-				</view>
-				<view class="login-btns">
-					<u-button shape="circle" :custom-style="wxButton" class="login-btn" type="success" :hair-line="false" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">
-						微信授权登录
-					</u-button>
-				</view>
+		<view class="content-logo">
+			<view class="logo-cont">
+				<u-image src="/static/login_icon_logo.png" width="160" height="160" class="logo"></u-image>
+			</view>
+			<view class="login-btns">
+				<u-button shape="circle" :custom-style="wxButton" class="login-btn" type="success" :hair-line="false" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">
+					微信授权登录
+				</u-button>
 			</view>
 			<view class="nologin">
 				<u-button shape="circle" size="mini" plain lass="login-btn" @click="cansel" type="info">
 					暂不登录
 				</u-button>
 			</view>
-		<!-- </view> -->
+		</view>
 		<view @click="toYs" class="yszc">首次登录会自动创建账号且即代表同意<text class="yszc-text">《乐色超人服务协议》</text>及<text class="yszc-text">《隐私保护政策》</text></view>
 	</view>
 </template>
@@ -152,68 +149,37 @@
 		height: 100vh;
 		padding:0 130upx;
 		margin: 0 auto;
-		.logo-cont{
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-		}
-		.logo{
-			display: inline-block;
-			margin:240upx 256upx 120upx;
-		}
-		.logo_text{
-			display: inline-block;
-			margin-bottom: 200upx;
-		}
-		.login-btn{
-			display: block;
-			// width: 670upx;
-			height: 80upx;
-		}
-		.phoneBtn:active{
-			background: #fff ;
-			outline: none;
-		}
-		.nologin{
-			text-align: center;
-			margin: 70upx 0 350upx 0;
+		background: #fff;
+		display: flex;
+		flex-direction: column;
+		.content-logo{
+			flex: 1;
+			.logo-cont{
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				.logo{
+					display: inline-block;
+					margin:240upx 256upx 120upx;
+				}
+			}
+			.nologin{
+				text-align: center;
+				margin-top: 70upx;
+				.login-btn{
+					display: block;
+					height: 80upx;
+				}
+			}
 		}
 		.yszc{
 			font-size: 24upx;
 			text-align: center;
+			margin-bottom: 40upx;
 			.yszc-text{
-				color:#4F88F7;
+				color:#1995FF;
 			}
 			
 		}
-		.popup-title{
-			display: flex;
-			align-items: center;
-			padding: 30rpx 40rpx;
-			h4{
-				margin-left:20rpx ;
-			}
-		}
-		.popup-usePhone{
-			padding:20rpx  40rpx ;
-		}
-		.popup-bindPhone{
-			display: flex;
-			padding:20rpx  40rpx ;
-			text{
-				display: inline-block;
-				margin-left: 20rpx;
-				color:#999
-			}
-		}
-		.popup-useOtherPhone{
-			padding:20rpx  40rpx ;
-			color:#576B95
-		}
-		.popup-btn{
-			display: flex;
-			justify-content: space-around;
-			padding:20rpx  40rpx 40rpx;
-		}
 	}
 </style>

+ 91 - 0
pages/order/orderDetails.vue

@@ -0,0 +1,91 @@
+<template>
+	<view class="content-orderDetails">
+		<view class="flex justify_center align_center order-states">
+			<u-image src="/static/order/prescription_order_icon_pay.png" width="48" height="48"></u-image>
+			<text>已完成</text>
+		</view>
+		<view class="flex justify_center order-time">下单时间:2020-12-12 02:02:23</view>
+		<view class="order-info">
+			<view class="flex justify_between item">
+				<text>店铺名称</text>
+				<text>华帝金座(菜鸟驿站)</text>
+			</view>
+			<view class="flex justify_between item">
+				<text>订单编号</text>
+				<text>20202020202020</text>
+			</view>
+			<view class="flex justify_between item">
+				<text>服务骑手</text>
+				<text>张三</text>
+			</view>
+		</view>
+		<view class="order-info">
+			<view class="flex justify_between item">
+				<text>下单用户</text>
+				<text>18292887584</text>
+			</view>
+		</view>
+		<view class="order-info">
+			<view class="flex flex_column item type">
+				<view>回收品类明细</view>
+				<view></view>
+			</view>
+			<view class="flex justify_between item">
+				<text>黄纸1.2元/千克</text>
+				<text>5千克/6元</text>
+			</view>
+			<view class="flex justify_between item">
+				<text>黄纸1.2元/千克</text>
+				<text>5千克/6元</text>
+			</view>
+			<view class="flex justify_between item">
+				<text>黄纸1.2元/千克</text>
+				<text>5千克/6元</text>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+</script>
+
+<style lang="less">
+	.content-orderDetails{
+		width: 100%;
+		height: 100vh;
+		padding: 44upx 32upx;
+		background-color: #f5f5f5;
+		.order-states{
+			margin-bottom: 10upx;
+			text{
+				display: inline-block;
+				margin: 0 10upx;
+				font-size: 42upx;
+				color: #191919;
+			}
+		}
+		.order-time{
+			margin-bottom: 30upx;
+		}
+		.order-info{
+			margin-bottom: 20upx;
+			background: #FFFFFF;
+			border-radius: 24upx;
+			font-weight: 400;
+			color: #191919;
+			.item{
+				padding: 30upx;
+				border-bottom: 1px soild #bbb;
+				// &:first-child{
+				// 	color: #7C7D7E;
+				// }
+			}
+			.item>text:first-child{
+				color: #7C7D7E;
+			}
+			.type{
+				color: #7C7D7E;
+			}
+		}
+	}
+</style>

+ 16 - 0
pages/userCenter/index.vue

@@ -19,6 +19,16 @@
 		</view>
 		<!-- 列表 -->
 		<view class="list-container">
+			<!-- <view class="bottom-zhiyin" >
+				<u-image src="/static/houme_bg_guide.png" mode="" height="160"></u-image>
+			</view> -->
+			<view v-if="hasLogin" @click="toZY" class="list-item flex align_center justify_between">
+				<view class="flex align_center">
+					<u-icon class="icon" name="icon_out" custom-prefix="custom-icon" size="48" color="#333"></u-icon>
+					<text>回收指引</text>
+				</view>
+				<u-icon name="arrow-right" color="#9DA8B5" size="32"></u-icon>
+			</view>
 			<view @click="checkUpdate" class="list-item flex align_center justify_between">
 				<view class="flex align_center">
 					<u-icon class="icon" name="personal_icon_version" custom-prefix="custom-icon" size="48" color="#333"></u-icon>
@@ -91,6 +101,12 @@
 			})
 		},
 		methods:{
+			// 回收指引
+			toZY(){
+				uni.navigateTo({
+				    url: '/pages/index/zhiyin'
+				})
+			},
 			// 获取当前小程序版本
 			getVersion(){
 				const accountInfo = uni.getAccountInfoSync();

BIN
static/index/bg_order.png


BIN
static/index/def_home_shop.png


BIN
static/index/home_icon.png


BIN
static/index/home_icon_code.png


BIN
static/index/icon_acrylic.png


BIN
static/index/icon_aper_flower.png


BIN
static/index/icon_aper_miscellaneous.png


BIN
static/index/icon_aper_yellow.png


BIN
static/index/icon_book.png


BIN
static/index/icon_bottle.png


BIN
static/index/icon_clothes.png


BIN
static/index/icon_frame_black.png


BIN
static/index/icon_frame_white.png


BIN
static/index/icon_iron_thick.png


BIN
static/index/icon_iron_thin.png


BIN
static/index/icon_magazine.png


BIN
static/index/icon_newspaper.png


BIN
static/index/icon_steel.png


BIN
static/login_icon_logo.png


BIN
static/order/prescription_order_icon_pay.png