From 48494458d24cfae61d94e2b06c372b5ffa86d250 Mon Sep 17 00:00:00 2001
From: jia <1451658316@qq.com>
Date: Mon, 30 Oct 2023 19:23:46 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=B4=E6=92=AD=E7=95=8C=E9=9D=A2=E5=8F=8Abu?=
 =?UTF-8?q?g=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/sd-live-page/histroy.nvue  |  60 +--
 components/sd-live-page/livepage.nvue |  47 +-
 manifest.json                         | 681 +++++++++++++-------------
 utils/uniMPevent.js                   |  15 +
 4 files changed, 422 insertions(+), 381 deletions(-)

diff --git a/components/sd-live-page/histroy.nvue b/components/sd-live-page/histroy.nvue
index ca19d54..4e8b92a 100644
--- a/components/sd-live-page/histroy.nvue
+++ b/components/sd-live-page/histroy.nvue
@@ -1,5 +1,5 @@
 <template>
-	<view class="container" >
+	<view class="container">
 		<view class="top-do-box">
 			<view class="room-info">
 				<view class="room-logo-box">
@@ -14,7 +14,7 @@
 						<text style="color: #fff;font-size: 25rpx;">4000</text>
 					</view>
 				</view>
-			<!-- 	<view class="room-guanzhu" @click="interest">
+				<!-- 	<view class="room-guanzhu" @click="interest">
 					<text class="guanzhu" v-if="!follow">关注</text>
 					<text class="guanzhu" v-else>已关注</text>
 				</view> -->
@@ -41,7 +41,7 @@
 		</view>
 
 
-	<!-- 	<view class="top-left" v-if="isshow">
+		<!-- 	<view class="top-left" v-if="isshow">
 			<view class="top-left-a" @click="switchCamera">
 				<image class="left-img" src="/static/img/qiehuan.png" mode=""></image>
 			</view>
@@ -52,7 +52,7 @@
 		<!-- 底部操作 -->
 
 
-	<!-- 	<view class="inpit-box-bg" v-if="focus">
+		<!-- 	<view class="inpit-box-bg" v-if="focus">
 			<view class="inpit-box-body">
 				<input class="uni-input" @input="onKeyInput" maxlength="20" cursor-spacing="10" hold-keyboard
 					placeholder="说点什么吧..." :value="inputValue" :focus="focus" />
@@ -240,7 +240,7 @@
 				{{join.message}}
 			</text>
 		</view>
-		
+
 		<gb-popup :isShow="isShow1" rName="确定" :isBut="false" lName="取消" @lEvent="show1" @rEvent="copyData"
 			title="请输入礼物数量">
 			<view style="padding: 30rpx;">
@@ -264,15 +264,15 @@
 		getuser,
 		getRechargeApi,
 		sendGift,
-			getAjuser
+		getAjuser
 	} from '@/api/live.js'
 	import {
-		HTTP_REQUEST_URL_FIVE
+		VUE_APP_WS_URL
 	} from '@/config/app.js';
 
 	import uniPopup from '@/components/unipopup/live-uni-popup.vue';
 	import msgList from '@/components/mh-msgList/mh-msgList.vue';
