shish 11 月之前
父节点
当前提交
7567481462
共有 44 个文件被更改,包括 101 次插入945 次删除
  1. 2 2
      ghs/dist/shop/index.html
  2. 0 0
      ghs/dist/shop/js/app.8a0d15a7.js
  3. 3 3
      ghs/vue.config.js
  4. 3 3
      ghsApp/src/config.js
  5. 6 6
      ghsApp/src/ext.json
  6. 7 8
      ghsApp/src/manifest.json
  7. 4 4
      ghsPad/src/config.js
  8. 6 6
      ghsPad/src/ext.json
  9. 6 3
      ghsPad/src/manifest.json
  10. 2 2
      hd/dist/shop/index.html
  11. 0 0
      hd/dist/shop/js/app.2ac374f6.js
  12. 2 2
      hd/vue.config.js
  13. 4 4
      hdApp/src/config.js
  14. 6 6
      hdApp/src/ext.json
  15. 2 3
      hdApp/src/manifest.json
  16. 6 6
      hdApp/src/static/iconfont/iconfont.css
  17. 3 3
      hdPad/src/config.js
  18. 6 6
      hdPad/src/ext.json
  19. 6 6
      hdPad/src/static/iconfont/iconfont.css
  20. 2 2
      hdh5/config.js
  21. 0 0
      hdh5/unpackage/dist/build/web/assets/_plugin-vue_export-helper.BwZZKqgp.js
  22. 0 0
      hdh5/unpackage/dist/build/web/assets/_plugin-vue_export-helper.DX-d0rQg.js
  23. 1 1
      hdh5/unpackage/dist/build/web/assets/admin-cg-alipay.CqvRTsdK.js
  24. 1 1
      hdh5/unpackage/dist/build/web/assets/admin-clear-alipay.CEcM0j6R.js
  25. 0 0
      hdh5/unpackage/dist/build/web/assets/admin-ghs-pay.DRHC8Hj6.js
  26. 1 1
      hdh5/unpackage/dist/build/web/assets/index-C9ERQmO8.js
  27. 1 1
      hdh5/unpackage/dist/build/web/assets/index.Ds8QbfAw.js
  28. 1 1
      hdh5/unpackage/dist/build/web/index.html
  29. 2 2
      mallApp/src/config.js
  30. 5 5
      mallApp/src/ext.json
  31. 6 10
      mallApp/src/manifest.json
  32. 1 1
      mallh5/unpackage/dist/build/web/assets/index-DJzkx5zs.js
  33. 1 1
      mallh5/unpackage/dist/build/web/assets/pages-pay-demo.C1-24r4p.js
  34. 0 0
      mallh5/unpackage/dist/build/web/assets/pages-pay-index.DLkkkEG1.js
  35. 0 0
      mallh5/unpackage/dist/build/web/assets/pages-pay-success.D7OBPJIv.js
  36. 1 1
      mallh5/unpackage/dist/build/web/index.html
  37. 2 2
      pt/dist/web/index.html
  38. 0 0
      pt/dist/web/js/app.1d2ed01b.js
  39. 2 2
      pt/vue.config.js
  40. 0 169
      线上/jd/vue.config.js
  41. 0 4
      线上/jdApp/src/config.js
  42. 0 12
      线上/jdApp/src/ext.json
  43. 0 221
      线上/jdApp/src/manifest.json
  44. 0 435
      线上/jdApp/src/static/iconfont/iconfont.css

+ 2 - 2
ghs/dist/shop/index.html

@@ -1,4 +1,4 @@
-<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="referer" content="never"><meta name="renderer" content="webkit"><meta name="viewport" content><link rel="icon" href="/favicon.ico"><link rel="stylesheet" type="text/css" media="print" href="/print-lock.css"><title>销花宝</title><link href="https://img.hzghd.com/cdn/nprogress/0.2.0/nprogress.min.css" rel="stylesheet"><link href="https://img.hzghd.com/cdn/quill/2.0.0-dev.3/quill.core.min.css" rel="stylesheet"><link href="https://img.hzghd.com/cdn/viewerjs/1.3.7/viewer.min.css" rel="stylesheet"><link href="https://img.hzghd.com/cdn/element-ui/2.13.0/theme-chalk/index.css" rel="stylesheet"><style>html,
+<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="referer" content="never"><meta name="renderer" content="webkit"><meta name="viewport" content><link rel="icon" href="/favicon.ico"><link rel="stylesheet" type="text/css" media="print" href="/print-lock.css"><title>销花宝</title><link href="https://img.wixhb.com/cdn/nprogress/0.2.0/nprogress.min.css" rel="stylesheet"><link href="https://img.wixhb.com/cdn/quill/2.0.0-dev.3/quill.core.min.css" rel="stylesheet"><link href="https://img.wixhb.com/cdn/viewerjs/1.3.7/viewer.min.css" rel="stylesheet"><link href="https://img.wixhb.com/cdn/element-ui/2.13.0/theme-chalk/index.css" rel="stylesheet"><style>html,
 			body,
 			#app {
 				height: 100%;
@@ -43,4 +43,4 @@
 			.once .sub-title {
 				color: #ababab;
 				font-size: 12px;
-			}</style><link href="/css/app.03cfa881.css" rel="preload" as="style"><link href="/css/chunk-libs.ce660555.css" rel="preload" as="style"><link href="/js/app.c5eb45fd.js" rel="preload" as="script"><link href="/js/chunk-libs.ae2a8b3d.js" rel="preload" as="script"><link href="/css/chunk-libs.ce660555.css" rel="stylesheet"><link href="/css/app.03cfa881.css" rel="stylesheet"></head><body><noscript></noscript><div id="app"><div class="once"><div class="container"><div class="title">正在加载资源</div><div class="sub-title">初次加载资源可能需要较多时间 请耐心等待</div></div><div class="footer"><a href="https://www.baidu.com/" target="_blank">花卉宝</a></div></div></div><script src="https://img.hzghd.com/cdn/vue/2.6.10/vue.min.js"></script><script src="https://img.hzghd.com/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="https://img.hzghd.com/cdn/vuex/3.1.1/vuex.min.js"></script><script src="https://img.hzghd.com/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="https://img.hzghd.com/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="https://img.hzghd.com/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="https://img.hzghd.com/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="https://img.hzghd.com/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="https://img.hzghd.com/cdn/element-ui/2.13.0/index.js"></script><script src="https://img.hzghd.com/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="https://img.hzghd.com/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="https://img.hzghd.com/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.ae2a8b3d.js"></script><script src="/js/app.c5eb45fd.js"></script></body></html>
+			}</style><link href="/css/app.03cfa881.css" rel="preload" as="style"><link href="/css/chunk-libs.ce660555.css" rel="preload" as="style"><link href="/js/app.8a0d15a7.js" rel="preload" as="script"><link href="/js/chunk-libs.ae2a8b3d.js" rel="preload" as="script"><link href="/css/chunk-libs.ce660555.css" rel="stylesheet"><link href="/css/app.03cfa881.css" rel="stylesheet"></head><body><noscript></noscript><div id="app"><div class="once"><div class="container"><div class="title">正在加载资源</div><div class="sub-title">初次加载资源可能需要较多时间 请耐心等待</div></div><div class="footer"><a href="https://www.baidu.com/" target="_blank">花卉宝</a></div></div></div><script src="https://img.wixhb.com/cdn/vue/2.6.10/vue.min.js"></script><script src="https://img.wixhb.com/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="https://img.wixhb.com/cdn/vuex/3.1.1/vuex.min.js"></script><script src="https://img.wixhb.com/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="https://img.wixhb.com/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="https://img.wixhb.com/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="https://img.wixhb.com/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="https://img.wixhb.com/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="https://img.wixhb.com/cdn/element-ui/2.13.0/index.js"></script><script src="https://img.wixhb.com/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="https://img.wixhb.com/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="https://img.wixhb.com/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.ae2a8b3d.js"></script><script src="/js/app.8a0d15a7.js"></script></body></html>

