shish 5 years ago
parent
commit
3f139f6ed0
80 changed files with 90 additions and 102 deletions
  1. 2 2
      ghsApp/dist/build/mp-weixin/admin/home/components/module/operate.json
  2. 2 2
      ghsApp/dist/build/mp-weixin/admin/home/components/plugin/time-axis.json
  3. 2 2
      ghsApp/dist/build/mp-weixin/admin/home/components/plugin/timeaxis-item.json
  4. 0 0
      ghsApp/dist/build/mp-weixin/admin/home/me.js
  5. 0 0
      ghsApp/dist/build/mp-weixin/admin/home/me.wxml
  6. 0 0
      ghsApp/dist/build/mp-weixin/admin/home/me.wxss
  7. 0 0
      ghsApp/dist/build/mp-weixin/admin/shop/add.js
  8. 0 0
      ghsApp/dist/build/mp-weixin/admin/shop/add.wxml
  9. 1 1
      ghsApp/dist/build/mp-weixin/admin/shop/add.wxss
  10. 0 0
      ghsApp/dist/build/mp-weixin/admin/shop/list.js
  11. 0 0
      ghsApp/dist/build/mp-weixin/admin/shop/list.wxml
  12. 1 1
      ghsApp/dist/build/mp-weixin/admin/shop/list.wxss
  13. 2 2
      ghsApp/dist/build/mp-weixin/components/app-coupon-sel.json
  14. 2 2
      ghsApp/dist/build/mp-weixin/components/app-wrapper-empty.json
  15. 2 2
      ghsApp/dist/build/mp-weixin/components/kd_entrance.json
  16. 2 2
      ghsApp/dist/build/mp-weixin/components/module/allMoreSelectInput.json
  17. 2 2
      ghsApp/dist/build/mp-weixin/components/module/app-avatar.json
  18. 2 2
      ghsApp/dist/build/mp-weixin/components/module/app-tag.json
  19. 2 2
      ghsApp/dist/build/mp-weixin/components/none-hd.json
  20. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/alert.json
  21. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/badge.json
  22. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/dropdown-list.json
  23. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/fab.json
  24. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/selectList.json
  25. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/simple-address.json
  26. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/t-table/t-table.json
  27. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/t-table/t-td.json
  28. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/t-table/t-th.json
  29. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/t-table/t-tr.json
  30. 2 2
      ghsApp/dist/build/mp-weixin/pagesArrears/detailsItem.json
  31. 1 1
      ghsApp/dist/build/mp-weixin/pagesClient/official/warn.js
  32. 1 1
      ghsApp/dist/build/mp-weixin/pagesClient/official/warn.wxml
  33. 1 1
      ghsApp/dist/build/mp-weixin/pagesClient/official/warn.wxss
  34. 2 2
      ghsApp/dist/build/mp-weixin/pagesOrder/components/stepStatus.json
  35. 0 0
      ghsApp/dist/build/mp-weixin/pagesStatistics/business.js
  36. 0 0
      ghsApp/dist/build/mp-weixin/pagesStatistics/business.wxml
  37. 0 0
      ghsApp/dist/build/mp-weixin/pagesStatistics/business.wxss
  38. 0 0
      ghsApp/dist/build/mp-weixin/pagesStore/me/cashSet.js
  39. 0 0
      ghsApp/dist/build/mp-weixin/pagesStore/me/rechargeList.js
  40. 1 1
      ghsApp/dist/build/mp-weixin/pagesStore/me/rechargeList.wxml
  41. 0 0
      ghsApp/dist/build/mp-weixin/pagesStorehouse/allot/addExDetails.js
  42. 0 0
      ghsApp/dist/build/mp-weixin/pagesStorehouse/allot/addExDetails.wxml
  43. 0 0
      ghsApp/dist/build/mp-weixin/pagesStorehouse/allot/addExDetails.wxss
  44. 0 0
      ghsApp/dist/build/mp-weixin/pagesStorehouse/allot/allotEx.js
  45. 1 1
      ghsApp/dist/build/mp-weixin/pagesStorehouse/allot/allotEx.wxml
  46. 1 1
      ghsApp/dist/build/mp-weixin/pagesStorehouse/allot/allotEx.wxss
  47. 0 0
      ghsApp/dist/build/mp-weixin/pagesStorehouse/allot/allotPut.js
  48. 1 1
      ghsApp/dist/build/mp-weixin/pagesStorehouse/allot/allotPut.wxml
  49. 1 1
      ghsApp/dist/build/mp-weixin/pagesStorehouse/allot/allotPut.wxss
  50. 0 0
      ghsApp/dist/build/mp-weixin/pagesStorehouse/allot/putDetails.js
  51. 0 0
      ghsApp/dist/build/mp-weixin/pagesStorehouse/allot/putDetails.wxml
  52. 0 0
      ghsApp/dist/build/mp-weixin/pagesStorehouse/allot/putDetails.wxss
  53. 2 2
      ghsApp/src/admin/home/me.vue
  54. 2 2
      ghsApp/src/admin/shop/list.vue
  55. 0 6
      ghsApp/src/pagesStore/me/rechargeList.vue
  56. 2 2
      hdApp/dist/build/mp-weixin/admin/coupon/components/selectCouponItem.json
  57. 2 2
      hdApp/dist/build/mp-weixin/admin/home/components/plugin/time-axis.json
  58. 0 0
      hdApp/dist/build/mp-weixin/admin/shop/add.js
  59. 0 0
      hdApp/dist/build/mp-weixin/admin/shop/add.wxml
  60. 1 1
      hdApp/dist/build/mp-weixin/admin/shop/add.wxss
  61. 0 0
      hdApp/dist/build/mp-weixin/admin/shop/list.js
  62. 0 0
      hdApp/dist/build/mp-weixin/admin/shop/list.wxml
  63. 1 1
      hdApp/dist/build/mp-weixin/admin/shop/list.wxss
  64. 2 2
      hdApp/dist/build/mp-weixin/components/app-result.json
  65. 2 2
      hdApp/dist/build/mp-weixin/components/module/allSelectInput.json
  66. 2 2
      hdApp/dist/build/mp-weixin/components/module/app-footer-cart.json
  67. 2 2
      hdApp/dist/build/mp-weixin/components/module/app-search.json
  68. 2 2
      hdApp/dist/build/mp-weixin/components/plugin/bottom-popup.json
  69. 2 2
      hdApp/dist/build/mp-weixin/components/plugin/dropdown-list.json
  70. 2 2
      hdApp/dist/build/mp-weixin/components/plugin/modal.json
  71. 2 2
      hdApp/dist/build/mp-weixin/components/plugin/simple-address.json
  72. 1 1
      hdApp/dist/build/mp-weixin/pagesClient/official/warn.js
  73. 1 1
      hdApp/dist/build/mp-weixin/pagesClient/official/warn.wxml
  74. 1 1
      hdApp/dist/build/mp-weixin/pagesClient/official/warn.wxss
  75. 2 2
      hdApp/dist/build/mp-weixin/pagesInvite/inviteItem.json
  76. 2 2
      hdApp/dist/build/mp-weixin/pagesOrder/components/stepShip.json
  77. 0 0
      hdApp/dist/build/mp-weixin/pagesStore/me/rechargeList.js
  78. 1 1
      hdApp/dist/build/mp-weixin/pagesStore/me/rechargeList.wxml
  79. 2 2
      hdApp/src/admin/shop/list.vue
  80. 0 6
      hdApp/src/pagesStore/me/rechargeList.vue

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

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

+ 2 - 2
ghsApp/dist/build/mp-weixin/admin/home/components/plugin/time-axis.json

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

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


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


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


+ 1 - 1
ghsApp/dist/build/mp-weixin/admin/shop/add.wxss

