个人中心界面优化

pages/index/index.vue

@@ -68,9 +68,12 @@
 									<view class="room-name">
 										<text>{{item.name}}{{item.roomType?'【'+roomTypeEnum[item.roomType]+'】':''}}</text>
 									</view>
-									<view class="price" @tap.stop="onNavToInfo(item)">
-										<text>查看包厢</text>
-										<text class="cuIcon-playfill text-gray text-lg"></text>
+									<view class="price">
+										<!-- <text>查看包厢</text>
+										<text class="cuIcon-playfill text-gray text-lg"></text> -->
+										<view class="">
+											<view class='cu-tag radius' :class="item.status==0?'line-green':item.status==1?'line-orange':'line-blue'" >{{roomStatusEnum[item.status]}}</view>
+										</view>
 									</view>
 								</view>
 								<view class="facilitie-box">
@@ -99,11 +102,11 @@
 											<text>惠</text>
 										</view>
 										<view class="part-2">
-											<text>{{val.duration}}小时{{val.price}}元</text>
+											<text>{{val.duration}}小时套餐{{val.price}}元</text>
 										</view>
-										<view class="part-3">
+										<!-- <view class="part-3">
 											<text>{{(val.price/val.duration).toFixed(2)}}/小时</text>
-										</view>
+										</view> -->
 									</view>
 								</view>
 								<view class="">
@@ -212,16 +215,21 @@
 				],
 				facilitieList: {},
 				roomTypeEnum:{},
+				roomStatusEnum:{},
 				show: true,
 				timer: null
 			}
 		},
 		onShow() {
 			this.onGetSysConfig();
+			uni.showLoading({
+				title:'加载中'
+			})
 			if (uni.getStorageSync("storeId") && this.storeList.length) {
 				this.storeId = uni.getStorageSync("storeId")
 				let obj = this.storeList.filter(item => item.id === this.storeId)[0]
-				console.log(obj, 909090)
+
+                new Promise((resolve)=>{
 					this.storeInfo = {
 						...obj,
 						distance:obj.distance? Number(obj.distance.substr(0,8)).toFixed(2):0,
@@ -232,8 +240,11 @@
 								images: item.images ? item.images.split(",").map(val => this.hostUrl + val) : []
 							}
 						}) : []
-
 					}
+					resolve()
+				}).then(()=>{
+					uni.hideLoading()
+				})
 			} else {
 				this.onLoading()
 			}
@@ -248,9 +259,6 @@
 
 		},
 		onLoad(option) {
-				uni.showLoading({
-					title: "加载中"
-				})
 			// 隐藏原生的tabbar
 			uni.hideTabBar();
 			this.onCheckUserLogin();
@@ -280,6 +288,7 @@
 						uni.setStorageSync('dicts', JSON.stringify(res.data.data))
 						this.facilitieList = getDictItem(dicts, "indoor_facilities");
 						this.roomTypeEnum = getDictItem(dicts, "store_room_type");
+						this.roomStatusEnum = getDictItem(dicts, "store_room_status");
 					})
 				// }
 			},
@@ -340,17 +349,20 @@
 				})
 			},
 			onGetListStore() {
+				let that = this;
 				getListStore({
 					...this.queryParams,
 					nowLatitude: this.latitude||'',
 					nowLongitude: this.longitude||''
 				}).then(res => {
 					if (res.data.code == 200 && res.data.data.length) {
-						uni.hideLoading()
 						this.storeList = res.data.data;
 						let obj = {}
 						obj = res.data.data[0];
-						this.storeInfo = {
+
+						
+						new Promise((resolve,reject)=>{
+							that.storeInfo = {
 								...obj,
 								distance:obj.distance? Number(obj.distance.substr(0,8)).toFixed(2):0,
 								roomVoList: obj.roomVoList.map(item => {
@@ -362,6 +374,13 @@
 									}
 								})
 							}
+							resolve()
+						}).then(()=>{
+							uni.hideLoading()
+						})
+						// this.$nextTick(()=>{
+							
+						// })
 					}
 				})
 			},
@@ -955,12 +974,14 @@
 				display: flex;
 				flex-direction: row;
 				align-items: center;
+				width: 48%;
 				height: 44rpx;
 				background: #FFFFFF;
 				border-radius: 8upx;
 				border: 2rpx solid #fc3f21;
-				margin: 8upx;
+				margin: 8upx 1%;
 		        overflow: hidden;
