From 42afabe62f12098efcf2c7f63e1eea331fc7d69b Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Sun, 5 May 2024 22:22:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=95=86=E6=88=B7=E5=BC=95=E5=AF=BC?=
 =?UTF-8?q?=E9=A1=B5=E5=BC=B9=E5=87=BA=E8=A7=84=E5=88=99=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json                    | 704 +++++++++++++++----------------
 pages/gather/gather.vue          |   1 -
 pages/gather/subnvue/concat.nvue |  41 +-
 pages/helpPeople/helpPeople.vue  |  11 +-
 pages/index/index.vue            |  63 +--
 pages/index/subnvue/concat.nvue  |  38 +-
 pages/index/subnvue/newUser.nvue |   4 +-
 pages/store/settled/index1.vue   |   2 +-
 pages/user/index.vue             |  14 +-
 pages/user/subnvue/index.nvue    |  15 +-
 static/images/pointer.png        | Bin 1624 -> 13591 bytes
 static/images/ydwd.png           | Bin 0 -> 1046 bytes
 utils/uniMP.js                   |  10 +-
 13 files changed, 484 insertions(+), 419 deletions(-)
 create mode 100644 static/images/ydwd.png

diff --git a/manifest.json b/manifest.json
index 8a90b4a..5b3b237 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,353 +1,353 @@
 {
-    "name" : "惠农生活",
-    "appid" : "__UNI__3A527D1",
-    "description" : "",
-    "versionName" : "2.0.44",
-    "versionCode" : 2037,
-    "transformPx" : false,
-    /* 5+App特有相关 */
-    "app-plus" : {
-        "titleNView" : true,
-        "usingComponents" : true,
-        "nvueCompiler" : "uni-app",
-        "nvueStyleCompiler" : "uni-app",
-        "compilerVersion" : 3,
-        "compatible" : {
-            "ignoreVersion" : true //true表示忽略版本检查提示框，HBuilderX1.9.0及以上版本支持 
-        },
-        "splashscreen" : {
-            "alwaysShowBeforeRender" : false,
-            "waiting" : false,
-            "autoclose" : true,
-            "delay" : 0
-        },
-        /* 模块配置 */
-        "modules" : {
-            "VideoPlayer" : {},
-            "OAuth" : {},
-            "Payment" : {},
-            "Share" : {},
-            "iBeacon" : {},
-            "Maps" : {},
-            "Geolocation" : {},
-            "UniMP" : {
-                "description" : "uni小程序"
-            },
-            "Push" : {},
-            "Barcode" : {},
-            "Camera" : {}
-        },
-        "safearea" : {
-            "bottom" : {
-                "offset" : "none"
-            }
-        },
-        /* 应用发布信息 */
-        "distribute" : {
-            /* android打包配置 */
-            "android" : {
-                "permissions" : [
-                    "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_LOCATION_EXTRA_COMMANDS\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.BATTERY_STATS\"/>",
-                    "<uses-permission android:name=\"android.permission.BLUETOOTH\"/>",
-                    "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
-                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
-                    "<uses-permission android:name=\"android.permission.CHANGE_CONFIGURATION\"/>",
-                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
-                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-                    "<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_ADMIN\"/>"
-                ],
-                "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ],
-                "permissionExternalStorage" : {
-                    "request" : "none",
-                    "prompt" : "应用保存运行状态等信息，需要获取读写手机存储（系统提示为访问设备上的照片、媒体内容和文件）权限，请允许。"
-                },
-                "permissionPhoneState" : {
-                    "request" : "none" //拨打电话权限关闭
-                },
-                "minSdkVersion" : 23,
-                "targetSdkVersion" : 30
-            },
-            /* ios打包配置 */
-            "ios" : {
-                "privacyDescription" : {
-                    "NSPhotoLibraryUsageDescription" : "上传用户头像保存分享海报",
-                    "NSPhotoLibraryAddUsageDescription" : "上传用户头像保存分享海报",
-                    "NSCameraUsageDescription" : "上传用户头像保存分享海报",
-                    "NSLocationWhenInUseUsageDescription" : "根据客户地理位置推荐最近门店",
-                    "NSLocationAlwaysUsageDescription" : "根据客户地理位置推荐最近门店"
-                },
-                "idfa" : false,
-                "dSYMs" : false
-            },
-            /* SDK配置 */
-            "sdkConfigs" : {
-                "maps" : {
-                    "amap" : {
-                        "appkey_ios" : "0a3202688624938fd5d2f37b52c30d5d",
-                        "appkey_android" : "0354f5ddc11e2ea76c5aac647f44d945",
-                        "name" : "amapIvoVHpJR"
-                    }
-                },
-                "payment" : {
-                    "weixin" : {
-                        "__platform__" : [ "ios", "android" ],
-                        "appid" : "wx2e8f79ff281284f5",
-                        "UniversalLinks" : "https://shop.lihaink.cn/"
-                    }
-                },
-                "share" : {
-                    "weixin" : {
-                        "appid" : "wx2e8f79ff281284f5",
-                        "UniversalLinks" : "https://shop.lihaink.cn/"
-                    }
-                },
-                "geolocation" : {
-                    "amap" : {
-                        "name" : "amapIvoVHpJR",
-                        "__platform__" : [ "ios", "android" ],
-                        "appkey_ios" : "0a3202688624938fd5d2f37b52c30d5d",
-                        "appkey_android" : "0354f5ddc11e2ea76c5aac647f44d945"
-                    }
-                },
-                "push" : {},
-                "oauth" : {
-                    "weixin" : {
-                        "appid" : "wx2e8f79ff281284f5",
-                        "UniversalLinks" : "https://shop.lihaink.cn/"
-                    },
-                    "univerify" : {}
-                },
-                "ad" : {}
-            },
-            "icons" : {
-                "android" : {
-                    "hdpi" : "unpackage/res/icons/72x72.png",
-                    "xhdpi" : "unpackage/res/icons/96x96.png",
-                    "xxhdpi" : "unpackage/res/icons/144x144.png",
-                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
-                },
-                "ios" : {
-                    "appstore" : "unpackage/res/icons/1024x1024.png",
-                    "ipad" : {
-                        "app" : "unpackage/res/icons/76x76.png",
-                        "app@2x" : "unpackage/res/icons/152x152.png",
-                        "notification" : "unpackage/res/icons/20x20.png",
-                        "notification@2x" : "unpackage/res/icons/40x40.png",
-                        "proapp@2x" : "unpackage/res/icons/167x167.png",
-                        "settings" : "unpackage/res/icons/29x29.png",
-                        "settings@2x" : "unpackage/res/icons/58x58.png",
-                        "spotlight" : "unpackage/res/icons/40x40.png",
-                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
-                    },
-                    "iphone" : {
-                        "app@2x" : "unpackage/res/icons/120x120.png",
-                        "app@3x" : "unpackage/res/icons/180x180.png",
-                        "notification@2x" : "unpackage/res/icons/40x40.png",
-                        "notification@3x" : "unpackage/res/icons/60x60.png",
-                        "settings@2x" : "unpackage/res/icons/58x58.png",
-                        "settings@3x" : "unpackage/res/icons/87x87.png",
-                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
-                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
-                    }
-                }
-            },
-            "splashscreen" : {
-                "useOriginalMsgbox" : true,
-                "androidStyle" : "common"
-            }
-        },
-        "nativePlugins" : {
-            "JG-JCore" : {
-                "JPUSH_APPKEY_IOS" : "8a5efd65cda14fafa6e64ad3",
-                "JPUSH_CHANNEL_IOS" : "8a5efd65cda14fafa6e64ad3",
-                "JPUSH_APPKEY_ANDROID" : "b5f679f4357018605ea6fd2e",
-                "JPUSH_CHANNEL_ANDROID" : "",
-                "__plugin_info__" : {
-                    "name" : "JG-JCore",
-                    "description" : "极光推送JCore插件",
-                    "platforms" : "Android,iOS",
-                    "url" : "",
-                    "android_package_name" : "uni.UNI3A527D1",
-                    "ios_bundle_id" : "",
-                    "isCloud" : false,
-                    "bought" : -1,
-                    "pid" : "",
-                    "parameters" : {
-                        "JPUSH_APPKEY_IOS" : {
-                            "des" : "[iOS]极光portal配置应用信息时分配的AppKey",
-                            "key" : "JCore:APP_KEY",
-                            "value" : "daebe19b547c43128796a078"
-                        },
-                        "JPUSH_CHANNEL_IOS" : {
-                            "des" : "[iOS]用于统计分发渠道，不需要可填默认值developer-default",
-                            "key" : "JCore:CHANNEL",
-                            "value" : ""
-                        },
-                        "JPUSH_APPKEY_ANDROID" : {
-                            "des" : "[Android]极光portal配置应用信息时分配的AppKey",
-                            "key" : "JPUSH_APPKEY",
-                            "value" : ""
-                        },
-                        "JPUSH_CHANNEL_ANDROID" : {
-                            "des" : "[Android]用于统计分发渠道，不需要可填默认值developer-default",
-                            "key" : "JPUSH_CHANNEL",
-                            "value" : ""
-                        }
-                    }
-                }
-            },
-            "JG-JPush" : {
-                "JPUSH_ISPRODUCTION_IOS" : "true",
-                "JPUSH_ADVERTISINGID_IOS" : "",
-                "JPUSH_DEFAULTINITJPUSH_IOS" : "true",
-                "JPUSH_OPPO_APPKEY" : "",
-                "JPUSH_OPPO_APPID" : "",
-                "JPUSH_OPPO_APPSECRET" : "",
-                "JPUSH_VIVO_APPKEY" : "",
-                "JPUSH_VIVO_APPID" : "",
-                "JPUSH_MEIZU_APPKEY" : "",
-                "JPUSH_MEIZU_APPID" : "",
-                "JPUSH_XIAOMI_APPKEY" : "",
-                "JPUSH_XIAOMI_APPID" : "",
-                "__plugin_info__" : {
-                    "name" : "JG-JPush",
-                    "description" : "极光推送Hbuilder插件",
-                    "platforms" : "Android,iOS",
-                    "url" : "",
-                    "android_package_name" : "uni.UNI3A527D1",
-                    "ios_bundle_id" : "",
-                    "isCloud" : false,
-                    "bought" : -1,
-                    "pid" : "",
-                    "parameters" : {
-                        "JPUSH_ISPRODUCTION_IOS" : {
-                            "des" : "[iOS]是否是生产环境，是填true，不是填false或者不填",
-                            "key" : "JPush:ISPRODUCTION",
-                            "value" : ""
-                        },
-                        "JPUSH_ADVERTISINGID_IOS" : {
-                            "des" : "[iOS]广告标识符（IDFA）如果不需要使用IDFA，可不填",
-                            "key" : "JPush:ADVERTISINGID",
-                            "value" : ""
-                        },
-                        "JPUSH_DEFAULTINITJPUSH_IOS" : {
-                            "des" : "[iOS]是否默认初始化，是填true，不是填false或者不填",
-                            "key" : "JPush:DEFAULTINITJPUSH",
-                            "value" : ""
-                        },
-                        "JPUSH_OPPO_APPKEY" : {
-                            "des" : "厂商OPPO-appkey,示例：OP-12345678",
-                            "key" : "OPPO_APPKEY",
-                            "value" : ""
-                        },
-                        "JPUSH_OPPO_APPID" : {
-                            "des" : "厂商OPPO-appId,示例：OP-12345678",
-                            "key" : "OPPO_APPID",
-                            "value" : ""
-                        },
-                        "JPUSH_OPPO_APPSECRET" : {
-                            "des" : "厂商OPPO-appSecret,示例：OP-12345678",
-                            "key" : "OPPO_APPSECRET",
-                            "value" : ""
-                        },
-                        "JPUSH_VIVO_APPKEY" : {
-                            "des" : "厂商VIVO-appkey,示例：12345678",
-                            "key" : "com.vivo.push.api_key",
-                            "value" : ""
-                        },
-                        "JPUSH_VIVO_APPID" : {
-                            "des" : "厂商VIVO-appId,示例：12345678",
-                            "key" : "com.vivo.push.app_id",
-                            "value" : ""
-                        },
-                        "JPUSH_MEIZU_APPKEY" : {
-                            "des" : "厂商MEIZU-appKey,示例：MZ-12345678",
-                            "key" : "MEIZU_APPKEY",
-                            "value" : ""
-                        },
-                        "JPUSH_MEIZU_APPID" : {
-                            "des" : "厂商MEIZU-appId,示例：MZ-12345678",
-                            "key" : "MEIZU_APPID",
-                            "value" : ""
-                        },
-                        "JPUSH_XIAOMI_APPKEY" : {
-                            "des" : "厂商XIAOMI-appKey,示例：MI-12345678",
-                            "key" : "XIAOMI_APPKEY",
-                            "value" : ""
-                        },
-                        "JPUSH_XIAOMI_APPID" : {
-                            "des" : "厂商XIAOMI-appId,示例：MI-12345678",
-                            "key" : "XIAOMI_APPID",
-                            "value" : ""
-                        }
-                    }
-                }
-            }
-        }
-    },
-    /* 快应用特有相关 */
-    "quickapp" : {},
-    /* 小程序特有相关 */
-    "mp-weixin" : {
-        "appid" : "wx5fb1cc8edb3f8baa",
-        "setting" : {
-            "urlCheck" : false,
-            "minified" : true,
-            "postcss" : true,
-            "es6" : true
-        },
-        "permission" : {
-            "scope.userLocation" : {
-                "desc" : "获取您的位置"
-            }
-        },
-        "requiredPrivateInfos" : [ "getLocation", "chooseAddress" ],
-        "usingComponents" : true,
-        "__usePrivacyCheck__" : true
-    },
-    "mp-alipay" : {
-        "usingComponents" : true
-    },
-    "mp-baidu" : {
-        "usingComponents" : true
-    },
-    "mp-toutiao" : {
-        "usingComponents" : true
-    },
-    "h5" : {
-        "devServer" : {
-            "https" : false
-        },
-        "router" : {
-            "mode" : "history",
-            "base" : ""
-        },
-        "domain" : "",
-        "sdkConfigs" : {
-            "maps" : {
-                "qqmap" : {
-                    "key" : "SMJBZ-WCHK4-ZPZUA-DSIXI-XDDVQ-XWFX7"
-                }
-            }
-        },
-        "title" : "加载中...",
-        "template" : "template.h5.html",
-        "optimization" : {
-            "treeShaking" : {
-                "enable" : true
-            }
-        }
-    }
-}
+	"name": "惠农生活",
+	"appid": "__UNI__3A527D1",
+	"description": "",
+	"versionName": "2.0.45",
+	"versionCode": 2045,
+	"transformPx": false,
+	/* 5+App特有相关 */
+	"app-plus": {
+		"titleNView": true,
+		"usingComponents": true,
+		"nvueCompiler": "uni-app",
+		"nvueStyleCompiler": "uni-app",
+		"compilerVersion": 3,
+		"compatible": {
+			"ignoreVersion": true //true表示忽略版本检查提示框，HBuilderX1.9.0及以上版本支持 
+		},
+		"splashscreen": {
+			"alwaysShowBeforeRender": false,
+			"waiting": false,
+			"autoclose": true,
+			"delay": 0
+		},
+		/* 模块配置 */
+		"modules": {
+			"VideoPlayer": {},
+			"OAuth": {},
+			"Payment": {},
+			"Share": {},
+			"iBeacon": {},
+			"Maps": {},
+			"Geolocation": {},
+			"UniMP": {
+				"description": "uni小程序"
+			},
+			"Push": {},
+			"Barcode": {},
+			"Camera": {}
+		},
+		"safearea": {
+			"bottom": {
+				"offset": "none"
+			}
+		},
+		/* 应用发布信息 */
+		"distribute": {
+			/* android打包配置 */
+			"android": {
+				"permissions": [
+					"<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_LOCATION_EXTRA_COMMANDS\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.BATTERY_STATS\"/>",
+					"<uses-permission android:name=\"android.permission.BLUETOOTH\"/>",
+					"<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
+					"<uses-permission android:name=\"android.permission.CAMERA\"/>",
+					"<uses-permission android:name=\"android.permission.CHANGE_CONFIGURATION\"/>",
+					"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
+					"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+					"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+					"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+					"<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_ADMIN\"/>"
+				],
+				"abiFilters": ["armeabi-v7a", "arm64-v8a", "x86"],
+				"permissionExternalStorage": {
+					"request": "none",
+					"prompt": "应用保存运行状态等信息，需要获取读写手机存储（系统提示为访问设备上的照片、媒体内容和文件）权限，请允许。"
+				},
+				"permissionPhoneState": {
+					"request": "none" //拨打电话权限关闭
+				},
+				"minSdkVersion": 23,
+				"targetSdkVersion": 30
+			},
+			/* ios打包配置 */
+			"ios": {
+				"privacyDescription": {
+					"NSPhotoLibraryUsageDescription": "上传用户头像保存分享海报",
+					"NSPhotoLibraryAddUsageDescription": "上传用户头像保存分享海报",
+					"NSCameraUsageDescription": "上传用户头像保存分享海报",
+					"NSLocationWhenInUseUsageDescription": "根据客户地理位置推荐最近门店",
+					"NSLocationAlwaysUsageDescription": "根据客户地理位置推荐最近门店"
+				},
+				"idfa": false,
+				"dSYMs": false
+			},
+			/* SDK配置 */
+			"sdkConfigs": {
+				"maps": {
+					"amap": {
+						"appkey_ios": "0a3202688624938fd5d2f37b52c30d5d",
+						"appkey_android": "0354f5ddc11e2ea76c5aac647f44d945",
+						"name": "amapIvoVHpJR"
+					}
+				},
+				"payment": {
+					"weixin": {
+						"__platform__": ["ios", "android"],
+						"appid": "wx2e8f79ff281284f5",
+						"UniversalLinks": "https://shop.lihaink.cn/"
+					}
+				},
+				"share": {
+					"weixin": {
+						"appid": "wx2e8f79ff281284f5",
+						"UniversalLinks": "https://shop.lihaink.cn/"
+					}
+				},
+				"geolocation": {
+					"amap": {
+						"name": "amapIvoVHpJR",
+						"__platform__": ["ios", "android"],
+						"appkey_ios": "0a3202688624938fd5d2f37b52c30d5d",
+						"appkey_android": "0354f5ddc11e2ea76c5aac647f44d945"
+					}
+				},
+				"push": {},
+				"oauth": {
+					"weixin": {
+						"appid": "wx2e8f79ff281284f5",
+						"UniversalLinks": "https://shop.lihaink.cn/"
+					},
+					"univerify": {}
+				},
+				"ad": {}
+			},
+			"icons": {
+				"android": {
+					"hdpi": "unpackage/res/icons/72x72.png",
+					"xhdpi": "unpackage/res/icons/96x96.png",
+					"xxhdpi": "unpackage/res/icons/144x144.png",
+					"xxxhdpi": "unpackage/res/icons/192x192.png"
+				},
+				"ios": {
+					"appstore": "unpackage/res/icons/1024x1024.png",
+					"ipad": {
+						"app": "unpackage/res/icons/76x76.png",
+						"app@2x": "unpackage/res/icons/152x152.png",
+						"notification": "unpackage/res/icons/20x20.png",
+						"notification@2x": "unpackage/res/icons/40x40.png",
+						"proapp@2x": "unpackage/res/icons/167x167.png",
+						"settings": "unpackage/res/icons/29x29.png",
+						"settings@2x": "unpackage/res/icons/58x58.png",
+						"spotlight": "unpackage/res/icons/40x40.png",
+						"spotlight@2x": "unpackage/res/icons/80x80.png"
+					},
+					"iphone": {
+						"app@2x": "unpackage/res/icons/120x120.png",
+						"app@3x": "unpackage/res/icons/180x180.png",
+						"notification@2x": "unpackage/res/icons/40x40.png",
+						"notification@3x": "unpackage/res/icons/60x60.png",
+						"settings@2x": "unpackage/res/icons/58x58.png",
+						"settings@3x": "unpackage/res/icons/87x87.png",
+						"spotlight@2x": "unpackage/res/icons/80x80.png",
+						"spotlight@3x": "unpackage/res/icons/120x120.png"
+					}
+				}
+			},
+			"splashscreen": {
+				"useOriginalMsgbox": true,
+				"androidStyle": "common"
+			}
+		},
+		"nativePlugins": {
+			"JG-JCore": {
+				"JPUSH_APPKEY_IOS": "8a5efd65cda14fafa6e64ad3",
+				"JPUSH_CHANNEL_IOS": "8a5efd65cda14fafa6e64ad3",
+				"JPUSH_APPKEY_ANDROID": "b5f679f4357018605ea6fd2e",
+				"JPUSH_CHANNEL_ANDROID": "",
+				"__plugin_info__": {
+					"name": "JG-JCore",
+					"description": "极光推送JCore插件",
+					"platforms": "Android,iOS",
+					"url": "",
+					"android_package_name": "uni.UNI3A527D1",
+					"ios_bundle_id": "",
+					"isCloud": false,
+					"bought": -1,
+					"pid": "",
+					"parameters": {
+						"JPUSH_APPKEY_IOS": {
+							"des": "[iOS]极光portal配置应用信息时分配的AppKey",
+							"key": "JCore:APP_KEY",
+							"value": "daebe19b547c43128796a078"
+						},
+						"JPUSH_CHANNEL_IOS": {
+							"des": "[iOS]用于统计分发渠道，不需要可填默认值developer-default",
+							"key": "JCore:CHANNEL",
+							"value": ""
+						},
+						"JPUSH_APPKEY_ANDROID": {
+							"des": "[Android]极光portal配置应用信息时分配的AppKey",
+							"key": "JPUSH_APPKEY",
+							"value": ""
+						},
+						"JPUSH_CHANNEL_ANDROID": {
+							"des": "[Android]用于统计分发渠道，不需要可填默认值developer-default",
+							"key": "JPUSH_CHANNEL",
+							"value": ""
+						}
+					}
+				}
+			},
+			"JG-JPush": {
+				"JPUSH_ISPRODUCTION_IOS": "true",
+				"JPUSH_ADVERTISINGID_IOS": "",
+				"JPUSH_DEFAULTINITJPUSH_IOS": "true",
+				"JPUSH_OPPO_APPKEY": "",
+				"JPUSH_OPPO_APPID": "",
+				"JPUSH_OPPO_APPSECRET": "",
+				"JPUSH_VIVO_APPKEY": "",
+				"JPUSH_VIVO_APPID": "",
+				"JPUSH_MEIZU_APPKEY": "",
+				"JPUSH_MEIZU_APPID": "",
+				"JPUSH_XIAOMI_APPKEY": "",
+				"JPUSH_XIAOMI_APPID": "",
+				"__plugin_info__": {
+					"name": "JG-JPush",
+					"description": "极光推送Hbuilder插件",
+					"platforms": "Android,iOS",
+					"url": "",
+					"android_package_name": "uni.UNI3A527D1",
+					"ios_bundle_id": "",
+					"isCloud": false,
+					"bought": -1,
+					"pid": "",
+					"parameters": {
+						"JPUSH_ISPRODUCTION_IOS": {
+							"des": "[iOS]是否是生产环境，是填true，不是填false或者不填",
+							"key": "JPush:ISPRODUCTION",
+							"value": ""
+						},
+						"JPUSH_ADVERTISINGID_IOS": {
+							"des": "[iOS]广告标识符（IDFA）如果不需要使用IDFA，可不填",
+							"key": "JPush:ADVERTISINGID",
+							"value": ""
+						},
+						"JPUSH_DEFAULTINITJPUSH_IOS": {
+							"des": "[iOS]是否默认初始化，是填true，不是填false或者不填",
+							"key": "JPush:DEFAULTINITJPUSH",
+							"value": ""
+						},
+						"JPUSH_OPPO_APPKEY": {
+							"des": "厂商OPPO-appkey,示例：OP-12345678",
+							"key": "OPPO_APPKEY",
+							"value": ""
+						},
+						"JPUSH_OPPO_APPID": {
+							"des": "厂商OPPO-appId,示例：OP-12345678",
+							"key": "OPPO_APPID",
+							"value": ""
+						},
+						"JPUSH_OPPO_APPSECRET": {
+							"des": "厂商OPPO-appSecret,示例：OP-12345678",
+							"key": "OPPO_APPSECRET",
+							"value": ""
+						},
+						"JPUSH_VIVO_APPKEY": {
+							"des": "厂商VIVO-appkey,示例：12345678",
+							"key": "com.vivo.push.api_key",
+							"value": ""
+						},
+						"JPUSH_VIVO_APPID": {
+							"des": "厂商VIVO-appId,示例：12345678",
+							"key": "com.vivo.push.app_id",
+							"value": ""
+						},
+						"JPUSH_MEIZU_APPKEY": {
+							"des": "厂商MEIZU-appKey,示例：MZ-12345678",
+							"key": "MEIZU_APPKEY",
+							"value": ""
+						},
+						"JPUSH_MEIZU_APPID": {
+							"des": "厂商MEIZU-appId,示例：MZ-12345678",
+							"key": "MEIZU_APPID",
+							"value": ""
+						},
+						"JPUSH_XIAOMI_APPKEY": {
+							"des": "厂商XIAOMI-appKey,示例：MI-12345678",
+							"key": "XIAOMI_APPKEY",
+							"value": ""
+						},
+						"JPUSH_XIAOMI_APPID": {
+							"des": "厂商XIAOMI-appId,示例：MI-12345678",
+							"key": "XIAOMI_APPID",
+							"value": ""
+						}
+					}
+				}
+			}
+		}
+	},
+	/* 快应用特有相关 */
+	"quickapp": {},
+	/* 小程序特有相关 */
+	"mp-weixin": {
+		"appid": "wx5fb1cc8edb3f8baa",
+		"setting": {
+			"urlCheck": false,
+			"minified": true,
+			"postcss": true,
+			"es6": true
+		},
+		"permission": {
+			"scope.userLocation": {
+				"desc": "获取您的位置"
+			}
+		},
+		"requiredPrivateInfos": ["getLocation", "chooseAddress"],
+		"usingComponents": true,
+		"__usePrivacyCheck__": true
+	},
+	"mp-alipay": {
+		"usingComponents": true
+	},
+	"mp-baidu": {
+		"usingComponents": true
+	},
+	"mp-toutiao": {
+		"usingComponents": true
+	},
+	"h5": {
+		"devServer": {
+			"https": false
+		},
+		"router": {
+			"mode": "history",
+			"base": ""
+		},
+		"domain": "",
+		"sdkConfigs": {
+			"maps": {
+				"qqmap": {
+					"key": "SMJBZ-WCHK4-ZPZUA-DSIXI-XDDVQ-XWFX7"
+				}
+			}
+		},
+		"title": "加载中...",
+		"template": "template.h5.html",
+		"optimization": {
+			"treeShaking": {
+				"enable": true
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/pages/gather/gather.vue b/pages/gather/gather.vue
index a40afe5..d64ced0 100644
--- a/pages/gather/gather.vue
+++ b/pages/gather/gather.vue
@@ -366,7 +366,6 @@
 		},
 		methods: {
 			openDiver() {
-				// console.log("open")
 				this.subNVue.show('zoom-out', 300)
 				uni.$emit('diverGatherEmit', this.elInfo);
 			},
diff --git a/pages/gather/subnvue/concat.nvue b/pages/gather/subnvue/concat.nvue
index ebae390..687119e 100644
--- a/pages/gather/subnvue/concat.nvue
+++ b/pages/gather/subnvue/concat.nvue
@@ -4,7 +4,8 @@
 			<text class="font">跳过</text>
 		</view>
 		<view class="tabbar" :style="{top:(top-12)+'px',left:(left-12)+'px'}">
-			<image src="/static/images/fabu.png" class="tab-icon"></image>
+			<image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/0fa43202312291702314919.png" class="tab-icon">
+			</image>
 		</view>
 		<view class="" class="pointe" :style="{ left:(left-10)+'px',top:(top)+'px'}">
 			<image src="/static/images/pointer.png" style="width: 254rpx;height: 254rpx;" mode=""></image>
@@ -12,11 +13,22 @@
 		<view class="center" :style="{left:(left+20)+'px',  top:(top+60)+'px'}">
 			<image src="/static/images/greenLineDown.png" style="width:35px;height: 60px;" mode=""></image>
 		</view>
-		<view class="tips" :style="{ left:left+'px',top:(top+120)+'px'}">
+		<!-- <view class="tips" :style="{ left:left+'px',top:(top+120)+'px'}">
 			<view class="tras" :class="{act:isActive}">
 				<text class="font" style="line-height: 106rpx;">点击供销助农平台进入商户平台</text>
 			</view>
+		</view> -->
+		<view class="tips-box" :style="{ left:left+'px',top:(top+120)+'px'}">
+			<view class="tips" style="position: absolute;padding-left: 20px;">
+				<view class="tras" :class="{act:isActive}">
+					<text style="font-size: 28rpx;line-height: 100rpx;color: white;">点击我的页面，进行商户入驻</text>
+				</view>
+			</view>
+			<image src="/static/images/starpng.png" class="start" mode="">
+			</image>
 		</view>
+
+
 		<view class="next-btn center">
 			<text class="next-btn-text font" @click="next">下一步(2/4)</text>
 		</view>
@@ -52,9 +64,7 @@
 					done: 1
 				}).then(res => {
 					console.log(res, 'res')
-					// uni.$emit('diverGatherSubEmit');
 				})
-				// uni.setStorageSync('is_new_user', false)
 			}
 		},
 		onLoad() {
@@ -81,11 +91,34 @@
 		border-radius: 30rpx;
 	}
 
