Browse Source

销售记录

shish 4 years ago
parent
commit
352d705399
43 changed files with 93 additions and 65 deletions
  1. 10 0
      ghsApp/dist/build/mp-weixin/admin/home/components/OrderItem.js
  2. 4 0
      ghsApp/dist/build/mp-weixin/admin/home/components/OrderItem.json
  3. 0 0
      ghsApp/dist/build/mp-weixin/admin/home/components/OrderItem.wxml
  4. 2 0
      ghsApp/dist/build/mp-weixin/admin/home/components/OrderItem.wxss
  5. 2 2
      ghsApp/dist/build/mp-weixin/admin/home/components/module/operate-line.json
  6. 0 0
      ghsApp/dist/build/mp-weixin/admin/home/order.js
  7. 1 1
      ghsApp/dist/build/mp-weixin/admin/home/order.json
  8. 0 0
      ghsApp/dist/build/mp-weixin/admin/home/order.wxml
  9. 0 2
      ghsApp/dist/build/mp-weixin/admin/home/order.wxss
  10. 1 1
      ghsApp/dist/build/mp-weixin/admin/item/components/ItemStock.js
  11. 1 1
      ghsApp/dist/build/mp-weixin/admin/item/components/ItemStock.wxml
  12. 1 1
      ghsApp/dist/build/mp-weixin/admin/item/components/ItemStock.wxss
  13. 0 0
      ghsApp/dist/build/mp-weixin/admin/order/itemOrder.js
  14. 8 0
      ghsApp/dist/build/mp-weixin/admin/order/itemOrder.json
  15. 1 0
      ghsApp/dist/build/mp-weixin/admin/order/itemOrder.wxml
  16. 0 0
      ghsApp/dist/build/mp-weixin/admin/order/itemOrder.wxss
  17. 6 0
      ghsApp/dist/build/mp-weixin/app.json
  18. 0 0
      ghsApp/dist/build/mp-weixin/common/runtime.js
  19. 0 0
      ghsApp/dist/build/mp-weixin/common/vendor.js
  20. 2 2
      ghsApp/dist/build/mp-weixin/components/app-date-picker.json
  21. 2 2
      ghsApp/dist/build/mp-weixin/components/app-img.json
  22. 2 2
      ghsApp/dist/build/mp-weixin/components/app-uploader.json
  23. 2 2
      ghsApp/dist/build/mp-weixin/components/module/allMoreSelectInput.json
  24. 2 2
      ghsApp/dist/build/mp-weixin/components/module/allSelectInput.json
  25. 2 2
      ghsApp/dist/build/mp-weixin/components/module/app-close.json
  26. 2 2
      ghsApp/dist/build/mp-weixin/components/module/app-vip.json
  27. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/dropdown-list.json
  28. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/simple-address.json
  29. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/t-table/t-table.json
  30. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/t-table/t-td.json
  31. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/t-table/t-th.json
  32. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/t-table/t-tr.json
  33. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/tabs.json
  34. 2 2
      ghsApp/dist/build/mp-weixin/pagesGys/detailsItem.json
  35. 1 1
      ghsApp/dist/build/mp-weixin/pagesOrder/common/vendor.js
  36. 0 0
      ghsApp/dist/build/mp-weixin/pagesOrder/detail.js
  37. 2 2
      ghsApp/dist/build/mp-weixin/pagesPurchase/orderItem.json
  38. 0 7
      ghsApp/dist/build/mp-weixin/sitemap.json
  39. 1 1
      ghsApp/src/admin/item/components/ItemStock.vue
  40. 3 3
      ghsApp/src/admin/order/itemOrder.vue
  41. 6 6
      ghsApp/src/ext.json
  42. 7 1
      ghsApp/src/manifest.json
  43. 6 6
      ghsApp/src/static/iconfont/iconfont.css

+ 10 - 0
ghsApp/dist/build/mp-weixin/admin/home/components/OrderItem.js

