提交

components/c-datepicker/c-datepicker.vue

@@ -549,7 +549,8 @@
 		},
 		mounted(){
 			setTimeout(()=>{
-				this.setValue();
+				
+				this.setValue(this.value);
 			}, 0);
 		}
 	}

components/c-form-type-action-sheet/c-form-type-action-sheet.vue

@@ -5,11 +5,11 @@
 				<text class="text">{{title}}</text>
 				<view class="btn-action" @click="cancel()">关闭</view>
 			</view>
-			<view class="search-wrap">
+			<!-- <view class="search-wrap">
 				<view class="input-wrap">
 					<input type="text" v-model="search" placeholder="请输入搜索关键字" placeholder-style="color: #999999" />
 				</view>
-			</view>
+			</view> -->
 			<view class="list-wrap">
 				<scroll-view class="scroll-inner" scroll-y="true" >
 					<view class="list-item" :class="{active: choices.indexOf(item.id) >= 0}" v-for="item in clist" :key="item.id" @click.stop="choice(item)">

env.js

@@ -6,7 +6,7 @@
 export const STORAGE_NAME = 'sign_app_'
 
 const ENV_BASE_URL = {
-	development: 'http://118.190.148.113:10070', //开发环境
+	development: 'https://fny.palace.qingdaofushan.com', //开发环境
 	production: 'https://fny.palace.qingdaofushan.com', //生产环境
 }
 	

pages/signs/address/address.vue

@@ -35,9 +35,9 @@
 						<view class="extra"></view>
 					</view>
 					<view class="form-item__input__wrap">
-						<view class="form-item__input" @click="showPos">
-							<input placeholder-class="input-placeholder" class="input" type="text" :value="form.cabinetPositionName" placeholder="请选择阁位" disabled />
-							<view class="icon"><image style="width: 16rpx;height: 16rpx;" src="/static/app/page3/arrow-down.png" mode="aspectFit"></image></view>
+						<view class="form-item__input">
+							<input placeholder-class="input-placeholder" class="input" type="text" :value="form.andName" placeholder="请选择阁位" disabled />
+							<!-- <view class="icon"><image style="width: 16rpx;height: 16rpx;" src="/static/app/page3/arrow-down.png" mode="aspectFit"></image></view> -->
 						</view>
 					</view>
 				</view>
@@ -71,7 +71,7 @@
 		<!-- 阁位 -->
 		<c-form-type-action-sheet ref="pos" title="请选择阁位" :loadData="getPos">
 			<template v-slot="{item}">
-				<view>{{item.name}}</view>
+				<view>{{item.area}}-{{item.name}}</view>
 			</template>
 		</c-form-type-action-sheet>
 		<!-- 验证码 -->
@@ -92,6 +92,7 @@
 					inputSearch: '',
 					cabinetAreaId: '',
 					cabinetAreaName: '',
+					andName: '',
 					cabinetPositionId: '',
 					cabinetPositionName: '',
 					code: '',
@@ -133,7 +134,7 @@
 					throw new Error("")
 				}
 				return res.data.map(item => {
-					return { ...item, id: item.cabinetPositionId, name: item.cabinetPositionName }
+					return { ...item, id: item.cabinetPositionId, area: item.cabinetAreaName, name: item.cabinetPositionName }
 				})
 			},
 			showPos() {
@@ -145,6 +146,7 @@
 					if(res.arr && res.arr.length > 0){
 						this.form.cabinetPositionId = res.arr[0].cabinetPositionId
 						this.form.cabinetPositionName = res.arr[0].cabinetPositionName
+						this.form.andName = res.arr[0].cabinetAreaName + '-' +  res.arr[0].cabinetPositionName 
 					}
 				})
 			},
