瀏覽代碼

收款问题

shish 2 周之前
父節點
當前提交
9591124670
共有 37 個文件被更改,包括 88 次插入90 次删除
  1. 2 2
      ghs/dist/shop/index.html
  2. 0 0
      ghs/dist/shop/js/app.9f5fa3e6.js
  3. 3 3
      ghs/vue.config.js
  4. 3 3
      ghsApp/src/config.js
  5. 3 3
      ghsApp/src/manifest.json
  6. 4 4
      ghsPad/src/config.js
  7. 3 6
      ghsPad/src/manifest.json
  8. 2 2
      hd/dist/shop/index.html
  9. 0 0
      hd/dist/shop/js/app.6156a144.js
  10. 2 2
      hd/vue.config.js
  11. 5 5
      hdApp/src/config.js
  12. 6 6
      hdApp/src/ext.json
  13. 3 3
      hdApp/src/manifest.json
  14. 6 6
      hdApp/src/static/iconfont/iconfont.css
  15. 3 3
      hdPad/src/config.js
  16. 6 6
      hdPad/src/ext.json
  17. 6 6
      hdPad/src/static/iconfont/iconfont.css
  18. 2 2
      hdh5/config.js
  19. 0 0
      hdh5/unpackage/dist/build/web/assets/_plugin-vue_export-helper.DdMvIptU.js
  20. 0 0
      hdh5/unpackage/dist/build/web/assets/_plugin-vue_export-helper.H6AekIpX.js
  21. 1 1
      hdh5/unpackage/dist/build/web/assets/admin-cg-alipay.M1j2sHeV.js
  22. 1 1
      hdh5/unpackage/dist/build/web/assets/admin-clear-alipay.adkZ4lWZ.js
  23. 0 0
      hdh5/unpackage/dist/build/web/assets/admin-ghs-pay.C-H4xIgk.js
  24. 1 1
      hdh5/unpackage/dist/build/web/assets/index-BJqnDxhV.js
  25. 1 1
      hdh5/unpackage/dist/build/web/assets/index.BSVTUOaP.js
  26. 0 0
      hdh5/unpackage/dist/build/web/assets/pagesPurchase-gathering.CTKRBFAx.js
  27. 1 1
      hdh5/unpackage/dist/build/web/index.html
  28. 3 3
      mallApp/src/config.js
  29. 14 13
      mallApp/src/manifest.json
  30. 1 1
      mallh5/unpackage/dist/build/web/assets/index-B5rO03ky.js
  31. 1 1
      mallh5/unpackage/dist/build/web/assets/pages-pay-demo.TyNY5I7J.js
  32. 0 0
      mallh5/unpackage/dist/build/web/assets/pages-pay-index.CMOAWAzv.js
  33. 0 0
      mallh5/unpackage/dist/build/web/assets/pages-pay-success.JGl4tffq.js
  34. 1 1
      mallh5/unpackage/dist/build/web/index.html
  35. 2 2
      pt/dist/web/index.html
  36. 0 0
      pt/dist/web/js/app.a18bd3d5.js
  37. 2 2
      pt/vue.config.js

+ 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.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,
+<!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,
 			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.9c3dba4c.js" rel="preload" as="script"><link href="/js/chunk-libs.344d2dbf.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.344d2dbf.js"></script><script src="/js/app.9c3dba4c.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.9f5fa3e6.js" rel="preload" as="script"><link href="/js/chunk-libs.344d2dbf.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.344d2dbf.js"></script><script src="/js/app.9f5fa3e6.js"></script></body></html>

文件差異過大導致無法顯示
+ 0 - 0
ghs/dist/shop/js/app.9f5fa3e6.js


+ 3 - 3
ghs/vue.config.js

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

+ 3 - 3
ghsApp/src/config.js

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

+ 3 - 3
ghsApp/src/manifest.json

