shish 4 лет назад
Родитель
Сommit
d6c55193e0
44 измененных файлов с 92 добавлено и 121 удалено
  1. 2 2
      ghsApp/dist/build/mp-weixin/admin/clear/orderItem.json
  2. 2 2
      ghsApp/dist/build/mp-weixin/admin/home/components/module/operate-line.json
  3. 2 2
      ghsApp/dist/build/mp-weixin/admin/home/components/module/operate.json
  4. 0 0
      ghsApp/dist/build/mp-weixin/admin/item/detail.js
  5. 0 0
      ghsApp/dist/build/mp-weixin/admin/item/detail.wxml
  6. 1 1
      ghsApp/dist/build/mp-weixin/admin/item/detail.wxss
  7. 2 2
      ghsApp/dist/build/mp-weixin/components/app-coupon-sel.json
  8. 2 2
      ghsApp/dist/build/mp-weixin/components/module/app-close.json
  9. 0 0
      ghsApp/dist/build/mp-weixin/components/module/app-commodity.js
  10. 0 0
      ghsApp/dist/build/mp-weixin/components/module/app-commodity.wxml
  11. 0 0
      ghsApp/dist/build/mp-weixin/components/module/app-commodity.wxss
  12. 2 2
      ghsApp/dist/build/mp-weixin/components/module/app-vip.json
  13. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/badge.json
  14. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/bottom-popup.json
  15. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/dropdown-list.json
  16. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/fab.json
  17. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/simple-address.json
  18. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/t-table/t-td.json
  19. 2 2
      ghsApp/dist/build/mp-weixin/pagesPurchase/orderItem.json
  20. 6 6
      ghsApp/src/ext.json
  21. 7 1
      ghsApp/src/manifest.json
  22. 6 6
      ghsApp/src/static/iconfont/iconfont.css
  23. 2 2
      hdApp/dist/build/mp-weixin/admin/clear/orderItem.json
  24. 2 2
      hdApp/dist/build/mp-weixin/admin/home/components/module/operate-line.json
  25. 2 2
      hdApp/dist/build/mp-weixin/admin/order/components/card-name.json
  26. 1 2
      hdApp/dist/build/mp-weixin/app.json
  27. 2 2
      hdApp/dist/build/mp-weixin/components/app-result.json
  28. 0 0
      hdApp/dist/build/mp-weixin/components/module/app-commodity.js
  29. 0 0
      hdApp/dist/build/mp-weixin/components/module/app-commodity.wxml
  30. 0 0
      hdApp/dist/build/mp-weixin/components/module/app-commodity.wxss
  31. 2 2
      hdApp/dist/build/mp-weixin/components/plugin/badge.json
  32. 2 2
      hdApp/dist/build/mp-weixin/components/plugin/modal.json
  33. 2 2
      hdApp/dist/build/mp-weixin/components/plugin/simple-address.json
  34. 2 2
      hdApp/dist/build/mp-weixin/components/plugin/t-table/t-table.json
  35. 2 2
      hdApp/dist/build/mp-weixin/components/plugin/t-table/t-td.json
  36. 2 2
      hdApp/dist/build/mp-weixin/components/plugin/t-table/t-th.json
  37. 2 2
      hdApp/dist/build/mp-weixin/components/plugin/t-table/t-tr.json
  38. 2 2
      hdApp/dist/build/mp-weixin/pagesArrears/detailsItem.json
  39. 2 2
      hdApp/dist/build/mp-weixin/pagesOrder/components/stepShip.json
  40. 6 33
      hdApp/dist/build/mp-weixin/project.config.json
  41. 0 7
      hdApp/dist/build/mp-weixin/sitemap.json
  42. 6 6
      hdApp/src/ext.json
  43. 1 1
      hdApp/src/manifest.json
  44. 6 6
      hdApp/src/static/iconfont/iconfont.css

+ 2 - 2
ghsApp/dist/build/mp-weixin/admin/clear/orderItem.json

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

+ 2 - 2
ghsApp/dist/build/mp-weixin/admin/home/components/module/operate-line.json

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

+ 2 - 2
ghsApp/dist/build/mp-weixin/admin/home/components/module/operate.json

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

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


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


+ 1 - 1
ghsApp/dist/build/mp-weixin/admin/item/detail.wxss

