ymwl
liudan 1 year ago
parent aeb48d46fb
commit 8cbb070ca1
  1. 6
      pages/OrderDetails/OrderDetails.vue
  2. 2
      pages/warehouse/buy.vue
  3. 3
      pages/warehouse/sell.vue
  4. 2
      unpackage/dist/build/h5/index.html
  5. 6
      unpackage/dist/build/h5/static/js/chunk-vendors.a1e8ef11.js
  6. 1
      unpackage/dist/build/h5/static/js/index.d773c0d1.js
  7. 1
      unpackage/dist/build/h5/static/js/index.d8f84e51.js
  8. 1
      unpackage/dist/build/h5/static/js/pages-AccountSecurity-AccountSecurity.756a741e.js
  9. 1
      unpackage/dist/build/h5/static/js/pages-AccountSecurity-AccountSecurity.b464766a.js
  10. 1
      unpackage/dist/build/h5/static/js/pages-AccountSecurity-AccountSecurity~pages-AddressEdit-AddressEdit~pages-ChangePassword-ChangePassw~87dbfe28.1e52b9ff.js
  11. 1
      unpackage/dist/build/h5/static/js/pages-AccountSecurity-AccountSecurity~pages-AddressEdit-AddressEdit~pages-ChangePassword-ChangePassw~87dbfe28.bff25322.js
  12. 1
      unpackage/dist/build/h5/static/js/pages-AccountSecurity-AccountSecurity~pages-AddressEdit-AddressEdit~pages-ConfirmOrder-ConfirmOrder~~3a70436b.26eeeb2e.js
  13. 1
      unpackage/dist/build/h5/static/js/pages-AccountSecurity-AccountSecurity~pages-AddressEdit-AddressEdit~pages-ConfirmOrder-ConfirmOrder~~3a70436b.3174608b.js
  14. 1
      unpackage/dist/build/h5/static/js/pages-AddressEdit-AddressEdit.66bd828c.js
  15. 1
      unpackage/dist/build/h5/static/js/pages-AddressEdit-AddressEdit.7ad2551f.js
  16. 1
      unpackage/dist/build/h5/static/js/pages-AddressList-AddressList.0d976075.js
  17. 1
      unpackage/dist/build/h5/static/js/pages-AddressList-AddressList.3955cf58.js
  18. 1
      unpackage/dist/build/h5/static/js/pages-ChangePassword-ChangePassword.188ac702.js
  19. 1
      unpackage/dist/build/h5/static/js/pages-ChangePassword-ChangePassword.be8f32f5.js
  20. 1
      unpackage/dist/build/h5/static/js/pages-ChangePassword-ChangePassword~pages-ConfirmOrder-ConfirmOrder~pages-Information-Information~pa~3d136d08.993a4646.js
  21. 1
      unpackage/dist/build/h5/static/js/pages-ChangePassword-ChangePassword~pages-ConfirmOrder-ConfirmOrder~pages-Information-Information~pa~3d136d08.bb075b54.js
  22. 1
      unpackage/dist/build/h5/static/js/pages-ConfirmOrder-ConfirmOrder.68d9ee43.js
  23. 1
      unpackage/dist/build/h5/static/js/pages-ConfirmOrder-ConfirmOrder.c7873164.js
  24. 1
      unpackage/dist/build/h5/static/js/pages-GoodsDetails-GoodsDetails.1e1c469c.js
  25. 1
      unpackage/dist/build/h5/static/js/pages-GoodsDetails-GoodsDetails.35be4706.js
  26. 1
      unpackage/dist/build/h5/static/js/pages-GoodsEvaluateList-GoodsEvaluateList.3266fd77.js
  27. 1
      unpackage/dist/build/h5/static/js/pages-GoodsEvaluateList-GoodsEvaluateList.bb9814c1.js
  28. 1
      unpackage/dist/build/h5/static/js/pages-GoodsOn-GoodsOn.3bf94c5d.js
  29. 1
      unpackage/dist/build/h5/static/js/pages-GoodsOn-GoodsOn.da0b6cb1.js
  30. 1
      unpackage/dist/build/h5/static/js/pages-Information-Information.2391ccee.js
  31. 1
      unpackage/dist/build/h5/static/js/pages-Information-Information.4d967ff1.js
  32. 1
      unpackage/dist/build/h5/static/js/pages-Information-Information~pages-OrderDetails-OrderDetails~pages-warehouse-buy.3300b8c1.js
  33. 1
      unpackage/dist/build/h5/static/js/pages-Information-Information~pages-OrderDetails-OrderDetails~pages-warehouse-buy.6d7d8203.js
  34. 1
      unpackage/dist/build/h5/static/js/pages-MyCoupon-MyCoupon.af47a2b3.js
  35. 1
      unpackage/dist/build/h5/static/js/pages-MyCoupon-MyCoupon.bc8d3bc5.js
  36. 1
      unpackage/dist/build/h5/static/js/pages-MyOrderList-MyOrderList.cc78ec0b.js
  37. 1
      unpackage/dist/build/h5/static/js/pages-MyOrderList-MyOrderList.f77d2aac.js
  38. 1
      unpackage/dist/build/h5/static/js/pages-OrderDetails-OrderDetails.deb9628d.js
  39. 1
      unpackage/dist/build/h5/static/js/pages-OrderDetails-OrderDetails.dfd1b675.js
  40. 1
      unpackage/dist/build/h5/static/js/pages-SearchGoodsList-SearchGoodsList.aa6325ec.js
  41. 1
      unpackage/dist/build/h5/static/js/pages-SearchGoodsList-SearchGoodsList.ad71c97b.js
  42. 1
      unpackage/dist/build/h5/static/js/pages-Setting-Setting.599167a5.js
  43. 1
      unpackage/dist/build/h5/static/js/pages-Setting-Setting.a38508c7.js
  44. 1
      unpackage/dist/build/h5/static/js/pages-bind-bind.57f4fd67.js
  45. 1
      unpackage/dist/build/h5/static/js/pages-bind-bind.a2362b0b.js
  46. 1
      unpackage/dist/build/h5/static/js/pages-cart-cart.8c404f3c.js
  47. 1
      unpackage/dist/build/h5/static/js/pages-cart-cart.e838e74a.js
  48. 1
      unpackage/dist/build/h5/static/js/pages-fenxiao-fans.07948ca9.js
  49. 1
      unpackage/dist/build/h5/static/js/pages-fenxiao-fans.90b4e83d.js
  50. 1
      unpackage/dist/build/h5/static/js/pages-fenxiao-fansOrder.107745be.js
  51. 1
      unpackage/dist/build/h5/static/js/pages-fenxiao-fansOrder.6498d159.js
  52. 1
      unpackage/dist/build/h5/static/js/pages-fenxiao-fenxiao.3b15afa9.js
  53. 1
      unpackage/dist/build/h5/static/js/pages-fenxiao-fenxiao.7bac6380.js
  54. 1
      unpackage/dist/build/h5/static/js/pages-fenxiao-fenxiao~pages-my-my.0b5b9d8a.js
  55. 1
      unpackage/dist/build/h5/static/js/pages-fenxiao-fenxiao~pages-my-my.3900db43.js
  56. 1
      unpackage/dist/build/h5/static/js/pages-fenxiao-fenxiao~pages-my-richText~pages-qianggou-productDetails~pages-qianggou-qianggou~pages-~25a581a4.9b886ff3.js
  57. 1
      unpackage/dist/build/h5/static/js/pages-fenxiao-fenxiao~pages-my-richText~pages-qianggou-productDetails~pages-qianggou-qianggou~pages-~25a581a4.aa38b9e4.js
  58. 2
      unpackage/dist/build/h5/static/js/pages-fenxiao-yongjin.14694483.js
  59. 1
      unpackage/dist/build/h5/static/js/pages-home-home.3f7b5d81.js
  60. 1
      unpackage/dist/build/h5/static/js/pages-home-home.c3673e53.js
  61. 3
      unpackage/dist/build/h5/static/js/pages-home-sign.315d9c8f.js
  62. 3
      unpackage/dist/build/h5/static/js/pages-home-sign.7aa3677c.js
  63. 1
      unpackage/dist/build/h5/static/js/pages-login-login.3cf34184.js
  64. 1
      unpackage/dist/build/h5/static/js/pages-login-login.7981331d.js
  65. 2
      unpackage/dist/build/h5/static/js/pages-my-invite.6b23a9c1.js
  66. 2
      unpackage/dist/build/h5/static/js/pages-my-invite.a4696ea4.js
  67. 1
      unpackage/dist/build/h5/static/js/pages-my-my.d3912a9d.js
  68. 1
      unpackage/dist/build/h5/static/js/pages-my-my.e34de2b4.js
  69. 1
      unpackage/dist/build/h5/static/js/pages-my-richText.031dfbf2.js
  70. 1
      unpackage/dist/build/h5/static/js/pages-my-richText.a06aac89.js
  71. 1
      unpackage/dist/build/h5/static/js/pages-qianggou-productDetails.3d44f006.js
  72. 1
      unpackage/dist/build/h5/static/js/pages-qianggou-productDetails.9f0a8887.js
  73. 1
      unpackage/dist/build/h5/static/js/pages-qianggou-productList.e194b01c.js
  74. 1
      unpackage/dist/build/h5/static/js/pages-qianggou-productList.facdc644.js
  75. 1
      unpackage/dist/build/h5/static/js/pages-qianggou-qianggou.36f6a22b.js
  76. 1
      unpackage/dist/build/h5/static/js/pages-qianggou-qianggou.8f955112.js
  77. 1
      unpackage/dist/build/h5/static/js/pages-register-findPsw.174ea0cc.js
  78. 1
      unpackage/dist/build/h5/static/js/pages-register-findPsw.3f802d34.js
  79. 1
      unpackage/dist/build/h5/static/js/pages-register-register.0db5cbaa.js
  80. 1
      unpackage/dist/build/h5/static/js/pages-register-register.dad86320.js
  81. 1
      unpackage/dist/build/h5/static/js/pages-search-search.0a49e59b.js
  82. 1
      unpackage/dist/build/h5/static/js/pages-search-search.be416377.js
  83. 1
      unpackage/dist/build/h5/static/js/pages-shoukuan-shoukuan.2f5162b8.js
  84. 1
      unpackage/dist/build/h5/static/js/pages-shoukuan-shoukuan.46b076cf.js
  85. 1
      unpackage/dist/build/h5/static/js/pages-shouyi-shouyi.1effe9e0.js
  86. 1
      unpackage/dist/build/h5/static/js/pages-shouyi-shouyi.6019cf04.js
  87. 1
      unpackage/dist/build/h5/static/js/pages-warehouse-buy.0ce79ec6.js
  88. 1
      unpackage/dist/build/h5/static/js/pages-warehouse-buy.bf33c808.js
  89. 1
      unpackage/dist/build/h5/static/js/pages-warehouse-pay.1e7a50bd.js
  90. 1
      unpackage/dist/build/h5/static/js/pages-warehouse-pay.2a4d3387.js
  91. 1
      unpackage/dist/build/h5/static/js/pages-warehouse-sell.7d484722.js
  92. 1
      unpackage/dist/build/h5/static/js/pages-warehouse-sell.d26d32ae.js
  93. 1
      unpackage/dist/build/h5/static/js/pages-warehouse-weituo.58b77318.js
  94. 1
      unpackage/dist/build/h5/static/js/pages-warehouse-weituo.82ccd616.js

