Browse Source

Signed-off-by: 1004749546@qq.com <1004749546@qq.com>
增加注意事项页面

1004749546@qq.com 4 năm trước cách đây
mục cha
commit
25cddc9d60
4 tập tin đã thay đổi với 68 bổ sung3 xóa
  1. 5 0
      pages.json
  2. 35 0
      pages/careMore/careMore.vue
  3. 25 2
      pages/getOrder/getOrder.vue
  4. 3 1
      pages/login/login.vue

+ 5 - 0
pages.json

@@ -72,6 +72,11 @@
 			"style": {
 				"navigationBarTitleText": "选择优惠卷"
 			}
+		}, {
+			"path": "pages/careMore/careMore",
+			"style": {
+				"navigationBarTitleText": "注意事项"
+			}
 		}
 	],
 	"globalStyle": {

+ 35 - 0
pages/careMore/careMore.vue

@@ -0,0 +1,35 @@
+<template>
+	<view class="care-content">
+		<view class="title">
+			不能清洗车辆
+		</view>
+		<view class="img">
+			<u-image width="80%" height="1600rpx" mode="widthFix" src="/static/img/carmore.png"></u-image>
+		</view>
+	</view>
+</template>
+
+<script>
+</script>
+
+<style lang="scss">
+	page {
+		height: 100%;
+	}
+	.care-content{
+		padding: 20rpx;
+		width: 100%;
+		height: 100%;
+		display: flex;
+		flex-direction: column;
+		.title{
+			font-size: 30rpx;
+			font-weight: 600;
+			margin-bottom: 20rpx;
+		}
+		.img{
+			flex: 1;
+			margin-left: 40rpx;
+		}
+	}
+</style>

+ 25 - 2
pages/getOrder/getOrder.vue

@@ -18,8 +18,14 @@
 						注意:洗车过程中禁止移动车辆和上下车
 					</view>
 				</view>
-				<view class="item bottom">
-					<text class="item-text">超高加装件不能清洗</text>
+				<view class="item bottom" @click="lookMore">
+					<view class="item-text">
+						<text >超高加装件不能清洗</text>
+						<view class="right">
+							<text>查看更多</text>
+							<u-icon name="arrow-right" size="28"></u-icon>
+						</view>
+					</view>
 					<image src="/static/img/zyts.png" mode="aspectFit"></image>
 				</view>
 			</view>
@@ -34,6 +40,7 @@
 							<text>{{item.itemName}}</text>
 							<text class="price">¥{{item.currentPrice}}</text>
 						</view>
+						<u-empty text="暂无服务项目" img-width="120" v-if="itemList.length==0 && status!='loading'" mode="list"></u-empty>
 					</view>
 				</view>
 				<view class="choose-content">
@@ -91,6 +98,7 @@
 		},
 		data() {
 			return {
+				status: 'loadmore',
 				userPhone: '',
 				stepIndex: 0, // 当前步奏下标
 				serverIndex: 0, // 选择服务下标
@@ -184,9 +192,17 @@
 					}
 				})
 			},
+			// 查看更多注意事项
+			lookMore () {
+				uni.navigateTo({
+					url: '/pages/careMore/careMore'
+				})
+			},
 			// 获取服务列表
 			getServerList () {
+				this.status = 'loading'
 				getStoreItems({storeId:100000}).then(res =>{
+					this.status = 'loadmore'
 					if (res.status == 200) {
 						this.itemList = res.data 
 						this.serverIndex = 0
@@ -269,6 +285,9 @@
 				if (this.isRead !='read') {
 					this.toashMsg('请先阅读并同意无人洗车《注意事项及服务协议》!')
 					return 
+				} else if (this.itemList.length==0) {
+					this.toashMsg('暂无服务项目')
+					return
 				}
 				uni.showLoading({
 					title: '请求中...',
@@ -414,6 +433,10 @@
 						color: #333;
 					}
 					.item-text{
+						width: 100%;
+						padding:0 20rpx;
+						display: flex;
+						justify-content: space-between;
 						padding-top: 20rpx;
 					}
 				}

+ 3 - 1
pages/login/login.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="content">
 		<image class="logo-img" mode="aspectFit" src="/static/img/logo.png"></image>
-		<u-button shape="circle" type="succes" plain class="login-btn" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">
+		<u-button shape="circle" class="login-btn" :hair-line="false" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">
 			<view class="login-btn-content">
 			  <view class="wechat-img"></view>
 			  <view>微信登陆</view>
@@ -39,6 +39,7 @@
 			if (path) {
 				this.path = decodeURIComponent(path);
 			}
+			console.log(this.path,this.lanuch,'111111111')
 		},
 		methods: {
 			getPhoneNumber(e) {
@@ -123,6 +124,7 @@
 	
 	.login-btn {
 	  margin-top: 30px;
+	  border: 1px solid #4CD964;
 	}
 	
 	.login-btn-content {