bug修改

component/googleMap/googleMap.vue

@@ -188,6 +188,7 @@
 			//点击marker触发
 			loadMarkertap(marker, item) {
 				let markerId = marker.data.markerId
+				console.log(marker.data)
 				if (markerId == 5000) return
 				if (this.types == 1) this.shopMarkerFn(marker, item)
 				if (this.types == 2) this.nearCabinetMarkerFn(marker, item)

pages/userManagement/userManagement.vue

@@ -21,7 +21,6 @@
 				<text style="margin-left: 6rpx;">{{ $t('添加成员') }}</text>
 			</view>
 		</view>
-		
 	</view>
 </template>
 

utils/util.js

@@ -2,13 +2,7 @@ import dayjs from 'dayjs'
 import duration from 'dayjs/plugin/duration'
 dayjs.extend(duration);
 const systemInfo = uni.getSystemInfoSync();
-<<<<<<< HEAD
 const Language = systemInfo.language == 'zh_CN' ? 'zh' : 'en' // 'zh' | 'en'
-// const Language = 'en' // 'zh' | 'en'
-=======
-// const Language = systemInfo.language == 'zh_CN' ? 'zh' : 'en' // 'zh' | 'en'
-const Language = 'zh' // 'zh' | 'en'
->>>>>>> xxq_test
 const formatTime = (date) => {
 	const year = date.getFullYear();
 	const month = date.getMonth() + 1;