页面优化

config.js

@@ -1,6 +1,5 @@
 // 应用全局配置
 module.exports = {
-  
   baseUrl: 'https://zxyyq.qs163.cn/prod-api',
   // baseUrl: 'http://47.99.82.249:5010/prod-api',
   // baseUrl: 'http://192.168.101.168:8065',

manifest.json

@@ -2,8 +2,8 @@
     "name" : "智慧园区",
     "appid" : "__UNI__9ACE566",
     "description" : "",
-    "versionName" : "1.0.1",
-    "versionCode" : 101,
+    "versionName" : "1.0.2",
+    "versionCode" : 102,
     "transformPx" : false,
     "app-plus" : {
         "usingComponents" : true,

utils/request.js

@@ -5,7 +5,7 @@ import { getToken } from '@/utils/auth'
 import errorCode from '@/utils/errorCode'
 import { toast, showConfirm, tansParams } from '@/utils/common'
 
-let timeout = 10000
+let timeout = 60000
 const baseUrl = config.baseUrl
 // const Clientid = config.Clientid
 var confirmflag = config.confirmflag

work/pages/yyorder/meetadd.vue

@@ -22,7 +22,7 @@
 								<!--已经预约的时间段 -->
 								<view class="tlist" v-show="meetid==ite.conferenceRoomId">
 									<view class="ttips flexc">
-										<image :src="tipimg"></image>已预约时段
+										<image :src="tipimg"></image>已被预约时段
 									</view>
 									<block v-if="ite.conferenceRoomOrderList&&ite.conferenceRoomOrderList.length">
 										<view class="ttime flexc" v-for="(tite,tidx) in ite.conferenceRoomOrderList" :key="tite.conferenceRoomOrderId">
@@ -30,11 +30,11 @@
 											{{tite.startTime}} 至 {{tite.endTime}}
 										</view>
 									</block>
-									<view v-else class="ttime">暂无数据</view>
+									<view v-else class="ttime">当前会议室空闲，无预约记录</view>
 								</view>
 							</view>
 							<view class="ybtn flexcc" @click="getNextFn">下一步</view>
-							<view class="tips">* 为避免重复操作，请先选择会议室查看是否被占用。</view>
+							<view class="tips">* 为避免您的重复操作，请避开会议室已被预约时段</view>
 						</view>
 					</view>
 					<view v-show="stepval==2">