修改买卖家入口界面，修改订单

assets/scss/mobileCenter.scss

@@ -28,7 +28,7 @@
     }*/
   }
   .seek-operation {
-    height: 2.09rem;
+    min-height: 2.09rem;
     padding: 0 .24rem;
     > p {
       height: .55rem;
@@ -46,19 +46,34 @@
     ul {
       margin-top: .27rem;
       li {
+        position: relative;
         display: inline-block;
         width: 1.48rem;
         margin-right: 1.05rem;
         text-align: center;
         font-size: .28rem;
+        margin-bottom: 0.2rem;
         color: #666;
-        &:last-child {
+        &:nth-child(3n) {
           margin-right: 0;
         }
         img {
           width: .8rem;
           margin-bottom: .05rem;
         }
+        span.text{
+          position: absolute;
+          font-size: 0.18rem;
+          color: #fff;
+          background: #e60012;
+          width: 0.28rem;
+          height: 0.28rem;
+          border-radius: 50%;
+          top: -0.04rem;
+          right: 0.2rem;
+          line-height: 0.28rem;
+          text-align: center;
+        }
       }
     }
   }

components/mobile/common/PullUp.vue

@@ -49,7 +49,11 @@
         if (this.fixId) {
           let obj = document.getElementById(this.fixId)
           height = obj.scrollHeight
-          scrolled = obj.scrollTop - document.body.scrollWidth / 750 * 100 * 0.88
+          let _scrollHeight = 0.88
+          if (this.$route.fullPath.indexOf('order') > -1) {
+            _scrollHeight = 1.26
+          }
+          scrolled = obj.scrollTop - document.body.scrollWidth / 750 * 100 * _scrollHeight
         } else {
           height = document.body.scrollHeight
           scrolled = document.documentElement.scrollTop || window.pageYOffset || document.body.scrollTop

pages/mobile/center/user/index.vue

@@ -26,33 +26,37 @@
           </li>
         </ul>
       </div>
-      <div class="block-wrap collect-block">
-        <nuxt-link tag="div" to="/mobile/order?type=buyer" class="content-line">
-          <img src="/images/mobile/center/user/order.jpg" alt="">
-          <span>采购订单</span>
-          <i class="iconfont icon-xiangyou"></i>
-        </nuxt-link>
-        <nuxt-link tag="div" to="/mobile/center/user/cart" class="content-line">
-          <img src="/images/mobile/center/user/cart.jpg" alt="">
-          <span>购物车<span class="text">({{carCount || 0}})</span></span>
-          <i class="iconfont icon-xiangyou"></i>
-        </nuxt-link>
-        <nuxt-link tag="div" to="/mobile/center/user/collect/component" class="content-line">
-          <img src="/images/mobile/center/user/comp-collect.png" alt="">
-          <span>器件收藏<span class="text">({{compCount.data || 0}})</span></span>
-          <i class="iconfont icon-xiangyou"></i>
-        </nuxt-link>
-        <nuxt-link tag="div" to="/mobile/center/user/collect/store" class="content-line">
-          <img src="/images/mobile/center/user/store-focus.png" alt="">
-          <span>店铺关注<span class="text">({{storeCount.data || 0}})</span></span>
-          <i class="iconfont icon-xiangyou"></i>
-        </nuxt-link>
-        <nuxt-link tag="div" to="/mobile/center/user/collect/message" class="content-line" v-if="user.data.enterprise.uu">
-          <img src="/images/mobile/center/user/message.png" alt="">
-          <span>消息中心<span class="text">({{messageCount.count || 0}})</span></span>
-          <i class="iconfont icon-xiangyou"></i>
-        </nuxt-link>
+
+      <div class="block-wrap seek-operation">
+        <p><i></i>更多服务</p>
+        <ul>
+          <nuxt-link tag="li" to="/mobile/order?type=buyer" class="content-line">
+            <img src="/images/mobile/center/user/order.jpg" alt="">
+            <p>采购订单</p>
+          </nuxt-link>
+          <nuxt-link tag="li" to="/mobile/center/user/cart" class="content-line">
+            <img src="/images/mobile/center/user/cart.jpg" alt="">
+            <p>购物车<span class="text">{{carCount || 0}}</span></p>
+          </nuxt-link>
+          <nuxt-link tag="li" to="/mobile/center/user/collect/component" class="content-line">
+            <img src="/images/mobile/center/user/comp-collect.png" alt="">
+            <p>器件收藏<span class="text">{{compCount.data || 0}}</span></p>
+          </nuxt-link>
+          <nuxt-link tag="li" to="/mobile/center/user/collect/store" class="content-line">
+            <img src="/images/mobile/center/user/store-focus.png" alt="">
+            <p>店铺关注<span class="text">{{storeCount.data || 0}}</span></p>
+          </nuxt-link>
+          <nuxt-link tag="li" to="/" class="content-line">
+            <img src="/images/mobile/center/user/payfor_icon.png" alt="">
+            <p>支付中心</p>
+          </nuxt-link>
+          <nuxt-link tag="li" to="/mobile/center/user/collect/message" class="content-line" v-if="user.data.enterprise.uu">
+            <img src="/images/mobile/center/user/message.png" alt="">
+            <p>消息中心<span class="text">{{messageCount.count || 0}}</span></p>
+          </nuxt-link>
+        </ul>
       </div>
+
     </div>
     <publish-seek :showSayPriceBox="showPublishBox" @cancelAction="showPublishBox = false" @remindAction="onRemind"></publish-seek>
     <remind-box :title="remindText" :timeoutCount="timeoutCount"></remind-box>

pages/mobile/center/vendor/index.vue

@@ -50,9 +50,21 @@
             <img src="/images/mobile/center/user/order.jpg" alt="">
             <p>销售订单</p>
           </nuxt-link>
+          <nuxt-link tag="li" to="/">
+            <img src="/images/mobile/center/user/wuliu_icon.png" alt="">
+            <p>物流管理</p>
+          </nuxt-link>
+          <nuxt-link tag="li" to="/">
+            <img src="/images/mobile/center/user/finance_icon.png" alt="">
+            <p>财务对账</p>
+          </nuxt-link>
+          <nuxt-link tag="li" to="/">
+            <img src="/images/mobile/center/user/invoice_icon.png" alt="">
+            <p>发票管理</p>
+          </nuxt-link>
           <nuxt-link tag="li" to="/mobile/center/vendor/message"  v-if="user.data.enterprise.uu">
             <img src="/images/mobile/center/user/message.png" alt="">
-            <p>消息中心<span class="text">({{messageCount.count || 0}})</span></p>
+            <p>消息中心<span class="text">{{messageCount.count || 0}}</span></p>
           </nuxt-link>
         </ul>
       </div>

pages/mobile/center/vendor/productdetails.vue

@@ -480,10 +480,15 @@
 </script>
 
 <style lang="scss" scoped>
+  @mixin overFlowHidden {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
   .productDetails {
     background: #fff;
-    margin: .2rem 0.2rem 0;
-    padding: 0.9rem 0 0.5rem 0;
+    margin: 1.26rem 0.2rem 0;
+    padding: 0 0 0.5rem 0;
     .product {
       /*background: #fff;*/
       /*margin: .2rem 0.2rem 0;*/
@@ -535,6 +540,7 @@
         }
         .pull-left {
           width: 50%;
+          @include overFlowHidden()
         }
         .progress-wrapper {
           width: .68rem;

pages/mobile/order/details.vue

@@ -246,7 +246,7 @@
           <template v-if="vendorType === 'buyer'">
             <div class="sendGoods" v-if="orderList.status === 404" @click="buyerGetGoods(orderList)">确认收货</div>
             <div class="sendGoods" v-if="!orderList.installmentId && (orderList.status === 503 || orderList.status === 501)" @click="gotoPay(orderList)">立即付款</div>
-            <div class="sendGoods" @click="onMind('此订单为分期付款，请前往【PC】端进行相关操作')" v-if="orderList.installmentId && (orderList.status === 503 || orderList.status === 504 || orderList.status === 524 ) && orderList.installment.status !== 505 && !orderList.againUpload">确认付款</div>
+            <div class="sendGoods" @click="onMind('此订单为分期付款，请前往【PC】端进行相关操作')" v-if="orderList.installmentId && (orderList.status === 503 || orderList.status === 504 || orderList.status === 524 ) && orderList.installment.status !== 505 && !orderList.againUpload">立即付款</div>
             <div class="" @click="onMind('此订单为分期付款，请前往【PC】端进行相关操作')" v-if="orderList.installmentId && (orderList.status === 503 || orderList.status === 504 || orderList.status === 524 ) && orderList.installment.status !== 505 && orderList.againUpload">重新上传</div>
             <div class="" @click="cancelOrder(orderList)" v-if="orderList.status === 503 || orderList.status === 501 || orderList.status === 502">取消订单</div>
             <div @click="paidTime(orderList)" class="" v-if="_getHoursFromNow(orderList.paytime) > sellsendGoodsTime - 1 && orderList.status !== 404 ">提醒发货</div>
@@ -889,7 +889,7 @@
   .order-wrapper {
     background: #f1f3f6;
     margin: 1.26rem 0 0.98rem 0;
-    height: calc(100vh - 0.88rem - 0.96rem);
+    height: calc(100vh - 1.26rem - 0.98rem);
     overflow-y: scroll;
     .order-details-wrap {
       .order-details-top {
@@ -1148,7 +1148,7 @@
         font-size: 0.24rem;
         color: #999;
         padding: 0.2rem 0;
-        margin-bottom: 0.3rem;
+        margin-bottom: 0.8rem;
        .clearfix.moreinfoList {
          padding: 0 0.2rem;
          /*border-bottom: 1px solid #e4e4e4;*/
@@ -1168,6 +1168,13 @@
           padding: 0 0.2rem;
         }
         .list-btn {
+          position: fixed;
+          bottom: 0.98rem;
+          width: 100%;
+          left: 0;
+          background: #fff;
+          height: 0.8rem;
+          border-top: 1px solid #dcdcdc;
           div {
             float: right;
             width: 1.5rem;
@@ -1177,7 +1184,7 @@
             border-radius: 3px;
             text-align: center;
             font-size: 0.26rem;
-            margin-top: 0.2rem;
+            margin-top: 0.15rem;
             margin-right: 0.2rem;
           }
         }

pages/mobile/order/index.vue

@@ -1,12 +1,12 @@
 <template>
-  <div class="order-wrapper" id="order-wrapper">
+  <div class="order-wrapper">
     <div class="order-nav">
       <div :class="activeType === '' ? 'active': ''" @click="ChangeList('')"><span>全部</span></div>
       <div :class="activeType === 'tobeconfirmed' ? 'active' : ''" @click="ChangeList('tobeconfirmed')"><span>待付款</span></div>
       <div :class="activeType === 'comfirmed' ? 'active' : ''" @click="ChangeList('comfirmed')"><span>待发货</span></div>
       <div :class="activeType === 'inbound' ? 'active' : ''" @click="ChangeList('inbound')"><span>待收货</span></div>
     </div>
-    <ul class="order-list-wrap">
+    <ul class="order-list-wrap"  id="order-wrapper">
       <li class="clearfix" v-for="item in orderList">
         <div class="list-wrap-title clearfix">
           <div class="pull-left" v-if="vendorType !== 'buyer'" @click="toShopdetails(item)">
@@ -87,14 +87,14 @@
         <div class="list-btn clearfix">
           <template v-if="vendorType === 'buyer'">
             <div class="pull-right sendGoods" v-if="item.status === 404" @click="buyerGetGoods(item)">确认收货</div>
-            <div class="pull-right sendGoods" v-if="!item.installmentId && (item.status === 503 || item.status === 501)" @click="gotoPay(item)">确认付款</div>
+            <div class="pull-right sendGoods" v-if="!item.installmentId && (item.status === 503 || item.status === 501)" @click="gotoPay(item)">立即付款</div>
             <div class="pull-right" @click="lookOrderDetail(item)">订单详情</div>
             <div class="pull-right sendGoods" @click="onMind('此订单为分期付款，请前往【PC】端进行相关操作')" v-if="item.installmentId && (item.status === 503 || item.status === 504 || item.status === 524 ) && item.installment.status !== 505 && !item.againUpload">立即付款</div>
             <div class="pull-right" @click="onMind('此订单为分期付款，请前往【PC】端进行相关操作')" v-if="item.installmentId && (item.status === 503 || item.status === 504 || item.status === 524 ) && item.installment.status !== 505 && item.againUpload">重新上传</div>
             <div class="pull-right" @click="cancelOrder(item)" v-if="item.status === 503 || item.status === 501 || item.status === 502">取消订单</div>
             <div class="pull-right" @click="deleteOrder(item)" v-if="item.status === 602 || item.status === 603 || item.status === 315 || item.status === 604 || item.status === 605 || item.status === 606">
               删除订单</div>
-            <div @click="paidTime(item)" class="pull-right" v-if="_getHoursFromNow(item.paytime) > sellsendGoodsTime - 1 && item.status !== 404">提醒发货</div>
+            <div @click="paidTime(item)" class="pull-right" v-if="_getHoursFromNow(item.paytime) > sellsendGoodsTime - 1 && item.status !== 404 && item.status !== 524">提醒发货</div>
             <div @click="lookLogisticsInfo(item)" class="pull-right" v-if="item.status === 404 || item.status === 520 || item.status === 405 || item.status === 521">查看物流</div>
             <div class="pull-right cancat" @click="cancatAlert(item)">
               <i class="iconfont icon-kefu1"></i>联系卖家
@@ -403,6 +403,7 @@
           status = '404'
         }
         this.$status = status
+        this.orderList = []
         this.$store.dispatch('order/getBuyerOrderList', {
           count: 5,
           page: 1,
@@ -425,6 +426,7 @@
         this.peisongShowName = ''
         this.sendGoodsInfo.kuaidinumber = ''
         this.$status = status
+        this.orderList = []
         this.$store.dispatch('order/getSellOrderList', {
           count: 5,
           page: 1,
@@ -625,6 +627,8 @@
           if (returnResult.status === 505 || returnResult.status === 406 || returnResult.status === 407 || returnResult.status === 403 || returnResult.status === 408) {
             this.onMind('提醒成功')
             this.ChangeList(this.activeType)
+          } else {
+            this.onMind('提醒发货失败：' + returnResult.message)
           }
         })
       },
@@ -758,8 +762,8 @@
             _obj[i].purchaseDetails = _obj[i].orderDetails
           }
           if (_obj[i].status === 505 || _obj[i].status === 406 || _obj[i].status === 407 || _obj[i].status === 403 || _obj[i].status === 408) {
-            _obj[i].paidTimeFromNow = this._getHoursFromNow(_obj[i].paytime)
-            _obj[i].lastNotiDelivery = this._getHoursFromNow(_obj[i].lastNotifyDeliveryTime)
+            // _obj[i].paidTimeFromNow = this._getHoursFromNow(_obj[i].paytime)
+            // _obj[i].lastNotiDelivery = this._getHoursFromNow(_obj[i].lastNotifyDeliveryTime)
           }
         }
         return _obj
@@ -772,6 +776,7 @@
         let newTime = new Date()
         let msec = newTime.getTime() - time
         let hours = parseInt(parseInt(msec) / (1000 * 60 * 60))
+        console.log(hours)
         return hours
       },
       onMind(str) {
@@ -828,8 +833,7 @@
 .order-wrapper {
   background: #f1f3f6;
   margin: 1.26rem 0 0.98rem 0;
-  height: calc(100vh - 0.88rem - 0.96rem);
-  overflow-y: scroll;
+  height: calc(100vh - 1.26rem - 0.98rem);
   /*padding-bottom: 0.96rem;*/
   .order-nav {
     background: #fff;
@@ -849,6 +853,8 @@
     }
   }
   .order-list-wrap {
+    height: calc(100vh - 1.26rem - 0.96rem - 0.84rem);
+    overflow-y: scroll;
     li {
       margin-top: 0.2rem;
     }