shish 5 years ago
parent
commit
4c7951927a
73 changed files with 224 additions and 167 deletions
  1. 2 2
      ghsApp/dist/build/mp-weixin/admin/clear/customOrderItem.json
  2. 2 2
      ghsApp/dist/build/mp-weixin/admin/home/components/module/operate-line.json
  3. 2 2
      ghsApp/dist/build/mp-weixin/admin/home/components/module/operate.json
  4. 2 2
      ghsApp/dist/build/mp-weixin/admin/home/components/plugin/time-axis.json
  5. 0 0
      ghsApp/dist/build/mp-weixin/admin/home/workbench.js
  6. 0 0
      ghsApp/dist/build/mp-weixin/admin/home/workbench.wxml
  7. 0 0
      ghsApp/dist/build/mp-weixin/admin/home/workbench.wxss
  8. 0 0
      ghsApp/dist/build/mp-weixin/admin/item/detail.js
  9. 0 0
      ghsApp/dist/build/mp-weixin/admin/item/detail.wxml
  10. 1 1
      ghsApp/dist/build/mp-weixin/admin/item/detail.wxss
  11. 0 0
      ghsApp/dist/build/mp-weixin/admin/shop/print.js
  12. 0 0
      ghsApp/dist/build/mp-weixin/admin/staff/list.js
  13. 0 0
      ghsApp/dist/build/mp-weixin/admin/staff/list.wxml
  14. 0 0
      ghsApp/dist/build/mp-weixin/admin/staff/list.wxss
  15. 2 1
      ghsApp/dist/build/mp-weixin/app.json
  16. 2 2
      ghsApp/dist/build/mp-weixin/components/app-img.json
  17. 2 2
      ghsApp/dist/build/mp-weixin/components/app-result.json
  18. 2 2
      ghsApp/dist/build/mp-weixin/components/app-uploader.json
  19. 2 2
      ghsApp/dist/build/mp-weixin/components/module/app-close.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/plugin/alert.json
  23. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/badge.json
  24. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/bottom-popup.json
  25. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/dropdown-list.json
  26. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/selectList.json
  27. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/simple-address.json
  28. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/tabs.json
  29. 2 2
      ghsApp/dist/build/mp-weixin/pagesOrder/components/stepShip.json
  30. 1 1
      ghsApp/dist/build/mp-weixin/pagesStorehouse/components/CommodityStock.js
  31. 1 1
      ghsApp/dist/build/mp-weixin/pagesStorehouse/components/CommodityStock.wxml
  32. 1 1
      ghsApp/dist/build/mp-weixin/pagesStorehouse/components/CommodityStock.wxss
  33. 0 0
      ghsApp/dist/build/mp-weixin/pagesStorehouse/stockWarn/manage.js
  34. 0 0
      ghsApp/dist/build/mp-weixin/pagesStorehouse/stockWarn/manage.wxml
  35. 0 0
      ghsApp/dist/build/mp-weixin/pagesStorehouse/stockWarn/manage.wxss
  36. 33 6
      ghsApp/dist/build/mp-weixin/project.config.json
  37. 0 0
      ghsApp/dist/build/mp-weixin/sitemap.json
  38. 16 0
      ghsApp/src/admin/home/workbench.vue
  39. 10 0
      ghsApp/src/admin/item/detail.vue
  40. 5 0
      ghsApp/src/admin/staff/list.vue
  41. 28 5
      ghsApp/src/pagesStorehouse/components/CommodityStock.vue
  42. 3 10
      ghsApp/src/pagesStorehouse/stockWarn/manage.vue
  43. 2 2
      hdApp/dist/build/mp-weixin/admin/home/components/module/operate-line.json
  44. 2 2
      hdApp/dist/build/mp-weixin/admin/home/components/plugin/time-axis.json
  45. 2 2
      hdApp/dist/build/mp-weixin/components/module/app-avatar.json
  46. 2 2
      hdApp/dist/build/mp-weixin/components/module/app-share-mask.json
  47. 2 2
      hdApp/dist/build/mp-weixin/components/module/app-vip.json
  48. 2 2
      hdApp/dist/build/mp-weixin/components/plugin/fab.json
  49. 2 2
      hdApp/dist/build/mp-weixin/components/plugin/list-cell.json
  50. 2 2
      hdApp/dist/build/mp-weixin/components/plugin/simple-address.json
  51. 1 1
      hdApp/dist/build/mp-weixin/pagesClient/official/result.js
  52. 1 1
      hdApp/dist/build/mp-weixin/pagesClient/official/result.wxml
  53. 1 1
      hdApp/dist/build/mp-weixin/pagesClient/official/result.wxss
  54. 1 1
      hdApp/dist/build/mp-weixin/pagesPurchase/particulars.js
  55. 1 1
      hdApp/dist/build/mp-weixin/pagesPurchase/particulars.wxml
  56. 1 1
      hdApp/dist/build/mp-weixin/pagesPurchase/particulars.wxss
  57. 24 14
      hdApp/dist/build/mp-weixin/project.config.json
  58. 1 2
      mallApp/dist/build/mp-weixin/app.json
  59. 0 0
      mallApp/dist/build/mp-weixin/common/main.wxss
  60. 2 2
      mallApp/dist/build/mp-weixin/components/app-coupon-sel.json
  61. 2 2
      mallApp/dist/build/mp-weixin/components/module/app-share-mask.json
  62. 2 2
      mallApp/dist/build/mp-weixin/components/module/app-tag.json
  63. 2 2
      mallApp/dist/build/mp-weixin/components/plugin/alert.json
  64. 2 2
      mallApp/dist/build/mp-weixin/components/plugin/list-cell.json
  65. 2 2
      mallApp/dist/build/mp-weixin/components/plugin/list-view.json
  66. 2 2
      mallApp/dist/build/mp-weixin/components/plugin/modal.json
  67. 2 2
      mallApp/dist/build/mp-weixin/components/plugin/rate.json
  68. 2 2
      mallApp/dist/build/mp-weixin/components/plugin/tabs.json
  69. 5 5
      mallApp/dist/build/mp-weixin/ext.json
  70. 2 2
      mallApp/dist/build/mp-weixin/pages/goods/components/buy-foot.json
  71. 2 2
      mallApp/dist/build/mp-weixin/pages/home/components/goods-list-middle.json
  72. 7 34
      mallApp/dist/build/mp-weixin/project.config.json
  73. 6 6
      mallApp/dist/build/mp-weixin/static/iconfont/iconfont.css

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

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

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

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

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

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

