shish 4 jaren geleden
bovenliggende
commit
87643651fd
65 gewijzigde bestanden met toevoegingen van 88 en 125 verwijderingen
  1. 0 0
      ghsApp/dist/build/app-plus/app-service.js
  2. 0 0
      ghsApp/dist/build/app-plus/app-view.js
  3. 0 0
      ghsApp/dist/build/app-plus/manifest.json
  4. 2 2
      ghsApp/dist/build/mp-weixin/admin/clear/orderItem.json
  5. 2 2
      ghsApp/dist/build/mp-weixin/admin/home/components/OrderItem.json
  6. 2 2
      ghsApp/dist/build/mp-weixin/admin/home/components/plugin/timeaxis-item.json
  7. 0 0
      ghsApp/dist/build/mp-weixin/admin/home/login.js
  8. 1 1
      ghsApp/dist/build/mp-weixin/admin/home/login.wxml
  9. 1 1
      ghsApp/dist/build/mp-weixin/admin/home/login.wxss
  10. 0 0
      ghsApp/dist/build/mp-weixin/admin/home/me.js
  11. 0 0
      ghsApp/dist/build/mp-weixin/admin/home/me.wxml
  12. 0 0
      ghsApp/dist/build/mp-weixin/admin/home/me.wxss
  13. 2 2
      ghsApp/dist/build/mp-weixin/admin/item/components/ItemStock.json
  14. 0 0
      ghsApp/dist/build/mp-weixin/admin/statistics/customSale.js
  15. 1 2
      ghsApp/dist/build/mp-weixin/app.json
  16. 2 2
      ghsApp/dist/build/mp-weixin/components/app-coupon-sel.json
  17. 2 2
      ghsApp/dist/build/mp-weixin/components/app-img.json
  18. 2 2
      ghsApp/dist/build/mp-weixin/components/app-wrapper-empty.json
  19. 2 2
      ghsApp/dist/build/mp-weixin/components/module/app-commodity.json
  20. 2 2
      ghsApp/dist/build/mp-weixin/components/module/app-footer-cart.json
  21. 2 2
      ghsApp/dist/build/mp-weixin/components/module/app-search.json
  22. 2 2
      ghsApp/dist/build/mp-weixin/components/module/app-share-mask.json
  23. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/alert.json
  24. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/badge.json
  25. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/selectList.json
  26. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/simple-address.json
  27. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/tabs.json
  28. 2 2
      ghsApp/dist/build/mp-weixin/pagesArrears/detailsItem.json
  29. 2 2
      ghsApp/dist/build/mp-weixin/pagesGys/detailsItem.json
  30. 2 2
      ghsApp/dist/build/mp-weixin/pagesInvite/inviteItem.json
  31. 2 2
      ghsApp/dist/build/mp-weixin/pagesOrder/components/stepStatus.json
  32. 2 2
      ghsApp/dist/build/mp-weixin/pagesPurchase/components/CommodityPurchase.json
  33. 6 35
      ghsApp/dist/build/mp-weixin/project.config.json
  34. 0 7
      ghsApp/dist/build/mp-weixin/sitemap.json
  35. 0 0
      hdApp/dist/build/app-plus/app-service.js
  36. 0 0
      hdApp/dist/build/app-plus/app-view.js
  37. 0 0
      hdApp/dist/build/app-plus/manifest.json
  38. 2 2
      hdApp/dist/build/mp-weixin/admin/coupon/components/selectCouponItem.json
  39. 2 2
      hdApp/dist/build/mp-weixin/admin/home/components/module/operate.json
  40. 2 2
      hdApp/dist/build/mp-weixin/admin/home/components/plugin/timeaxis-item.json
  41. 0 0
      hdApp/dist/build/mp-weixin/admin/home/login.js
  42. 1 1
      hdApp/dist/build/mp-weixin/admin/home/login.wxml
  43. 1 1
      hdApp/dist/build/mp-weixin/admin/home/login.wxss
  44. 0 0
      hdApp/dist/build/mp-weixin/admin/home/me.js
  45. 0 0
      hdApp/dist/build/mp-weixin/admin/home/me.wxml
  46. 0 0
      hdApp/dist/build/mp-weixin/admin/home/me.wxss
  47. 2 2
      hdApp/dist/build/mp-weixin/components/app-date-picker.json
  48. 2 2
      hdApp/dist/build/mp-weixin/components/app-result.json
  49. 2 2
      hdApp/dist/build/mp-weixin/components/module/allSelectInput.json
  50. 2 2
      hdApp/dist/build/mp-weixin/components/module/app-avatar.json
  51. 2 2
      hdApp/dist/build/mp-weixin/components/module/app-share-mask.json
  52. 2 2
      hdApp/dist/build/mp-weixin/components/module/app-vip.json
  53. 2 2
      hdApp/dist/build/mp-weixin/components/not-login.json
  54. 2 2
      hdApp/dist/build/mp-weixin/components/plugin/alert.json
  55. 2 2
      hdApp/dist/build/mp-weixin/components/plugin/modal.json
  56. 2 2
      hdApp/dist/build/mp-weixin/components/plugin/tabs.json
  57. 2 2
      hdApp/dist/build/mp-weixin/pagesOrder/components/stepShip.json
  58. 2 2
      hdApp/dist/build/mp-weixin/pagesPurchase/components/gatheringList.json
  59. 2 2
      hdApp/dist/build/mp-weixin/pagesPurchase/components/wangCg.json
  60. 0 0
      hdApp/dist/build/mp-weixin/pagesPurchase/ghsProduct.js
  61. 0 0
      hdApp/dist/build/mp-weixin/pagesPurchase/ghsProduct.wxml
  62. 0 0
      hdApp/dist/build/mp-weixin/pagesPurchase/ghsProduct.wxss
  63. 1 1
      hdApp/dist/build/mp-weixin/pagesPurchase/particulars.js
  64. 1 1
      hdApp/dist/build/mp-weixin/pagesPurchase/particulars.wxml
  65. 1 1
      hdApp/dist/build/mp-weixin/pagesPurchase/particulars.wxss