@ -17,9 +17,9 @@
<view class="goods-list"> <view class="goods-list">
<view class="list" v-for="(item,index) in orderInfo" :key="index"> <view class="list" v-for="(item,index) in orderInfo" :key="index">
<view class="sellerInfo"> <view class="sellerInfo">
<view class="title">{{orderDetails.seller?orderDetails.seller.nickname:'-'}}</view> <view class="title">{{tool!='buy'?(orderDetails.buyer?orderDetails.buyer.nickname:'-'):(orderDetails.seller?orderDetails.seller.nickname:'-')}}</view>
<view class="content" style="margin-left:20rpx;"> <view class="content" style="margin-left:20rpx;">
<text>{{orderDetails.seller?orderDetails.seller.mobile:'-'}}</text> <text>{{tool!='buy'?(orderDetails.buyer?orderDetails.buyer.mobile:'-'):(orderDetails.seller?orderDetails.seller.mobile:'-')}}</text>
</view> </view>
</view> </view>
<view class="orderNum"> <view class="orderNum">
@ -123,6 +123,7 @@
return { return {
orderInfo:[], orderInfo:[],
warehouse:[], warehouse:[],
tool:'',
orderDetails:{} orderDetails:{}
}; };
}, },
@ -236,6 +237,7 @@
} }
}, },
onLoad(option) { onLoad(option) {
this.tool=option.tool
this.id = option.id; this.id = option.id;
this.getOrderDetails() this.getOrderDetails()
} }

