Главная Обзор Помощь
Регистрация Вход
zhh
/
front-end
1
0
Ответвить 0
Файлы Задачи 0 Запросы на слияние 0 Вики
Просмотр исходного кода

Merge branch 'master' of git.huaml.com:zhh/front-end

shizhongqi 1 день назад
Родитель
93f45ee009 bb0f2215e5
Сommit
f47ec708b0
40 измененных файлов с 102 добавлено и 326 удалено
Разделённый вид Показать статистику Diff
  1. 2 2
      ghs/dist/shop/index.html
  2. 0 0
      ghs/dist/shop/js/app.a084fc64.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. 6 3
      ghsPad/src/manifest.json
  8. 2 2
      hd/dist/shop/index.html
  9. 0 0
      hd/dist/shop/js/app.b4700f5d.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.CK36Qeja.js
  20. 0 0
      hdh5/unpackage/dist/build/web/assets/_plugin-vue_export-helper.DzGsaf_H.js
  21. 1 1
      hdh5/unpackage/dist/build/web/assets/admin-cg-alipay.D830B9uw.js
  22. 1 1
      hdh5/unpackage/dist/build/web/assets/admin-clear-alipay.SlYCvlhX.js
  23. 0 0
      hdh5/unpackage/dist/build/web/assets/admin-ghs-balanceChange.DTgG1l5h.js
  24. 0 0
      hdh5/unpackage/dist/build/web/assets/admin-ghs-pay.B1zf-g75.js
  25. 1 1
      hdh5/unpackage/dist/build/web/assets/index-BJhhWmNe.js
  26. 1 1
      hdh5/unpackage/dist/build/web/assets/index.DZHAujCr.js
  27. 1 1
      hdh5/unpackage/dist/build/web/assets/index.kWdIQQAF.js
  28. 0 0
      hdh5/unpackage/dist/build/web/assets/pagesPurchase-gathering.Dkko0no6.js
  29. 1 1
      hdh5/unpackage/dist/build/web/index.html
  30. 3 3
      mallApp/src/config.js
  31. 13 14
      mallApp/src/manifest.json
  32. 11 237
      mallApp/src/static/iconfont/iconfont.css
  33. 1 1
      mallh5/unpackage/dist/build/web/assets/index-BYPdUZs5.js
  34. 1 1
      mallh5/unpackage/dist/build/web/assets/pages-pay-demo.mR5zWgw3.js
  35. 0 0
      mallh5/unpackage/dist/build/web/assets/pages-pay-index.BcI6NZxo.js
  36. 0 0
      mallh5/unpackage/dist/build/web/assets/pages-pay-success.0c7SA6vH.js
  37. 1 1
      mallh5/unpackage/dist/build/web/index.html
  38. 2 2
      pt/dist/web/index.html
  39. 0 0
      pt/dist/web/js/app.c81dca2d.js
  40. 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.hzghd.com/cdn/nprogress/0.2.0/nprogress.min.css" rel="stylesheet"><link href="https://img.hzghd.com/cdn/quill/2.0.0-dev.3/quill.core.min.css" rel="stylesheet"><link href="https://img.hzghd.com/cdn/viewerjs/1.3.7/viewer.min.css" rel="stylesheet"><link href="https://img.hzghd.com/cdn/element-ui/2.13.0/theme-chalk/index.css" rel="stylesheet"><style>html,
 
+<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="referer" content="never"><meta name="renderer" content="webkit"><meta name="viewport" content><link rel="icon" href="/favicon.ico"><link rel="stylesheet" type="text/css" media="print" href="/print-lock.css"><title>销花宝</title><link href="https://img.wixhb.com/cdn/nprogress/0.2.0/nprogress.min.css" rel="stylesheet"><link href="https://img.wixhb.com/cdn/quill/2.0.0-dev.3/quill.core.min.css" rel="stylesheet"><link href="https://img.wixhb.com/cdn/viewerjs/1.3.7/viewer.min.css" rel="stylesheet"><link href="https://img.wixhb.com/cdn/element-ui/2.13.0/theme-chalk/index.css" rel="stylesheet"><style>html,
 
 			body,
 
 			#app {
 
 				height: 100%;
 
@@ -43,4 +43,4 @@
 
 			.once .sub-title {
 
 				color: #ababab;
 
 				font-size: 12px;
 
-			}</style><link href="/css/app.adeb0359.css" rel="preload" as="style"><link href="/css/chunk-libs.ce660555.css" rel="preload" as="style"><link href="/js/app.0319f666.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.adeb0359.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.0319f666.js"></script></body></html>
 
