zhangdan hace 4 años
padre
commit
21acc4070c

+ 1 - 0
pages/index/index.vue

@@ -281,6 +281,7 @@
 						width:186upx;
 						height: 108upx;
 						background-image: url('../../static/home_sign_rider.png');
+						background-size:100% 100%;
 						.notice-static-text{
 							position: relative;
 							top:21upx;

+ 6 - 4
pages/index/userInfo.vue

@@ -21,7 +21,7 @@
 							<u-icon name="arrow-right" slot="right"></u-icon>
 						</u-form-item>
 						<u-form-item prop="houseAddress" label="详细信息:" required>
-							<u-input placeholder="请输入详细信息" v-model="form.houseAddress" maxlength="30"/>
+							<u-input placeholder="请输入详细信息" v-model="form.houseAddress" maxlength="30" class="houseAddress" type="textarea"/>
 						</u-form-item>
 				</u-form>
 			</view>
@@ -94,7 +94,6 @@
 			getDetailData(){
 				userDetail().then(res=>{
 					if(res.status==200){
-						this.$u.vuex('vuex_userInfoData',res.data)
 						this.userDetailInfo=res.data
 						this.$refs.addressType.setVal(res.data.addressType)
 						this.form.addressType=res.data.addressType
@@ -102,7 +101,7 @@
 						this.form.contactName=res.data.contactName
 						this.form.contactAddress=res.data.contactAddress
 						this.form.houseAddress=res.data.houseAddress
-						this.photograph=res.data.imageHeader ?res.data.imageHeader.split() :''
+						this.photograph=[res.data.imageHeader] ?res.data.imageHeader.split() :''
 						this.form.lat=res.data.latitude
 						this.form.lng=res.data.longitude
 					}
@@ -157,7 +156,6 @@
 							mask: true
 						})
 						saveImgToAliOss(res.tempFilePaths[0],(ret)=>{
-							console.log(res,'-----------上传照片')
 							this.photograph=res.tempFilePaths
 							uni.hideLoading()
 						})
@@ -318,6 +316,10 @@
 				}
 			}
 		}
+		.houseAddress{
+			display: flex;
+			flex-wrap: wrap;
+		}
 		.btns{
 			padding: 30upx 30upx 50upx;
 			background-color: #fff;

+ 5 - 18
pages/index/yuyue.vue

@@ -223,10 +223,10 @@
 				const year = date.getFullYear()
 				const month = date.getMonth()+1
 				const day = date.getDate()
-				const amMax = [year,month,day].join('-') + ' ' + '12:59:59'
-				const pmMax = [year,month,day].join('-') + ' ' + '18:00:00'
+				const amMax = [year,month,day].join('/') + ' ' + '12:59:59'
+				const pmMax = [year,month,day].join('/') + ' ' + '18:00:00'
 				const nowTime = date.getTime()
-				console.log([year,month,day].join('-'))
+				console.log([year,month,day].join('/'))
 				console.log(date.getTime(),'now time')
 				console.log(new Date(amMax).getTime(),'am time')
 				console.log(new Date(pmMax).getTime(),'pm time')
@@ -278,6 +278,7 @@
 							})
 					}
 				}
+				console.log(this.list,'--------------时间数组')
 				// return
 				this.show=true
 			},
@@ -317,22 +318,7 @@
 							this.reserveDateEnd=this.nowDate = year + "-" +( month<10? '0'+month:month ) + "-" + (day<10? '0'+(day+2):day+2)+' 18:00:00';
 						}
 					}
-					console.log(new Date(this.reserveDateEnd).getTime(),'--------------结束时间戳')
-					// if((new Date(this.reserveDateEnd).getTime())-(new Date().getTime())<=0){
-					// 	this.time=''
-					// 	this.show=true
-					// 	console.log(this.show,'------------展开')
-					// 	uni.showToast({
-					// 		title: '请选择合适的预约时间',
-					// 		icon: 'none'
-					// 	})
-					// 	return false
-					// }else{
-					// 	this.time=e[0].label + e[1].label
-					// }
 				}