File diff suppressed because it is too large
+ 0 - 0
ghsApp/dist/build/app-plus/app-service.js


File diff suppressed because it is too large
+ 0 - 0
ghsApp/dist/build/app-plus/app-view.js


File diff suppressed because it is too large
+ 0 - 0
ghsApp/dist/build/app-plus/manifest.json


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

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

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

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

File diff suppressed because it is too large
+ 0 - 0
ghsApp/dist/build/mp-weixin/admin/home/login.js


+ 1 - 1
ghsApp/dist/build/mp-weixin/admin/home/login.wxml

@@ -1 +1 @@
-<view class="app-main app-content data-v-720fb2c4"><view class="model data-v-720fb2c4"><view class="experFrame data-v-720fb2c4"><view class="data-v-720fb2c4"><view style="text-align:center;margin-bottom:20rpx;" class="data-v-720fb2c4"><image class="logo data-v-720fb2c4" src="{{constant.imgUrl+'/logo3.png'}}" mode="widthFix"></image></view><view style="color:#666666;text-align:center;margin-bottom:50rpx;font-size:35rpx;" class="data-v-720fb2c4">销花宝</view><view class="data-v-720fb2c4"><input class="experInput data-v-720fb2c4" placeholder="手机号" type="number" data-event-opts="{{[['focus',[['e0',['$event']]]],['input',[['__set_model',['','mobile','$event',[]]]]]]}}" value="{{mobile}}" bindfocus="__e" bindinput="__e"/></view><view class="data-v-720fb2c4"><input class="experInput data-v-720fb2c4" placeholder="密码" type="password" data-event-opts="{{[['focus',[['e1',['$event']]]],['input',[['__set_model',['','password','$event',[]]]]]]}}" value="{{password}}" bindfocus="__e" bindinput="__e"/></view><view style="margin-top:50rpx;" class="data-v-720fb2c4"><button data-event-opts="{{[['tap',[['loginFun',['$event']]]]]}}" class="admin-button-com small default buttonText data-v-720fb2c4" bindtap="__e">登陆</button></view><view style="margin-top:35rpx;" class="data-v-720fb2c4"><button class="admin-button-com small buttonText data-v-720fb2c4" style="background-color:#2BA245;border-color:#2BA245;color:white;" open-type="getPhoneNumber" data-event-opts="{{[['getphonenumber',[['wxPhoneLogin',['$event']]]]]}}" bindgetphonenumber="__e">微信手机号一键登录</button></view><view style="margin-top:60rpx;color:#999999;width:88%;font-size:30rpx;" class="data-v-720fb2c4"><text data-event-opts="{{[['tap',[['pageTo',[['o',['url','/pagesClient/official/apply'],['type',2]]]]]]]}}" style="float:right;" bindtap="__e" class="data-v-720fb2c4">注册帐号</text></view></view></view></view></view>
+<view class="app-main app-content data-v-7828c5dc"><view class="model data-v-7828c5dc"><view class="experFrame data-v-7828c5dc"><view class="data-v-7828c5dc"><view style="text-align:center;margin-bottom:20rpx;" class="data-v-7828c5dc"><image class="logo data-v-7828c5dc" src="{{constant.imgUrl+'/logo3.png'}}" mode="widthFix"></image></view><view style="color:#666666;text-align:center;margin-bottom:50rpx;font-size:35rpx;" class="data-v-7828c5dc">销花宝</view><view class="data-v-7828c5dc"><input class="experInput data-v-7828c5dc" placeholder="手机号" type="number" data-event-opts="{{[['focus',[['e0',['$event']]]],['input',[['__set_model',['','mobile','$event',[]]]]]]}}" value="{{mobile}}" bindfocus="__e" bindinput="__e"/></view><view class="data-v-7828c5dc"><input class="experInput data-v-7828c5dc" placeholder="密码" type="password" data-event-opts="{{[['focus',[['e1',['$event']]]],['input',[['__set_model',['','password','$event',[]]]]]]}}" value="{{password}}" bindfocus="__e" bindinput="__e"/></view><view style="margin-top:50rpx;" class="data-v-7828c5dc"><button data-event-opts="{{[['tap',[['loginFun',['$event']]]]]}}" class="admin-button-com small default buttonText data-v-7828c5dc" bindtap="__e">登陆</button></view><view style="margin-top:35rpx;" class="data-v-7828c5dc"><button class="admin-button-com small buttonText data-v-7828c5dc" style="background-color:#2BA245;border-color:#2BA245;color:white;" open-type="getPhoneNumber" data-event-opts="{{[['getphonenumber',[['wxPhoneLogin',['$event']]]]]}}" bindgetphonenumber="__e">微信手机号一键登录</button></view><view style="margin-top:60rpx;color:#999999;width:88%;font-size:30rpx;" class="data-v-7828c5dc"><text data-event-opts="{{[['tap',[['pageTo',[['o',['url','/pagesClient/official/apply'],['type',2]]]]]]]}}" style="float:right;" bindtap="__e" class="data-v-7828c5dc">注册帐号</text></view></view></view></view></view>