+			}</style><link href="/css/app.adeb0359.css" rel="preload" as="style"><link href="/css/chunk-libs.ce660555.css" rel="preload" as="style"><link href="/js/app.a084fc64.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.adeb0359.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.a084fc64.js"></script></body></html>

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
ghs/dist/shop/js/app.a084fc64.js


+ 3 - 3
ghs/vue.config.js
Просмотреть файл 

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

+ 3 - 3
ghsApp/src/config.js
Просмотреть файл 

@@ -1,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'

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

+ 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 - 3
ghsPad/src/manifest.json
Просмотреть файл 

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

+ 2 - 2
hd/dist/shop/index.html
Просмотреть файл 

@@ -1,4 +1,4 @@
 
-<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="referer" content="never"><meta name="renderer" content="webkit"><meta name="viewport" content><link rel="icon" href="/favicon.ico"><link rel="stylesheet" type="text/css" media="print" href="/print-lock.css"><title>只管花</title><link href="https://img.huaml.com/cdn/nprogress/0.2.0/nprogress.min.css" rel="stylesheet"><link href="https://img.huaml.com/cdn/quill/2.0.0-dev.3/quill.core.min.css" rel="stylesheet"><link href="https://img.huaml.com/cdn/viewerjs/1.3.7/viewer.min.css" rel="stylesheet"><link href="https://img.huaml.com/cdn/element-ui/2.13.0/theme-chalk/index.css" rel="stylesheet"><style>html,
 
+<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="referer" content="never"><meta name="renderer" content="webkit"><meta name="viewport" content><link rel="icon" href="/favicon.ico"><link rel="stylesheet" type="text/css" media="print" href="/print-lock.css"><title>只管花</title><link href="https://img.huahb.cn/cdn/nprogress/0.2.0/nprogress.min.css" rel="stylesheet"><link href="https://img.huahb.cn/cdn/quill/2.0.0-dev.3/quill.core.min.css" rel="stylesheet"><link href="https://img.huahb.cn/cdn/viewerjs/1.3.7/viewer.min.css" rel="stylesheet"><link href="https://img.huahb.cn/cdn/element-ui/2.13.0/theme-chalk/index.css" rel="stylesheet"><style>html,
 
 			body,
 
 			#app {
 
 				height: 100%;
 
@@ -43,4 +43,4 @@
 
 			.once .sub-title {
 
 				color: #ababab;
 
 				font-size: 12px;
 
-			}</style><link href="/css/app.809da915.css" rel="preload" as="style"><link href="/css/chunk-libs.b57e4bfb.css" rel="preload" as="style"><link href="/js/app.51b25e25.js" rel="preload" as="script"><link href="/js/chunk-libs.d15a0dfc.js" rel="preload" as="script"><link href="/css/chunk-libs.b57e4bfb.css" rel="stylesheet"><link href="/css/app.809da915.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.d15a0dfc.js"></script><script src="/js/app.51b25e25.js"></script></body></html>
 
+			}</style><link href="/css/app.809da915.css" rel="preload" as="style"><link href="/css/chunk-libs.b57e4bfb.css" rel="preload" as="style"><link href="/js/app.b4700f5d.js" rel="preload" as="script"><link href="/js/chunk-libs.d15a0dfc.js" rel="preload" as="script"><link href="/css/chunk-libs.b57e4bfb.css" rel="stylesheet"><link href="/css/app.809da915.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.d15a0dfc.js"></script><script src="/js/app.b4700f5d.js"></script></body></html>

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
hd/dist/shop/js/app.b4700f5d.js


+ 2 - 2
hd/vue.config.js
Просмотреть файл 

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

+ 5 - 5
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'

+ 6 - 6
hdApp/src/ext.json
Просмотреть файл 

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

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

+ 6 - 6
hdApp/src/static/iconfont/iconfont.css
Просмотреть файл 

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

+ 3 - 3
hdPad/src/config.js
Просмотреть файл 

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

+ 6 - 6
hdPad/src/ext.json
Просмотреть файл 

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

+ 6 - 6
hdPad/src/static/iconfont/iconfont.css
Просмотреть файл 

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

+ 2 - 2
hdh5/config.js
Просмотреть файл 

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

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
hdh5/unpackage/dist/build/web/assets/_plugin-vue_export-helper.CK36Qeja.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
hdh5/unpackage/dist/build/web/assets/_plugin-vue_export-helper.DzGsaf_H.js


+ 1 - 1
hdh5/unpackage/dist/build/web/assets/admin-cg-alipay.CFuwMSY6.js → hdh5/unpackage/dist/build/web/assets/admin-cg-alipay.D830B9uw.js
Просмотреть файл 