@@ -176,7 +178,7 @@
 						this.$refs.uToast.hide()
 						if(res.code == 200){
 							// 这里此提示会被this.start()方法中的提示覆盖
-							this.$refs.uToast.show({type: 'success', message: '验证码已发送', position: 'top'})
+							this.$refs.uToast.show({type: 'success', message: res.msg, position: 'top', duration: 3000})
 							// 通知验证码组件内部开始倒计时
 							this.$refs.uCode.start()
 						}else{

pages/signs/address/index.scss

@@ -20,7 +20,7 @@
 			align-items: center;
 			height: 68rpx;
 			.name{
-				font-size: 30rpx;
+				font-size: 32rpx;
 				font-family: PingFang SC;
 				font-weight: bold;
 				color: #212121;
@@ -53,7 +53,7 @@
 					margin-right: 10px;
 				}
 				.input-placeholder{
-					font-size: 28rpx;
+					font-size: 30rpx;
 					font-family: PingFang SC;
 					font-weight: bold;
 					color: #B8BBBF;
@@ -112,7 +112,7 @@
 		min-width: 178rpx;
 		padding-right: 10rpx;
 		flex-shrink: 0;
-		font-size: 24rpx;
+		font-size: 28rpx;
 		font-family: PingFang SC;
 		font-weight: 500;
 		color: $u-primary;

pages/signs/subscribe/index.scss

@@ -20,14 +20,14 @@
 			align-items: center;
 			height: 68rpx;
 			.name{
-				font-size: 30rpx;
+				font-size: 32rpx;
 				font-family: PingFang SC;
 				font-weight: bold;
 				color: #212121;
 			}
 			.extra{
 				margin-left: auto;
-				font-size: 24rpx;
+				font-size: 26rpx;
 				font-family: PingFang SC;
 				font-weight: bold;
 				color: #79A9CE;
@@ -43,7 +43,7 @@
 					flex: 1;
 					height: 100%;
 					padding-left: 10px;
-					font-size: 28rpx;
+					font-size: 30rpx;
 					font-family: PingFang SC;
 					font-weight: bold;
 					color: #000;
@@ -53,7 +53,7 @@
 					margin-right: 10px;
 				}
 				.input-placeholder{
-					font-size: 28rpx;
+					font-size: 30rpx;
 					font-family: PingFang SC;
 					font-weight: bold;
 					color: #B8BBBF;
@@ -90,6 +90,16 @@
 		}
 	}
 	.time-range{
+		position: relative;
+		.cover-swiper{
+			position: absolute;
+			right: 0;
+			top: 0;
+			bottom: 0;
+			width: 80rpx;
+			background-color: transparent;
+			z-index: 3;
+		}
 		// padding-left: 30px;
 		flex: 1;
 		height: 100%;

pages/signs/subscribe/subscribe.vue

@@ -9,7 +9,7 @@
 					</view>
 					<view class="form-item__input__wrap" @click="showPos">
 						<view class="form-item__input">
-							<input placeholder-class="input-placeholder" class="input" type="text" :value="form.cabinetPositionName" placeholder="请选择阁位" disabled />
+							<input placeholder-class="input-placeholder" class="input" type="text" :value="form.andName" placeholder="请选择阁位" disabled />
 							<view class="icon"><image style="width: 16rpx;height: 16rpx;" src="/static/app/page3/arrow-down.png" mode="aspectFit"></image></view>
 						</view>
 					</view>
@@ -49,6 +49,7 @@
 									</view>
 								</swiper-item>
 							</swiper>
+							<view class="cover-swiper"></view>
 						</view>
 					</view>
 				</view>
@@ -63,7 +64,7 @@
 		<!-- 阁位 -->
 		<c-form-type-action-sheet ref="pos" title="请选择阁位" :loadData="getPos">
 			<template v-slot="{item}">
-				<view>{{item.name}}</view>
+				<view>{{item.area}}-{{item.name}}</view>
 			</template>
 		</c-form-type-action-sheet>
 
@@ -80,9 +81,11 @@
 				form: {
 					cabinetPositionId: '',
 					cabinetPositionName: '',
+					andName: '',
 					num: '',
+					day: dayjs().add(1, 'day').format('YYYY/MM/DD'),
 					beginDate: dayjs().format('YYYY-MM-DD'),
-					visitDate: dayjs().format('YYYY-MM-DD'),
+					visitDate: dayjs().add(1, 'day').format('YYYY-MM-DD'),
 					visitTime: ''
 				},
 				current: null,
@@ -144,7 +147,7 @@
 					throw new Error("")
 				}
 				return res.data.map(item => {
-					return { ...item, id: item.cabinetPositionId, name: item.cabinetPositionName || '' }
+					return { ...item, id: item.cabinetPositionId, area: item.cabinetAreaName || '未获取', name: item.cabinetPositionName || '未获取' }
 				})
 			},
 			showPos() {
@@ -152,6 +155,7 @@
 					if(res.arr && res.arr.length > 0){
 						this.form.cabinetPositionId = res.arr[0].cabinetPositionId
 						this.form.cabinetPositionName = res.arr[0].cabinetPositionName
+						this.form.andName = (res.arr[0].cabinetAreaName || '未获取到') + '-' +  (res.arr[0].cabinetPositionName || '未获取到')
 					}
 				})
 			},

unpackage/dist/build/mp-weixin/components/c-form-type-action-sheet/c-form-type-action-sheet.wxml

