pull/1/head
liudan 1 year ago
parent d59f34fe8d
commit 6011787f3f
  1. 4
      pages/OrderDetails/OrderDetails.vue
  2. 23
      pages/fenxiao/fansOrder.vue
  3. 22
      pages/qianggou/productDetails.vue
  4. 2
      pages/warehouse/sell.vue
  5. 2
      unpackage/dist/build/h5/index.html
  6. 1
      unpackage/dist/build/h5/static/index.63b34199.css
  7. 1
      unpackage/dist/build/h5/static/index.97465e7b.css
  8. 18
      unpackage/dist/build/h5/static/js/chunk-vendors.47b4e8e2.js
  9. 18
      unpackage/dist/build/h5/static/js/chunk-vendors.4cb2825c.js
  10. 1
      unpackage/dist/build/h5/static/js/index.524409b6.js
  11. 1
      unpackage/dist/build/h5/static/js/index.dedb1e41.js
  12. 1
      unpackage/dist/build/h5/static/js/pages-AccountSecurity-AccountSecurity.4a60d59d.js
  13. 1
      unpackage/dist/build/h5/static/js/pages-AccountSecurity-AccountSecurity.756a741e.js
  14. 1
      unpackage/dist/build/h5/static/js/pages-AccountSecurity-AccountSecurity~pages-AddressEdit-AddressEdit~pages-ChangePassword-ChangePassw~87dbfe28.1e52b9ff.js
  15. 1
      unpackage/dist/build/h5/static/js/pages-AccountSecurity-AccountSecurity~pages-AddressEdit-AddressEdit~pages-ChangePassword-ChangePassw~87dbfe28.96ef645f.js
  16. 1
      unpackage/dist/build/h5/static/js/pages-AccountSecurity-AccountSecurity~pages-AddressEdit-AddressEdit~pages-ConfirmOrder-ConfirmOrder~~3a70436b.26eeeb2e.js
  17. 1
      unpackage/dist/build/h5/static/js/pages-AccountSecurity-AccountSecurity~pages-AddressEdit-AddressEdit~pages-ConfirmOrder-ConfirmOrder~~3a70436b.59cacb51.js
  18. 1
      unpackage/dist/build/h5/static/js/pages-AddressEdit-AddressEdit.66bd828c.js
  19. 1
      unpackage/dist/build/h5/static/js/pages-AddressEdit-AddressEdit.b84fa115.js
  20. 1
      unpackage/dist/build/h5/static/js/pages-AddressList-AddressList.0d976075.js
  21. 1
      unpackage/dist/build/h5/static/js/pages-AddressList-AddressList.f4254d0a.js
  22. 1
      unpackage/dist/build/h5/static/js/pages-ChangePassword-ChangePassword.64fd4c37.js
  23. 1
      unpackage/dist/build/h5/static/js/pages-ChangePassword-ChangePassword.be8f32f5.js
  24. 1
      unpackage/dist/build/h5/static/js/pages-ChangePassword-ChangePassword~pages-ConfirmOrder-ConfirmOrder~pages-Information-Information~pa~3d136d08.117a9c88.js
  25. 1
      unpackage/dist/build/h5/static/js/pages-ChangePassword-ChangePassword~pages-ConfirmOrder-ConfirmOrder~pages-Information-Information~pa~3d136d08.993a4646.js
  26. 1
      unpackage/dist/build/h5/static/js/pages-ConfirmOrder-ConfirmOrder.d2a9c4f2.js
  27. 1
      unpackage/dist/build/h5/static/js/pages-ConfirmOrder-ConfirmOrder.f0d0d064.js
  28. 1
      unpackage/dist/build/h5/static/js/pages-GoodsDetails-GoodsDetails.1e1c469c.js
  29. 1
      unpackage/dist/build/h5/static/js/pages-GoodsDetails-GoodsDetails.64b4793c.js
  30. 1
      unpackage/dist/build/h5/static/js/pages-GoodsEvaluateList-GoodsEvaluateList.3266fd77.js
  31. 1
      unpackage/dist/build/h5/static/js/pages-GoodsEvaluateList-GoodsEvaluateList.c93d2e9f.js
  32. 1
      unpackage/dist/build/h5/static/js/pages-GoodsOn-GoodsOn.5ca048df.js
  33. 1
      unpackage/dist/build/h5/static/js/pages-GoodsOn-GoodsOn.da0b6cb1.js
  34. 1
      unpackage/dist/build/h5/static/js/pages-Information-Information.37cac8f2.js
  35. 1
      unpackage/dist/build/h5/static/js/pages-Information-Information.4d967ff1.js
  36. 1
      unpackage/dist/build/h5/static/js/pages-Information-Information~pages-OrderDetails-OrderDetails~pages-warehouse-buy.3300b8c1.js
  37. 1
      unpackage/dist/build/h5/static/js/pages-Information-Information~pages-OrderDetails-OrderDetails~pages-warehouse-buy.3b0cf0aa.js
  38. 1
      unpackage/dist/build/h5/static/js/pages-MyCoupon-MyCoupon.0580060e.js
  39. 1
      unpackage/dist/build/h5/static/js/pages-MyCoupon-MyCoupon.bc8d3bc5.js
  40. 1
      unpackage/dist/build/h5/static/js/pages-MyOrderList-MyOrderList.120347d9.js
  41. 1
      unpackage/dist/build/h5/static/js/pages-MyOrderList-MyOrderList.cc78ec0b.js
  42. 1
      unpackage/dist/build/h5/static/js/pages-OrderDetails-OrderDetails.dfd1b675.js
  43. 1
      unpackage/dist/build/h5/static/js/pages-OrderDetails-OrderDetails.f861f1af.js
  44. 1
      unpackage/dist/build/h5/static/js/pages-SearchGoodsList-SearchGoodsList.297771b8.js
  45. 1
      unpackage/dist/build/h5/static/js/pages-SearchGoodsList-SearchGoodsList.ad71c97b.js
  46. 1
      unpackage/dist/build/h5/static/js/pages-Setting-Setting.599167a5.js
  47. 1
      unpackage/dist/build/h5/static/js/pages-Setting-Setting.9b159de5.js
  48. 1
      unpackage/dist/build/h5/static/js/pages-bind-bind.1868eaa5.js
  49. 1
      unpackage/dist/build/h5/static/js/pages-bind-bind.57f4fd67.js
  50. 1
      unpackage/dist/build/h5/static/js/pages-cart-cart.0869a7bc.js
  51. 1
      unpackage/dist/build/h5/static/js/pages-cart-cart.8c404f3c.js
  52. 1
      unpackage/dist/build/h5/static/js/pages-fenxiao-fans.90b4e83d.js
  53. 1
      unpackage/dist/build/h5/static/js/pages-fenxiao-fans.d54dd40d.js
  54. 1
      unpackage/dist/build/h5/static/js/pages-fenxiao-fansOrder.107745be.js
  55. 1
      unpackage/dist/build/h5/static/js/pages-fenxiao-fansOrder.362dc673.js
  56. 1
      unpackage/dist/build/h5/static/js/pages-fenxiao-fenxiao.7bac6380.js
  57. 1
      unpackage/dist/build/h5/static/js/pages-fenxiao-fenxiao.a4452d81.js
  58. 1
      unpackage/dist/build/h5/static/js/pages-fenxiao-fenxiao~pages-my-my.3900db43.js
  59. 1
      unpackage/dist/build/h5/static/js/pages-fenxiao-fenxiao~pages-my-my.fc5a3121.js
  60. 1
      unpackage/dist/build/h5/static/js/pages-fenxiao-fenxiao~pages-my-richText~pages-qianggou-productDetails~pages-qianggou-qianggou~pages-~25a581a4.aa38b9e4.js
  61. 1
      unpackage/dist/build/h5/static/js/pages-fenxiao-fenxiao~pages-my-richText~pages-qianggou-productDetails~pages-qianggou-qianggou~pages-~25a581a4.fee70162.js
  62. 1
      unpackage/dist/build/h5/static/js/pages-fenxiao-yongjin.6ff58fb7.js
  63. 1
      unpackage/dist/build/h5/static/js/pages-fenxiao-yongjin.b58e62b7.js
  64. 1
      unpackage/dist/build/h5/static/js/pages-home-home.252699ff.js
  65. 1
      unpackage/dist/build/h5/static/js/pages-home-home.a93653b8.js
  66. 3
      unpackage/dist/build/h5/static/js/pages-home-sign.27fb2024.js
  67. 3
      unpackage/dist/build/h5/static/js/pages-home-sign.315d9c8f.js
  68. 1
      unpackage/dist/build/h5/static/js/pages-login-login.053f2ec3.js
  69. 1
      unpackage/dist/build/h5/static/js/pages-login-login.ac2354cd.js
  70. 2
      unpackage/dist/build/h5/static/js/pages-my-invite.0884ddea.js
  71. 2
      unpackage/dist/build/h5/static/js/pages-my-invite.79846a74.js
  72. 1
      unpackage/dist/build/h5/static/js/pages-my-my.27db590c.js
  73. 1
      unpackage/dist/build/h5/static/js/pages-my-my.d3912a9d.js
  74. 1
      unpackage/dist/build/h5/static/js/pages-my-richText.49c95d8e.js
  75. 1
      unpackage/dist/build/h5/static/js/pages-my-richText.a06aac89.js
  76. 1
      unpackage/dist/build/h5/static/js/pages-qianggou-productDetails.21c24279.js
  77. 1
      unpackage/dist/build/h5/static/js/pages-qianggou-productDetails.9f0a8887.js
  78. 1
      unpackage/dist/build/h5/static/js/pages-qianggou-productList.b4d0a1a0.js
  79. 1
      unpackage/dist/build/h5/static/js/pages-qianggou-productList.e194b01c.js
  80. 1
      unpackage/dist/build/h5/static/js/pages-qianggou-qianggou.71ce7b0f.js
  81. 1
      unpackage/dist/build/h5/static/js/pages-qianggou-qianggou.8f955112.js
  82. 1
      unpackage/dist/build/h5/static/js/pages-register-findPsw.3f802d34.js
  83. 1
      unpackage/dist/build/h5/static/js/pages-register-findPsw.44b892a9.js
  84. 1
      unpackage/dist/build/h5/static/js/pages-register-register.0db5cbaa.js
  85. 1
      unpackage/dist/build/h5/static/js/pages-register-register.cdf39122.js
  86. 1
      unpackage/dist/build/h5/static/js/pages-search-search.0a49e59b.js
  87. 1
      unpackage/dist/build/h5/static/js/pages-search-search.eaa4bbf7.js
  88. 1
      unpackage/dist/build/h5/static/js/pages-shoukuan-shoukuan.46b076cf.js
  89. 1
      unpackage/dist/build/h5/static/js/pages-shoukuan-shoukuan.8e3d6012.js
  90. 1
      unpackage/dist/build/h5/static/js/pages-shouyi-shouyi.54f97bbe.js
  91. 1
      unpackage/dist/build/h5/static/js/pages-shouyi-shouyi.6019cf04.js
  92. 1
      unpackage/dist/build/h5/static/js/pages-warehouse-buy.3a74d0f2.js
  93. 1
      unpackage/dist/build/h5/static/js/pages-warehouse-buy.bf33c808.js
  94. 1
      unpackage/dist/build/h5/static/js/pages-warehouse-pay.26403113.js
  95. 1
      unpackage/dist/build/h5/static/js/pages-warehouse-pay.d398b92d.js
  96. 1
      unpackage/dist/build/h5/static/js/pages-warehouse-sell.713c6bdf.js
  97. 1
      unpackage/dist/build/h5/static/js/pages-warehouse-sell.7d484722.js
  98. 1
      unpackage/dist/build/h5/static/js/pages-warehouse-weituo.8d1d0c99.js
  99. 1
      unpackage/dist/build/h5/static/js/pages-warehouse-weituo.e95f3e69.js

