From 88f571aa48053168abd0c36e1a118874e6a6792b Mon Sep 17 00:00:00 2001
From: liudan <18634735655@163.com>
Date: Thu, 30 May 2024 21:16:52 +0800
Subject: [PATCH] 11

---
 .../WaterfallsFlowItem.vue                    |  2 +-
 components/productConSwiper/index.vue         |  4 ++--
 manifest.json                                 | 20 +++++++++----------
 pages/goods_details/index.vue                 |  2 +-
 4 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/components/plantWaterfallsFlowItem/WaterfallsFlowItem.vue b/components/plantWaterfallsFlowItem/WaterfallsFlowItem.vue
index fa50ce3..c42807a 100644
--- a/components/plantWaterfallsFlowItem/WaterfallsFlowItem.vue
+++ b/components/plantWaterfallsFlowItem/WaterfallsFlowItem.vue
@@ -8,7 +8,7 @@
 				<text v-else-if="item.is_type == 2" class="iconfont icon-shipin1"></text>
 			</view>
 			<view v-else-if="item.is_type == 2" class="video_img">
-				<image class="image" src="../../static/images/stop.png" mode=""></image>
+				<!-- <image class="image" src="../../static/images/stop.png" mode=""></image> -->
 			</view>
 			<view v-if="isAuth && tab == 0 && item.status != 1" class="approval_status">
 				<view v-if="item.status == -1" class="approval_title">审核未通过</view>
diff --git a/components/productConSwiper/index.vue b/components/productConSwiper/index.vue
index 93c0c56..9e96eee 100644
--- a/components/productConSwiper/index.vue
+++ b/components/productConSwiper/index.vue
@@ -12,7 +12,7 @@
 						<image class="image" :src="videoCoverImg"></image>
 					</view>
 					<view class="stop" v-if="controls" @tap="bindPause">
-						<image class="image" src="../../static/images/stop.png"></image>
+						<!-- <image class="image" src="../../static/images/stop.png"></image> -->
 					</view>
 				</view>
 			</swiper-item>
@@ -24,7 +24,7 @@
 						<image class="image" :src="videoCoverImg"></image>
 					</view>
 					<view class="stop" v-show="controls" @tap="bindPause">
-						<image class="image" src="../../static/images/stop.png"></image>
+						<!-- <image class="image" src="../../static/images/stop.png"></image> -->
 					</view>
 				</view>
 			</swiper-item>
diff --git a/manifest.json b/manifest.json
index b76d1bf..39f70a8 100644
--- a/manifest.json
+++ b/manifest.json
@@ -25,8 +25,7 @@
             "Payment" : {},
             "Share" : {},
             "iBeacon" : {},
-            "Geolocation" : {},
-            "Maps" : {}
+            "Geolocation" : {}
         },
         "safearea" : {
             "bottom" : {
@@ -57,7 +56,6 @@
                     "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
                     "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
                     "<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" ],
@@ -67,7 +65,8 @@
                 },
                 "permissionPhoneState" : {
                     "request" : "none" //拨打电话权限关闭
-                }
+                },
+                "targetSdkVersion" : 33
             },
             /* ios打包配置 */
             "ios" : {
@@ -78,7 +77,8 @@
                     "NSLocationWhenInUseUsageDescription" : "根据客户地理位置推荐最近门店",
                     "NSLocationAlwaysUsageDescription" : "根据客户地理位置推荐最近门店"
                 },
-                "idfa" : false
+                "idfa" : false,
+                "dSYMs" : false
             },
             /* SDK配置 */
             "sdkConfigs" : {
@@ -95,22 +95,20 @@
                 },
                 "share" : {
                     "weixin" : {
-                        "appid" : "",
+                        "appid" : "wx72eaeef6bbcc9172",
                         "UniversalLinks" : "https://mer.crmeb.net/"
                     }
                 },
                 "geolocation" : {
-                    "amap" : {
-                        "__platform__" : [ "ios", "android" ],
-                        "appkey_ios" : "",
-                        "appkey_android" : ""
+                    "system" : {
+                        "__platform__" : [ "ios", "android" ]
                     }
                 },
                 "push" : {},
                 "oauth" : {
                     "apple" : {},
                     "weixin" : {
-                        "appid" : "",
+                        "appid" : "wx72eaeef6bbcc9172",
                         "appsecret" : "",
                         "UniversalLinks" : "https://mer.crmeb.net/"
                     }
diff --git a/pages/goods_details/index.vue b/pages/goods_details/index.vue
index 1255ef8..4b40343 100644
--- a/pages/goods_details/index.vue
+++ b/pages/goods_details/index.vue
@@ -197,7 +197,7 @@
 							<view class="pictrue" v-for="(item, index) in storeInfo.community" :key="index" v-if="index<=2"
 							 @click="goPlant(item)">
 								<image :src="item.image[0]" class="image"></image>
-								<image v-if="item.is_type == 2" class="video_img" src="@/static/images/stop.png" mode=""></image>
+								<!-- <image v-if="item.is_type == 2" class="video_img" src="@/static/images/stop.png" mode=""></image> -->
 							</view>
 						</view>
 					</view>