# Conflicts:
#	unpackage/dist/build/h5/index.html
#	unpackage/dist/build/h5/static/js/index.faeaf14e.js
main
liudan 1 year ago
commit acdd3a08d9
  1. 6
      pages/qianggou/productDetails.vue
  2. 2
      unpackage/dist/build/h5/index.html
  3. 1
      unpackage/dist/build/h5/static/index.97465e7b.css
  4. 18
      unpackage/dist/build/h5/static/js/chunk-vendors.9f560ff9.js
  5. 2
      unpackage/dist/build/h5/static/js/index.bb3ac8f5.js
  6. 1
      unpackage/dist/build/h5/static/js/pages-AccountSecurity-AccountSecurity.b99d4ac6.js
  7. 1
      unpackage/dist/build/h5/static/js/pages-AccountSecurity-AccountSecurity~pages-AddressEdit-AddressEdit~pages-ChangePassword-ChangePassw~87dbfe28.d7ae33f2.js
  8. 1
      unpackage/dist/build/h5/static/js/pages-AccountSecurity-AccountSecurity~pages-AddressEdit-AddressEdit~pages-ConfirmOrder-ConfirmOrder~~3a70436b.60617624.js
  9. 1
      unpackage/dist/build/h5/static/js/pages-AddressEdit-AddressEdit.76d8168f.js
  10. 1
      unpackage/dist/build/h5/static/js/pages-AddressList-AddressList.91825343.js
  11. 1
      unpackage/dist/build/h5/static/js/pages-ChangePassword-ChangePassword.f0665b2e.js
  12. 1
      unpackage/dist/build/h5/static/js/pages-ChangePassword-ChangePassword~pages-ConfirmOrder-ConfirmOrder~pages-Information-Information~pa~3d136d08.6d6efbe1.js
  13. 1
      unpackage/dist/build/h5/static/js/pages-ConfirmOrder-ConfirmOrder.56ac5d84.js
  14. 1
      unpackage/dist/build/h5/static/js/pages-GoodsDetails-GoodsDetails.39ded1e8.js
  15. 1
      unpackage/dist/build/h5/static/js/pages-GoodsEvaluateList-GoodsEvaluateList.2c6b2c4e.js
  16. 1
      unpackage/dist/build/h5/static/js/pages-GoodsOn-GoodsOn.2fcd3a94.js
  17. 1
      unpackage/dist/build/h5/static/js/pages-Information-Information.d584b954.js
  18. 1
      unpackage/dist/build/h5/static/js/pages-Information-Information~pages-OrderDetails-OrderDetails~pages-warehouse-buy.cead5557.js
  19. 1
      unpackage/dist/build/h5/static/js/pages-MyCoupon-MyCoupon.e07b73d6.js
  20. 1
      unpackage/dist/build/h5/static/js/pages-MyOrderList-MyOrderList.8850f2e9.js
  21. 1
      unpackage/dist/build/h5/static/js/pages-OrderDetails-OrderDetails.a1566762.js
  22. 1
      unpackage/dist/build/h5/static/js/pages-SearchGoodsList-SearchGoodsList.e46caf7b.js
  23. 1
      unpackage/dist/build/h5/static/js/pages-Setting-Setting.b8cd9414.js
  24. 1
      unpackage/dist/build/h5/static/js/pages-bind-bind.3cdfc829.js
  25. 1
      unpackage/dist/build/h5/static/js/pages-cart-cart.186b274c.js
  26. 1
      unpackage/dist/build/h5/static/js/pages-fenxiao-fans.e8d6de94.js
  27. 1
      unpackage/dist/build/h5/static/js/pages-fenxiao-fansOrder.4f3e1692.js
  28. 1
      unpackage/dist/build/h5/static/js/pages-fenxiao-fenxiao.9959d453.js
  29. 1
      unpackage/dist/build/h5/static/js/pages-fenxiao-fenxiao~pages-my-my.11b4d5f9.js
  30. 1
      unpackage/dist/build/h5/static/js/pages-fenxiao-fenxiao~pages-my-richText~pages-qianggou-productDetails~pages-qianggou-qianggou~pages-~25a581a4.ba467f04.js
  31. 1
      unpackage/dist/build/h5/static/js/pages-fenxiao-yongjin.afdaa62d.js
  32. 1
      unpackage/dist/build/h5/static/js/pages-home-home.4809178c.js
  33. 3
      unpackage/dist/build/h5/static/js/pages-home-sign.145682f8.js
  34. 1
      unpackage/dist/build/h5/static/js/pages-login-login.3ece775d.js
  35. 2
      unpackage/dist/build/h5/static/js/pages-my-invite.e764a6c9.js
  36. 1
      unpackage/dist/build/h5/static/js/pages-my-my.a1bade4e.js
  37. 1
      unpackage/dist/build/h5/static/js/pages-my-richText.24c224a7.js
  38. 1
      unpackage/dist/build/h5/static/js/pages-qianggou-productDetails.eff457a9.js
  39. 1
      unpackage/dist/build/h5/static/js/pages-qianggou-productDetails.fab2ef18.js
  40. 1
      unpackage/dist/build/h5/static/js/pages-qianggou-productList.94b45c5f.js
  41. 1
      unpackage/dist/build/h5/static/js/pages-qianggou-qianggou.426aa324.js
  42. 1
      unpackage/dist/build/h5/static/js/pages-register-findPsw.81d0df9c.js
  43. 1
      unpackage/dist/build/h5/static/js/pages-register-register.e38ebfb6.js
  44. 1
      unpackage/dist/build/h5/static/js/pages-search-search.92d1046e.js
  45. 1
      unpackage/dist/build/h5/static/js/pages-shoukuan-shoukuan.a711ec6f.js
  46. 1
      unpackage/dist/build/h5/static/js/pages-shouyi-shouyi.a5e6cf9a.js
  47. 1
      unpackage/dist/build/h5/static/js/pages-warehouse-buy.0c62288a.js
  48. 1
      unpackage/dist/build/h5/static/js/pages-warehouse-pay.cb9c2b3e.js
  49. 1
      unpackage/dist/build/h5/static/js/pages-warehouse-sell.8dbaede2.js
  50. 1
      unpackage/dist/build/h5/static/js/pages-warehouse-weituo.5f70718a.js

@ -170,11 +170,11 @@ export default {
let finishTime = this.dateDifference(new Date(time).getTime())
let endFinishTime = this.dateDifference(new Date(endTime).getTime())
console.log("endFinishTime=============》"+endFinishTime)
if(endFinishTime>0){
if(endFinishTime>=0){
this.ends = false
console.log(false)
}else{
console.log(true)
this.ends = true
}
if(finishTime>0){

@ -1,2 +0,0 @@
<!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.9f560ff9.js></script><script src=/static/js/index.faeaf14e.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
Loading…
Cancel
Save