@ -98,11 +98,11 @@
<image :src="orderDetails.pay_voucher" v-if="orderDetails.pay_voucher" @click="lookPic([orderDetails.pay_voucher])" mode="aspectFit"></image>
<text v-else>暂无付款凭证</text>
</view>
<view class="btnContainer" v-if="orderDetails.status==0">
<!-- <view class="btnContainer" v-if="orderDetails.status==0">
<view class="btnItem" @click="uploadPay">上传凭证</view>
<view class="btnItem" @click="goPayHandle">去支付</view>
<view class="btnItem" @click="confirmPay">支付确认</view>
</view>
</view> -->
<u-upload
:previewFullImage="false"
@afterRead="afterRead"

@ -29,7 +29,8 @@
<text>订单号{{item.order_sn}}</text>
</view>
<view class="status">
<text>{{item.status==0?'付款确认':item.status==1?'收款确认':item.status==3?'投诉':''}}</text>
<text>{{getstatusLabel(item.status)}}</text>
<!-- <text>{{item.status==0?'付款确认':item.status==1?'收款确认':item.status==3?'投诉':''}}</text> -->
</view>
</view>
<view class="goods-list">
@ -86,6 +87,16 @@
limit:10,
tableData:[],
total:0,
statusList:[
{id:0,name:'待支付'},
{id:1,name:'待确认'},
{id:2,name:'待委托'},
{id:3,name:'已投诉'},
{id:4,name:'待发货'},
{id:5,name:'待收货'},
{id:-1,name:'已取消'},
{id:7,name:'已上架'},
]
};
},
methods:{
@ -110,6 +121,16 @@
}
})
},
getstatusLabel(val){
let arr = this.statusList.filter(item=>{
return item.id==val;
})
if(arr.length>0){
return arr[0].name
}else{
return '-'
}
},
},
onReachBottom() {

@ -43,7 +43,7 @@
</view>
</view>
<!-- 底部 -->
<view class="page-footer" @click="buyHandle" v-if="isDeadLine">
<view :class="ends?'page-footer isend':'page-footer'" @click="!ends?buyHandle():''" v-if="isDeadLine">
立即抢购
</view>
<view class="page-footer" v-if="!isDeadLine">
@ -79,6 +79,7 @@ export default {
isDeadLine:true,
finalSecondNum:"",
timer:null,
ends:false
};
},
onLoad(params) {
@ -160,9 +161,20 @@ export default {
url: res.data.image
})
let timeNum = res.data.warehouse.start
let endTimeNum = res.data.warehouse.end
// let timeNum = "16:02";
let time = this.timestampToTime()+timeNum+":00"
let endTime = this.timestampToTime()+endTimeNum+":00"
let finishTime = this.dateDifference(new Date(time).getTime())
let endFinishTime = this.dateDifference(new Date(endTime).getTime())
console.log("endFinishTime=============》"+endFinishTime)
if(endFinishTime>0){
this.ends = false
console.log(false)
}else{
console.log(true)
this.ends = true
}
if(finishTime>0){
this.timer = setInterval(()=>{
let secondNum = finishTime--;
@ -359,5 +371,11 @@ export default {
}
}
}
}
}
.isend{
//opacity:0.4;
background:#eaeaea !important;
color: gray;
}
</style>

@ -147,7 +147,7 @@
/**
* 订单列表点击
*/
onOrderList(){
onOrderList(item){
uni.navigateTo({
url: '/pages/OrderDetails/OrderDetails?id='+item.id,
})

@ -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)'))
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.63b34199.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.4cb2825c.js></script><script src=/static/js/index.dedb1e41.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.47b4e8e2.js></script><script src=/static/js/index.524409b6.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

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