Merge branch 'master' of http://115.29.66.169:10080/yicangzongtai/share_h5

manifest.json

@@ -181,5 +181,6 @@
                 "enable" : true
             }
         }
-    }
+    },
+    "vueVersion" : "2"
 }

pages/payCentre.vue

@@ -1,7 +1,12 @@
 <template>
 	<view class="body">
-		<image src="/static/payCentre/loading.gif" mode=""></image>
-		<view>支付中</view>
+		<!-- <image src="/static/payCentre/loading.gif" mode=""></image> -->
+		<image class="payLogo" src="/static/payCentre/payLogo.png" mode=""></image>
+		<view>
+			正在进入宜格收银台 
+			<text>{{text}}s</text>
+		</view>
+		<view class="footerBox">宜昌城市大脑运营管理有限公司提供技术支持</view>
 	</view>
 </template>
 
@@ -10,7 +15,8 @@
 	export default {
 		data() {
 			return {
-				data:""
+				data:"",
+				text:3
 			}
 		},
 		onLoad(options) {
@@ -20,10 +26,20 @@
 				// })
 				setTimeout(()=>{
 					this.goto(options.orderNo)
-				},100)
+				},100);
 			}
+			this.init()
 		},
 		methods: {
+			init(){
+				this.text=3;
+				let setTime=setInterval(()=>{
+					this.text--;
+					if(this.text==0&&setTime){
+						clearInterval(setTime)
+					}
+				},1000)
+			},
 			goto(orderNo) {
 				try {
 					uniWeb.webView.postMessage({
@@ -49,5 +65,27 @@
 			width: 200rpx;
 			height: 200rpx;
 		}
+		.payLogo{
+			width: 294rpx;
+			height: 294rpx;
+		}
+		>view{
+			font-size: 30rpx;
+			color: #333333;
+			font-weight: 700;
+			margin-top: 45rpx;
+			text{
+				font-size: 36rpx;
+				color: #FF0511;
+			}
+		}
+		.footerBox{
+			width: 100%;
+			font-size: 24rpx;
+			color: #999999;
+			text-align: center;
+			position: fixed;
+			bottom: 90rpx;
+		}
 	}
 </style>

pages/paySuccess.vue

@@ -36,7 +36,7 @@
 					// document.body.appendChild(ifr);
 					window.location = "ygfwUrlSchemes://&orderNo=" + this.orderNo;
 				} else {
-					window.location = "https://yigeapp.songlanyun.com" 
+					window.location = "https://yigeapp.songlanyun.com"
 					// window.open("https://apps.apple.com/cn/app/nano-health/id1615496457");
 					// window.location="https://appstore.nanomirai.com"
 					// window.location = "https://yigeapp.songlanyun.com/ygfw/" //你的苹果应用app链接 
@@ -69,6 +69,7 @@
 			height: 200rpx;
 		}
 
+
 		button {
 			width: 80%;
 			margin: 200rpx auto 0;