Browse Source

修改需求

yangc 7 years ago
parent
commit
63a5155926

+ 6 - 0
assets/scss/mobilePayCenter.scss

@@ -94,6 +94,12 @@ $base-color: #3f84f6;
           &:first-child {
             border-right: 1px solid #d9d9d9;
           }
+          &.default-icon {
+            color: #15b262;
+            i {
+              color: #15b262;
+            }
+          }
         }
       }
     }

+ 3 - 4
components/mobile/MobileHeader.vue

@@ -138,7 +138,6 @@
       },
       initHeader: function (val, query) {
         this.showSearchIcon = false
-        let _tp = this.$route.query.type
         this.showHeader = val && val !== '/' && val !== '/mobile/applyPurchase/list' && !this.startWith(val, '/mobile/supplier')
 //        this.showSearch = val !== '/' && !this.startWith(val, '/mobile/search')
         let title = '优软商城'
@@ -213,8 +212,8 @@
           title = '购物车'
         } else if (this.startWith(val, '/mobile/center/user/payCenter')) {
           this.showSearchIcon = false
-          if (_tp) {
-            title = '款账户'
+          if (this.$route.query.switchType === 'account') {
+            title = '款账户'
           } else {
             title = '应付对账'
           }
@@ -223,7 +222,7 @@
           title = '发票管理'
         } else if (this.startWith(val, '/mobile/center/vendor/payCenter')) {
           this.showSearchIcon = false
-          if (_tp) {
+          if (this.$route.query.switchType === 'account') {
             title = '收款账户'
           } else {
             title = '应收对账'

+ 1 - 1
components/mobile/applyPurchase/SeekList.vue

@@ -43,7 +43,7 @@
                 <span v-if="getDay(item.remainingTime) <= 0" v-text="getHours(item.remainingTime)"></span>
                 <i v-if="getDay(item.remainingTime) <= 0">&nbsp;小时</i>
               </p>
-              <p class="remain-time" v-else><span>已截止</span></p>
+              <!--<p class="remain-time" v-else><span>已截止</span></p>-->
             </template>
           </div>
           <div class="fr" :class="{'no-btn': !isSelfSeek(item) && !canSayPrice(item) && !canSeeInfo(item), 'is-qutation': item.quotation, 'is-simple': userType !== 'buyer' && item.quotation}">

+ 1 - 1
components/mobile/center/Seek.vue

@@ -10,7 +10,7 @@
         <span class="mobile-switch-btn" :class="{'active': activeType=='all'}" @click="switchActiveType('all')">公司商机</span>
         <span class="mobile-switch-btn" :class="{'active': activeType=='self'}" @click="switchActiveType('self')">我的商机</span>
       </div>
-      <div class="product-switch-item" v-if="userType == 'buyer'">
+      <div class="product-switch-item" v-if="userType == 'buyer' && seekType !== 'done'">
         <span :class="overdue==='attention'?'mobile-switch-btn active':'mobile-switch-btn'" @click="ChangeTab('attention')">未截止</span>
         <span :class="overdue==='isattention'?'mobile-switch-btn active':'mobile-switch-btn'" @click="ChangeTab('isattention')">已截止</span>
       </div>

+ 1 - 1
pages/mobile/center/user/invoice/index.vue

@@ -3,7 +3,7 @@
     <div class="mobile-nav">
       <div class="mobile-header mobile-center-header">
         <a @click="goLastPage()"><i class="iconfont icon-fanhui"></i></a>
-        <p>票信息</p>
+        <p>票信息</p>
         <p class="en-name">
           <img :src="`/images/mobile/center/${user.data.enterprise && user.data.enterprise.uu ? 'en' : 'self'}.png`" alt="">{{currentEnName}}
         </p>

+ 10 - 1
pages/mobile/center/user/invoice/invoiceRecord.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="mobile-invoice invoice-wrapper invoice-record" @click="showFilterInvoiceType = false">
     <div class="order-nav">
-      <nuxt-link to="/mobile/center/user/invoice/waitinvoice" tag="div"><span>申请</span></nuxt-link>
+      <nuxt-link to="/mobile/center/user/invoice/waitinvoice" tag="div"><span>申请开票</span></nuxt-link>
       <nuxt-link to="/mobile/center/user/invoice/invoiceRecord?status=101" tag="div" :class="status === '101' ? 'active' :''"><span>待卖家开票</span></nuxt-link>
       <nuxt-link to="/mobile/center/user/invoice/invoiceRecord?status=102" tag="div" :class="status === '102' ? 'active' :''"><span>已开票</span></nuxt-link>
       <!--<div class="active"><span>已开票</span></div>-->
@@ -105,6 +105,15 @@
                 </div>
               </div>
 
+              <div class="list ">
+                <div class="clearfix">
+                  <div class="pull-left">卖家:</div>
+                  <div class="pull-left" style="width: 5rem;">
+                    {{inv.sellername}}
+                  </div>
+                </div>
+              </div>
+
               <div class="list ">
                 <div class="clearfix">
                   <div class="pull-left">订单号:</div>

+ 1 - 1
pages/mobile/center/user/invoice/waitinvoice.vue

@@ -10,7 +10,7 @@
       </div>
     </div>
     <div class="order-nav">
-      <div class="active"><span>申请</span></div>
+      <div class="active"><span>申请开票</span></div>
       <nuxt-link to="/mobile/center/user/invoice/invoiceRecord?status=101" tag="div"><span>待卖家开票</span></nuxt-link>
       <!--<div class="active"><span>待开票订单</span></div>-->
       <nuxt-link to="/mobile/center/user/invoice/invoiceRecord?status=102" tag=div><span>已开票</span></nuxt-link>

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

@@ -31,8 +31,8 @@
             <a class="fr inline-block" @click="deleteAccount(account)">删除</a>
           </div>-->
           <div class="btn-wrap">
-            <a class="inline-block default-icon" v-if="account.num == 1"><i class="iconfont icon-gouxuan1"></i>默认账户</a>
-            <a class="inline-block set-default-icon" v-if="account.num != 1" @click="setDefaultAccount(account)"><i class="iconfont icon-gouxuan1"></i>设为默认</a>
+            <a class="inline-block default-icon" v-if="account.num == 1" @click="setRemindText('该账户是默认账户')"><i class="iconfont icon-gouxuan1"></i>默认账户</a>
+            <a class="inline-block" v-if="account.num != 1" @click="setDefaultAccount(account)"><i class="iconfont icon-gouxuan1"></i>设为默认</a>
             <a class="inline-block" @click="deleteAccount(account)"><i class="iconfont icon-lajitong"></i>删除</a>
           </div>
         </li>

+ 4 - 3
pages/mobile/center/user/seek.vue

@@ -10,8 +10,7 @@
       let user = store.state.option.user.data
       let params = {
         pageNumber: 1,
-        pageSize: 10,
-        overdue: '0'
+        pageSize: 10
       }
       if (user.enterprise.uu) {
         params.enUU = user.enterprise.uu
@@ -20,6 +19,7 @@
       }
       if (query.seekType === 'wait') {
         params.state = 'todo'
+        params.overdue = 0
         return Promise.all([
           store.dispatch('applyPurchase/loadBuyerUnSayPricePurchaseManList', params)
         ])
@@ -44,13 +44,14 @@
           pageNumber: page,
           pageSize: count,
           keyword: keyword,
-          overdue: otherParamas[2]
+          overdue: otherParamas[2] || null
         }
         if (this.user.data.enterprise.uu) {
           params.enUU = this.user.data.enterprise.uu
         } else {
           params.userUU = this.user.data.userUU
         }
+        console.log(params)
         if (this.seekType === 'done') {
           params._state = 'done'
           this.$store.dispatch('applyPurchase/loadBuyerPurchaseManList', params)

+ 1 - 1
pages/mobile/user/index.vue

@@ -40,7 +40,7 @@
           </li>
           <li @click="go('/mobile/center/user/invoice?type=frompage')">
             <img src="/images/mobile/user/fapiao.png" alt="">
-            <p>票信息</p>
+            <p>票信息</p>
           </li>
           <li @click="go('/mobile/center/vendor/payCenter?switchType=account&type=frompage')">
             <img src="/images/mobile/user/shoukuan.png" alt="">