Merge branch 'master' into redesign‌-260706

# Conflicts:
#	ghs/dist/shop/css/chunk-ed03a434.3666ff33.css
#	ghs/dist/shop/index.html
#	ghs/dist/shop/js/app.9ed41f76.js
#	ghs/dist/shop/js/app.9f5fa3e6.js
#	ghs/dist/shop/js/app.f75b6f69.js
#	hd/dist/shop/index.html
#	hd/dist/shop/js/app.bf88ca96.js
#	hdh5/unpackage/dist/build/web/assets/_plugin-vue_export-helper.DB5wsZxt.js
#	hdh5/unpackage/dist/build/web/assets/admin-cg-alipay.CVcHi9tF.js
#	hdh5/unpackage/dist/build/web/assets/admin-cg-alipay.CxZsNMyg.js
#	hdh5/unpackage/dist/build/web/assets/admin-cg-alipay.D830B9uw.js
#	hdh5/unpackage/dist/build/web/assets/admin-clear-alipay.9HtuqQJ6.js
#	hdh5/unpackage/dist/build/web/assets/admin-clear-alipay.CDx-MXU7.js
#	hdh5/unpackage/dist/build/web/assets/admin-clear-alipay.SlYCvlhX.js
#	hdh5/unpackage/dist/build/web/assets/admin-ghs-balanceChange.DTgG1l5h.js
#	hdh5/unpackage/dist/build/web/assets/admin-ghs-balanceChange.DjIpUyYX.js
#	hdh5/unpackage/dist/build/web/assets/admin-ghs-balanceChange.EHeynR2t.js
#	hdh5/unpackage/dist/build/web/assets/admin-ghs-pay.B1zf-g75.js
#	hdh5/unpackage/dist/build/web/assets/admin-ghs-pay.CmRIWzbh.js
#	hdh5/unpackage/dist/build/web/assets/admin-ghs-pay.DDOshwB3.js
#	hdh5/unpackage/dist/build/web/assets/index-4s5eHE7i.js
#	hdh5/unpackage/dist/build/web/assets/index-BBAix273.js
#	hdh5/unpackage/dist/build/web/assets/index-BJhhWmNe.js
#	hdh5/unpackage/dist/build/web/assets/index.BY0HDO6l.js
#	hdh5/unpackage/dist/build/web/assets/index.DKg0_iAu.js
#	hdh5/unpackage/dist/build/web/assets/index.DNfuzBGq.js
#	hdh5/unpackage/dist/build/web/assets/index.DPtqXnrX.js
#	hdh5/unpackage/dist/build/web/assets/index.DZHAujCr.js
#	hdh5/unpackage/dist/build/web/assets/index.kWdIQQAF.js
#	hdh5/unpackage/dist/build/web/assets/pagesPurchase-gathering.BHZnxdvl.js
#	hdh5/unpackage/dist/build/web/assets/pagesPurchase-gathering.BWN_e-1t.js
#	hdh5/unpackage/dist/build/web/assets/pagesPurchase-gathering.Dkko0no6.js
#	hdh5/unpackage/dist/build/web/index.html
#	mallApp/src/static/iconfont/iconfont.css
#	mallh5/unpackage/dist/build/web/assets/index-B5rO03ky.js
#	mallh5/unpackage/dist/build/web/assets/index-BYPdUZs5.js
#	mallh5/unpackage/dist/build/web/assets/index-ugUN8Z-j.js
#	mallh5/unpackage/dist/build/web/assets/pages-pay-demo.TyNY5I7J.js
#	mallh5/unpackage/dist/build/web/assets/pages-pay-demo.mR5zWgw3.js
#	mallh5/unpackage/dist/build/web/assets/pages-pay-demo.wNXEPclJ.js
#	mallh5/unpackage/dist/build/web/assets/pages-pay-index.5jxOdmOY.js
#	mallh5/unpackage/dist/build/web/assets/pages-pay-index.BcI6NZxo.js
#	mallh5/unpackage/dist/build/web/assets/pages-pay-index.CMOAWAzv.js
#	mallh5/unpackage/dist/build/web/assets/pages-pay-success.0c7SA6vH.js
#	mallh5/unpackage/dist/build/web/assets/pages-pay-success.D_8R3oPJ.js
#	mallh5/unpackage/dist/build/web/assets/pages-pay-success.JGl4tffq.js
#	mallh5/unpackage/dist/build/web/index.html
#	pt/dist/web/index.html
#	pt/dist/web/js/app.d3e25896.js

