shish 10 months ago
parent
commit
9da75bee51
33 changed files with 97 additions and 100 deletions
  1. 3 3
      ghs/vue.config.js
  2. 3 3
      ghsApp/src/config.js
  3. 6 6
      ghsApp/src/ext.json
  4. 7 8
      ghsApp/src/manifest.json
  5. 4 4
      ghsPad/src/config.js
  6. 6 6
      ghsPad/src/ext.json
  7. 6 3
      ghsPad/src/manifest.json
  8. 2 2
      hd/vue.config.js
  9. 5 5
      hdApp/src/config.js
  10. 6 6
      hdApp/src/ext.json
  11. 2 3
      hdApp/src/manifest.json
  12. 6 6
      hdApp/src/static/iconfont/iconfont.css
  13. 3 3
      hdPad/src/config.js
  14. 6 6
      hdPad/src/ext.json
  15. 6 6
      hdPad/src/static/iconfont/iconfont.css
  16. 2 2
      hdh5/config.js
  17. 0 0
      hdh5/unpackage/dist/build/web/assets/_plugin-vue_export-helper.BcdXjB2d.js
  18. 0 0
      hdh5/unpackage/dist/build/web/assets/_plugin-vue_export-helper.Dm2AQb3V.js
  19. 1 1
      hdh5/unpackage/dist/build/web/assets/admin-cg-alipay.CkNyTXgw.js
  20. 1 1
      hdh5/unpackage/dist/build/web/assets/admin-clear-alipay.BUohALSi.js
  21. 0 0
      hdh5/unpackage/dist/build/web/assets/admin-ghs-pay.D2EUmDti.js
  22. 1 1
      hdh5/unpackage/dist/build/web/assets/index-DEybz3ac.js
  23. 1 1
      hdh5/unpackage/dist/build/web/assets/index.EdnRVVuu.js
  24. 1 1
      hdh5/unpackage/dist/build/web/index.html
  25. 3 3
      mallApp/src/config.js
  26. 5 5
      mallApp/src/ext.json
  27. 6 10
      mallApp/src/manifest.json
  28. 1 1
      mallh5/unpackage/dist/build/web/assets/index-BhZ2UAq8.js
  29. 1 1
      mallh5/unpackage/dist/build/web/assets/pages-pay-demo.gVkmbAB0.js
  30. 0 0
      mallh5/unpackage/dist/build/web/assets/pages-pay-index.Cn5dBIea.js
  31. 0 0
      mallh5/unpackage/dist/build/web/assets/pages-pay-success.Dy69Vwio.js
  32. 1 1
      mallh5/unpackage/dist/build/web/index.html
  33. 2 2
      pt/vue.config.js

+ 3 - 3
ghs/vue.config.js

@@ -2,14 +2,14 @@ const path = require('path');
 
 
 const isProduction = process.env.NODE_ENV === 'production';
 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) {
 function resolve(dir) {
 	return path.join(__dirname, dir);
 	return path.join(__dirname, dir);
 }
 }
 
 
