Merge branch 'dk-dev' of http://39.101.143.165:8090/dong_k/zhapp into dk-dev

App.vue

@@ -1,6 +1,7 @@
 <script>
 export default {
-	onLaunch: function () {
+	onLaunch: function (e) {
+		if(e.query.from === 'share') return
 		const getMessageCount = async () => {
 			if(!this.$store.state.token) return
 			try {

pages/lottery/index.vue

@@ -61,24 +61,44 @@
 
 			// this.to_url = 'http://192.168.5.21:8080/custh5/#/packageF/pages/activity/lottery/turntable?activityId='+ activityId + '&currentPlatform='+currentPlatform+'&currentUser='+currentUser;
 
-			this.to_url =
-				'https://test.baoxianzhanggui.com/custh5/#/packageF/pages/activity/lottery/turntable?activityId=' +
-				activityId + '&localActivityTableId=' + localActivityTableId + '&currentPlatform=' + currentPlatform +
-				'&currentUser=' + currentUser + '&tenantId=' + tenantId;
-		},
-		methods: {
-			// 这个 getMessage 在 H5 下其实不会被调到，可以保留给 App/小程序用
-			getMessage(event) {
-				const list = event.detail && event.detail.data
-				const urlType = list && list[list.length - 1]
-				switch (urlType && urlType.type) {
-					case 'back':
-						uni.navigateBack()
-						break
-					default:
-				}
+		this.to_url = 'https://life.baoxianzhanggui.com/custh5/#/packageF/pages/activity/lottery/turntable?activityId=' + activityId + '&localActivityTableId=' + localActivityTableId + '&currentPlatform=' + currentPlatform + '&currentUser=' + currentUser + '&tenantId=' + tenantId;
+	},
+	onShow(){
+// #ifdef APP-PLUS
+                        // 设置webview显示时顶部丢失问题
+                        var height = 0; //定义动态的高度变量，如高度为定值，可以直接写
+                        uni.getSystemInfo({
+                                //成功获取的回调函数，返回值为系统信息
+                                success: (sysinfo) => {
+                                        height = sysinfo.windowHeight -
+                                                40; //自行修改，自己需要的高度 此处如底部有其他内容，可以直接---(-50)这种，如果不减，页面会下沉，看不到底部导航栏
+                                },
+                                complete: () => {}
+                        });
+                        var currentWebview = this.$scope.$getAppWebview(); //获取当前web-view
+                        setTimeout(function() {
+                                var wv = currentWebview.children()[0];
+                                wv.setStyle({ //设置web-view距离顶部的距离以及自己的高度，单位为px
+                                        top: 40, //此处是距离顶部的高度，应该是你页面的头部
+                                        height: height, //webview的高度
+                                        scalable: false, //webview的页面是否可以缩放，双指放大缩小,
+                                })
+                        }, 500); //如页面初始化调用需要写延迟
+                        // #endif
+	},
+	methods: {
+		// 这个 getMessage 在 H5 下其实不会被调到，可以保留给 App/小程序用
+		getMessage(event) {
+			const list = event.detail && event.detail.data
+			const urlType = list && list[list.length - 1]
+			switch (urlType && urlType.type) {
+				case 'back':
+					uni.navigateBack()
+					break
+				default:
 			}
 		}
+	}
 
 	}
 </script>

pages/message/message.vue

@@ -96,7 +96,6 @@
 		</view>
 		<u-loadmore v-if="datalist.length!=0" :status="status" />
 
-		
 		<u-popup :show="qrcodePopup" mode="center" round="20rpx" closeable mask-close-able @close="qrcodePopup = false">
 			<div class="popup-content">
 				<image :src="qrcode" style="width:400rpx;height:400rpx" mode=""></image>

pages/quote/quoteRecordDetail.vue

@@ -933,7 +933,7 @@
 				}
 			},
 			async details(orderno) {
-				let res = await this.$http.get('/supplementOrder/getOrderDetail?ordersNo=' + orderno);
+				let res = await this.$http.get('/supplementOrder/getOrderDetail?ordersNo=' + orderno+'&form='+this.isFromShare);
 				if (res.code == 200) {
 					this.orderStatus = res.data.order.orderStatus; //订单状态
 					this.companyName = res.data.order.companyName; //保险公司简称