shish 4 vuotta sitten
vanhempi
commit
cbf90e0e15
22 muutettua tiedostoa jossa 41 lisäystä ja 63 poistoa
  1. 2 2
      ghsApp/dist/build/mp-weixin/admin/clear/customOrderItem.json
  2. 1 1
      ghsApp/dist/build/mp-weixin/admin/home/components/OrderItem.js
  3. 0 0
      ghsApp/dist/build/mp-weixin/admin/home/components/OrderItem.wxml
  4. 0 2
      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. 2 2
      ghsApp/dist/build/mp-weixin/admin/home/components/module/operate.json
  7. 2 2
      ghsApp/dist/build/mp-weixin/admin/home/components/plugin/time-axis.json
  8. 0 0
      ghsApp/dist/build/mp-weixin/admin/order/itemOrder.js
  9. 1 1
      ghsApp/dist/build/mp-weixin/admin/order/itemOrder.wxml
  10. 0 0
      ghsApp/dist/build/mp-weixin/admin/order/itemOrder.wxss
  11. 2 2
      ghsApp/dist/build/mp-weixin/components/app-coupon-sel.json
  12. 2 2
      ghsApp/dist/build/mp-weixin/components/module/allSelectInput.json
  13. 2 2
      ghsApp/dist/build/mp-weixin/components/module/app-share-mask.json
  14. 2 2
      ghsApp/dist/build/mp-weixin/components/none-hd.json
  15. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/badge.json
  16. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/fab.json
  17. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/selectList.json
  18. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/tabs.json
  19. 6 33
      ghsApp/dist/build/mp-weixin/project.config.json
  20. 7 0
      ghsApp/dist/build/mp-weixin/sitemap.json
  21. 1 1
      ghsApp/src/admin/home/components/OrderItem.vue
  22. 1 1
      ghsApp/src/admin/order/itemOrder.vue

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

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

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

@@ -1,4 +1,4 @@
-(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"],{"0b6a":function(t,e,n){"use strict";var r;n.d(e,"b",(function(){return a})),n.d(e,"c",(function(){return u})),n.d(e,"a",(function(){return r}));var a=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}})},u=[]},"1c52":function(t,e,n){"use strict";n.r(e);var r=n("0b6a"),a=n("c7b3");for(var u in a)["default"].indexOf(u)<0&&function(t){n.d(e,t,(function(){return a[t]}))}(u);n("f2df1");var c,o=n("0095"),f=Object(o["a"])(a["default"],r["b"],r["c"],!1,null,"4077d750",null,!1,r["a"],c);e["default"]=f.exports},"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},c7b3:function(t,e,n){"use strict";n.r(e);var r=n("7f52"),a=n.n(r);for(var u in r)["default"].indexOf(u)<0&&function(t){n.d(e,t,(function(){return r[t]}))}(u);e["default"]=a.a},e46f:function(t,e,n){},f2df1:function(t,e,n){"use strict";var r=n("e46f"),a=n.n(r);a.a}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'admin/home/components/OrderItem-create-component',
     'admin/home/components/OrderItem-create-component',
     {
     {

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
ghsApp/dist/build/mp-weixin/admin/home/components/OrderItem.wxml


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 2
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 @@
 {
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }
 }

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

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
ghsApp/dist/build/mp-weixin/admin/order/itemOrder.js


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

@@ -1 +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>
+<view class="app-main app-content _div data-v-5e5ed6ba"><view class="list-wrap _div data-v-5e5ed6ba"><block wx:if="{{!$root.g0}}"><block class="data-v-5e5ed6ba"><block wx:for="{{$root.l0}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="list _div data-v-5e5ed6ba"><block wx:if="{{!item.g1}}"><view class="_div data-v-5e5ed6ba"><order-item vue-id="{{'7935f66a-1-'+index}}" item="{{item.$orig.orderInfo}}" data-event-opts="{{[['^orderEventBtn',[['orderEventBtn']]]]}}" bind:orderEventBtn="__e" class="data-v-5e5ed6ba" bind:__l="__l"></order-item></view></block></view></block></block></block><block wx:else><block class="data-v-5e5ed6ba"><app-wrapper-empty vue-id="7935f66a-2" title="暂无数据" is-empty="{{$root.g2}}" class="data-v-5e5ed6ba" bind:__l="__l"></app-wrapper-empty></block></block></view></view>

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
ghsApp/dist/build/mp-weixin/admin/order/itemOrder.wxss


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

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

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

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

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

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

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

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

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

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

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

+ 1 - 1
ghsApp/src/admin/home/components/OrderItem.vue

@@ -1,5 +1,5 @@
 <template>
 <template>
-    <view>
+    <view  @click="pageTo({url:'/pagesOrder/detail',query: {id: item.id}})">
         <view class="order-top_box">
         <view class="order-top_box">
         
         
         <image style="width: 38rpx;height:38rpx;border-radius:38rpx;" mode="aspectFit" :src="item.customAvatarUrl"></image>
         <image style="width: 38rpx;height:38rpx;border-radius:38rpx;" mode="aspectFit" :src="item.customAvatarUrl"></image>

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

@@ -3,7 +3,7 @@
 
 
     <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">
           <div v-if="!$util.isEmpty(item.orderInfo)">
           <div v-if="!$util.isEmpty(item.orderInfo)">
             <OrderItem :item="item.orderInfo" @orderEventBtn="orderEventBtn"></OrderItem>
             <OrderItem :item="item.orderInfo" @orderEventBtn="orderEventBtn"></OrderItem>
           </div>
           </div>

Kaikkia tiedostoja ei voida näyttää, sillä liian monta tiedostoa muuttui tässä diffissä