@@ -1 +1 @@
 
-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-DXniIKmk.js";import{c as l}from"./index.CrFZeb0S.js";import{_ as c}from"./_plugin-vue_export-helper.CK36Qeja.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};

+ 1 - 1
hdh5/unpackage/dist/build/web/assets/admin-clear-alipay.B2sjUtXn.js → hdh5/unpackage/dist/build/web/assets/admin-clear-alipay.SlYCvlhX.js
Просмотреть файл 

@@ -1 +1 @@
 
-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-DXniIKmk.js";import{b as l}from"./index.CrFZeb0S.js";import{_ as c}from"./_plugin-vue_export-helper.CK36Qeja.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};

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
hdh5/unpackage/dist/build/web/assets/admin-ghs-balanceChange.DTgG1l5h.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
hdh5/unpackage/dist/build/web/assets/admin-ghs-pay.B1zf-g75.js


Разница между файлами не показана из-за своего большого размера
+ 1 - 1
hdh5/unpackage/dist/build/web/assets/index-BJhhWmNe.js


+ 1 - 1
hdh5/unpackage/dist/build/web/assets/index.C4eSwroU.js → hdh5/unpackage/dist/build/web/assets/index.DZHAujCr.js
Просмотреть файл 

@@ -1 +1 @@
 
-import{h as e}from"./_plugin-vue_export-helper.CK36Qeja.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};

+ 1 - 1
hdh5/unpackage/dist/build/web/assets/index.CrFZeb0S.js → hdh5/unpackage/dist/build/web/assets/index.kWdIQQAF.js
Просмотреть файл 

@@ -1 +1 @@
 
-import{h as a}from"./_plugin-vue_export-helper.CK36Qeja.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};

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
hdh5/unpackage/dist/build/web/assets/pagesPurchase-gathering.Dkko0no6.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-DXniIKmk.js"></script>
 
+    <script type="module" crossorigin src="/assets/index-BJhhWmNe.js"></script>
 
     <link rel="stylesheet" crossorigin href="/assets/index-BvquTqJD.css">
 
   </head>

   <body>

+ 3 - 3
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'

+ 13 - 14
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

+ 11 - 237
mallApp/src/static/iconfont/iconfont.css
Просмотреть файл 

@@ -1,11 +1,11 @@
 
 @font-face {
 
   font-family: 'iconfont';  /* project id 1525256 */
 
- src: url('https://api.shop.theflorist.cn/iconfont/iconfont.eot?t=202608271143'); /* IE9 */
 
- src: url('https://api.shop.theflorist.cn/iconfont/iconfont.eot?t=202608271143#iefix') format('embedded-opentype'), /* IE6-IE8 */
 
-	  url('https://api.shop.theflorist.cn/iconfont/iconfont.woff2?t=202608271143') format('woff2'),
 
-	  url('https://api.shop.theflorist.cn/iconfont/iconfont.woff?t=202608271143') format('woff'),
 
-	  url('https://api.shop.theflorist.cn/iconfont/iconfont.ttf?t=202608271143') format('truetype'),
 
-	  url('https://api.shop.theflorist.cn/iconfont/iconfont.svg?t=202608271143#iconfont') format('svg');
 
+  src: url('https://api.shop.zhiguanhua.cn/iconfont/font_1525256_6243f1wxe9f.eot');
 
+  src: url('https://api.shop.zhiguanhua.cn/iconfont/font_1525256_6243f1wxe9f.eot?#iefix') format('embedded-opentype'),
 
+  url('https://api.shop.zhiguanhua.cn/iconfont/font_1525256_6bxwphhntqh.woff2') format('woff2'),
 
+  url('https://api.shop.zhiguanhua.cn/iconfont/font_1525256_6243f1wxe9f.woff') format('woff'),
 
+  url('https://api.shop.zhiguanhua.cn/iconfont/font_1525256_6243f1wxe9f.ttf') format('truetype'),
 
+  url('https://api.shop.zhiguanhua.cn/iconfont/font_1525256_6243f1wxe9f.svg#iconfont') format('svg');
 
 }
 
 
 .iconfont {
 
@@ -15,110 +15,14 @@
 
   -webkit-font-smoothing: antialiased;
 
   -moz-osx-font-smoothing: grayscale;
 
 }
 
-.icondaishouhuo:before {
 
-  content: "\e608";
 
-}
 
-
 
-.iconshouhou:before {
 
-  content: "\e70b";
 
-}
 
-
 
-.icondaipeisong:before {
 
-  content: "\e67c";
 
-}
 
-
 
-.icondaifukuan:before {
 
-  content: "\e704";
 
-}
 