+	/* .tips {
+		width: 462rpx;
+		height: 106rpx;
+		background-color: #5BE157;
+		border-radius: 20rpx;
+	} */
+	.tips-box {
+		width: 462rpx;
+		height: 178rpx;
+		position: absolute;
+		padding-top: 72rpx;
+		position: absolute;
+	}
+
+	.start {
+		width: 72rpx;
+		height: 72rpx;
+		position: absolute;
+		right: 0;
+		top: 20px;
+	}
+
 	.tips {
 		width: 462rpx;
 		height: 106rpx;
 		background-color: #5BE157;
 		border-radius: 20rpx;
+
 	}
 
 	.center {
diff --git a/pages/helpPeople/helpPeople.vue b/pages/helpPeople/helpPeople.vue
index 836f6a4..2422d16 100644
--- a/pages/helpPeople/helpPeople.vue
+++ b/pages/helpPeople/helpPeople.vue
@@ -18,6 +18,13 @@
 				我是农民用户
 			</view>
 		</view>
+		<view class="li" style="margin-top: 50rpx;" @click="navSw('/pages/index/index',true)">
+			<u-image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/48aed202402260946123969.webp" width="690rpx"
+				height="200rpx" style="position: absolute;"></u-image>
+			<view class="btn">
+				我是商户
+			</view>
+		</view>
 	</view>
 </template>
 
@@ -37,7 +44,9 @@
 					url
 				})
 			},
