Merge branch 'main' of http://git.njrzwl.cn:3000/liudan/zhaozong1

components/productConSwiper/index.vue

@@ -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>

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/"
                     }