+ 2 - 2
ghsApp/dist/build/mp-weixin/admin/home/components/plugin/time-axis.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/workbench.js


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


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


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


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


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

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

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


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


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


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


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

@@ -342,5 +342,6 @@
     "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-img.json

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

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

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

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

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

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

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

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

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

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

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

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

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

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

+ 1 - 1
ghsApp/dist/build/mp-weixin/pagesStorehouse/components/CommodityStock.js

@@ -1,4 +1,4 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pagesStorehouse/components/CommodityStock"],{"097d":function(t,n,e){"use strict";var o;e.d(n,"b",(function(){return u})),e.d(n,"c",(function(){return i})),e.d(n,"a",(function(){return o}));var u=function(){var t=this,n=t.$createElement;t._self._c},i=[]},"0cba":function(t,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var o=e("7602"),u=function(){Promise.all([e.e("common/vendor"),e.e("components/app-img")]).then(function(){return resolve(e("cb3c"))}.bind(null,e)).catch(e.oe)},i={name:"Commodity",components:{AppImg:u},props:{type:{type:String,default:o.STOCK_TYPE.WARN},isPrice:{type:Boolean,default:!0},isEdit:{type:Boolean,default:!0},info:{required:!0}},data:function(){return{isImg:!1}},mounted:function(){var t=this;setTimeout((function(){t.isImg=!0}),100)},methods:{customNum:function(){this.$emit("customNum")},addEvent:function(){this.$emit("add")},subtractEvent:function(){this.$emit("subtract")},delEvent:function(){this.$emit("del")}}};n.default=i},"108f":function(t,n,e){"use strict";e.r(n);var o=e("0cba"),u=e.n(o);for(var i in o)["default"].indexOf(i)<0&&function(t){e.d(n,t,(function(){return o[t]}))}(i);n["default"]=u.a},"22e0":function(t,n,e){"use strict";var o=e("ded9"),u=e.n(o);u.a},"7acd":function(t,n,e){"use strict";e.r(n);var o=e("097d"),u=e("108f");for(var i in u)["default"].indexOf(i)<0&&function(t){e.d(n,t,(function(){return u[t]}))}(i);e("22e0");var c,a=e("0095"),r=Object(a["a"])(u["default"],o["b"],o["c"],!1,null,"d5845a56",null,!1,o["a"],c);n["default"]=r.exports},ded9:function(t,n,e){}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pagesStorehouse/components/CommodityStock"],{"0cba":function(t,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var i=e("7602"),o=function(){Promise.all([e.e("common/vendor"),e.e("components/app-img")]).then(function(){return resolve(e("cb3c"))}.bind(null,e)).catch(e.oe)},c={name:"Commodity",components:{AppImg:o},props:{type:{type:String,default:i.STOCK_TYPE.WARN},isPrice:{type:Boolean,default:!0},isEdit:{type:Boolean,default:!0},info:{required:!0},modifyStock:{type:Object}},data:function(){return{isImg:!1,currentStock:null,hidden:0}},mounted:function(){var t=this;setTimeout((function(){t.isImg=!0}),100)},watch:{modifyStock:{handler:function(){if(this.modifyStock.id==this.info.id&&this.modifyStock.stock!=this.info.stock){this.currentStock=this.modifyStock.stock;var t=this;setTimeout((function(){t.hidden=t.modifyStock.hidden}),800)}},deep:!0}},methods:{goItem:function(t){this.$util.pageTo({url:"/admin/item/detail?id="+t})},customNum:function(){this.$emit("customNum")},addEvent:function(){this.$emit("add")},subtractEvent:function(){this.$emit("subtract")},delEvent:function(){this.$emit("del")}}};n.default=c},"0eb6":function(t,n,e){"use strict";var i;e.d(n,"b",(function(){return o})),e.d(n,"c",(function(){return c})),e.d(n,"a",(function(){return i}));var o=function(){var t=this,n=t.$createElement;t._self._c},c=[]},"108f":function(t,n,e){"use strict";e.r(n);var i=e("0cba"),o=e.n(i);for(var c in i)["default"].indexOf(c)<0&&function(t){e.d(n,t,(function(){return i[t]}))}(c);n["default"]=o.a},"231c":function(t,n,e){},5806:function(t,n,e){"use strict";var i=e("231c"),o=e.n(i);o.a},"7acd":function(t,n,e){"use strict";e.r(n);var i=e("0eb6"),o=e("108f");for(var c in o)["default"].indexOf(c)<0&&function(t){e.d(n,t,(function(){return o[t]}))}(c);e("5806");var u,f=e("0095"),r=Object(f["a"])(o["default"],i["b"],i["c"],!1,null,"60f676fa",null,!1,i["a"],u);n["default"]=r.exports}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pagesStorehouse/components/CommodityStock-create-component',
     {

+ 1 - 1
ghsApp/dist/build/mp-weixin/pagesStorehouse/components/CommodityStock.wxml

@@ -1 +1 @@
-<view class="item-cmd_bx data-v-d5845a56"><view class="img_bx data-v-d5845a56" style="background:#eeeeee;"><block wx:if="{{isImg}}"><image src="{{info.cover}}" class="data-v-d5845a56"></image></block></view><navigator class="{{['cmd-info_bx data-v-d5845a56',type==STOCK_TYPE.WARN?'':'active']}}" url="{{type==STOCK_TYPE.WARN?'':'/admin/item/detail?id='+info.id}}"><view class="tit data-v-d5845a56">{{info.itemName||""}}</view><view class="kc data-v-d5845a56"></view><view class="num-open_bx data-v-d5845a56"><block wx:if="{{isPrice}}"><view class="price data-v-d5845a56">{{"¥"+info.price}}</view></block><view class="open-bx warn data-v-d5845a56">库存<text style="margin-left:10rpx;font-size:32rpx;" class="data-v-d5845a56">{{''+info.stock}}</text></view></view></navigator></view>
+<block wx:if="{{hidden==0}}"><view class="item-cmd_bx data-v-60f676fa"><view class="img_bx data-v-60f676fa" style="background:#eeeeee;"><block wx:if="{{isImg}}"><image src="{{info.cover}}" class="data-v-60f676fa"></image></block></view><view data-event-opts="{{[['tap',[['goItem',['$0'],['info.id']]]]]}}" class="{{['cmd-info_bx data-v-60f676fa',type==STOCK_TYPE.WARN?'':'active']}}" bindtap="__e"><view class="tit data-v-60f676fa">{{info.itemName||""}}</view><view class="kc data-v-60f676fa"></view><view class="num-open_bx data-v-60f676fa"><block wx:if="{{isPrice}}"><view class="price data-v-60f676fa">{{"¥"+info.price}}</view></block><view class="open-bx warn data-v-60f676fa">库存<text style="margin-left:10rpx;font-size:32rpx;" class="data-v-60f676fa">{{''+(currentStock||info.stock)}}</text></view></view></view></view></block>

+ 1 - 1
ghsApp/dist/build/mp-weixin/pagesStorehouse/components/CommodityStock.wxss

@@ -1 +1 @@
-.item-cmd_bx.data-v-d5845a56{position:relative;margin-bottom:20rpx}.item-cmd_bx .img_bx.data-v-d5845a56{height:160rpx;width:160rpx;position:absolute;left:0rpx;top:0rpx}.item-cmd_bx .img_bx image.data-v-d5845a56{width:100%;height:100%}.item-cmd_bx .cmd-info_bx.data-v-d5845a56{position:relative;padding-left:177rpx}.item-cmd_bx .cmd-info_bx.active.data-v-d5845a56:before{content:" ";height:22rpx;width:22rpx;border-width:2rpx 2rpx 0 0;border-color:#b2b2b2;border-style:solid;-webkit-transform:matrix(.5,.5,-.5,.5,0,0);transform:matrix(.5,.5,-.5,.5,0,0);position:absolute;top:50%;margin-top:-12rpx;right:30rpx}.item-cmd_bx .cmd-info_bx .tit.data-v-d5845a56{font-size:28rpx;font-weight:400;color:#333;padding-top:10rpx}.item-cmd_bx .cmd-info_bx .kc.data-v-d5845a56{color:#999;font-size:24rpx;padding:10rpx 0 24rpx}.item-cmd_bx .cmd-info_bx .num-open_bx.data-v-d5845a56{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.item-cmd_bx .cmd-info_bx .num-open_bx .price.data-v-d5845a56{font-size:28rpx;color:#999;-webkit-box-flex:1;-webkit-flex:1;flex:1}.item-cmd_bx .cmd-info_bx .num-open_bx .open-bx.data-v-d5845a56{color:#333}.item-cmd_bx .cmd-info_bx .num-open_bx .open-bx text.data-v-d5845a56{font-size:24rpx;font-weight:700}
+.item-cmd_bx.data-v-60f676fa{position:relative;margin-bottom:20rpx}.item-cmd_bx .img_bx.data-v-60f676fa{height:160rpx;width:160rpx;position:absolute;left:0rpx;top:0rpx}.item-cmd_bx .img_bx image.data-v-60f676fa{width:100%;height:100%}.item-cmd_bx .cmd-info_bx.data-v-60f676fa{position:relative;padding-left:177rpx}.item-cmd_bx .cmd-info_bx.active.data-v-60f676fa:before{content:" ";height:22rpx;width:22rpx;border-width:2rpx 2rpx 0 0;border-color:#b2b2b2;border-style:solid;-webkit-transform:matrix(.5,.5,-.5,.5,0,0);transform:matrix(.5,.5,-.5,.5,0,0);position:absolute;top:50%;margin-top:-12rpx;right:30rpx}.item-cmd_bx .cmd-info_bx .tit.data-v-60f676fa{font-size:28rpx;font-weight:400;color:#333;padding-top:10rpx}.item-cmd_bx .cmd-info_bx .kc.data-v-60f676fa{color:#999;font-size:24rpx;padding:10rpx 0 24rpx}.item-cmd_bx .cmd-info_bx .num-open_bx.data-v-60f676fa{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.item-cmd_bx .cmd-info_bx .num-open_bx .price.data-v-60f676fa{font-size:28rpx;color:#999;-webkit-box-flex:1;-webkit-flex:1;flex:1}.item-cmd_bx .cmd-info_bx .num-open_bx .open-bx.data-v-60f676fa{color:#333}.item-cmd_bx .cmd-info_bx .num-open_bx .open-bx text.data-v-60f676fa{font-size:24rpx;font-weight:700}

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


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


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


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

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

+ 0 - 0
mallApp/dist/build/mp-weixin/sitemap.json → ghsApp/dist/build/mp-weixin/sitemap.json


+ 16 - 0
ghsApp/src/admin/home/workbench.vue

@@ -223,6 +223,22 @@ export default {
 					name: "调拨入库",
 					img: `${this.$constant.imgUrl}/ghs/home/dbrk.png`,
 					url: "/pagesStorehouse/allot/allotPut"
+				},
+
+				{
+					name: "花材",
+					img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`,
+					url: "/admin/item/list"
+				},
+				{
+					name: "员工",
+					img: `${this.$constant.imgUrl}/ghs/home/yggl.png`,
+					url: "/admin/staff/list"
+				},
+				{
+					name: "业绩",
+					img: `${this.$constant.imgUrl}/ghs/home/icon_ygyj.png`,
+					url: "/admin/staff/achieve"
 				}
 			],
 			// 总览

+ 10 - 0
ghsApp/src/admin/item/detail.vue

@@ -354,6 +354,16 @@ export default {
         ...form
       }).then(res => {
         this.$msg("操作成功!");
+
+        //返回上一页带参数
+        let pages = getCurrentPages();
+        let prevPage = pages[ pages.length - 2 ];
+        let hidden = 0
+        if(this.form.stock > this.form.stockWarning){
+          hidden = 1
+        }
+        prevPage.$vm.modifyStock = {id:this.form.id,stock:this.form.stock,hidden:hidden};
+
         uni.navigateBack({});
       });
     },

+ 5 - 0
ghsApp/src/admin/staff/list.vue

@@ -302,6 +302,11 @@ export default {
 					font-size: 30px;
 					font-weight: 600;
 					margin-right: 10px;
+					display: inline-block;
+					overflow: hidden;
+					text-overflow:ellipsis;
+					white-space: nowrap;
+					width:150rpx;
 				}
 				.flex-center {
 					margin-top: 10px;

+ 28 - 5
ghsApp/src/pagesStorehouse/components/CommodityStock.vue

@@ -1,18 +1,18 @@
 <template>
-	<view class="item-cmd_bx">
+	<view class="item-cmd_bx" v-if="hidden==0">
 		<view class="img_bx" style="background:#eeeeee">
 			<image :src="info.cover" v-if="isImg"></image>
 		</view>
-		<navigator :url="type == STOCK_TYPE.WARN?'':`/admin/item/detail?id=${info.id}`" class="cmd-info_bx" :class="type == STOCK_TYPE.WARN?'':'active'">
+		<view @click="goItem(info.id)" class="cmd-info_bx" :class="type == STOCK_TYPE.WARN?'':'active'">
 			<view class="tit">{{ info.itemName || "" }}</view>
 			<view class="kc"></view>
 			<view class="num-open_bx">
 				<view class="price" v-if="isPrice">¥{{ info.price }}</view>
 				<view class="open-bx warn">
-					库存 <text style="margin-left: 10rpx;font-size: 32rpx"> {{ info.stock }}</text>
+					库存 <text style="margin-left: 10rpx;font-size: 32rpx"> {{ currentStock||info.stock }}</text>
 				</view>
 			</view>
-		</navigator>
+		</view>
 	</view>
 </template>
 
@@ -39,12 +39,16 @@ export default {
 		},
 		info: {
 			required: true
+		},
+		modifyStock:{
+			type:Object
 		}
 	},
 	data() {
 		return {
-			// STOCK_TYPEv,
 			isImg:false,
+			currentStock:null,
+			hidden:0
 		};
 	},
 	mounted() {
@@ -52,7 +56,26 @@ export default {
 			this.isImg = true;
 		},100)
 	},
+	watch: {
+		modifyStock:{
+			handler(){
+				if(this.modifyStock.id == this.info.id && this.modifyStock.stock != this.info.stock){
+					this.currentStock = this.modifyStock.stock
+					let that = this
+					setTimeout(function(){
+						that.hidden = that.modifyStock.hidden
+					},800)
+				}
+			},
+			deep:true
+		}
+	},
 	methods: {
+		goItem(id){
+			this.$util.pageTo({
+				url: "/admin/item/detail?id="+id
+			})
+		},
 		customNum() {
 			this.$emit("customNum");
 		},

+ 3 - 10
ghsApp/src/pagesStorehouse/stockWarn/manage.vue

@@ -19,6 +19,7 @@
 							:key="productIndex"
 							:info="productItem"
 							:isEdit="true"
+							:modifyStock="modifyStock"
 						></CommodityStock>
 						</view>
 					</template>
@@ -102,7 +103,8 @@ export default {
 					name: "库存明细",
 					key: STOCK_TYPE.MANAGE
 				}
-			]
+			],
+			modifyStock:{}
 		};
 	},
 	computed:{
@@ -129,15 +131,6 @@ export default {
 			}
 	},
 	onShow(){
-		this.page = 1
-		this.filterProductInfoContrapose = []
-		let type = this.tabs[this.tabIndex].key == STOCK_TYPE.WARN ? "waring" : "";
-		this.shopId = this.getMyShopInfo.id;
-		if(type=="waring"){
-			this.initDataContrapose({ type, shopId: this.shopId,status:0});
-		}else{
-			this.initData({ type, shopId: this.shopId,status:0});
-		}
 	},
 	methods: {
 		affirm(val) {

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1 +1 @@
-require('../common/vendor.js');(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pagesClient/official/result"],{"3e36":function(e,n,t){"use strict";var o;t.d(n,"b",(function(){return u})),t.d(n,"c",(function(){return c})),t.d(n,"a",(function(){return o}));var u=function(){var e=this,n=e.$createElement;e._self._c},c=[]},"420d":function(e,n,t){"use strict";(function(e){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var o=function(){t.e("components/app-result").then(function(){return resolve(t("9325"))}.bind(null,t)).catch(t.oe)},u={name:"ApplyResult",components:{appResult:o},onUnload:function(){e.setStorageSync("HOME_REFRESH","1"),e.removeStorageSync("HOME_STATUS_STROAGE_SHOW")},methods:{close:function(){e.removeStorageSync("OPEN_SHOP_ID"),e.removeStorageSync("HOME_STATUS_STROAGE_SHOW"),this.$store.commit("setLoginInfo",{}),this.pageTo({url:"/admin/home/workbench",type:3})}}};n.default=u}).call(this,t("f3be")["default"])},"491d":function(e,n,t){"use strict";t.r(n);var o=t("420d"),u=t.n(o);for(var c in o)["default"].indexOf(c)<0&&function(e){t.d(n,e,(function(){return o[e]}))}(c);n["default"]=u.a},"6440f":function(e,n,t){"use strict";t.r(n);var o=t("3e36"),u=t("491d");for(var c in u)["default"].indexOf(c)<0&&function(e){t.d(n,e,(function(){return u[e]}))}(c);t("f228");var r,a=t("0095"),f=Object(a["a"])(u["default"],o["b"],o["c"],!1,null,"27d52676",null,!1,o["a"],r);n["default"]=f.exports},8054:function(e,n,t){"use strict";(function(e){t("6cdc");o(t("4a15"));var n=o(t("6440f"));function o(e){return e&&e.__esModule?e:{default:e}}e(n.default)}).call(this,t("f3be")["createPage"])},c8be:function(e,n,t){},f228:function(e,n,t){"use strict";var o=t("c8be"),u=t.n(o);u.a}},[["8054","common/runtime","common/vendor"]]]);
+require('../common/vendor.js');(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pagesClient/official/result"],{1409:function(n,e,t){"use strict";var o;t.d(e,"b",(function(){return u})),t.d(e,"c",(function(){return c})),t.d(e,"a",(function(){return o}));var u=function(){var n=this,e=n.$createElement;n._self._c},c=[]},2482:function(n,e,t){"use strict";var o=t("8a79"),u=t.n(o);u.a},"420d":function(n,e,t){"use strict";(function(n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var o=function(){t.e("components/app-result").then(function(){return resolve(t("9325"))}.bind(null,t)).catch(t.oe)},u={name:"ApplyResult",components:{appResult:o},onUnload:function(){n.setStorageSync("HOME_REFRESH","1"),n.removeStorageSync("HOME_STATUS_STROAGE_SHOW")},methods:{close:function(){n.removeStorageSync("OPEN_SHOP_ID"),n.removeStorageSync("HOME_STATUS_STROAGE_SHOW"),this.$store.commit("setLoginInfo",{}),this.pageTo({url:"/admin/home/workbench",type:3})}}};e.default=u}).call(this,t("f3be")["default"])},"491d":function(n,e,t){"use strict";t.r(e);var o=t("420d"),u=t.n(o);for(var c in o)["default"].indexOf(c)<0&&function(n){t.d(e,n,(function(){return o[n]}))}(c);e["default"]=u.a},"6440f":function(n,e,t){"use strict";t.r(e);var o=t("1409"),u=t("491d");for(var c in u)["default"].indexOf(c)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(c);t("2482");var r,a=t("0095"),i=Object(a["a"])(u["default"],o["b"],o["c"],!1,null,"106402d6",null,!1,o["a"],r);e["default"]=i.exports},8054:function(n,e,t){"use strict";(function(n){t("6cdc");o(t("4a15"));var e=o(t("6440f"));function o(n){return n&&n.__esModule?n:{default:n}}n(e.default)}).call(this,t("f3be")["createPage"])},"8a79":function(n,e,t){}},[["8054","common/runtime","common/vendor"]]]);

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

@@ -1 +1 @@
-<app-result vue-id="3beb80ba-1" title="已提交" class="data-v-27d52676" bind:__l="__l" vue-slots="{{['default']}}"><view class="dec data-v-27d52676"></view><button data-event-opts="{{[['tap',[['close',['$event']]]]]}}" class="admin-button-com blue big data-v-27d52676" bindtap="__e">返回</button></app-result>
+<app-result vue-id="3beb80ba-1" title="已提交" class="data-v-106402d6" bind:__l="__l" vue-slots="{{['default']}}"><view class="dec data-v-106402d6"></view><button data-event-opts="{{[['tap',[['close',['$event']]]]]}}" class="admin-button-com blue big data-v-106402d6" bindtap="__e">返回</button></app-result>

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

@@ -1 +1 @@
-.dec.data-v-27d52676{color:#666;font-size:28rpx;font-weight:400;margin-bottom:30rpx}.admin-button-com.data-v-27d52676{margin-bottom:20rpx;width:100%}
+.dec.data-v-106402d6{color:#666;font-size:28rpx;font-weight:400;margin-bottom:30rpx}.admin-button-com.data-v-106402d6{margin-bottom:20rpx;width:100%}

+ 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,e,n){"use strict";n.r(e);var u=n("a3b0"),a=n("d5f6");for(var r in a)["default"].indexOf(r)<0&&function(t){n.d(e,t,(function(){return a[t]}))}(r);n("5a48");var o,c=n("0095"),i=Object(c["a"])(a["default"],u["b"],u["c"],!1,null,"35c29a0e",null,!1,u["a"],o);e["default"]=i.exports},"5a48":function(t,e,n){"use strict";var u=n("e97b"),a=n.n(u);a.a},6045:function(t,e,n){"use strict";(function(t){n("6cdc");u(n("4a15"));var e=u(n("231b"));function u(t){return t&&t.__esModule?t:{default:t}}t(e.default)}).call(this,n("f3be")["createPage"])},"8d32":function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var u={name:"AppResult",methods:{goClose:function(){this.pageTo({url:"/admin/home/workbench",type:3})},go_detail:function(){this.pageTo({url:"/pagesPurchase/purDetails?status=2&id="+this.option.id,type:2})}}};e.default=u},a3b0:function(t,e,n){"use strict";var u;n.d(e,"b",(function(){return a})),n.d(e,"c",(function(){return r})),n.d(e,"a",(function(){return u}));var a=function(){var t=this,e=t.$createElement;t._self._c},r=[]},d5f6:function(t,e,n){"use strict";n.r(e);var u=n("8d32"),a=n.n(u);for(var r in u)["default"].indexOf(r)<0&&function(t){n.d(e,t,(function(){return u[t]}))}(r);e["default"]=a.a},e97b:function(t,e,n){}},[["6045","common/runtime","common/vendor"]]]);
+require('common/vendor.js');(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pagesPurchase/particulars"],{"231b":function(t,n,e){"use strict";e.r(n);var i=e("2927"),a=e("d5f6");for(var u in a)["default"].indexOf(u)<0&&function(t){e.d(n,t,(function(){return a[t]}))}(u);e("80c7");var o,c=e("0095"),r=Object(c["a"])(a["default"],i["b"],i["c"],!1,null,"728fcfa4",null,!1,i["a"],o);n["default"]=r.exports},2927:function(t,n,e){"use strict";var i;e.d(n,"b",(function(){return a})),e.d(n,"c",(function(){return u})),e.d(n,"a",(function(){return i}));var a=function(){var t=this,n=t.$createElement;t._self._c},u=[]},6045:function(t,n,e){"use strict";(function(t){e("6cdc");i(e("4a15"));var n=i(e("231b"));function i(t){return t&&t.__esModule?t:{default:t}}t(n.default)}).call(this,e("f3be")["createPage"])},"80c7":function(t,n,e){"use strict";var i=e("ac7b"),a=e.n(i);a.a},"8d32":function(t,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var i={name:"AppResult",data:function(){return{hasInit:!1}},onLoad:function(){this.hasInit=!0},onShow:function(){0==this.hasInit&&this.$store.commit("setLoginInfo",{})},methods:{openMind:function(){this.hasInit=!1,this.pageTo({url:"/pagesClient/official/warn"})},goClose:function(){this.pageTo({url:"/admin/home/workbench",type:3})},goDetail:function(){this.pageTo({url:"/pagesPurchase/purDetails?status=2&id="+this.option.id,type:2})}}};n.default=i},ac7b:function(t,n,e){},d5f6:function(t,n,e){"use strict";e.r(n);var i=e("8d32"),a=e.n(i);for(var u in i)["default"].indexOf(u)<0&&function(t){e.d(n,t,(function(){return i[t]}))}(u);n["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-35c29a0e"><view class="billing_box_bg data-v-35c29a0e"><view class="top-view data-v-35c29a0e"></view><view class="result-view data-v-35c29a0e"><view class="{{['data-v-35c29a0e','iconfont','iconchenggong']}}"></view><view class="result-title data-v-35c29a0e">支付成功</view><button data-event-opts="{{[['tap',[['go_detail',['$event']]]]]}}" class="admin-button-com blue big data-v-35c29a0e" bindtap="__e">订单详情</button><button data-event-opts="{{[['tap',[['goClose',['$event']]]]]}}" class="admin-button-com big data-v-35c29a0e" bindtap="__e">返回首页</button></view></view></view>
+<view class="app-content data-v-728fcfa4"><view class="billing_box_bg data-v-728fcfa4"><view class="top-view data-v-728fcfa4"></view><view class="result-view data-v-728fcfa4"><view class="{{['data-v-728fcfa4','iconfont','iconchenggong']}}"></view><view class="result-title data-v-728fcfa4">支付成功</view><block wx:if="{{loginInfo.admin.subscribe==0}}"><button data-event-opts="{{[['tap',[['openMind',['$event']]]]]}}" class="admin-button-com blue big data-v-728fcfa4" bindtap="__e">开启动态提醒</button></block><block wx:if="{{loginInfo.admin.subscribe==0}}"><button data-event-opts="{{[['tap',[['goDetail',['$event']]]]]}}" class="admin-button-com big data-v-728fcfa4" bindtap="__e">订单详情</button></block><block wx:if="{{loginInfo.admin.subscribe==1}}"><button data-event-opts="{{[['tap',[['goDetail',['$event']]]]]}}" class="admin-button-com blue big data-v-728fcfa4" bindtap="__e">订单详情</button></block><button data-event-opts="{{[['tap',[['goClose',['$event']]]]]}}" class="admin-button-com big data-v-728fcfa4" bindtap="__e">返回首页</button></view></view></view>

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

@@ -1 +1 @@
-.billing_box_bg.data-v-35c29a0e{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-35c29a0e{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-35c29a0e{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-35c29a0e{font-size:170rpx;color:#049e2c}.billing_box_bg .result-view .result-title.data-v-35c29a0e{margin:50rpx 0 70rpx;font-size:32rpx}.billing_box_bg .result-view .close_btn.data-v-35c29a0e{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-35c29a0e{margin-bottom:20rpx;width:100%}
+.billing_box_bg.data-v-728fcfa4{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-728fcfa4{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-728fcfa4{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-728fcfa4{font-size:170rpx;color:#049e2c}.billing_box_bg .result-view .result-title.data-v-728fcfa4{margin:50rpx 0 70rpx;font-size:32rpx}.billing_box_bg .result-view .close_btn.data-v-728fcfa4{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-728fcfa4{margin-bottom:20rpx;width:100%}

+ 24 - 14
hdApp/dist/build/mp-weixin/project.config.json

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

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

@@ -117,6 +117,5 @@
   },
   "usingComponents": {
     "tab-bar": "/components/app-tabbar"
-  },
-  "sitemapLocation": "sitemap.json"
+  }
 }

File diff suppressed because it is too large
+ 0 - 0
mallApp/dist/build/mp-weixin/common/main.wxss


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

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

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

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

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

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

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

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

+ 2 - 2
mallApp/dist/build/mp-weixin/components/plugin/list-cell.json

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

+ 2 - 2
mallApp/dist/build/mp-weixin/components/plugin/list-view.json

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

+ 2 - 2
mallApp/dist/build/mp-weixin/components/plugin/modal.json

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

+ 2 - 2
mallApp/dist/build/mp-weixin/components/plugin/rate.json

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

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

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

+ 5 - 5
mallApp/dist/build/mp-weixin/ext.json

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

+ 2 - 2
mallApp/dist/build/mp-weixin/pages/goods/components/buy-foot.json

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

+ 2 - 2
mallApp/dist/build/mp-weixin/pages/home/components/goods-list-middle.json

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

+ 7 - 34
mallApp/dist/build/mp-weixin/project.config.json

@@ -5,54 +5,27 @@
   },
   "setting": {
     "urlCheck": false,
-    "es6": true,
-    "enhance": true,
-    "postcss": true,
-    "preloadBackgroundData": false,
-    "minified": true,
-    "newFeature": false,
-    "coverView": true,
-    "nodeModules": false,
-    "autoAudits": false,
-    "showShadowRootInWxmlPanel": true,
-    "scopeDataCheck": false,
-    "uglifyFileName": false,
-    "checkInvalidKey": true,
-    "checkSiteMap": true,
-    "uploadWithSourceMap": true,
-    "compileHotReLoad": false,
-    "lazyloadPlaceholderEnable": false,
-    "useMultiFrameRuntime": true,
-    "useApiHook": true,
-    "useApiHostProcess": false,
-    "babelSetting": {
-      "ignore": [],
-      "disablePlugins": [],
-      "outputPath": ""
-    },
-    "enableEngineNative": false,
-    "useIsolateContext": true,
-    "userConfirmedBundleSwitch": false,
-    "packNpmManually": false,
-    "packNpmRelationList": [],
-    "minifyWXSS": true,
-    "showES6CompileOption": false
+    "es6": true
   },
   "compileType": "miniprogram",
   "libVersion": "",
-  "appid": "wxe41bd5816affd0ba",
-  "projectname": "%E5%95%86%E5%9F%8E",
+  "appid": "wx99a1dfc4171efb42",
+  "projectname": "商城",
   "condition": {
     "search": {
+      "current": -1,
       "list": []
     },
     "conversation": {
+      "current": -1,
       "list": []
     },
     "game": {
+      "current": -1,
       "list": []
     },
     "miniprogram": {
+      "current": -1,
       "list": []
     }
   }

+ 6 - 6
mallApp/dist/build/mp-weixin/static/iconfont/iconfont.css

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

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