ios问题修改

config.js

@@ -12,7 +12,7 @@ module.exports = {
   // baseUrl: 'http://192.168.2.82:58080',//张天强
   // baseUrl: 'http://192.168.2.69:58080',//董高文
   // baseUrl: 'http://192.168.0.44:58080',//董高文
-  // baseUrl: 'http://192.168.2.74:28080',//盛旭
+  // baseUrl: 'http://192.168.2.72:58080',//盛旭
   // baseUrl: 'http://192.168.1.102:58080',//测试
   // #endif
   // #ifdef  APP-PLUS

pages/advanceOrder/index.vue

@@ -81,7 +81,6 @@
 	</view> 
 
     <!-- 购物车 --> 
-    <view style="height: 60px"></view>
     <view class="shop-car">
       <view class="car-cont">
         <view class="flex align-center" @click="openCar">
@@ -689,12 +688,12 @@ page {
 .menuContent{
 	width: 100%;
 	display: flex;
-	height: 74vh;
+	height: 71vh;
 	// background-color: #DD7D3C;
 }
 .content-left{
 	width: 23%;
-	height: 74vh;
+	height: 71vh;
 } 
 .active2 {
 	color: #DD7D3C;
@@ -704,7 +703,7 @@ page {
 
 .content-right{
 	width: 77%;
-	height: 74vh;
+	height: 71vh;
 	// height: auto !important;
 }
 .scroll-right-item{
@@ -732,7 +731,7 @@ page {
   // z-index: 999;
 }
 .top-cont {
-  height: 55px;
+  height: 42px;
   padding: 0 16px;
   background: #fff;
   .top-right-cont {

pages/feedback/index.vue

@@ -252,6 +252,10 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+/deep/.u-action-sheet__item-wrap {
+	overflow: auto;
+	max-height: 50vh;
+}
 .feedback-page {
   height:96vh;
   overflow-y: auto;

pages/index.vue

@@ -93,7 +93,7 @@
 			  <view class="box-title">客流统计</view> 
 			</view>
 			
-			<view class="handle-box-item2" @click="goToYj" style="background: #F4FFFF;" v-if="userInfo.orgId=='456365640698040320'||userInfo.custNum.indexOf('@yjst')>-1">
+			<view class="handle-box-item2" @click="goToYj" style="background: #F4FFFF;" v-if="userInfo.orgId=='456365640698040320'||userInfo.custNum.indexOf('!yjst')>-1">
 			  <view class="image-box">
 				<image src="/static/images/index/yjCanteen.png" style="width: 40px;height: 40px;" mode="aspectFit"></image>
 			  </view>
@@ -268,7 +268,7 @@ export default {
 				//sm4加密
 				// let jsonStr = decryptWithSM4(result.data.data)
 				// this.userInfo = JSON.parse(jsonStr) 
-				console.log(this.userInfo)
+				// console.log(this.userInfo)
 				uni.setStorageSync('openId', this.userInfo.openid,{expires:90})
 				uni.setStorageSync('placeId', this.userInfo.placeId,{expires:90})
 			})

pages/mine/me/basicInfo.vue

@@ -158,9 +158,9 @@
 			getUserInfo() {
 				getInfoNewAPI({'custId':uni.getStorageSync('custId'),"sourceType":7}).then(res => { 
 					this.userInfo = res.data;
-					this.$set(this.userInfo,'mobile',decryptWithSM4(this.userInfo.mobile))
-					this.$set(this.userInfo,'idCard',decryptWithSM4(this.userInfo.idCard))
-					this.$set(this.userInfo,'email',decryptWithSM4(this.userInfo.email))
+					this.$set(this.userInfo,'mobile',decryptWithSM4(res.data.mobile))
+					this.$set(this.userInfo,'idCard',decryptWithSM4(res.data.idCard))
+					this.$set(this.userInfo,'email',decryptWithSM4(res.data.email))
 					//sm4加密
 					// let jsonStr = decryptWithSM4(res.data.data)
 					// this.userInfo = JSON.parse(jsonStr) 

pages/review/index.vue

@@ -207,6 +207,10 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+/deep/.u-action-sheet__item-wrap {
+	overflow: auto;
+	max-height: 50vh;
+}
 .rating-page {
   height: 94vh;
   // background-color: #ffffff;

pages/system.vue

@@ -81,8 +81,8 @@ export default {
     handleItem(index) {
 		console.log(index)
 		if (index === 0) {
-			console.log(this.userInfo.custNum.indexOf("@yjst_sbd"))
-			if(this.userInfo.custNum.indexOf("@yjst_yj")>-1||(this.userInfo.orgId=='456365640698040320'&&this.userInfo.custNum.indexOf("@yjst_sbd")==-1)){
+			console.log(this.userInfo.custNum.indexOf("!yjst_sbd"))
+			if(this.userInfo.custNum.indexOf("!yjst_yj")>-1||(this.userInfo.orgId=='456365640698040320'&&this.userInfo.custNum.indexOf("!yjst_sbd")==-1)){
 				uni.navigateTo({  url: '/pages/yjCanteen' });
 			}else{
 				this.$router.push({ path: '/pages/index' }) 
@@ -97,7 +97,7 @@ export default {
 		console.log(index)
 		if (index === 0) {
 			console.log(this.userInfo.custNum.indexOf("yjst_sbd"))
-			if(this.userInfo.custNum.indexOf("@yjst_yj")>-1||(this.userInfo.orgId=='456365640698040320'&&this.userInfo.custNum.indexOf("@yjst_sbd")==-1)){
+			if(this.userInfo.custNum.indexOf("!yjst_yj")>-1||(this.userInfo.orgId=='456365640698040320'&&this.userInfo.custNum.indexOf("!yjst_sbd")==-1)){
 				uni.navigateTo({  url: '/pages/yjCanteen' });
 			}else{
 				this.$router.push({ path: '/pages/index' }) 

pages/weeklyMenu/menuList.vue

@@ -262,12 +262,12 @@ page {
 .menuContent{
 	width: 100%;
 	display: flex;
-	height: 80vh;
+	height: 77vh;
 	// background-color: #ff6816;
 }
 .content-left{
 	width: 20%;
-	height: 80vh;
+	height: 77vh;
 } 
 .active2 {
 	color: #DD7D3C;
@@ -277,7 +277,7 @@ page {
 
 .content-right{
 	width: 80%;
-	height: 80vh;
+	height: 77vh;
 }
 .scroll-right-item{
 	width: 100%;

pages/yjCanteen.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
-		<web-view id="webviewId" :update-title="false" :webview-styles="webviewStyles" @message="getMessage" :src="webViewSrc"
-			style="height: 100%;" ref="webView"></web-view>
+		<web-view id="webviewId" :update-title="false" :webview-styles="webviewStyles" @message="getMessage"
+			:src="webViewSrc" style="height: 100%;" ref="webView"></web-view>
 	</view>
 </template>
 
@@ -47,6 +47,16 @@
 			}, 1000); // 如果是页面初始化调用时，需要延时一下
 			// #endif
 			window.addEventListener("message", this.getMessage);
+
+
+			// 解决 iOS 下键盘收起页面不回弹
+			//window.addEventListener('focusout', () => {
+			//  if (/iPhone|iPad|iPod/i.test(navigator.userAgent)) {
+			//    // 触发一次滚动，让页面回弹
+			//    window.scrollTo(0, 0);
+			//	uni.$u.toast('userAgent')
+			//  }
+			//});
 		},
 		methods: {
 			getMessage(event) { //在H5端使用通信返回App端
@@ -62,13 +72,37 @@
 					this.$store.dispatch('LogOut').then(() => {
 						uni.removeStorageSync('token')
 						Cookies.remove('token')
-						uni.reLaunch({ url: '/pages/login' })
+						uni.reLaunch({
+							url: '/pages/login'
 						})
-				}else if (event.data.data.arg.action == 'sbdCanteen') {// 跳转到sbd食堂
+					})
+				} else if (event.data.data.arg.action == 'sbdCanteen') { // 跳转到sbd食堂s
 					// uni.reLaunch({
 					// 	url: '/pages/index'  // 测试
 					// });
-          			this.$router.push({ path: '/pages/index' })
+					this.$router.push({
+						path: '/pages/index'
+					})
+				} else if (event.data.data.arg.action == 'keyboard-blur') { // 跳转到sbd食堂
+					console.log('触发一次滚动，让页面回弹')
+					// 等键盘真正收起后，再触发回滚
+					setTimeout(() => {
+						if (/iPhone|iPad|iPod/i.test(navigator.userAgent)) {
+							// 触发一次滚动，让页面回弹
+							// window.scrollTo(0, 0);
+							console.log('触发一次滚动，让页面回弹2')
+							uni.pageScrollTo({
+								scrollTop: 0,
+								duration: 100
+							});
+							// 强制刷新 DOM
+							//document.body.style.display = 'none';
+							//setTimeout(() => {
+							//	console.log('强制刷新 DOM')
+							//	document.body.style.display = '';
+							//}, 50);
+						}
+					}, 100);
 				}
 			}
 		},