Browse Source

修改首页询价显示bug,订单未设置地址时不显示配送方式

yangc 7 years ago
parent
commit
758b8dd9bb
2 changed files with 3 additions and 3 deletions
  1. 2 2
      components/home/floor/FloorList.vue
  2. 1 1
      pages/mobile/center/user/pay/_orderId.vue

+ 2 - 2
components/home/floor/FloorList.vue

@@ -120,8 +120,8 @@
     },
     filters: {
       date: function (date) {
-        const now = baseUtils.formatDate('yyyy-MM-dd', Date.now())
-        const day = Math.floor((now - date) / (1000 * 60 * 60 * 24))
+        const now = baseUtils.formatDate(new Date(), 'yyyy-MM-dd')
+        const day = Math.floor((new Date(now).getTime() - new Date(baseUtils.formatDate(new Date(date), 'yyyy-MM-dd')).getTime()) / (1000 * 60 * 60 * 24))
         return day <= 0 ? '今天' : day + '天前'
       },
       enterpriseFilter ([str, user]) {

+ 1 - 1
pages/mobile/center/user/pay/_orderId.vue

@@ -408,7 +408,7 @@
         this.getTakeSelfInfo()
       },
       getDeliveryRule () {
-        return this.$http.post(`/trade/distributionRule/usable/rule?area=${this.selectedAddress.area}`, this.ruleParamsArr)
+        return !this.selectedAddress.id ? {} : this.$http.post(`/trade/distributionRule/usable/rule?area=${this.selectedAddress.area}`, this.ruleParamsArr)
           .then(res => {
             this.fareRule = res.data || {}
             this.initFare()