Bladeren bron

邀请开店

shish 5 jaren geleden
bovenliggende
commit
d32a92f9d4
52 gewijzigde bestanden met toevoegingen van 86 en 86 verwijderingen
  1. 2 2
      ghsApp/dist/build/mp-weixin/admin/home/components/module/operate-line.json
  2. 2 2
      ghsApp/dist/build/mp-weixin/admin/home/components/module/operate.json
  3. 2 2
      ghsApp/dist/build/mp-weixin/admin/home/components/plugin/time-axis.json
  4. 2 2
      ghsApp/dist/build/mp-weixin/components/app-uploader.json
  5. 2 2
      ghsApp/dist/build/mp-weixin/components/module/allMoreSelectInput.json
  6. 2 2
      ghsApp/dist/build/mp-weixin/components/module/allSelectInput.json
  7. 2 2
      ghsApp/dist/build/mp-weixin/components/module/app-search.json
  8. 2 2
      ghsApp/dist/build/mp-weixin/components/module/app-tag.json
  9. 2 2
      ghsApp/dist/build/mp-weixin/components/module/app-vip.json
  10. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/badge.json
  11. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/bottom-popup.json
  12. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/fab.json
  13. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/list-cell.json
  14. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/selectList.json
  15. 2 2
      ghsApp/dist/build/mp-weixin/components/w-picker/date-picker.json
  16. 2 2
      ghsApp/dist/build/mp-weixin/components/w-picker/half-picker.json
  17. 2 2
      ghsApp/dist/build/mp-weixin/components/w-picker/linkage-picker.json
  18. 2 2
      ghsApp/dist/build/mp-weixin/components/w-picker/range-picker.json
  19. 2 2
      ghsApp/dist/build/mp-weixin/components/w-picker/region-picker.json
  20. 2 2
      ghsApp/dist/build/mp-weixin/components/w-picker/selector-picker.json
  21. 2 2
      ghsApp/dist/build/mp-weixin/components/w-picker/shortterm-picker.json
  22. 2 2
      ghsApp/dist/build/mp-weixin/components/w-picker/time-picker.json
  23. 0 0
      ghsApp/dist/build/mp-weixin/pagesClient/official/apply.js
  24. 0 0
      ghsApp/dist/build/mp-weixin/pagesClient/official/apply.wxml
  25. 1 1
      ghsApp/dist/build/mp-weixin/pagesClient/official/apply.wxss
  26. 1 1
      ghsApp/src/pagesClient/official/apply.vue
  27. 2 2
      hdApp/dist/build/mp-weixin/admin/coupon/components/selectCouponItem.json
  28. 2 2
      hdApp/dist/build/mp-weixin/admin/home/components/module/operate-line.json
  29. 2 2
      hdApp/dist/build/mp-weixin/admin/home/components/module/operate.json
  30. 0 0
      hdApp/dist/build/mp-weixin/common/vendor.js
  31. 2 2
      hdApp/dist/build/mp-weixin/components/app-img.json
  32. 2 2
      hdApp/dist/build/mp-weixin/components/module/allMoreSelectInput.json
  33. 2 2
      hdApp/dist/build/mp-weixin/components/module/allSelectInput.json
  34. 2 2
      hdApp/dist/build/mp-weixin/components/module/app-avatar.json
  35. 2 2
      hdApp/dist/build/mp-weixin/components/module/app-close.json
  36. 2 2
      hdApp/dist/build/mp-weixin/components/module/app-search.json
  37. 2 2
      hdApp/dist/build/mp-weixin/components/module/app-share-mask.json
  38. 2 2
      hdApp/dist/build/mp-weixin/components/module/app-vip.json
  39. 2 2
      hdApp/dist/build/mp-weixin/components/none-hd.json
  40. 2 2
      hdApp/dist/build/mp-weixin/components/plugin/alert.json
  41. 2 2
      hdApp/dist/build/mp-weixin/components/plugin/bottom-popup.json
  42. 2 2
      hdApp/dist/build/mp-weixin/components/plugin/fab.json
  43. 2 2
      hdApp/dist/build/mp-weixin/components/plugin/simple-address.json
  44. 2 2
      hdApp/dist/build/mp-weixin/components/plugin/tabs.json
  45. 0 0
      hdApp/dist/build/mp-weixin/pagesClient/official/apply.js
  46. 0 0
      hdApp/dist/build/mp-weixin/pagesClient/official/apply.wxml
  47. 1 1
      hdApp/dist/build/mp-weixin/pagesClient/official/apply.wxss
  48. 0 0
      hdApp/dist/build/mp-weixin/pagesPurchase/order.js
  49. 1 1
      hdApp/dist/build/mp-weixin/pagesPurchase/order.wxml
  50. 1 1
      hdApp/dist/build/mp-weixin/pagesPurchase/order.wxss
  51. 2 2
      hdApp/dist/build/mp-weixin/pagesPurchase/orderItem.json
  52. 1 1
      hdApp/src/pagesClient/official/apply.vue

