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

online

shish 5 лет назад
Родитель
5dcc959432
Сommit
d2d75079ba
72 измененных файлов с 173 добавлено и 179 удалено
Разделённый вид Показать статистику Diff
  1. 2 2
      ghs/dist/shop/index.html
  2. 0 0
      ghs/dist/shop/js/app.19a0da74.js
  3. 4 4
      ghs/vue.config.js
  4. 0 0
      ghsApp/dist/build/mp-weixin/common/main.wxss
  5. 2 2
      ghsApp/dist/build/mp-weixin/components/app-img.json
  6. 2 2
      ghsApp/dist/build/mp-weixin/components/app-uploader.json
  7. 2 2
      ghsApp/dist/build/mp-weixin/components/module/app-footer-cart.json
  8. 2 2
      ghsApp/dist/build/mp-weixin/components/module/app-search.json
  9. 2 2
      ghsApp/dist/build/mp-weixin/components/module/app-vip.json
  10. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/alert.json
  11. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/bottom-popup.json
  12. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/dropdown-list.json
  13. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/t-table/t-td.json
  14. 2 2
      ghsApp/dist/build/mp-weixin/components/w-picker/half-picker.json
  15. 2 2
      ghsApp/dist/build/mp-weixin/components/w-picker/range-picker.json
  16. 2 2
      ghsApp/dist/build/mp-weixin/components/w-picker/region-picker.json
  17. 2 2
      ghsApp/dist/build/mp-weixin/components/w-picker/selector-picker.json
  18. 2 2
      ghsApp/dist/build/mp-weixin/components/w-picker/shortterm-picker.json
  19. 2 2
      ghsApp/dist/build/mp-weixin/components/w-picker/time-picker.json
  20. 6 6
      ghsApp/dist/build/mp-weixin/ext.json
  21. 2 2
      ghsApp/dist/build/mp-weixin/pagesArrears/detailsItem.json
  22. 2 2
      ghsApp/dist/build/mp-weixin/pagesOrder/components/stepShip.json
  23. 2 2
      ghsApp/dist/build/mp-weixin/pagesPurchase/orderItem.json
  24. 1 1
      ghsApp/dist/build/mp-weixin/project.config.json
  25. 6 6
      ghsApp/dist/build/mp-weixin/static/iconfont/iconfont.css
  26. 6 6
      ghsApp/src/ext.json
  27. 6 6
      ghsApp/src/static/iconfont/iconfont.css
  28. 4 4
      hd/vue.config.js
  29. 2 2
      hdApp/dist/build/mp-weixin/admin/home/components/module/operate-line.json
  30. 2 2
      hdApp/dist/build/mp-weixin/admin/home/components/module/operate.json
  31. 2 2
      hdApp/dist/build/mp-weixin/admin/home/components/plugin/time-axis.json
  32. 0 1
      hdApp/dist/build/mp-weixin/admin/shopAdmin/bind.wxss
  33. 0 1
      hdApp/dist/build/mp-weixin/admin/staff/sel-member.wxss
  34. 0 1
      hdApp/dist/build/mp-weixin/admin/statistics/demo.wxss
  35. 0 0
      hdApp/dist/build/mp-weixin/common/main.wxss
  36. 2 2
      hdApp/dist/build/mp-weixin/components/app-uploader.json
  37. 2 2
      hdApp/dist/build/mp-weixin/components/module/allSelectInput.json
  38. 2 2
      hdApp/dist/build/mp-weixin/components/module/app-avatar.json
  39. 2 2
      hdApp/dist/build/mp-weixin/components/module/app-order-list.json
  40. 2 2
      hdApp/dist/build/mp-weixin/components/module/app-share-mask.json
  41. 2 2
      hdApp/dist/build/mp-weixin/components/module/app-vip.json
  42. 2 2
      hdApp/dist/build/mp-weixin/components/none-hd.json
  43. 2 2
      hdApp/dist/build/mp-weixin/components/plugin/alert.json
  44. 2 2
      hdApp/dist/build/mp-weixin/components/plugin/fab.json
  45. 2 2
      hdApp/dist/build/mp-weixin/components/plugin/list-cell.json
  46. 2 2
      hdApp/dist/build/mp-weixin/components/plugin/rate.json
  47. 2 2
      hdApp/dist/build/mp-weixin/components/plugin/simple-address.json
  48. 6 6
      hdApp/dist/build/mp-weixin/ext.json
  49. 2 2
      hdApp/dist/build/mp-weixin/pagesArrears/detailsItem.json
  50. 2 2
      hdApp/dist/build/mp-weixin/pagesInvite/inviteItem.json
  51. 2 2
      hdApp/dist/build/mp-weixin/pagesOrder/components/stepShip.json
  52. 0 1
      hdApp/dist/build/mp-weixin/pagesOrder/print.wxss
  53. 0 1
      hdApp/dist/build/mp-weixin/pagesStore/me/rechargeList.wxss
  54. 0 1
      hdApp/dist/build/mp-weixin/pagesStore/me/withdraw.wxss
  55. 2 2
      hdApp/dist/build/mp-weixin/project.config.json
  56. 6 6
      hdApp/dist/build/mp-weixin/static/iconfont/iconfont.css
  57. 6 6
      hdApp/src/ext.json
  58. 1 1
      hdApp/src/manifest.json
  59. 6 6
      hdApp/src/static/iconfont/iconfont.css
  60. 0 0
      mallApp/dist/build/mp-weixin/common/main.wxss
  61. 2 2
      mallApp/dist/build/mp-weixin/components/app-img.json
  62. 2 2
      mallApp/dist/build/mp-weixin/components/module/app-search.json
  63. 2 2
      mallApp/dist/build/mp-weixin/components/module/app-tag.json
  64. 2 2
      mallApp/dist/build/mp-weixin/components/plugin/list-cell.json
  65. 2 2
      mallApp/dist/build/mp-weixin/components/plugin/modal.json
  66. 5 5
      mallApp/dist/build/mp-weixin/ext.json
  67. 2 2
      mallApp/dist/build/mp-weixin/project.config.json
  68. 6 6
      mallApp/dist/build/mp-weixin/static/iconfont/iconfont.css
  69. 5 5
      mallApp/src/ext.json
  70. 1 1
      mallApp/src/manifest.json
  71. 6 6
      mallApp/src/static/iconfont/iconfont.css
  72. 4 4
      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"><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"><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.6f07e55a.css" rel="preload" as="style"><link href="/css/chunk-libs.2e1e87b5.css" rel="preload" as="style"><link href="/js/app.b0d82cbf.js" rel="preload" as="script"><link href="/js/chunk-libs.1c1e0cb4.js" rel="preload" as="script"><link href="/css/chunk-libs.2e1e87b5.css" rel="stylesheet"><link href="/css/app.6f07e55a.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.1c1e0cb4.js"></script><script src="/js/app.b0d82cbf.js"></script></body></html>
 