+ 1 - 1
ghsApp/dist/build/mp-weixin/admin/home/login.wxss

@@ -1 +1 @@
-.model.data-v-720fb2c4{position:fixed;z-index:9999;top:0;left:0;width:100vw;height:100vh;color:#fff;overflow:hidden;text-align:center}.model > .noData_img.data-v-720fb2c4{width:318rpx;height:318rpx;margin:332rpx auto 0}.model > .no_data_text.data-v-720fb2c4{font-size:32rpx;color:#fff;text-align:center;margin:50rpx 0}.model > .freeApply.data-v-720fb2c4{width:376rpx;height:88rpx;line-height:88rpx;background:-webkit-linear-gradient(left,#3385ff,#33b0ff);background:linear-gradient(90deg,#3385ff,#33b0ff);border-radius:44rpx;margin:0 auto;font-size:32rpx;color:#fff;text-align:center}.model > .experience.data-v-720fb2c4{margin-top:40rpx;color:#fff;font-size:30rpx}.model > .experFrame.data-v-720fb2c4{margin-top:90rpx;height:50rpx}.model > .experFrame .experInput.data-v-720fb2c4{height:80rpx;width:80%;margin-bottom:38rpx;display:inline-block;vertical-align:middle;background-color:#f5f5f5;border:none;border-bottom:1rpx solid #ccc;color:#666;padding-left:20rpx;box-sizing:border-box;text-align:left}.model > .experFrame .buttonText.data-v-720fb2c4{display:inline-block;line-height:92rpx;padding:0 20rpx;vertical-align:middle;font-size:32rpx;width:80%;height:90rpx}.model > .experFrame .logo.data-v-720fb2c4{width:180rpx;margin:0 auto}
+.model.data-v-7828c5dc{position:fixed;z-index:9999;top:0;left:0;width:100vw;height:100vh;color:#fff;overflow:hidden;text-align:center}.model > .noData_img.data-v-7828c5dc{width:318rpx;height:318rpx;margin:332rpx auto 0}.model > .no_data_text.data-v-7828c5dc{font-size:32rpx;color:#fff;text-align:center;margin:50rpx 0}.model > .freeApply.data-v-7828c5dc{width:376rpx;height:88rpx;line-height:88rpx;background:-webkit-linear-gradient(left,#3385ff,#33b0ff);background:linear-gradient(90deg,#3385ff,#33b0ff);border-radius:44rpx;margin:0 auto;font-size:32rpx;color:#fff;text-align:center}.model > .experience.data-v-7828c5dc{margin-top:40rpx;color:#fff;font-size:30rpx}.model > .experFrame.data-v-7828c5dc{margin-top:90rpx;height:50rpx}.model > .experFrame .experInput.data-v-7828c5dc{height:80rpx;width:80%;margin-bottom:38rpx;display:inline-block;vertical-align:middle;background-color:#f5f5f5;border:none;border-bottom:1rpx solid #ccc;color:#666;padding-left:20rpx;box-sizing:border-box;text-align:left}.model > .experFrame .buttonText.data-v-7828c5dc{display:inline-block;line-height:92rpx;padding:0 20rpx;vertical-align:middle;font-size:32rpx;width:80%;height:90rpx}.model > .experFrame .logo.data-v-7828c5dc{width:180rpx;margin:0 auto}

File diff suppressed because it is too large
+ 0 - 0
ghsApp/dist/build/mp-weixin/admin/home/me.js


File diff suppressed because it is too large
+ 0 - 0
ghsApp/dist/build/mp-weixin/admin/home/me.wxml


File diff suppressed because it is too large
+ 0 - 0
ghsApp/dist/build/mp-weixin/admin/home/me.wxss


+ 2 - 2
ghsApp/dist/build/mp-weixin/admin/item/components/ItemStock.json

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

File diff suppressed because it is too large
+ 0 - 0
ghsApp/dist/build/mp-weixin/admin/statistics/customSale.js


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

@@ -421,6 +421,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
ghsApp/dist/build/mp-weixin/components/app-coupon-sel.json

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

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

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

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/app-wrapper-empty.json

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

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

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

+ 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 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/module/app-share-mask.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 @@
 {
-  "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/selectList.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 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

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

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

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

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

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

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

+ 2 - 2
ghsApp/dist/build/mp-weixin/pagesOrder/components/stepStatus.json

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

+ 2 - 2
ghsApp/dist/build/mp-weixin/pagesPurchase/components/CommodityPurchase.json

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

+ 6 - 35
ghsApp/dist/build/mp-weixin/project.config.json

@@ -5,56 +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": ""
-    },
-    "useIsolateContext": false,
-    "userConfirmedBundleSwitch": false,
-    "packNpmManually": false,
-    "packNpmRelationList": [],
-    "minifyWXSS": true,
-    "disableUseStrict": false,
-    "showES6CompileOption": false,
-    "useCompilerPlugins": false,
-    "minifyWXML": true
+    "es6": true
   },
   "compileType": "miniprogram",
   "libVersion": "",
   "appid": "wx21b7c3ef12082099",
-  "projectname": "%E9%94%80%E8%8A%B1%E5%AE%9D",
+  "projectname": "销花宝",
   "condition": {
     "search": {
+      "current": -1,
       "list": []
     },
     "conversation": {
+      "current": -1,
       "list": []
     },
     "game": {
+      "current": -1,
       "list": []
     },
     "miniprogram": {
+      "current": -1,
       "list": []
     }
   }

+ 0 - 7
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": "*"
-  }]
-}