-let hostUrl = 'https://img.hzghd.com/';
+let hostUrl = 'https://img.wixhb.com/';
 
 
 const cdn = {
 const cdn = {
 	dev: {
 	dev: {

+ 3 - 3
ghsApp/src/config.js

@@ -1,4 +1,4 @@
 export const ProjectName = 'ghs'
 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,
   "extEnable": true,
-  "extAppid": "wx21b7c3ef12082099",
+  "extAppid": "wxcf32b3f0684c2433",
   "directCommit": false,
   "directCommit": false,
   "ext": {
   "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" : {
                     "entitlements" : {
                         "com.apple.developer.associated-domains" : [ "applinks:fronttg.wixhb.com" ]
                         "com.apple.developer.associated-domains" : [ "applinks:fronttg.wixhb.com" ]
                     }
                     }
-                }          
+                }
             },
             },
             /* SDK配置 */
             /* SDK配置 */
             "sdkConfigs" : {
             "sdkConfigs" : {
@@ -172,20 +172,19 @@
     "quickapp" : {},
     "quickapp" : {},
     /* 小程序特有相关 线上(销花宝) wxcf32b3f0684c2433 开发(花掌柜) wx21b7c3ef12082099 */
     /* 小程序特有相关 线上(销花宝) wxcf32b3f0684c2433 开发(花掌柜) wx21b7c3ef12082099 */
     "mp-weixin" : {
     "mp-weixin" : {
-        "appid" : "wx21b7c3ef12082099",
+        "appid" : "wxcf32b3f0684c2433",
         "setting" : {
         "setting" : {
             "urlCheck" : false
             "urlCheck" : false
         },
         },
+        "optimization" : {
+            "subPackages" : true
+        },
         "usingComponents" : true,
         "usingComponents" : true,
         "permission" : {
         "permission" : {
             "scope.userLocation" : {
             "scope.userLocation" : {
                 "desc" : "请点击确定"
                 "desc" : "请点击确定"
             }
             }
-        },
-        "optimization" : {
-            "subPackages" : true
-        },
-        "lazyCodeLoading":"requiredComponents"
+        }
     },
     },
     "mp-alipay" : {
     "mp-alipay" : {
         "usingComponents" : true
         "usingComponents" : true
@@ -214,7 +213,7 @@
             "port" : 81,
             "port" : 81,
             "proxy" : {
             "proxy" : {
                 "/api" : {
                 "/api" : {
-                    "target" : "http://api.shop.hzghd.com",
+                    "target" : "http://api.shop.wixhb.com",
                     "secure" : false,
                     "secure" : false,
                     "changeOrigin" : true,
                     "changeOrigin" : true,
                     "pathRewrite" : {
                     "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,
   "extEnable": true,
-  "extAppid": "wx21b7c3ef12082099",
+  "extAppid": "wxcf32b3f0684c2433",
   "directCommit": false,
   "directCommit": false,
   "ext": {
   "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" : "该应用需要读取您的相册,以便支持您修改头像、门店图片或花材图片",
                     "NSPhotoLibraryAddUsageDescription" : "该应用需要读取您的相册,以便支持您修改头像、门店图片或花材图片",
                     "NSCameraUsageDescription" : "该应用需要获取您的摄像头权限,以便支持您直接拍照上传头像、门店图片或花材图片"
                     "NSCameraUsageDescription" : "该应用需要获取您的摄像头权限,以便支持您直接拍照上传头像、门店图片或花材图片"
                 },
                 },
-                "idfa" : false            
+				"idfa" : false
             },
             },
             /* SDK配置 */
             /* SDK配置 */
             "sdkConfigs" : {
             "sdkConfigs" : {
@@ -133,10 +133,13 @@
     "quickapp" : {},
     "quickapp" : {},
     /* 小程序特有相关 线上(销花宝) wxcf32b3f0684c2433 开发(花掌柜) wx21b7c3ef12082099 */
     /* 小程序特有相关 线上(销花宝) wxcf32b3f0684c2433 开发(花掌柜) wx21b7c3ef12082099 */
     "mp-weixin" : {
     "mp-weixin" : {
-        "appid" : "wx21b7c3ef12082099",
+        "appid" : "wxcf32b3f0684c2433",
         "setting" : {
         "setting" : {
             "urlCheck" : false
             "urlCheck" : false
         },
         },
+        "optimization" : {
+            "subPackages" : true
+        },
         "usingComponents" : true,
         "usingComponents" : true,
         "permission" : {
         "permission" : {
             "scope.userLocation" : {
             "scope.userLocation" : {
@@ -171,7 +174,7 @@
             "port" : 81,
             "port" : 81,
             "proxy" : {
             "proxy" : {
                 "/api" : {
                 "/api" : {
-                    "target" : "http://api.shop.hzghd.com",
+                    "target" : "http://api.shop.wixhb.com",
                     "secure" : false,
                     "secure" : false,
                     "changeOrigin" : true,
                     "changeOrigin" : true,
                     "pathRewrite" : {
                     "pathRewrite" : {

+ 2 - 2
hd/vue.config.js

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

+ 5 - 5
hdApp/src/config.js

@@ -1,6 +1,6 @@
 export const ProjectName = 'hd'
 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'

+ 6 - 6
hdApp/src/ext.json

@@ -1,12 +1,12 @@
 {
 {
   "extEnable": true,
   "extEnable": true,
-  "extAppid": "wxe4675bab299a52f7",
+  "extAppid": "wx0d42f5f1dcb3a370",
   "directCommit": false,
   "directCommit": false,
   "ext": {
   "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" : {},
     "quickapp" : {},
     /* 小程序特有相关 线上(花掌柜) wx0d42f5f1dcb3a370 开发(花美玲) wxe4675bab299a52f7 */
     /* 小程序特有相关 线上(花掌柜) wx0d42f5f1dcb3a370 开发(花美玲) wxe4675bab299a52f7 */
     "mp-weixin" : {
     "mp-weixin" : {
-        "appid" : "wxe4675bab299a52f7",
+        "appid" : "wx0d42f5f1dcb3a370",
         "setting" : {
         "setting" : {
             "urlCheck" : false
             "urlCheck" : false
         },
         },
@@ -165,8 +165,7 @@
         },
         },
         "optimization" : {
         "optimization" : {
             "subPackages" : true
             "subPackages" : true
-        },
-        "lazyCodeLoading":"requiredComponents"
+        }
     },
     },
     "mp-alipay" : {
     "mp-alipay" : {
         "usingComponents" : true
         "usingComponents" : true

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

@@ -1,11 +1,11 @@
 @font-face {
 @font-face {
   font-family: 'iconfont';  /* project id 1525256 */
   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 {
 .iconfont {

+ 3 - 3
hdPad/src/config.js

@@ -1,4 +1,4 @@
 export const ProjectName = 'hd'
 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,
   "extEnable": true,
-  "extAppid": "wxe4675bab299a52f7",
+  "extAppid": "wx0d42f5f1dcb3a370",
   "directCommit": false,
   "directCommit": false,
   "ext": {
   "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-face {
   font-family: 'iconfont';  /* project id 1525256 */
   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 {
 .iconfont {

+ 2 - 2
hdh5/config.js

@@ -1,3 +1,3 @@
 // API 配置
 // 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'

File diff suppressed because it is too large
+ 0 - 0
hdh5/unpackage/dist/build/web/assets/_plugin-vue_export-helper.BcdXjB2d.js


File diff suppressed because it is too large
+ 0 - 0
hdh5/unpackage/dist/build/web/assets/_plugin-vue_export-helper.Dm2AQb3V.js


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

@@ -1 +1 @@
-import{s as a,f as e,k as t,c as n,w as s,e as o,j as i,i as r,o as d,b as p}from"./index-CWzVacIH.js";import{p as l}from"./index.CvWM8Ibx.js";import{_ as h}from"./_plugin-vue_export-helper.Dm2AQb3V.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,k as t,c as n,w as s,e as o,j as i,i as r,o as d,b as p}from"./index-DEybz3ac.js";import{p as l}from"./index.EdnRVVuu.js";import{_ as h}from"./_plugin-vue_export-helper.BcdXjB2d.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.BMsiaufK.js → hdh5/unpackage/dist/build/web/assets/admin-clear-alipay.BUohALSi.js

@@ -1 +1 @@
-import{s as a,f as e,k as t,c as n,w as s,e as o,j as i,i as r,o as d,b as p}from"./index-CWzVacIH.js";import{a as l}from"./index.CvWM8Ibx.js";import{_ as c}from"./_plugin-vue_export-helper.Dm2AQb3V.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,k as t,c as n,w as s,e as o,j as i,i as r,o as d,b as p}from"./index-DEybz3ac.js";import{a as l}from"./index.EdnRVVuu.js";import{_ as c}from"./_plugin-vue_export-helper.BcdXjB2d.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};

File diff suppressed because it is too large
+ 0 - 0
hdh5/unpackage/dist/build/web/assets/admin-ghs-pay.D2EUmDti.js


File diff suppressed because it is too large
+ 1 - 1
hdh5/unpackage/dist/build/web/assets/index-DEybz3ac.js


+ 1 - 1
hdh5/unpackage/dist/build/web/assets/index.CvWM8Ibx.js → hdh5/unpackage/dist/build/web/assets/index.EdnRVVuu.js

@@ -1 +1 @@
-import{h as a}from"./_plugin-vue_export-helper.Dm2AQb3V.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.BcdXjB2d.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>
 	<script src="/static/web/quill-1.3.7.min.js"></script>
     <!--preload-links-->
     <!--preload-links-->
     <!--app-context-->
     <!--app-context-->
-    <script type="module" crossorigin src="/assets/index-CWzVacIH.js"></script>
+    <script type="module" crossorigin src="/assets/index-DEybz3ac.js"></script>
     <link rel="stylesheet" crossorigin href="/assets/index-Dzn8UyOo.css">
     <link rel="stylesheet" crossorigin href="/assets/index-Dzn8UyOo.css">
   </head>
   </head>
   <body>
   <body>

+ 3 - 3
mallApp/src/config.js

@@ -1,4 +1,4 @@
 export const ProjectName = 'mall'
 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'

+ 5 - 5
mallApp/src/ext.json

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

File diff suppressed because it is too large
+ 1 - 1
mallh5/unpackage/dist/build/web/assets/index-BhZ2UAq8.js


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

@@ -1 +1 @@
-import{c as e,w as a,i as o,o as t,a as n}from"./index-L-mm2gf-.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-BhZ2UAq8.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};

File diff suppressed because it is too large
+ 0 - 0
mallh5/unpackage/dist/build/web/assets/pages-pay-index.Cn5dBIea.js


File diff suppressed because it is too large
+ 0 - 0
mallh5/unpackage/dist/build/web/assets/pages-pay-success.Dy69Vwio.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>
 	<script src="/static/web/quill-1.3.7.min.js"></script>
     <!--preload-links-->
     <!--preload-links-->
     <!--app-context-->
     <!--app-context-->
-    <script type="module" crossorigin src="/assets/index-L-mm2gf-.js"></script>
+    <script type="module" crossorigin src="/assets/index-BhZ2UAq8.js"></script>
     <link rel="stylesheet" crossorigin href="/assets/index-Dzn8UyOo.css">
     <link rel="stylesheet" crossorigin href="/assets/index-Dzn8UyOo.css">
   </head>
   </head>
   <body>
   <body>

+ 2 - 2
pt/vue.config.js

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

Some files were not shown because too many files changed in this diff