线上

ghsApp/dist/build/mp-weixin/admin/home/apply.wxml

@@ -1 +1 @@
-<view class="app-content data-v-2e922bb8"><view class="apply-content_box data-v-2e922bb8"><block wx:for="{{menuList}}" wx:for-item="item" wx:for-index="__i0__" wx:key="title"><view class="apply-list_box data-v-2e922bb8"><view class="tit data-v-2e922bb8">{{''+item.title+''}}</view><view class="tabs-wrap _div data-v-2e922bb8"><block wx:for="{{item.list}}" wx:for-item="s" wx:for-index="__i1__" wx:key="url"><view class="tabs-list _div data-v-2e922bb8"><view data-event-opts="{{[['tap',[['pageTo',['$0'],[[['menuList','title',item.title],['list','url',s.url]]]]]]]}}" bindtap="__e" class="_div data-v-2e922bb8"><view class="tabs-img _div data-v-2e922bb8"><image src="{{s.img}}" alt="{{true}}" mode="widthFix" class="_img data-v-2e922bb8"></image></view><view class="tabs-name _div data-v-2e922bb8">{{s.name}}</view></view></view></block></view></view></block></view></view>
+<view class="app-content data-v-670d8948"><view class="apply-content_box data-v-670d8948"><block wx:for="{{menuList}}" wx:for-item="item" wx:for-index="__i0__" wx:key="title"><view class="apply-list_box data-v-670d8948"><view class="tit data-v-670d8948">{{''+item.title+''}}</view><view class="tabs-wrap _div data-v-670d8948"><block wx:for="{{item.list}}" wx:for-item="s" wx:for-index="__i1__" wx:key="url"><view class="tabs-list _div data-v-670d8948"><view data-event-opts="{{[['tap',[['pageTo',['$0'],[[['menuList','title',item.title],['list','url',s.url]]]]]]]}}" bindtap="__e" class="_div data-v-670d8948"><view class="tabs-img _div data-v-670d8948"><image src="{{s.img}}" alt="{{true}}" mode="widthFix" class="_img data-v-670d8948"></image></view><view class="tabs-name _div data-v-670d8948">{{s.name}}</view></view></view></block></view></view></block></view></view>

ghsApp/dist/build/mp-weixin/admin/home/apply.wxss

@@ -1 +1 @@
-.apply-content_box.data-v-2e922bb8{padding-top:1rpx;padding-bottom:60rpx}.apply-content_box .apply-list_box.data-v-2e922bb8{margin-top:20rpx;padding:40rpx 30rpx;background-color:#fff}.apply-content_box .apply-list_box > .tit.data-v-2e922bb8{color:#333;font-size:32rpx;font-weight:600}.apply-content_box .tabs-wrap.data-v-2e922bb8{padding:40rpx 0rpx;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}.apply-content_box .tabs-wrap .tabs-list.data-v-2e922bb8{width:25%;margin-top:50rpx;text-align:center}.apply-content_box .tabs-wrap .tabs-list .tabs-img.data-v-2e922bb8{width:100rpx;height:100rpx;margin:0 auto}.apply-content_box .tabs-wrap .tabs-list .tabs-img ._img.data-v-2e922bb8{height:100%}.apply-content_box .tabs-wrap .tabs-list .tabs-name.data-v-2e922bb8{color:#666;margin-top:10rpx}.apply-content_box .tabs-wrap .tabs-list.data-v-2e922bb8:nth-child(-n + 4){margin-top:0}
+.apply-content_box.data-v-670d8948{padding-top:1rpx;padding-bottom:60rpx}.apply-content_box .apply-list_box.data-v-670d8948{margin-top:20rpx;padding:40rpx 30rpx;background-color:#fff}.apply-content_box .apply-list_box > .tit.data-v-670d8948{color:#333;font-size:32rpx;font-weight:600}.apply-content_box .tabs-wrap.data-v-670d8948{padding:40rpx 0rpx;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}.apply-content_box .tabs-wrap .tabs-list.data-v-670d8948{width:25%;margin-top:50rpx;text-align:center}.apply-content_box .tabs-wrap .tabs-list .tabs-img.data-v-670d8948{width:100rpx;height:100rpx;margin:0 auto}.apply-content_box .tabs-wrap .tabs-list .tabs-img ._img.data-v-670d8948{height:100%}.apply-content_box .tabs-wrap .tabs-list .tabs-name.data-v-670d8948{color:#666;margin-top:10rpx}.apply-content_box .tabs-wrap .tabs-list.data-v-670d8948:nth-child(-n + 4){margin-top:0}

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

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

ghsApp/dist/build/mp-weixin/admin/home/components/plugin/timeaxis-item.json

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

ghsApp/dist/build/mp-weixin/admin/statistics/kdIncome.json

@@ -0,0 +1,9 @@
+{
+  "navigationBarTitleText": "收入统计",
+  "usingComponents": {
+    "select-list": "/components/plugin/selectList",
+    "app-wrapper-empty": "/components/app-wrapper-empty",
+    "dorpdown-select": "/components/module/shopSelect",
+    "date-select": "/components/module/dateSelect"
+  }
+}

ghsApp/dist/build/mp-weixin/app.json

@@ -194,6 +194,7 @@
       "pages": [
         "profit",
         "productSale",
+        "kdIncome",
         "customSale",
         "incomeStat",
         "cgStat",
@@ -394,6 +395,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"
+  }
 }

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

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

ghsApp/dist/build/mp-weixin/components/app-date-picker.json

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

ghsApp/dist/build/mp-weixin/components/module/app-avatar.json

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

ghsApp/dist/build/mp-weixin/components/module/app-search.json

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

ghsApp/dist/build/mp-weixin/components/module/app-vip.json

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

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

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

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

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

ghsApp/dist/build/mp-weixin/components/plugin/modal.json

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

ghsApp/dist/build/mp-weixin/components/plugin/simple-address.json

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

ghsApp/dist/build/mp-weixin/components/plugin/t-table/t-table.json

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

ghsApp/dist/build/mp-weixin/pagesArrears/detailsItem.json

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

ghsApp/dist/build/mp-weixin/pagesGys/detailsItem.json

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

ghsApp/dist/build/mp-weixin/pagesInvite/inviteItem.json

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

ghsApp/dist/build/mp-weixin/pagesPurchase/orderItem.json

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

ghsApp/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": "wxcf32b3f0684c2433",
-  "projectname": "%E4%BE%9B%E5%BA%94%E5%95%86",
+  "projectname": "供应商",
   "condition": {
     "search": {
+      "current": -1,
       "list": []
     },
     "conversation": {
+      "current": -1,
       "list": []
     },
     "game": {
+      "current": -1,
       "list": []
     },
     "miniprogram": {
+      "current": -1,
       "list": []
     }
   }

ghsApp/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": "*"
-  }]
-}

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

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

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 {