@@ -0,0 +1,10 @@
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["admin/home/components/OrderItem"],{"1c52":function(t,e,n){"use strict";n.r(e);var r=n("39c2"),u=n("c7b3");for(var a in u)["default"].indexOf(a)<0&&function(t){n.d(e,t,(function(){return u[t]}))}(a);n("9089");var c,o=n("0095"),i=Object(o["a"])(u["default"],r["b"],r["c"],!1,null,"5df3180d",null,!1,r["a"],c);e["default"]=i.exports},"39c2":function(t,e,n){"use strict";var r;n.d(e,"b",(function(){return u})),n.d(e,"c",(function(){return a})),n.d(e,"a",(function(){return r}));var u=function(){var t=this,e=t.$createElement,n=(t._self._c,t.statusFormat(t.item.status)),r=parseFloat(t.item.actPrice);t.$mp.data=Object.assign({},{$root:{m0:n,m1:r}})},a=[]},"53db":function(t,e,n){},"7f52":function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var r={name:"OrderItem",components:{},props:{item:{required:!0}},data:function(){return{}},methods:{orderEventBtn:function(t,e){this.$emit("orderEventBtn",t,e)},statusFormat:function(t){switch(t){case"1":return"待确认";case"2":return"待配送";case"3":return"配送中";case"4":return"已完成";case"5":return"已取消";case"6":return"已退款";default:return""}}}};e.default=r},9089:function(t,e,n){"use strict";var r=n("53db"),u=n.n(r);u.a},c7b3:function(t,e,n){"use strict";n.r(e);var r=n("7f52"),u=n.n(r);for(var a in r)["default"].indexOf(a)<0&&function(t){n.d(e,t,(function(){return r[t]}))}(a);e["default"]=u.a}}]);
+;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
+    'admin/home/components/OrderItem-create-component',
+    {
+        'admin/home/components/OrderItem-create-component':(function(module, exports, __webpack_require__){
+            __webpack_require__('f3be')['createComponent'](__webpack_require__("1c52"))
+        })
+    },
+    [['admin/home/components/OrderItem-create-component']]
+]);

+ 4 - 0
ghsApp/dist/build/mp-weixin/admin/home/components/OrderItem.json

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

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


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


+ 2 - 2
ghsApp/dist/build/mp-weixin/admin/home/components/module/operate-line.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/order.js


+ 1 - 1
ghsApp/dist/build/mp-weixin/admin/home/order.json

@@ -8,6 +8,6 @@
     "modal-module": "/components/plugin/modal",
     "modal-module": "/components/plugin/modal",
     "app-search-module": "/components/module/app-search",
     "app-search-module": "/components/module/app-search",
     "dorpdown-select": "/components/module/dorpdownSelect",
     "dorpdown-select": "/components/module/dorpdownSelect",
-    "app-avatar-module": "/components/module/app-avatar"
+    "order-item": "/admin/home/components/OrderItem"
   }
   }
 }
 }

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


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


+ 1 - 1
ghsApp/dist/build/mp-weixin/admin/item/components/ItemStock.js