+			}</style><link href="/css/app.6f07e55a.css" rel="preload" as="style"><link href="/css/chunk-libs.2e1e87b5.css" rel="preload" as="style"><link href="/js/app.19a0da74.js" rel="preload" as="script"><link href="/js/chunk-libs.1c1e0cb4.js" rel="preload" as="script"><link href="/css/chunk-libs.2e1e87b5.css" rel="stylesheet"><link href="/css/app.6f07e55a.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.1c1e0cb4.js"></script><script src="/js/app.19a0da74.js"></script></body></html>

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


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

@@ -3,7 +3,7 @@ const path = require('path');
 
 const isProduction = process.env.NODE_ENV === 'production';
 
 
 //http和https切换请修改这里，修改后需要重新运行npm run serve shish 2021.4.12
 
-const proxyTarget = 'http://api.shop.hzghd.com';
 
+const proxyTarget = 'https://api.shop.wixhb.com';
 
 
 function resolve(dir) {
 
 	return path.join(__dirname, dir);
 
@@ -14,11 +14,11 @@ function resolve(dir) {
 
  * **/
 
 let hostUrl = ``;
 
 if(process.env.NODE_ENV == 'development'){
 
-	hostUrl = `http://img.hzghd.com/`;
 
+	hostUrl = `https://img.wixhb.com/`;
 
 }else if(process.env.NODE_ENV == 'local'){
 
-	hostUrl = `http://img.hzghd.com/`;
 
+	hostUrl = `https://img.wixhb.com/`;
 
 }else{
 
-	hostUrl = `https://img.hzghd.com/`;
 
+	hostUrl = `https://img.wixhb.com/`;
 
 }
 
 
 const cdn = {

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
ghsApp/dist/build/mp-weixin/common/main.wxss


+ 2 - 2
ghsApp/dist/build/mp-weixin/components/app-img.json
Просмотреть файл 

@@ -1,4 +1,4 @@
 
 {
 
-  "usingComponents": {},
 
-  "component": true
 
+  "component": true,
 
+  "usingComponents": {}
 
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/app-uploader.json
Просмотреть файл 

@@ -1,4 +1,4 @@
 
 {
 
-  "usingComponents": {},
 
-  "component": true
 
+  "component": true,
 
+  "usingComponents": {}
 
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/module/app-footer-cart.json
Просмотреть файл 

@@ -1,4 +1,4 @@
 
 {
 
-  "usingComponents": {},
 
-  "component": true
 
+  "component": true,
 
+  "usingComponents": {}
 
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/module/app-search.json
Просмотреть файл 

@@ -1,4 +1,4 @@
 
 {
 
-  "component": true,
 
-  "usingComponents": {}
 
+  "usingComponents": {},
 
+  "component": true
 
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/module/app-vip.json
Просмотреть файл 

@@ -1,4 +1,4 @@
 
 {
 
-  "usingComponents": {},
 
-  "component": true
 
+  "component": true,
 
+  "usingComponents": {}
 
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/plugin/alert.json
Просмотреть файл 

@@ -1,4 +1,4 @@
 
 {
 
-  "component": true,
 
-  "usingComponents": {}
 
+  "usingComponents": {},
 
+  "component": true
 
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/plugin/bottom-popup.json
Просмотреть файл 

@@ -1,4 +1,4 @@
 
 {
 
-  "usingComponents": {},
 
-  "component": true
 
+  "component": true,
 
+  "usingComponents": {}
 
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/plugin/dropdown-list.json
Просмотреть файл 

@@ -1,4 +1,4 @@
 
 {
 
-  "usingComponents": {},
 
-  "component": true
 
+  "component": true,
 
+  "usingComponents": {}
 
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/plugin/t-table/t-td.json
Просмотреть файл 

@@ -1,4 +1,4 @@
 
 {
 
-  "usingComponents": {},
 
-  "component": true
 
+  "component": true,
 
+  "usingComponents": {}
 
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/w-picker/half-picker.json
Просмотреть файл 

@@ -1,4 +1,4 @@
 
 {
 
-  "usingComponents": {},
 
-  "component": true
 
+  "component": true,
 
+  "usingComponents": {}
 
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/w-picker/range-picker.json
Просмотреть файл 

@@ -1,4 +1,4 @@
 
 {
 
-  "usingComponents": {},
 
-  "component": true
 
+  "component": true,
 
+  "usingComponents": {}
 
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/w-picker/region-picker.json
Просмотреть файл 

@@ -1,4 +1,4 @@
 
 {
 
-  "usingComponents": {},
 
-  "component": true
 
+  "component": true,
 
+  "usingComponents": {}
 
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/w-picker/selector-picker.json
Просмотреть файл 

@@ -1,4 +1,4 @@
 
 {
 
-  "usingComponents": {},
 
-  "component": true
 
+  "component": true,
 
+  "usingComponents": {}
 
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/w-picker/shortterm-picker.json
Просмотреть файл 

@@ -1,4 +1,4 @@
 
 {
 
-  "usingComponents": {},
 
-  "component": true
 
+  "component": true,
 
+  "usingComponents": {}
 
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/w-picker/time-picker.json
Просмотреть файл 

@@ -1,4 +1,4 @@
 
 {
 
-  "usingComponents": {},
 
-  "component": true
 
+  "component": true,
 
+  "usingComponents": {}
 
 }

+ 6 - 6
ghsApp/dist/build/mp-weixin/ext.json
Просмотреть файл 

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

+ 2 - 2
ghsApp/dist/build/mp-weixin/pagesArrears/detailsItem.json
Просмотреть файл 

@@ -1,4 +1,4 @@
 
 {
 
-  "component": true,
 
-  "usingComponents": {}
 
+  "usingComponents": {},
 
+  "component": true
 
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/pagesOrder/components/stepShip.json
Просмотреть файл 

@@ -1,4 +1,4 @@
 
 {
 
-  "usingComponents": {},
 
-  "component": true
 
+  "component": true,
 
+  "usingComponents": {}
 
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/pagesPurchase/orderItem.json
Просмотреть файл 

@@ -1,4 +1,4 @@
 
 {
 
-  "component": true,
 
-  "usingComponents": {}
 
+  "usingComponents": {},
 
+  "component": true
 
 }

+ 1 - 1
ghsApp/dist/build/mp-weixin/project.config.json
Просмотреть файл 

@@ -40,7 +40,7 @@
 
   },
 
   "compileType": "miniprogram",
 
   "libVersion": "",
 
-  "appid": "wxcf32b3f0684c2433",
 
+  "appid": "wx21b7c3ef12082099",
 
   "projectname": "%E4%BE%9B%E5%BA%94%E5%95%86",
 
   "condition": {
 
     "search": {

+ 6 - 6
ghsApp/dist/build/mp-weixin/static/iconfont/iconfont.css
Просмотреть файл 

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

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

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

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

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

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

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

+ 2 - 2
hdApp/dist/build/mp-weixin/admin/home/components/module/operate-line.json
Просмотреть файл 

@@ -1,4 +1,4 @@
 
 {
 
-  "component": true,
 
-  "usingComponents": {}
 
+  "usingComponents": {},
 
+  "component": true
 
 }

+ 2 - 2
hdApp/dist/build/mp-weixin/admin/home/components/module/operate.json
Просмотреть файл 

@@ -1,4 +1,4 @@
 
 {
 
-  "component": true,
 
-  "usingComponents": {}
 
+  "usingComponents": {},
 
+  "component": true
 
 }

+ 2 - 2
hdApp/dist/build/mp-weixin/admin/home/components/plugin/time-axis.json
Просмотреть файл 

@@ -1,4 +1,4 @@
 
 {
 
-  "component": true,
 
-  "usingComponents": {}
 
+  "usingComponents": {},
 
+  "component": true
 
 }

+ 0 - 1
hdApp/dist/build/mp-weixin/admin/shopAdmin/bind.wxss
Просмотреть файл 

@@ -1 +0,0 @@
 
-/* admin/shopAdmin/bind.wxss */

+ 0 - 1
hdApp/dist/build/mp-weixin/admin/staff/sel-member.wxss
Просмотреть файл 

@@ -1 +0,0 @@
 
-/* admin/staff/sel-member.wxss */

+ 0 - 1
hdApp/dist/build/mp-weixin/admin/statistics/demo.wxss
Просмотреть файл 

@@ -1 +0,0 @@
 
-/* admin/statistics/demo.wxss */

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
hdApp/dist/build/mp-weixin/common/main.wxss


+ 2 - 2
hdApp/dist/build/mp-weixin/components/app-uploader.json
Просмотреть файл 

@@ -1,4 +1,4 @@
 
 {
 
-  "component": true,
 
-  "usingComponents": {}
 
+  "usingComponents": {},
 
+  "component": true
 
 }

+ 2 - 2
hdApp/dist/build/mp-weixin/components/module/allSelectInput.json
Просмотреть файл 

@@ -1,4 +1,4 @@
 
 {
 
-  "usingComponents": {},
 
-  "component": true
 
+  "component": true,
 
+  "usingComponents": {}
 
 }

+ 2 - 2
hdApp/dist/build/mp-weixin/components/module/app-avatar.json
Просмотреть файл 

@@ -1,4 +1,4 @@
 
 {
 
-  "usingComponents": {},
 
-  "component": true
 
+  "component": true,
 
+  "usingComponents": {}
 
 }

+ 2 - 2
hdApp/dist/build/mp-weixin/components/module/app-order-list.json
Просмотреть файл 

@@ -1,4 +1,4 @@
 
 {
 
-  "usingComponents": {},
 
-  "component": true
 
+  "component": true,
 
+  "usingComponents": {}
 
 }

+ 2 - 2
hdApp/dist/build/mp-weixin/components/module/app-share-mask.json
Просмотреть файл 

@@ -1,4 +1,4 @@
 
 {
 
-  "usingComponents": {},
 
-  "component": true
 
+  "component": true,
 
+  "usingComponents": {}
 
 }

+ 2 - 2
hdApp/dist/build/mp-weixin/components/module/app-vip.json
Просмотреть файл 

@@ -1,4 +1,4 @@
 
 {
 
-  "component": true,
 
-  "usingComponents": {}
 
+  "usingComponents": {},
 
+  "component": true
 
 }

+ 2 - 2
hdApp/dist/build/mp-weixin/components/none-hd.json
Просмотреть файл 

@@ -1,4 +1,4 @@
 
 {
 
-  "component": true,
 
-  "usingComponents": {}
 
+  "usingComponents": {},
 
+  "component": true
 
 }

+ 2 - 2
hdApp/dist/build/mp-weixin/components/plugin/alert.json
Просмотреть файл 

@@ -1,4 +1,4 @@
 
 {
 
-  "component": true,
 
-  "usingComponents": {}
 
+  "usingComponents": {},
 
+  "component": true
 
 }

+ 2 - 2
hdApp/dist/build/mp-weixin/components/plugin/fab.json
Просмотреть файл 

@@ -1,4 +1,4 @@
 
 {
 
-  "component": true,
 
-  "usingComponents": {}
 
+  "usingComponents": {},
 
+  "component": true
 
 }

+ 2 - 2
hdApp/dist/build/mp-weixin/components/plugin/list-cell.json
Просмотреть файл 

@@ -1,4 +1,4 @@
 
 {
 
-  "usingComponents": {},
 
-  "component": true
 
+  "component": true,
 
+  "usingComponents": {}
 
 }

+ 2 - 2
hdApp/dist/build/mp-weixin/components/plugin/rate.json
Просмотреть файл 

@@ -1,4 +1,4 @@
 
 {
 
-  "usingComponents": {},
 
-  "component": true
 
+  "component": true,
 
+  "usingComponents": {}
 
 }

+ 2 - 2
hdApp/dist/build/mp-weixin/components/plugin/simple-address.json
Просмотреть файл 

@@ -1,4 +1,4 @@
 
 {
 
-  "usingComponents": {},
 
-  "component": true
 
+  "component": true,
 
+  "usingComponents": {}
 
 }

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

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

+ 2 - 2
hdApp/dist/build/mp-weixin/pagesArrears/detailsItem.json
Просмотреть файл 

@@ -1,4 +1,4 @@
 
 {
 
-  "usingComponents": {},
 
-  "component": true
 
+  "component": true,
 
+  "usingComponents": {}
 
 }

+ 2 - 2
hdApp/dist/build/mp-weixin/pagesInvite/inviteItem.json
Просмотреть файл 

@@ -1,4 +1,4 @@
 
 {
 
-  "usingComponents": {},
 
-  "component": true
 
+  "component": true,
 
+  "usingComponents": {}
 
 }

+ 2 - 2
hdApp/dist/build/mp-weixin/pagesOrder/components/stepShip.json
Просмотреть файл 

@@ -1,4 +1,4 @@
 
 {
 
-  "usingComponents": {},
 
-  "component": true
 
+  "component": true,
 
+  "usingComponents": {}
 
 }

+ 0 - 1
hdApp/dist/build/mp-weixin/pagesOrder/print.wxss
Просмотреть файл 

@@ -1 +0,0 @@
 
-/* pagesOrder/print.wxss */

+ 0 - 1
hdApp/dist/build/mp-weixin/pagesStore/me/rechargeList.wxss
Просмотреть файл 

@@ -1 +0,0 @@
 
-/* pagesStore/me/rechargeList.wxss */

+ 0 - 1
hdApp/dist/build/mp-weixin/pagesStore/me/withdraw.wxss
Просмотреть файл 

@@ -1 +0,0 @@
 
-/* pagesStore/me/withdraw.wxss */

+ 2 - 2
hdApp/dist/build/mp-weixin/project.config.json
Просмотреть файл 

@@ -23,7 +23,7 @@
 
     "compileHotReLoad": false,
 
     "useMultiFrameRuntime": true,
 
     "useApiHook": true,
 
-    "useApiHostProcess": true,
 
+    "useApiHostProcess": false,
 
     "babelSetting": {
 
       "ignore": [],
 
       "disablePlugins": [],
 
@@ -40,7 +40,7 @@
 
   },
 
   "compileType": "miniprogram",
 
   "libVersion": "",
 
-  "appid": "wx0d42f5f1dcb3a370",
 
+  "appid": "wxe4675bab299a52f7",
 
   "projectname": "%E9%9B%B6%E5%94%AE",
 
   "condition": {
 
     "search": {

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

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

+ 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":"花惠宝"
 
   }
 
 }

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

@@ -84,7 +84,7 @@
 
     "quickapp" : {},
 
     /* 小程序特有相关 线上（花惠宝） wx0d42f5f1dcb3a370 开发（花美玲） wxe4675bab299a52f7 */
 
     "mp-weixin" : {
 
-        "appid" : "wxe4675bab299a52f7",
 
+        "appid" : "wx0d42f5f1dcb3a370",
 
         "setting" : {
 
             "urlCheck" : false
 
         },

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

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

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
mallApp/dist/build/mp-weixin/common/main.wxss


+ 2 - 2
mallApp/dist/build/mp-weixin/components/app-img.json
Просмотреть файл 

@@ -1,4 +1,4 @@
 
 {
 
-  "usingComponents": {},
 
-  "component": true
 
+  "component": true,
 
+  "usingComponents": {}
 
 }

+ 2 - 2
mallApp/dist/build/mp-weixin/components/module/app-search.json
Просмотреть файл 

@@ -1,4 +1,4 @@
 
 {
 
-  "usingComponents": {},
 
-  "component": true
 
+  "component": true,
 
+  "usingComponents": {}
 
 }

+ 2 - 2
mallApp/dist/build/mp-weixin/components/module/app-tag.json
Просмотреть файл 

@@ -1,4 +1,4 @@
 
 {
 
-  "usingComponents": {},
 
-  "component": true
 
+  "component": true,
 
+  "usingComponents": {}
 
 }

+ 2 - 2
mallApp/dist/build/mp-weixin/components/plugin/list-cell.json
Просмотреть файл 

@@ -1,4 +1,4 @@
 
 {
 
-  "component": true,
 
-  "usingComponents": {}
 
+  "usingComponents": {},
 
+  "component": true
 
 }

+ 2 - 2
mallApp/dist/build/mp-weixin/components/plugin/modal.json
Просмотреть файл 

@@ -1,4 +1,4 @@
 
 {
 
-  "usingComponents": {},
 
-  "component": true
 
+  "component": true,
 
+  "usingComponents": {}
 
 }

+ 5 - 5
mallApp/dist/build/mp-weixin/ext.json
Просмотреть файл 

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

+ 2 - 2
mallApp/dist/build/mp-weixin/project.config.json
Просмотреть файл 

@@ -23,7 +23,7 @@
 
     "compileHotReLoad": false,
 
     "useMultiFrameRuntime": true,
 
     "useApiHook": true,
 
-    "useApiHostProcess": true,
 
+    "useApiHostProcess": false,
 
     "babelSetting": {
 
       "ignore": [],
 
       "disablePlugins": [],
 
@@ -40,7 +40,7 @@
 
   },
 
   "compileType": "miniprogram",
 
   "libVersion": "",
 
-  "appid": "wx99a1dfc4171efb42",
 
+  "appid": "wxe41bd5816affd0ba",
 
   "projectname": "%E5%95%86%E5%9F%8E",
 
   "condition": {
 
     "search": {

+ 6 - 6
mallApp/dist/build/mp-weixin/static/iconfont/iconfont.css
Просмотреть файл 

@@ -1,11 +1,11 @@
 
 @font-face {
 
   font-family: 'iconfont';  /* project id 1525256 */
 
-  src: url('https://img.zhiguanhua.cn/iconfont/font_1525256_6243f1wxe9f.eot');
 
-  src: url('https://img.zhiguanhua.cn/iconfont/font_1525256_6243f1wxe9f.eot?#iefix') format('embedded-opentype'),
 
-  url('https://img.zhiguanhua.cn/iconfont/font_1525256_6243f1wxe9f.woff2') format('woff2'),
 
-  url('https://img.zhiguanhua.cn/iconfont/font_1525256_6243f1wxe9f.woff') format('woff'),
 
-  url('https://img.zhiguanhua.cn/iconfont/font_1525256_6243f1wxe9f.ttf') format('truetype'),
 
-  url('https://img.zhiguanhua.cn/iconfont/font_1525256_6243f1wxe9f.svg#iconfont') format('svg');
 
+  src: url('https://img.theflorist.cn/iconfont/font_1525256_6243f1wxe9f.eot');
 
+  src: url('https://img.theflorist.cn/iconfont/font_1525256_6243f1wxe9f.eot?#iefix') format('embedded-opentype'),
 
+  url('https://img.theflorist.cn/iconfont/font_1525256_6243f1wxe9f.woff2') format('woff2'),
 
+  url('https://img.theflorist.cn/iconfont/font_1525256_6243f1wxe9f.woff') format('woff'),
 
+  url('https://img.theflorist.cn/iconfont/font_1525256_6243f1wxe9f.ttf') format('truetype'),
 
+  url('https://img.theflorist.cn/iconfont/font_1525256_6243f1wxe9f.svg#iconfont') format('svg');
 
 }
 
 
 .iconfont {

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

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

+ 1 - 1
mallApp/src/manifest.json
Просмотреть файл 

@@ -83,7 +83,7 @@
 
     "quickapp" : {},
 
     /* 小程序特有相关 线上（花卉宝） wx99a1dfc4171efb42 开发（中花卉） wxe41bd5816affd0ba */
 
     "mp-weixin" : {
 
-        "appid" : "wxe41bd5816affd0ba",
 
+        "appid" : "wx99a1dfc4171efb42",
 
         "setting" : {
 
             "urlCheck" : false
 
         },

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

@@ -1,11 +1,11 @@
 
 @font-face {
 
   font-family: 'iconfont';  /* project id 1525256 */
 
-  src: url('https://img.theflorist.cn/iconfont/font_1525256_6243f1wxe9f.eot');
 
-  src: url('https://img.theflorist.cn/iconfont/font_1525256_6243f1wxe9f.eot?#iefix') format('embedded-opentype'),
 
-  url('https://img.theflorist.cn/iconfont/font_1525256_6243f1wxe9f.woff2') format('woff2'),
 
-  url('https://img.theflorist.cn/iconfont/font_1525256_6243f1wxe9f.woff') format('woff'),
 
-  url('https://img.theflorist.cn/iconfont/font_1525256_6243f1wxe9f.ttf') format('truetype'),
 
-  url('https://img.theflorist.cn/iconfont/font_1525256_6243f1wxe9f.svg#iconfont') format('svg');
 
+  src: url('https://img.zhiguanhua.cn/iconfont/font_1525256_6243f1wxe9f.eot');
 
+  src: url('https://img.zhiguanhua.cn/iconfont/font_1525256_6243f1wxe9f.eot?#iefix') format('embedded-opentype'),
 
+  url('https://img.zhiguanhua.cn/iconfont/font_1525256_6243f1wxe9f.woff2') format('woff2'),
 
+  url('https://img.zhiguanhua.cn/iconfont/font_1525256_6243f1wxe9f.woff') format('woff'),
 
+  url('https://img.zhiguanhua.cn/iconfont/font_1525256_6243f1wxe9f.ttf') format('truetype'),
 
+  url('https://img.zhiguanhua.cn/iconfont/font_1525256_6243f1wxe9f.svg#iconfont') format('svg');
 
 }
 
 
 .iconfont {

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

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

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