ghs/dist/shop/css/chunk-12bee1b6.a50064e6.css

@@ -1 +0,0 @@
-.el-dialog .el-dialog__header[data-v-ea3fe634]{padding:10px;text-align:center;border-bottom:1px solid #f7f7f7}.el-dialog .el-dialog__header .el-dialog__title[data-v-ea3fe634]{font-size:15px;letter-spacing:.5px}.el-dialog .el-dialog__header .el-dialog__headerbtn[data-v-ea3fe634]{top:13px}.el-dialog .el-dialog__header .el-dialog__headerbtn .el-dialog__close[data-v-ea3fe634]{font-size:18px}.el-dialog .el-dialog__body[data-v-ea3fe634]{padding:20px}.el-dialog .el-dialog__footer[data-v-ea3fe634]{padding-bottom:15px}.shop-list[data-v-ea3fe634]{height:100%}

ghs/dist/shop/css/chunk-2500a632.d16cae0f.css

@@ -0,0 +1 @@
+.el-dialog .el-dialog__header[data-v-6af25aaa]{padding:10px;text-align:center;border-bottom:1px solid #f7f7f7}.el-dialog .el-dialog__header .el-dialog__title[data-v-6af25aaa]{font-size:15px;letter-spacing:.5px}.el-dialog .el-dialog__header .el-dialog__headerbtn[data-v-6af25aaa]{top:13px}.el-dialog .el-dialog__header .el-dialog__headerbtn .el-dialog__close[data-v-6af25aaa]{font-size:18px}.el-dialog .el-dialog__body[data-v-6af25aaa]{padding:20px}.el-dialog .el-dialog__footer[data-v-6af25aaa]{padding-bottom:15px}.shop-list[data-v-6af25aaa]{height:100%}.yj-total-wrap[data-v-6af25aaa]{display:block;width:100%}.yj-total-nums[data-v-6af25aaa]{display:block;line-height:1.6}.yj-total-tip[data-v-6af25aaa]{display:block;width:100%;margin-top:10px;font-size:13px;color:#1c89e0;line-height:1.6}

ghs/dist/shop/css/chunk-2ead2b2c.98ad1e69.css

@@ -1 +0,0 @@
-.el-dialog .el-dialog__header[data-v-6fac0e9f]{padding:10px;text-align:center;border-bottom:1px solid #f7f7f7}.el-dialog .el-dialog__header .el-dialog__title[data-v-6fac0e9f]{font-size:15px;letter-spacing:.5px}.el-dialog .el-dialog__header .el-dialog__headerbtn[data-v-6fac0e9f]{top:13px}.el-dialog .el-dialog__header .el-dialog__headerbtn .el-dialog__close[data-v-6fac0e9f]{font-size:18px}.el-dialog .el-dialog__body[data-v-6fac0e9f]{padding:20px}.el-dialog .el-dialog__footer[data-v-6fac0e9f]{padding-bottom:15px}.shop-list[data-v-6fac0e9f]{height:100%}

ghs/dist/shop/css/chunk-31c03faa.e096230c.css

@@ -1 +0,0 @@
-.el-dialog .el-dialog__header[data-v-5fbfc943]{padding:10px;text-align:center;border-bottom:1px solid #f7f7f7}.el-dialog .el-dialog__header .el-dialog__title[data-v-5fbfc943]{font-size:15px;letter-spacing:.5px}.el-dialog .el-dialog__header .el-dialog__headerbtn[data-v-5fbfc943]{top:13px}.el-dialog .el-dialog__header .el-dialog__headerbtn .el-dialog__close[data-v-5fbfc943]{font-size:18px}.el-dialog .el-dialog__body[data-v-5fbfc943]{padding:20px}.el-dialog .el-dialog__footer[data-v-5fbfc943]{padding-bottom:15px}.shop-list[data-v-5fbfc943]{height:100%}

ghs/dist/shop/css/chunk-48696bed.d2a4c940.css

@@ -0,0 +1 @@
+.el-dialog .el-dialog__header[data-v-83f0e63a]{padding:10px;text-align:center;border-bottom:1px solid #f7f7f7}.el-dialog .el-dialog__header .el-dialog__title[data-v-83f0e63a]{font-size:15px;letter-spacing:.5px}.el-dialog .el-dialog__header .el-dialog__headerbtn[data-v-83f0e63a]{top:13px}.el-dialog .el-dialog__header .el-dialog__headerbtn .el-dialog__close[data-v-83f0e63a]{font-size:18px}.el-dialog .el-dialog__body[data-v-83f0e63a]{padding:20px}.el-dialog .el-dialog__footer[data-v-83f0e63a]{padding-bottom:15px}.shop-list[data-v-83f0e63a]{height:100%}

ghs/dist/shop/css/chunk-48f6d562.3f9ebc54.css

@@ -0,0 +1 @@
+.el-dialog .el-dialog__header[data-v-7fb79e7e]{padding:10px;text-align:center;border-bottom:1px solid #f7f7f7}.el-dialog .el-dialog__header .el-dialog__title[data-v-7fb79e7e]{font-size:15px;letter-spacing:.5px}.el-dialog .el-dialog__header .el-dialog__headerbtn[data-v-7fb79e7e]{top:13px}.el-dialog .el-dialog__header .el-dialog__headerbtn .el-dialog__close[data-v-7fb79e7e]{font-size:18px}.el-dialog .el-dialog__body[data-v-7fb79e7e]{padding:20px}.el-dialog .el-dialog__footer[data-v-7fb79e7e]{padding-bottom:15px}.shop-list[data-v-7fb79e7e]{height:100%}

ghs/dist/shop/css/chunk-5bb86f36.354d21c5.css

@@ -1 +0,0 @@
-.el-dialog .el-dialog__header[data-v-5ec73699]{padding:10px;text-align:center;border-bottom:1px solid #f7f7f7}.el-dialog .el-dialog__header .el-dialog__title[data-v-5ec73699]{font-size:15px;letter-spacing:.5px}.el-dialog .el-dialog__header .el-dialog__headerbtn[data-v-5ec73699]{top:13px}.el-dialog .el-dialog__header .el-dialog__headerbtn .el-dialog__close[data-v-5ec73699]{font-size:18px}.el-dialog .el-dialog__body[data-v-5ec73699]{padding:20px}.el-dialog .el-dialog__footer[data-v-5ec73699]{padding-bottom:15px}.shop-list[data-v-5ec73699]{height:100%}

ghs/dist/shop/css/chunk-666c23fa.a88045b3.css

@@ -1 +0,0 @@
-.el-dialog .el-dialog__header[data-v-5befa3c0]{padding:10px;text-align:center;border-bottom:1px solid #f7f7f7}.el-dialog .el-dialog__header .el-dialog__title[data-v-5befa3c0]{font-size:15px;letter-spacing:.5px}.el-dialog .el-dialog__header .el-dialog__headerbtn[data-v-5befa3c0]{top:13px}.el-dialog .el-dialog__header .el-dialog__headerbtn .el-dialog__close[data-v-5befa3c0]{font-size:18px}.el-dialog .el-dialog__body[data-v-5befa3c0]{padding:20px}.el-dialog .el-dialog__footer[data-v-5befa3c0]{padding-bottom:15px}.shop-list[data-v-5befa3c0]{height:100%}

ghs/dist/shop/css/chunk-6816b5ce.f722d3ae.css

@@ -1 +0,0 @@
-.el-dialog .el-dialog__header[data-v-5ab4a258]{padding:10px;text-align:center;border-bottom:1px solid #f7f7f7}.el-dialog .el-dialog__header .el-dialog__title[data-v-5ab4a258]{font-size:15px;letter-spacing:.5px}.el-dialog .el-dialog__header .el-dialog__headerbtn[data-v-5ab4a258]{top:13px}.el-dialog .el-dialog__header .el-dialog__headerbtn .el-dialog__close[data-v-5ab4a258]{font-size:18px}.el-dialog .el-dialog__body[data-v-5ab4a258]{padding:20px}.el-dialog .el-dialog__footer[data-v-5ab4a258]{padding-bottom:15px}.shop-list[data-v-5ab4a258]{height:100%}

ghs/dist/shop/css/chunk-69510fdc.5baafe0b.css

@@ -0,0 +1 @@
+.el-dialog .el-dialog__header[data-v-05e8e5be]{padding:10px;text-align:center;border-bottom:1px solid #f7f7f7}.el-dialog .el-dialog__header .el-dialog__title[data-v-05e8e5be]{font-size:15px;letter-spacing:.5px}.el-dialog .el-dialog__header .el-dialog__headerbtn[data-v-05e8e5be]{top:13px}.el-dialog .el-dialog__header .el-dialog__headerbtn .el-dialog__close[data-v-05e8e5be]{font-size:18px}.el-dialog .el-dialog__body[data-v-05e8e5be]{padding:20px}.el-dialog .el-dialog__footer[data-v-05e8e5be]{padding-bottom:15px}.shop-list[data-v-05e8e5be]{height:100%}.cg-total-wrap[data-v-05e8e5be]{display:block;width:100%}.cg-total-nums[data-v-05e8e5be]{display:block;line-height:1.6}

ghs/dist/shop/css/chunk-78680b8e.82d255d2.css

@@ -0,0 +1 @@
+.el-dialog .el-dialog__header[data-v-72cda2b4]{padding:10px;text-align:center;border-bottom:1px solid #f7f7f7}.el-dialog .el-dialog__header .el-dialog__title[data-v-72cda2b4]{font-size:15px;letter-spacing:.5px}.el-dialog .el-dialog__header .el-dialog__headerbtn[data-v-72cda2b4]{top:13px}.el-dialog .el-dialog__header .el-dialog__headerbtn .el-dialog__close[data-v-72cda2b4]{font-size:18px}.el-dialog .el-dialog__body[data-v-72cda2b4]{padding:20px}.el-dialog .el-dialog__footer[data-v-72cda2b4]{padding-bottom:15px}.shop-list[data-v-72cda2b4]{height:100%}.yj-total-wrap[data-v-72cda2b4]{display:block;width:100%}.yj-total-nums[data-v-72cda2b4]{display:block;line-height:1.6}.yj-total-tip[data-v-72cda2b4]{display:block;width:100%;margin-top:10px;font-size:13px;color:#1c89e0;line-height:1.6}

ghs/dist/shop/css/chunk-b7a9e4f6.08c7c8c1.css

@@ -0,0 +1 @@
+.el-dialog .el-dialog__header[data-v-3e1c6a2a]{padding:10px;text-align:center;border-bottom:1px solid #f7f7f7}.el-dialog .el-dialog__header .el-dialog__title[data-v-3e1c6a2a]{font-size:15px;letter-spacing:.5px}.el-dialog .el-dialog__header .el-dialog__headerbtn[data-v-3e1c6a2a]{top:13px}.el-dialog .el-dialog__header .el-dialog__headerbtn .el-dialog__close[data-v-3e1c6a2a]{font-size:18px}.el-dialog .el-dialog__body[data-v-3e1c6a2a]{padding:20px}.el-dialog .el-dialog__footer[data-v-3e1c6a2a]{padding-bottom:15px}.shop-list[data-v-3e1c6a2a]{height:100%}.yj-total-wrap[data-v-3e1c6a2a]{display:block;width:100%}.yj-total-nums[data-v-3e1c6a2a]{display:block;line-height:1.6}.yj-total-tip[data-v-3e1c6a2a]{display:block;width:100%;margin-top:10px;font-size:13px;color:#1c89e0;line-height:1.6}

ghs/dist/shop/css/chunk-b9d39322.59147274.css

@@ -0,0 +1 @@
+.el-dialog .el-dialog__header[data-v-0551272c]{padding:10px;text-align:center;border-bottom:1px solid #f7f7f7}.el-dialog .el-dialog__header .el-dialog__title[data-v-0551272c]{font-size:15px;letter-spacing:.5px}.el-dialog .el-dialog__header .el-dialog__headerbtn[data-v-0551272c]{top:13px}.el-dialog .el-dialog__header .el-dialog__headerbtn .el-dialog__close[data-v-0551272c]{font-size:18px}.el-dialog .el-dialog__body[data-v-0551272c]{padding:20px}.el-dialog .el-dialog__footer[data-v-0551272c]{padding-bottom:15px}.shop-list[data-v-0551272c]{height:100%}.yj-total-wrap[data-v-0551272c]{display:block;width:100%}.yj-total-nums[data-v-0551272c]{display:block;line-height:1.6}.yj-total-tip[data-v-0551272c]{display:block;width:100%;margin-top:10px;font-size:13px;color:#1c89e0;line-height:1.6}

ghs/dist/shop/css/chunk-d1ee2580.313756b3.css

@@ -1 +0,0 @@
-.el-dialog .el-dialog__header[data-v-6ca64a5f]{padding:10px;text-align:center;border-bottom:1px solid #f7f7f7}.el-dialog .el-dialog__header .el-dialog__title[data-v-6ca64a5f]{font-size:15px;letter-spacing:.5px}.el-dialog .el-dialog__header .el-dialog__headerbtn[data-v-6ca64a5f]{top:13px}.el-dialog .el-dialog__header .el-dialog__headerbtn .el-dialog__close[data-v-6ca64a5f]{font-size:18px}.el-dialog .el-dialog__body[data-v-6ca64a5f]{padding:20px}.el-dialog .el-dialog__footer[data-v-6ca64a5f]{padding-bottom:15px}.shop-list[data-v-6ca64a5f]{height:100%}

ghs/dist/shop/css/chunk-d712f49c.0330d9cb.css

@@ -0,0 +1 @@
+.el-dialog .el-dialog__header[data-v-00b705c7]{padding:10px;text-align:center;border-bottom:1px solid #f7f7f7}.el-dialog .el-dialog__header .el-dialog__title[data-v-00b705c7]{font-size:15px;letter-spacing:.5px}.el-dialog .el-dialog__header .el-dialog__headerbtn[data-v-00b705c7]{top:13px}.el-dialog .el-dialog__header .el-dialog__headerbtn .el-dialog__close[data-v-00b705c7]{font-size:18px}.el-dialog .el-dialog__body[data-v-00b705c7]{padding:20px}.el-dialog .el-dialog__footer[data-v-00b705c7]{padding-bottom:15px}.shop-list[data-v-00b705c7]{height:100%}.sale-total-wrap[data-v-00b705c7]{display:block;width:100%}.sale-total-nums[data-v-00b705c7]{display:block;line-height:1.6}

ghs/dist/shop/css/chunk-efb50a6c.7514f4cd.css

@@ -1 +0,0 @@
-.el-dialog .el-dialog__header[data-v-50eabccd]{padding:10px;text-align:center;border-bottom:1px solid #f7f7f7}.el-dialog .el-dialog__header .el-dialog__title[data-v-50eabccd]{font-size:15px;letter-spacing:.5px}.el-dialog .el-dialog__header .el-dialog__headerbtn[data-v-50eabccd]{top:13px}.el-dialog .el-dialog__header .el-dialog__headerbtn .el-dialog__close[data-v-50eabccd]{font-size:18px}.el-dialog .el-dialog__body[data-v-50eabccd]{padding:20px}.el-dialog .el-dialog__footer[data-v-50eabccd]{padding-bottom:15px}.shop-list[data-v-50eabccd]{height:100%}

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: {

ghsApp/src/config.js

@@ -1,5 +1,5 @@
 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'
 export const APP_VERSION = '1.2.90'

ghsApp/src/manifest.json

@@ -221,7 +221,7 @@
     "quickapp" : {},
     /* 小程序特有相关 线上（销花宝） wxcf32b3f0684c2433 开发（花掌柜） wx21b7c3ef12082099 */
     "mp-weixin" : {
-        "appid" : "wx21b7c3ef12082099",
+        "appid" : "wxcf32b3f0684c2433",
         "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.hzghd.com",
+                    "target" : "http://api.shop.wixhb.com",
                     "secure" : false,
                     "changeOrigin" : true,
                     "pathRewrite" : {

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'

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" : {

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: {

hdApp/src/config.js

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

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":"花掌柜"
   }
 }

hdApp/src/manifest.json

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

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 {

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'

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":"花掌柜"
   }
 }

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 {

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'

hdh5/unpackage/dist/build/web/assets/admin-cg-alipay.CVcHi9tF.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:hdh5/unpackage/dist/build/web/assets/admin-cg-alipay.CVcHi9tF.js
 import{s as a,j as e,u as t,c as n,w as s,f as o,q as i,i as r,o as d,e as p}from"./index-4s5eHE7i.js";import{c as l}from"./index.DKg0_iAu.js";import{_ as c}from"./_plugin-vue_export-helper.DB5wsZxt.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,j as e,u as t,c as n,w as s,f as o,q as i,i as r,o as d,e as p}from"./index-BJhhWmNe.js";import{c as l}from"./index.kWdIQQAF.js";import{_ as c}from"./_plugin-vue_export-helper.DzGsaf_H.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};
+>>>>>>>> master:hdh5/unpackage/dist/build/web/assets/admin-cg-alipay.D830B9uw.js

hdh5/unpackage/dist/build/web/assets/admin-clear-alipay.CDx-MXU7.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:hdh5/unpackage/dist/build/web/assets/admin-clear-alipay.CDx-MXU7.js
 import{s as a,j as e,u as t,c as n,w as s,f as o,q as i,i as r,o as d,e as p}from"./index-4s5eHE7i.js";import{b as l}from"./index.DKg0_iAu.js";import{_ as c}from"./_plugin-vue_export-helper.DB5wsZxt.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,j as e,u as t,c as n,w as s,f as o,q as i,i as r,o as d,e as p}from"./index-BJhhWmNe.js";import{b as l}from"./index.kWdIQQAF.js";import{_ as c}from"./_plugin-vue_export-helper.DzGsaf_H.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};
+>>>>>>>> master:hdh5/unpackage/dist/build/web/assets/admin-clear-alipay.SlYCvlhX.js

hdh5/unpackage/dist/build/web/assets/index.BY0HDO6l.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:hdh5/unpackage/dist/build/web/assets/index.BY0HDO6l.js
 import{h as e}from"./_plugin-vue_export-helper.DB5wsZxt.js";const g=g=>e.get("/ghs/get-ghs-data",g),s=g=>e.get("/ghs-balance-change/list",g);export{s as b,g};
+========
+import{h as e}from"./_plugin-vue_export-helper.DzGsaf_H.js";const g=g=>e.get("/ghs/get-ghs-data",g),s=g=>e.get("/ghs-balance-change/list",g);export{s as b,g};
+>>>>>>>> master:hdh5/unpackage/dist/build/web/assets/index.DZHAujCr.js

hdh5/unpackage/dist/build/web/assets/index.DKg0_iAu.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:hdh5/unpackage/dist/build/web/assets/index.DKg0_iAu.js
 import{h as a}from"./_plugin-vue_export-helper.DB5wsZxt.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.DzGsaf_H.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};
+>>>>>>>> master:hdh5/unpackage/dist/build/web/assets/index.kWdIQQAF.js

mallApp/src/config.js

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

mallApp/src/manifest.json

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

mallh5/unpackage/dist/build/web/assets/pages-pay-demo.wNXEPclJ.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:mallh5/unpackage/dist/build/web/assets/pages-pay-demo.wNXEPclJ.js
 import{c as e,w as a,i as o,o as t,a as n}from"./index-ugUN8Z-j.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-BYPdUZs5.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};
+>>>>>>>> master:mallh5/unpackage/dist/build/web/assets/pages-pay-demo.mR5zWgw3.js

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: {