@@ -1,4 +1,4 @@
-require('../common/vendor.js');(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["admin/item/components/ItemStock"],{"08aa":function(t,n,e){},"22d4a":function(t,n,e){"use strict";e.r(n);var o=e("2614"),i=e.n(o);for(var a in o)["default"].indexOf(a)<0&&function(t){e.d(n,t,(function(){return o[t]}))}(a);n["default"]=i.a},2614:function(t,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var o=e("7602"),i=function(){Promise.all([e.e("common/vendor"),e.e("components/app-img")]).then(function(){return resolve(e("cb3c"))}.bind(null,e)).catch(e.oe)},a={name:"Commodity",components:{AppImg:i},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{STOCK_TYPE:o.STOCK_TYPE}},methods:{goToStockDetail:function(t){this.$util.pageTo({url:"/pagesStorehouse/stockWarn/detailed?id="+t})},goToProduct:function(t){this.$emit("goToProduct",t)},customNum:function(){this.$emit("customNum")},addEvent:function(){this.$emit("add")},subtractEvent:function(){this.$emit("subtract")},delEvent:function(){this.$emit("del")}}};n.default=a},43604:function(t,n,e){"use strict";e.r(n);var o=e("b7d0"),i=e("22d4a");for(var a in i)["default"].indexOf(a)<0&&function(t){e.d(n,t,(function(){return i[t]}))}(a);e("d11b");var u,c=e("0095"),r=Object(c["a"])(i["default"],o["b"],o["c"],!1,null,"417abe0b",null,!1,o["a"],u);n["default"]=r.exports},b7d0:function(t,n,e){"use strict";var o;e.d(n,"b",(function(){return i})),e.d(n,"c",(function(){return a})),e.d(n,"a",(function(){return o}));var i=function(){var t=this,n=t.$createElement,e=(t._self._c,parseFloat(t.info.price)),o=parseFloat(t.info.stock);t.$mp.data=Object.assign({},{$root:{m0:e,m1:o}})},a=[]},d11b:function(t,n,e){"use strict";var o=e("08aa"),i=e.n(o);i.a}}]);
+require('../common/vendor.js');(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["admin/item/components/ItemStock"],{"0638":function(t,e,n){"use strict";var o;n.d(e,"b",(function(){return i})),n.d(e,"c",(function(){return u})),n.d(e,"a",(function(){return o}));var i=function(){var t=this,e=t.$createElement,n=(t._self._c,parseFloat(t.info.price)),o=parseFloat(t.info.stock);t.$mp.data=Object.assign({},{$root:{m0:n,m1:o}})},u=[]},"0c1b":function(t,e,n){"use strict";var o=n("e465"),i=n.n(o);i.a},"22d4a":function(t,e,n){"use strict";n.r(e);var o=n("2614"),i=n.n(o);for(var u in o)["default"].indexOf(u)<0&&function(t){n.d(e,t,(function(){return o[t]}))}(u);e["default"]=i.a},2614:function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var o=n("7602"),i=function(){Promise.all([n.e("common/vendor"),n.e("components/app-img")]).then(function(){return resolve(n("cb3c"))}.bind(null,n)).catch(n.oe)},u={name:"Commodity",components:{AppImg:i},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{STOCK_TYPE:o.STOCK_TYPE}},methods:{goToOrderDetail:function(t){this.$util.pageTo({url:"/admin/order/itemOrder?id="+t})},goToStockDetail:function(t){this.$util.pageTo({url:"/pagesStorehouse/stockWarn/detailed?id="+t})},goToProduct:function(t){this.$emit("goToProduct",t)},customNum:function(){this.$emit("customNum")},addEvent:function(){this.$emit("add")},subtractEvent:function(){this.$emit("subtract")},delEvent:function(){this.$emit("del")}}};e.default=u},43604:function(t,e,n){"use strict";n.r(e);var o=n("0638"),i=n("22d4a");for(var u in i)["default"].indexOf(u)<0&&function(t){n.d(e,t,(function(){return i[t]}))}(u);n("0c1b");var r,a=n("0095"),c=Object(a["a"])(i["default"],o["b"],o["c"],!1,null,"2bcd8126",null,!1,o["a"],r);e["default"]=c.exports},e465:function(t,e,n){}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'admin/item/components/ItemStock-create-component',
     'admin/item/components/ItemStock-create-component',
     {
     {

+ 1 - 1
ghsApp/dist/build/mp-weixin/admin/item/components/ItemStock.wxml

@@ -1 +1 @@
-<view class="{{['product data-v-417abe0b',info.status==2?'sold-out':'']}}"><view class="item-cmd_bx data-v-417abe0b"><view class="img_bx data-v-417abe0b"><app-img vue-id="9f99c904-1" src="{{info.cover}}" alt="花材" mode="aspectFit" height="{{160}}" class="data-v-417abe0b" bind:__l="__l"></app-img></view><view data-event-opts="{{[['tap',[['pageTo',[['o',['url','/admin/item/detail'],['query',{id:info.id}]]]]]]]}}" class="cmd-info_bx active data-v-417abe0b" bindtap="__e"><view class="tit data-v-417abe0b">{{info.itemName||""}}</view><view class="kc data-v-417abe0b">{{"¥"+$root.m0}}</view><view class="num-open_bx data-v-417abe0b"><view class="open-bx data-v-417abe0b">库存<text style="margin-left:10rpx;font-size:23rpx;" class="data-v-417abe0b">{{$root.m1}}</text><block wx:if="{{info.status==2}}"><text style="margin-left:30rpx;font-size:23rpx;color:#999999;" class="data-v-417abe0b">已下架</text></block></view></view></view></view><text data-event-opts="{{[['tap',[['goToStockDetail',['$0'],['info.id']]]]]}}" class="bottom-button data-v-417abe0b" catchtap="__e">库存明细</text><text data-event-opts="{{[['tap',[['goToProduct',['$0'],['info.id']]]]]}}" class="bottom-button data-v-417abe0b" catchtap="__e">分享</text></view>
+<view class="product data-v-2bcd8126"><view class="{{['item-cmd_bx data-v-2bcd8126',info.status==2?'sold-out':'']}}"><view class="img_bx data-v-2bcd8126"><app-img vue-id="9f99c904-1" src="{{info.cover}}" alt="花材" mode="aspectFit" height="{{160}}" class="data-v-2bcd8126" bind:__l="__l"></app-img></view><view data-event-opts="{{[['tap',[['pageTo',[['o',['url','/admin/item/detail'],['query',{id:info.id}]]]]]]]}}" class="cmd-info_bx active data-v-2bcd8126" bindtap="__e"><view class="tit data-v-2bcd8126">{{info.itemName||""}}</view><view class="kc data-v-2bcd8126">{{"¥"+$root.m0}}</view><view class="num-open_bx data-v-2bcd8126"><view class="open-bx data-v-2bcd8126">库存<text style="margin-left:10rpx;font-size:23rpx;" class="data-v-2bcd8126">{{$root.m1}}</text><block wx:if="{{info.status==2}}"><text style="margin-left:30rpx;font-size:23rpx;color:#999999;" class="data-v-2bcd8126">已下架</text></block></view></view></view></view><text data-event-opts="{{[['tap',[['goToOrderDetail',['$0'],['info.id']]]]]}}" class="bottom-button data-v-2bcd8126" catchtap="__e">销售记录</text><text data-event-opts="{{[['tap',[['goToStockDetail',['$0'],['info.id']]]]]}}" class="bottom-button data-v-2bcd8126" catchtap="__e">库存明细</text><text data-event-opts="{{[['tap',[['goToProduct',['$0'],['info.id']]]]]}}" class="bottom-button data-v-2bcd8126" catchtap="__e">分享</text></view>

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

@@ -1 +1 @@
-.product.data-v-417abe0b{height:230rpx}.sold-out.data-v-417abe0b{background:#f5f5f5}.bottom-button.data-v-417abe0b{font-weight:400;border:2rpx solid #ccc;font-size:22rpx;border-radius:20rpx;padding:6rpx 22rpx 6rpx 22rpx;margin:0 26rpx 0 0;float:right;color:#aaa9a9}.item-cmd_bx.data-v-417abe0b{position:relative;margin-bottom:20rpx}.item-cmd_bx .img_bx.data-v-417abe0b{height:160rpx;width:160rpx;position:absolute;left:0rpx;top:0rpx}.item-cmd_bx .cmd-info_bx.data-v-417abe0b{position:relative;padding-left:177rpx}.item-cmd_bx .cmd-info_bx.active.data-v-417abe0b: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-417abe0b{font-size:30rpx;font-weight:700;color:#333;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;width:350rpx}.item-cmd_bx .cmd-info_bx .kc.data-v-417abe0b{color:red;font-size:24rpx;padding:24rpx 0 24rpx}.item-cmd_bx .cmd-info_bx .num-open_bx.data-v-417abe0b{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-417abe0b{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-417abe0b{color:#333;width:280rpx}.item-cmd_bx .cmd-info_bx .num-open_bx .open-bx text.data-v-417abe0b{font-size:24rpx;font-weight:700}
+.product.data-v-2bcd8126{height:230rpx}.sold-out.data-v-2bcd8126{background:#f0eeee}.bottom-button.data-v-2bcd8126{font-weight:400;border:2rpx solid #ccc;font-size:22rpx;border-radius:20rpx;padding:6rpx 22rpx 6rpx 22rpx;margin:0 26rpx 0 0;float:right;color:#aaa9a9}.item-cmd_bx.data-v-2bcd8126{height:160rpx;position:relative;margin-bottom:20rpx}.item-cmd_bx .img_bx.data-v-2bcd8126{height:160rpx;width:160rpx;position:absolute;left:0rpx;top:0rpx}.item-cmd_bx .cmd-info_bx.data-v-2bcd8126{position:relative;padding-left:177rpx}.item-cmd_bx .cmd-info_bx.active.data-v-2bcd8126: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-2bcd8126{font-size:30rpx;font-weight:700;color:#333;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;width:350rpx}.item-cmd_bx .cmd-info_bx .kc.data-v-2bcd8126{color:red;font-size:24rpx;padding:24rpx 0 24rpx}.item-cmd_bx .cmd-info_bx .num-open_bx.data-v-2bcd8126{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-2bcd8126{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-2bcd8126{color:#333;width:280rpx}.item-cmd_bx .cmd-info_bx .num-open_bx .open-bx text.data-v-2bcd8126{font-size:24rpx;font-weight:700}

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


+ 8 - 0
ghsApp/dist/build/mp-weixin/admin/order/itemOrder.json

@@ -0,0 +1,8 @@
+{
+  "navigationBarTitleText": "订单列表",
+  "usingComponents": {
+    "app-wrapper-empty": "/components/app-wrapper-empty",
+    "modal-module": "/components/plugin/modal",
+    "order-item": "/admin/home/components/OrderItem"
+  }
+}

+ 1 - 0
ghsApp/dist/build/mp-weixin/admin/order/itemOrder.wxml

@@ -0,0 +1 @@
+<view class="app-main app-content _div data-v-785511b5"><view class="list-wrap _div data-v-785511b5"><block wx:if="{{!$root.g0}}"><block class="data-v-785511b5"><block wx:for="{{$root.l0}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['pageTo',[['o',['url','/pagesOrder/detail'],['query',{id:item.$orig.id}]]]]]]]}}" class="list _div data-v-785511b5" bindtap="__e"><block wx:if="{{!item.g1}}"><view class="_div data-v-785511b5"><order-item vue-id="{{'7935f66a-1-'+index}}" item="{{item.$orig.orderInfo}}" data-event-opts="{{[['^orderEventBtn',[['orderEventBtn']]]]}}" bind:orderEventBtn="__e" class="data-v-785511b5" bind:__l="__l"></order-item></view></block></view></block></block></block><block wx:else><block class="data-v-785511b5"><app-wrapper-empty vue-id="7935f66a-2" title="暂无数据" is-empty="{{$root.g2}}" class="data-v-785511b5" bind:__l="__l"></app-wrapper-empty></block></block></view></view>

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


+ 6 - 0
ghsApp/dist/build/mp-weixin/app.json

@@ -323,6 +323,12 @@
         "list",
         "list",
         "rechargeList"
         "rechargeList"
       ]
       ]
+    },
+    {
+      "root": "admin/order",
+      "pages": [
+        "itemOrder"
+      ]
     }
     }
   ],
   ],
   "window": {
   "window": {

File diff suppressed because it is too large
+ 0 - 0
ghsApp/dist/build/mp-weixin/common/runtime.js


File diff suppressed because it is too large
+ 0 - 0
ghsApp/dist/build/mp-weixin/common/vendor.js


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

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

+ 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-uploader.json

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

+ 1 - 1
ghsApp/dist/build/mp-weixin/pagesOrder/common/vendor.js

@@ -1 +1 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pagesOrder/common/vendor"],{"55b5":function(e,r,t){"use strict";Object.defineProperty(r,"__esModule",{value:!0}),r.refundDetail=void 0;var u=o(t("14bf"));function o(e){return e&&e.__esModule?e:{default:e}}var d=function(e){return u.default.get("/refund/detail",e)};r.refundDetail=d},6277:function(e,r,t){"use strict";Object.defineProperty(r,"__esModule",{value:!0}),r.getOrderProduct=void 0;var u=o(t("14bf"));function o(e){return e&&e.__esModule?e:{default:e}}var d=function(e){return u.default.get("/order-item/get-order-product",e)};r.getOrderProduct=d}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pagesOrder/common/vendor"],{"55b5":function(e,n,r){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.refundDetail=void 0;var t=u(r("14bf"));function u(e){return e&&e.__esModule?e:{default:e}}var o=function(e){return t.default.get("/refund/detail",e)};n.refundDetail=o}}]);

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


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

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

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

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

