shish 3 лет назад
Родитель
Сommit
c3d0216eeb

+ 2 - 2
开发/jdApp/src/ext.json

@@ -1,12 +1,12 @@
 {
   "extEnable": true,
-  "extAppid": "wx36ca6b1d6e9ca2a4",
+  "extAppid": "wxcb52034801895551",
   "directCommit": false,
   "ext": {
     "account": 12362,
     "apiHost": "https://api.shop.huadianbao.net",
     "socketApiHost": "api.shop.huadianbao.net",
     "imgHost": "https://img.huadianbao.net",
-    "name":"花店宝"
+    "name":"只管花"
   }
 }

+ 136 - 32
开发/jdApp/src/manifest.json

@@ -1,9 +1,9 @@
 {
-    "name" : "昆明供应商",
-    "appid" : "",
-    "description" : "应用描述",
-    "versionName" : "1.0.0",
-    "versionCode" : "100",
+    "name" : "只管花",
+    "appid" : "__UNI__BD781B0",
+    "description" : "基地批发销售管理系统",
+    "versionName" : "1.1.27",
+    "versionCode" : 1127,
     "transformPx" : true,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -11,6 +11,9 @@
         "nvueCompiler" : "uni-app",
         "compilerVersion" : 3,
         "nvueLaunchMode" : "fast",
+        "compatible" : {
+            "ignoreVersion" : true
+        },
         "splashscreen" : {
             "alwaysShowBeforeRender" : true,
             "waiting" : true,
@@ -18,42 +21,146 @@
             "delay" : 0
         },
         "modules" : {
-            "OAuth" : {},
-            "Payment" : {},
+            "VideoPlayer" : {},
+            "Bluetooth" : {},
+            "Geolocation" : {},
             "Push" : {},
+            "OAuth" : {},
             "Share" : {},
-            "Speech" : {},
-            "VideoPlayer" : {}
+            "Camera" : {}
         },
         /* 应用发布信息 */
         "distribute" : {
             /* android打包配置 */
             "android" : {
-                "permissions" : [ "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>" ]
+                "permissions" : [
+                    "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
+                    "<uses-permission android:name=\"android.permission.CAMERA\"/>"
+                ],
+                "autoSdkPermissions" : false,
+                "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ],
+                "permissionExternalStorage" : {
+                    "request" : "none",
+                    "prompt" : "保存运行状态等信息,需要获取读写手机存储(系统提示为访问设备上的照片、媒体内容和文件)权限,请允许。"
+                },
+                "permissionPhoneState" : {
+                    "request" : "none",
+                    "prompt" : "为保证您正常和安全地使用,需要获取设备识别码(部分手机提示为获取手机号码)使用权限,请允许。"
+                }
             },
             /* ios打包配置 */
             "ios" : {
                 "urlschemewhitelist" : [ "baidumap", "iosamap" ],
                 "privacyDescription" : {
                     "NSPhotoLibraryUsageDescription" : "该应用需要读取您的相册,以便支持您修改头像、门店图片或花材图片",
-                    "NSPhotoLibraryAddUsageDescription" : "该应用需要读取您的相册,以便支持您修改头像、门店图片或花材图片"
+                    "NSPhotoLibraryAddUsageDescription" : "该应用需要读取您的相册,以便支持您修改头像、门店图片或花材图片",
+                    "NSCameraUsageDescription" : "该应用需要获取您的摄像头权限,以便支持您直接拍照上传头像、门店图片或花材图片"
                 },
-                "idfa" : false
+                "idfa" : false,
+                "capabilities" : {
+                    "entitlements" : {
+                        "com.apple.developer.associated-domains" : [ "applinks:fronttg.zhhinc.com" ]
+                    }
+                }          
             },
             /* SDK配置 */
             "sdkConfigs" : {
                 "speech" : {
                     "ifly" : {}
+                },
+                "push" : {
+                    "unipush" : {}
+                },
+                "share" : {
+                    "weixin" : {
+                        "appid" : "wxb379c1f2f3ef705e",
+                        "UniversalLinks" : "https://fronttg.wixhb.com/uni-universallinks/__UNI__BD781B0/"
+                    }
+                },
+                "ad" : {},
+                "geolocation" : {
+                    "system" : {
+                        "__platform__" : [ "ios", "android" ]
+                    }
+                },
+                "maps" : {},
+                "oauth" : {
+                    "univerify" : {}
                 }
             },
-            "orientation" : [ "portrait-primary" ]
+            "orientation" : [ "portrait-primary" ],
+            "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/1024.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
+            }
+        },
+        "nativePlugins" : {
+            "CL-Dialog" : {
+                "__plugin_info__" : {
+                    "name" : "确认提示框",
+                    "description" : "为了统一两个平台的提示(对话框)框的效果,以及对文字颜色内容的可自定义",
+                    "platforms" : "Android,iOS",
+                    "url" : "https://ext.dcloud.net.cn/plugin?id=1497",
+                    "android_package_name" : "zhh.huahuibao.app",
+                    "ios_bundle_id" : "com.zhh.xhb",
+                    "isCloud" : true,
+                    "bought" : 1,
+                    "pid" : "1497",
+                    "parameters" : {}
+                }
+            },
+            "Html5app-Gprinter" : {
+                "__plugin_info__" : {
+                    "name" : "Android 和 IOS 佳博 蓝牙小票 标签 打印插件",
+                    "description" : "Android / IOS 佳博小票 、标签 打印机插件,QQ交流群:891416757",
+                    "platforms" : "Android,iOS",
+                    "url" : "https://ext.dcloud.net.cn/plugin?id=462",
+                    "android_package_name" : "zhh.huahuibao.app",
+                    "ios_bundle_id" : "com.zhh.xhb",
+                    "isCloud" : true,
+                    "bought" : 1,
+                    "pid" : "462",
+                    "parameters" : {}
+                }
+            }
         }
     },
     /* 快应用特有相关 */
     "quickapp" : {},
