zhangdan 4 роки тому
батько
коміт
d9f0d66fb6

+ 5 - 5
src/views/businessManage/leduQuery/leduQuery.vue

@@ -124,8 +124,8 @@ export default {
         officialPartnerName: this.queryParam.officialPartnerName
       }
       if (this.queryOrderDate && this.queryOrderDate.length) {
-        params.beginDate = moment(this.queryOrderDate[0]).format('YYYY-MM-DD')
-        params.endDate = moment(this.queryOrderDate[1]).format('YYYY-MM-DD')
+        params.beginDate = moment(this.queryOrderDate[0]).format('YYYY-MM-DD 00:00:00')
+        params.endDate = moment(this.queryOrderDate[1]).format('YYYY-MM-DD 23:59:59')
       } else {
         params.beginDate = ''
         params.endDate = ''
@@ -137,7 +137,7 @@ export default {
       // 判断两个时间段是否相差m个月  第二个参数指相差单位,第三个参数指是否返回浮点形式(小数)
       if (moment(params.endDate).diff(moment(params.beginDate), 'months', true) > 3) {
         this.$message.error('单次最多只能导出3个月的数据,请缩小查询区间后再进行导出!')
-		return
+        return
       }
       this.loading = true
       exportOffPartnerGoldLog(params).then(res => {
@@ -169,8 +169,8 @@ export default {
         endDate: this.queryParam.endDate
       }
       if (this.queryOrderDate && this.queryOrderDate.length) {
-        params.beginDate = moment(this.queryOrderDate[0]).format('YYYY-MM-DD')
-        params.endDate = moment(this.queryOrderDate[1]).format('YYYY-MM-DD')
+        params.beginDate = moment(this.queryOrderDate[0]).format('YYYY-MM-DD 00:00:00')
+        params.endDate = moment(this.queryOrderDate[1]).format('YYYY-MM-DD 23:59:59')
       } else {
         params.beginDate = ''
         params.endDate = ''

+ 7 - 7
src/views/market/giftCard/giftCard.vue

@@ -168,13 +168,13 @@ export default {
 		    queryParam.startTime = ''
 		    queryParam.endTime = ''
 		  }
-      if (this.rechargeTime && this.rechargeTime.length) {
-        queryParam.useTimeStart = moment(this.time[0]).format('YYYY-MM-DD 00:00:00')
-        queryParam.useTimeEnd = moment(this.time[1]).format('YYYY-MM-DD 23:59:59')
-      } else {
-        queryParam.useTimeStart = ''
-        queryParam.useTimeEnd = ''
-      }
+        if (this.rechargeTime && this.rechargeTime.length) {
+          queryParam.useTimeStart = moment(this.rechargeTime[0]).format('YYYY-MM-DD 00:00:00')
+          queryParam.useTimeEnd = moment(this.rechargeTime[1]).format('YYYY-MM-DD 23:59:59')
+        } else {
+          queryParam.useTimeStart = ''
+          queryParam.useTimeEnd = ''
+        }
         return giftCardQuery(queryParam).then(res => {
           const no = (res.data.pageNo - 1) * res.data.pageSize
           if (res.status == 200) {

+ 2 - 1
src/views/recoveryManage/riderOrderModal.vue

@@ -52,7 +52,7 @@
           <p class="item-main" v-if="!pageInfo.contactName && !pageInfo. contactName">--</p>
         </a-col>
         <a-col :span="8" class="item-cont">
-          <p class="item-label">地址:</p>
+          <p style="width: 100px;">地址:</p>
           <p class="item-main">{{ pageInfo.contactAddress ? pageInfo.contactAddress : '' }}{{ pageInfo.houseAddress ? pageInfo.houseAddress : '' }}</p>
         </a-col>
         <a-col :span="8" class="item-cont">
@@ -60,6 +60,7 @@
           <viewer :images="pageInfo.imageHeader ? pageInfo.imageHeader :[]" class="viewer" ref="viewer" @inited="inited" rebuild>
             <img v-for="src in pageInfo.imageHeader" :src="src" :key="src" class="image1">
           </viewer>
+          <!-- <P style="margin-bottom: 0;">{{ pageInfo.imageHeader ? pageInfo.imageHeader : '' }}</P> -->
         </a-col>
         <a-col :span="8" class="item-cont">
           <p class="item-label">类型:</p>