Merge branch 'old' of https://gitea.lihaink.cn/mkm/nk-shop2.0 into old

pages/gather/gather.vue

@@ -17,7 +17,8 @@
 				<view class="place_wrapper flex_a_c" @click="selectLocation">
 					<view class="iconfont icon-weizhi"></view>
 					<view class="town_name">{{street||'定位中' }}</view>
-            <view class="town_name rotate-box" @click.stop="getPositionFn()"><uni-icons type="loop" color="#fff"></uni-icons></view>
+					<view class="town_name rotate-box" @click.stop="getPositionFn()"><uni-icons type="loop"
+							color="#fff"></uni-icons></view>
 				</view>
 				<navigator url="/pages/chat/customer_list/index?type=0" hover-class="none">
 					<view class="iconfont icon-xiaoxi" style="color: #fff"> </view>
@@ -208,6 +209,26 @@
 						},
 						type: 3,
 					},
+					{
+						name: '里海直播',
+						icon: '/static/applet/live.png',
+						data: {
+							id: "__UNI__0E46DAD",
+							url: "https://lihai001.oss-cn-chengdu.aliyuncs.com/app/__UNI__0E46DAD.wgt",
+
+						},
+						type: 4,
+
+					},
+					{
+						name: 'oa小程序',
+						icon: '/static/applet/oa.png',
+						data: {
+							id: "__UNI__40723E1",
+							url: "https://lihai001.oss-cn-chengdu.aliyuncs.com/app/__UNI__40723E1.wgt",
+						},
+						type: 4
+					}
 					// {
 					// 	name: '农业智能感知平台',
 					// 	icon: '/static/applet/icons.png',
@@ -311,7 +332,10 @@
 		methods: {
 			getPositionFn() {
 				this.street = '定位中'
-        this.$store.commit('setLocation', {lat: null, long: null})
+				this.$store.commit('setLocation', {
+					lat: null,
+					long: null
+				})
 				uni.removeStorageSync('RejectTarget')
 				this.selfLocation()
 
@@ -416,7 +440,9 @@
 					case 1:
 						uniMP.loadMP(data);
 						break;
-					case 2: uniMP.loadMPx(data); break;
+					case 2:
+						uniMP.loadMPx(data);
+						break;
 						// case 2:
 						// 	// this.navigator(data);
 						// 	// uniMP.loadMPx(data);
@@ -522,8 +548,7 @@
 							icon: 'none'
 						})
 					})
-        }
+				} else uni.getLocation({
-        else uni.getLocation({
 					type: 'wgs84',
 					timeout: '10',
 					success: (res) => {