@@ -1 +1 @@
-.app-content.data-v-5e28168d{min-height:calc(100vh - 20rpx);padding-top:20rpx}.prompt-text.data-v-5e28168d{color:#999;padding-left:30rpx;margin-bottom:30rpx}.module-com.data-v-5e28168d{margin-bottom:20rpx}.module-com .member-wrap .member-det.data-v-5e28168d{font-size:24rpx;margin-left:20rpx}.module-com .remark-wrap.data-v-5e28168d{-webkit-box-align:start;-webkit-align-items:flex-start;align-items:flex-start}.module-com .remark-wrap .remark.data-v-5e28168d{height:240rpx}.confirm-btn.data-v-5e28168d{width:calc(100% - 60rpx);margin:60rpx 30rpx 20rpx}.confirm-btn .admin-button-com.data-v-5e28168d{width:100%}
+.app-content.data-v-6696db66{min-height:calc(100vh - 20rpx);padding-top:20rpx}.prompt-text.data-v-6696db66{color:#999;padding-left:30rpx;margin-bottom:30rpx}.module-com.data-v-6696db66{margin-bottom:20rpx}.module-com .member-wrap .member-det.data-v-6696db66{font-size:24rpx;margin-left:20rpx}.module-com .remark-wrap.data-v-6696db66{-webkit-box-align:start;-webkit-align-items:flex-start;align-items:flex-start}.module-com .remark-wrap .remark.data-v-6696db66{height:240rpx}.confirm-btn.data-v-6696db66{width:calc(100% - 60rpx);margin:60rpx 30rpx 20rpx}.confirm-btn .admin-button-com.data-v-6696db66{width:100%}

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


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


+ 1 - 1
ghsApp/dist/build/mp-weixin/admin/shop/list.wxss

@@ -1 +1 @@
-.app-content.data-v-53ead1cc{min-height:calc(100vh - 100rpx);padding-bottom:100rpx}.list-wrap.data-v-53ead1cc{background-color:#fff}.list-wrap .list.data-v-53ead1cc{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;margin:0 30rpx;padding:30rpx 0;border-bottom:2rpx solid #eee}.staff-list .list-det.data-v-53ead1cc{width:calc(100% - 110rpx);color:#999;margin-left:20rpx;display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between}.staff-list .list-det .list-det-left .staff-name.data-v-53ead1cc{color:#333;font-size:30rpx;font-weight:600;margin-right:20rpx}.staff-list .list-det .list-det-left .flex-center.data-v-53ead1cc{margin-top:18rpx}.staff-list .list-det .list-det-left .status-list.data-v-53ead1cc{margin-left:60rpx;color:#3385ff}.staff-list .list-det .list-det-left .status-list.data-v-53ead1cc:first-child{margin-left:0}.staff-list .list-det .list-det-left .status-list .iconfont.data-v-53ead1cc{font-size:24rpx;margin-right:10rpx}.staff-list .list-det .list-det-right.data-v-53ead1cc{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}.staff-list .list-det .list-det-right > ._div.data-v-53ead1cc{margin-left:50rpx}.staff-list .list-det .list-det-right > ._div.data-v-53ead1cc:first-child{margin-left:0}.staff-list .list-det .list-det-right .iconfont.data-v-53ead1cc{font-size:36rpx;color:#999}.app-footer.data-v-53ead1cc{-webkit-box-pack:end;-webkit-justify-content:flex-end;justify-content:flex-end}.app-footer .admin-button-com.data-v-53ead1cc{width:160rpx;margin-right:30rpx}
+.app-content.data-v-13252c15{min-height:calc(100vh - 100rpx);padding-bottom:100rpx}.list-wrap.data-v-13252c15{background-color:#fff}.list-wrap .list.data-v-13252c15{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;margin:0 30rpx;padding:30rpx 0;border-bottom:2rpx solid #eee}.staff-list .list-det.data-v-13252c15{width:calc(100% - 110rpx);color:#999;margin-left:20rpx;display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between}.staff-list .list-det .list-det-left .staff-name.data-v-13252c15{color:#333;font-size:30rpx;font-weight:600;margin-right:20rpx}.staff-list .list-det .list-det-left .flex-center.data-v-13252c15{margin-top:18rpx}.staff-list .list-det .list-det-left .status-list.data-v-13252c15{margin-left:60rpx;color:#3385ff}.staff-list .list-det .list-det-left .status-list.data-v-13252c15:first-child{margin-left:0}.staff-list .list-det .list-det-left .status-list .iconfont.data-v-13252c15{font-size:24rpx;margin-right:10rpx}.staff-list .list-det .list-det-right.data-v-13252c15{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}.staff-list .list-det .list-det-right > ._div.data-v-13252c15{margin-left:50rpx}.staff-list .list-det .list-det-right > ._div.data-v-13252c15:first-child{margin-left:0}.staff-list .list-det .list-det-right .iconfont.data-v-13252c15{font-size:36rpx;color:#999}.app-footer.data-v-13252c15{-webkit-box-pack:end;-webkit-justify-content:flex-end;justify-content:flex-end}.app-footer .admin-button-com.data-v-13252c15{width:160rpx;margin-right:30rpx}

+ 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-wrapper-empty.json

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

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

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

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

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

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

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

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

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

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/none-hd.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/badge.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 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

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

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

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

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

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

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

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

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

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

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/plugin/t-table/t-tr.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 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

+ 1 - 1
ghsApp/dist/build/mp-weixin/pagesClient/official/warn.js

@@ -1 +1 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pagesClient/official/warn"],{7513:function(t,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var a={name:"OfficialWarn",data:function(){return{stepList:[{title:"点击下方打开聊天框"},{title:"点击框内右下方“开启微信提醒”卡片",images:"".concat(this.$constant.imgUrl,"/ghs/official/step3.png")},{title:"接收二维码点击长按,识别公众号关注即可",images:"".concat(this.$constant.imgUrl,"/ghs/official/step2.png")}]}},methods:{handleContact:function(t){console.log("".concat(constant.imgUrl,"/ghs/official/mind.png")),console.log("e.detail.path",t.detail.path),console.log("e.detail.query",t.detail.query)}}};n.default=a},7793:function(t,n,e){"use strict";var a;e.d(n,"b",(function(){return c})),e.d(n,"c",(function(){return i})),e.d(n,"a",(function(){return a}));var c=function(){var t=this,n=t.$createElement;t._self._c},i=[]},"995b":function(t,n,e){"use strict";var a=e("9c37"),c=e.n(a);c.a},"9c37":function(t,n,e){},cfe0:function(t,n,e){"use strict";(function(t){e("6cdc");a(e("4a15"));var n=a(e("f723"));function a(t){return t&&t.__esModule?t:{default:t}}t(n.default)}).call(this,e("f3be")["createPage"])},ed55:function(t,n,e){"use strict";e.r(n);var a=e("7513"),c=e.n(a);for(var i in a)["default"].indexOf(i)<0&&function(t){e.d(n,t,(function(){return a[t]}))}(i);n["default"]=c.a},f723:function(t,n,e){"use strict";e.r(n);var a=e("7793"),c=e("ed55");for(var i in c)["default"].indexOf(i)<0&&function(t){e.d(n,t,(function(){return c[t]}))}(i);e("995b");var o,u=e("0095"),f=Object(u["a"])(c["default"],a["b"],a["c"],!1,null,"d713784a",null,!1,a["a"],o);n["default"]=f.exports}},[["cfe0","common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pagesClient/official/warn"],{2279:function(t,n,e){"use strict";var a=e("e9a9"),c=e.n(a);c.a},"57c7":function(t,n,e){"use strict";var a;e.d(n,"b",(function(){return c})),e.d(n,"c",(function(){return i})),e.d(n,"a",(function(){return a}));var c=function(){var t=this,n=t.$createElement;t._self._c},i=[]},7513:function(t,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var a={name:"OfficialWarn",data:function(){return{stepList:[{title:"点击下方打开聊天框"},{title:"点击框内右下方“开启微信提醒”卡片",images:"".concat(this.$constant.imgUrl,"/ghs/official/step3.png")},{title:"接收二维码点击长按,识别公众号关注即可",images:"".concat(this.$constant.imgUrl,"/ghs/official/step2.png")}]}},methods:{handleContact:function(t){console.log("".concat(constant.imgUrl,"/ghs/official/mind.png")),console.log("e.detail.path",t.detail.path),console.log("e.detail.query",t.detail.query)}}};n.default=a},cfe0:function(t,n,e){"use strict";(function(t){e("6cdc");a(e("4a15"));var n=a(e("f723"));function a(t){return t&&t.__esModule?t:{default:t}}t(n.default)}).call(this,e("f3be")["createPage"])},e9a9:function(t,n,e){},ed55:function(t,n,e){"use strict";e.r(n);var a=e("7513"),c=e.n(a);for(var i in a)["default"].indexOf(i)<0&&function(t){e.d(n,t,(function(){return a[t]}))}(i);n["default"]=c.a},f723:function(t,n,e){"use strict";e.r(n);var a=e("57c7"),c=e("ed55");for(var i in c)["default"].indexOf(i)<0&&function(t){e.d(n,t,(function(){return c[t]}))}(i);e("2279");var o,f=e("0095"),u=Object(f["a"])(c["default"],a["b"],a["c"],!1,null,"f1724c68",null,!1,a["a"],o);n["default"]=u.exports}},[["cfe0","common/runtime","common/vendor"]]]);

+ 1 - 1
ghsApp/dist/build/mp-weixin/pagesClient/official/warn.wxml

@@ -1 +1 @@
-<view class="data-v-d713784a"><view class="warn-tit data-v-d713784a">开启微信提醒</view><view class="step-view_box data-v-d713784a"><block wx:for="{{stepList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="step-li_box data-v-d713784a"><view class="step-head_box data-v-d713784a"><view class="step-icon_num data-v-d713784a">{{''+(index+1)+''}}</view><block wx:if="{{stepList.length-1!==index}}"><view class="step-line data-v-d713784a"></view></block></view><view class="step-main_box data-v-d713784a"><view class="step-tit data-v-d713784a">{{''+item.title+''}}</view><view class="step-content_box data-v-d713784a"><block wx:if="{{index===0}}"><view class="button-box data-v-d713784a"><button class="admin-button-com blue big data-v-d713784a" open-type="contact" show-message-card="true" send-message-title="识别下方二维码,关注公众号" send-message-path="/pagesClient/official/warn" send-message-img="`${constant.imgUrl}/ghs/official/mind.png`" data-event-opts="{{[['bindcontact',[['handleContact',['$event']]]]]}}" bindbindcontact="__e">打开聊天框</button></view></block><block wx:else><image class="step-img data-v-d713784a" src="{{item.images}}" mode="widthFix"></image></block></view></view></view></block></view></view>
+<view class="data-v-f1724c68"><view class="warn-tit data-v-f1724c68">开启微信提醒</view><view class="step-view_box data-v-f1724c68"><block wx:for="{{stepList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="step-li_box data-v-f1724c68"><view class="step-head_box data-v-f1724c68"><view class="step-icon_num data-v-f1724c68">{{''+(index+1)+''}}</view><block wx:if="{{stepList.length-1!==index}}"><view class="step-line data-v-f1724c68"></view></block></view><view class="step-main_box data-v-f1724c68"><view class="step-tit data-v-f1724c68">{{''+item.title+''}}</view><view class="step-content_box data-v-f1724c68"><block wx:if="{{index===0}}"><view class="button-box data-v-f1724c68"><button class="admin-button-com blue big data-v-f1724c68" open-type="contact" show-message-card="{{true}}" send-message-title="识别下方二维码,关注公众号" send-message-path="/pagesClient/official/warn" send-message-img="{{constant.imgUrl+'/ghs/official/mind.png'}}" data-event-opts="{{[['bindcontact',[['handleContact',['$event']]]]]}}" bindbindcontact="__e">打开聊天框</button></view></block><block wx:else><image class="step-img data-v-f1724c68" src="{{item.images}}" mode="widthFix"></image></block></view></view></view></block></view></view>

+ 1 - 1
ghsApp/dist/build/mp-weixin/pagesClient/official/warn.wxss

@@ -1 +1 @@
-.warn-tit.data-v-d713784a{color:#040404;font-size:36rpx;font-weight:600;padding:42rpx 0 0 52rpx}.step-view_box.data-v-d713784a{margin-top:63rpx;padding:0 25rpx 0 40rpx}.step-view_box .step-li_box.data-v-d713784a{display:-webkit-box;display:-webkit-flex;display:flex}.step-view_box .step-li_box > .step-head_box.data-v-d713784a{position:relative}.step-view_box .step-li_box > .step-head_box > .step-icon_num.data-v-d713784a{width:40rpx;height:40rpx;border-radius:50%;background-color:#3385ff;text-align:center;line-height:40rpx;color:#fff;font-size:28rpx;position:relative;z-index:50}.step-view_box .step-li_box > .step-head_box > .step-line.data-v-d713784a{height:100%;width:0rpx;border-left:1rpx dashed #3385ff;position:absolute;left:50%;top:50%;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%);z-index:45}.step-view_box .step-li_box > .step-main_box.data-v-d713784a{-webkit-box-flex:1;-webkit-flex:1;flex:1;padding-left:30rpx}.step-view_box .step-li_box > .step-main_box .step-tit.data-v-d713784a{color:#141f25;font-size:32rpx;font-weight:600}.step-view_box .step-li_box > .step-main_box .step-content_box .button-box.data-v-d713784a{width:100%;padding-right:25rpx}.step-view_box .step-li_box > .step-main_box .step-content_box .button-box .admin-button-com.data-v-d713784a{margin:67rpx 0 85rpx}.step-view_box .step-li_box > .step-main_box .step-content_box .step-img.data-v-d713784a{width:382rpx;height:566rpx;margin:34rpx 0 71rpx}.admin-button-com.data-v-d713784a{width:100%}
+.warn-tit.data-v-f1724c68{color:#040404;font-size:36rpx;font-weight:600;padding:42rpx 0 0 52rpx}.step-view_box.data-v-f1724c68{margin-top:63rpx;padding:0 25rpx 0 40rpx}.step-view_box .step-li_box.data-v-f1724c68{display:-webkit-box;display:-webkit-flex;display:flex}.step-view_box .step-li_box > .step-head_box.data-v-f1724c68{position:relative}.step-view_box .step-li_box > .step-head_box > .step-icon_num.data-v-f1724c68{width:40rpx;height:40rpx;border-radius:50%;background-color:#3385ff;text-align:center;line-height:40rpx;color:#fff;font-size:28rpx;position:relative;z-index:50}.step-view_box .step-li_box > .step-head_box > .step-line.data-v-f1724c68{height:100%;width:0rpx;border-left:1rpx dashed #3385ff;position:absolute;left:50%;top:50%;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%);z-index:45}.step-view_box .step-li_box > .step-main_box.data-v-f1724c68{-webkit-box-flex:1;-webkit-flex:1;flex:1;padding-left:30rpx}.step-view_box .step-li_box > .step-main_box .step-tit.data-v-f1724c68{color:#141f25;font-size:32rpx;font-weight:600}.step-view_box .step-li_box > .step-main_box .step-content_box .button-box.data-v-f1724c68{width:100%;padding-right:25rpx}.step-view_box .step-li_box > .step-main_box .step-content_box .button-box .admin-button-com.data-v-f1724c68{margin:67rpx 0 85rpx}.step-view_box .step-li_box > .step-main_box .step-content_box .step-img.data-v-f1724c68{width:382rpx;height:566rpx;margin:34rpx 0 71rpx}.admin-button-com.data-v-f1724c68{width:100%}

+ 2 - 2
ghsApp/dist/build/mp-weixin/pagesOrder/components/stepStatus.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/pagesStatistics/business.js


File diff suppressed because it is too large
+ 0 - 0
ghsApp/dist/build/mp-weixin/pagesStatistics/business.wxml


File diff suppressed because it is too large
+ 0 - 0
ghsApp/dist/build/mp-weixin/pagesStatistics/business.wxss


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


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


+ 1 - 1
ghsApp/dist/build/mp-weixin/pagesStore/me/rechargeList.wxml

@@ -1 +1 @@
-<view class="_div data-v-e6c961c2"><block wx:if="{{!$root.g0}}"><block class="data-v-e6c961c2"><t-table vue-id="3b043ee4-1" headerBackgroundColor="#F0F2F6" class="data-v-e6c961c2" bind:__l="__l" vue-slots="{{['default']}}"><t-tr vue-id="{{('3b043ee4-2')+','+('3b043ee4-1')}}" header="{{true}}" class="data-v-e6c961c2" bind:__l="__l" vue-slots="{{['default']}}"><block wx:for="{{columns}}" wx:for-item="item" wx:for-index="index" wx:key="index"><t-th vue-id="{{('3b043ee4-3-'+index)+','+('3b043ee4-2')}}" align="{{item.align}}" class="data-v-e6c961c2" bind:__l="__l" vue-slots="{{['default']}}">{{''+item.name+''}}</t-th></block></t-tr><block wx:for="{{list.data}}" wx:for-item="item" wx:for-index="index" wx:key="index"><t-tr vue-id="{{('3b043ee4-4-'+index)+','+('3b043ee4-1')}}" class="data-v-e6c961c2" bind:__l="__l" vue-slots="{{['default']}}"><block wx:for="{{columns}}" wx:for-item="column" wx:for-index="colIndex" wx:key="colIndex"><t-td vue-id="{{('3b043ee4-5-'+index+'-'+colIndex)+','+('3b043ee4-4-'+index)}}" align="{{column.align}}" color="{{column.color}}" class="data-v-e6c961c2" bind:__l="__l" vue-slots="{{['default']}}"><view class="data-v-e6c961c2">{{''+(item[column.dataIndex]||"")+''}}</view></t-td></block></t-tr></block></t-table></block></block><block wx:else><block class="data-v-e6c961c2"><app-wrapper-empty vue-id="3b043ee4-6" title="暂无记录" is-empty="{{$root.g1}}" class="data-v-e6c961c2" bind:__l="__l"></app-wrapper-empty></block></block><kd-entrance vue-id="3b043ee4-7" class="data-v-e6c961c2" bind:__l="__l"></kd-entrance></view>
+<view class="_div data-v-1305d6c7"><block wx:if="{{!$root.g0}}"><block class="data-v-1305d6c7"><t-table vue-id="3b043ee4-1" headerBackgroundColor="#F0F2F6" class="data-v-1305d6c7" bind:__l="__l" vue-slots="{{['default']}}"><t-tr vue-id="{{('3b043ee4-2')+','+('3b043ee4-1')}}" header="{{true}}" class="data-v-1305d6c7" bind:__l="__l" vue-slots="{{['default']}}"><block wx:for="{{columns}}" wx:for-item="item" wx:for-index="index" wx:key="index"><t-th vue-id="{{('3b043ee4-3-'+index)+','+('3b043ee4-2')}}" align="{{item.align}}" class="data-v-1305d6c7" bind:__l="__l" vue-slots="{{['default']}}">{{''+item.name+''}}</t-th></block></t-tr><block wx:for="{{list.data}}" wx:for-item="item" wx:for-index="index" wx:key="index"><t-tr vue-id="{{('3b043ee4-4-'+index)+','+('3b043ee4-1')}}" class="data-v-1305d6c7" bind:__l="__l" vue-slots="{{['default']}}"><block wx:for="{{columns}}" wx:for-item="column" wx:for-index="colIndex" wx:key="colIndex"><t-td vue-id="{{('3b043ee4-5-'+index+'-'+colIndex)+','+('3b043ee4-4-'+index)}}" align="{{column.align}}" color="{{column.color}}" class="data-v-1305d6c7" bind:__l="__l" vue-slots="{{['default']}}"><view class="data-v-1305d6c7">{{''+(item[column.dataIndex]||"")+''}}</view></t-td></block></t-tr></block></t-table></block></block><block wx:else><block class="data-v-1305d6c7"><app-wrapper-empty vue-id="3b043ee4-6" title="暂无记录" is-empty="{{$root.g1}}" class="data-v-1305d6c7" bind:__l="__l"></app-wrapper-empty></block></block><kd-entrance vue-id="3b043ee4-7" class="data-v-1305d6c7" bind:__l="__l"></kd-entrance></view>

File diff suppressed because it is too large
+ 0 - 0
ghsApp/dist/build/mp-weixin/pagesStorehouse/allot/addExDetails.js


File diff suppressed because it is too large
+ 0 - 0
ghsApp/dist/build/mp-weixin/pagesStorehouse/allot/addExDetails.wxml


File diff suppressed because it is too large
+ 0 - 0
ghsApp/dist/build/mp-weixin/pagesStorehouse/allot/addExDetails.wxss


File diff suppressed because it is too large
+ 0 - 0
ghsApp/dist/build/mp-weixin/pagesStorehouse/allot/allotEx.js


+ 1 - 1
ghsApp/dist/build/mp-weixin/pagesStorehouse/allot/allotEx.wxml

@@ -1 +1 @@
-<view class="allot-ex-page data-v-8f476e9c"><view class="tabs data-v-8f476e9c"><tabs vue-id="7621ee40-1" tabs="{{tabs}}" currentTab="{{tabIndex}}" addText="新增" isAdd="{{false}}" data-event-opts="{{[['^change',[['changeTabEvent']]],['^add',[['addEvent']]]]}}" bind:change="__e" bind:add="__e" class="data-v-8f476e9c" bind:__l="__l"></tabs></view><scroll-view class="allot-list data-v-8f476e9c" scroll-y="{{true}}"><block wx:if="{{!$root.g0}}"><block class="data-v-8f476e9c"><block wx:for="{{list.data}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['gotoDetails',['$0'],[[['list.data','',index]]]]]]]}}" class="allot-item data-v-8f476e9c" bindtap="__e"><view class="info data-v-8f476e9c"><view class="info-order data-v-8f476e9c">{{item.orderSn}}</view><view class="info-name data-v-8f476e9c">{{"门店:"+item.adminName}}</view><view class="info-name data-v-8f476e9c">{{"数量:"+(item.bigNum||"-")+"/"+(item.smallNum||"-")}}</view><view class="info-name data-v-8f476e9c">{{"时间:"+item.updateTime}}</view></view><view class="{{['data-v-8f476e9c','status',item.status==OUT_STATUS.DONE?'primary':item.status==OUT_STATUS.CONFIRM?'warn':'gray']}}"><view class="{{['data-v-8f476e9c','iconfont',item.status==OUT_STATUS.CANCEL?'iconcaozuojihuo':'icondairuku']}}"></view><view class="{{['data-v-8f476e9c','status-name']}}">{{item.statusName}}</view></view></view></block></block></block><block wx:else><block class="data-v-8f476e9c"><app-wrapper-empty vue-id="7621ee40-2" title="暂无记录" is-empty="{{$root.g1}}" class="data-v-8f476e9c" bind:__l="__l"></app-wrapper-empty></block></block></scroll-view><view class="app-footer open_btn data-v-8f476e9c"><view data-event-opts="{{[['tap',[['addEvent',['$event']]]]]}}" class="admin-button-com middle blue data-v-8f476e9c" bindtap="__e">新增出库</view></view></view>
+<view class="allot-ex-page data-v-3f134512"><view class="tabs data-v-3f134512"><tabs vue-id="7621ee40-1" tabs="{{tabs}}" currentTab="{{tabIndex}}" addText="新增" isAdd="{{false}}" data-event-opts="{{[['^change',[['changeTabEvent']]],['^add',[['addEvent']]]]}}" bind:change="__e" bind:add="__e" class="data-v-3f134512" bind:__l="__l"></tabs></view><scroll-view class="allot-list data-v-3f134512" scroll-y="{{true}}"><block wx:if="{{!$root.g0}}"><block class="data-v-3f134512"><block wx:for="{{list.data}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['gotoDetails',['$0'],[[['list.data','',index]]]]]]]}}" class="allot-item data-v-3f134512" bindtap="__e"><view class="info data-v-3f134512"><view class="info-order data-v-3f134512">{{item.orderSn}}</view><view class="info-name data-v-3f134512">{{"门店:"+item.inShopName}}</view><view class="info-name data-v-3f134512">{{"数量:"+(item.bigNum||"-")+"/"+(item.smallNum||"-")}}</view><view class="info-name data-v-3f134512">{{"时间:"+item.updateTime}}</view></view><view class="{{['data-v-3f134512','status',item.status==OUT_STATUS.DONE?'primary':item.status==OUT_STATUS.CONFIRM?'warn':'gray']}}"><view class="{{['data-v-3f134512','iconfont',item.status==OUT_STATUS.CANCEL?'iconcaozuojihuo':'icondairuku']}}"></view><view class="{{['data-v-3f134512','status-name']}}">{{item.statusName}}</view></view></view></block></block></block><block wx:else><block class="data-v-3f134512"><app-wrapper-empty vue-id="7621ee40-2" title="暂无记录" is-empty="{{$root.g1}}" class="data-v-3f134512" bind:__l="__l"></app-wrapper-empty></block></block></scroll-view><view class="app-footer open_btn data-v-3f134512"><view data-event-opts="{{[['tap',[['addEvent',['$event']]]]]}}" class="admin-button-com middle blue data-v-3f134512" bindtap="__e">新增出库</view></view></view>

+ 1 - 1
ghsApp/dist/build/mp-weixin/pagesStorehouse/allot/allotEx.wxss

@@ -1 +1 @@
-.allot-ex-page.data-v-8f476e9c{height:100%;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:#f9fbfc}.allot-ex-page .allot-list.data-v-8f476e9c{margin-top:20rpx;-webkit-box-flex:1;-webkit-flex:1;flex:1;padding-bottom:150rpx}.allot-ex-page .allot-list .allot-item.data-v-8f476e9c{margin-bottom:1rpx;padding:30rpx;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;box-shadow:0rpx 1rpx 0rpx 0rpx #eee;background-color:#fff}.allot-ex-page .allot-list .allot-item .info.data-v-8f476e9c{-webkit-box-flex:1;-webkit-flex:1;flex:1;margin-right:20rpx}.allot-ex-page .allot-list .allot-item .info .info-order.data-v-8f476e9c{font-size:32rpx;font-weight:600;color:#333}.allot-ex-page .allot-list .allot-item .info .info-name.data-v-8f476e9c{margin:20rpx 0 20rpx;font-size:28rpx;font-weight:400;color:#666}.allot-ex-page .allot-list .allot-item .info .info-time.data-v-8f476e9c{margin-right:30rpx;font-size:28rpx;font-weight:400;color:#666}.allot-ex-page .allot-list .allot-item .status.data-v-8f476e9c{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;-webkit-flex-shrink:0;flex-shrink:0;width:100rpx;color:#ccc}.allot-ex-page .allot-list .allot-item .status .status-name.data-v-8f476e9c{margin-top:10rpx;font-size:24rpx}.allot-ex-page .allot-list .allot-item .status .iconfont.data-v-8f476e9c{font-size:46rpx}.allot-ex-page .allot-list .allot-item .status.primary.data-v-8f476e9c{color:#3385ff}.allot-ex-page .allot-list .allot-item .status.gray.data-v-8f476e9c{color:#ccc}.allot-ex-page .allot-list .allot-item .status.warn.data-v-8f476e9c{color:#ffaf1d}
+.allot-ex-page.data-v-3f134512{height:100%;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:#f9fbfc}.allot-ex-page .allot-list.data-v-3f134512{margin-top:20rpx;-webkit-box-flex:1;-webkit-flex:1;flex:1;padding-bottom:150rpx}.allot-ex-page .allot-list .allot-item.data-v-3f134512{margin-bottom:1rpx;padding:30rpx;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;box-shadow:0rpx 1rpx 0rpx 0rpx #eee;background-color:#fff}.allot-ex-page .allot-list .allot-item .info.data-v-3f134512{-webkit-box-flex:1;-webkit-flex:1;flex:1;margin-right:20rpx}.allot-ex-page .allot-list .allot-item .info .info-order.data-v-3f134512{font-size:32rpx;font-weight:600;color:#333}.allot-ex-page .allot-list .allot-item .info .info-name.data-v-3f134512{margin:20rpx 0 20rpx;font-size:28rpx;font-weight:400;color:#666}.allot-ex-page .allot-list .allot-item .info .info-time.data-v-3f134512{margin-right:30rpx;font-size:28rpx;font-weight:400;color:#666}.allot-ex-page .allot-list .allot-item .status.data-v-3f134512{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;-webkit-flex-shrink:0;flex-shrink:0;width:100rpx;color:#ccc}.allot-ex-page .allot-list .allot-item .status .status-name.data-v-3f134512{margin-top:10rpx;font-size:24rpx}.allot-ex-page .allot-list .allot-item .status .iconfont.data-v-3f134512{font-size:46rpx}.allot-ex-page .allot-list .allot-item .status.primary.data-v-3f134512{color:#3385ff}.allot-ex-page .allot-list .allot-item .status.gray.data-v-3f134512{color:#ccc}.allot-ex-page .allot-list .allot-item .status.warn.data-v-3f134512{color:#ffaf1d}

File diff suppressed because it is too large
+ 0 - 0
ghsApp/dist/build/mp-weixin/pagesStorehouse/allot/allotPut.js


+ 1 - 1
ghsApp/dist/build/mp-weixin/pagesStorehouse/allot/allotPut.wxml

@@ -1 +1 @@
-<view class="allot-ex-page data-v-e7a14c62"><view class="tabs data-v-e7a14c62"><tabs vue-id="245a8c1a-1" tabs="{{tabs}}" currentTab="{{tabIndex}}" data-event-opts="{{[['^change',[['changeTabEvent']]],['^add',[['addEvent']]]]}}" bind:change="__e" bind:add="__e" class="data-v-e7a14c62" bind:__l="__l"></tabs></view><scroll-view class="allot-list data-v-e7a14c62" scroll-y="{{true}}"><block wx:if="{{!$root.g0}}"><block class="data-v-e7a14c62"><block wx:for="{{list.data}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['gotoDetails',['$0'],[[['list.data','',index]]]]]]]}}" class="allot-item data-v-e7a14c62" bindtap="__e"><view class="info data-v-e7a14c62"><view class="info-order data-v-e7a14c62">{{item.orderSn}}</view><view class="info-name data-v-e7a14c62">{{"门店:"+item.adminName}}</view><view class="info-name data-v-e7a14c62">{{"数量:"+item.bigNum+"/"+item.smallNum}}</view><view class="info-name data-v-e7a14c62">{{"时间:"+item.updateTime}}</view></view><view class="{{['data-v-e7a14c62','status',item.status==PUT_STATUS.DONE?'primary':item.status==PUT_STATUS.CONFIRM?'warn':'gray']}}"><view class="{{['data-v-e7a14c62','iconfont',item.status==PUT_STATUS.CANCEL?'iconcaozuojihuo':'icondairuku']}}"></view><view class="{{['data-v-e7a14c62','status-name']}}">{{item.statusName}}</view></view></view></block></block></block><block wx:else><block class="data-v-e7a14c62"><app-wrapper-empty vue-id="245a8c1a-2" title="暂无数据" is-empty="{{$root.g1}}" class="data-v-e7a14c62" bind:__l="__l"></app-wrapper-empty></block></block></scroll-view><kd-entrance vue-id="245a8c1a-3" class="data-v-e7a14c62" bind:__l="__l"></kd-entrance></view>
+<view class="allot-ex-page data-v-e5f37172"><view class="tabs data-v-e5f37172"><tabs vue-id="245a8c1a-1" tabs="{{tabs}}" currentTab="{{tabIndex}}" data-event-opts="{{[['^change',[['changeTabEvent']]],['^add',[['addEvent']]]]}}" bind:change="__e" bind:add="__e" class="data-v-e5f37172" bind:__l="__l"></tabs></view><scroll-view class="allot-list data-v-e5f37172" scroll-y="{{true}}"><block wx:if="{{!$root.g0}}"><block class="data-v-e5f37172"><block wx:for="{{list.data}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['gotoDetails',['$0'],[[['list.data','',index]]]]]]]}}" class="allot-item data-v-e5f37172" bindtap="__e"><view class="info data-v-e5f37172"><view class="info-order data-v-e5f37172">{{item.orderSn}}</view><view class="info-name data-v-e5f37172">{{"门店:"+item.outShopName}}</view><view class="info-name data-v-e5f37172">{{"数量:"+item.bigNum+"/"+item.smallNum}}</view><view class="info-name data-v-e5f37172">{{"时间:"+item.updateTime}}</view></view><view class="{{['data-v-e5f37172','status',item.status==PUT_STATUS.DONE?'primary':item.status==PUT_STATUS.CONFIRM?'warn':'gray']}}"><view class="{{['data-v-e5f37172','iconfont',item.status==PUT_STATUS.CANCEL?'iconcaozuojihuo':'icondairuku']}}"></view><view class="{{['data-v-e5f37172','status-name']}}">{{item.statusName}}</view></view></view></block></block></block><block wx:else><block class="data-v-e5f37172"><app-wrapper-empty vue-id="245a8c1a-2" title="暂无数据" is-empty="{{$root.g1}}" class="data-v-e5f37172" bind:__l="__l"></app-wrapper-empty></block></block></scroll-view></view>

+ 1 - 1
ghsApp/dist/build/mp-weixin/pagesStorehouse/allot/allotPut.wxss

@@ -1 +1 @@
-.allot-ex-page.data-v-e7a14c62{height:100%;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:#f9fbfc}.allot-ex-page .allot-list.data-v-e7a14c62{margin-top:20rpx;-webkit-box-flex:1;-webkit-flex:1;flex:1;padding-bottom:150rpx}.allot-ex-page .allot-list .allot-item.data-v-e7a14c62{margin-bottom:1rpx;padding:30rpx;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;box-shadow:0rpx 1rpx 0rpx 0rpx #eee;background-color:#fff}.allot-ex-page .allot-list .allot-item .info.data-v-e7a14c62{-webkit-box-flex:1;-webkit-flex:1;flex:1;margin-right:20rpx}.allot-ex-page .allot-list .allot-item .info .info-order.data-v-e7a14c62{font-size:32rpx;font-weight:600;color:#333}.allot-ex-page .allot-list .allot-item .info .info-name.data-v-e7a14c62{margin:20rpx 0 20rpx;font-size:28rpx;font-weight:400;color:#666}.allot-ex-page .allot-list .allot-item .info .info-time.data-v-e7a14c62{margin-right:30rpx;font-size:28rpx;font-weight:400;color:#666}.allot-ex-page .allot-list .allot-item .status.data-v-e7a14c62{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;-webkit-flex-shrink:0;flex-shrink:0;width:100rpx;color:#ccc}.allot-ex-page .allot-list .allot-item .status .status-name.data-v-e7a14c62{margin-top:10rpx;font-size:24rpx}.allot-ex-page .allot-list .allot-item .status .iconfont.data-v-e7a14c62{font-size:46rpx}.allot-ex-page .allot-list .allot-item .status.primary.data-v-e7a14c62{color:#3385ff}.allot-ex-page .allot-list .allot-item .status.gray.data-v-e7a14c62{color:#ccc}.allot-ex-page .allot-list .allot-item .status.warn.data-v-e7a14c62{color:#ffaf1d}
+.allot-ex-page.data-v-e5f37172{height:100%;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:#f9fbfc}.allot-ex-page .allot-list.data-v-e5f37172{margin-top:20rpx;-webkit-box-flex:1;-webkit-flex:1;flex:1;padding-bottom:150rpx}.allot-ex-page .allot-list .allot-item.data-v-e5f37172{margin-bottom:1rpx;padding:30rpx;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;box-shadow:0rpx 1rpx 0rpx 0rpx #eee;background-color:#fff}.allot-ex-page .allot-list .allot-item .info.data-v-e5f37172{-webkit-box-flex:1;-webkit-flex:1;flex:1;margin-right:20rpx}.allot-ex-page .allot-list .allot-item .info .info-order.data-v-e5f37172{font-size:32rpx;font-weight:600;color:#333}.allot-ex-page .allot-list .allot-item .info .info-name.data-v-e5f37172{margin:20rpx 0 20rpx;font-size:28rpx;font-weight:400;color:#666}.allot-ex-page .allot-list .allot-item .info .info-time.data-v-e5f37172{margin-right:30rpx;font-size:28rpx;font-weight:400;color:#666}.allot-ex-page .allot-list .allot-item .status.data-v-e5f37172{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;-webkit-flex-shrink:0;flex-shrink:0;width:100rpx;color:#ccc}.allot-ex-page .allot-list .allot-item .status .status-name.data-v-e5f37172{margin-top:10rpx;font-size:24rpx}.allot-ex-page .allot-list .allot-item .status .iconfont.data-v-e5f37172{font-size:46rpx}.allot-ex-page .allot-list .allot-item .status.primary.data-v-e5f37172{color:#3385ff}.allot-ex-page .allot-list .allot-item .status.gray.data-v-e5f37172{color:#ccc}.allot-ex-page .allot-list .allot-item .status.warn.data-v-e5f37172{color:#ffaf1d}

File diff suppressed because it is too large
+ 0 - 0
ghsApp/dist/build/mp-weixin/pagesStorehouse/allot/putDetails.js


File diff suppressed because it is too large
+ 0 - 0
ghsApp/dist/build/mp-weixin/pagesStorehouse/allot/putDetails.wxml


File diff suppressed because it is too large
+ 0 - 0
ghsApp/dist/build/mp-weixin/pagesStorehouse/allot/putDetails.wxss


+ 2 - 2
ghsApp/src/admin/home/me.vue

@@ -89,14 +89,14 @@
             >
               <div class="tui-title">收支明细</div>
             </tui-list-cell>
-            <tui-list-cell
+            <!-- <tui-list-cell
               @click="pageTo({ url: '/pagesStore/me/rechargeList' })"
               class="line-cell"
               :hover="false"
               :arrow="true"
             >
               <div class="tui-title">充值记录</div>
-            </tui-list-cell>
+            </tui-list-cell> -->
             <tui-list-cell
               @click="pageTo({ url: '/pagesStore/me/cashSet' })"
               class="line-cell"

+ 2 - 2
ghsApp/src/admin/shop/list.vue

@@ -28,9 +28,9 @@
 								<i class="iconfont iconbianji"></i>
 							</div>
 							<!-- 删除 -->
-							<div @click="delModalFn(item)">
+							<!-- <div @click="delModalFn(item)">
 								<i class="iconfont iconshanchu1"></i>
-							</div>
+							</div> -->
 						</div>
 					</div>
 				</div>

+ 0 - 6
ghsApp/src/pagesStore/me/rechargeList.vue

@@ -58,12 +58,6 @@ export default {
 					dataIndex: "totalRecharge",
 					color: "info",
 					align: "center"
-				},
-				{
-					name: "状态",
-					dataIndex: "statusText",
-					color: "info",
-					align: "center"
 				}
 			],
 		};

+ 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/plugin/time-axis.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/admin/shop/add.js


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


+ 1 - 1
hdApp/dist/build/mp-weixin/admin/shop/add.wxss

@@ -1 +1 @@
-.app-content.data-v-193bb1f2{min-height:calc(100vh - 20rpx);padding-top:20rpx}.prompt-text.data-v-193bb1f2{color:#999;padding-left:30rpx;margin-bottom:30rpx}.module-com.data-v-193bb1f2{margin-bottom:20rpx}.module-com .member-wrap .member-det.data-v-193bb1f2{font-size:24rpx;margin-left:20rpx}.module-com .remark-wrap.data-v-193bb1f2{-webkit-box-align:start;-webkit-align-items:flex-start;align-items:flex-start}.module-com .remark-wrap .remark.data-v-193bb1f2{height:240rpx}.confirm-btn.data-v-193bb1f2{width:calc(100% - 60rpx);margin:60rpx 30rpx 20rpx}.confirm-btn .admin-button-com.data-v-193bb1f2{width:100%}
+.app-content.data-v-e77bacc0{min-height:calc(100vh - 20rpx);padding-top:20rpx}.prompt-text.data-v-e77bacc0{color:#999;padding-left:30rpx;margin-bottom:30rpx}.module-com.data-v-e77bacc0{margin-bottom:20rpx}.module-com .member-wrap .member-det.data-v-e77bacc0{font-size:24rpx;margin-left:20rpx}.module-com .remark-wrap.data-v-e77bacc0{-webkit-box-align:start;-webkit-align-items:flex-start;align-items:flex-start}.module-com .remark-wrap .remark.data-v-e77bacc0{height:240rpx}.confirm-btn.data-v-e77bacc0{width:calc(100% - 60rpx);margin:60rpx 30rpx 20rpx}.confirm-btn .admin-button-com.data-v-e77bacc0{width:100%}

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


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


+ 1 - 1
hdApp/dist/build/mp-weixin/admin/shop/list.wxss

@@ -1 +1 @@
-.app-content.data-v-47773698{min-height:calc(100vh - 100rpx);padding-bottom:100rpx}.list-wrap.data-v-47773698{background-color:#fff}.list-wrap .list.data-v-47773698{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;margin:0 30rpx;padding:30rpx 0;border-bottom:2rpx solid #eee}.staff-list .list-det.data-v-47773698{width:calc(100% - 110rpx);color:#999;margin-left:20rpx;display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between}.staff-list .list-det .list-det-left .staff-name.data-v-47773698{color:#333;font-size:30rpx;font-weight:600;margin-right:20rpx}.staff-list .list-det .list-det-left .flex-center.data-v-47773698{margin-top:18rpx}.staff-list .list-det .list-det-left .status-list.data-v-47773698{margin-left:60rpx;color:#3385ff}.staff-list .list-det .list-det-left .status-list.data-v-47773698:first-child{margin-left:0}.staff-list .list-det .list-det-left .status-list .iconfont.data-v-47773698{font-size:24rpx;margin-right:10rpx}.staff-list .list-det .list-det-right.data-v-47773698{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}.staff-list .list-det .list-det-right > ._div.data-v-47773698{margin-left:50rpx}.staff-list .list-det .list-det-right > ._div.data-v-47773698:first-child{margin-left:0}.staff-list .list-det .list-det-right .iconfont.data-v-47773698{font-size:36rpx;color:#999}.app-footer.data-v-47773698{-webkit-box-pack:end;-webkit-justify-content:flex-end;justify-content:flex-end}.app-footer .admin-button-com.data-v-47773698{width:160rpx;margin-right:30rpx}
+.app-content.data-v-f5efb2a2{min-height:calc(100vh - 100rpx);padding-bottom:100rpx}.list-wrap.data-v-f5efb2a2{background-color:#fff}.list-wrap .list.data-v-f5efb2a2{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;margin:0 30rpx;padding:30rpx 0;border-bottom:2rpx solid #eee}.staff-list .list-det.data-v-f5efb2a2{width:calc(100% - 110rpx);color:#999;margin-left:20rpx;display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between}.staff-list .list-det .list-det-left .staff-name.data-v-f5efb2a2{color:#333;font-size:30rpx;font-weight:600;margin-right:20rpx}.staff-list .list-det .list-det-left .flex-center.data-v-f5efb2a2{margin-top:18rpx}.staff-list .list-det .list-det-left .status-list.data-v-f5efb2a2{margin-left:60rpx;color:#3385ff}.staff-list .list-det .list-det-left .status-list.data-v-f5efb2a2:first-child{margin-left:0}.staff-list .list-det .list-det-left .status-list .iconfont.data-v-f5efb2a2{font-size:24rpx;margin-right:10rpx}.staff-list .list-det .list-det-right.data-v-f5efb2a2{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}.staff-list .list-det .list-det-right > ._div.data-v-f5efb2a2{margin-left:50rpx}.staff-list .list-det .list-det-right > ._div.data-v-f5efb2a2:first-child{margin-left:0}.staff-list .list-det .list-det-right .iconfont.data-v-f5efb2a2{font-size:36rpx;color:#999}.app-footer.data-v-f5efb2a2{-webkit-box-pack:end;-webkit-justify-content:flex-end;justify-content:flex-end}.app-footer .admin-button-com.data-v-f5efb2a2{width:160rpx;margin-right:30rpx}

+ 2 - 2
hdApp/dist/build/mp-weixin/components/app-result.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-footer-cart.json

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

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

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

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

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

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

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

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

+ 1 - 1
hdApp/dist/build/mp-weixin/pagesClient/official/warn.js

@@ -1 +1 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pagesClient/official/warn"],{7513:function(t,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var a={name:"OfficialWarn",data:function(){return{stepList:[{title:"点击下方打开聊天框"},{title:"点击框内右下方“开启微信提醒”卡片",images:"".concat(this.$constant.imgUrl,"/ghs/official/step3.png")},{title:"接收二维码点击长按,识别公众号关注即可",images:"".concat(this.$constant.imgUrl,"/ghs/official/step2.png")}]}},methods:{handleContact:function(t){console.log("".concat(constant.imgUrl,"/ghs/official/mind.png")),console.log("e.detail.path",t.detail.path),console.log("e.detail.query",t.detail.query)}}};n.default=a},7793:function(t,n,e){"use strict";var a;e.d(n,"b",(function(){return c})),e.d(n,"c",(function(){return i})),e.d(n,"a",(function(){return a}));var c=function(){var t=this,n=t.$createElement;t._self._c},i=[]},"995b":function(t,n,e){"use strict";var a=e("9c37"),c=e.n(a);c.a},"9c37":function(t,n,e){},cfe0:function(t,n,e){"use strict";(function(t){e("6cdc");a(e("4a15"));var n=a(e("f723"));function a(t){return t&&t.__esModule?t:{default:t}}t(n.default)}).call(this,e("f3be")["createPage"])},ed55:function(t,n,e){"use strict";e.r(n);var a=e("7513"),c=e.n(a);for(var i in a)["default"].indexOf(i)<0&&function(t){e.d(n,t,(function(){return a[t]}))}(i);n["default"]=c.a},f723:function(t,n,e){"use strict";e.r(n);var a=e("7793"),c=e("ed55");for(var i in c)["default"].indexOf(i)<0&&function(t){e.d(n,t,(function(){return c[t]}))}(i);e("995b");var o,u=e("0095"),f=Object(u["a"])(c["default"],a["b"],a["c"],!1,null,"d713784a",null,!1,a["a"],o);n["default"]=f.exports}},[["cfe0","common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pagesClient/official/warn"],{"24c5":function(t,n,e){"use strict";var a=e("5af9"),c=e.n(a);c.a},"5af9":function(t,n,e){},7513:function(t,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var a={name:"OfficialWarn",data:function(){return{stepList:[{title:"点击下方打开聊天框"},{title:"点击框内右下方“开启微信提醒”卡片",images:"".concat(this.$constant.imgUrl,"/ghs/official/step3.png")},{title:"接收二维码点击长按,识别公众号关注即可",images:"".concat(this.$constant.imgUrl,"/ghs/official/step2.png")}]}},methods:{handleContact:function(t){console.log("".concat(constant.imgUrl,"/ghs/official/mind.png")),console.log("e.detail.path",t.detail.path),console.log("e.detail.query",t.detail.query)}}};n.default=a},cfe0:function(t,n,e){"use strict";(function(t){e("6cdc");a(e("4a15"));var n=a(e("f723"));function a(t){return t&&t.__esModule?t:{default:t}}t(n.default)}).call(this,e("f3be")["createPage"])},d11a:function(t,n,e){"use strict";var a;e.d(n,"b",(function(){return c})),e.d(n,"c",(function(){return i})),e.d(n,"a",(function(){return a}));var c=function(){var t=this,n=t.$createElement;t._self._c},i=[]},ed55:function(t,n,e){"use strict";e.r(n);var a=e("7513"),c=e.n(a);for(var i in a)["default"].indexOf(i)<0&&function(t){e.d(n,t,(function(){return a[t]}))}(i);n["default"]=c.a},f723:function(t,n,e){"use strict";e.r(n);var a=e("d11a"),c=e("ed55");for(var i in c)["default"].indexOf(i)<0&&function(t){e.d(n,t,(function(){return c[t]}))}(i);e("24c5");var o,f=e("0095"),u=Object(f["a"])(c["default"],a["b"],a["c"],!1,null,"79eb7cd4",null,!1,a["a"],o);n["default"]=u.exports}},[["cfe0","common/runtime","common/vendor"]]]);

+ 1 - 1
hdApp/dist/build/mp-weixin/pagesClient/official/warn.wxml

@@ -1 +1 @@
-<view class="data-v-d713784a"><view class="warn-tit data-v-d713784a">开启微信提醒</view><view class="step-view_box data-v-d713784a"><block wx:for="{{stepList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="step-li_box data-v-d713784a"><view class="step-head_box data-v-d713784a"><view class="step-icon_num data-v-d713784a">{{''+(index+1)+''}}</view><block wx:if="{{stepList.length-1!==index}}"><view class="step-line data-v-d713784a"></view></block></view><view class="step-main_box data-v-d713784a"><view class="step-tit data-v-d713784a">{{''+item.title+''}}</view><view class="step-content_box data-v-d713784a"><block wx:if="{{index===0}}"><view class="button-box data-v-d713784a"><button class="admin-button-com blue big data-v-d713784a" open-type="contact" show-message-card="true" send-message-title="识别下方二维码,关注公众号" send-message-path="/pagesClient/official/warn" send-message-img="`${constant.imgUrl}/ghs/official/mind.png`" data-event-opts="{{[['bindcontact',[['handleContact',['$event']]]]]}}" bindbindcontact="__e">打开聊天框</button></view></block><block wx:else><image class="step-img data-v-d713784a" src="{{item.images}}" mode="widthFix"></image></block></view></view></view></block></view></view>
+<view class="data-v-79eb7cd4"><view class="warn-tit data-v-79eb7cd4">开启微信提醒</view><view class="step-view_box data-v-79eb7cd4"><block wx:for="{{stepList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="step-li_box data-v-79eb7cd4"><view class="step-head_box data-v-79eb7cd4"><view class="step-icon_num data-v-79eb7cd4">{{''+(index+1)+''}}</view><block wx:if="{{stepList.length-1!==index}}"><view class="step-line data-v-79eb7cd4"></view></block></view><view class="step-main_box data-v-79eb7cd4"><view class="step-tit data-v-79eb7cd4">{{''+item.title+''}}</view><view class="step-content_box data-v-79eb7cd4"><block wx:if="{{index===0}}"><view class="button-box data-v-79eb7cd4"><button class="admin-button-com blue big data-v-79eb7cd4" open-type="contact" show-message-card="{{true}}" send-message-title="识别下方二维码,关注公众号" send-message-path="/pagesClient/official/warn" send-message-img="{{constant.imgUrl+'/ghs/official/mind.png'}}" data-event-opts="{{[['bindcontact',[['handleContact',['$event']]]]]}}" bindbindcontact="__e">打开聊天框</button></view></block><block wx:else><image class="step-img data-v-79eb7cd4" src="{{item.images}}" mode="widthFix"></image></block></view></view></view></block></view></view>

+ 1 - 1
hdApp/dist/build/mp-weixin/pagesClient/official/warn.wxss

@@ -1 +1 @@
-.warn-tit.data-v-d713784a{color:#040404;font-size:36rpx;font-weight:600;padding:42rpx 0 0 52rpx}.step-view_box.data-v-d713784a{margin-top:63rpx;padding:0 25rpx 0 40rpx}.step-view_box .step-li_box.data-v-d713784a{display:-webkit-box;display:-webkit-flex;display:flex}.step-view_box .step-li_box > .step-head_box.data-v-d713784a{position:relative}.step-view_box .step-li_box > .step-head_box > .step-icon_num.data-v-d713784a{width:40rpx;height:40rpx;border-radius:50%;background-color:#3385ff;text-align:center;line-height:40rpx;color:#fff;font-size:28rpx;position:relative;z-index:50}.step-view_box .step-li_box > .step-head_box > .step-line.data-v-d713784a{height:100%;width:0rpx;border-left:1rpx dashed #3385ff;position:absolute;left:50%;top:50%;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%);z-index:45}.step-view_box .step-li_box > .step-main_box.data-v-d713784a{-webkit-box-flex:1;-webkit-flex:1;flex:1;padding-left:30rpx}.step-view_box .step-li_box > .step-main_box .step-tit.data-v-d713784a{color:#141f25;font-size:32rpx;font-weight:600}.step-view_box .step-li_box > .step-main_box .step-content_box .button-box.data-v-d713784a{width:100%;padding-right:25rpx}.step-view_box .step-li_box > .step-main_box .step-content_box .button-box .admin-button-com.data-v-d713784a{margin:67rpx 0 85rpx}.step-view_box .step-li_box > .step-main_box .step-content_box .step-img.data-v-d713784a{width:382rpx;height:566rpx;margin:34rpx 0 71rpx}.admin-button-com.data-v-d713784a{width:100%}
+.warn-tit.data-v-79eb7cd4{color:#040404;font-size:36rpx;font-weight:600;padding:42rpx 0 0 52rpx}.step-view_box.data-v-79eb7cd4{margin-top:63rpx;padding:0 25rpx 0 40rpx}.step-view_box .step-li_box.data-v-79eb7cd4{display:-webkit-box;display:-webkit-flex;display:flex}.step-view_box .step-li_box > .step-head_box.data-v-79eb7cd4{position:relative}.step-view_box .step-li_box > .step-head_box > .step-icon_num.data-v-79eb7cd4{width:40rpx;height:40rpx;border-radius:50%;background-color:#3385ff;text-align:center;line-height:40rpx;color:#fff;font-size:28rpx;position:relative;z-index:50}.step-view_box .step-li_box > .step-head_box > .step-line.data-v-79eb7cd4{height:100%;width:0rpx;border-left:1rpx dashed #3385ff;position:absolute;left:50%;top:50%;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%);z-index:45}.step-view_box .step-li_box > .step-main_box.data-v-79eb7cd4{-webkit-box-flex:1;-webkit-flex:1;flex:1;padding-left:30rpx}.step-view_box .step-li_box > .step-main_box .step-tit.data-v-79eb7cd4{color:#141f25;font-size:32rpx;font-weight:600}.step-view_box .step-li_box > .step-main_box .step-content_box .button-box.data-v-79eb7cd4{width:100%;padding-right:25rpx}.step-view_box .step-li_box > .step-main_box .step-content_box .button-box .admin-button-com.data-v-79eb7cd4{margin:67rpx 0 85rpx}.step-view_box .step-li_box > .step-main_box .step-content_box .step-img.data-v-79eb7cd4{width:382rpx;height:566rpx;margin:34rpx 0 71rpx}.admin-button-com.data-v-79eb7cd4{width:100%}

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

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


+ 1 - 1
hdApp/dist/build/mp-weixin/pagesStore/me/rechargeList.wxml

@@ -1 +1 @@
-<view class="_div data-v-e6c961c2"><block wx:if="{{!$root.g0}}"><block class="data-v-e6c961c2"><t-table vue-id="3b043ee4-1" headerBackgroundColor="#F0F2F6" class="data-v-e6c961c2" bind:__l="__l" vue-slots="{{['default']}}"><t-tr vue-id="{{('3b043ee4-2')+','+('3b043ee4-1')}}" header="{{true}}" class="data-v-e6c961c2" bind:__l="__l" vue-slots="{{['default']}}"><block wx:for="{{columns}}" wx:for-item="item" wx:for-index="index" wx:key="index"><t-th vue-id="{{('3b043ee4-3-'+index)+','+('3b043ee4-2')}}" align="{{item.align}}" class="data-v-e6c961c2" bind:__l="__l" vue-slots="{{['default']}}">{{''+item.name+''}}</t-th></block></t-tr><block wx:for="{{list.data}}" wx:for-item="item" wx:for-index="index" wx:key="index"><t-tr vue-id="{{('3b043ee4-4-'+index)+','+('3b043ee4-1')}}" class="data-v-e6c961c2" bind:__l="__l" vue-slots="{{['default']}}"><block wx:for="{{columns}}" wx:for-item="column" wx:for-index="colIndex" wx:key="colIndex"><t-td vue-id="{{('3b043ee4-5-'+index+'-'+colIndex)+','+('3b043ee4-4-'+index)}}" align="{{column.align}}" color="{{column.color}}" class="data-v-e6c961c2" bind:__l="__l" vue-slots="{{['default']}}"><view class="data-v-e6c961c2">{{''+(item[column.dataIndex]||"")+''}}</view></t-td></block></t-tr></block></t-table></block></block><block wx:else><block class="data-v-e6c961c2"><app-wrapper-empty vue-id="3b043ee4-6" title="暂无记录" is-empty="{{$root.g1}}" class="data-v-e6c961c2" bind:__l="__l"></app-wrapper-empty></block></block><kd-entrance vue-id="3b043ee4-7" class="data-v-e6c961c2" bind:__l="__l"></kd-entrance></view>
+<view class="_div data-v-1305d6c7"><block wx:if="{{!$root.g0}}"><block class="data-v-1305d6c7"><t-table vue-id="3b043ee4-1" headerBackgroundColor="#F0F2F6" class="data-v-1305d6c7" bind:__l="__l" vue-slots="{{['default']}}"><t-tr vue-id="{{('3b043ee4-2')+','+('3b043ee4-1')}}" header="{{true}}" class="data-v-1305d6c7" bind:__l="__l" vue-slots="{{['default']}}"><block wx:for="{{columns}}" wx:for-item="item" wx:for-index="index" wx:key="index"><t-th vue-id="{{('3b043ee4-3-'+index)+','+('3b043ee4-2')}}" align="{{item.align}}" class="data-v-1305d6c7" bind:__l="__l" vue-slots="{{['default']}}">{{''+item.name+''}}</t-th></block></t-tr><block wx:for="{{list.data}}" wx:for-item="item" wx:for-index="index" wx:key="index"><t-tr vue-id="{{('3b043ee4-4-'+index)+','+('3b043ee4-1')}}" class="data-v-1305d6c7" bind:__l="__l" vue-slots="{{['default']}}"><block wx:for="{{columns}}" wx:for-item="column" wx:for-index="colIndex" wx:key="colIndex"><t-td vue-id="{{('3b043ee4-5-'+index+'-'+colIndex)+','+('3b043ee4-4-'+index)}}" align="{{column.align}}" color="{{column.color}}" class="data-v-1305d6c7" bind:__l="__l" vue-slots="{{['default']}}"><view class="data-v-1305d6c7">{{''+(item[column.dataIndex]||"")+''}}</view></t-td></block></t-tr></block></t-table></block></block><block wx:else><block class="data-v-1305d6c7"><app-wrapper-empty vue-id="3b043ee4-6" title="暂无记录" is-empty="{{$root.g1}}" class="data-v-1305d6c7" bind:__l="__l"></app-wrapper-empty></block></block><kd-entrance vue-id="3b043ee4-7" class="data-v-1305d6c7" bind:__l="__l"></kd-entrance></view>

+ 2 - 2
hdApp/src/admin/shop/list.vue

@@ -28,9 +28,9 @@
 								<i class="iconfont iconbianji"></i>
 							</div>
 							<!-- 删除 -->
-							<div @click="delModalFn(item)">
+							<!-- <div @click="delModalFn(item)">
 								<i class="iconfont iconshanchu1"></i>
-							</div>
+							</div> -->
 						</div>
 					</div>
 				</div>

+ 0 - 6
hdApp/src/pagesStore/me/rechargeList.vue

@@ -58,12 +58,6 @@ export default {
 					dataIndex: "totalRecharge",
 					color: "info",
 					align: "center"
-				},
-				{
-					name: "状态",
-					dataIndex: "statusText",
-					color: "info",
-					align: "center"
 				}
 			],
 		};

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