File diff suppressed because it is too large
+ 0 - 0
hdApp/dist/build/app-plus/app-service.js


File diff suppressed because it is too large
+ 0 - 0
hdApp/dist/build/app-plus/app-view.js


File diff suppressed because it is too large
+ 0 - 0
hdApp/dist/build/app-plus/manifest.json


+ 2 - 2
hdApp/dist/build/mp-weixin/admin/coupon/components/selectCouponItem.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 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

+ 2 - 2
hdApp/dist/build/mp-weixin/admin/home/components/plugin/timeaxis-item.json

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

File diff suppressed because it is too large
+ 0 - 0
hdApp/dist/build/mp-weixin/admin/home/login.js


+ 1 - 1
hdApp/dist/build/mp-weixin/admin/home/login.wxml

@@ -1 +1 @@
-<view class="app-main app-content data-v-6c83b836"><view class="model data-v-6c83b836"><view class="experFrame data-v-6c83b836"><view class="data-v-6c83b836"><view style="text-align:center;margin-bottom:20rpx;" class="data-v-6c83b836"><image class="logo data-v-6c83b836" src="{{constant.imgUrl+'/logo4.png'}}" mode="widthFix"></image></view><view style="color:#666666;text-align:center;margin-bottom:50rpx;font-size:35rpx;" class="data-v-6c83b836">花惠宝</view><view class="data-v-6c83b836"><input class="experInput data-v-6c83b836" placeholder="手机号" type="number" data-event-opts="{{[['focus',[['e0',['$event']]]],['input',[['__set_model',['','mobile','$event',[]]]]]]}}" value="{{mobile}}" bindfocus="__e" bindinput="__e"/></view><view class="data-v-6c83b836"><input class="experInput data-v-6c83b836" placeholder="密码" type="password" data-event-opts="{{[['focus',[['e1',['$event']]]],['input',[['__set_model',['','password','$event',[]]]]]]}}" value="{{password}}" bindfocus="__e" bindinput="__e"/></view><view style="margin-top:50rpx;" class="data-v-6c83b836"><button data-event-opts="{{[['tap',[['loginFun',['$event']]]]]}}" class="admin-button-com small default buttonText data-v-6c83b836" bindtap="__e">登陆</button></view><view style="margin-top:35rpx;" class="data-v-6c83b836"><button class="admin-button-com small buttonText data-v-6c83b836" style="background-color:#2BA245;border-color:#2BA245;color:white;" open-type="getPhoneNumber" data-event-opts="{{[['getphonenumber',[['wxPhoneLogin',['$event']]]]]}}" bindgetphonenumber="__e">微信手机号一键登录</button></view><view style="margin-top:60rpx;color:#999999;width:88%;font-size:30rpx;" class="data-v-6c83b836"><text data-event-opts="{{[['tap',[['pageTo',[['o',['url','/pagesClient/official/apply'],['type',2]]]]]]]}}" style="float:right;" bindtap="__e" class="data-v-6c83b836">注册帐号</text></view></view></view></view></view>
+<view class="app-main app-content data-v-00faf9a1"><view class="model data-v-00faf9a1"><view class="experFrame data-v-00faf9a1"><view class="data-v-00faf9a1"><view style="text-align:center;margin-bottom:20rpx;" class="data-v-00faf9a1"><image class="logo data-v-00faf9a1" src="{{constant.imgUrl+'/logo4.png'}}" mode="widthFix"></image></view><view style="color:#666666;text-align:center;margin-bottom:50rpx;font-size:35rpx;" class="data-v-00faf9a1">花惠宝</view><view class="data-v-00faf9a1"><input class="experInput data-v-00faf9a1" placeholder="手机号" type="number" data-event-opts="{{[['focus',[['e0',['$event']]]],['input',[['__set_model',['','mobile','$event',[]]]]]]}}" value="{{mobile}}" bindfocus="__e" bindinput="__e"/></view><view class="data-v-00faf9a1"><input class="experInput data-v-00faf9a1" placeholder="密码" type="password" data-event-opts="{{[['focus',[['e1',['$event']]]],['input',[['__set_model',['','password','$event',[]]]]]]}}" value="{{password}}" bindfocus="__e" bindinput="__e"/></view><view style="margin-top:50rpx;" class="data-v-00faf9a1"><button data-event-opts="{{[['tap',[['loginFun',['$event']]]]]}}" class="admin-button-com small default buttonText data-v-00faf9a1" bindtap="__e">登陆</button></view><view style="margin-top:35rpx;" class="data-v-00faf9a1"><button class="admin-button-com small buttonText data-v-00faf9a1" style="background-color:#2BA245;border-color:#2BA245;color:white;" open-type="getPhoneNumber" data-event-opts="{{[['getphonenumber',[['wxPhoneLogin',['$event']]]]]}}" bindgetphonenumber="__e">微信手机号一键登录</button></view><view style="margin-top:60rpx;color:#999999;width:88%;font-size:30rpx;" class="data-v-00faf9a1"><text data-event-opts="{{[['tap',[['pageTo',[['o',['url','/pagesClient/official/apply'],['type',2]]]]]]]}}" style="float:right;" bindtap="__e" class="data-v-00faf9a1">注册帐号</text></view></view></view></view></view>

