bug修改

components/mobile/Home.vue

@@ -34,7 +34,7 @@
         <li>
           <a @click="goOpportunity">
             <img src="/images/mobile/@2x/home/seek.png" alt="">
-            <span>我的商机</span>
+            <span>公司商机</span>
           </a>
         </li>
         <li>
@@ -184,12 +184,12 @@
       goOpportunity () {
         if (this.user.logged) {
           if (this.user.data.enterprise.uu) {
-            this.$router.push('/mobile/applyPurchase/list/businessOpportunity')
+            this.$router.push('/mobile/center/vendor/seek?seekType=wait')
           } else if (this.user.data.enterprise.isVendor !== 313) {
             this.onRemind('抱歉，您暂未开通卖家中心，可前往PC端开通')
           }
         } else {
-          this.url = '/mobile/applyPurchase/list/businessOpportunity'
+          this.url = '/mobile/center/vendor/seek?seekType=wait'
           this.showLoginBox = true
         }
       },

pages/mobile/center/user/pay/_orderId.vue

@@ -118,7 +118,7 @@
           </p>
         </template>
         <template v-else>
-          <p class="no-addr">暂无收货地址信息</p>
+          <p class="no-addr">请维护收货地址信息</p>
         </template>
       </div>
       <i class="iconfont icon-xiangyou inline-block"></i>