-
 
-.iconshouhuodizhi:before {
 
-  content: "\e681";
 
-}
 
-
 
-.iconhongbao:before {
 
-  content: "\e784";
 
-}
 
-
 
-.icontuichu:before {
 
-  content: "\e60d";
 
-}
 
-
 
-.iconorder_fill:before {
 
-  content: "\e714";
 
-}
 
-
 
-.iconorder:before {
 
-  content: "\e713";
 
-}
 
-
 
-.iconcart:before {
 
-  content: "\e6af";
 
-}
 
-
 
-.iconhome1:before {
 
-  content: "\e6b8";
 
-}
 
-
 
-.iconhomefill:before {
 
-  content: "\e6bb";
 
-}
 
-
 
-.iconmessage:before {
 
-  content: "\e6bc";
 
-}
 
-
 
-.iconmessagefill:before {
 
-  content: "\e779";
 
-}
 
-
 
-.iconmy:before {
 
-  content: "\e78b";
 
-}
 
-
 
-.iconmyfill:before {
 
-  content: "\e78c";
 
-}
 
 
-.iconcart_fill_light:before {
 
-  content: "\e7e7";
 
-}
 
-
 
-.iconevaluate:before {
 
-  content: "\e672";
 
-}
 
-
 
-.iconevaluate_fill:before {
 
-  content: "\e7f0";
 
-}
 
-
 
-.iconyuechaxun:before {
 
-  content: "\e66e";
 
-}
 
-
 
-.iconfenhong:before {
 
-  content: "\e612";
 
-}
 
-
 
-.iconkefu1:before {
 
-  content: "\e646";
 
-}
 
-
 
-.iconhuiyuanquanyi1:before {
 
-  content: "\e60e";
 
-}
 
-
 
-.iconcachu:before {
 
-  content: "\e7e6";
 
-}
 
-
 
-.iconjihuo:before {
 
-  content: "\e601";
 
+.iconjiantouxia:before {
 
+  content: "\e61a";
 
 }
 
 
 .iconmingxi1:before {
 
   content: "\e7e5";
 
 }
 
-
 
 .iconjian:before {
 
   content: "\e7e3";
 
 }
 
@@ -127,138 +31,6 @@
 
   content: "\e7e4";
 
 }
 
 
-.iconqiehuan1:before {
 
-  content: "\e7e2";
 
-}
 
-
 
-.iconqishouyinying:before {
 
-  content: "\e7e1";
 
-}
 
-
 
-.iconxiayi:before {
 
-  content: "\e7de";
 
-}
 
-
 
-.iconshangyi:before {
 
-  content: "\e7e0";
 
-}
 
-
 
-.iconyiruku:before {
 
-  content: "\e7df";
 
-}
 
-
 
-.iconyikaidian:before {
 
-  content: "\e7d7";
 
-}
 
-
 
-.icondianhua1:before {
 
-  content: "\e7d9";
 
-}
 
-
 
-.iconshoukuanma1:before {
 
-  content: "\e7d8";
 
-}
 
-
 
-.icondaichuku:before {
 
-  content: "\e7da";
 
-}
 
-
 
-.iconyichuku:before {
 
-  content: "\e7db";
 
-}
 
-
 
-.iconyiquxiao:before {
 
-  content: "\e7dc";
 
-}
 
-
 
-.icondairuku:before {
 
-  content: "\e7dd";
 
-}
 
-
 
-.iconshoukuanma:before {
 
-  content: "\e600";
 
-}
 
-
 
-.icongouwuche:before {
 
-  content: "\e7d5";
 
-}
 
-
 
-.iconjianqu:before {
 
-  content: "\e7d3";
 
-}
 
-
 
-.icontianjia:before {
 
-  content: "\e7d4";
 
-}
 
-
 
-.iconsearch1:before {
 
-  content: "\e7d6";
 
-}
 
-
 
-.icondingdanweixuanzhong1:before {
 
-  content: "\e7c9";
 
-}
 
-
 
-.icondianpuweixuanzhong:before {
 
-  content: "\e7ca";
 
-}
 
-
 
-.iconwodeweixuanzhong:before {
 
-  content: "\e7cb";
 
-}
 
-
 
-.iconyingyongweixuanzhong:before {
 
-  content: "\e7cc";
 
-}
 
-
 
-.icondianpuxuanzhong:before {
 
-  content: "\e7cd";
 
-}
 
-
 
-.icondingdanxuanzhong1:before {
 
-  content: "\e7ce";
 
-}
 
-
 
-.iconwodexuanzhong:before {
 
-  content: "\e7cf";
 
-}
 
-
 