+				
 		        .part-1{
 					display: flex;
 					justify-content: center;
@@ -974,11 +995,12 @@
 				}
 				.part-2{
 					display: flex;
+					flex: 1;
 					justify-content: center;
 					align-items: center;
 					height: 100%;
 					padding: 8upx;
-					border-right: 2upx solid #fc3f21;
+					// border-right: 2upx solid #fc3f21;
 				}
 				.part-3{
 					display: flex;

pages/order/order.vue

@@ -56,7 +56,7 @@
 						<view v-for="(item,index) in packageMode" :key="index" class="flex-col item"
 							:class="{active: modeIndex===index,'item-3':packageMode.length<3,'item-n':packageMode.length>=3}"
 							@tap="onChangeMode(index)">
-							<text class="text-title">{{item.name}}</text>
+							<text class="text-title">{{item.duration}}小时套餐</text>
 							<view class="flex-row" style="margin-top: 12upx;">
 								<text style="margin-bottom: 4upx;">￥</text>
 								<text class="text-title text-bold text-xl">{{item.price}}</text>

pages/orderRecord/orderRecord.vue

@@ -75,7 +75,7 @@
 						<text class="text-gray margin-right">优惠券抵扣</text>
 						<text class="text-title">{{item.couponName}}</text>
 					</view>
-					<view class="flex-row part-1">
+					<view class="flex-between part-1">
 						<text class="text-gray margin-right">订单编号:</text>
 						<text class="text-title">{{item.orderNo}}</text>
 					</view>

pages/payRecord/index.vue

@@ -5,15 +5,16 @@
               	  <view v-for="(item,index) in list" :key="index" class="list-item" @tap="onNavToOrderInfo(item)">
 					<view class="flex-between part-1">
 						<view class="">
-							<text class="text-title">{{item.name}}:</text>
+							<text class="text-title">{{item.name}}</text>
 						</view>
 						<view class="flex-row">
-							<text class="text-black text-bold text-lg">{{item.price}}元</text>
+							<text class="text-bold text-xl" :class="item.sign=='income'?'text-red':'text-black'">{{payStatus[item.sign||'expenditure']}}</text>
+							<text class="text-black text-bold text-lg" >{{item.price}}元</text>
 						</view>
 					</view>
 					<view class="flex-between part-1">
-						<text>创建时间:</text>
 						<text>{{item.createTime}}</text>
+						<text>{{payTypeEnum[item.payType||'1']}}</text>
 					</view>
               	  </view>
               </view>
@@ -74,7 +75,16 @@ import NoLogin from "@/components/noLogin/noLogin"
 					pageSize: 10
 				},
 				loginStatus:true,
-				orderStatusEnum:{}
+				orderStatusEnum:{},
+				payTypeEnum:{
+					1:"微信支付",
+					2:"支付宝支付",
+					3:"余额支付"
+				},
+				payStatus:{
+					expenditure:'-',
+					income:'+'
+				}
 			};
 		},
 		onLoad() {
@@ -163,7 +173,7 @@ import NoLogin from "@/components/noLogin/noLogin"
 				align-items: center;
 				.list-item{
 					width: 94%;
-					padding: 30upx 20upx;
+					padding: 20upx 20upx;
 					border-radius: 20upx;
 					background-color: #ffffff;
 					margin-top: 30upx;
@@ -171,6 +181,11 @@ import NoLogin from "@/components/noLogin/noLogin"
 						display: flex;
 						align-items: center;
 						padding: 10upx;
+						.flex-row{
+							display: flex;
+							flex-direction: row;
+							align-items: center;
+						}
 					}
 				}
 			}

pages/setUserInfo/index.vue

@@ -67,7 +67,7 @@
 				userInfo:{
 					avatar:"",
 					nickName:"",
-					phone:''
+					sex:''
 				},
 				assetsPath:config.assetsPath,
 				nickName:"",
@@ -101,18 +101,37 @@
 				})
 			},
 			onSaveUserInfo(){
-				if(this.userInfo.phone && !checkPhone(this.userInfo.phone)){
-					uni.showToast({
-						icon:'none',
-						title:'手机号输入不正确'
+				// if(this.userInfo.phone && !checkPhone(this.userInfo.phone)){
+				// 	uni.showToast({
+				// 		icon:'none',
+				// 		title:'手机号输入不正确'
+				// 	})
+				// 	return
+				// }
+				uni.showLoading({
+					title:'提交中'
 				})
-					return
-				}
-				updateUserInfo(this.userInfo).then(res=>{
+				updateUserInfo({
+					id:this.userInfo.id,
+					avatar:this.userInfo.avatar,
+					nickName:this.userInfo.nickName,
+					sex:this.userInfo.sex
+				}).then(res=>{
+					uni.hideLoading()
 					if(res.data.code == 200 ){
 						uni.showToast({
 							icon:"none",
-							title:"保存成功"
+							title:"保存成功",
+							success: () => {
+								setTimeout(()=>{
+									uni.navigateBack()
+								},500)
+							}
+						})
+					}else{
+						uni.showToast({
+							icon:"none",
+							title:res.data.msg,
 						})
 					}
 				})