@@ -472,7 +472,16 @@
       getDeliveryRule () {
         return !this.selectedAddress.id ? {} : this.$http.post(`/trade/distributionRule/usable/rule?area=${this.selectedAddress.area}`, this.ruleParamsArr)
           .then(res => {
-            this.fareRule = res.data || {}
+//            this.fareRule = res.data || {}
+            this.orderData.forEach(item => {
+              this.fareRule[item.storeid] = [{
+                fare: 0,
+                uuid: item.storeid,
+                ruleName: '卖家配送，全国包邮',
+                method: 1302,
+                currencyName: this.payData.currencyName
+              }]
+            })
             this.initFare()
           }, err => {
             this.setRemindText(err.response.data || '系统错误')
@@ -616,7 +625,7 @@
         if (this.addressData && this.addressData.length) {
           this.showAddrModal = true
         } else {
-          this.setRemindText('暂无收货地址，请前往pc端维护')
+          this.setRemindText('暂未设置收货地址，请前往【我】->【收货地址信息】进行维护】')
         }
       },
       // 配送规则校验
@@ -632,7 +641,7 @@
       // 收货地址校验
       checkAddress () {
         if (!this.selectedAddress || !this.selectedAddress.id) {
-          this.setRemindText('收货地址信息为空，请前往pc端添加收货地址')
+          this.setRemindText('暂未设置收货地址，请前往【我】->【收货地址信息】进行维护】')
           return false
         } else if (this.selectedAddress.area.indexOf('香港') > -1) {
           if (this.payData.currency === 'RMB') {
@@ -726,11 +735,11 @@
         // 1103线下 1102线上
         orderInfo.paytype = '1103'
         orderInfo.splitInfo = {
-          ruleList: JSON.stringify(submitParam.ruleList),
-          takeList: JSON.stringify(submitParam.takeList)
+          ruleList: JSON.stringify(submitParam.ruleList)
+//          takeList: JSON.stringify(submitParam.takeList)
         }
         orderInfo.orderDetails = this.convertOrderDetailParams()
-        console.log(orderInfo)
+//        console.log(orderInfo)
         return orderInfo
 
         // 人民币为专用增值税发票，美元不开发票    --1205专用增值税发票   --1206普通发票  --1207不开发票
@@ -745,8 +754,8 @@
           remarkObj: {},
           // 配送方式
           ruleList: {},
-          // 自提点
-          takeList: {},
+//          // 自提点
+//          takeList: {},
           // 是否包含寄售商品
           includeConsignment: false
         }
@@ -754,7 +763,7 @@
           params.goodsPrice += item.goodsPrice
           params.remarkObj[item.storeid] = item.remark
           params.ruleList[item.storeid] = item.fare
-          params.takeList[item.storeid] = this.checkShowTakeSelf(item) && this.takeSelfData[item.storeid] ? [0] : null
+//          params.takeList[item.storeid] = this.checkShowTakeSelf(item) && this.takeSelfData[item.storeid] ? [0] : null
           if (item.storeid === '33069557578d44e69bd91ad12d28a8d4') {
             params.includeConsignment = true
           }

pages/mobile/center/user/payCenter.vue

@@ -344,11 +344,16 @@
         this.filterRecord()
       },
       setDate (type) {
-        this.filterParams[type] = new Date(this.filterParams[type]).getTime()
+        // 00:00:00
+        this.filterParams[type] = new Date(this.filterParams[type]).getTime() - 8 * 60 * 60 * 1000
         if (this.filterParams.fromDate && this.filterParams.toDate && this.filterParams.fromDate > this.filterParams.toDate) {
           this.setRemindText('起始时间不能大于结束时间')
           this.filterParams[type] = null
         } else {
+          if (this.filterParams.fromDate && this.filterParams.toDate && this.filterParams.fromDate === this.filterParams.toDate) {
+            // 23:59:59
+            this.filterParams.toDate += 23 * 60 * 60 * 1000 + 59 * 60 * 1000 + 59 * 1000
+          }
           this.filterRecord()
         }
       },

pages/mobile/center/vendor/payCenter.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="mobile-pay-center mobile-fix-content mobile-centerfix-content" id="mobileFixContent" @click="setShowSelect('all', false)">
+  <div class="mobile-pay-center vendor-pay mobile-fix-content mobile-centerfix-content" id="mobileFixContent" @click="setShowSelect('all', false)">
     <div class="mp-head">
       <span class="inline-block" :class="{'active': switchType === 'record'}" @click="setSwitchType('record')">交易记录</span>
       <span class="inline-block" :class="{'active': switchType === 'account'}" @click="setSwitchType('account')">收款账户</span>
@@ -404,11 +404,15 @@
         this.filterRecord()
       },
       setDate (type) {
-        this.filterParams[type] = new Date(this.filterParams[type]).getTime()
+        this.filterParams[type] = new Date(this.filterParams[type]).getTime() - 8 * 60 * 60 * 1000
         if (this.filterParams.fromDate && this.filterParams.toDate && this.filterParams.fromDate > this.filterParams.toDate) {
           this.setRemindText('起始时间不能大于结束时间')
           this.filterParams[type] = null
         } else {
+          if (this.filterParams.fromDate && this.filterParams.toDate && this.filterParams.fromDate === this.filterParams.toDate) {
+            // 23:59:59
+            this.filterParams.toDate += 23 * 60 * 60 * 1000 + 59 * 60 * 1000 + 59 * 1000
+          }
           this.filterRecord()
         }
       },
@@ -553,8 +557,8 @@
         let file = e.target.files[0]
         let arr = file.name.split('.')
         let type = arr[arr.length - 1]
-        if ('pdf/png/jpg'.indexOf(type) === -1) {
-          this.setRemindText('仅支持jpg/png/pdf格式的文件')
+        if ('pdf/png/jpg/jpeg'.indexOf(type.toLowerCase()) === -1) {
+          this.setRemindText('仅支持jpg/jpeg/png/pdf格式的文件')
         } else if (file.size > 1024 * 1024 * 3) {
           this.setRemindText('请勿大于3M')
         } else {
@@ -702,8 +706,11 @@
       width: 88%;
     }
   }
-  .mobile-pay-center .mobile-modal .mobile-modal-wrapper {
-    left: .2rem !important;
-    right: .2rem !important;
+  .vendor-pay {
+    bottom: 2.23rem;
+    .mobile-modal .mobile-modal-wrapper {
+      left: .2rem !important;
+      right: .2rem !important;
+    }
   }
 </style>