-    /* 小程序特有相关 线上(只管花) wxcb52034801895551 开发(花店宝) wx36ca6b1d6e9ca2a4 */
+    /* 小程序特有相关*/
     "mp-weixin" : {
-        "appid" : "wx36ca6b1d6e9ca2a4",
+        "appid" : "wxcb52034801895551",
         "setting" : {
             "urlCheck" : false
         },
@@ -79,23 +186,23 @@
             // "mode" : "history",
             "base" : "/"
         },
-        "async": {
-            "timeout": 200000
+        "async" : {
+            "timeout" : 20000
         },
-        "optimization": {
-            "treeShaking": {
-                "enable": true
+        "optimization" : {
+            "treeShaking" : {
+                "enable" : true
             }
         },
-        "devServer": {
-            "port": 81,
-            "proxy": {
-                "/api": {
-                    "target": "http://api.shop.hzghd.com",
-                    "secure": false,
-                    "changeOrigin": true,
-                    "pathRewrite": {
-                        "^/api": ""
+        "devServer" : {
+            "port" : 81,
+            "proxy" : {
+                "/api" : {
+                    "target" : "http://api.shop.huadianbao.net",
+                    "secure" : false,
+                    "changeOrigin" : true,
+                    "pathRewrite" : {
+                        "^/api" : ""
                     }
                 }
             }
@@ -106,9 +213,6 @@
                     "key" : ""
                 }
             }
-        },
-        "async" : {
-            "timeout" : 20000
         }
     }
 }

+ 7 - 7
开发/jdApp/src/static/iconfont/iconfont.css

@@ -1,16 +1,16 @@
 @font-face {
   font-family: 'iconfont';  /* project id 1525256 */
-  src: url('https://img.huadianbao.net/iconfont/font_1525256_6bxwphhntqh.eot');
-  src: url('https://img.huadianbao.net/iconfont/font_1525256_6bxwphhntqh.eot?#iefix') format('embedded-opentype'),
-  url('https://img.huadianbao.net/iconfont/font_1525256_6bxwphhntqh.woff2') format('woff2'),
-  url('https://img.huadianbao.net/iconfont/font_1525256_6bxwphhntqh.woff') format('woff'),
-  url('https://img.huadianbao.net/iconfont/font_1525256_6bxwphhntqh.ttf') format('truetype'),
-  url('https://img.huadianbao.net/iconfont/font_1525256_6bxwphhntqh.svg#iconfont') format('svg');
+  src: url('https://img.hzghd.com/iconfont/font_1525256_6bxwphhntqh.eot');
+  src: url('https://img.hzghd.com/iconfont/font_1525256_6bxwphhntqh.eot?#iefix') format('embedded-opentype'),
+  url('https://img.hzghd.com/iconfont/font_1525256_6bxwphhntqh.woff2') format('woff2'),
+  url('https://img.hzghd.com/iconfont/font_1525256_6bxwphhntqh.woff') format('woff'),
+  url('https://img.hzghd.com/iconfont/font_1525256_6bxwphhntqh.ttf') format('truetype'),
+  url('https://img.hzghd.com/iconfont/font_1525256_6bxwphhntqh.svg#iconfont') format('svg');
 }
 
 .iconfont {
   font-family: "iconfont" !important;
-  font-size: 16px;
+  font-size: 16upx;
   font-style: normal;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;

+ 5 - 5
线上/jdApp/src/ext.json

@@ -1,12 +1,12 @@
 {
   "extEnable": true,
-  "extAppid": "wxcb52034801895551",
+  "extAppid": "",
   "directCommit": false,
   "ext": {
     "account": 12358,
-    "apiHost": "https://api.shop.wixhb.cn",
-    "socketApiHost": "api.shop.wixhb.cn",
-    "imgHost": "https://img.wixhb.cn",
-    "name":"只管花"
+    "apiHost": "https://api.shop.zhhinc.com",
+    "socketApiHost": "api.shop.zhhinc.com",
+    "imgHost": "https://img.zhhinc.com",
+    "name":"花来旺"
   }
 }

+ 138 - 37
线上/jdApp/src/manifest.json

@@ -1,9 +1,9 @@
 {
-    "name" : "昆明供应商",
-    "appid" : "",
-    "description" : "应用描述",
-    "versionName" : "1.0.0",
-    "versionCode" : "100",
+    "name" : "花来旺",
+    "appid" : "__UNI__BD781B0",
+    "description" : "基地批发销售管理系统",
+    "versionName" : "1.1.27",
+    "versionCode" : 1127,
     "transformPx" : true,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -11,6 +11,9 @@
         "nvueCompiler" : "uni-app",
         "compilerVersion" : 3,
         "nvueLaunchMode" : "fast",
+        "compatible" : {
+            "ignoreVersion" : true
+        },
         "splashscreen" : {
             "alwaysShowBeforeRender" : true,
             "waiting" : true,
@@ -18,18 +21,32 @@
             "delay" : 0
         },
         "modules" : {
-            "OAuth" : {},
-            "Payment" : {},
+            "VideoPlayer" : {},
+            "Bluetooth" : {},
+            "Geolocation" : {},
             "Push" : {},
+            "OAuth" : {},
             "Share" : {},
-            "Speech" : {},
-            "VideoPlayer" : {}
+            "Camera" : {}
         },
         /* 应用发布信息 */
         "distribute" : {
             /* android打包配置 */
             "android" : {
-                "permissions" : [ "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>" ]
+                "permissions" : [
+                    "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
+                    "<uses-permission android:name=\"android.permission.CAMERA\"/>"
+                ],
+                "autoSdkPermissions" : false,
+                "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ],
+                "permissionExternalStorage" : {
+                    "request" : "none",
+                    "prompt" : "保存运行状态等信息,需要获取读写手机存储(系统提示为访问设备上的照片、媒体内容和文件)权限,请允许。"
+                },
+                "permissionPhoneState" : {
+                    "request" : "none",
+                    "prompt" : "为保证您正常和安全地使用,需要获取设备识别码(部分手机提示为获取手机号码)使用权限,请允许。"
+                }
             },
             /* ios打包配置 */
             "ios" : {
@@ -39,35 +56,122 @@
                     "NSPhotoLibraryAddUsageDescription" : "该应用需要读取您的相册,以便支持您修改头像、门店图片或花材图片",
                     "NSCameraUsageDescription" : "该应用需要获取您的摄像头权限,以便支持您直接拍照上传头像、门店图片或花材图片"
                 },
-                "idfa" : false            },
+                "idfa" : false,
+                "capabilities" : {
+                    "entitlements" : {
+                        "com.apple.developer.associated-domains" : [ "applinks:fronttg.zhhinc.com" ]
+                    }
+                }
+            },
             /* SDK配置 */
             "sdkConfigs" : {
                 "speech" : {
                     "ifly" : {}
+                },
+                "push" : {
+                    "unipush" : {}
+                },
+                "share" : {
+                    "weixin" : {
+                        "appid" : "wxb379c1f2f3ef705e",
+                        "UniversalLinks" : "https://fronttg.wixhb.com/uni-universallinks/__UNI__BD781B0/"
+                    }
+                },
+                "ad" : {},
+                "geolocation" : {
+                    "system" : {
+                        "__platform__" : [ "ios", "android" ]
+                    }
+                },
+                "maps" : {},
+                "oauth" : {
+                    "univerify" : {}
                 }
             },
-            "orientation" : [ "portrait-primary" ]
+            "orientation" : [ "portrait-primary" ],
+            "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/1024.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
+            }
+        },
+        "nativePlugins" : {
+            "CL-Dialog" : {
+                "__plugin_info__" : {
+                    "name" : "确认提示框",
+                    "description" : "为了统一两个平台的提示(对话框)框的效果,以及对文字颜色内容的可自定义",
+                    "platforms" : "Android,iOS",
+                    "url" : "https://ext.dcloud.net.cn/plugin?id=1497",
+                    "android_package_name" : "zhh.huahuibao.app",
+                    "ios_bundle_id" : "com.zhh.xhb",
+                    "isCloud" : true,
+                    "bought" : 1,
+                    "pid" : "1497",
+                    "parameters" : {}
+                }
+            },
+            "Html5app-Gprinter" : {
+                "__plugin_info__" : {
+                    "name" : "Android 和 IOS 佳博 蓝牙小票 标签 打印插件",
+                    "description" : "Android / IOS 佳博小票 、标签 打印机插件,QQ交流群:891416757",
+                    "platforms" : "Android,iOS",
+                    "url" : "https://ext.dcloud.net.cn/plugin?id=462",
+                    "android_package_name" : "zhh.huahuibao.app",
+                    "ios_bundle_id" : "com.zhh.xhb",
+                    "isCloud" : true,
+                    "bought" : 1,
+                    "pid" : "462",
+                    "parameters" : {}
+                }
+            }
         }
     },
     /* 快应用特有相关 */
     "quickapp" : {},
-    /* 小程序特有相关 线上(只管花) wxcb52034801895551 开发(花店宝) wx36ca6b1d6e9ca2a4 */
+    /* 小程序特有相关*/
     "mp-weixin" : {
-        "appid" : "wxcb52034801895551",
+        "appid" : "",
         "setting" : {
             "urlCheck" : false
         },
-		"optimization" : {
-			"subPackages" : true
-		},
+        "optimization" : {
+            "subPackages" : true
+        },
         "usingComponents" : true,
         "permission" : {
             "scope.userLocation" : {
                 "desc" : "请点击确定"
             }
-        },
-        "optimization": {  
-            "subPackages": true  
         }
     },
     "mp-alipay" : {
@@ -85,23 +189,23 @@
             // "mode" : "history",
             "base" : "/"
         },
-        "async": {
-            "timeout": 200000
+        "async" : {
+            "timeout" : 20000
         },
-        "optimization": {
-            "treeShaking": {
-                "enable": true
+        "optimization" : {
+            "treeShaking" : {
+                "enable" : true
             }
         },
-        "devServer": {
-            "port": 81,
-            "proxy": {
-                "/api": {
-                    "target": "http://api.shop.hzghd.com",
-                    "secure": false,
-                    "changeOrigin": true,
-                    "pathRewrite": {
-                        "^/api": ""
+        "devServer" : {
+            "port" : 81,
+            "proxy" : {
+                "/api" : {
+                    "target" : "http://api.shop.zhhinc.com",
+                    "secure" : false,
+                    "changeOrigin" : true,
+                    "pathRewrite" : {
+                        "^/api" : ""
                     }
                 }
             }
@@ -112,9 +216,6 @@
                     "key" : ""
                 }
             }
-        },
-        "async" : {
-            "timeout" : 20000
         }
     }
 }

+ 7 - 7
线上/jdApp/src/static/iconfont/iconfont.css

@@ -1,16 +1,16 @@
 @font-face {
   font-family: 'iconfont';  /* project id 1525256 */
-  src: url('https://img.wixhb.cn/iconfont/font_1525256_6bxwphhntqh.eot');
-  src: url('https://img.wixhb.cn/iconfont/font_1525256_6bxwphhntqh.eot?#iefix') format('embedded-opentype'),
-  url('https://img.wixhb.cn/iconfont/font_1525256_6bxwphhntqh.woff2') format('woff2'),
-  url('https://img.wixhb.cn/iconfont/font_1525256_6bxwphhntqh.woff') format('woff'),
-  url('https://img.wixhb.cn/iconfont/font_1525256_6bxwphhntqh.ttf') format('truetype'),
-  url('https://img.wixhb.cn/iconfont/font_1525256_6bxwphhntqh.svg#iconfont') format('svg');
+  src: url('https://img.wixhb.com/iconfont/font_1525256_6bxwphhntqh.eot');
+  src: url('https://img.wixhb.com/iconfont/font_1525256_6bxwphhntqh.eot?#iefix') format('embedded-opentype'),
+  url('https://img.wixhb.com/iconfont/font_1525256_6bxwphhntqh.woff2') format('woff2'),
+  url('https://img.wixhb.com/iconfont/font_1525256_6bxwphhntqh.woff') format('woff'),
+  url('https://img.wixhb.com/iconfont/font_1525256_6bxwphhntqh.ttf') format('truetype'),
+  url('https://img.wixhb.com/iconfont/font_1525256_6bxwphhntqh.svg#iconfont') format('svg');
 }
 
 .iconfont {
   font-family: "iconfont" !important;
-  font-size: 16px;
+  font-size: 16upx;
   font-style: normal;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;