From 4a0c34c295023d322714a0207d697a68517dad29 Mon Sep 17 00:00:00 2001
From: 15820893422 <1978476055@qq.com>
Date: Fri, 19 Apr 2024 18:30:43 +0800
Subject: [PATCH] 1

---
 manifest.json                         |  2 +-
 pages.json                            | 20 +++++++++++---------
 pages/shop/index.vue                  |  3 ++-
 pages/shop_details/index.vue          |  6 +++---
 pages/store/merchantDetails/index.vue |  2 +-
 5 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/manifest.json b/manifest.json
index 15588fc..9783db7 100644
--- a/manifest.json
+++ b/manifest.json
@@ -151,7 +151,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wx5fb1cc8edb3f8baa",
+        "appid" : "wx95e45e4fc390dd98",
         "setting" : {
             "urlCheck" : false,
             "minified" : true,
diff --git a/pages.json b/pages.json
index dc1de53..e947aa8 100644
--- a/pages.json
+++ b/pages.json
@@ -985,13 +985,13 @@
 					}
 				}
 			]
-			,
-			"plugins": {
-				"live-player-plugin": {
-					"version": "1.3.2",
-					"provider": "wx2b03c6e691cd7370"
-				}
-			}
+			// ,
+			// "plugins": {
+			// 	"live-player-plugin": {
+			// 		"version": "1.3.2",
+			// 		"provider": "wx95e45e4fc390dd98"
+			// 	}
+			// }
 		},
 		{
 			"root": "pages/chat",
@@ -1347,8 +1347,10 @@
 		}
 	],
 	"easycom" : {
-	    "^u-(.*)" : "@/uni_modules/uview-ui/components/u-$1/u-$1.vue",
-	    "^uv-(.*)" : "@climblee/uv-ui/components/uv-$1/uv-$1.vue"
+		  "custom": {
+			"^u-(.*)" : "@/uni_modules/uview-ui/components/u-$1/u-$1.vue",
+			"^uv-(.*)" : "@/uni_modules/uv-ui/components/uv-$1/uv-$1.vue"
+		  }
 	},
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
diff --git a/pages/shop/index.vue b/pages/shop/index.vue
index 1d3ad75..efcd163 100644
--- a/pages/shop/index.vue
+++ b/pages/shop/index.vue
@@ -13,7 +13,7 @@
 			<view class="tab-sao iconfont icon-saoma" @tap='handleBorcode'></view>
 		</view>
 		<view class="content-map" >
-			<map class="map" :latitude="latitude" :longitude="longitude" :markers="[{'id':1,'latitude':latitude,'longitude':longitude,'iconPath':'/static/images/location.png',width:24,height:24 }]" :show-location="true"></map>
+			<map class="map" :latitude="latitude" :longitude="longitude" :markers="markers" :show-location="true"></map>
 		</view>
 		<view class="content-type">
 			<!-- <cover-image src="../annex/static/vipBg.png" style="position: absolute;
@@ -94,6 +94,7 @@
 				 latitude: '',
 				 longitude: '',
 				 city:'请点击获取定位',
+				 markers:[{'id':1,'latitude':latitude,'longitude':longitude,'iconPath':'/static/images/location.png',width:24,height:24 }]
 			}
 		},
 		onLoad(){
diff --git a/pages/shop_details/index.vue b/pages/shop_details/index.vue
index d358cce..d3ecbee 100644
--- a/pages/shop_details/index.vue
+++ b/pages/shop_details/index.vue
@@ -244,7 +244,7 @@ export default {
         }
         .grade {
           color: #fe8c16;
-          & > :first-child {
+          :first-child {
             margin-right: 8rpx;
           }
         }
@@ -260,12 +260,12 @@ export default {
           .iconfont {
             font-size: 24rpx;
           }
-          & > :first-child {
+          :first-child {
             max-width: 320rpx;
             overflow: hidden;
             white-space: nowrap;
             text-overflow: ellipsis;
-            & > :first-child {
+            :first-child {
               margin-right: 8rpx;
             }
           }
diff --git a/pages/store/merchantDetails/index.vue b/pages/store/merchantDetails/index.vue
index 66ee3ce..57a35a2 100644
--- a/pages/store/merchantDetails/index.vue
+++ b/pages/store/merchantDetails/index.vue
@@ -50,7 +50,7 @@
 				})
 			},
 			copyTBL(url) {
-				let copeData = `登录地址:${this.resData.login_url} 商户账号:${this.resData.phone}`
+				let copeData = `登录地址:${this.resData.login_url} 商户账号:${this.resData.mer_account}`
 				// #ifdef MP || APP-PLUS
 				uni.setClipboardData({
 					data: copeData,