+ 1 - 1
hdApp/dist/build/mp-weixin/admin/home/login.wxss

@@ -1 +1 @@
-.model.data-v-6c83b836{position:fixed;z-index:9999;top:0;left:0;width:100vw;height:100vh;color:#fff;overflow:hidden;text-align:center}.model > .noData_img.data-v-6c83b836{width:318rpx;height:318rpx;margin:332rpx auto 0}.model > .no_data_text.data-v-6c83b836{font-size:32rpx;color:#fff;text-align:center;margin:50rpx 0}.model > .freeApply.data-v-6c83b836{width:376rpx;height:88rpx;line-height:88rpx;background:-webkit-linear-gradient(left,#3385ff,#33b0ff);background:linear-gradient(90deg,#3385ff,#33b0ff);border-radius:44rpx;margin:0 auto;font-size:32rpx;color:#fff;text-align:center}.model > .experience.data-v-6c83b836{margin-top:40rpx;color:#fff;font-size:30rpx}.model > .experFrame.data-v-6c83b836{margin-top:90rpx;height:50rpx}.model > .experFrame .experInput.data-v-6c83b836{height:80rpx;width:80%;margin-bottom:38rpx;display:inline-block;vertical-align:middle;background-color:#f5f5f5;border:none;border-bottom:1rpx solid #ccc;color:#666;padding-left:20rpx;box-sizing:border-box;text-align:left}.model > .experFrame .buttonText.data-v-6c83b836{display:inline-block;line-height:92rpx;padding:0 20rpx;vertical-align:middle;font-size:32rpx;width:80%;height:90rpx}.model > .experFrame .logo.data-v-6c83b836{width:180rpx;margin:0 auto}
+.model.data-v-00faf9a1{position:fixed;z-index:9999;top:0;left:0;width:100vw;height:100vh;color:#fff;overflow:hidden;text-align:center}.model > .noData_img.data-v-00faf9a1{width:318rpx;height:318rpx;margin:332rpx auto 0}.model > .no_data_text.data-v-00faf9a1{font-size:32rpx;color:#fff;text-align:center;margin:50rpx 0}.model > .freeApply.data-v-00faf9a1{width:376rpx;height:88rpx;line-height:88rpx;background:-webkit-linear-gradient(left,#3385ff,#33b0ff);background:linear-gradient(90deg,#3385ff,#33b0ff);border-radius:44rpx;margin:0 auto;font-size:32rpx;color:#fff;text-align:center}.model > .experience.data-v-00faf9a1{margin-top:40rpx;color:#fff;font-size:30rpx}.model > .experFrame.data-v-00faf9a1{margin-top:90rpx;height:50rpx}.model > .experFrame .experInput.data-v-00faf9a1{height:80rpx;width:80%;margin-bottom:38rpx;display:inline-block;vertical-align:middle;background-color:#f5f5f5;border:none;border-bottom:1rpx solid #ccc;color:#666;padding-left:20rpx;box-sizing:border-box;text-align:left}.model > .experFrame .buttonText.data-v-00faf9a1{display:inline-block;line-height:92rpx;padding:0 20rpx;vertical-align:middle;font-size:32rpx;width:80%;height:90rpx}.model > .experFrame .logo.data-v-00faf9a1{width:180rpx;margin:0 auto}

File diff suppressed because it is too large
+ 0 - 0
hdApp/dist/build/mp-weixin/admin/home/me.js


File diff suppressed because it is too large
+ 0 - 0
hdApp/dist/build/mp-weixin/admin/home/me.wxml


File diff suppressed because it is too large
+ 0 - 0
hdApp/dist/build/mp-weixin/admin/home/me.wxss


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

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

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

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

+ 2 - 2
hdApp/dist/build/mp-weixin/components/module/allSelectInput.json

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

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

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

+ 2 - 2
hdApp/dist/build/mp-weixin/components/module/app-share-mask.json

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

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

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

+ 2 - 2
hdApp/dist/build/mp-weixin/components/not-login.json

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

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

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

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

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

+ 2 - 2
hdApp/dist/build/mp-weixin/pagesOrder/components/stepShip.json

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

+ 2 - 2
hdApp/dist/build/mp-weixin/pagesPurchase/components/gatheringList.json

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

+ 2 - 2
hdApp/dist/build/mp-weixin/pagesPurchase/components/wangCg.json

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

File diff suppressed because it is too large
+ 0 - 0
hdApp/dist/build/mp-weixin/pagesPurchase/ghsProduct.js


File diff suppressed because it is too large
+ 0 - 0
hdApp/dist/build/mp-weixin/pagesPurchase/ghsProduct.wxml


File diff suppressed because it is too large
+ 0 - 0
hdApp/dist/build/mp-weixin/pagesPurchase/ghsProduct.wxss


+ 1 - 1
hdApp/dist/build/mp-weixin/pagesPurchase/particulars.js

@@ -1 +1 @@
-require('common/vendor.js');(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pagesPurchase/particulars"],{"231b":function(t,n,e){"use strict";e.r(n);var o=e("a93c"),a=e("d5f6");for(var c in a)["default"].indexOf(c)<0&&function(t){e.d(n,t,(function(){return a[t]}))}(c);e("8222");var r,i=e("7702"),u=Object(i["a"])(a["default"],o["b"],o["c"],!1,null,"bd2f774e",null,!1,o["a"],r);n["default"]=u.exports},6045:function(t,n,e){"use strict";(function(t){e("6cdc");o(e("dda7"));var n=o(e("231b"));function o(t){return t&&t.__esModule?t:{default:t}}t(n.default)}).call(this,e("255a")["createPage"])},"75ef":function(t,n,e){"use strict";(function(t){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var e={name:"AppResult",data:function(){return{hasInit:!1,ghsCgScene:"",fromCg:0}},onLoad:function(){this.hasInit=!0;var n=t.getStorageSync("ghsCgScene");n&&(this.ghsCgScene=n);var e=t.getStorageSync("ghsCgOption");e.cg&&(this.fromCg=e.fromCg)},onShow:function(){0==this.hasInit&&this.$store.commit("setLoginInfo",{})},methods:{goBack:function(){t.navigateBack()},goHome:function(){t.removeStorageSync("ghsCgScene"),t.removeStorageSync("ghsCgOption"),this.pageTo({url:"/admin/home/workbench",type:4})},goDetail:function(){t.removeStorageSync("ghsCgScene"),t.removeStorageSync("ghsCgOption"),this.pageTo({url:"/pagesPurchase/purDetails",query:{id:this.option.id,status:2}})}}};n.default=e}).call(this,e("255a")["default"])},8222:function(t,n,e){"use strict";var o=e("c4b6"),a=e.n(o);a.a},a93c:function(t,n,e){"use strict";var o;e.d(n,"b",(function(){return a})),e.d(n,"c",(function(){return c})),e.d(n,"a",(function(){return o}));var a=function(){var t=this,n=t.$createElement;t._self._c},c=[]},c4b6:function(t,n,e){},d5f6:function(t,n,e){"use strict";e.r(n);var o=e("75ef"),a=e.n(o);for(var c in o)["default"].indexOf(c)<0&&function(t){e.d(n,t,(function(){return o[t]}))}(c);n["default"]=a.a}},[["6045","common/runtime","common/vendor"]]]);
+require('common/vendor.js');(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pagesPurchase/particulars"],{"231b":function(t,e,n){"use strict";n.r(e);var o=n("8e77"),a=n("d5f6");for(var r in a)["default"].indexOf(r)<0&&function(t){n.d(e,t,(function(){return a[t]}))}(r);n("c24f");var c,i=n("7702"),u=Object(i["a"])(a["default"],o["b"],o["c"],!1,null,"7c4e9423",null,!1,o["a"],c);e["default"]=u.exports},6045:function(t,e,n){"use strict";(function(t){n("6cdc");o(n("dda7"));var e=o(n("231b"));function o(t){return t&&t.__esModule?t:{default:t}}t(e.default)}).call(this,n("255a")["createPage"])},"75ef":function(t,e,n){"use strict";(function(t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var n={name:"AppResult",data:function(){return{hasInit:!1,ghsCgScene:"",fromCg:0}},onLoad:function(){this.hasInit=!0;var e=t.getStorageSync("ghsCgScene");e&&(this.ghsCgScene=e);var n=t.getStorageSync("ghsCgOption");n.fromCg&&(this.fromCg=n.fromCg)},onShow:function(){0==this.hasInit&&this.$store.commit("setLoginInfo",{})},methods:{goBack:function(){t.navigateBack()},goHome:function(){t.removeStorageSync("ghsCgScene"),t.removeStorageSync("ghsCgOption"),this.pageTo({url:"/admin/home/workbench",type:4})},goDetail:function(){t.removeStorageSync("ghsCgScene"),t.removeStorageSync("ghsCgOption"),this.pageTo({url:"/pagesPurchase/purDetails",query:{id:this.option.id,status:2}})}}};e.default=n}).call(this,n("255a")["default"])},"8e77":function(t,e,n){"use strict";var o;n.d(e,"b",(function(){return a})),n.d(e,"c",(function(){return r})),n.d(e,"a",(function(){return o}));var a=function(){var t=this,e=t.$createElement;t._self._c},r=[]},a4ba:function(t,e,n){},c24f:function(t,e,n){"use strict";var o=n("a4ba"),a=n.n(o);a.a},d5f6:function(t,e,n){"use strict";n.r(e);var o=n("75ef"),a=n.n(o);for(var r in o)["default"].indexOf(r)<0&&function(t){n.d(e,t,(function(){return o[t]}))}(r);e["default"]=a.a}},[["6045","common/runtime","common/vendor"]]]);

+ 1 - 1
hdApp/dist/build/mp-weixin/pagesPurchase/particulars.wxml

@@ -1 +1 @@
-<view class="app-content data-v-bd2f774e"><view class="billing_box_bg data-v-bd2f774e"><view class="top-view data-v-bd2f774e"></view><view class="result-view data-v-bd2f774e"><view class="{{['data-v-bd2f774e','iconfont','iconchenggong']}}"></view><view class="result-title data-v-bd2f774e">支付成功</view><block wx:if="{{ghsCgScene!=''||fromCg==1}}"><view class="data-v-bd2f774e"><view class="data-v-bd2f774e">关闭页面后,微信下拉找到【花惠宝】小程序,如下图点采购可以再次下单</view><view style="margin-bottom:30rpx;margin-top:15rpx;" class="data-v-bd2f774e"><image class="image data-v-bd2f774e" src="{{constant.imgUrl+'/cg/hd_cg_route.png'}}" mode="widthFix"></image></view></view></block><button data-event-opts="{{[['tap',[['goDetail',['$event']]]]]}}" class="admin-button-com blue big data-v-bd2f774e" bindtap="__e">订单详情</button><block wx:if="{{ghsCgScene!=''}}"><button data-event-opts="{{[['tap',[['goHome',['$event']]]]]}}" class="admin-button-com big data-v-bd2f774e" bindtap="__e">返回首页</button></block><block wx:else><button data-event-opts="{{[['tap',[['goBack',['$event']]]]]}}" class="admin-button-com big data-v-bd2f774e" bindtap="__e">返回</button></block></view></view></view>
+<view class="app-content data-v-7c4e9423"><view class="billing_box_bg data-v-7c4e9423"><view class="top-view data-v-7c4e9423"></view><view class="result-view data-v-7c4e9423"><view class="{{['data-v-7c4e9423','iconfont','iconchenggong']}}"></view><view class="result-title data-v-7c4e9423">支付成功</view><block wx:if="{{ghsCgScene!=''||fromCg==1}}"><view class="data-v-7c4e9423"><view class="data-v-7c4e9423">关闭页面后,微信下拉找到【花惠宝】小程序,如下图点采购可以再次下单</view><view style="margin-bottom:30rpx;margin-top:15rpx;" class="data-v-7c4e9423"><image class="image data-v-7c4e9423" src="{{constant.imgUrl+'/cg/hd_cg_route.png'}}" mode="widthFix"></image></view></view></block><button data-event-opts="{{[['tap',[['goDetail',['$event']]]]]}}" class="admin-button-com blue big data-v-7c4e9423" bindtap="__e">订单详情</button><block wx:if="{{ghsCgScene!=''}}"><button data-event-opts="{{[['tap',[['goHome',['$event']]]]]}}" class="admin-button-com big data-v-7c4e9423" bindtap="__e">返回首页</button></block><block wx:else><button data-event-opts="{{[['tap',[['goBack',['$event']]]]]}}" class="admin-button-com big data-v-7c4e9423" bindtap="__e">返回</button></block></view></view></view>

+ 1 - 1
hdApp/dist/build/mp-weixin/pagesPurchase/particulars.wxss

@@ -1 +1 @@
-.billing_box_bg.data-v-bd2f774e{position:relative;padding:60rpx 30rpx;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;flex-direction:column;background-color:#f5f5f5}.billing_box_bg .top-view.data-v-bd2f774e{position:absolute;top:0;left:0;width:100%;height:299rpx;background:#3385ff;border-radius:0rpx 0rpx 83rpx 83rpx}.billing_box_bg .result-view.data-v-bd2f774e{position:relative;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;flex-direction:column;-webkit-box-align:center;-webkit-align-items:center;align-items:center;padding:70rpx;width:100%;background:#fff;border-radius:20rpx;z-index:1}.billing_box_bg .result-view .iconchenggong.data-v-bd2f774e{font-size:170rpx;color:#049e2c}.billing_box_bg .result-view .result-title.data-v-bd2f774e{margin:50rpx 0 70rpx;font-size:32rpx}.billing_box_bg .result-view .close_btn.data-v-bd2f774e{line-height:88rpx;text-align:center;width:550rpx;height:88rpx;border:1rpx solid #ddd;border-radius:8rpx;font-size:32rpx;color:#666}.billing_box_bg .admin-button-com.data-v-bd2f774e{margin-bottom:20rpx;width:100%}
+.billing_box_bg.data-v-7c4e9423{position:relative;padding:60rpx 30rpx;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;flex-direction:column;background-color:#f5f5f5}.billing_box_bg .top-view.data-v-7c4e9423{position:absolute;top:0;left:0;width:100%;height:299rpx;background:#3385ff;border-radius:0rpx 0rpx 83rpx 83rpx}.billing_box_bg .result-view.data-v-7c4e9423{position:relative;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;flex-direction:column;-webkit-box-align:center;-webkit-align-items:center;align-items:center;padding:70rpx;width:100%;background:#fff;border-radius:20rpx;z-index:1}.billing_box_bg .result-view .iconchenggong.data-v-7c4e9423{font-size:170rpx;color:#049e2c}.billing_box_bg .result-view .result-title.data-v-7c4e9423{margin:50rpx 0 70rpx;font-size:32rpx}.billing_box_bg .result-view .close_btn.data-v-7c4e9423{line-height:88rpx;text-align:center;width:550rpx;height:88rpx;border:1rpx solid #ddd;border-radius:8rpx;font-size:32rpx;color:#666}.billing_box_bg .admin-button-com.data-v-7c4e9423{margin-bottom:20rpx;width:100%}

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