@@ -1 +1 @@
-<view class="{{['mask','data-v-f95db852',maskState===0?'none':maskState===1?'show':'']}}" catchtouchmove="true" data-event-opts="{{[['tap',[['cancel']]]]}}" bindtap="__e"><view data-event-opts="{{[['tap',[['stopPrevent',['$event']]]]]}}" class="mask-content data-v-f95db852" catchtap="__e"><view class="head data-v-f95db852"><text class="text data-v-f95db852">{{title}}</text><view data-event-opts="{{[['tap',[['cancel']]]]}}" class="btn-action data-v-f95db852" bindtap="__e">关闭</view></view><view class="search-wrap data-v-f95db852"><view class="input-wrap data-v-f95db852"><input type="text" placeholder="请输入搜索关键字" placeholder-style="color: #999999" data-event-opts="{{[['input',[['__set_model',['','search','$event',[]]]]]]}}" value="{{search}}" bindinput="__e" class="data-v-f95db852"/></view></view><view class="list-wrap data-v-f95db852"><scroll-view class="scroll-inner data-v-f95db852" scroll-y="true"><block wx:for="{{$root.l0}}" wx:for-item="item" wx:for-index="__i0__" wx:key="id"><view data-event-opts="{{[['tap',[['choice',['$0'],[[['clist','id',item.$orig.id]]]]]]]}}" class="{{['list-item','data-v-f95db852',(item.g0>=0)?'active':'']}}" catchtap="__e"><view class="content data-v-f95db852"><slot></slot><scoped-slots-default item="{{item.$orig}}" class="scoped-ref" bind:__l="__l"></scoped-slots-default></view></view></block><block wx:if="{{clist.length==0}}"><view class="empty-wrap data-v-f95db852"><image src="/static/app/data_empty.png" mode="widthFix" class="data-v-f95db852"></image><view class="text data-v-f95db852">暂无数据</view></view></block><view style="height:180rpx;" class="data-v-f95db852"></view></scroll-view></view><view class="action-wrap data-v-f95db852"><button data-event-opts="{{[['tap',[['confirm']]]]}}" class="btn-action btn-green btn-round data-v-f95db852" bindtap="__e">提 交</button></view></view></view>
+<view class="{{['mask','data-v-5157ec12',maskState===0?'none':maskState===1?'show':'']}}" catchtouchmove="true" data-event-opts="{{[['tap',[['cancel']]]]}}" bindtap="__e"><view data-event-opts="{{[['tap',[['stopPrevent',['$event']]]]]}}" class="mask-content data-v-5157ec12" catchtap="__e"><view class="head data-v-5157ec12"><text class="text data-v-5157ec12">{{title}}</text><view data-event-opts="{{[['tap',[['cancel']]]]}}" class="btn-action data-v-5157ec12" bindtap="__e">关闭</view></view><view class="list-wrap data-v-5157ec12"><scroll-view class="scroll-inner data-v-5157ec12" scroll-y="true"><block wx:for="{{$root.l0}}" wx:for-item="item" wx:for-index="__i0__" wx:key="id"><view data-event-opts="{{[['tap',[['choice',['$0'],[[['clist','id',item.$orig.id]]]]]]]}}" class="{{['list-item','data-v-5157ec12',(item.g0>=0)?'active':'']}}" catchtap="__e"><view class="content data-v-5157ec12"><slot></slot><scoped-slots-default item="{{item.$orig}}" class="scoped-ref" bind:__l="__l"></scoped-slots-default></view></view></block><block wx:if="{{clist.length==0}}"><view class="empty-wrap data-v-5157ec12"><image src="/static/app/data_empty.png" mode="widthFix" class="data-v-5157ec12"></image><view class="text data-v-5157ec12">暂无数据</view></view></block><view style="height:180rpx;" class="data-v-5157ec12"></view></scroll-view></view><view class="action-wrap data-v-5157ec12"><button data-event-opts="{{[['tap',[['confirm']]]]}}" class="btn-action btn-green btn-round data-v-5157ec12" bindtap="__e">提 交</button></view></view></view>

unpackage/dist/build/mp-weixin/pages/signs/address/address-c-form-type-action-sheet-default.wxml

@@ -1 +1 @@
-<view class="data-v-094d4605">{{item.name}}</view>
+<view class="data-v-7760e974">{{item.name}}</view>

unpackage/dist/build/mp-weixin/pages/signs/address/address-c-form-type-action-sheet-default1.wxml

@@ -1 +1 @@
-<view class="data-v-094d4605">{{item.name}}</view>
+<view class="data-v-7760e974">{{item.area+"-"+item.name}}</view>

unpackage/dist/build/mp-weixin/pages/signs/subscribe/subscribe-c-form-type-action-sheet-default.wxml

@@ -1 +1 @@
-<view class="data-v-c2ee8382">{{item.name}}</view>
+<view class="data-v-71318636">{{item.area+"-"+item.name}}</view>