-			navSw(url) {
+			navSw(url, isNewStore) {
+				uni.setStorageSync('newStore', Boolean(isNewStore))
+				// return
 				uni.switchTab({
 					url: url
 				})
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 69f3799..6d678a1 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -525,7 +525,8 @@
 				preview: false,
 				isSupport: true,
 				isIndexClick: true,
-				scrollTop: 0
+				scrollTop: 0,
+				// newStore:
 			};
 		},
 
@@ -597,30 +598,13 @@
 			};
 		},
 		// #endif
-
-
-
-
 		created(options) {
 			let routes = getCurrentPages(); // 获取当前打开过的页面路由数组
 			let curRoute = routes[routes.length - 1].route //获取当前页面路由
 			this.activeRouter = '/' + curRoute
 		},
 		onLoad(options) {
-			// #ifdef APP
-			uni.$on('offSubnvue', () => {
-				this.subNvue.hide('slide-out-left')
-				uni.switchTab({
-					url: '/pages/user/index'
-				})
-			})
-			uni.$on('diverIndexSubEmit', () => {
-				this.subNvue.hide('slide-out-left')
-				uni.switchTab({
-					url: '/pages/gather/gather'
-				})
-			})
-			// #endif
+
 
 			let that = this
 			this._options = options;
@@ -641,14 +625,8 @@
 		},
 
 		onShow() {
+			if (uni.getStorageSync('newStore')) this.openDiver();
 			let that = this;
-			// #ifdef APP-PLUS
-			if (Boolean(uni.getStorageSync('is_new_user'))) {
-				this.subNvue = uni.getSubNVueById('newUser')
-				this.subNvue.show('slide-in-left', 300)
-			}
-			// #endif
-
 			that.isIntegral = uni.getStorageSync('isIntegral')
 			// #ifdef APP-PLUS
 			if (that.appUpdate.openUpgrade == '1') {
@@ -694,8 +672,37 @@
 		},
 
 		methods: {
+			/*新商户引导页相关*/
 			openDiver() {
+				// #ifdef APP
+				this.subNvue = uni.getSubNVueById('newUser')
+				this.subNvue.show('slide-in-left', 300)
+				uni.$on('offSubnvue', () => {
+					this.subNvue.hide('slide-out-left')
+					if (uni.getStorageSync("newStore")) {
+						uni.switchTab({
+							url: '/pages/user/index'
+						})
+					}
+				});
+				// uni.$on('diverIndexSubEmit', () => {
+				// 	this.subNvue.hide('slide-out-left')
+				// 	uni.switchTab({
+				// 		url: '/pages/gather/gather'
+				// 	})
+				// })
+				// #endif
+
+			},
+			/* 新商户发布商品引导页 */
+			openListGoodsDiver() {
 				if (Boolean(this.userInfo.service?.mer_id)) {
+					uni.$on('diverIndexSubEmit', () => {
+						this.subNvue.hide('slide-out-left')
+						uni.switchTab({
+							url: '/pages/gather/gather'
+						})
+					})
 					isNewMer(this.userInfo.uid, this.userInfo.service?.mer_id).then(
 						res => {
 							if (res.data == 'true') {
@@ -1042,7 +1049,9 @@
 					showTab(res.data);
 					that.userInfo = res.data;
 					this.$store.commit('SET_USERINFO', res.data);
-					this.openDiver()
+					// #ifdef APP
+					this.openListGoodsDiver()
+					// #endif
 				});
 			},
 			// 记录会员访问
diff --git a/pages/index/subnvue/concat.nvue b/pages/index/subnvue/concat.nvue
index 4dac274..8ff2f18 100644
--- a/pages/index/subnvue/concat.nvue
+++ b/pages/index/subnvue/concat.nvue
@@ -6,10 +6,14 @@
 		<view class="next-btn" :style="{top:(offsetY-250)+'px'}">
 			<text class="next-btn-text font" @click="next">下一步(1/4)</text>
 		</view>
-		<view class="tips center" :style="{top:(offsetY-178)+'px'}">
-			<view class="tras" :class="{act:isActive}">
-				<text class="font" style="line-height: 106rpx;">点击生产页面，进入办公助手</text>
+		<view class="tips-box" :style="{right:20, top:(offsetY-218)+'px'}">
+			<view class="tips" style="position: absolute;padding-left: 20px;">
+				<view class="tras" :class="{act:isActive}">
+					<text style="font-size: 28rpx;line-height: 100rpx;color: white;">点击我的页面，进行商户入驻</text>
+				</view>
 			</view>
+			<image src="/static/images/starpng.png" class="start" mode="">
+			</image>
 		</view>
 		<view style="position: absolute;" class="center" :style="{top:(offsetY-120)+'px'}">
 			<image src="/static/images/greenLine.png" style="width:35px;height: 60px;" mode=""></image>
@@ -25,6 +29,9 @@
 </template>
 
 <script>
+	import {
+		isNewMer
+	} from '@/api/user.js';
 	export default {
 		data() {
 			return {
@@ -42,7 +49,11 @@
 
 			},
 			jump() {
-				uni.setStorageSync('is_new_user', false)
+				isNewMer(this.$store.state.app.userInfo.uid, this.$store.state.app.userInfo.service?.mer_id, {
+					done: 1
+				}).then(res => {
+					console.log(res, 'res')
+				})
 				uni.$emit('diverIndexSubEmit');
 			}
 		},
@@ -73,11 +84,28 @@
 		top: 80rpx;
 	}
 
+	.tips-box {
+		width: 462rpx;
+		height: 178rpx;
+		position: absolute;
+		padding-top: 72rpx;
+		position: absolute;
+	}
+
+	.start {
+		width: 72rpx;
+		height: 72rpx;
+		position: absolute;
+		right: 0;
+		top: 20px;
+	}
+
 	.tips {
 		width: 462rpx;
 		height: 106rpx;
 		background-color: #5BE157;
 		border-radius: 20rpx;
+
 	}
 
 	.center {
@@ -139,7 +167,7 @@
 		padding-left: 20rpx;
 		position: absolute;
 		z-index: 999 !important;
-		width: 20px;
+		width: 0px;
 		transition-property: width;
 		transition-duration: 3s;
 		transition-delay: 0.1s;
diff --git a/pages/index/subnvue/newUser.nvue b/pages/index/subnvue/newUser.nvue
index bc05f2f..ee01fbc 100644
--- a/pages/index/subnvue/newUser.nvue
+++ b/pages/index/subnvue/newUser.nvue
@@ -7,7 +7,7 @@
 			<text class="next-btn-text font" style="line-height: 76rpx;" @click="next">下一步(1/2)</text>
 		</view>
 		<view class="target" :style="{left:screenWidth/4*3,top:screenHeight-68}">
-			<image src="/static/images/fabu.png" class="target-icon"></image>
+			<image src="/static/images/ydwd.png" class="target-icon"></image>
 			<text class="target-text">我的</text>
 		</view>
 		<view :style="{left:screenWidth/4*3,top:screenHeight-130}">
@@ -38,8 +38,8 @@
 		},
 		methods: {
 			jump() {
+				uni.setStorageSync("newStore", false)
 				uni.$emit('offSubnvue');
-				uni.setStorageSync("is_new_user", 0)
 			},
 			next() {
 				uni.$emit('offSubnvue');
diff --git a/pages/store/settled/index1.vue b/pages/store/settled/index1.vue
index 34cfc3e..8521863 100644
--- a/pages/store/settled/index1.vue
+++ b/pages/store/settled/index1.vue
@@ -89,7 +89,7 @@
 											<view class="businessBox"
 												:style="{'color':(business_name == '' || business_name.length == 5)?'#B2B2B2':''}"
 												style="width: 400rpx;word-break: keep-all;line-height: 40rpx;font-size: 30rpx;">
-												{{(business_name == '' || business_name.length == 5)?'请选择商圈':business_name}}
+												{{(business_name == '' || business_name.length == 5)?'请选择商12圈':business_name}}
 											</view>
 											<view class='iconfont icon-jiantou'></view>
 										</picker>
diff --git a/pages/user/index.vue b/pages/user/index.vue
index c9a64f4..338740a 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -174,14 +174,14 @@
 				</view>
 				<!-- 会员菜单 -->
 				<view class="user-menus" style="margin-top: 20rpx;">
-					<view class="title skeleton-rect">我的2服务</view>
+					<view class="title skeleton-rect">我的服务</view>
 					<view class="menu-box">
 						<block v-for="(item,index) in personalMenu" :key="index" :id="'target'+index">
 							<view v-if="item.isShow" class="item ">
 								<view @click="authTo(item.url)" class="item-count">
 									<image v-if="showSkeleton" class="skeleton_image skeleton-radius"></image>
 									<image v-else :src="item.pic" class="targets"></image>
-									<text>{{item.name+index}}</text>
+									<text>{{item.name}}</text>
 								</view>
 							</view>
 						</block>
@@ -483,12 +483,11 @@
 					.boundingClientRect((data) => {
 						that.elInfo = data
 						// #ifdef APP-PLUS
-						if (Boolean(uni.getStorageSync('is_new_user'))) {
+						if (Boolean(uni.getStorageSync('newStore'))) {
 							that.subNvue = uni.getSubNVueById('userSubnvu')
 							that.subNvue.show('slide-in-left', 300)
 							uni.$emit('openUserSubnvue', JSON.stringify(data))
 						}
-
 						// #endif
 					})
 					.exec();
@@ -503,17 +502,12 @@
 		},
 		onShow: function() {
 			// #ifdef APP-PLUS
-			// this.subNvue = uni.getSubNVueById('userSubnvu')
-			// this.subNvue.show('slide-in-left', 300)
-			// uni.$emit('openUserSubnvue', JSON.stringify(this.elInfo))
-			if (Boolean(uni.getStorageSync('is_new_user')) && this.elInfo) {
+			if ((uni.getStorageSync('newStore')) && this.elInfo) {
 				this.subNvue = uni.getSubNVueById('userSubnvu')
 				this.subNvue.show('slide-in-left', 300)
 				uni.$emit('openUserSubnvue', JSON.stringify(this.elInfo))
 			}
-
 			// #endif
-
 			let that = this;
 			let routes = getCurrentPages();
 			let curRoute = routes[routes.length - 1].route
diff --git a/pages/user/subnvue/index.nvue b/pages/user/subnvue/index.nvue
index c04c7d2..96efc77 100644
--- a/pages/user/subnvue/index.nvue
+++ b/pages/user/subnvue/index.nvue
@@ -1,13 +1,14 @@
 <template>
 	<view class="">
-		<view class="jump" @click="jump">
+		<view class="jump" @click="next">
 			<text class="font">跳过</text>
 		</view>
 		<view class="next-btn center" :style="{ left:screenWidth/2,top:(screenHeight-96)}">
 			<text class="next-btn-text font" style="line-height: 76rpx;" @click="next">我知道了</text>
 		</view>
 		<view class="target" :style="{left:left-20,top:top-13.5}">
-			<image src="/static/images/fabu.png" class="target-icon"></image>
+			<image src="http://lihai001.oss-cn-chengdu.aliyuncs.com/def/6202d269b6163b9ec7a4383559fc67a8.png"
+				class="target-icon"></image>
 			<text class="target-text">商家入驻</text>
 		</view>
 		<view :style="{left:left-20,top:top-70}" class="trans1">
@@ -39,20 +40,14 @@
 			}
 		},
 		methods: {
-			jump() {
-				uni.$emit('offuserSubnvue');
-				uni.setStorageSync("is_new_user", 0)
-			},
 			next() {
 				uni.$emit('offuserSubnvue');
-				uni.setStorageSync("is_new_user", 0)
+				uni.setStorageSync("newStore", false)
 			}
 		},
 		onLoad() {
 			let that = this
 			uni.$on('openUserSubnvue', (data) => {
-				console.log('获取到的data')
-				console.log(JSON.parse(data))
 				that.left = JSON.parse(data).left
 				that.top = JSON.parse(data).top
 			})
@@ -65,8 +60,6 @@
 			setTimeout(() => {
 				that.isAct = true
 			})
-
-
 		}
 
 
diff --git a/static/images/pointer.png b/static/images/pointer.png
index edd4fadaff553ae7e1b93400b6ccaf9ce81eeaa6..251271cff4be721ffa1bce4361f8e92b296f85df 100644
GIT binary patch
literal 13591
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
Uvwv28|I-Nok&qX!5H$$+KL%IvPXGV_

literal 1624
zcmV-e2B-OnP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px*5=lfsRCr$Pm`iL_Wf+Fv@Bhzj?!63<HYgM*1o0L@Q357JqsE20fR&ep(P*ME
zG3r(km#)->x-iCsAeLw}Aexi}g4`0jLQo<iK}=|Y(i<%^opa7-zW>aO#SNR8(-~)`
zIhiwQJLmtN?|t9@LTK?9wRrt#186It#R;@6(BcAUhhW<RZ40zGfwl!&TmbRS0?e#2
zeeofr7CM0bfrx@efFGL$_|M~SaxVWq(w!hDvy;eqx@7?H$pMGm-Z3O|Nw`TM*X@&)
zbBQRNZwRp{fKMOJunH&PWdO?svK>qseU#`u-x>hU4(8Z*$Kj;`+XK>BkmEi<-hw@?
z0pQHOEQhHH@-konkj#J*i5=wTpKT2QCkN877frI8CO96DNP)7Q=Sb(4wFZE52RsyM
zhP@QQNq{5>JMunM#t{HS#PbCro)A2<&xP;Ku$NJAk}xXBbutZKc#FHcx3ZNvpq#1g
zM7Laz8$>(+WE#}n<8V_6GY#4vD3b$EPnbZ2(*+8HA!u)X+*4yb0Qi7~--2OwQ{8Y=
zAlm^a(=ci%O#{ge5Io@0nHS+E?}X><hSzg6j@4p300ss$uj%>&ZgMHyL^Kt;9+2$<
zF8>Y6_kfiHj1B{efm|LGsxM(@pCcl_p0<bw06;i3c!ZtA1IGUXz_KIxlNA*$pF;&)
z`3vaoF$*Rt%)Ehw`#F#suUAmk9RM>Eem%CFdFFfA&PoHoa-xFeULb@4pf#Wbh6`{J
z@O@x*76601^f$0_&k#|~L$a;_O!23GdX>ZQLlnj9sc0!|yMSc@+K#MX%LY+C3j_r)
zgMvUx2d2h=Y$rf!KiOT6);c8X3*gkDEv#ra3fF;=^T3kj<?c(tc2u+|K`wz{+knzl
z%bTzaLLexClwyoe_0qz=;aX-w-2m{3y`8YLmzb1=D<i<fDA2bIq#dxfLD~jO#|4BG
zEs78b0z*_lR0blJ5C}!k<mhV3uR7fn0Q^(?w<zW81`{wb224+YdV0Xpb>nrp1VH&+
z3a%)^wn0iqe=GNv4W2E4E{)tvx85<-6ae_-{<m3M@0!7~_}Vv}G=)ir1prB>6^JyL
z2=Zf8QOSquy#@jwG&#PBmfU@~IRO0f<IAk<kIi7ESTGQl<U_S^b1y+BAk0hd%Stei
z%AqJA7@+G@8>oN%vE~49V((gJJ!FbAp4LEES<{p~UI9=!niRVT0J)@i^S|YLtwFxO
zg8J8;Z4LlKdy-ImmCeL1&DEwZmVKWovJ64&VQgY%{OFblEY?tB4+YW|$Z;6K)FSGC
z@N!cCFog_#`x*zq2i1b5An|#nc%uNxhYA2d4haQ>$podLl!CGy0WbzN*-L$!3(W&S
z&H+ZQT;MRwM-a-MmQIT;<^li^8WlwEWB@2A%ZBn&5)a?es`XFRviNf9)cPxL{67Bq
z>t$Rl{tkw&_*#mKR8WzB6o$+U=FmX+SNhS`8M8B+Y4xUqwH|HV7D96e%ExzZ<Psl(
zER8EFsAhl+p?rw~0^ckhWadzg2TJ8+El@=9TAps-e61+~m^?W4)x$hHJ6N?sH3uri
zOG1kNOU44SD%9z&XtPu(Y^OCF-l=u*u~^^+B^=$gl}r9WWdUSh%;`Rf1p*(TM5W_F
z$+p<@d|aLErF&|d{*`gXVu8xT%<k~Wu8%kjU#ZUXmE+J5FaW~90FdCLg^PjW%nNke
z#?R`}{n!-{O^th!C>5?TX^J33(kI#Vg&{)80Bu91J3xu#7wEt5`C4y*=faFt0S15^
zk1gg=C@W`ng0eu8)RRMzFa*nGJ5ZeqWbg0@t-OD*UfrJ;1sDj2cfG`6@QFDXQ363l
zD<FX&89)Rr@^^GEEnRo<{|7*_;NXr&VX5~3x{I0Y>Iz87OlcS3C0@tc$3LytS>U{c
z;D0;G+qNk@wjvEAvIvW5^ZOzdU?)du<C9bM?0iE2h@-%pJtOuIyxD-_{(T!j+{7F0
zd2IzWT1Vm@Pg?<T6K}NVwH4549f^B9Z3V<lywRT5RzRb5B<}IF6%aS^Mtfe%E8riW
W^WIQ`o*Tsg0000<MNUMnLSTaZGwGTD

diff --git a/static/images/ydwd.png b/static/images/ydwd.png
new file mode 100644
index 0000000000000000000000000000000000000000..05198bc03e696ff0c12ba86008fe3fa95bf11591
GIT binary patch
literal 1046
zcmV+x1nK*UP)<h;3K|Lk000e1NJLTq001-q001-y1^@s6#dsU*00001b5ch_0Itp)
z=>Px&&`Cr=RA@u(nO#mBF%ZY?MetfULE!|26O^2w=?MrDws>oLf~F@ZyhU~-k{iGY
z2qz#t0qF@KuN$#bPh>}yn`LdUvqe$-nzcPY&xik>P_kizZWs^Q0=;*SZauX1P{Sv%
z){tY29aBm_5kd|PS5Xv`!C-K=F3z<8an8>Gpi3z|E-`!x09W(*d^8*mUsA#)1?qG<
z`@6fl_iupwV><wxODTt`pppTtf&qXBO6j;LiZL3TW!XLebSR}?Y=D$dNq|<s%v7$l
z2ZO-^#2uHHmxo1B^avqmR&KS*z7O$U5+KId6{Yl>-gpK8r&7vEl_8vS47CN6%DERQ
z<w4b)s^3!qJyS~e2_dsA%Z~f~{<Lai^Si2qw<ZKrgkEhR#u(<rjW%#3gy{If;CH&T
zKWZ;cq?9Ki^WAS#0F5c7pS3|JKB49s!5FK(hFLQykPsqjJ<d56h#zQFQ53a`LzDsb
z3EQW;5kN{6JfXBv3H?W1kV}aZk_Ye2LsL~0J|aM#=La!T#xCFgJ>=}uRb~6T5aKGt
zJ9sJY?d?6AJ50^T@*h2F=a9bjG3;<mg%C#})^N_dgpgl)&QBo(7KrFk8%W<J_T@N~
zQl9%*<lJGX^^QU=<yCv60>XFC;&RmYQ6-cM0|3`jO7vE(kpxJ4$<}kI%}Ncl)qx4s
zJkL*J3W`f#8%XC6=0Mw7yi^9Q09uGsHNU3>>UA9#)dIq>!GzYr)V5=k=Xv+76X%?_
z@zrWdz7?*M`F!4r^;R?x=N!G_#{4MDvR+7H>s-Qhu=ikc5WUrk(S=b!jIkR^=~7h#
zz}?QyPB#R^4XcZbi&ORVxK$qipbJYBR4|ZpZ{Xg+PlmD_(Yb}M+yxZgYoWy=2uPpe
zy=71`7_+7erCz^dDP_yIPy_)PA*vTo4)X?-cW1~O$kuFil(p|k+ZQjEbk)N<@~M1Y
zK)S2*WXf}0MH~RNRPuxnFP-NF<eb)nl=9Tqs5;*{IqM~SeSscLH?%45SoyT<H~8#b
z3FN$2ehVSW`qg!uQ93vDc~J>uyB%A*O@*5w4BfvH$a#@^C1y%j*%9K?T@3<C(b<fF
zRbhuRXrUgeI!l#6cHi13DPs(-niJA03j!j9d{spO1!SYcRwyYvWcRMI37_oGDW6jT
zfJ39~eTq`0hj3H%7{k9tmhTlGL)P()Psn=#;WPX7^>t{P^6N0RV$GR)N_2d}-3!Q8
z!GsX(@I<wIBM#z4|7*VTpTJe?1p!4E)cBMwP~%4)xZ&1Afd|(3=Nsptzbb1WQ-A)<
QF8}}l07*qoM6N<$f^rq(=>Px#

literal 0
HcmV?d00001

diff --git a/utils/uniMP.js b/utils/uniMP.js
index 96a2958..630380a 100644
--- a/utils/uniMP.js
+++ b/utils/uniMP.js
@@ -49,8 +49,8 @@ const loadMP = async (id) => {
 				else uni.$emit('showLoading', true, `初始化中... 99%`)
 			}, 200)
 			let downloadTask = uni.downloadFile({
-				// url: info.data.version_info?.dow_url,
-				url: "https://lihai001.oss-cn-chengdu.aliyuncs.com/attach/36e40202405031202367449.wgt",
+				url: info.data.version_info?.dow_url,
+				// url: "https://lihai001.oss-cn-chengdu.aliyuncs.com/attach/36e40202405031202367449.wgt",
 				success(res) {
 					wgtFile = res.tempFilePath;
 					setTimeout(() => {
@@ -221,8 +221,8 @@ const loadAppletMP = async (data) => {
 				else uni.$emit('showLoading', true, `初始化中... 99%`)
 			}, 200)
 			let downloadTask = uni.downloadFile({
-				// url: data.url,
-				url: "https://lihai001.oss-cn-chengdu.aliyuncs.com/attach/3ffde202405031254278460.wgt",
+				url: data.url,
+				// url: "https://lihai001.oss-cn-chengdu.aliyuncs.com/attach/3ffde202405031254278460.wgt",
 				success(res) {
 					wgtFile = res.tempFilePath;
 					console.log('初始化完成', wgtFile);
@@ -356,7 +356,7 @@ const open = (id = null) => {
 				mp.sendUniMPEvent(appid, 'tocustomlist', id, (ret) => {
 					console.log("开始发送消息")
 				});
-			}, 3000)
+			}, 1000)
 		}
 
 	});