文件差异内容过多而无法显示
+ 0 - 0
ghs/dist/shop/js/app.8a0d15a7.js


+ 3 - 3
ghs/vue.config.js

@@ -2,14 +2,14 @@ const path = require('path');
 
 const isProduction = process.env.NODE_ENV === 'production';
 
-//http和https切换请修改这里,同步修改下面图片的host,修改后需要重新运行npm run serve shish 2021.4.12
-const proxyTarget = 'https://api.shop.hzghd.com';
+//http和https切换请修改这里,修改后需要重新运行npm run serve shish 2021.4.12
+const proxyTarget = 'https://api.shop.wixhb.com';
 
 function resolve(dir) {
 	return path.join(__dirname, dir);
 }
 
-let hostUrl = 'https://img.hzghd.com/';
+let hostUrl = 'https://img.wixhb.com/';
 
 const cdn = {
 	dev: {

+ 3 - 3
ghsApp/src/config.js

@@ -1,4 +1,4 @@
 export const ProjectName = 'ghs'
-export const APIHOST = 'https://api.shop.hzghd.com'
-export const IMGHOST = 'https://img.hzghd.com'
-export const CURRENT_ENV = 'dev'
+export const APIHOST = 'https://api.shop.wixhb.com'
+export const IMGHOST = 'https://img.wixhb.com'
+export const CURRENT_ENV = 'production'

+ 6 - 6
ghsApp/src/ext.json

@@ -1,12 +1,12 @@
 {
   "extEnable": true,
-  "extAppid": "wx21b7c3ef12082099",
+  "extAppid": "wxcf32b3f0684c2433",
   "directCommit": false,
   "ext": {
-    "account": 12362,
-    "apiHost": "https://api.shop.hzghd.com",
-    "socketApiHost": "api.shop.hzghd.com",
-    "imgHost": "https://img.hzghd.com",
-    "name":"花掌柜"
+    "account": 12358,
+    "apiHost": "https://api.shop.wixhb.com",
+    "socketApiHost": "api.shop.wixhb.com",
+    "imgHost": "https://img.wixhb.com",
+    "name":"销花宝"
   }
 }

+ 7 - 8
ghsApp/src/manifest.json

@@ -64,7 +64,7 @@
                     "entitlements" : {
                         "com.apple.developer.associated-domains" : [ "applinks:fronttg.wixhb.com" ]
                     }
-                }          
+                }
             },
             /* SDK配置 */
             "sdkConfigs" : {
@@ -172,20 +172,19 @@
     "quickapp" : {},
     /* 小程序特有相关 线上(销花宝) wxcf32b3f0684c2433 开发(花掌柜) wx21b7c3ef12082099 */
     "mp-weixin" : {
-        "appid" : "wx21b7c3ef12082099",
+        "appid" : "wxcf32b3f0684c2433",
         "setting" : {
             "urlCheck" : false
         },
+        "optimization" : {
+            "subPackages" : true
+        },
         "usingComponents" : true,
         "permission" : {
             "scope.userLocation" : {
                 "desc" : "请点击确定"
             }
-        },
-        "optimization" : {
-            "subPackages" : true
-        },
-        "lazyCodeLoading":"requiredComponents"
+        }
     },
     "mp-alipay" : {
         "usingComponents" : true
@@ -214,7 +213,7 @@
             "port" : 81,
             "proxy" : {
                 "/api" : {
-                    "target" : "http://api.shop.hzghd.com",
+                    "target" : "http://api.shop.wixhb.com",
                     "secure" : false,
                     "changeOrigin" : true,
                     "pathRewrite" : {

+ 4 - 4
ghsPad/src/config.js

@@ -1,4 +1,4 @@
-export const ProjectName = 'store'
-export const APIHOST = 'https://api.shop.hzghd.com'
-export const IMGHOST = 'https://img.hzghd.com'
-export const CURRENT_ENV = 'dev'
+export const ProjectName = 'ghsPad'
+export const APIHOST = 'https://api.shop.wixhb.com'
+export const IMGHOST = 'https://img.wixhb.com'
+export const CURRENT_ENV = 'production'

+ 6 - 6
ghsPad/src/ext.json

@@ -1,12 +1,12 @@
 {
   "extEnable": true,
-  "extAppid": "wx21b7c3ef12082099",
+  "extAppid": "wxcf32b3f0684c2433",
   "directCommit": false,
   "ext": {
-    "account": 12362,
-    "apiHost": "https://api.shop.hzghd.com",
-    "socketApiHost": "api.shop.hzghd.com",
-    "imgHost": "https://img.hzghd.com",
-    "name":"花掌柜"
+    "account": 12358,
+    "apiHost": "https://api.shop.wixhb.com",
+    "socketApiHost": "api.shop.wixhb.com",
+    "imgHost": "https://img.wixhb.com",
+    "name":"销花宝"
   }
 }

+ 6 - 3
ghsPad/src/manifest.json

@@ -45,7 +45,7 @@
                     "NSPhotoLibraryAddUsageDescription" : "该应用需要读取您的相册,以便支持您修改头像、门店图片或花材图片",
                     "NSCameraUsageDescription" : "该应用需要获取您的摄像头权限,以便支持您直接拍照上传头像、门店图片或花材图片"
                 },
-                "idfa" : false            
+				"idfa" : false
             },
             /* SDK配置 */
             "sdkConfigs" : {
@@ -133,10 +133,13 @@
     "quickapp" : {},
     /* 小程序特有相关 线上(销花宝) wxcf32b3f0684c2433 开发(花掌柜) wx21b7c3ef12082099 */
     "mp-weixin" : {
-        "appid" : "wx21b7c3ef12082099",
+        "appid" : "wxcf32b3f0684c2433",
         "setting" : {
             "urlCheck" : false
         },
+        "optimization" : {
+            "subPackages" : true
+        },
         "usingComponents" : true,
         "permission" : {
             "scope.userLocation" : {
@@ -171,7 +174,7 @@
             "port" : 81,
             "proxy" : {
                 "/api" : {
-                    "target" : "http://api.shop.hzghd.com",
+                    "target" : "http://api.shop.wixhb.com",
                     "secure" : false,
                     "changeOrigin" : true,
                     "pathRewrite" : {

+ 2 - 2
hd/dist/shop/index.html

@@ -1,4 +1,4 @@
-<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="referer" content="never"><meta name="renderer" content="webkit"><meta name="viewport" content><link rel="icon" href="/favicon.ico"><link rel="stylesheet" type="text/css" media="print" href="/print-lock.css"><title>只管花</title><link href="https://img.huaml.com/cdn/nprogress/0.2.0/nprogress.min.css" rel="stylesheet"><link href="https://img.huaml.com/cdn/quill/2.0.0-dev.3/quill.core.min.css" rel="stylesheet"><link href="https://img.huaml.com/cdn/viewerjs/1.3.7/viewer.min.css" rel="stylesheet"><link href="https://img.huaml.com/cdn/element-ui/2.13.0/theme-chalk/index.css" rel="stylesheet"><style>html,
+<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="referer" content="never"><meta name="renderer" content="webkit"><meta name="viewport" content><link rel="icon" href="/favicon.ico"><link rel="stylesheet" type="text/css" media="print" href="/print-lock.css"><title>只管花</title><link href="https://img.huahb.cn/cdn/nprogress/0.2.0/nprogress.min.css" rel="stylesheet"><link href="https://img.huahb.cn/cdn/quill/2.0.0-dev.3/quill.core.min.css" rel="stylesheet"><link href="https://img.huahb.cn/cdn/viewerjs/1.3.7/viewer.min.css" rel="stylesheet"><link href="https://img.huahb.cn/cdn/element-ui/2.13.0/theme-chalk/index.css" rel="stylesheet"><style>html,
 			body,
 			#app {
 				height: 100%;
@@ -43,4 +43,4 @@
 			.once .sub-title {
 				color: #ababab;
 				font-size: 12px;
-			}</style><link href="/css/app.97b5310c.css" rel="preload" as="style"><link href="/css/chunk-libs.b57e4bfb.css" rel="preload" as="style"><link href="/js/app.3af8f280.js" rel="preload" as="script"><link href="/js/chunk-libs.4c3a697b.js" rel="preload" as="script"><link href="/css/chunk-libs.b57e4bfb.css" rel="stylesheet"><link href="/css/app.97b5310c.css" rel="stylesheet"></head><body><noscript></noscript><div id="app"><div class="once"><div class="container"><div class="title">正在加载资源</div><div class="sub-title">初次加载资源可能需要较多时间 请耐心等待</div></div><div class="footer"><a href="https://www.baidu.com/" target="_blank">花卉宝</a></div></div></div><script src="https://img.huaml.com/cdn/vue/2.6.10/vue.min.js"></script><script src="https://img.huaml.com/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="https://img.huaml.com/cdn/vuex/3.1.1/vuex.min.js"></script><script src="https://img.huaml.com/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="https://img.huaml.com/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="https://img.huaml.com/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="https://img.huaml.com/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="https://img.huaml.com/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="https://img.huaml.com/cdn/element-ui/2.13.0/index.js"></script><script src="https://img.huaml.com/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="https://img.huaml.com/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="https://img.huaml.com/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.4c3a697b.js"></script><script src="/js/app.3af8f280.js"></script></body></html>
+			}</style><link href="/css/app.97b5310c.css" rel="preload" as="style"><link href="/css/chunk-libs.b57e4bfb.css" rel="preload" as="style"><link href="/js/app.2ac374f6.js" rel="preload" as="script"><link href="/js/chunk-libs.4c3a697b.js" rel="preload" as="script"><link href="/css/chunk-libs.b57e4bfb.css" rel="stylesheet"><link href="/css/app.97b5310c.css" rel="stylesheet"></head><body><noscript></noscript><div id="app"><div class="once"><div class="container"><div class="title">正在加载资源</div><div class="sub-title">初次加载资源可能需要较多时间 请耐心等待</div></div><div class="footer"><a href="https://www.baidu.com/" target="_blank">花卉宝</a></div></div></div><script src="https://img.huahb.cn/cdn/vue/2.6.10/vue.min.js"></script><script src="https://img.huahb.cn/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="https://img.huahb.cn/cdn/vuex/3.1.1/vuex.min.js"></script><script src="https://img.huahb.cn/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="https://img.huahb.cn/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="https://img.huahb.cn/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="https://img.huahb.cn/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="https://img.huahb.cn/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="https://img.huahb.cn/cdn/element-ui/2.13.0/index.js"></script><script src="https://img.huahb.cn/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="https://img.huahb.cn/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="https://img.huahb.cn/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.4c3a697b.js"></script><script src="/js/app.2ac374f6.js"></script></body></html>

文件差异内容过多而无法显示
+ 0 - 0
hd/dist/shop/js/app.2ac374f6.js


+ 2 - 2
hd/vue.config.js

@@ -3,13 +3,13 @@ const path = require('path');
 const isProduction = process.env.NODE_ENV === 'production';
 
 //http和https切换请修改这里,修改后需要重新运行npm run serve shish 2021.4.12
-const proxyTarget = 'https://api.shop.huaml.com';
+const proxyTarget = 'https://api.shop.huahb.cn';
 
 function resolve(dir) {
 	return path.join(__dirname, dir);
 }
 
-let hostUrl = 'https://img.huaml.com/';
+let hostUrl = 'https://img.huahb.cn/';
 
 const cdn = {
 	dev: {

+ 4 - 4
hdApp/src/config.js

@@ -1,5 +1,5 @@
 export const ProjectName = 'hd'
-export const APIHOST = 'https://api.shop.huaml.com'
-export const FORMALHOST = 'https://shop.huaml.com'
-export const IMGHOST = 'https://img.huaml.com'
-export const CURRENT_ENV = 'dev'
+export const APIHOST = 'https://api.shop.huahb.cn'
+export const FORMALHOST = 'https://shop.huahb.cn'
+export const IMGHOST = 'https://img.huahb.cn'
+export const CURRENT_ENV = 'production'

+ 6 - 6
hdApp/src/ext.json

@@ -1,12 +1,12 @@
 {
   "extEnable": true,
-  "extAppid": "wxe4675bab299a52f7",
+  "extAppid": "wx0d42f5f1dcb3a370",
   "directCommit": false,
   "ext": {
-    "account": 12362,
-    "apiHost": "https://api.shop.huaml.com",
-    "socketApiHost": "api.shop.huaml.com",
-    "imgHost": "https://img.huaml.com",
-    "name":"花美玲"
+    "account": 12358,
+    "apiHost": "https://api.shop.huahb.cn",
+    "socketApiHost": "api.shop.huahb.cn",
+    "imgHost": "https://img.huahb.cn",
+    "name":"花掌柜"
   }
 }

+ 2 - 3
hdApp/src/manifest.json

@@ -153,7 +153,7 @@
     "quickapp" : {},
     /* 小程序特有相关 线上(花掌柜) wx0d42f5f1dcb3a370 开发(花美玲) wxe4675bab299a52f7 */
     "mp-weixin" : {
-        "appid" : "wxe4675bab299a52f7",
+        "appid" : "wx0d42f5f1dcb3a370",
         "setting" : {
             "urlCheck" : false
         },
@@ -165,8 +165,7 @@
         },
         "optimization" : {
             "subPackages" : true
-        },
-        "lazyCodeLoading":"requiredComponents"
+        }
     },
     "mp-alipay" : {
         "usingComponents" : true

+ 6 - 6
hdApp/src/static/iconfont/iconfont.css

@@ -1,11 +1,11 @@
 @font-face {
   font-family: 'iconfont';  /* project id 1525256 */
-  src: url('https://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.eot');
-  src: url('https://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.eot?#iefix') format('embedded-opentype'),
-  url('https://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.woff2') format('woff2'),
-  url('https://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.woff') format('woff'),
-  url('https://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.ttf') format('truetype'),
-  url('https://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.svg#iconfont') format('svg');
+  src: url('https://api.shop.huahb.cn/iconfont/font_1525256_6bxwphhntqh.eot');
+  src: url('https://api.shop.huahb.cn/iconfont/font_1525256_6bxwphhntqh.eot?#iefix') format('embedded-opentype'),
+  url('https://api.shop.huahb.cn/iconfont/font_1525256_6bxwphhntqh.woff2') format('woff2'),
+  url('https://api.shop.huahb.cn/iconfont/font_1525256_6bxwphhntqh.woff') format('woff'),
+  url('https://api.shop.huahb.cn/iconfont/font_1525256_6bxwphhntqh.ttf') format('truetype'),
+  url('https://api.shop.huahb.cn/iconfont/font_1525256_6bxwphhntqh.svg#iconfont') format('svg');
 }
 
 .iconfont {

+ 3 - 3
hdPad/src/config.js

@@ -1,4 +1,4 @@
 export const ProjectName = 'hd'
-export const APIHOST = 'https://api.shop.huaml.com'
-export const IMGHOST = 'https://img.huaml.com'
-export const CURRENT_ENV = 'dev'
+export const APIHOST = 'https://api.shop.huahb.cn'
+export const IMGHOST = 'https://img.huahb.cn'
+export const CURRENT_ENV = 'production'

+ 6 - 6
hdPad/src/ext.json

@@ -1,12 +1,12 @@
 {
   "extEnable": true,
-  "extAppid": "wxe4675bab299a52f7",
+  "extAppid": "wx0d42f5f1dcb3a370",
   "directCommit": false,
   "ext": {
-    "account": 12362,
-    "apiHost": "https://api.shop.huaml.com",
-    "socketApiHost": "api.shop.huaml.com",
-    "imgHost": "https://img.huaml.com",
-    "name":"花美玲"
+    "account": 12358,
+    "apiHost": "https://api.shop.huahb.cn",
+    "socketApiHost": "api.shop.huahb.cn",
+    "imgHost": "https://img.huahb.cn",
+    "name":"花掌柜"
   }
 }

+ 6 - 6
hdPad/src/static/iconfont/iconfont.css

@@ -1,11 +1,11 @@
 @font-face {
   font-family: 'iconfont';  /* project id 1525256 */
-  src: url('https://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.eot');
-  src: url('https://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.eot?#iefix') format('embedded-opentype'),
-  url('https://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.woff2') format('woff2'),
-  url('https://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.woff') format('woff'),
-  url('https://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.ttf') format('truetype'),
-  url('https://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.svg#iconfont') format('svg');
+  src: url('https://api.shop.huahb.cn/iconfont/font_1525256_6bxwphhntqh.eot');
+  src: url('https://api.shop.huahb.cn/iconfont/font_1525256_6bxwphhntqh.eot?#iefix') format('embedded-opentype'),
+  url('https://api.shop.huahb.cn/iconfont/font_1525256_6bxwphhntqh.woff2') format('woff2'),
+  url('https://api.shop.huahb.cn/iconfont/font_1525256_6bxwphhntqh.woff') format('woff'),
+  url('https://api.shop.huahb.cn/iconfont/font_1525256_6bxwphhntqh.ttf') format('truetype'),
+  url('https://api.shop.huahb.cn/iconfont/font_1525256_6bxwphhntqh.svg#iconfont') format('svg');
 }
 
 .iconfont {

+ 2 - 2
hdh5/config.js

@@ -1,3 +1,3 @@
 // API 配置
-export const APIHOST = 'https://api.shop.huaml.com'
-export const IMGHOST = 'https://img.huaml.com'
+export const APIHOST = 'https://api.shop.huahb.cn'
+export const IMGHOST = 'https://img.huahb.cn'

文件差异内容过多而无法显示
+ 0 - 0
hdh5/unpackage/dist/build/web/assets/_plugin-vue_export-helper.BwZZKqgp.js


文件差异内容过多而无法显示
+ 0 - 0
hdh5/unpackage/dist/build/web/assets/_plugin-vue_export-helper.DX-d0rQg.js


+ 1 - 1
hdh5/unpackage/dist/build/web/assets/admin-cg-alipay.C5XSU5QY.js → hdh5/unpackage/dist/build/web/assets/admin-cg-alipay.CqvRTsdK.js

@@ -1 +1 @@
-import{s as a,f as e,l as t,c as n,w as s,e as o,k as i,i as r,o as d,b as p}from"./index-CCmlO5_-.js";import{p as l}from"./index.fRkTBf8Q.js";import{_ as h}from"./_plugin-vue_export-helper.DX-d0rQg.js";const c=h({name:"alipay",components:{},mixins:[],data:()=>({payUrl:"",hasRenew:1}),computed:{},onLoad(a){let e=a.orderSn?a.orderSn:"";this.payInit(e)},mounted(){},methods:{init(){},go(){1==this.hasRenew&&(window.location.href=this.payUrl)},payInit(e){if(""==e)return a({title:"没有找到订单编号",icon:"none",duration:1500}),!1;l({orderSn:e}).then((e=>{if(0==e.code)return a({title:e.msg,icon:"none",duration:1500}),!1;this.hasRenew=e.data.hasRenew?e.data.hasRenew:0,e.data.hasRenew&&1==e.data.hasRenew&&(this.payUrl=e.data.payUrl,window.location.href=this.payUrl)}))}}},[["render",function(a,l,h,c,w,u){const m=i,f=r;return d(),e("div",{class:"app-content pay-wrap"},[t("div",{class:"delivery-wrap"},[t("div",{class:"btn-wrap"},[1==w.hasRenew?(d(),n(m,{key:0,class:"button-com red",onClick:l[0]||(l[0]=a=>u.go())},{default:s((()=>[p("正在打开支付宝...")])),_:1})):o("",!0),0==w.hasRenew?(d(),n(f,{key:1,style:{"margin-top":"50upx","font-size":"40upx","font-weight":"bold","text-align":"center"}},{default:s((()=>[p("商家还未开通此功能")])),_:1})):o("",!0)])])])}],["__scopeId","data-v-1045a385"]]);export{c as default};
+import{s as a,f as e,l as t,c as n,w as s,e as o,k as i,i as r,o as d,b as p}from"./index-C9ERQmO8.js";import{p as l}from"./index.Ds8QbfAw.js";import{_ as h}from"./_plugin-vue_export-helper.BwZZKqgp.js";const c=h({name:"alipay",components:{},mixins:[],data:()=>({payUrl:"",hasRenew:1}),computed:{},onLoad(a){let e=a.orderSn?a.orderSn:"";this.payInit(e)},mounted(){},methods:{init(){},go(){1==this.hasRenew&&(window.location.href=this.payUrl)},payInit(e){if(""==e)return a({title:"没有找到订单编号",icon:"none",duration:1500}),!1;l({orderSn:e}).then((e=>{if(0==e.code)return a({title:e.msg,icon:"none",duration:1500}),!1;this.hasRenew=e.data.hasRenew?e.data.hasRenew:0,e.data.hasRenew&&1==e.data.hasRenew&&(this.payUrl=e.data.payUrl,window.location.href=this.payUrl)}))}}},[["render",function(a,l,h,c,w,u){const m=i,f=r;return d(),e("div",{class:"app-content pay-wrap"},[t("div",{class:"delivery-wrap"},[t("div",{class:"btn-wrap"},[1==w.hasRenew?(d(),n(m,{key:0,class:"button-com red",onClick:l[0]||(l[0]=a=>u.go())},{default:s((()=>[p("正在打开支付宝...")])),_:1})):o("",!0),0==w.hasRenew?(d(),n(f,{key:1,style:{"margin-top":"50upx","font-size":"40upx","font-weight":"bold","text-align":"center"}},{default:s((()=>[p("商家还未开通此功能")])),_:1})):o("",!0)])])])}],["__scopeId","data-v-1045a385"]]);export{c as default};

+ 1 - 1
hdh5/unpackage/dist/build/web/assets/admin-clear-alipay.C0sd3WJd.js → hdh5/unpackage/dist/build/web/assets/admin-clear-alipay.CEcM0j6R.js

@@ -1 +1 @@
-import{s as a,f as e,l as t,c as n,w as s,e as o,k as i,i as r,o as d,b as p}from"./index-CCmlO5_-.js";import{a as l}from"./index.fRkTBf8Q.js";import{_ as c}from"./_plugin-vue_export-helper.DX-d0rQg.js";const h=c({name:"alipay",components:{},mixins:[],data:()=>({payUrl:"",hasRenew:1}),computed:{},onLoad(a){let e=a.orderSn?a.orderSn:"";this.payInit(e)},mounted(){},methods:{init(){},go(){1==this.hasRenew&&(window.location.href=this.payUrl)},payInit(e){if(""==e)return a({title:"没有找到订单号",icon:"none",duration:1500}),!1;l({orderSn:e}).then((e=>{if(0==e.code)return a({title:e.msg,icon:"none",duration:1500}),!1;this.hasRenew=e.data.hasRenew?e.data.hasRenew:0,e.data.hasRenew&&1==e.data.hasRenew&&(this.payUrl=e.data.payUrl,window.location.href=this.payUrl)}))}}},[["render",function(a,l,c,h,w,u){const m=i,f=r;return d(),e("div",{class:"app-content pay-wrap"},[t("div",{class:"delivery-wrap"},[t("div",{class:"btn-wrap"},[1==w.hasRenew?(d(),n(m,{key:0,class:"button-com red",onClick:l[0]||(l[0]=a=>u.go())},{default:s((()=>[p("正在打开支付宝...")])),_:1})):o("",!0),0==w.hasRenew?(d(),n(f,{key:1,style:{"margin-top":"50upx","font-size":"40upx","font-weight":"bold","text-align":"center"}},{default:s((()=>[p("商家还未开通此功能")])),_:1})):o("",!0)])])])}],["__scopeId","data-v-12a9cc21"]]);export{h as default};
+import{s as a,f as e,l as t,c as n,w as s,e as o,k as i,i as r,o as d,b as p}from"./index-C9ERQmO8.js";import{a as l}from"./index.Ds8QbfAw.js";import{_ as c}from"./_plugin-vue_export-helper.BwZZKqgp.js";const h=c({name:"alipay",components:{},mixins:[],data:()=>({payUrl:"",hasRenew:1}),computed:{},onLoad(a){let e=a.orderSn?a.orderSn:"";this.payInit(e)},mounted(){},methods:{init(){},go(){1==this.hasRenew&&(window.location.href=this.payUrl)},payInit(e){if(""==e)return a({title:"没有找到订单号",icon:"none",duration:1500}),!1;l({orderSn:e}).then((e=>{if(0==e.code)return a({title:e.msg,icon:"none",duration:1500}),!1;this.hasRenew=e.data.hasRenew?e.data.hasRenew:0,e.data.hasRenew&&1==e.data.hasRenew&&(this.payUrl=e.data.payUrl,window.location.href=this.payUrl)}))}}},[["render",function(a,l,c,h,w,u){const m=i,f=r;return d(),e("div",{class:"app-content pay-wrap"},[t("div",{class:"delivery-wrap"},[t("div",{class:"btn-wrap"},[1==w.hasRenew?(d(),n(m,{key:0,class:"button-com red",onClick:l[0]||(l[0]=a=>u.go())},{default:s((()=>[p("正在打开支付宝...")])),_:1})):o("",!0),0==w.hasRenew?(d(),n(f,{key:1,style:{"margin-top":"50upx","font-size":"40upx","font-weight":"bold","text-align":"center"}},{default:s((()=>[p("商家还未开通此功能")])),_:1})):o("",!0)])])])}],["__scopeId","data-v-12a9cc21"]]);export{h as default};

文件差异内容过多而无法显示
+ 0 - 0
hdh5/unpackage/dist/build/web/assets/admin-ghs-pay.DRHC8Hj6.js


文件差异内容过多而无法显示
+ 1 - 1
hdh5/unpackage/dist/build/web/assets/index-C9ERQmO8.js


+ 1 - 1
hdh5/unpackage/dist/build/web/assets/index.fRkTBf8Q.js → hdh5/unpackage/dist/build/web/assets/index.Ds8QbfAw.js

@@ -1 +1 @@
-import{h as a}from"./_plugin-vue_export-helper.DX-d0rQg.js";const p=async p=>a.post("/purchase/ali-pay",p),s=async p=>a.post("/purchase-clear/ali-pay",p);export{s as a,p};
+import{h as a}from"./_plugin-vue_export-helper.BwZZKqgp.js";const p=async p=>a.post("/purchase/ali-pay",p),s=async p=>a.post("/purchase-clear/ali-pay",p);export{s as a,p};

+ 1 - 1
hdh5/unpackage/dist/build/web/index.html

@@ -16,7 +16,7 @@
 	<script src="/static/web/quill-1.3.7.min.js"></script>
     <!--preload-links-->
     <!--app-context-->
-    <script type="module" crossorigin src="/assets/index-CCmlO5_-.js"></script>
+    <script type="module" crossorigin src="/assets/index-C9ERQmO8.js"></script>
     <link rel="stylesheet" crossorigin href="/assets/index-Dzn8UyOo.css">
   </head>
   <body>

+ 2 - 2
mallApp/src/config.js

@@ -1,3 +1,3 @@
 export const ProjectName = 'mall'
-export const CURRENT_ENV = 'dev'
-export const APIHOST = 'https://api.shop.theflorist.cn'
+export const CURRENT_ENV = 'production'
+export const APIHOST = 'https://api.shop.zhiguanhua.cn'

+ 5 - 5
mallApp/src/ext.json

@@ -1,12 +1,12 @@
 {
   "extEnable": true,
-  "extAppid": "wxe41bd5816affd0ba",
+  "extAppid": "wx99a1dfc4171efb42",
   "directCommit": false,
   "ext": {
     "account": 0,
-    "apiHost": "https://api.shop.theflorist.cn",
-    "socketApiHost": "api.shop.theflorist.cn",
-    "imgHost": "https://img.theflorist.cn",
-    "name":"花卉"
+    "apiHost": "https://api.shop.zhiguanhua.cn",
+    "socketApiHost": "api.shop.zhiguanhua.cn",
+    "imgHost": "https://img.zhiguanhua.cn",
+    "name":"花卉"
   }
 }

+ 6 - 10
mallApp/src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "商城",
     "appid" : "__UNI__19572D0",
     "description" : "花店商城",
-    "versionName" : "1.0.11",
-    "versionCode" : "1011",
+    "versionName" : "1.0.10",
+    "versionCode" : "1010",
     "transformPx" : true,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -38,8 +38,8 @@
                     "NSPhotoLibraryUsageDescription" : "该应用需要读取您的相册,以便支持您修改头像、门店图片或花材图片",
                     "NSPhotoLibraryAddUsageDescription" : "该应用需要读取您的相册,以便支持您修改头像、门店图片或花材图片",
                     "NSCameraUsageDescription" : "该应用需要获取您的摄像头权限,以便支持您直接拍照上传头像、门店图片或花材图片"
-                },
-                "idfa" : false            
+				},
+				"idfa" : false
             },
             /* SDK配置 */
             "sdkConfigs" : {
@@ -54,17 +54,13 @@
     "quickapp" : {},
     /* 小程序特有相关 线上(花卉宝) wx99a1dfc4171efb42 开发(中花卉) wxe41bd5816affd0ba */
     "mp-weixin" : {
-        "appid" : "wxe41bd5816affd0ba",
+        "appid" : "wx99a1dfc4171efb42",
         "setting" : {
             "urlCheck" : false
         },
-        "optimization" : {
-            "subPackages" : true
-        },
         "usingComponents" : true,
         "permission" : {
-        },
-        "lazyCodeLoading":"requiredComponents"
+        }
     },
     "mp-alipay" : {
         "usingComponents" : true

文件差异内容过多而无法显示
+ 1 - 1
mallh5/unpackage/dist/build/web/assets/index-DJzkx5zs.js


+ 1 - 1
mallh5/unpackage/dist/build/web/assets/pages-pay-demo.DQtisBjK.js → mallh5/unpackage/dist/build/web/assets/pages-pay-demo.C1-24r4p.js

@@ -1 +1 @@
-import{c as e,w as a,i as o,o as t,a as n}from"./index-BeAzKEzg.js";import{_ as s}from"./_plugin-vue_export-helper.BCo6x5W8.js";const r=s({name:"index",data:()=>({}),computed:{},onLoad(e){},methods:{}},[["render",function(s,r,d,u,i,m){const p=o;return t(),e(p,null,{default:a((()=>[n(" 您好 ")])),_:1})}]]);export{r as default};
+import{c as e,w as a,i as o,o as t,a as n}from"./index-DJzkx5zs.js";import{_ as s}from"./_plugin-vue_export-helper.BCo6x5W8.js";const r=s({name:"index",data:()=>({}),computed:{},onLoad(e){},methods:{}},[["render",function(s,r,d,u,i,m){const p=o;return t(),e(p,null,{default:a((()=>[n(" 您好 ")])),_:1})}]]);export{r as default};

文件差异内容过多而无法显示
+ 0 - 0
mallh5/unpackage/dist/build/web/assets/pages-pay-index.DLkkkEG1.js


文件差异内容过多而无法显示
+ 0 - 0
mallh5/unpackage/dist/build/web/assets/pages-pay-success.D7OBPJIv.js


+ 1 - 1
mallh5/unpackage/dist/build/web/index.html

@@ -16,7 +16,7 @@
 	<script src="/static/web/quill-1.3.7.min.js"></script>
     <!--preload-links-->
     <!--app-context-->
-    <script type="module" crossorigin src="/assets/index-BeAzKEzg.js"></script>
+    <script type="module" crossorigin src="/assets/index-DJzkx5zs.js"></script>
     <link rel="stylesheet" crossorigin href="/assets/index-Dzn8UyOo.css">
   </head>
   <body>

+ 2 - 2
pt/dist/web/index.html

@@ -1,4 +1,4 @@
-<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="referer" content="never"><meta name="renderer" content="webkit"><meta name="viewport" content><link rel="icon" href="/favicon.ico"><link rel="stylesheet" type="text/css" media="print" href="/print-lock.css"><title>花卉宝</title><link href="http://img.hzghd.com/cdn/nprogress/0.2.0/nprogress.min.css" rel="stylesheet"><link href="http://img.hzghd.com/cdn/quill/2.0.0-dev.3/quill.core.min.css" rel="stylesheet"><link href="http://img.hzghd.com/cdn/viewerjs/1.3.7/viewer.min.css" rel="stylesheet"><link href="http://img.hzghd.com/cdn/element-ui/2.13.0/theme-chalk/index.css" rel="stylesheet"><style>html,
+<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="referer" content="never"><meta name="renderer" content="webkit"><meta name="viewport" content><link rel="icon" href="/favicon.ico"><link rel="stylesheet" type="text/css" media="print" href="/print-lock.css"><title>花卉宝</title><link href="https://img.wixhb.com/cdn/nprogress/0.2.0/nprogress.min.css" rel="stylesheet"><link href="https://img.wixhb.com/cdn/quill/2.0.0-dev.3/quill.core.min.css" rel="stylesheet"><link href="https://img.wixhb.com/cdn/viewerjs/1.3.7/viewer.min.css" rel="stylesheet"><link href="https://img.wixhb.com/cdn/element-ui/2.13.0/theme-chalk/index.css" rel="stylesheet"><style>html,
 			body,
 			#app {
 				height: 100%;
@@ -43,4 +43,4 @@
 			.once .sub-title {
 				color: #ababab;
 				font-size: 12px;
-			}</style><link href="/css/app.97b5310c.css" rel="preload" as="style"><link href="/css/chunk-libs.b57e4bfb.css" rel="preload" as="style"><link href="/js/app.0603cebc.js" rel="preload" as="script"><link href="/js/chunk-libs.4c3a697b.js" rel="preload" as="script"><link href="/css/chunk-libs.b57e4bfb.css" rel="stylesheet"><link href="/css/app.97b5310c.css" rel="stylesheet"></head><body><noscript></noscript><div id="app"><div class="once"><div class="container"><div class="title">正在加载资源</div><div class="sub-title">初次加载资源可能需要较多时间 请耐心等待</div></div><div class="footer"><a href="https://www.baidu.com/" target="_blank">花卉宝</a></div></div></div><script src="http://img.hzghd.com/cdn/vue/2.6.10/vue.min.js"></script><script src="http://img.hzghd.com/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="http://img.hzghd.com/cdn/vuex/3.1.1/vuex.min.js"></script><script src="http://img.hzghd.com/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="http://img.hzghd.com/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="http://img.hzghd.com/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="http://img.hzghd.com/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="http://img.hzghd.com/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="http://img.hzghd.com/cdn/element-ui/2.13.0/index.js"></script><script src="http://img.hzghd.com/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="http://img.hzghd.com/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="http://img.hzghd.com/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.4c3a697b.js"></script><script src="/js/app.0603cebc.js"></script></body></html>
+			}</style><link href="/css/app.97b5310c.css" rel="preload" as="style"><link href="/css/chunk-libs.b57e4bfb.css" rel="preload" as="style"><link href="/js/app.1d2ed01b.js" rel="preload" as="script"><link href="/js/chunk-libs.4c3a697b.js" rel="preload" as="script"><link href="/css/chunk-libs.b57e4bfb.css" rel="stylesheet"><link href="/css/app.97b5310c.css" rel="stylesheet"></head><body><noscript></noscript><div id="app"><div class="once"><div class="container"><div class="title">正在加载资源</div><div class="sub-title">初次加载资源可能需要较多时间 请耐心等待</div></div><div class="footer"><a href="https://www.baidu.com/" target="_blank">花卉宝</a></div></div></div><script src="https://img.wixhb.com/cdn/vue/2.6.10/vue.min.js"></script><script src="https://img.wixhb.com/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="https://img.wixhb.com/cdn/vuex/3.1.1/vuex.min.js"></script><script src="https://img.wixhb.com/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="https://img.wixhb.com/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="https://img.wixhb.com/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="https://img.wixhb.com/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="https://img.wixhb.com/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="https://img.wixhb.com/cdn/element-ui/2.13.0/index.js"></script><script src="https://img.wixhb.com/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="https://img.wixhb.com/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="https://img.wixhb.com/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.4c3a697b.js"></script><script src="/js/app.1d2ed01b.js"></script></body></html>

文件差异内容过多而无法显示
+ 0 - 0
pt/dist/web/js/app.1d2ed01b.js


+ 2 - 2
pt/vue.config.js

@@ -3,13 +3,13 @@ const path = require('path');
 const isProduction = process.env.NODE_ENV === 'production';
 
 //http和https切换请修改这里,修改后需要重新运行 npm run serve 即可 shish 2021.4.12
-const proxyTarget = 'https://api.pt.huaml.com';
+const proxyTarget = 'https://api.pt.wixhb.com';
 
 function resolve(dir) {
 	return path.join(__dirname, dir);
 }
 
-let hostUrl = 'http://img.hzghd.com/';
+let hostUrl = 'https://img.wixhb.com/';
 
 const cdn = {
 	dev: {

+ 0 - 169
线上/jd/vue.config.js

@@ -1,169 +0,0 @@
-const path = require('path');
-
-const isProduction = process.env.NODE_ENV === 'production';
-
-//http和https切换请修改这里,修改后需要重新运行npm run serve shish 2021.4.12
-const proxyTarget = 'https://api.shop.wixhb.cn';
-
-function resolve(dir) {
-	return path.join(__dirname, dir);
-}
-
-let hostUrl = 'https://img.wixhb.cn/';
-
-const cdn = {
-	dev: {
-		css: [`${hostUrl}cdn/element-ui/2.13.0/theme-chalk/index.css`]
-	},
-	pro: {
-		css: [
-			`${hostUrl}cdn/nprogress/0.2.0/nprogress.min.css`,
-			`${hostUrl}cdn/quill/2.0.0-dev.3/quill.core.min.css`,
-			`${hostUrl}cdn/viewerjs/1.3.7/viewer.min.css`,
-			`${hostUrl}cdn/element-ui/2.13.0/theme-chalk/index.css`
-		],
-		js: [
-			`${hostUrl}cdn/vue/2.6.10/vue.min.js`,
-			`${hostUrl}cdn/vue-router/3.1.3/vue-router.min.js`,
-			`${hostUrl}cdn/vuex/3.1.1/vuex.min.js`,
-			`${hostUrl}cdn/clipboard.js/2.0.4/clipboard.min.js`,
-			`${hostUrl}cdn/axios/0.19.0-beta.1/axios.min.js`,
-			`${hostUrl}cdn/nprogress/0.2.0/nprogress.min.js`,
-			`${hostUrl}cdn/Mock.js/1.0.1-beta3/mock-min.js`,
-			`${hostUrl}cdn/quill/2.0.0-dev.3/quill.min.js`,
-			`${hostUrl}cdn/element-ui/2.13.0/index.js`,
-			`${hostUrl}cdn/viewerjs/1.3.7/viewer.min.js`,
-			`${hostUrl}cdn/echarts/4.4.0-rc.1/echarts.min.js`,
-			`${hostUrl}cdn/npm/vue-echarts@4.0.2.js`
-		]
-	}
-};
-
-module.exports = {
-	publicPath: '/',
-	lintOnSave: true,
-	productionSourceMap: false,
-	parallel: require('os').cpus().length > 1,
-	// 输出文件目录
-	outputDir: 'dist/shop/',
-
-	css: {
-		extract: isProduction,
-		sourceMap: false,
-		loaderOptions: {
-			stylus: {
-				import: '~@/assets/css/common.styl'
-			},
-			sass: {
-				prependData: `@import "~@/assets/css/base.scss";`
-			}
-		}
-	},
-
-	devServer: {
-		host: '127.0.0.1',
-		port: 7777,
-		open: false,
-		compress: false,
-		overlay: {
-			warnings: false,
-			errors: true
-		},
-
-		proxy: {
-			'/dev': {
-				target: proxyTarget,
-				changeOrigin: true,
-				pathRewrite: { '^/dev': '' }
-			},
-			'/s-dev': {
-				target: proxyTarget,
-				changeOrigin: true,
-				pathRewrite: { '^/s-dev': '' }
-			},
-			'/pro': {
-				target: proxyTarget,
-				changeOrigin: true,
-				pathRewrite: { '^/pro': '/api' }
-			}
-		}
-	},
-
-	chainWebpack: config => {
-		// 移除 prefetch 插件
-		config.plugins.delete('prefetch');
-		// 移除 preload 插件
-		// config.plugins.delete('preload');
-		// svg
-		// config.module.rule('svg').uses.clear();
-
-		// config.module
-		// 	.rule('svg-sprite-loader')
-		// 	.test(/.svg$/)
-		// 	.exclude.add(/node_modules/)
-		// 	.end()
-		// 	.use('svg-sprite-loader')
-		// 	.loader('svg-sprite-loader')
-		// 	.options({
-		// 		symbolId: '[name]'
-		// 	});
-
-		// 去掉元素之间空格
-		config.module
-			.rule('vue')
-			.use('vue-loader')
-			.loader('vue-loader')
-			.tap(options => {
-				options.compilerOptions.preserveWhitespace = true;
-				return options;
-			})
-			.end();
-
-		// 引入cdn
-		config.plugin('html').tap(args => {
-			args[0].cdn = cdn[isProduction ? 'pro' : 'dev'];
-			return args;
-		});
-
-		if (isProduction) {
-			config.performance.set('hints', false);
-
-			config.optimization.splitChunks({
-				chunks: 'all',
-				cacheGroups: {
-					libs: {
-						name: 'chunk-libs',
-						test: /[\\/]node_modules[\\/]/,
-						priority: 10,
-						chunks: 'initial'
-					},
-					commons: {
-						name: 'chunk-cool',
-						test: resolve('src/cool'),
-						minChunks: 3,
-						priority: 5,
-						reuseExistingChunk: true
-					}
-				}
-			});
-		}
-	},
-
-	configureWebpack: config => {
-		if (isProduction) {
-			config.externals = {
-				vue: 'Vue',
-				'vue-router': 'VueRouter',
-				'element-ui': 'ELEMENT',
-				vuex: 'Vuex',
-				axios: 'axios',
-				mockjs: 'Mock',
-				nprogress: 'NProgress',
-				quill: 'Quill',
-				viewer: 'Viewer',
-				echarts: 'echarts',
-				'vue-echarts': 'VueECharts'
-			};
-		}
-	}
-};

+ 0 - 4
线上/jdApp/src/config.js

@@ -1,4 +0,0 @@
-export const ProjectName = 'ghs'
-export const APIHOST = 'https://api.shop.zhhinc.com'
-export const IMGHOST = 'https://img.zhhinc.com'
-export const CURRENT_ENV = 'production'

+ 0 - 12
线上/jdApp/src/ext.json

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

+ 0 - 221
线上/jdApp/src/manifest.json

@@ -1,221 +0,0 @@
-{
-    "name" : "花来旺",
-    "appid" : "__UNI__635A1BC",
-    "description" : "基地批发销售管理系统",
-    "versionName" : "1.1.27",
-    "versionCode" : 1127,
-    "transformPx" : true,
-    /* 5+App特有相关 */
-    "app-plus" : {
-        "usingComponents" : true,
-        "nvueCompiler" : "uni-app",
-        "compilerVersion" : 3,
-        "nvueLaunchMode" : "fast",
-        "compatible" : {
-            "ignoreVersion" : true
-        },
-        "splashscreen" : {
-            "alwaysShowBeforeRender" : true,
-            "waiting" : true,
-            "autoclose" : true,
-            "delay" : 0
-        },
-        "modules" : {
-            "VideoPlayer" : {},
-            "Bluetooth" : {},
-            "Geolocation" : {},
-            "Push" : {},
-            "OAuth" : {},
-            "Share" : {},
-            "Camera" : {}
-        },
-        /* 应用发布信息 */
-        "distribute" : {
-            /* android打包配置 */
-            "android" : {
-                "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" : "该应用需要读取您的相册,以便支持您修改头像、门店图片或花材图片",
-                    "NSCameraUsageDescription" : "该应用需要获取您的摄像头权限,以便支持您直接拍照上传头像、门店图片或花材图片"
-                },
-                "idfa" : false,
-                "capabilities" : {
-                    "entitlements" : {
-                        "com.apple.developer.associated-domains" : [ "applinks:fronttg.zhhinc.com" ]
-                    }
-                }
-            },
-            /* SDK配置 */
-            "sdkConfigs" : {
-                "speech" : {
-                    
-                },
-                "push" : {
-                    "unipush" : {}
-                },
-                "share" : {
-                    "weixin" : {
-                        "appid" : "wx685d3b6a0063ff2e",
-                        "UniversalLinks" : ""
-                    }
-                },
-                "ad" : {},
-                "geolocation" : {
-                    "system" : {
-                        "__platform__" : [ "ios", "android" ]
-                    }
-                },
-                "maps" : {},
-                "oauth" : {
-                    "univerify" : {}
-                }
-            },
-            "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" : {},
-    /* 小程序特有相关*/
-    "mp-weixin" : {
-        "appid" : "wx685d3b6a0063ff2e",
-        "setting" : {
-            "urlCheck" : false
-        },
-        "optimization" : {
-            "subPackages" : true
-        },
-        "usingComponents" : true,
-        "permission" : {
-            "scope.userLocation" : {
-                "desc" : "请点击确定"
-            }
-        }
-    },
-    "mp-alipay" : {
-        "usingComponents" : true
-    },
-    "mp-baidu" : {
-        "usingComponents" : true
-    },
-    "mp-toutiao" : {
-        "usingComponents" : true
-    },
-    "h5" : {
-        "template" : "template.h5.html",
-        "router" : {
-            // "mode" : "history",
-            "base" : "/"
-        },
-        "async" : {
-            "timeout" : 20000
-        },
-        "optimization" : {
-            "treeShaking" : {
-                "enable" : true
-            }
-        },
-        "devServer" : {
-            "port" : 81,
-            "proxy" : {
-                "/api" : {
-                    "target" : "http://api.shop.zhhinc.com",
-                    "secure" : false,
-                    "changeOrigin" : true,
-                    "pathRewrite" : {
-                        "^/api" : ""
-                    }
-                }
-            }
-        },
-        "sdkConfigs" : {
-            "maps" : {
-                "qqmap" : {
-                    "key" : ""
-                }
-            }
-        }
-    }
-}

+ 0 - 435
线上/jdApp/src/static/iconfont/iconfont.css

@@ -1,435 +0,0 @@
-@font-face {
-  font-family: 'iconfont';  /* project id 1525256 */
-  src: url('https://api.shop.zhhinc.com/iconfont/font_1525256_6bxwphhntqh.eot');
-  src: url('https://api.shop.zhhinc.com/iconfont/font_1525256_6bxwphhntqh.eot?#iefix') format('embedded-opentype'),
-  url('https://api.shop.zhhinc.com/iconfont/font_1525256_6bxwphhntqh.woff2') format('woff2'),
-  url('https://api.shop.zhhinc.com/iconfont/font_1525256_6bxwphhntqh.woff') format('woff'),
-  url('https://api.shop.zhhinc.com/iconfont/font_1525256_6bxwphhntqh.ttf') format('truetype'),
-  url('https://api.shop.zhhinc.com/iconfont/font_1525256_6bxwphhntqh.svg#iconfont') format('svg');
-}
-
-.iconfont {
-  font-family: "iconfont" !important;
-  font-size: 16upx;
-  font-style: normal;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-.iconcachu::before {
-  content: "\e7e6";
-}
-
-.iconjihuo:before {
-  content: "\e601";
-}
-
-.iconmingxi1:before {
-  content: "\e7e5";
-}
-.iconjian:before {
-  content: "\e7e3";
-}
-
-.iconzeng:before {
-  content: "\e7e4";
-}
-
-.iconqiehuan1:before {
-  content: "\e7e2";
-}
-
-.iconqishouyinying:before {
-  content: "\e7e1";
-}
-
-.iconxiayi:before {
-  content: "\e7de";
-}
-
-.iconshangyi:before {
-  content: "\e7e0";
-}
-
-.iconyiruku:before {
-  content: "\e7df";
-}
-
-.iconyikaidian:before {
-  content: "\e7d7";
-}
-
-.icondianhua1:before {
-  content: "\e7d9";
-}
-
-.iconshoukuanma1:before {
-  content: "\e7d8";
-}
-
-.icondaichuku:before {
-  content: "\e7da";
-}
-
-.iconyichuku:before {
-  content: "\e7db";
-}
-
-.iconyiquxiao:before {
-  content: "\e7dc";
-}
-
-.icondairuku:before {
-  content: "\e7dd";
-}
-
-.iconshoukuanma:before {
-  content: "\e600";
-}
-
-.icongouwuche:before {
-  content: "\e7d5";
-}
-
-.iconjianqu:before {
-  content: "\e7d3";
-}
-
-.icontianjia:before {
-  content: "\e7d4";
-}
-
-.iconsearch1:before {
-  content: "\e7d6";
-}
-
-.icondingdanweixuanzhong1:before {
-  content: "\e7c9";
-}
-
-.icondianpuweixuanzhong:before {
-  content: "\e7ca";
-}
-
-.iconwodeweixuanzhong:before {
-  content: "\e7cb";
-}
-
-.iconyingyongweixuanzhong:before {
-  content: "\e7cc";
-}
-
-.icondianpuxuanzhong:before {
-  content: "\e7cd";
-}
-
-.icondingdanxuanzhong1:before {
-  content: "\e7ce";
-}
-
-.iconwodexuanzhong:before {
-  content: "\e7cf";
-}
-
-.iconkehuweixuanzhong1:before {
-  content: "\e7d0";
-}
-
-.iconyingyongxuanzhong:before {
-  content: "\e7d1";
-}
-
-.iconkehuxuanzhong1:before {
-  content: "\e7d2";
-}
-
-.iconxiaochengxu2:before {
-  content: "\e78d";
-}
-
-.iconmeituan:before {
-  content: "\e78e";
-}
-
-.iconzhangshangcaifuyemianshoujiban344:before {
-  content: "\e632";
-}
-
-.iconwaimai:before {
-  content: "\e692";
-}
-
-.iconxiaochengxu1:before {
-  content: "\e619";
-}
-
-.iconjiantouxia:before {
-  content: "\e61a";
-}
-
-.iconshenheweitongguo:before {
-  content: "\e774";
-}
-
-.iconsanjiao_xia:before {
-  content: "\e631";
-}
-
-.iconsanjiaoshang:before {
-  content: "\e643";
-}
-
-.icondagou:before {
-  content: "\e607";
-}
-
-.iconshezhi:before {
-  content: "\e645";
-}
-
-.iconcaidan:before {
-  content: "\e65d";
-}
-
-.iconxiaoxi2:before {
-  content: "\e76f";
-}
-
-.iconmorentu:before {
-  content: "\e76e";
-}
-
-.icongou:before {
-  content: "\e76d";
-}
-
-.iconbianjijiage1:before {
-  content: "\e76c";
-}
-
-.iconchenggong:before {
-  content: "\e76b";
-}
-
-.iconfahuo:before {
-  content: "\e75d";
-}
-
-.iconshouye:before {
-  content: "\e75e";
-}
-
-.icontianjiatuku:before {
-  content: "\e767";
-}
-
-.iconxinrenlingquanshezhi:before {
-  content: "\e768";
-}
-
-.iconhuiyuandengjishezhi:before {
-  content: "\e769";
-}
-
-.iconweixin:before {
-  content: "\e76a";
-}
-
-.iconcaidanlan:before {
-  content: "\e75c";
-}
-
-.icontupiantianjia:before {
-  content: "\e75f";
-}
-
-.icondelete:before {
-  content: "\e760";
-}
-
-.iconxiaoxi1:before {
-  content: "\e761";
-}
-
-.iconxiala:before {
-  content: "\e762";
-}
-
-.icontianjiakehu:before {
-  content: "\e766";
-}
-
-.iconweixingongzhonghao:before {
-  content: "\e763";
-}
-
-.iconshoujihao1:before {
-  content: "\e764";
-}
-
-.iconweixinlaiyuan:before {
-  content: "\e765";
-}
-
-.iconkehuxuanzhong:before {
-  content: "\e755";
-}
-
-.iconkehuweixuanzhong:before {
-  content: "\e756";
-}
-
-.icongongzuotaiweixuanzhong:before {
-  content: "\e757";
-}
-
-.icongongzuotaixuanzhong:before {
-  content: "\e758";
-}
-
-.icondingdanweixuanzhong:before {
-  content: "\e759";
-}
-
-.icondingdanxuanzhong:before {
-  content: "\e75a";
-}
-
-.iconcaozuo:before {
-  content: "\e751";
-}
-
-.iconcaozuojihuo:before {
-  content: "\e752";
-}
-
-.iconfenxiang1:before {
-  content: "\e74c";
-}
-
-.iconbianji:before {
-  content: "\e74d";
-}
-
-.iconjinyong:before {
-  content: "\e74e";
-}
-
-.iconqiyong:before {
-  content: "\e74f";
-}
-
-.iconshanchu1:before {
-  content: "\e750";
-}
-
-.iconzhiding:before {
-  content: "\e753";
-}
-
-.iconxiajia:before {
-  content: "\e754";
-}
-
-.iconguanbi:before {
-  content: "\e74b";
-}
-
-.iconshanchu:before {
-  content: "\e74a";
-}
-
-.iconkefu:before {
-  content: "\e749";
-}
-
-.icontupian:before {
-  content: "\e746";
-}
-
-.iconxiaochengxu:before {
-  content: "\e747";
-}
-
-.iconzhifubao:before {
-  content: "\e748";
-}
-
-.iconchangjianwentixiangguanwenti2:before {
-  content: "\e679";
-}
-
-.iconxuanzhong:before {
-  content: "\e744";
-}
-
-.iconweixuanzhong:before {
-  content: "\e745";
-}
-
-.iconfenxiang:before {
-  content: "\e743";
-}
-
-.iconxiaoxi:before {
-  content: "\e741";
-}
-
-.icondianpu:before {
-  content: "\e742";
-}
-
-.icondianhua:before {
-  content: "\e73f";
-}
-
-.iconditu:before {
-  content: "\e740";
-}
-
-.iconsearch:before {
-  content: "\e73d";
-}
-
-.iconclose:before {
-  content: "\e73e";
-}
-
-.icondaizhifu:before {
-  content: "\e733";
-}
-
-.iconshoujihao:before {
-  content: "\e734";
-}
-
-.iconxiangyou:before {
-  content: "\e735";
-}
-
-.iconhaopingxingxing:before {
-  content: "\e736";
-}
-
-.iconmine:before {
-  content: "\e737";
-}
-
-.iconstore:before {
-  content: "\e738";
-}
-
-.iconhome:before {
-  content: "\e739";
-}
-
-.iconclassification:before {
-  content: "\e73a";
-}
-
-.iconyiguoqi:before {
-  content: "\e73b";
-}
-
-.iconyishiyong:before {
-  content: "\e73c";
-}

部分文件因为文件数量过多而无法显示