skiy 3 years ago
parent
commit
3c9daf8c8b
46 changed files with 26 additions and 24 deletions
  1. 4 4
      pages/order/info.vue
  2. 2 2
      pages/order/order.vue
  3. 17 16
      pages/refund/refund.vue
  4. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
  5. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/u-header.js.map
  6. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/Delivery/Delivery.js.map
  7. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/Delivery/create.js.map
  8. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/Delivery/location.js.map
  9. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/Marketing/Marketing.js.map
  10. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/Marketing/coupon.js.map
  11. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/Marketing/vipers.js.map
  12. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
  13. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map
  14. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/Withdrawal.js.map
  15. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/mine.js.map
  16. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/password.js.map
  17. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/info.js.map
  18. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/order.js.map
  19. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/perfect.js.map
  20. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/settle.js.map
  21. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/transport.js.map
  22. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/video.js.map
  23. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/refund/refund.js.map
  24. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/turnover/info.js.map
  25. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/turnover/turnover.js.map
  26. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-badge/u-badge.js.map
  27. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-checkbox-group/u-checkbox-group.js.map
  28. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-checkbox/u-checkbox.js.map
  29. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-form-item/u-form-item.js.map
  30. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-form/u-form.js.map
  31. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-icon/u-icon.js.map
  32. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-index-anchor/u-index-anchor.js.map
  33. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-index-list/u-index-list.js.map
  34. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-input/u-input.js.map
  35. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-loading/u-loading.js.map
  36. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-mask/u-mask.js.map
  37. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-picker/u-picker.js.map
  38. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-popup/u-popup.js.map
  39. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-search/u-search.js.map
  40. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-subsection/u-subsection.js.map
  41. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-switch/u-switch.js.map
  42. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-tabs/u-tabs.js.map
  43. 0 0
      unpackage/dist/dev/mp-weixin/pages/order/info.wxml
  44. 2 2
      unpackage/dist/dev/mp-weixin/pages/order/order.js
  45. 1 0
      unpackage/dist/dev/mp-weixin/pages/refund/refund.js
  46. 0 0
      unpackage/dist/dev/mp-weixin/pages/refund/refund.wxml

+ 4 - 4
pages/order/info.vue

@@ -231,12 +231,12 @@
 			<view class="title">
 				配送信息
 			</view>
-			<view class="row" v-if="info.senders[0].user.nickname">
+			<view class="row" v-if="info.senders[0].user.name">
 				<view class="name">
 					取宠代理
 				</view>
 				<view class="text">
-					{{info.senders[0]?info.senders[0].user.nickname: "-"}}
+					{{info.senders[0]?info.senders[0].user.name: "-"}}
 				</view>
 			</view>
 			<view class="row" v-if="info.senders[0].user.mobile">
@@ -251,12 +251,12 @@
 					</image>
 				</view>
 			</view>
-			<view class="row" v-if="info.senders[1].user.nickname">
+			<view class="row" v-if="info.senders[1].user.name">
 				<view class="name">
 					派送代理
 				</view>
 				<view class="text">
-					{{info.senders[1]?info.senders[1].user.nickname: "-"}}
+					{{info.senders[1]?info.senders[1].user.name: "-"}}
 				</view>
 			</view>
 			<view class="row" v-if="info.senders[1].user.mobile">

+ 2 - 2
pages/order/order.vue

@@ -684,9 +684,9 @@
 			})
 		},
 		onLoad() {
-			this.getData()
+			// this.getData()
 			// 获取订单数量
-			this.getDataNum()
+			// this.getDataNum()
 			
 		},
 		onShow() {

File diff suppressed because it is too large
+ 17 - 16
pages/refund/refund.vue


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/u-header.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/Delivery/Delivery.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/Delivery/create.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/Delivery/location.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/Marketing/Marketing.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/Marketing/coupon.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/Marketing/vipers.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/Withdrawal.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/mine.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/password.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/info.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/order.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/perfect.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/settle.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/transport.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/video.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/refund/refund.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/turnover/info.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/turnover/turnover.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-badge/u-badge.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-checkbox-group/u-checkbox-group.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-checkbox/u-checkbox.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-form-item/u-form-item.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-form/u-form.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-icon/u-icon.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-index-anchor/u-index-anchor.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-index-list/u-index-list.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-input/u-input.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-loading/u-loading.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-mask/u-mask.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-picker/u-picker.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-popup/u-popup.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-search/u-search.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-subsection/u-subsection.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-switch/u-switch.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-tabs/u-tabs.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/mp-weixin/pages/order/info.wxml


+ 2 - 2
unpackage/dist/dev/mp-weixin/pages/order/order.js

@@ -856,9 +856,9 @@ __webpack_require__.r(__webpack_exports__);
 
   },
   onLoad: function onLoad() {
-    this.getData();
+    // this.getData()
     // 获取订单数量
-    this.getDataNum();
+    // this.getDataNum()
 
   },
   onShow: function onShow() {

+ 1 - 0
unpackage/dist/dev/mp-weixin/pages/refund/refund.js

@@ -354,6 +354,7 @@ __webpack_require__.r(__webpack_exports__);
 //
 //
 //
+//
 var _default =
 {
   data: function data() {

File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/mp-weixin/pages/refund/refund.wxml


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