-.iconkehuweixuanzhong1:before {
 
-  content: "\e7d0";
 
-}
 
-
 
-.iconyingyongxuanzhong:before {
 
-  content: "\e7d1";
 
-}
 
-
 
-.iconkehuxuanzhong1:before {
 
-  content: "\e7d2";
 
-}
 
-
 
-.iconxiaochengxu2:before {
 
-  content: "\e78d";
 
-}
 
-
 
-.iconmeituan:before {
 
-  content: "\e78e";
 
-}
 
-
 
-.iconzhangshangcaifuyemianshoujiban344:before {
 
-  content: "\e632";
 
-}
 
-
 
-.iconwaimai:before {
 
-  content: "\e692";
 
-}
 
-
 
-.iconxiaochengxu1:before {
 
-  content: "\e619";
 
-}
 
-
 
-.iconjiantouxia:before {
 
-  content: "\e61a";
 
-}
 
-
 
 .iconshenheweitongguo:before {
 
   content: "\e774";
 
 }
 
@@ -527,4 +299,6 @@
 
   content: "\e73c";
 
 }
 
 
-
 
+.icongouwuche:before {
 
+  content: "\e7d5";
 
+}

Разница между файлами не показана из-за своего большого размера
+ 1 - 1
mallh5/unpackage/dist/build/web/assets/index-BYPdUZs5.js


+ 1 - 1
mallh5/unpackage/dist/build/web/assets/pages-pay-demo.IWDEe3_7.js → mallh5/unpackage/dist/build/web/assets/pages-pay-demo.mR5zWgw3.js
Просмотреть файл 

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

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
mallh5/unpackage/dist/build/web/assets/pages-pay-index.BcI6NZxo.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
mallh5/unpackage/dist/build/web/assets/pages-pay-success.0c7SA6vH.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-7eWCbUXd.js"></script>
 
+    <script type="module" crossorigin src="/assets/index-BYPdUZs5.js"></script>
 
     <link rel="stylesheet" crossorigin href="/assets/index-Dzn8UyOo.css">
 
   </head>

   <body>

+ 2 - 2
pt/dist/web/index.html
Просмотреть файл 

@@ -1,4 +1,4 @@
 
-<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="referer" content="never"><meta name="renderer" content="webkit"><meta name="viewport" content><link rel="icon" href="/favicon.ico"><link rel="stylesheet" type="text/css" media="print" href="/print-lock.css"><title>花卉宝</title><link href="http://img.hzghd.com/cdn/nprogress/0.2.0/nprogress.min.css" rel="stylesheet"><link href="http://img.hzghd.com/cdn/quill/2.0.0-dev.3/quill.core.min.css" rel="stylesheet"><link href="http://img.hzghd.com/cdn/viewerjs/1.3.7/viewer.min.css" rel="stylesheet"><link href="http://img.hzghd.com/cdn/element-ui/2.13.0/theme-chalk/index.css" rel="stylesheet"><style>html,
 
+<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="referer" content="never"><meta name="renderer" content="webkit"><meta name="viewport" content><link rel="icon" href="/favicon.ico"><link rel="stylesheet" type="text/css" media="print" href="/print-lock.css"><title>花卉宝</title><link href="https://img.wixhb.com/cdn/nprogress/0.2.0/nprogress.min.css" rel="stylesheet"><link href="https://img.wixhb.com/cdn/quill/2.0.0-dev.3/quill.core.min.css" rel="stylesheet"><link href="https://img.wixhb.com/cdn/viewerjs/1.3.7/viewer.min.css" rel="stylesheet"><link href="https://img.wixhb.com/cdn/element-ui/2.13.0/theme-chalk/index.css" rel="stylesheet"><style>html,
 
 			body,
 
 			#app {
 
 				height: 100%;
 
@@ -43,4 +43,4 @@
 
 			.once .sub-title {
 
 				color: #ababab;
 
 				font-size: 12px;
 
-			}</style><link href="/css/app.809da915.css" rel="preload" as="style"><link href="/css/chunk-libs.b57e4bfb.css" rel="preload" as="style"><link href="/js/app.810b6963.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.809da915.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.810b6963.js"></script></body></html>
 
+			}</style><link href="/css/app.809da915.css" rel="preload" as="style"><link href="/css/chunk-libs.b57e4bfb.css" rel="preload" as="style"><link href="/js/app.c81dca2d.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.809da915.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.c81dca2d.js"></script></body></html>

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
pt/dist/web/js/app.c81dca2d.js


+ 2 - 2
pt/vue.config.js
Просмотреть файл 

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

Некоторые файлы не были показаны из-за большого количества измененных файлов