+ 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": {}
 }
 }

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

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/module/app-vip.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/bottom-popup.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/list-cell.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/w-picker/date-picker.json

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

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/w-picker/half-picker.json

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

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/w-picker/linkage-picker.json

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

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/w-picker/range-picker.json

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

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/w-picker/region-picker.json

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

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/w-picker/selector-picker.json

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

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/w-picker/shortterm-picker.json

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

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/w-picker/time-picker.json

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

File diff suppressed because it is too large
+ 0 - 0
ghsApp/dist/build/mp-weixin/pagesClient/official/apply.js


File diff suppressed because it is too large
+ 0 - 0
ghsApp/dist/build/mp-weixin/pagesClient/official/apply.wxml


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

@@ -1 +1 @@
-.module-com.data-v-a3313d48{margin-bottom:20rpx;background-color:#fff}.module-com .module-tit.data-v-a3313d48{padding:20rpx 18rpx;font-size:28rpx;font-weight:600;border-bottom:1rpx solid #eee}.module-com .module-det.data-v-a3313d48{padding:0 30rpx}.line-cell .tui-title.data-v-a3313d48{width:210rpx;color:#666}.line-cell .tui-input.data-v-a3313d48{width:calc(100% - 210rpx);font-size:28rpx}.line-cell .tui-placeholder.data-v-a3313d48{color:#ccc}.line-cell .phcolor.data-v-a3313d48{color:#ccc}.btn-wrap.data-v-a3313d48{width:90%;margin:60rpx auto}.btn-wrap .admin-button-com.data-v-a3313d48{width:100%;margin:0 auto}.code-wrap .tui-input.data-v-a3313d48{width:calc(100% - 410rpx);font-size:28rpx}.code-wrap .tui-code.data-v-a3313d48{width:200rpx;text-align:center;border-left:1rpx solid #eee;color:#3385ff}.recommend-wrap.data-v-a3313d48{padding:30rpx 45rpx}.recommend-wrap .recommend-tag.data-v-a3313d48{font-size:28rpx;color:#666;margin-bottom:24rpx}.recommend-wrap .recommend-det.data-v-a3313d48{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}.recommend-wrap .recommend-det .recommend-info.data-v-a3313d48{margin-left:20rpx}.recommend-wrap .recommend-det .recommend-info .app-size-32.data-v-a3313d48{margin-bottom:4rpx}
+.module-com.data-v-502b4713{margin-bottom:20rpx;background-color:#fff}.module-com .module-tit.data-v-502b4713{padding:20rpx 18rpx;font-size:28rpx;font-weight:600;border-bottom:1rpx solid #eee}.module-com .module-det.data-v-502b4713{padding:0 30rpx}.line-cell .tui-title.data-v-502b4713{width:210rpx;color:#666}.line-cell .tui-input.data-v-502b4713{width:calc(100% - 210rpx);font-size:28rpx}.line-cell .tui-placeholder.data-v-502b4713{color:#ccc}.line-cell .phcolor.data-v-502b4713{color:#ccc}.btn-wrap.data-v-502b4713{width:90%;margin:60rpx auto}.btn-wrap .admin-button-com.data-v-502b4713{width:100%;margin:0 auto}.code-wrap .tui-input.data-v-502b4713{width:calc(100% - 410rpx);font-size:28rpx}.code-wrap .tui-code.data-v-502b4713{width:200rpx;text-align:center;border-left:1rpx solid #eee;color:#3385ff}.recommend-wrap.data-v-502b4713{padding:30rpx 45rpx}.recommend-wrap .recommend-tag.data-v-502b4713{font-size:28rpx;color:#666;margin-bottom:24rpx}.recommend-wrap .recommend-det.data-v-502b4713{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}.recommend-wrap .recommend-det .recommend-info.data-v-502b4713{margin-left:20rpx}.recommend-wrap .recommend-det .recommend-info .app-size-32.data-v-502b4713{margin-bottom:4rpx}

+ 1 - 1
ghsApp/src/pagesClient/official/apply.vue

@@ -152,7 +152,7 @@
           />
           />
           <div class="recommend-info">
           <div class="recommend-info">
             <div class="app-size-32">{{ merchantData.name }}</div>
             <div class="app-size-32">{{ merchantData.name }}</div>
-            <div class="app-color-2">{{ merchantData.fullAddress }}</div>
+            <div class="app-color-2"></div>
           </div>
           </div>
         </div>
         </div>
       </div>
       </div>

+ 2 - 2
hdApp/dist/build/mp-weixin/admin/coupon/components/selectCouponItem.json

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

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

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

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


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

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

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

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

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

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

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

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

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

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

+ 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/module/app-share-mask.json

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

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

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

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

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

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

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

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

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

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

File diff suppressed because it is too large
+ 0 - 0
hdApp/dist/build/mp-weixin/pagesClient/official/apply.js


File diff suppressed because it is too large
+ 0 - 0
hdApp/dist/build/mp-weixin/pagesClient/official/apply.wxml


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

@@ -1 +1 @@
-.module-com.data-v-66b45273{margin-bottom:20rpx;background-color:#fff}.module-com .module-tit.data-v-66b45273{padding:20rpx 18rpx;font-size:28rpx;font-weight:600;border-bottom:1rpx solid #eee}.module-com .module-det.data-v-66b45273{padding:0 30rpx}.line-cell .tui-title.data-v-66b45273{width:210rpx;color:#666}.line-cell .tui-input.data-v-66b45273{width:calc(100% - 210rpx);font-size:28rpx}.line-cell .tui-placeholder.data-v-66b45273{color:#ccc}.line-cell .phcolor.data-v-66b45273{color:#ccc}.btn-wrap.data-v-66b45273{width:90%;margin:60rpx auto}.btn-wrap .admin-button-com.data-v-66b45273{width:100%;margin:0 auto}.code-wrap .tui-input.data-v-66b45273{width:calc(100% - 410rpx);font-size:28rpx}.code-wrap .tui-code.data-v-66b45273{width:200rpx;text-align:center;border-left:1rpx solid #eee;color:#3385ff}.recommend-wrap.data-v-66b45273{padding:30rpx 45rpx}.recommend-wrap .recommend-tag.data-v-66b45273{font-size:28rpx;color:#666;margin-bottom:24rpx}.recommend-wrap .recommend-det.data-v-66b45273{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}.recommend-wrap .recommend-det .recommend-info.data-v-66b45273{margin-left:20rpx}.recommend-wrap .recommend-det .recommend-info .app-size-32.data-v-66b45273{margin-bottom:4rpx}
+.module-com.data-v-506a4348{margin-bottom:20rpx;background-color:#fff}.module-com .module-tit.data-v-506a4348{padding:20rpx 18rpx;font-size:28rpx;font-weight:600;border-bottom:1rpx solid #eee}.module-com .module-det.data-v-506a4348{padding:0 30rpx}.line-cell .tui-title.data-v-506a4348{width:210rpx;color:#666}.line-cell .tui-input.data-v-506a4348{width:calc(100% - 210rpx);font-size:28rpx}.line-cell .tui-placeholder.data-v-506a4348{color:#ccc}.line-cell .phcolor.data-v-506a4348{color:#ccc}.btn-wrap.data-v-506a4348{width:90%;margin:60rpx auto}.btn-wrap .admin-button-com.data-v-506a4348{width:100%;margin:0 auto}.code-wrap .tui-input.data-v-506a4348{width:calc(100% - 410rpx);font-size:28rpx}.code-wrap .tui-code.data-v-506a4348{width:200rpx;text-align:center;border-left:1rpx solid #eee;color:#3385ff}.recommend-wrap.data-v-506a4348{padding:30rpx 45rpx}.recommend-wrap .recommend-tag.data-v-506a4348{font-size:28rpx;color:#666;margin-bottom:24rpx}.recommend-wrap .recommend-det.data-v-506a4348{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}.recommend-wrap .recommend-det .recommend-info.data-v-506a4348{margin-left:20rpx}.recommend-wrap .recommend-det .recommend-info .app-size-32.data-v-506a4348{margin-bottom:4rpx}

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


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

@@ -1 +1 @@
-<view class="order-page data-v-5ea28b32"><block wx:if="{{tabIndex==0}}"><scroll-view class="order_list data-v-5ea28b32" scroll-y="{{true}}" scroll-view="{{true}}"><block class="data-v-5ea28b32"><block wx:if="{{!$root.g0}}"><block class="data-v-5ea28b32"><block wx:for="{{$root.l0}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['enter',['$0'],[[['supplierList','',index]]]]]]]}}" class="list_item data-v-5ea28b32" bindtap="__e"><image src="{{item.$orig.avatar}}" class="data-v-5ea28b32"></image><view class="store_name data-v-5ea28b32"><view class="store_title data-v-5ea28b32">{{item.$orig.name}}</view><view class="accumulative data-v-5ea28b32">{{"欠款: "+item.$orig.debtAmount}}</view></view><view class="store_btn data-v-5ea28b32"><block wx:if="{{item.m0>0}}"><view data-event-opts="{{[['tap',[['settleAccounts',['$0'],[[['supplierList','',index]]]]]]]}}" class="btn_entrance data-v-5ea28b32" catchtap="__e">结账</view></block><block wx:else><view data-event-opts="{{[['tap',[['',['$event']]]]]}}" class="btn_entrance btn_forbid data-v-5ea28b32" catchtap="__e">结账</view></block><view data-event-opts="{{[['tap',[['enter',['$0'],[[['supplierList','',index]]]]]]]}}" class="btn_entrance data-v-5ea28b32" catchtap="__e">采购</view></view></view></block></block></block><block wx:else><block class="data-v-5ea28b32"><app-wrapper-empty vue-id="74ac7040-1" title="暂无数据" is-empty="{{$root.g1}}" class="data-v-5ea28b32" bind:__l="__l"></app-wrapper-empty></block></block></block></scroll-view></block><kd-entrance vue-id="74ac7040-2" class="data-v-5ea28b32" bind:__l="__l"></kd-entrance></view>
+<view class="order-page data-v-5273abe5"><block wx:if="{{tabIndex==0}}"><scroll-view class="order_list data-v-5273abe5" scroll-y="{{true}}" scroll-view="{{true}}"><block class="data-v-5273abe5"><block wx:if="{{!$root.g0}}"><block class="data-v-5273abe5"><block wx:for="{{$root.l0}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['enter',['$0'],[[['supplierList','',index]]]]]]]}}" class="list_item data-v-5273abe5" bindtap="__e"><image src="{{item.$orig.avatar}}" class="data-v-5273abe5"></image><view class="store_name data-v-5273abe5"><view class="store_title data-v-5273abe5">{{item.$orig.name}}</view><view class="accumulative data-v-5273abe5">{{"欠款: "+item.$orig.debtAmount}}</view></view><view class="store_btn data-v-5273abe5"><block wx:if="{{item.m0>0}}"><view data-event-opts="{{[['tap',[['settleAccounts',['$0'],[[['supplierList','',index]]]]]]]}}" class="btn_entrance data-v-5273abe5" catchtap="__e">结账</view></block><block wx:else><view data-event-opts="{{[['tap',[['',['$event']]]]]}}" class="btn_entrance btn_forbid data-v-5273abe5" catchtap="__e">结账</view></block><view data-event-opts="{{[['tap',[['enter',['$0'],[[['supplierList','',index]]]]]]]}}" class="btn_entrance data-v-5273abe5" catchtap="__e">采购</view></view></view></block></block></block><block wx:else><block class="data-v-5273abe5"><app-wrapper-empty vue-id="74ac7040-1" title="暂无数据" is-empty="{{$root.g1}}" class="data-v-5273abe5" bind:__l="__l"></app-wrapper-empty></block></block></block></scroll-view></block></view>

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

@@ -1 +1 @@
-.order-page .tabs.data-v-5ea28b32{height:80rpx;line-height:80rpx}.order-page .tabs > view.data-v-5ea28b32{width:50%;text-align:center;font-size:28rpx;color:#666;display:inline-block}.order-page .tabs > .active.data-v-5ea28b32{position:relative;color:#3385ff;font-weight:700}.order-page .tabs > .active.data-v-5ea28b32::after{content:"";position:absolute;bottom:0;left:50%;-webkit-transform:translateX(-50%);transform:translateX(-50%);width:70rpx;height:6rpx;background:#3385ff}.order-page .order_list.data-v-5ea28b32{height:100%;background:#f0f2f6;padding:0 0 20rpx}.order-page .order_list .list_item.data-v-5ea28b32{margin:20rpx 0 0;position:relative;height:180rpx;width:100vw;background:#fff;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.order-page .order_list .list_item > image.data-v-5ea28b32{margin-left:30rpx;width:120rpx;height:120rpx;border-radius:60rpx}.order-page .order_list .list_item > .store_name.data-v-5ea28b32{margin-left:30rpx}.order-page .order_list .list_item > .store_name > .store_title.data-v-5ea28b32{margin-bottom:30rpx;font-size:32rpx;font-weight:700;color:#333}.order-page .order_list .list_item > .store_name > .accumulative.data-v-5ea28b32{font-size:26rpx;color:#999}.order-page .order_list .list_item > .store_btn.data-v-5ea28b32{position:absolute;right:30rpx}.order-page .order_list .list_item > .store_btn > .btn_entrance.data-v-5ea28b32{display:inline-block;font-size:26rpx;color:#3385ff;border:1rpx solid #3385ff;border-radius:8rpx;padding:15rpx 30rpx;margin-left:30rpx}.order-page .order_list .list_item > .store_btn > .btn_forbid.data-v-5ea28b32{border:1rpx solid #999;color:#999}.order-page .pay_list.data-v-5ea28b32{padding-top:20rpx;background-color:#f0f2f6}
+.order-page .tabs.data-v-5273abe5{height:80rpx;line-height:80rpx}.order-page .tabs > view.data-v-5273abe5{width:50%;text-align:center;font-size:28rpx;color:#666;display:inline-block}.order-page .tabs > .active.data-v-5273abe5{position:relative;color:#3385ff;font-weight:700}.order-page .tabs > .active.data-v-5273abe5::after{content:"";position:absolute;bottom:0;left:50%;-webkit-transform:translateX(-50%);transform:translateX(-50%);width:70rpx;height:6rpx;background:#3385ff}.order-page .order_list.data-v-5273abe5{height:100%;background:#f0f2f6;padding:0 0 20rpx}.order-page .order_list .list_item.data-v-5273abe5{margin:20rpx 0 0;position:relative;height:180rpx;width:100vw;background:#fff;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.order-page .order_list .list_item > image.data-v-5273abe5{margin-left:30rpx;width:120rpx;height:120rpx;border-radius:60rpx}.order-page .order_list .list_item > .store_name.data-v-5273abe5{margin-left:30rpx}.order-page .order_list .list_item > .store_name > .store_title.data-v-5273abe5{margin-bottom:30rpx;font-size:32rpx;font-weight:700;color:#333}.order-page .order_list .list_item > .store_name > .accumulative.data-v-5273abe5{font-size:26rpx;color:#999}.order-page .order_list .list_item > .store_btn.data-v-5273abe5{position:absolute;right:30rpx}.order-page .order_list .list_item > .store_btn > .btn_entrance.data-v-5273abe5{display:inline-block;font-size:26rpx;color:#3385ff;border:1rpx solid #3385ff;border-radius:8rpx;padding:15rpx 30rpx;margin-left:30rpx}.order-page .order_list .list_item > .store_btn > .btn_forbid.data-v-5273abe5{border:1rpx solid #999;color:#999}.order-page .pay_list.data-v-5273abe5{padding-top:20rpx;background-color:#f0f2f6}

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

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

+ 1 - 1
hdApp/src/pagesClient/official/apply.vue

@@ -122,7 +122,7 @@
           />
           />
           <div class="recommend-info">
           <div class="recommend-info">
             <div class="app-size-32">{{ merchantData.name }}</div>
             <div class="app-size-32">{{ merchantData.name }}</div>
-            <div class="app-color-2">{{ merchantData.fullAddress }}</div>
+            <div class="app-color-2"></div>
           </div>
           </div>
         </div>
         </div>
       </div>
       </div>

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