-import gbpopup from '@/components/gb-popup/gb-popup.vue';
+	import gbpopup from '@/components/gb-popup/gb-popup.vue';
 	export default {
 		name: "sd-float-page",
 		props: {
@@ -340,8 +340,7 @@ import gbpopup from '@/components/gb-popup/gb-popup.vue';
 				userinfo: null,
 				hoveredIndex: -1,
 				regIndex: -1,
-				gifts: [
-				],
+				gifts: [],
 				gifsobj: {},
 				gift_num: '',
 				isShow1: false,
@@ -393,7 +392,7 @@ import gbpopup from '@/components/gb-popup/gb-popup.vue';
 
 		},
 		methods: {
-//关注
+			//关注
 			getjuser() {
 				getAjuser(this.userinfo.app_user_id).then((res) => {
 					console.log(res, 'AAAAAA')
@@ -440,7 +439,7 @@ import gbpopup from '@/components/gb-popup/gb-popup.vue';
 				})
 			},
 			//送礼
-	//送礼
+			//送礼
 
 			bosendGift(gif) {
 				// 执行关闭模态对话框的操作
@@ -941,7 +940,7 @@ import gbpopup from '@/components/gb-popup/gb-popup.vue';
 			send_lick: function() {
 				this.sendGift()
 
-			
+
 			},
 
 			//礼物弹窗
@@ -960,23 +959,23 @@ import gbpopup from '@/components/gb-popup/gb-popup.vue';
 				console.log(this.gift_num)
 				let gift = {
 					'gift_id': gt.id,
-			
+
 				}
 				this.isShow1 = true
 				this.gifsobj = gift
-			
+
 			},
-		//对话监听
-		set_focus: function() {
-			this.focus = !this.focus
-		},
-		
-		//对话输入监听
-		onKeyInput: function(event) {
-			this.inputValue = event.detail.value
-		
-		},
-		
+			//对话监听
+			set_focus: function() {
+				this.focus = !this.focus
+			},
+
+			//对话输入监听
+			onKeyInput: function(event) {
+				this.inputValue = event.detail.value
+
+			},
+
 			send_message: function() {
 				const t = this;
 				t.focus = false;
@@ -1621,7 +1620,8 @@ import gbpopup from '@/components/gb-popup/gb-popup.vue';
 		.txtba-b {
 			font-size: 33rpx;
 			font-family: PingFang SC-Medium, PingFang SC;
-			font-weight: 500;color: #F84221;
+			font-weight: 500;
+			color: #F84221;
 			line-height: 60rpx;
 		}
 
@@ -1808,9 +1808,9 @@ import gbpopup from '@/components/gb-popup/gb-popup.vue';
 
 	.send-boj-txt {
 		flex: 1;
-	
+
 		padding-right: 40rpx;
-	
+
 		flex-direction: row;
 		justify-content: space-between;
 	}
@@ -2049,7 +2049,7 @@ import gbpopup from '@/components/gb-popup/gb-popup.vue';
 		border-radius: 50%;
 		margin-right: 10upx;
 		overflow: hidden;
-		
+
 
 	}
 
diff --git a/components/sd-live-page/livepage.nvue b/components/sd-live-page/livepage.nvue
index b819c2d..4bb6ec4 100644
--- a/components/sd-live-page/livepage.nvue
+++ b/components/sd-live-page/livepage.nvue
@@ -1,5 +1,6 @@
 <template>
 	<view class="container">
+			<view class="" :style="{'height':heightG+'px'}"  @click="quanju">
 		<view class="top-do-box">
 			<view class="room-info">
 				<view class="room-logo-box">
@@ -50,7 +51,7 @@
 			<mh-msgList ref="msgList" :msgList="msgList"></mh-msgList>
 		</view>
 		<!-- 底部操作 -->
-
+</view>
 
 		<view class="inpit-box-bg" v-if="focus">
 			<view class="inpit-box-body">
@@ -286,7 +287,11 @@
 			},
 			room: {
 				type: Object,
-			}
+			},
+			heightG :{
+				type: String,
+				default: '760'
+			},
 		},
 		components: {
 			uniPopup,
@@ -467,6 +472,7 @@
 					if (res.code == 1) {
 						this.$refs.share.close()
 						uni.hideModal()
+						this.getuser()
 					} else {
 						uni.showModal({
 							title: '提示',
@@ -570,7 +576,7 @@
 			//购买商品
 
 			shopp(item) {
-				console.log(item)
+				// console.log(item)
 				uni.navigateTo({
 					url:'/pages/goods_details/index?id='+item.app_goods_id
 				})
@@ -898,9 +904,25 @@
 			},
 			//关闭直播间
 			outroom: function() {
-				uni.redirectTo({
-					url: '/pages/room/index'
+				uni.showModal({
+				  title: '提示', // 对话框标题
+				  content: '是否确定退出直播间', // 对话框内容
+				  showCancel: true, // 是否显示取消按钮，默认为 true
+				  cancelText: '取消', // 取消按钮的文字，默认为 "取消"
+				  cancelColor: '#000000', // 取消按钮的文本颜色，默认为 "#000000"
+				  confirmText: '确定', // 确定按钮的文字，默认为 "确定"
+				  confirmColor: '#3CC51F', // 确定按钮的文本颜色，默认为 "#3CC51F"
+				  success(res) {
+				    if (res.confirm) {
+				    uni.redirectTo({
+				    	url: '/pages/room/index'
+				    })
+				    } else if (res.cancel) {
+				      console.log('用户点击了取消按钮')
+				    }
+				  }
 				})
+				
 			},
 
 			get_live_room() {
@@ -2048,11 +2070,12 @@
 
 	}
 
-	.room-users-box {
+.room-users-box {
 		width: 200rpx;
-		height: 65upx;
+		height: 70upx;
 
 		display: flex;
+		margin-top: 10rpx;
 
 	}
 
@@ -2061,21 +2084,19 @@
 		flex-direction: row;
 		flex-wrap: nowrap;
 		width: 200rpx;
-		height: 80upx;
-		margin-top: 10rpx;
+		height: 75upx;
 
 	}
 
 
 
 	.top-scroll-users-header {
-		width: 60upx;
-		height: 60upx;
+		width: 63upx;
+		height: 63upx;
 		border-radius: 50%;
 		margin-right: 10upx;
 		overflow: hidden;
-
-
+	
 	}
 
 	// .top-scroll-users-header image {
diff --git a/manifest.json b/manifest.json
index 697f258..e88dc21 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,341 +1,346 @@
 {
-	"name": "惠农生活",
-	"appid": "__UNI__3A527D1",
-	"description": "",
-	"versionName": "1.5.3",
-	"versionCode": 153,
-	"transformPx": false,
-	/* 5+App特有相关 */
-	"app-plus": {
-		"titleNView": true,
-		"usingComponents": true,
-		"nvueCompiler": "uni-app",
-		"nvueStyleCompiler": "uni-app",
-		"compilerVersion": 3,
-		"splashscreen": {
-			"alwaysShowBeforeRender": true,
-			"waiting": true,
-			"autoclose": true,
-			"delay": 0
-		},
-		/* 模块配置 */
-		"modules": {
-			"VideoPlayer": {},
-			"iBeacon": {},
-			"Barcode": {},
-			"Camera": {},
-			"Geolocation": {},
-			"Payment": {},
-			"Share": {},
-			"OAuth": {},
-			"UniMP": {
-				"description": "uni小程序"
-			},
-			"Maps": {},
-			"Push": {}
-		},
-		"safearea": {
-			"bottom": {
-				"offset": "none"
-			}
-		},
-		/* 应用发布信息 */
-		"distribute": {
-			/* android打包配置 */
-			"android": {
-				"resizeableActivity": true,
-				"permissions": [
-					"<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_LOCATION_EXTRA_COMMANDS\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.BATTERY_STATS\"/>",
-					"<uses-permission android:name=\"android.permission.BLUETOOTH\"/>",
-					"<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>",
-					"<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
-					"<uses-permission android:name=\"android.permission.CAMERA\"/>",
-					"<uses-permission android:name=\"android.permission.CHANGE_CONFIGURATION\"/>",
-					"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.INTERNET\"/>",
-					"<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
-					"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-					"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-					"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-					"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-					"<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
-					"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
-					"<uses-permission android:name=\"android.permission.BLUETOOTH\"/>",
-					"<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>"
-				],
-				"abiFilters": ["armeabi-v7a", "arm64-v8a", "x86"],
-				"permissionExternalStorage": {
-					"request": "none",
-					"prompt": "应用保存运行状态等信息，需要获取读写手机存储（系统提示为访问设备上的照片、媒体内容和文件）权限，请允许。"
-				},
-				"permissionPhoneState": {
-					"request": "none" //拨打电话权限关闭
-				}
-			},
-			/* ios打包配置 */
-			"ios": {
-				"privacyDescription": {
-					"NSPhotoLibraryUsageDescription": "上传用户头像保存分享海报",
-					"NSPhotoLibraryAddUsageDescription": "上传用户头像保存分享海报",
-					"NSCameraUsageDescription": "上传用户头像保存分享海报",
-					"NSLocationWhenInUseUsageDescription": "根据客户地理位置推荐最近门店",
-					"NSLocationAlwaysUsageDescription": "根据客户地理位置推荐最近门店",
-					"NSLocationAlwaysAndWhenInUseUsageDescription": "根据客户地理位置推荐最近门店"
-				},
-				"idfa": false,
-				"dSYMs": false
-			},
-			/* SDK配置 */
-			"sdkConfigs": {
-				"maps": {
-					"amap": {
-						"appkey_ios": "82af93ec51139c712c4118d84ba684ee",
-						"appkey_android": "0799f37420c0784f1e6cba230a68bdb1"
-					}
-				},
-				"payment": {
-					"weixin": {
-						"__platform__": ["ios", "android"],
-						"appid": "wx9d68c92b550ddd1e",
-						"UniversalLinks": "https://shop.lihaink.cn/"
-					}
-				},
-				"share": {
-					"weixin": {
-						"appid": "wx9d68c92b550ddd1e",
-						"UniversalLinks": "https://shop.lihaink.cn/"
-					}
-				},
-				"geolocation": {
-					"amap": {
-						"__platform__": ["ios", "android"],
-						"appkey_ios": "82af93ec51139c712c4118d84ba684ee",
-						"appkey_android": "0799f37420c0784f1e6cba230a68bdb1"
-					}
-				},
-				"oauth": {},
-				"ad": {},
-				"push": {}
-			},
-			"icons": {
-				"android": {
-					"hdpi": "unpackage/res/icons/72x72.png",
-					"xhdpi": "unpackage/res/icons/96x96.png",
-					"xxhdpi": "unpackage/res/icons/144x144.png",
-					"xxxhdpi": "unpackage/res/icons/192x192.png"
-				},
-				"ios": {
-					"appstore": "unpackage/res/icons/1024x1024.png",
-					"ipad": {
-						"app": "unpackage/res/icons/76x76.png",
-						"app@2x": "unpackage/res/icons/152x152.png",
-						"notification": "unpackage/res/icons/20x20.png",
-						"notification@2x": "unpackage/res/icons/40x40.png",
-						"proapp@2x": "unpackage/res/icons/167x167.png",
-						"settings": "unpackage/res/icons/29x29.png",
-						"settings@2x": "unpackage/res/icons/58x58.png",
-						"spotlight": "unpackage/res/icons/40x40.png",
-						"spotlight@2x": "unpackage/res/icons/80x80.png"
-					},
-					"iphone": {
-						"app@2x": "unpackage/res/icons/120x120.png",
-						"app@3x": "unpackage/res/icons/180x180.png",
-						"notification@2x": "unpackage/res/icons/40x40.png",
-						"notification@3x": "unpackage/res/icons/60x60.png",
-						"settings@2x": "unpackage/res/icons/58x58.png",
-						"settings@3x": "unpackage/res/icons/87x87.png",
-						"spotlight@2x": "unpackage/res/icons/80x80.png",
-						"spotlight@3x": "unpackage/res/icons/120x120.png"
-					}
-				}
-			},
-			"splashscreen": {
-				"useOriginalMsgbox": true
-			}
-		},
-		"nativePlugins": {
-			"JG-JCore": {
-				"JPUSH_APPKEY_IOS": "8a5efd65cda14fafa6e64ad3",
-				"JPUSH_CHANNEL_IOS": "8a5efd65cda14fafa6e64ad3",
-				"JPUSH_APPKEY_ANDROID": "b5f679f4357018605ea6fd2e",
-				"JPUSH_CHANNEL_ANDROID": "",
-				"__plugin_info__": {
-					"name": "JG-JCore",
-					"description": "极光推送JCore插件",
-					"platforms": "Android,iOS",
-					"url": "",
-					"android_package_name": "uni.UNI3A527D1",
-					"ios_bundle_id": "",
-					"isCloud": false,
-					"bought": -1,
-					"pid": "",
-					"parameters": {
-						"JPUSH_APPKEY_IOS": {
-							"des": "[iOS]极光portal配置应用信息时分配的AppKey",
-							"key": "JCore:APP_KEY",
-							"value": "daebe19b547c43128796a078"
-						},
-						"JPUSH_CHANNEL_IOS": {
-							"des": "[iOS]用于统计分发渠道，不需要可填默认值developer-default",
-							"key": "JCore:CHANNEL",
-							"value": ""
-						},
-						"JPUSH_APPKEY_ANDROID": {
-							"des": "[Android]极光portal配置应用信息时分配的AppKey",
-							"key": "JPUSH_APPKEY",
-							"value": ""
-						},
-						"JPUSH_CHANNEL_ANDROID": {
-							"des": "[Android]用于统计分发渠道，不需要可填默认值developer-default",
-							"key": "JPUSH_CHANNEL",
-							"value": ""
-						}
-					}
-				}
-			},
-			"JG-JPush": {
-				"JPUSH_ISPRODUCTION_IOS": "true",
-				"JPUSH_ADVERTISINGID_IOS": "",
-				"JPUSH_DEFAULTINITJPUSH_IOS": "true",
-				"JPUSH_OPPO_APPKEY": "",
-				"JPUSH_OPPO_APPID": "",
-				"JPUSH_OPPO_APPSECRET": "",
-				"JPUSH_VIVO_APPKEY": "",
-				"JPUSH_VIVO_APPID": "",
-				"JPUSH_MEIZU_APPKEY": "",
-				"JPUSH_MEIZU_APPID": "",
-				"JPUSH_XIAOMI_APPKEY": "",
-				"JPUSH_XIAOMI_APPID": "",
-				"__plugin_info__": {
-					"name": "JG-JPush",
-					"description": "极光推送Hbuilder插件",
-					"platforms": "Android,iOS",
-					"url": "",
-					"android_package_name": "uni.UNI3A527D1",
-					"ios_bundle_id": "",
-					"isCloud": false,
-					"bought": -1,
-					"pid": "",
-					"parameters": {
-						"JPUSH_ISPRODUCTION_IOS": {
-							"des": "[iOS]是否是生产环境，是填true，不是填false或者不填",
-							"key": "JPush:ISPRODUCTION",
-							"value": ""
-						},
-						"JPUSH_ADVERTISINGID_IOS": {
-							"des": "[iOS]广告标识符（IDFA）如果不需要使用IDFA，可不填",
-							"key": "JPush:ADVERTISINGID",
-							"value": ""
-						},
-						"JPUSH_DEFAULTINITJPUSH_IOS": {
-							"des": "[iOS]是否默认初始化，是填true，不是填false或者不填",
-							"key": "JPush:DEFAULTINITJPUSH",
-							"value": ""
-						},
-						"JPUSH_OPPO_APPKEY": {
-							"des": "厂商OPPO-appkey,示例：OP-12345678",
-							"key": "OPPO_APPKEY",
-							"value": ""
-						},
-						"JPUSH_OPPO_APPID": {
-							"des": "厂商OPPO-appId,示例：OP-12345678",
-							"key": "OPPO_APPID",
-							"value": ""
-						},
-						"JPUSH_OPPO_APPSECRET": {
-							"des": "厂商OPPO-appSecret,示例：OP-12345678",
-							"key": "OPPO_APPSECRET",
-							"value": ""
-						},
-						"JPUSH_VIVO_APPKEY": {
-							"des": "厂商VIVO-appkey,示例：12345678",
-							"key": "com.vivo.push.api_key",
-							"value": ""
-						},
-						"JPUSH_VIVO_APPID": {
-							"des": "厂商VIVO-appId,示例：12345678",
-							"key": "com.vivo.push.app_id",
-							"value": ""
-						},
-						"JPUSH_MEIZU_APPKEY": {
-							"des": "厂商MEIZU-appKey,示例：MZ-12345678",
-							"key": "MEIZU_APPKEY",
-							"value": ""
-						},
-						"JPUSH_MEIZU_APPID": {
-							"des": "厂商MEIZU-appId,示例：MZ-12345678",
-							"key": "MEIZU_APPID",
-							"value": ""
-						},
-						"JPUSH_XIAOMI_APPKEY": {
-							"des": "厂商XIAOMI-appKey,示例：MI-12345678",
-							"key": "XIAOMI_APPKEY",
-							"value": ""
-						},
-						"JPUSH_XIAOMI_APPID": {
-							"des": "厂商XIAOMI-appId,示例：MI-12345678",
-							"key": "XIAOMI_APPID",
-							"value": ""
-						}
-					}
-				}
-			}
-		}
-	},
-	/* 快应用特有相关 */
-	"quickapp": {},
-	/* 小程序特有相关 */
-	"mp-weixin": {
-		"appid": "wxfb4695444ab8d0d0",
-		"setting": {
-			"urlCheck": false,
-			"minified": true,
-			"postcss": true,
-			"es6": true
-		},
-		"permission": {
-			"scope.userLocation": {
-				"desc": "获取您的位置"
-			}
-		},
-		"requiredPrivateInfos": ["getLocation", "chooseAddress"],
-		"usingComponents": true
-	},
-	"mp-alipay": {
-		"usingComponents": true
-	},
-	"mp-baidu": {
-		"usingComponents": true
-	},
-	"mp-toutiao": {
-		"usingComponents": true
-	},
-	"h5": {
-		"devServer": {
-			"https": false
-		},
-		"router": {
-			"mode": "history",
-			"base": ""
-		},
-		"domain": "",
-		"sdkConfigs": {
-			"maps": {
-				"qqmap": {
-					"key": "SMJBZ-WCHK4-ZPZUA-DSIXI-XDDVQ-XWFX7"
-				}
-			}
-		},
-		"title": "加载中...",
-		"template": "template.h5.html"
-	}
+    "name" : "惠农生活",
+    "appid" : "__UNI__3A527D1",
+    "description" : "",
+    "versionName" : "1.5.3",
+    "versionCode" : 153,
+    "transformPx" : false,
+    /* 5+App特有相关 */
+    "app-plus" : {
+        "titleNView" : true,
+        "usingComponents" : true,
+        "nvueCompiler" : "uni-app",
+        "nvueStyleCompiler" : "uni-app",
+        "compilerVersion" : 3,
+        "splashscreen" : {
+            "alwaysShowBeforeRender" : true,
+            "waiting" : true,
+            "autoclose" : true,
+            "delay" : 0
+        },
+        /* 模块配置 */
+        "modules" : {
+            "VideoPlayer" : {},
+            "iBeacon" : {},
+            "Barcode" : {},
+            "Camera" : {},
+            "Geolocation" : {},
+            "Payment" : {},
+            "Share" : {},
+            "OAuth" : {},
+            "UniMP" : {
+                "description" : "uni小程序"
+            },
+            "Maps" : {},
+            "Push" : {},
+            "Record" : {},
+            "LivePusher" : {}
+        },
+        "safearea" : {
+            "bottom" : {
+                "offset" : "none"
+            }
+        },
+        /* 应用发布信息 */
+        "distribute" : {
+            /* android打包配置 */
+            "android" : {
+                "resizeableActivity" : true,
+                "permissions" : [
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_LOCATION_EXTRA_COMMANDS\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.BATTERY_STATS\"/>",
+                    "<uses-permission android:name=\"android.permission.BLUETOOTH\"/>",
+                    "<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>",
+                    "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
+                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_CONFIGURATION\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+                    "<uses-permission android:name=\"android.permission.INTERNET\"/>",
+                    "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+                ],
+                "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ],
+                "permissionExternalStorage" : {
+                    "request" : "none",
+                    "prompt" : "应用保存运行状态等信息，需要获取读写手机存储（系统提示为访问设备上的照片、媒体内容和文件）权限，请允许。"
+                },
+                "permissionPhoneState" : {
+                    "request" : "none" //拨打电话权限关闭
+                }
+            },
+            /* ios打包配置 */
+            "ios" : {
+                "privacyDescription" : {
+                    "NSPhotoLibraryUsageDescription" : "上传用户头像保存分享海报",
+                    "NSPhotoLibraryAddUsageDescription" : "上传用户头像保存分享海报",
+                    "NSCameraUsageDescription" : "上传用户头像保存分享海报",
+                    "NSLocationWhenInUseUsageDescription" : "根据客户地理位置推荐最近门店",
+                    "NSLocationAlwaysUsageDescription" : "根据客户地理位置推荐最近门店",
+                    "NSLocationAlwaysAndWhenInUseUsageDescription" : "根据客户地理位置推荐最近门店"
+                },
+                "idfa" : false,
+                "dSYMs" : false
+            },
+            /* SDK配置 */
+            "sdkConfigs" : {
+                "maps" : {
+                    "amap" : {
+                        "appkey_ios" : "82af93ec51139c712c4118d84ba684ee",
+                        "appkey_android" : "0799f37420c0784f1e6cba230a68bdb1"
+                    }
+                },
+                "payment" : {
+                    "weixin" : {
+                        "__platform__" : [ "ios", "android" ],
+                        "appid" : "wx9d68c92b550ddd1e",
+                        "UniversalLinks" : "https://shop.lihaink.cn/"
+                    }
+                },
+                "share" : {
+                    "weixin" : {
+                        "appid" : "wx9d68c92b550ddd1e",
+                        "UniversalLinks" : "https://shop.lihaink.cn/"
+                    }
+                },
+                "geolocation" : {
+                    "amap" : {
+                        "__platform__" : [ "ios", "android" ],
+                        "appkey_ios" : "82af93ec51139c712c4118d84ba684ee",
+                        "appkey_android" : "0799f37420c0784f1e6cba230a68bdb1"
+                    }
+                },
+                "oauth" : {},
+                "ad" : {},
+                "push" : {}
+            },
+            "icons" : {
+                "android" : {
+                    "hdpi" : "unpackage/res/icons/72x72.png",
+                    "xhdpi" : "unpackage/res/icons/96x96.png",
+                    "xxhdpi" : "unpackage/res/icons/144x144.png",
+                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
+                },
+                "ios" : {
+                    "appstore" : "unpackage/res/icons/1024x1024.png",
+                    "ipad" : {
+                        "app" : "unpackage/res/icons/76x76.png",
+                        "app@2x" : "unpackage/res/icons/152x152.png",
+                        "notification" : "unpackage/res/icons/20x20.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "proapp@2x" : "unpackage/res/icons/167x167.png",
+                        "settings" : "unpackage/res/icons/29x29.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "spotlight" : "unpackage/res/icons/40x40.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
+                    },
+                    "iphone" : {
+                        "app@2x" : "unpackage/res/icons/120x120.png",
+                        "app@3x" : "unpackage/res/icons/180x180.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "notification@3x" : "unpackage/res/icons/60x60.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "settings@3x" : "unpackage/res/icons/87x87.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
+                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
+                    }
+                }
+            },
+            "splashscreen" : {
+                "useOriginalMsgbox" : true
+            }
+        },
+        "nativePlugins" : {
+            "JG-JCore" : {
+                "JPUSH_APPKEY_IOS" : "8a5efd65cda14fafa6e64ad3",
+                "JPUSH_CHANNEL_IOS" : "8a5efd65cda14fafa6e64ad3",
+                "JPUSH_APPKEY_ANDROID" : "b5f679f4357018605ea6fd2e",
+                "JPUSH_CHANNEL_ANDROID" : "",
+                "__plugin_info__" : {
+                    "name" : "JG-JCore",
+                    "description" : "极光推送JCore插件",
+                    "platforms" : "Android,iOS",
+                    "url" : "",
+                    "android_package_name" : "uni.UNI3A527D1",
+                    "ios_bundle_id" : "",
+                    "isCloud" : false,
+                    "bought" : -1,
+                    "pid" : "",
+                    "parameters" : {
+                        "JPUSH_APPKEY_IOS" : {
+                            "des" : "[iOS]极光portal配置应用信息时分配的AppKey",
+                            "key" : "JCore:APP_KEY",
+                            "value" : "daebe19b547c43128796a078"
+                        },
+                        "JPUSH_CHANNEL_IOS" : {
+                            "des" : "[iOS]用于统计分发渠道，不需要可填默认值developer-default",
+                            "key" : "JCore:CHANNEL",
+                            "value" : ""
+                        },
+                        "JPUSH_APPKEY_ANDROID" : {
+                            "des" : "[Android]极光portal配置应用信息时分配的AppKey",
+                            "key" : "JPUSH_APPKEY",
+                            "value" : ""
+                        },
+                        "JPUSH_CHANNEL_ANDROID" : {
+                            "des" : "[Android]用于统计分发渠道，不需要可填默认值developer-default",
+                            "key" : "JPUSH_CHANNEL",
+                            "value" : ""
+                        }
+                    }
+                }
+            },
+            "JG-JPush" : {
+                "JPUSH_ISPRODUCTION_IOS" : "true",
+                "JPUSH_ADVERTISINGID_IOS" : "",
+                "JPUSH_DEFAULTINITJPUSH_IOS" : "true",
+                "JPUSH_OPPO_APPKEY" : "",
+                "JPUSH_OPPO_APPID" : "",
+                "JPUSH_OPPO_APPSECRET" : "",
+                "JPUSH_VIVO_APPKEY" : "",
+                "JPUSH_VIVO_APPID" : "",
+                "JPUSH_MEIZU_APPKEY" : "",
+                "JPUSH_MEIZU_APPID" : "",
+                "JPUSH_XIAOMI_APPKEY" : "",
+                "JPUSH_XIAOMI_APPID" : "",
+                "__plugin_info__" : {
+                    "name" : "JG-JPush",
+                    "description" : "极光推送Hbuilder插件",
+                    "platforms" : "Android,iOS",
+                    "url" : "",
+                    "android_package_name" : "uni.UNI3A527D1",
+                    "ios_bundle_id" : "",
+                    "isCloud" : false,
+                    "bought" : -1,
+                    "pid" : "",
+                    "parameters" : {
+                        "JPUSH_ISPRODUCTION_IOS" : {
+                            "des" : "[iOS]是否是生产环境，是填true，不是填false或者不填",
+                            "key" : "JPush:ISPRODUCTION",
+                            "value" : ""
+                        },
+                        "JPUSH_ADVERTISINGID_IOS" : {
+                            "des" : "[iOS]广告标识符（IDFA）如果不需要使用IDFA，可不填",
+                            "key" : "JPush:ADVERTISINGID",
+                            "value" : ""
+                        },
+                        "JPUSH_DEFAULTINITJPUSH_IOS" : {
+                            "des" : "[iOS]是否默认初始化，是填true，不是填false或者不填",
+                            "key" : "JPush:DEFAULTINITJPUSH",
+                            "value" : ""
+                        },
+                        "JPUSH_OPPO_APPKEY" : {
+                            "des" : "厂商OPPO-appkey,示例：OP-12345678",
+                            "key" : "OPPO_APPKEY",
+                            "value" : ""
+                        },
+                        "JPUSH_OPPO_APPID" : {
+                            "des" : "厂商OPPO-appId,示例：OP-12345678",
+                            "key" : "OPPO_APPID",
+                            "value" : ""
+                        },
+                        "JPUSH_OPPO_APPSECRET" : {
+                            "des" : "厂商OPPO-appSecret,示例：OP-12345678",
+                            "key" : "OPPO_APPSECRET",
+                            "value" : ""
+                        },
+                        "JPUSH_VIVO_APPKEY" : {
+                            "des" : "厂商VIVO-appkey,示例：12345678",
+                            "key" : "com.vivo.push.api_key",
+                            "value" : ""
+                        },
+                        "JPUSH_VIVO_APPID" : {
+                            "des" : "厂商VIVO-appId,示例：12345678",
+                            "key" : "com.vivo.push.app_id",
+                            "value" : ""
+                        },
+                        "JPUSH_MEIZU_APPKEY" : {
+                            "des" : "厂商MEIZU-appKey,示例：MZ-12345678",
+                            "key" : "MEIZU_APPKEY",
+                            "value" : ""
+                        },
+                        "JPUSH_MEIZU_APPID" : {
+                            "des" : "厂商MEIZU-appId,示例：MZ-12345678",
+                            "key" : "MEIZU_APPID",
+                            "value" : ""
+                        },
+                        "JPUSH_XIAOMI_APPKEY" : {
+                            "des" : "厂商XIAOMI-appKey,示例：MI-12345678",
+                            "key" : "XIAOMI_APPKEY",
+                            "value" : ""
+                        },
+                        "JPUSH_XIAOMI_APPID" : {
+                            "des" : "厂商XIAOMI-appId,示例：MI-12345678",
+                            "key" : "XIAOMI_APPID",
+                            "value" : ""
+                        }
+                    }
+                }
+            }
+        }
+    },
+    /* 快应用特有相关 */
+    "quickapp" : {},
+    /* 小程序特有相关 */
+    "mp-weixin" : {
+        "appid" : "wxfb4695444ab8d0d0",
+        "setting" : {
+            "urlCheck" : false,
+            "minified" : true,
+            "postcss" : true,
+            "es6" : true
+        },
+        "permission" : {
+            "scope.userLocation" : {
+                "desc" : "获取您的位置"
+            }
+        },
+        "requiredPrivateInfos" : [ "getLocation", "chooseAddress" ],
+        "usingComponents" : true
+    },
+    "mp-alipay" : {
+        "usingComponents" : true
+    },
+    "mp-baidu" : {
+        "usingComponents" : true
+    },
+    "mp-toutiao" : {
+        "usingComponents" : true
+    },
+    "h5" : {
+        "devServer" : {
+            "https" : false
+        },
+        "router" : {
+            "mode" : "history",
+            "base" : ""
+        },
+        "domain" : "",
+        "sdkConfigs" : {
+            "maps" : {
+                "qqmap" : {
+                    "key" : "SMJBZ-WCHK4-ZPZUA-DSIXI-XDDVQ-XWFX7"
+                }
+            }
+        },
+        "title" : "加载中...",
+        "template" : "template.h5.html"
+    }
 }
 //拨打电话权限关闭
-/* ios打包配置 */
\ No newline at end of file
+/* ios打包配置 */
+
diff --git a/utils/uniMPevent.js b/utils/uniMPevent.js
index d5eb984..f051aec 100644
--- a/utils/uniMPevent.js
+++ b/utils/uniMPevent.js
@@ -55,5 +55,20 @@ export const initEvent = () => {
 	 
   	console.log('收到小程序事件: ' + JSON.stringify(ret));
   }
+  
+  //直播小程序跳转商城购买商品
+  if (ret.event == 'live_shop') {
+     console.log(JSON.stringify(ret))
+	 let arr1=ret.data
+  	 mp.closeUniMP(ret.fromAppid, (ret) => {
+  	   // console.log('closeUniMP: ' + JSON.stringify(ret));
+	   setTimeout(()=>{
+		   uni.navigateTo({
+		   	url:'/pages/goods_details/index?id='+arr1.app_goods_id
+		   },1000)
+	   })
+  	 });
+  	// console.log('收到小程序事件: ' + JSON.stringify(ret));
+  }
   });
 }
\ No newline at end of file