-				
-				
 			},
 			// 选择用户信息
 			selectUserInfo(){
@@ -351,6 +337,7 @@
 			getDetailData(){
 				userDetail().then(res=>{
 					if(res.status==200){
+						this.$u.vuex('vuex_userInfoData',res.data)
 						this.form.info=res.data.contactName
 						this.userId=res.data.id
 						this.userLatitude=res.data.lat    // 用户位置经度

+ 4 - 4
pages/index/zhiyin.vue

@@ -2,19 +2,19 @@
 	<view class="content">
 		<view class="content-item">
 			<view class="item-title">一、点击首页【一键预约】,进入预约 下单流程。</view>
-			<view class="item-img"><image src="/static/stepOne.png" style="width: 260px;height: 200px;"></image></view>
+			<view class="item-img"><image src="/static/stepOne.png" style="width: 230px;height: 200px;"></image></view>
 		</view>
 		<view class="content-item">
 			<view class="item-title">二、录入预约时间、用户信息、预约分 类、预估重量等信息,输入完毕点击【 立刻下单】,即可提交订单。</view>
-			<view class="item-img"><image src="/static/stepTwo.png" style="width: 260px;height: 200px;"></image></view>
+			<view class="item-img"><image src="/static/stepTwo.png" style="width: 230px;height: 200px;"></image></view>
 		</view>
 		<view class="content-item">
 			<view class="item-title">三、订单提交完成,等待骑手上门。 可在【待服务】列表查看待服务订单 详情。</view>
-			<view class="item-img"><image src="/static/stepThree.png" style="width: 260px;height: 200px;"></image></view>
+			<view class="item-img"><image src="/static/stepThree.png" style="width: 230px;height: 200px;"></image></view>
 		</view>
 		<view class="content-item">
 			<view class="item-title">四、骑手上门服务,录入回收品类和 重量信息,自动生成应付金额,线下 支付给用户。</view>
-			<view class="item-img"><image src="/static/stepFour.png" style="width: 260px;height: 200px;"></image></view>
+			<view class="item-img"><image src="/static/stepFour.png" style="width: 230px;height: 200px;"></image></view>
 		</view>
 	</view>
 </template>

+ 15 - 5
pages/order/index.vue

@@ -1,17 +1,17 @@
 <template>
 	<view class="content">
 		<view v-for="item in orderList" class="order-content">
-			<view class="item-userInfo item1" @click="itemChange(item)">
+			<view class="item-userInfo item1">
 				<view class="userInfo">
 					<u-image src="/static/order_avatar_rider.png" width="72" height="72" shape="circle"></u-image>
 					<view class="userInfo-nameOrPhone">
 						<view class="name">{{item.name}}</view>
-						<view class="phone"><u-icon name="phone"></u-icon><text>{{item.phone}}</text></view>
+						<view class="phone" @click="callPhone(item.phone)"><u-icon name="phone" size="36"></u-icon><view style="margin-left: 10upx;">{{item.phone}}</view></view>
 					</view>
 				</view>
 				<view>
-					<u-icon v-show="item.isUp" name="arrow-up" color="#999" size="28"></u-icon>
-					<u-icon v-show="!item.isUp" name="arrow-down" color="#999" size="28"></u-icon>
+					<u-icon v-show="item.isUp" name="arrow-up" color="#999" size="36" @click="itemChange(item)"></u-icon>
+					<u-icon v-show="!item.isUp" name="arrow-down" color="#999" size="36" @click="itemChange(item)"></u-icon>
 				</view>
 			</view>
 			<view v-show="item.isUp">
@@ -19,7 +19,7 @@
 				<view class="item-userInfo-detail">
 					<view class="detail-title">用户信息</view>
 					<view class="detail-title coucntinfo"><text class="coucntname">{{item.contactName}}</text><text>{{item.contactMobile}}</text></view>
-					<view class="detail-title address">{{item.contactAddress}}</view>
+					<view class="detail-title address">{{item.contactAddress}}{{item.houseAddress}}</view>
 				</view>
 				<u-line color="#e5e5e5"/>
 				<view class="item-userInfo-detail detail-title">订单信息</view>
@@ -85,6 +85,12 @@
 					item.isUp = !item.isUp
 				})
 			},
+			//拨打电话
+			callPhone(phone) {
+			  uni.makePhoneCall({
+			    phoneNumber: phone
+			  });
+			},
 			// 获取订单列表
 			getOrderListData(){
 				getOrderList({orderStatus:'CONFIRM'}).then(res=>{
@@ -141,14 +147,18 @@
 				justify-content: space-between;
 				.userInfo{
 					display: flex;
+					align-items: center;
 					.userInfo-nameOrPhone{
 						margin-left: 20upx;
 						font-size: 28upx;
 						.name{
+							padding: 5upx 0;
 							font-weight: bold;
 							color: #222;
 						}
 						.phone{
+							display: flex;
+							padding: 5upx 0;
 							font-weight: 400;
 							color: #999;
 						}

+ 9 - 2
pages/userCenter/index.vue

@@ -50,8 +50,8 @@
 		data() {
 			return {
 				hasLogin: false,
-				name:this.$store.state.vuex_userInfoData.contactName,
-				mobile:this.$store.state.vuex_userInfoData.contactMobile,
+				// name:'',
+				// mobile:
 				userData: {},
 				price:'500元',  // 交易金额
 				version: '1.0.0' // 小程序版本
@@ -73,9 +73,16 @@
 		computed: {
 			user() {
 				return this.userData 
+			},
+			name(){
+				return this.$store.state.vuex_userInfoData.contactName
+			},
+			mobile(){
+				return this.$store.state.vuex_userInfoData.contactMobile
 			}
 		},
 		onLoad() {
+			console.log(this.$store.state.vuex_userInfoData,this.$store.state.vuex_userInfoData.contactName,this.$store.state.vuex_userInfoData.contactMobile,'-------------用户信息')
 			// this.getVersion()
 			// 开启分享
 			uni.showShareMenu({

BIN
static/home_sign_rider.png


BIN
static/login_icon_logo.png