修改配置文件版本冲突

manifest.json

@@ -1,451 +1,223 @@
-<<<<<<< HEAD
-{
-	"name": "非繁科技",
-	"appid": "__UNI__BAFF75B",
-	"description": "基于 uni-app + Vue3 技术驱动的在线商城系统，内含诸多功能与丰富的活动，期待您的使用和反馈。",
-	"versionName": "1.8.3",
-	"versionCode": 183,
-	"transformPx": false,
-	"app-plus": {
-		"usingComponents": true,
-		"nvueCompiler": "uni-app",
-		"nvueStyleCompiler": "uni-app",
-		"compilerVersion": 3,
-		"nvueLaunchMode": "fast",
-		"splashscreen": {
-			"alwaysShowBeforeRender": true,
-			"waiting": true,
-			"autoclose": true,
-			"delay": 0
-		},
-		"safearea": {
-			"bottom": {
-				"offset": "none"
-			}
-		},
-		"modules": {
-			"Payment": {},
-			"Share": {},
-			"VideoPlayer": {},
-			"OAuth": {}
-		},
-		"distribute": {
-			"android": {
-				"permissions": [
-					"<uses-feature android:name=\"android.hardware.camera\"/>",
-					"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
-					"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_MOCK_LOCATION\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
-					"<uses-permission android:name=\"android.permission.CAMERA\"/>",
-					"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-					"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-					"<uses-permission android:name=\"android.permission.GET_TASKS\"/>",
-					"<uses-permission android:name=\"android.permission.INTERNET\"/>",
-					"<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_CONTACTS\"/>",
-					"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-					"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.READ_SMS\"/>",
-					"<uses-permission android:name=\"android.permission.RECEIVE_BOOT_COMPLETED\"/>",
-					"<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
-					"<uses-permission android:name=\"android.permission.SEND_SMS\"/>",
-					"<uses-permission android:name=\"android.permission.SYSTEM_ALERT_WINDOW\"/>",
-					"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-					"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-					"<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
-					"<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
-					"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
-					"<uses-permission android:name=\"android.permission.WRITE_SMS\"/>",
-					"<uses-permission android:name=\"android.permission.RECEIVE_USER_PRESENT\"/>"
-				],
-				"minSdkVersion": 21,
-				"schemes": "shopro"
-			},
-			"ios": {
-				"urlschemewhitelist": ["baidumap", "iosamap"],
-				"dSYMs": false,
-				"privacyDescription": {
-					"NSPhotoLibraryUsageDescription": "需要同意访问您的相册选取图片才能完善该条目",
-					"NSPhotoLibraryAddUsageDescription": "需要同意访问您的相册才能保存该图片",
-					"NSCameraUsageDescription": "需要同意访问您的摄像头拍摄照片才能完善该条目",
-					"NSUserTrackingUsageDescription": "开启追踪并不会获取您在其它站点的隐私信息,该行为仅用于标识设备,保障服务安全和提升浏览体验"
-				},
-				"urltypes": "shopro",
-				"capabilities": {
-					"entitlements": {
-						"com.apple.developer.associated-domains": ["applinks:shopro.sheepjs.com"]
-					}
-				},
-				"idfa": true
-			},
-			"sdkConfigs": {
-				"speech": {
-					"ifly": {}
-				},
-				"ad": {},
-				"oauth": {
-					"apple": {},
-					"weixin": {
-						"appid": "wxae7a0c156da9383b",
-						"UniversalLinks": "https://shopro.sheepjs.com/uni-universallinks/__UNI__082C0BA/"
-					}
-				},
-				"payment": {
-					"weixin": {
-						"__platform__": ["ios", "android"],
-						"appid": "wxae7a0c156da9383b",
-						"UniversalLinks": "https://shopro.sheepjs.com/uni-universallinks/__UNI__082C0BA/"
-					},
-					"alipay": {
-						"__platform__": ["ios", "android"]
-					}
-				},
-				"share": {
-					"weixin": {
-						"appid": "wxae7a0c156da9383b",
-						"UniversalLinks": "https://shopro.sheepjs.com/uni-universallinks/__UNI__082C0BA/"
-					}
-				}
-			},
-			"orientation": ["portrait-primary"],
-			"splashscreen": {
-				"androidStyle": "common",
-				"iosStyle": "common",
-				"useOriginalMsgbox": true
-			},
-			"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"
-					}
-				}
-			}
-		}
-	},
-	"quickapp": {},
-	"quickapp-native": {
-		"icon": "/static/logo.png",
-		"package": "com.example.demo",
-		"features": [{
-			"name": "system.clipboard"
-		}]
-	},
-	"quickapp-webview": {
-		"icon": "/static/logo.png",
-		"package": "com.example.demo",
-		"minPlatformVersion": 1070,
-		"versionName": "1.0.0",
-		"versionCode": 100
-	},
-	"mp-weixin": {
-		"appid": "wx63c280fe3248a3e7",
-		"setting": {
-			"urlCheck": false,
-			"minified": true,
-			"postcss": true
-		},
-		"optimization": {
-			"subPackages": true
-		},
-		"plugins": {},
-		"lazyCodeLoading": "requiredComponents",
-		"usingComponents": {},
-		"permission": {},
-		"requiredPrivateInfos": ["chooseAddress"]
-	},
-	"mp-alipay": {
-		"usingComponents": true
-	},
-	"mp-baidu": {
-		"usingComponents": true
-	},
-	"mp-toutiao": {
-		"usingComponents": true
-	},
-	"mp-jd": {
-		"usingComponents": true
-	},
-	"h5": {
-		"template": "index.html",
-		"router": {
-			"mode": "hash",
-			"base": "./"
-		},
-		"sdkConfigs": {
-			"maps": {}
-		},
-		"async": {
-			"timeout": 20000
-		},
-		"title": "中星",
-		"optimization": {
-			"treeShaking": {
-				"enable": true
-			}
-		}
-	},
-	"vueVersion": "3",
-	"_spaceID": "192b4892-5452-4e1d-9f09-eee1ece40639",
-	"locale": "zh-Hans",
-	"fallbackLocale": "zh-Hans"
-}
-=======
 {
-    "name" : "非繁科技",
-    "appid" : "__UNI__BAFF75B",
-    "description" : "基于 uni-app + Vue3 技术驱动的在线商城系统，内含诸多功能与丰富的活动，期待您的使用和反馈。",
-    "versionName" : "1.8.3",
-    "versionCode" : 183,
-    "transformPx" : false,
-    "app-plus" : {
-        "usingComponents" : true,
-        "nvueCompiler" : "uni-app",
-        "nvueStyleCompiler" : "uni-app",
-        "compilerVersion" : 3,
-        "nvueLaunchMode" : "fast",
-        "splashscreen" : {
-            "alwaysShowBeforeRender" : true,
-            "waiting" : true,
-            "autoclose" : true,
-            "delay" : 0
-        },
-        "safearea" : {
-            "bottom" : {
-                "offset" : "none"
-            }
-        },
-        "modules" : {
-            "Payment" : {},
-            "Share" : {},
-            "VideoPlayer" : {},
-            "OAuth" : {}
-        },
-        "distribute" : {
-            "android" : {
-                "permissions" : [
-                    "<uses-feature android:name=\"android.hardware.camera\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
-                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_MOCK_LOCATION\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
-                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
-                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-                    "<uses-permission android:name=\"android.permission.GET_TASKS\"/>",
-                    "<uses-permission android:name=\"android.permission.INTERNET\"/>",
-                    "<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_CONTACTS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_SMS\"/>",
-                    "<uses-permission android:name=\"android.permission.RECEIVE_BOOT_COMPLETED\"/>",
-                    "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
-                    "<uses-permission android:name=\"android.permission.SEND_SMS\"/>",
-                    "<uses-permission android:name=\"android.permission.SYSTEM_ALERT_WINDOW\"/>",
-                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_SMS\"/>",
-                    "<uses-permission android:name=\"android.permission.RECEIVE_USER_PRESENT\"/>"
-                ],
-                "minSdkVersion" : 21,
-                "schemes" : "shopro"
-            },
-            "ios" : {
-                "urlschemewhitelist" : [ "baidumap", "iosamap" ],
-                "dSYMs" : false,
-                "privacyDescription" : {
-                    "NSPhotoLibraryUsageDescription" : "需要同意访问您的相册选取图片才能完善该条目",
-                    "NSPhotoLibraryAddUsageDescription" : "需要同意访问您的相册才能保存该图片",
-                    "NSCameraUsageDescription" : "需要同意访问您的摄像头拍摄照片才能完善该条目",
-                    "NSUserTrackingUsageDescription" : "开启追踪并不会获取您在其它站点的隐私信息,该行为仅用于标识设备,保障服务安全和提升浏览体验"
-                },
-                "urltypes" : "shopro",
-                "capabilities" : {
-                    "entitlements" : {
-                        "com.apple.developer.associated-domains" : [ "applinks:shopro.sheepjs.com" ]
-                    }
-                },
-                "idfa" : true
-            },
-            "sdkConfigs" : {
-                "speech" : {
-                    "ifly" : {}
-                },
-                "ad" : {},
-                "oauth" : {
-                    "apple" : {},
-                    "weixin" : {
-                        "appid" : "wxae7a0c156da9383b",
-                        "UniversalLinks" : "https://shopro.sheepjs.com/uni-universallinks/__UNI__082C0BA/"
-                    }
-                },
-                "payment" : {
-                    "weixin" : {
-                        "__platform__" : [ "ios", "android" ],
-                        "appid" : "wxae7a0c156da9383b",
-                        "UniversalLinks" : "https://shopro.sheepjs.com/uni-universallinks/__UNI__082C0BA/"
-                    },
-                    "alipay" : {
-                        "__platform__" : [ "ios", "android" ]
-                    }
-                },
-                "share" : {
-                    "weixin" : {
-                        "appid" : "wxae7a0c156da9383b",
-                        "UniversalLinks" : "https://shopro.sheepjs.com/uni-universallinks/__UNI__082C0BA/"
-                    }
-                }
-            },
-            "orientation" : [ "portrait-primary" ],
-            "splashscreen" : {
-                "androidStyle" : "common",
-                "iosStyle" : "common",
-                "useOriginalMsgbox" : true
-            },
-            "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"
-                    }
-                }
-            }
-        }
+  "name": "非繁科技",
+  "appid": "__UNI__BAFF75B",
+  "description": "基于 uni-app + Vue3 技术驱动的在线商城系统，内含诸多功能与丰富的活动，期待您的使用和反馈。",
+  "versionName": "1.8.3",
+  "versionCode": 183,
+  "transformPx": false,
+  "app-plus": {
+    "usingComponents": true,
+    "nvueCompiler": "uni-app",
+    "nvueStyleCompiler": "uni-app",
+    "compilerVersion": 3,
+    "nvueLaunchMode": "fast",
+    "splashscreen": {
+      "alwaysShowBeforeRender": true,
+      "waiting": true,
+      "autoclose": true,
+      "delay": 0
     },
-    "quickapp" : {},
-    "quickapp-native" : {
-        "icon" : "/static/logo.png",
-        "package" : "com.example.demo",
-        "features" : [
-            {
-                "name" : "system.clipboard"
-            }
-        ]
+    "safearea": {
+      "bottom": {
+        "offset": "none"
+      }
     },
-    "quickapp-webview" : {
-        "icon" : "/static/logo.png",
-        "package" : "com.example.demo",
-        "minPlatformVersion" : 1070,
-        "versionName" : "1.0.0",
-        "versionCode" : 100
+    "modules": {
+      "Payment": {},
+      "Share": {},
+      "VideoPlayer": {},
+      "OAuth": {}
     },
-    "mp-weixin" : {
-        "appid" : "wx63c280fe3248a3e7",
-        "setting" : {
-            "urlCheck" : false,
-            "minified" : true,
-            "postcss" : true
+    "distribute": {
+      "android": {
+        "permissions": [
+          "<uses-feature android:name=\"android.hardware.camera\"/>",
+          "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+          "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
+          "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+          "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
+          "<uses-permission android:name=\"android.permission.ACCESS_MOCK_LOCATION\"/>",
+          "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+          "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+          "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
+          "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+          "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+          "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+          "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+          "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+          "<uses-permission android:name=\"android.permission.GET_TASKS\"/>",
+          "<uses-permission android:name=\"android.permission.INTERNET\"/>",
+          "<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_CONTACTS\"/>",
+          "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+          "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+          "<uses-permission android:name=\"android.permission.READ_SMS\"/>",
+          "<uses-permission android:name=\"android.permission.RECEIVE_BOOT_COMPLETED\"/>",
+          "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
+          "<uses-permission android:name=\"android.permission.SEND_SMS\"/>",
+          "<uses-permission android:name=\"android.permission.SYSTEM_ALERT_WINDOW\"/>",
+          "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+          "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+          "<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
+          "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
+          "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
+          "<uses-permission android:name=\"android.permission.WRITE_SMS\"/>",
+          "<uses-permission android:name=\"android.permission.RECEIVE_USER_PRESENT\"/>"
+        ],
+        "minSdkVersion": 21,
+        "schemes": "shopro"
+      },
+      "ios": {
+        "urlschemewhitelist": ["baidumap", "iosamap"],
+        "dSYMs": false,
+        "privacyDescription": {
+          "NSPhotoLibraryUsageDescription": "需要同意访问您的相册选取图片才能完善该条目",
+          "NSPhotoLibraryAddUsageDescription": "需要同意访问您的相册才能保存该图片",
+          "NSCameraUsageDescription": "需要同意访问您的摄像头拍摄照片才能完善该条目",
+          "NSUserTrackingUsageDescription": "开启追踪并不会获取您在其它站点的隐私信息,该行为仅用于标识设备,保障服务安全和提升浏览体验"
         },
-        "optimization" : {
-            "subPackages" : true
+        "urltypes": "shopro",
+        "capabilities": {
+          "entitlements": {
+            "com.apple.developer.associated-domains": ["applinks:shopro.sheepjs.com"]
+          }
         },
-        "plugins" : {},
-        "lazyCodeLoading" : "requiredComponents",
-        "usingComponents" : {},
-        "permission" : {},
-        "requiredPrivateInfos" : [ "chooseAddress" ]
-    },
-    "mp-alipay" : {
-        "usingComponents" : true
-    },
-    "mp-baidu" : {
-        "usingComponents" : true
-    },
-    "mp-toutiao" : {
-        "usingComponents" : true
-    },
-    "mp-jd" : {
-        "usingComponents" : true
-    },
-    "h5" : {
-        "template" : "index.html",
-        "router" : {
-            "mode" : "hash",
-            "base" : "./"
+        "idfa": true
+      },
+      "sdkConfigs": {
+        "speech": {
+          "ifly": {}
+        },
+        "ad": {},
+        "oauth": {
+          "apple": {},
+          "weixin": {
+            "appid": "wxae7a0c156da9383b",
+            "UniversalLinks": "https://shopro.sheepjs.com/uni-universallinks/__UNI__082C0BA/"
+          }
         },
-        "sdkConfigs" : {
-            "maps" : {}
+        "payment": {
+          "weixin": {
+            "__platform__": ["ios", "android"],
+            "appid": "wxae7a0c156da9383b",
+            "UniversalLinks": "https://shopro.sheepjs.com/uni-universallinks/__UNI__082C0BA/"
+          },
+          "alipay": {
+            "__platform__": ["ios", "android"]
+          }
         },
-        "async" : {
-            "timeout" : 20000
+        "share": {
+          "weixin": {
+            "appid": "wxae7a0c156da9383b",
+            "UniversalLinks": "https://shopro.sheepjs.com/uni-universallinks/__UNI__082C0BA/"
+          }
+        }
+      },
+      "orientation": ["portrait-primary"],
+      "splashscreen": {
+        "androidStyle": "common",
+        "iosStyle": "common",
+        "useOriginalMsgbox": true
+      },
+      "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"
         },
-        "title" : "中星商城",
-        "optimization" : {
-            "treeShaking" : {
-                "enable" : true
-            }
+        "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"
+          }
         }
+      }
+    }
+  },
+  "quickapp": {},
+  "quickapp-native": {
+    "icon": "/static/logo.png",
+    "package": "com.example.demo",
+    "features": [{
+      "name": "system.clipboard"
+    }]
+  },
+  "quickapp-webview": {
+    "icon": "/static/logo.png",
+    "package": "com.example.demo",
+    "minPlatformVersion": 1070,
+    "versionName": "1.0.0",
+    "versionCode": 100
+  },
+  "mp-weixin": {
+    "appid": "wx63c280fe3248a3e7",
+    "setting": {
+      "urlCheck": false,
+      "minified": true,
+      "postcss": true
+    },
+    "optimization": {
+      "subPackages": true
+    },
+    "plugins": {},
+    "lazyCodeLoading": "requiredComponents",
+    "usingComponents": {},
+    "permission": {},
+    "requiredPrivateInfos": ["chooseAddress"]
+  },
+  "mp-alipay": {
+    "usingComponents": true
+  },
+  "mp-baidu": {
+    "usingComponents": true
+  },
+  "mp-toutiao": {
+    "usingComponents": true
+  },
+  "mp-jd": {
+    "usingComponents": true
+  },
+  "h5": {
+    "template": "index.html",
+    "router": {
+      "mode": "hash",
+      "base": "./"
+    },
+    "sdkConfigs": {
+      "maps": {}
+    },
+    "async": {
+      "timeout": 20000
     },
-    "vueVersion" : "3",
-    "_spaceID" : "192b4892-5452-4e1d-9f09-eee1ece40639",
-    "locale" : "zh-Hans",
-    "fallbackLocale" : "zh-Hans"
-}
->>>>>>> 2a4fc69da7887abaf079fe9390e3617ef41f9a66
+    "title": "中星",
+    "optimization": {
+      "treeShaking": {
+        "enable": true
+      }
+    }
+  },
+  "vueVersion": "3",
+  "_spaceID": "192b4892-5452-4e1d-9f09-eee1ece40639",
+  "locale": "zh-Hans",
+  "fallbackLocale": "zh-Hans"
+}

package.json

@@ -1,115 +1,9 @@
-<<<<<<< HEAD
-{
-	"id": "shopro",
-	"name": "shopro",
-	"displayName": "中星",
-	"version": "1.0.1",
-	"description": "芋道商城，一套代码，同时发行到iOS、Android、H5、微信小程序多个平台，请使用手机扫码快速体验强大功能",
-	"scripts": {
-		"prettier": "prettier --write  \"{pages,sheep}/**/*.{js,json,tsx,css,less,scss,vue,html,md}\""
-	},
-	"repository": "https://github.com/sheepjs/shop.git",
-	"keywords": [
-		"商城",
-		"B2C",
-		"商城模板"
-	],
-	"author": "",
-	"license": "MIT",
-	"bugs": {
-		"url": "https://github.com/sheepjs/shop/issues"
-	},
-	"homepage": "https://github.com/dcloudio/hello-uniapp#readme",
-	"dcloudext": {
-		"category": [
-			"前端页面模板",
-			"uni-app前端项目模板"
-		],
-		"sale": {
-			"regular": {
-				"price": "0.00"
-			},
-			"sourcecode": {
-				"price": "0.00"
-			}
-		},
-		"contact": {
-			"qq": ""
-		},
-		"declaration": {
-			"ads": "无",
-			"data": "无",
-			"permissions": "无"
-		},
-		"npmurl": ""
-	},
-	"uni_modules": {
-		"dependencies": [],
-		"encrypt": [],
-		"platforms": {
-			"cloud": {
-				"tcb": "u",
-				"aliyun": "u"
-			},
-			"client": {
-				"App": {
-					"app-vue": "y",
-					"app-nvue": "u"
-				},
-				"H5-mobile": {
-					"Safari": "y",
-					"Android Browser": "y",
-					"微信浏览器(Android)": "y",
-					"QQ浏览器(Android)": "y"
-				},
-				"H5-pc": {
-					"Chrome": "y",
-					"IE": "y",
-					"Edge": "y",
-					"Firefox": "y",
-					"Safari": "y"
-				},
-				"小程序": {
-					"微信": "y",
-					"阿里": "u",
-					"百度": "u",
-					"字节跳动": "u",
-					"QQ": "u",
-					"京东": "u"
-				},
-				"快应用": {
-					"华为": "u",
-					"联盟": "u"
-				},
-				"Vue": {
-					"vue2": "u",
-					"vue3": "y"
-				}
-			}
-		}
-	},
-	"dependencies": {
-		"@hyoga/uni-socket.io": "^1.0.1",
-		"dayjs": "^1.11.7",
-		"lodash": "^4.17.21",
-		"luch-request": "^3.0.8",
-		"pinia": "^2.0.33",
-		"pinia-plugin-persist-uni": "^1.2.0",
-		"qs-canvas": "^1.0.11",
-		"weixin-js-sdk": "^1.6.0"
-	},
-	"devDependencies": {
-		"prettier": "^2.8.7",
-		"vconsole": "^3.15.0"
-	}
-}
-=======
 {
   "id": "shopro",
   "name": "shopro",
-  "displayName": "中星商城",
+  "displayName": "中星",
   "version": "1.0.1",
-  "description": "中星商城，一套代码，同时发行到iOS、Android、H5、微信小程序多个平台，请使用手机扫码快速体验强大功能",
+  "description": "芋道商城，一套代码，同时发行到iOS、Android、H5、微信小程序多个平台，请使用手机扫码快速体验强大功能",
   "scripts": {
     "prettier": "prettier --write  \"{pages,sheep}/**/*.{js,json,tsx,css,less,scss,vue,html,md}\""
   },
@@ -207,5 +101,4 @@
     "prettier": "^2.8.7",
     "vconsole": "^3.15.0"
   }
-}
->>>>>>> 2a4fc69da7887abaf079fe9390e3617ef41f9a66
+}

sheep/store/app.js

@@ -1,147 +1,3 @@
-<<<<<<< HEAD
-import DiyApi from '@/sheep/api/promotion/diy';
-import {
-	defineStore
-} from 'pinia';
-import $platform from '@/sheep/platform';
-import $router from '@/sheep/router';
-import user from './user';
-import sys from './sys';
-
-const app = defineStore({
-	id: 'app',
-	state: () => ({
-		info: {
-			// 应用信息
-			name: '', // 商城名称
-			logo: '', // logo
-			version: '', // 版本号
-			copyright: '', // 版权信息 I
-			copytime: '', // 版权信息 II
-
-			cdnurl: '', // 云存储域名
-			filesystem: '', // 云存储平台
-		},
-		platform: {
-			share: {
-				methods: [], // 支持的分享方式
-				forwardInfo: {}, // 默认转发信息
-				posterInfo: {}, // 海报信息
-				linkAddress: '', // 复制链接地址
-			},
-			bind_mobile: 0, // 登陆后绑定手机号提醒 (弱提醒，可手动关闭)
-		},
-		chat: {},
-		template: {
-			// 店铺装修模板
-			basic: {}, // 基本信息
-			home: {
-				// 首页模板
-				style: {},
-				data: [],
-			},
-			user: {
-				// 个人中心模板
-				style: {},
-				data: [],
-			},
-		},
-		shareInfo: {}, // 全局分享信息
-		has_wechat_trade_managed: 0 // 小程序发货信息管理  0 没有 || 1 有
-	}),
-	actions: {
-		// 获取Shopro应用配置和模板
-		async init(templateId = null) {
-			// 检查网络
-			const networkStatus = await $platform.checkNetwork();
-			if (!networkStatus) {
-				$router.error('NetworkError');
-			}
-
-			// 加载装修配置
-			await adaptTemplate(this.template, templateId)
-
-			// TODO 芋艿：未来支持管理后台可配；对应 https://api.shopro.sheepjs.com/shop/api/init
-			if (true) {
-				this.info = {
-					name: '中星',
-					logo: 'https://static.iocoder.cn/ruoyi-vue-pro-logo.png',
-					version: '1.1.13',
-					copyright: '全部开源，个人与企业可 100% 免费使用',
-					copytime: 'Copyright© 2018-2024',
-
-					cdnurl: 'https://file.sheepjs.com', // 云存储域名
-					filesystem: 'qcloud', // 云存储平台
-				};
-				this.platform = {
-					share: {
-						methods: ["poster", "link"],
-						linkAddress: "https://shopro.sheepjs.com/#/",
-						posterInfo: {
-							"user_bg": "/static/img/shop/config/user-poster-bg.png",
-							"goods_bg": "/static/img/shop/config/goods-poster-bg.png",
-							"groupon_bg": "/static/img/shop/config/groupon-poster-bg.png"
-						}
-					},
-					bind_mobile: 0
-				};
-				this.chat = {
-					chat_domain: "https://api.shopro.sheepjs.com/chat",
-					room_id: "admin"
-				}
-				this.has_wechat_trade_managed = 0;
-
-				// 加载主题
-				const sysStore = sys();
-				sysStore.setTheme();
-
-				// 模拟用户登录
-				const userStore = user();
-				if (userStore.isLogin) {
-					userStore.loginAfter();
-				}
-				return Promise.resolve(true);
-			} else {
-				$router.error('InitError', res.msg || '加载失败');
-			}
-		},
-	},
-	persist: {
-		enabled: true,
-		strategies: [{
-			key: 'app-store',
-		}, ],
-	},
-});
-
-// todo: @owen 先做数据适配，后期重构
-const adaptTemplate = async (appTemplate, templateId) => {
-	const {
-		data: diyTemplate
-	} = templateId
-		// 查询指定模板，一般是预览时使用
-		?
-		await DiyApi.getDiyTemplate(templateId) :
-		await DiyApi.getUsedDiyTemplate();
-	// 模板不存在
-	if (!diyTemplate) {
-		$router.error('TemplateError');
-		return
-	}
-
-	const tabBar = diyTemplate?.property?.tabBar;
-	if (tabBar) {
-		appTemplate.basic.tabbar = tabBar
-		if (tabBar?.theme) {
-			appTemplate.basic.theme = tabBar?.theme;
-		}
-	}
-	appTemplate.home = diyTemplate?.home;
-	appTemplate.user = diyTemplate?.user;
-}
-
-export default app;
-=======
 import DiyApi from '@/sheep/api/promotion/diy';
 import { defineStore } from 'pinia';
 import $platform from '@/sheep/platform';
@@ -150,135 +6,134 @@ import user from './user';
 import sys from './sys';
 
 const app = defineStore({
-  id: 'app',
-  state: () => ({
-    info: {
-      // 应用信息
-      name: '', // 商城名称
-      logo: '', // logo
-      version: '', // 版本号
-      copyright: '', // 版权信息 I
-      copytime: '', // 版权信息 II
+	id: 'app',
+	state: () => ({
+		info: {
+			// 应用信息
+			name: '', // 商城名称
+			logo: '', // logo
+			version: '', // 版本号
+			copyright: '', // 版权信息 I
+			copytime: '', // 版权信息 II
 
-      cdnurl: '', // 云存储域名
-      filesystem: '', // 云存储平台
-    },
-    platform: {
-      share: {
-        methods: [], // 支持的分享方式
-        forwardInfo: {}, // 默认转发信息
-        posterInfo: {}, // 海报信息
-        linkAddress: '', // 复制链接地址
-      },
-      bind_mobile: 0, // 登陆后绑定手机号提醒 (弱提醒，可手动关闭)
-    },
-    chat: {},
-    template: {
-      // 店铺装修模板
-      basic: {}, // 基本信息
-      home: {
-        // 首页模板
-        style: {},
-        data: [],
-      },
-      user: {
-        // 个人中心模板
-        style: {},
-        data: [],
-      },
-    },
-    shareInfo: {}, // 全局分享信息
-    has_wechat_trade_managed: 0 // 小程序发货信息管理  0 没有 || 1 有
-  }),
-  actions: {
-    // 获取Shopro应用配置和模板
-    async init(templateId = null) {
-      // 检查网络
-      const networkStatus = await $platform.checkNetwork();
-      if (!networkStatus) {
-        $router.error('NetworkError');
-      }
+			cdnurl: '', // 云存储域名
+			filesystem: '', // 云存储平台
+		},
+		platform: {
+			share: {
+				methods: [], // 支持的分享方式
+				forwardInfo: {}, // 默认转发信息
+				posterInfo: {}, // 海报信息
+				linkAddress: '', // 复制链接地址
+			},
+			bind_mobile: 0, // 登陆后绑定手机号提醒 (弱提醒，可手动关闭)
+		},
+		chat: {},
+		template: {
+			// 店铺装修模板
+			basic: {}, // 基本信息
+			home: {
+				// 首页模板
+				style: {},
+				data: [],
+			},
+			user: {
+				// 个人中心模板
+				style: {},
+				data: [],
+			},
+		},
+		shareInfo: {}, // 全局分享信息
+		has_wechat_trade_managed: 0 // 小程序发货信息管理  0 没有 || 1 有
+	}),
+	actions: {
+		// 获取Shopro应用配置和模板
+		async init(templateId = null) {
+			// 检查网络
+			const networkStatus = await $platform.checkNetwork();
+			if (!networkStatus) {
+				$router.error('NetworkError');
+			}
 
-      // 加载装修配置
-      await adaptTemplate(this.template, templateId)
+			// 加载装修配置
+			await adaptTemplate(this.template, templateId)
 
-      // TODO 芋艿：未来支持管理后台可配；对应 https://api.shopro.sheepjs.com/shop/api/init
-      if (true) {
-        this.info = {
-          name: '中星商城',
-          logo: 'https://static.iocoder.cn/ruoyi-vue-pro-logo.png',
-          version: '1.1.13',
-          copyright: '全部开源，个人与企业可 100% 免费使用',
-          copytime: 'Copyright© 2018-2024',
+			// TODO 芋艿：未来支持管理后台可配；对应 https://api.shopro.sheepjs.com/shop/api/init
+			if (true) {
+				this.info = {
+					name: '中星商城',
+					logo: 'https://static.iocoder.cn/ruoyi-vue-pro-logo.png',
+					version: '1.1.13',
+					copyright: '全部开源，个人与企业可 100% 免费使用',
+					copytime: 'Copyright© 2018-2024',
 
-          cdnurl: 'https://file.sheepjs.com', // 云存储域名
-          filesystem: 'qcloud', // 云存储平台
-        };
-        this.platform = {
-          share: {
-            methods: [ "poster", "link" ],
-            linkAddress: "https://shopro.sheepjs.com/#/",
-            posterInfo: {
-              "user_bg": "/static/img/shop/config/user-poster-bg.png",
-              "goods_bg": "/static/img/shop/config/goods-poster-bg.png",
-              "groupon_bg": "/static/img/shop/config/groupon-poster-bg.png"
-            }
-          },
-          bind_mobile: 0
-        };
-        this.chat = {
-          chat_domain: "https://api.shopro.sheepjs.com/chat",
-          room_id: "admin"
-        }
-        this.has_wechat_trade_managed = 0;
+					cdnurl: 'https://file.sheepjs.com', // 云存储域名
+					filesystem: 'qcloud', // 云存储平台
+				};
+				this.platform = {
+					share: {
+						methods: [ "poster", "link" ],
+						linkAddress: "https://shopro.sheepjs.com/#/",
+						posterInfo: {
+							"user_bg": "/static/img/shop/config/user-poster-bg.png",
+							"goods_bg": "/static/img/shop/config/goods-poster-bg.png",
+							"groupon_bg": "/static/img/shop/config/groupon-poster-bg.png"
+						}
+					},
+					bind_mobile: 0
+				};
+				this.chat = {
+					chat_domain: "https://api.shopro.sheepjs.com/chat",
+					room_id: "admin"
+				}
+				this.has_wechat_trade_managed = 0;
 
-        // 加载主题
-        const sysStore = sys();
-        sysStore.setTheme();
+				// 加载主题
+				const sysStore = sys();
+				sysStore.setTheme();
 
-        // 模拟用户登录
-        const userStore = user();
-        if (userStore.isLogin) {
-          userStore.loginAfter();
-        }
-        return Promise.resolve(true);
-      } else {
-        $router.error('InitError', res.msg || '加载失败');
-      }
-    },
-  },
-  persist: {
-    enabled: true,
-    strategies: [
-      {
-        key: 'app-store',
-      },
-    ],
-  },
+				// 模拟用户登录
+				const userStore = user();
+				if (userStore.isLogin) {
+					userStore.loginAfter();
+				}
+				return Promise.resolve(true);
+			} else {
+				$router.error('InitError', res.msg || '加载失败');
+			}
+		},
+	},
+	persist: {
+		enabled: true,
+		strategies: [
+			{
+				key: 'app-store',
+			},
+		],
+	},
 });
 
 // todo: @owen 先做数据适配，后期重构
 const adaptTemplate = async (appTemplate, templateId) => {
-  const { data: diyTemplate } = templateId
-      // 查询指定模板，一般是预览时使用
-      ? await DiyApi.getDiyTemplate(templateId)
-      : await DiyApi.getUsedDiyTemplate();
-  // 模板不存在
-  if (!diyTemplate) {
-    $router.error('TemplateError');
-    return
-  }
+	const { data: diyTemplate } = templateId
+		// 查询指定模板，一般是预览时使用
+		? await DiyApi.getDiyTemplate(templateId)
+		: await DiyApi.getUsedDiyTemplate();
+	// 模板不存在
+	if (!diyTemplate) {
+		$router.error('TemplateError');
+		return
+	}
 
-  const tabBar = diyTemplate?.property?.tabBar;
-  if (tabBar) {
-    appTemplate.basic.tabbar = tabBar
-    if (tabBar?.theme) {
-      appTemplate.basic.theme = tabBar?.theme;
-    }
-  }
-  appTemplate.home = diyTemplate?.home;
-  appTemplate.user = diyTemplate?.user;
+	const tabBar = diyTemplate?.property?.tabBar;
+	if (tabBar) {
+		appTemplate.basic.tabbar = tabBar
+		if (tabBar?.theme) {
+			appTemplate.basic.theme = tabBar?.theme;
+		}
+	}
+	appTemplate.home = diyTemplate?.home;
+	appTemplate.user = diyTemplate?.user;
 }
 
 export default app;
->>>>>>> 2a4fc69da7887abaf079fe9390e3617ef41f9a66