+ 1 - 1
ghsApp/src/admin/item/components/ItemStock.vue

@@ -17,7 +17,7 @@
 			</view>
 			</view>
 		</view>
 		</view>
 	</view>
 	</view>
-	<text class="bottom-button" @click.stop="goToOrderDetail(info.id)">销售</text>
+	<text class="bottom-button" @click.stop="goToOrderDetail(info.id)">销售记录</text>
 	<text class="bottom-button" @click.stop="goToStockDetail(info.id)">库存明细</text>
 	<text class="bottom-button" @click.stop="goToStockDetail(info.id)">库存明细</text>
 	<text class="bottom-button" @click.stop="goToProduct(info.id)">分享</text>
 	<text class="bottom-button" @click.stop="goToProduct(info.id)">分享</text>
 </view>
 </view>

+ 3 - 3
ghsApp/src/admin/order/itemOrder.vue

@@ -4,9 +4,9 @@
     <div class="list-wrap">
     <div class="list-wrap">
       <block v-if="!$util.isEmpty(list.data)">
       <block v-if="!$util.isEmpty(list.data)">
         <div class="list" v-for="(item, index) in list.data" :key="index" @click="pageTo({url: '/pagesOrder/detail',query: {id: item.id,},})">
         <div class="list" v-for="(item, index) in list.data" :key="index" @click="pageTo({url: '/pagesOrder/detail',query: {id: item.id,},})">