@@ -221,7 +221,7 @@
     "quickapp" : {},
     /* 小程序特有相关 线上(销花宝) wxcf32b3f0684c2433 开发(花掌柜) wx21b7c3ef12082099 */
     "mp-weixin" : {
-        "appid" : "wxcf32b3f0684c2433",
+        "appid" : "wx21b7c3ef12082099",
         "setting" : {
             "urlCheck" : false,
             "minified" : true
@@ -235,7 +235,7 @@
         "optimization" : {
             "subPackages" : true
         },
-        "lazyCodeLoading" : "requiredComponents",
+        "lazyCodeLoading":"requiredComponents",
         "uniStatistics" : {
             "enable" : false
         },
@@ -279,7 +279,7 @@
             "port" : 81,
             "proxy" : {
                 "/api" : {
-                    "target" : "http://api.shop.wixhb.com",
+                    "target" : "http://api.shop.hzghd.com",
                     "secure" : false,
                     "changeOrigin" : true,
                     "pathRewrite" : {

+ 4 - 4
ghsPad/src/config.js

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

+ 3 - 6
ghsPad/src/manifest.json

@@ -45,7 +45,7 @@
                     "NSPhotoLibraryAddUsageDescription" : "该应用需要读取您的相册,以便支持您修改头像、门店图片或花材图片",
                     "NSCameraUsageDescription" : "该应用需要获取您的摄像头权限,以便支持您直接拍照上传头像、门店图片或花材图片"
                 },
-				"idfa" : false
+                "idfa" : false            
             },
             /* SDK配置 */
             "sdkConfigs" : {
@@ -133,13 +133,10 @@
     "quickapp" : {},
     /* 小程序特有相关 线上(销花宝) wxcf32b3f0684c2433 开发(花掌柜) wx21b7c3ef12082099 */
     "mp-weixin" : {
-        "appid" : "wxcf32b3f0684c2433",
+        "appid" : "wx21b7c3ef12082099",
         "setting" : {
             "urlCheck" : false
         },
-        "optimization" : {
-            "subPackages" : true
-        },
         "usingComponents" : true,
         "permission" : {
             "scope.userLocation" : {
@@ -174,7 +171,7 @@
             "port" : 81,
             "proxy" : {
                 "/api" : {
-                    "target" : "http://api.shop.wixhb.com",
+                    "target" : "http://api.shop.hzghd.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.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,
+<!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,
 			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.bf88ca96.js" rel="preload" as="script"><link href="/js/chunk-libs.7289eda9.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.7289eda9.js"></script><script src="/js/app.bf88ca96.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.6156a144.js" rel="preload" as="script"><link href="/js/chunk-libs.7289eda9.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.7289eda9.js"></script><script src="/js/app.6156a144.js"></script></body></html>

文件差異過大導致無法顯示
+ 0 - 0
hd/dist/shop/js/app.6156a144.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.huahb.cn';
+const proxyTarget = 'https://api.shop.huaml.com';
 
 function resolve(dir) {
 	return path.join(__dirname, dir);
 }
 
-let hostUrl = 'https://img.huahb.cn/';
+let hostUrl = 'https://img.huaml.com/';
 
 const cdn = {
 	dev: {

+ 5 - 5
hdApp/src/config.js

@@ -1,7 +1,7 @@
 export const ProjectName = 'hd'
-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'
-export const WSSHOST = 'wss://chat.shop.huahb.cn'
+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 WSSHOST = 'wss://chat.shop.huaml.com'
 export const APP_VERSION = '2.3.7'

+ 6 - 6
hdApp/src/ext.json

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

+ 3 - 3
hdApp/src/manifest.json

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

+ 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.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');
+  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');
 }
 
 .iconfont {

+ 3 - 3
hdPad/src/config.js

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

+ 6 - 6
hdPad/src/ext.json

@@ -1,12 +1,12 @@
 {
   "extEnable": true,
-  "extAppid": "wx0d42f5f1dcb3a370",
+  "extAppid": "wxe4675bab299a52f7",
   "directCommit": false,
   "ext": {
-    "account": 12358,
-    "apiHost": "https://api.shop.huahb.cn",
-    "socketApiHost": "api.shop.huahb.cn",
-    "imgHost": "https://img.huahb.cn",
-    "name":"花掌柜"
+    "account": 12362,
+    "apiHost": "https://api.shop.huaml.com",
+    "socketApiHost": "api.shop.huaml.com",
+    "imgHost": "https://img.huaml.com",
+    "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.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');
+  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');
 }
 
 .iconfont {

+ 2 - 2
hdh5/config.js

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

文件差異過大導致無法顯示
+ 0 - 0
hdh5/unpackage/dist/build/web/assets/_plugin-vue_export-helper.DdMvIptU.js


文件差異過大導致無法顯示
+ 0 - 0
hdh5/unpackage/dist/build/web/assets/_plugin-vue_export-helper.H6AekIpX.js


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

@@ -1 +1 @@
-import{s as a,f as e,q as t,c as n,w as s,e as o,k as i,i as r,o as d,d as p}from"./index-CS1sLqOC.js";import{c as l}from"./index.CDovZGC1.js";import{_ as c}from"./_plugin-vue_export-helper.H6AekIpX.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-1045a385"]]);export{h as default};
+import{s as a,f as e,q as t,c as n,w as s,e as o,k as i,i as r,o as d,d as p}from"./index-BJqnDxhV.js";import{c as l}from"./index.BSVTUOaP.js";import{_ as c}from"./_plugin-vue_export-helper.DdMvIptU.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-1045a385"]]);export{h as default};

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

@@ -1 +1 @@
-import{s as a,f as e,q as t,c as n,w as s,e as o,k as i,i as r,o as d,d as p}from"./index-CS1sLqOC.js";import{b as l}from"./index.CDovZGC1.js";import{_ as c}from"./_plugin-vue_export-helper.H6AekIpX.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,q as t,c as n,w as s,e as o,k as i,i as r,o as d,d as p}from"./index-BJqnDxhV.js";import{b as l}from"./index.BSVTUOaP.js";import{_ as c}from"./_plugin-vue_export-helper.DdMvIptU.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.C-H4xIgk.js


文件差異過大導致無法顯示
+ 1 - 1
hdh5/unpackage/dist/build/web/assets/index-BJqnDxhV.js


+ 1 - 1
hdh5/unpackage/dist/build/web/assets/index.CDovZGC1.js → hdh5/unpackage/dist/build/web/assets/index.BSVTUOaP.js

@@ -1 +1 @@
-import{h as a}from"./_plugin-vue_export-helper.H6AekIpX.js";const s=async s=>a.post("/purchase/ali-pay",s),e=async s=>a.post("/purchase-clear/ali-pay",s),p=async s=>a.get("/purchase/debt-list",s),c=async s=>a.get("/ghs/detail",s),r=async s=>a.post("/purchase-clear/create-order",s);export{r as a,e as b,s as c,c as g,p};
+import{h as a}from"./_plugin-vue_export-helper.DdMvIptU.js";const s=async s=>a.post("/purchase/ali-pay",s),e=async s=>a.post("/purchase-clear/ali-pay",s),p=async s=>a.get("/purchase/debt-list",s),c=async s=>a.get("/ghs/detail",s),r=async s=>a.post("/purchase-clear/create-order",s);export{r as a,e as b,s as c,c as g,p};

文件差異過大導致無法顯示
+ 0 - 0
hdh5/unpackage/dist/build/web/assets/pagesPurchase-gathering.CTKRBFAx.js


+ 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-CS1sLqOC.js"></script>
+    <script type="module" crossorigin src="/assets/index-BJqnDxhV.js"></script>
     <link rel="stylesheet" crossorigin href="/assets/index-Dzn8UyOo.css">
   </head>
   <body>

+ 3 - 3
mallApp/src/config.js

@@ -1,4 +1,4 @@
 export const ProjectName = 'mall'
-export const CURRENT_ENV = 'production'
-export const APIHOST = 'https://api.shop.zhiguanhua.cn'
-export const WSSHOST = 'wss://chat.shop.huahb.cn'
+export const CURRENT_ENV = 'dev'
+export const APIHOST = 'https://api.shop.theflorist.cn'
+export const WSSHOST = 'wss://chat.shop.huaml.com'

+ 14 - 13
mallApp/src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "商城",
     "appid" : "__UNI__19572D0",
     "description" : "花店商城",
-    "versionName" : "1.0.10",
-    "versionCode" : "1010",
+    "versionName" : "1.0.12",
+    "versionCode" : "1012",
     "transformPx" : true,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -38,14 +38,12 @@
                     "NSPhotoLibraryUsageDescription" : "该应用需要读取您的相册,以便支持您修改头像、门店图片或花材图片",
                     "NSPhotoLibraryAddUsageDescription" : "该应用需要读取您的相册,以便支持您修改头像、门店图片或花材图片",
                     "NSCameraUsageDescription" : "该应用需要获取您的摄像头权限,以便支持您直接拍照上传头像、门店图片或花材图片"
-				},
-				"idfa" : false
+                },
+                "idfa" : false            
             },
             /* SDK配置 */
             "sdkConfigs" : {
-                "speech" : {
-                    
-                }
+                "speech" : {}
             },
             "orientation" : [ "portrait-primary" ]
         },
@@ -57,13 +55,17 @@
     "quickapp" : {},
     /* 小程序特有相关 线上(花卉宝) wx99a1dfc4171efb42 开发(中花卉) wxe41bd5816affd0ba */
     "mp-weixin" : {
-        "appid" : "wx99a1dfc4171efb42",
+        "appid" : "wxe41bd5816affd0ba",
         "setting" : {
             "urlCheck" : false
         },
+        "optimization" : {
+            "subPackages" : true
+        },
         "usingComponents" : true,
-        "permission" : {},
-        "lazyCodeLoading" : "requiredComponents",
+        "permission" : {
+        },
+        "lazyCodeLoading":"requiredComponents",
         "uniStatistics" : {
             "enable" : false
         }
@@ -93,7 +95,7 @@
             "base" : "/"
         },
         "async": {
-            "timeout": 20000
+            "timeout": 200000
         },
         "optimization": {
             "treeShaking": {
@@ -123,8 +125,7 @@
         "uniStatistics" : {
             "enable" : false
         }
-    }
-    ,
+    },
     "uniStatistics" : {
         "version" : "2",
         "enable" : false

文件差異過大導致無法顯示
+ 1 - 1
mallh5/unpackage/dist/build/web/assets/index-B5rO03ky.js


+ 1 - 1
mallh5/unpackage/dist/build/web/assets/pages-pay-demo.jXX3xtpy.js → mallh5/unpackage/dist/build/web/assets/pages-pay-demo.TyNY5I7J.js

@@ -1 +1 @@
-import{c as e,w as a,i as o,o as t,a as n}from"./index-BhxOCqMw.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-B5rO03ky.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.CMOAWAzv.js


文件差異過大導致無法顯示
+ 0 - 0
mallh5/unpackage/dist/build/web/assets/pages-pay-success.JGl4tffq.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-BhxOCqMw.js"></script>
+    <script type="module" crossorigin src="/assets/index-B5rO03ky.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="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,
+<!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,
 			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.c70d755a.js" rel="preload" as="script"><link href="/js/chunk-libs.7289eda9.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.7289eda9.js"></script><script src="/js/app.c70d755a.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.a18bd3d5.js" rel="preload" as="script"><link href="/js/chunk-libs.7289eda9.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.7289eda9.js"></script><script src="/js/app.a18bd3d5.js"></script></body></html>

文件差異過大導致無法顯示
+ 0 - 0
pt/dist/web/js/app.a18bd3d5.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.wixhb.com';
+const proxyTarget = 'https://api.pt.huaml.com';
 
 function resolve(dir) {
 	return path.join(__dirname, dir);
 }
 
-let hostUrl = 'https://img.wixhb.com/';
+let hostUrl = 'http://img.hzghd.com/';
 
 const cdn = {
 	dev: {

部分文件因文件數量過多而無法顯示