@ -266,7 +266,7 @@
*/ */
onOrderList(item){ onOrderList(item){
uni.navigateTo({ uni.navigateTo({
url: '/pages/OrderDetails/OrderDetails?id='+item.id, url: '/pages/OrderDetails/OrderDetails?id='+item.id+'&tool=buy',
}) })
}, },
cancelOrderHandle(item){ cancelOrderHandle(item){

@ -90,6 +90,7 @@
status:null, status:null,
tableData:[], tableData:[],
total:0, total:0,
tool:'',
statusList:[ statusList:[
{id:0,name:'待支付'}, {id:0,name:'待支付'},
{id:1,name:'待确认'}, {id:1,name:'待确认'},
@ -149,7 +150,7 @@
*/ */
onOrderList(item){ onOrderList(item){
uni.navigateTo({ uni.navigateTo({
url: '/pages/OrderDetails/OrderDetails?id='+item.id, url: '/pages/OrderDetails/OrderDetails?id='+item.id+'&tool=sell',
}) })
}, },
confirmPay(item,status){ confirmPay(item,status){

@ -1,2 +1,2 @@
<!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>商城</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)')) <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>商城</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/static/index.97465e7b.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.47b4e8e2.js></script><script src=/static/js/index.d773c0d1.js></script></body></html> document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/static/index.97465e7b.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.a1e8ef11.js></script><script src=/static/js/index.d8f84e51.js></script></body></html>

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long
Loading…
Cancel
Save