柒零 1 jaar geleden
bovenliggende
commit
cf1e0b6d67
4 gewijzigde bestanden met toevoegingen van 68 en 12 verwijderingen
  1. 48 2
      subpages/data/data.js
  2. 16 6
      subpages/data/data.wxml
  3. 1 2
      subpages/helpDetails/helpDetails.wxss
  4. 3 2
      subpages/helpList/helpList.wxss

+ 48 - 2
subpages/data/data.js

@@ -1207,6 +1207,8 @@ Page({
 		sns: [],//床
 		dateData: [],//日期
 		dateTimeData: [],//时间段
+		selectTitleList: [],//床垫
+		showSelect: false,
 		showSelectSn: false,
 		showSelectDate: false,
 		showSelectDateTime: false,
@@ -1538,6 +1540,21 @@ Page({
 		}
 
 	},
+	onTitleChange(event) {
+		const { picker, value, index } = event.detail;
+		console.log(`当前值:${value.rpid}, 当前索引:${index}`);
+		console.log(`当前值:${value.bedname}, 当前索引:${index}`);
+		console.log(`当前值:${value.hotelname}, 当前索引:${index}`);
+		console.log(`当前值:${value.roomname}, 当前索引:${index}`);
+		this.setData({
+			reportId: value.rpid,
+			hotelname: value.hotelname,
+			roomname: value.roomname,
+			bedname: value.bedname,
+		});
+		this.closePicker();
+		this.getReportData();//更新报告
+	},
 	onSnChange(event) {
 		const { picker, value, index } = event.detail;
 		console.log(`当前值:${value.sn}, 当前索引:${index}`);
@@ -1570,10 +1587,14 @@ Page({
 		var type = e.currentTarget.dataset.type;
 		console.log(type);
 
-		if (type == 'sn' && this.data.sns.length) {
+		if (type == 'sn' && this.data.selectTitleList.length) {
 			this.setData({
-				showSelectSn: true,
+				showSelect: true,
 			});
+		} else if (type == 'sn' && this.data.sns.length) {
+			// this.setData({
+			// 	showSelectSn: true,
+			// });
 		} else if (type == 'date' && this.data.dateData.length) {
 			return
 			// this.setData({
@@ -1588,11 +1609,35 @@ Page({
 	},
 	closePicker() {
 		this.setData({
+			showSelect: false,
 			showSelectSn: false,
 			showSelectDate: false,
 			showSelectDateTime: false
 		});
 	},
+	getAllUnionidList() {
+		var that = this;
+		wx.request({
+			url: `${aipushApi}` + '/allunionidlist',
+			data: {
+				"udi": wx.getStorageSync("unionid"),
+				"token": token_today_push
+			},
+			method: 'POST',
+			success(res) {
+				try {
+					const tempList = res.data.data || []
+					that.setData({
+						selectTitleList: tempList,
+					});
+					
+				} catch (error) {
+					console.error(error);
+				}
+
+			},
+		})
+	},
 	getSnData() {
 		var that = this;
 		wx.request({
@@ -1927,6 +1972,7 @@ Page({
 						});
 
 						that.getSnData();//需要筛选的 要获取sn
+						that.getAllUnionidList();
 					} else {
 						// wx.showModal({
 						// 	title: '提示',

+ 16 - 6
subpages/data/data.wxml

@@ -541,31 +541,41 @@
 		<authorized-login-dialog showDialog="{{showAuthorizedDialog}}"
 			bind:authorizationSuccessful="authorizationSuccessful"></authorized-login-dialog>
 
+		<!-- 选择床垫 -->
+		<van-popup show="{{ showSelect }}" bind:close="closePicker" position="bottom" lock-scroll z-index="9999"
+			close-on-click-overlay showToolbar="true">
+			<view style="width: 100vw;display: block;">
+				<van-picker columns="{{ selectTitleList }}" value-key="title" bind:confirm="onTitleChange"
+					bind:cancel="closePicker" />
+			</view>
+		</van-popup>
+
+
 		<!-- 选择床 -->
-		<van-popup show="{{ showSelectSn }}" bind:close="closePicker" position="bottom" lock-scroll z-index="9999"
+		<!-- <van-popup show="{{ showSelectSn }}" bind:close="closePicker" position="bottom" lock-scroll z-index="9999"
 			close-on-click-overlay showToolbar="true">
 			<view style="width: 100vw;display: block;">
 				<van-picker columns="{{ sns }}" value-key="pos" bind:confirm="onSnChange" bind:cancel="closePicker" />
 			</view>
-		</van-popup>
+		</van-popup> -->
 
 
 		<!-- 选择日期 -->
-		<van-popup show="{{ showSelectDate }}" bind:close="closePicker" position="bottom" lock-scroll z-index="9999"
+		<!-- <van-popup show="{{ showSelectDate }}" bind:close="closePicker" position="bottom" lock-scroll z-index="9999"
 			close-on-click-overlay showToolbar="true">
 			<view style="width: 100vw;display: block;">
 				<van-picker columns="{{ dateData }}" value-key="rdate" bind:confirm="onDateChange"
 					bind:cancel="closePicker" />
 			</view>
-		</van-popup>
+		</van-popup> -->
 		<!-- 选择时间段 -->
-		<van-popup show="{{ showSelectDateTime }}" bind:close="closePicker" position="bottom" lock-scroll z-index="9999"
+		<!-- <van-popup show="{{ showSelectDateTime }}" bind:close="closePicker" position="bottom" lock-scroll z-index="9999"
 			close-on-click-overlay showToolbar="true">
 			<view style="width: 100vw;display: block;">
 				<van-picker columns="{{ dateTimeData }}" value-key="durations" bind:confirm="onDateTimeChange"
 					bind:cancel="closePicker" />
 			</view>
-		</van-popup>
+		</van-popup>  -->
 
 	</view>
 </view>

+ 1 - 2
subpages/helpDetails/helpDetails.wxss

@@ -25,6 +25,5 @@ page {
     margin: 0 auto;
     padding: 30rpx 0;
     width: 630rpx;
-    font-size: 24rpx;
-    color: #666666;
+    overflow: auto;
 }

+ 3 - 2
subpages/helpList/helpList.wxss

@@ -54,9 +54,10 @@ page {
 }
 
 .menu-title {
-    font-size: 28rpx;
+    font-size: 32rpx;
     margin-left: 20rpx;
     color: #333333;
+    font-weight: bold;
 }
 
 .item {
@@ -79,6 +80,6 @@ page {
 
 .item-title {
     flex: 1;
-    font-size: 26rpx;
+    font-size: 28rpx;
     color: #333333;
 }