@@ -1 +1 @@
-.app-content.data-v-52616aa9{min-height:calc(100vh - 100rpx);padding-bottom:150rpx}.module-com.data-v-52616aa9{margin-bottom:20rpx;background-color:#fff;color:#666}.module-com .module-tit.data-v-52616aa9{padding:20rpx 30rpx;font-size:28rpx}.module-com .module-det.data-v-52616aa9{padding:0 30rpx}.category-wrap.data-v-52616aa9{-webkit-box-align:start;-webkit-align-items:flex-start;align-items:flex-start;padding-bottom:0!important}.category-wrap .tui-input.data-v-52616aa9{display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:start;-webkit-justify-content:flex-start;justify-content:flex-start;-webkit-flex-wrap:wrap;flex-wrap:wrap}.category-wrap .tui-input .admin-button-com.data-v-52616aa9{margin-right:20rpx;margin-bottom:20rpx;position:relative;z-index:9999}.summary-wrap .goods-summary.data-v-52616aa9{height:400rpx}.app-footer.data-v-52616aa9{-webkit-box-pack:space-evenly;-webkit-justify-content:space-evenly;justify-content:space-evenly;z-index:9999}.app-footer .admin-button-com.data-v-52616aa9{width:46%}
+.app-content.data-v-3387277e{min-height:calc(100vh - 100rpx);padding-bottom:150rpx}.module-com.data-v-3387277e{margin-bottom:20rpx;background-color:#fff;color:#666}.module-com .module-tit.data-v-3387277e{padding:20rpx 30rpx;font-size:28rpx}.module-com .module-det.data-v-3387277e{padding:0 30rpx}.category-wrap.data-v-3387277e{-webkit-box-align:start;-webkit-align-items:flex-start;align-items:flex-start;padding-bottom:0!important}.category-wrap .tui-input.data-v-3387277e{display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:start;-webkit-justify-content:flex-start;justify-content:flex-start;-webkit-flex-wrap:wrap;flex-wrap:wrap}.category-wrap .tui-input .admin-button-com.data-v-3387277e{margin-right:20rpx;margin-bottom:20rpx;position:relative;z-index:9999}.summary-wrap .goods-summary.data-v-3387277e{height:400rpx}.app-footer.data-v-3387277e{-webkit-box-pack:space-evenly;-webkit-justify-content:space-evenly;justify-content:space-evenly;z-index:9999}.app-footer .admin-button-com.data-v-3387277e{width:46%}

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/app-coupon-sel.json

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

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/module/app-close.json

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

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


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


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


+ 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/badge.json

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

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/plugin/bottom-popup.json

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

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/plugin/dropdown-list.json

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

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/plugin/fab.json

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

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/plugin/simple-address.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/pagesPurchase/orderItem.json

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

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

+ 7 - 1
ghsApp/src/manifest.json

@@ -83,15 +83,21 @@
     "quickapp" : {},
     /* 小程序特有相关 线上(销花宝) wxcf32b3f0684c2433 开发(花掌柜) wx21b7c3ef12082099 */
     "mp-weixin" : {
-        "appid" : "wx21b7c3ef12082099",
+        "appid" : "wxcf32b3f0684c2433",
         "setting" : {
             "urlCheck" : false
         },
+		"optimization" : {
+			"subPackages" : true
+		},
         "usingComponents" : true,
         "permission" : {
             "scope.userLocation" : {
                 "desc" : "请点击确定"
             }
+        },
+        "optimization": {  
+            "subPackages": true  
         }
     },
     "mp-alipay" : {

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

+ 2 - 2
hdApp/dist/build/mp-weixin/admin/clear/orderItem.json

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

+ 2 - 2
hdApp/dist/build/mp-weixin/admin/home/components/module/operate-line.json

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

+ 2 - 2
hdApp/dist/build/mp-weixin/admin/order/components/card-name.json

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

+ 1 - 2
hdApp/dist/build/mp-weixin/app.json

@@ -372,6 +372,5 @@
     "t-tr": "/components/plugin/t-table/t-tr",
     "t-th": "/components/plugin/t-table/t-th",
     "t-td": "/components/plugin/t-table/t-td"
-  },
-  "sitemapLocation": "sitemap.json"
+  }
 }

+ 2 - 2
hdApp/dist/build/mp-weixin/components/app-result.json

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

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


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


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


+ 2 - 2
hdApp/dist/build/mp-weixin/components/plugin/badge.json

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

+ 2 - 2
hdApp/dist/build/mp-weixin/components/plugin/modal.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": {}
 }

+ 2 - 2
hdApp/dist/build/mp-weixin/components/plugin/t-table/t-table.json

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

+ 2 - 2
hdApp/dist/build/mp-weixin/components/plugin/t-table/t-td.json

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

+ 2 - 2
hdApp/dist/build/mp-weixin/components/plugin/t-table/t-th.json

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

+ 2 - 2
hdApp/dist/build/mp-weixin/components/plugin/t-table/t-tr.json

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

+ 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/pagesOrder/components/stepShip.json

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

+ 6 - 33
hdApp/dist/build/mp-weixin/project.config.json

@@ -5,54 +5,27 @@
   },
   "setting": {
     "urlCheck": false,
-    "es6": true,
-    "enhance": true,
-    "postcss": true,
-    "preloadBackgroundData": false,
-    "minified": true,
-    "newFeature": false,
-    "coverView": true,
-    "nodeModules": false,
-    "autoAudits": false,
-    "showShadowRootInWxmlPanel": true,
-    "scopeDataCheck": false,
-    "uglifyFileName": false,
-    "checkInvalidKey": true,
-    "checkSiteMap": true,
-    "uploadWithSourceMap": true,
-    "compileHotReLoad": false,
-    "lazyloadPlaceholderEnable": false,
-    "useMultiFrameRuntime": true,
-    "useApiHook": true,
-    "useApiHostProcess": true,
-    "babelSetting": {
-      "ignore": [],
-      "disablePlugins": [],
-      "outputPath": ""
-    },
-    "enableEngineNative": false,
-    "useIsolateContext": true,
-    "userConfirmedBundleSwitch": false,
-    "packNpmManually": false,
-    "packNpmRelationList": [],
-    "minifyWXSS": true,
-    "showES6CompileOption": false
+    "es6": true
   },
   "compileType": "miniprogram",
   "libVersion": "",
   "appid": "wx0d42f5f1dcb3a370",
-  "projectname": "%E9%9B%B6%E5%94%AE",
+  "projectname": "零售",
   "condition": {
     "search": {
+      "current": -1,
       "list": []
     },
     "conversation": {
+      "current": -1,
       "list": []
     },
     "game": {
+      "current": -1,
       "list": []
     },
     "miniprogram": {
+      "current": -1,
       "list": []
     }
   }

+ 0 - 7
hdApp/dist/build/mp-weixin/sitemap.json

@@ -1,7 +0,0 @@
-{
-  "desc": "关于本文件的更多信息,请参考文档 https://developers.weixin.qq.com/miniprogram/dev/framework/sitemap.html",
-  "rules": [{
-  "action": "allow",
-  "page": "*"
-  }]
-}

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

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