-
-          <OrderItem :item="item" @orderEventBtn="orderEventBtn"></OrderItem>
-
+          <div v-if="!$util.isEmpty(item.orderInfo)">
+            <OrderItem :item="item.orderInfo" @orderEventBtn="orderEventBtn"></OrderItem>
+          </div>
         </div>
         </div>
       </block>
       </block>
       <block v-else>
       <block v-else>

+ 6 - 6
ghsApp/src/ext.json

@@ -1,12 +1,12 @@
 {
 {
   "extEnable": true,
   "extEnable": true,
-  "extAppid": "wx21b7c3ef12082099",
+  "extAppid": "wxcf32b3f0684c2433",
   "directCommit": false,
   "directCommit": false,
   "ext": {
   "ext": {
-    "account": 12362,
-    "apiHost": "https://api.shop.hzghd.com",
-    "socketApiHost": "api.shop.hzghd.com",
-    "imgHost": "https://img.hzghd.com",
-    "name":"花掌柜"
+    "account": 12358,
+    "apiHost": "https://api.shop.wixhb.com",
+    "socketApiHost": "api.shop.wixhb.com",
+    "imgHost": "https://img.wixhb.com",
+    "name":"销花宝"
   }
   }
 }
 }

+ 7 - 1
ghsApp/src/manifest.json

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

+ 6 - 6
ghsApp/src/static/iconfont/iconfont.css

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

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