Browse Source

bug处理

yangc 7 years ago
parent
commit
e7c3a35f9f

+ 1 - 1
components/applyPurchase/articleOne.vue

@@ -361,7 +361,7 @@
         return this.validObj.deadline
       },
       setDeadLineValid: function () {
-        this.applyObj.deadline = this.baseUtils.formatDate(this.applyObj.deadline, 'yyyy-MM-dd hh:mm:ss')
+        this.applyObj.deadline = this.baseUtils.formatDate(this.baseUtils.getFullDay(new Date(this.applyObj.deadline)), 'yyyy-MM-dd hh:mm:ss')
         this.validObj.deadline = true
       },
       onUnitPriceInput: function () {

+ 1 - 1
components/main/Nav.vue

@@ -41,7 +41,7 @@
       <nuxt-link to="/product/brand/brandList/A" class="item">
         <span>品牌墙</span>
       </nuxt-link>
-      <nuxt-link :to="'/store/' + process.env.pcbId" class="item">
+      <nuxt-link :to="'/store/'" class="item">
         <span>PCB专区</span>
       </nuxt-link>
       <nuxt-link to="/news" class="item">

+ 1 - 0
components/mobile/applyPurchase/PublishSeek.vue

@@ -200,6 +200,7 @@
         return !time || (time >= now && time <= now + 1000 * 60 * 60 * 24 * 90)
       },
       deadlineChange: function () {
+        this.applyObj.deadline = this.baseUtils.formatDate(this.baseUtils.getFullDay(new Date(this.baseUtils.getClearDay(new Date(this.applyObj.deadline)))), 'yyyy-MM-dd hh:mm:ss')
         if (!this.isValidDate(this.applyObj.deadline)) {
           this.setRemindText('日期需不小于今天且在90天以内')
           this.applyObj.deadline = ''

+ 1 - 0
components/mobile/applyPurchase/PublishSupplierSeek.vue

@@ -154,6 +154,7 @@
         return !time || (time >= now && time <= now + 1000 * 60 * 60 * 24 * 90)
       },
       deadlineChange: function () {
+        this.applyObj.deadline = this.baseUtils.formatDate(this.baseUtils.getFullDay(new Date(this.baseUtils.getClearDay(new Date(this.applyObj.deadline)))), 'yyyy-MM-dd hh:mm:ss')
         if (!this.isValidDate(this.applyObj.deadline)) {
           this.setRemindText('日期需不小于今天且在90天以内')
           this.applyObj.deadline = ''

+ 2 - 2
components/mobile/base/BaseFilter.vue

@@ -152,10 +152,10 @@
     line-height: .5rem;
     .title {
       vertical-align: top;
-      width: 21%;
+      width: 23%;
     }
     .content {
-      width: 79%;
+      width: 77%;
       .item {
         width: 33%;
         color: $base-color;

+ 1 - 1
components/supplier/details.vue

@@ -181,7 +181,7 @@
       },
       // 时间格式化
       setDeadLineValid: function () {
-        this.applyObj.deadline = this.baseUtils.formatDate(this.applyObj.deadline, 'yyyy-MM-dd hh:mm:ss')
+        this.applyObj.deadline = this.baseUtils.formatDate(this.baseUtils.getFullDay(new Date(this.applyObj.deadline)), 'yyyy-MM-dd hh:mm:ss')
         this.validObj.deadline = true
       },
       // 检查单价预算

+ 1 - 1
components/supplier/resource.vue

@@ -263,7 +263,7 @@
       },
       // 时间格式化
       setDeadLineValid: function () {
-        this.applyObj.deadline = this.baseUtils.formatDate(this.applyObj.deadline, 'yyyy-MM-dd hh:mm:ss')
+        this.applyObj.deadline = this.baseUtils.formatDate(this.baseUtils.getFullDay(new Date(this.applyObj.deadline)), 'yyyy-MM-dd hh:mm:ss')
         this.validObj.deadline = true
       },
       // 检查单价预算

+ 2 - 1
pages/mobile/center/user/payCenter.vue

@@ -115,7 +115,7 @@
             <span class="inline-block content text-ellipse">{{record.paytype == 1103 ? '线下支付' : '线上支付'}}</span>
           </div>-->
           <div class="content-line">
-            <span class="inline-block title">收款方式:</span>
+            <span class="inline-block title">交易方式:</span>
             <span class="inline-block content">{{record.remitteeType | payTypeFilter}}</span>
           </div>
           <div class="content-line">
@@ -416,6 +416,7 @@
         }
       },
       filterRecord () {
+        this.page = 1
         this.isChange = true
         this.reloadList()
       },

+ 1 - 0
pages/mobile/center/vendor/payCenter.vue

@@ -426,6 +426,7 @@
       },
       filterRecord () {
         this.isChange = true
+        this.page = 1
         this.reloadList()
       },
       onSelectAction (selectObj) {

+ 12 - 2
utils/baseUtils.js

@@ -462,13 +462,21 @@ const _isEmptyStr = (str) => {
 }
 
 /*
-* 获取某个时间段去除时分秒的时间戳
+* 获取某个时间段去除时分秒的时间戳(目前写死八点)
 * @date 默认当天 Date格式
 * */
 const _getClearDay = (date = new Date()) => {
   return new Date(_formatDate(date, 'yyyy-MM-dd')).getTime() - 8 * 60 * 60 * 1000
 }
 
+/*
+ * 获取某个时间段的23:59:59(目前写死0点)
+ * @date 默认当天 Date格式
+ * */
+const _getFullDay = (date = new Date()) => {
+  return new Date(date.getTime() + 23 * 60 * 60 * 1000 + 59 * 60 * 1000 + 59 * 1000)
+}
+
 export default {
   // 获取字符串字符长度
   getRealLen: _getRealLen,
@@ -513,5 +521,7 @@ export default {
   onFileUpload: _onFileUpload,
   isEmptyStr: _isEmptyStr,
   // 获取00:00:00的时间
-  getClearDay: _getClearDay
+  getClearDay: _getClearDay,
+  // 获取23:59:59的时间
+  getFullDay: _getFullDay
 }

+ 1 - 1
utils/mixin.js

@@ -263,7 +263,7 @@ export const seekProduct = {
   methods: {
     // 时间格式化
     setDeadLineValid: function () {
-      this.applyObj.deadline = this.baseUtils.formatDate(this.applyObj.deadline, 'yyyy-MM-dd hh:mm:ss')
+      this.applyObj.deadline = this.baseUtils.formatDate(this.baseUtils.getFullDay(new Date(this.applyObj.deadline)), 'yyyy-MM-dd hh:mm:ss')
       this.validObj.deadline = true
     },
     // 检查单价预算