Merge remote-tracking branch 'origin/release-201818' into release-201818

assets/scss/mobileCommon.scss

@@ -664,8 +664,8 @@ table.com-price-list {
       text-align: left;
       padding: 0 .2rem;
       font-size: .28rem;
-      height: .53rem;
-      line-height: .53rem;
+      height: .73rem;
+      line-height: .73rem;
       &:active, &:focus {
         background: $base-color;
         color: #fff;

assets/scss/mobileInvoice.scss

@@ -95,13 +95,13 @@ $blue-base: #3f84f6;
             border-bottom: none;
           }
           .title {
-            width: 28%;
+            width: 31%;
             text-align: right;
             color: #666;
             vertical-align: top;
           }
           .content {
-            width: 72%;
+            width: 69%;
             text-align: right;
             padding-right: .18rem;
             padding-left: .6rem;

pages/mobile/center/user/cart.vue

@@ -64,7 +64,7 @@
       <empty-status :text="'购物车空空如也，快去添加商品吧！'"></empty-status>
     </template>
     <remind-box :title="remindText" :timeoutCount="timeoutCount"></remind-box>
-    <pull-up :fixId="'mobileFixContent'" :searchMore="fetching" :allPage="allPage" :page="page" @pullUpAction="onPullUpAction"></pull-up>
+    <pull-up :searchMore="fetching" :allPage="allPage" :page="page" @pullUpAction="onPullUpAction"></pull-up>
     <link-user :infoObj="currentStoreInfo"
                :showLink="showLink"
                @closeAction="showLink = false"></link-user>

pages/mobile/center/user/invoice/index.vue

@@ -314,6 +314,9 @@
     .order-nav {
       background: #fff;
       position: fixed;
+      -webkit-box-shadow: 0 1px 3px #ddd;
+      -moz-box-shadow: 0 1px 3px #ddd;
+      box-shadow: 0 1px 3px #ddd;
       top: 1.26rem;
       width: 100%;
       z-index: 10;

pages/mobile/center/user/invoice/invoiceRecord.vue

@@ -1,103 +1,137 @@
 <template>
-  <div class="mobile-invoice mobile-content mobile-content-long invoice-record" @click="showFilterInvoiceType = false">
+  <div class="mobile-invoice invoice-wrapper invoice-record" @click="showFilterInvoiceType = false">
     <div class="order-nav">
       <nuxt-link to="/mobile/center/user/invoice" tag="div"><span>发票信息</span></nuxt-link>
       <nuxt-link to="/mobile/center/user/invoice/waitinvoice" tag="div"><span>待开票订单</span></nuxt-link>
       <div class="active"><span>开票记录</span></div>
     </div>
-    <div class="search-content mi-search-content">
-      <input type="text" v-model="filterParams.keyword" @keyup.13="onFilter" placeholder="订单号/发票抬头/收票人/联系电话">
-      <span @click="onFilter"><i class="iconfont icon-sousuo"></i></span>
-    </div>
-    <div class="mi-list-content">
-      <div class="mi-lc-filters clearfix">
-        <span class="multi-check inline-block" :class="{active: filterParams.status === 101}" @click="setFilter('status', 101)">待开票</span>
-        <span class="multi-check inline-block" :class="{active: filterParams.status === 102}" @click="setFilter('status', 102)">已开票</span>
-        <div class="com-select-wrap fr" @click.stop="showFilterInvoiceType = !showFilterInvoiceType">{{filterParams.invoicetype === 1206 ? '普票' : filterParams.invoicetype === 1205 ? '专票' : '全部'}}
-          <ul class="select-list" v-show="showFilterInvoiceType">
-            <li @click.stop="setFilter('invoicetype', null)" v-show="filterParams.invoicetype">全部</li>
-            <li @click.stop="setFilter('invoicetype', 1206)" v-show="filterParams.invoicetype != 1206">普票</li>
-            <li @click.stop="setFilter('invoicetype', 1205)" v-show="filterParams.invoicetype != 1205">专票</li>
-          </ul>
-        </div>
+    <div class="invoice-wrapper-el" id="invoice-wrapper-el">
+      <div class="search-content mi-search-content">
+        <input type="text" v-model="filterParams.keyword" @keyup.13="onFilter" placeholder="订单号/发票抬头/收票人/联系电话">
+        <span @click="onFilter"><i class="iconfont icon-sousuo"></i></span>
       </div>
-      <ul class="mi-list" v-if="invoiceList.length">
-        <li v-for="inv in invoiceList">
-          <div class="line">
+      <div class="mi-list-content">
+        <div class="mi-lc-filters clearfix">
+          <span class="multi-check inline-block" :class="{active: filterParams.status === 101}" @click="setFilter('status', 101)">待开票</span>
+          <span class="multi-check inline-block" :class="{active: filterParams.status === 102}" @click="setFilter('status', 102)">已开票</span>
+          <div class="com-select-wrap fr" @click.stop="showFilterInvoiceType = !showFilterInvoiceType">{{filterParams.invoicetype === 1206 ? '普票' : filterParams.invoicetype === 1205 ? '专票' : '全部'}}
+            <ul class="select-list" v-show="showFilterInvoiceType">
+              <li @click.stop="setFilter('invoicetype', null)" v-show="filterParams.invoicetype">全部</li>
+              <li @click.stop="setFilter('invoicetype', 1206)" v-show="filterParams.invoicetype != 1206">普票</li>
+              <li @click.stop="setFilter('invoicetype', 1205)" v-show="filterParams.invoicetype != 1205">专票</li>
+            </ul>
+          </div>
+        </div>
+        <ul class="mi-list" v-if="invoiceList.length">
+          <li v-for="inv in invoiceList">
+            <div class="line">
             <span class="inline-block title">
               类型：
             </span>
-            <span class="inline-block content">
+              <span class="inline-block content">
               <i class="inv" :class="{'spec-inv' : inv.invoicetype === 1205}">{{inv.invoicetype === 1206 ? '普票' : '专票'}}</i>
             </span>
-          </div>
-          <div class="line">
+            </div>
+            <div class="line">
             <span class="inline-block title">
               申请时间：
             </span>
-            <span class="inline-block content">{{inv.createTime | date}}</span>
-          </div>
-          <div class="line">
+              <span class="inline-block content">{{inv.createTime | date}}</span>
+            </div>
+            <div class="line">
             <span class="inline-block title">
               状态：
             </span>
-            <span class="inline-block content">{{inv.status == 101 ? '待开票' : '已开票'}}</span>
-          </div>
-          <div class="line">
+              <span class="inline-block content">{{inv.status == 101 ? '待开票' : '已开票'}}</span>
+            </div>
+            <div class="line">
             <span class="inline-block title">
               商家名称：
             </span>
-            <nuxt-link :to="`/mobile/shop/${inv.storeid}`" class="inline-block content link">{{inv.sellername}}</nuxt-link>
-          </div>
-          <div class="line">
+              <nuxt-link :to="`/mobile/shop/${inv.storeid}`" class="inline-block content link">{{inv.sellername}}</nuxt-link>
+            </div>
+            <div class="line">
             <span class="inline-block title">
               订单号：
             </span>
-            <span class="inline-block content link">
-              <nuxt-link class="block" :key="id" :to="`/mobile/order/details?uuid=${baseUtils.enidfilter(id)}&type=buyer`" v-for="id in inv.orderids.split(',')">
+              <span class="inline-block content">
+              <nuxt-link class="block link" :key="id" :to="`/mobile/order/details?uuid=${baseUtils.enidfilter(id)}&type=buyer`" v-for="id in inv.orderids.split(',')">
                 {{id}}
               </nuxt-link>
             </span>
-          </div>
-          <div class="line">
+            </div>
+            <div class="line">
             <span class="inline-block title">
               可开票金额：
             </span>
-            <span class="inline-block content price">¥{{inv.price || 0}}</span>
-          </div>
-          <div class="line">
+              <span class="inline-block content price">¥{{inv.price || 0}}</span>
+            </div>
+            <div class="line">
             <span class="inline-block title">
               发票抬头：
             </span>
-            <span class="inline-block content">{{inv.invoicetitle}}</span>
-          </div>
-          <div class="line">
+              <span class="inline-block content">{{inv.invoicetitle}}</span>
+            </div>
+            <template v-if="inv.invoicetype == 1205">
+              <div class="line">
+            <span class="inline-block title">
+              单位地址：
+            </span>
+                <span class="inline-block content">{{inv.billInfo.companyAddress || '-'}}</span>
+              </div>
+              <div class="line">
+            <span class="inline-block title">
+              单位电话：
+            </span>
+                <span class="inline-block content">{{inv.billInfo.companyPhone || '-'}}</span>
+              </div>
+              <div class="line">
+            <span class="inline-block title">
+              税务登记号：
+            </span>
+                <span class="inline-block content">{{inv.billInfo.companyTaxNumber || '-'}}</span>
+              </div>
+              <div class="line">
+            <span class="inline-block title">
+              开户银行：
+            </span>
+                <span class="inline-block content">{{inv.billInfo.bankName || '-'}}</span>
+              </div>
+              <div class="line">
+            <span class="inline-block title">
+              开户银行账户：
+            </span>
+                <span class="inline-block content">{{inv.billInfo.bankAccount || '-'}}</span>
+              </div>
+            </template>
+            <div class="line">
             <span class="inline-block title">
               收票人：
             </span>
-            <span class="inline-block content">{{inv.receiverName}}</span>
-          </div>
-          <div class="line">
+              <span class="inline-block content">{{inv.receiverName}}</span>
+            </div>
+            <div class="line">
             <span class="inline-block title">
               联系电话：
             </span>
-            <span class="inline-block content">{{inv.recTel}}</span>
-          </div>
-          <div class="line">
+              <span class="inline-block content">{{inv.recTel}}</span>
+            </div>
+            <div class="line">
             <span class="inline-block title">
               收票地址：
             </span>
-            <span class="inline-block content">{{inv.invoiceAddress}}</span>
-          </div>
-        </li>
-      </ul>
-      <empty-status
-        :text="'暂无开票信息'"
-        :showLink="false"
-        v-else></empty-status>
+              <span class="inline-block content">{{inv.invoiceAddress}}</span>
+            </div>
+          </li>
+        </ul>
+        <empty-status
+          :text="'暂无开票信息'"
+          :showLink="false"
+          v-else></empty-status>
+      </div>
     </div>
     <remind-box :title="remindText" :timeoutCount="timeoutCount"></remind-box>
-    <pull-up :searchMore="fetching" :allPage="invoices.data.totalPages" :page="page" @pullUpAction="onPullUp"></pull-up>
+    <pull-up :fixId="'invoice-wrapper-el'" :searchMore="fetching" :allPage="invoices.data.totalPages" :page="page" @pullUpAction="onPullUp"></pull-up>
   </div>
 </template>
 <script>
@@ -140,7 +174,11 @@
               this.invoiceList = []
               this.isChange = false
             }
-            this.invoiceList = [...this.invoiceList, ...val.content]
+            let arr = this.baseUtils.deepCopy(val.content)
+            arr.forEach(item => {
+              item.billInfo = item.billInfo ? JSON.parse(item.billInfo) : {}
+            })
+            this.invoiceList = [...this.invoiceList, ...arr]
           }
         },
         immediate: true
@@ -210,6 +248,12 @@
   }
   .order-nav {
     background: #fff;
+    -webkit-box-shadow: 0 1px 3px #ddd;
+    -moz-box-shadow: 0 1px 3px #ddd;
+    box-shadow: 0 1px 3px #ddd;
+    position: fixed;
+    width: 100%;
+    top: 1.26rem;
     div {
       height: 0.82rem;
       line-height: 0.82rem;
@@ -225,4 +269,23 @@
       }
     }
   }
+  .invoice-wrapper {
+    background: #fff;
+    /*margin: 1.26rem 0 0 0;*/
+    left: 0;
+    bottom: .98rem;
+    top: 2.08rem;
+    right: 0;
+    z-index: 0;
+    /*padding: 0.82rem 0 1.04rem;*/
+    /*height: calc(100vh - 1.26rem);*/
+    position: absolute;
+    width: 100%;
+    .invoice-wrapper-el {
+      /*margin: 0 0 0.98rem;*/
+      height: calc(100vh - 1.26rem - 0.98rem);
+      overflow-y: scroll;
+      /*padding-bottom: 0.98rem;*/
+    }
+  }
 </style>

pages/mobile/center/user/invoice/waitinvoice.vue

@@ -511,6 +511,9 @@
     }
     .order-nav {
       background: #fff;
+      -webkit-box-shadow: 0 1px 3px #ddd;
+      -moz-box-shadow: 0 1px 3px #ddd;
+      box-shadow: 0 1px 3px #ddd;
       position: fixed;
       width: 100%;
       top: 1.26rem;

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

@@ -208,56 +208,67 @@
     <!-- 选择配送方式弹框end -->
 
     <!-- 选择发票弹框start -->
-    <modal-wrapper :showModal="showInvoiceModal"
+    <modal-wrapper :showModal="showInvoiceModal && !showAddinvoice"
                    :title="'选择发票'"
                    @closeAction="showInvoiceModal = false">
       <ul class="invoice-list">
         <li @click="setInvoiceCheck(-1)">
-          <label class="bottom-modal-check mobile-cart-check" :class="{active: selectedInvoiceIndex === -1}">
-            <input type="checkbox">
-          </label>
-          <span class="inv-head">暂不开票</span>
-        </li>
-        <li v-for="(inv, index) in invoiceData" @click="setInvoiceCheck(index)">
-          <label class="bottom-modal-check mobile-cart-check" :class="{'active': selectedInvoiceIndex === index}">
-            <input type="checkbox">
-          </label>
-          <span class="inv-head inline-block text-ellipse">{{inv.head}}</span>
-          <img class="inv-type" :src="`/images/mobile/center/user/${inv.kind === 1205 ? 'invoice-spec' : 'invoice-nor'}.png`" alt="">
-          <div class="content-line" v-if="inv.kind === 1205">
-            <div class="title inline-block">单位地址：</div>
-            <div class="content inline-block">{{inv.companyAddress || '-'}}</div>
-          </div>
-          <div class="content-line" v-if="inv.kind === 1205">
-            <div class="title inline-block">单位电话：</div>
-            <div class="content inline-block">{{inv.companyPhone || '-'}}</div>
+          <div class="inv-content">
+            <label class="bottom-modal-check mobile-cart-check" :class="{active: selectedInvoiceIndex === -1}">
+              <input type="checkbox">
+            </label>
+            <span class="inv-head">暂不开票</span>
           </div>
-          <div class="content-line" v-if="inv.kind === 1205">
-            <div class="title inline-block">税务登记号：</div>
-            <div class="content inline-block">{{inv.companyTaxNumber || '-'}}</div>
-          </div>
-          <div class="content-line" v-if="inv.kind === 1205">
-            <div class="title inline-block">开户银行：</div>
-            <div class="content inline-block">{{inv.bankName || '-'}}</div>
-          </div>
-          <div class="content-line" v-if="inv.kind === 1205">
-            <div class="title inline-block">开户银行账户：</div>
-            <div class="content inline-block">{{inv.bankAccount || '-'}}</div>
-          </div>
-          <div class="content-line">
-            <div class="title inline-block">收票人：</div>
-            <div class="content inline-block">{{inv.name || '-'}}</div>
-          </div>
-          <div class="content-line">
-            <div class="title inline-block">联系电话：</div>
-            <div class="content inline-block">{{inv.telephone || '-'}}</div>
+        </li>
+        <li v-for="(inv, index) in invoiceData" @click.stop="setInvoiceCheck(index)">
+          <div class="inv-content">
+            <label class="bottom-modal-check mobile-cart-check" :class="{'active': selectedInvoiceIndex === index}">
+              <input type="checkbox">
+            </label>
+            <span class="inv-head inline-block text-ellipse">{{inv.head}}</span>
+            <img class="inv-type" :src="`/images/mobile/center/user/${inv.kind === 1205 ? 'invoice-spec' : 'invoice-nor'}.png`" alt="">
+            <div class="content-line" v-if="inv.kind === 1205">
+              <div class="title inline-block">单位地址：</div>
+              <div class="content inline-block">{{inv.companyAddress || '-'}}</div>
+            </div>
+            <div class="content-line" v-if="inv.kind === 1205">
+              <div class="title inline-block">单位电话：</div>
+              <div class="content inline-block">{{inv.companyPhone || '-'}}</div>
+            </div>
+            <div class="content-line" v-if="inv.kind === 1205">
+              <div class="title inline-block">税务登记号：</div>
+              <div class="content inline-block">{{inv.companyTaxNumber || '-'}}</div>
+            </div>
+            <div class="content-line" v-if="inv.kind === 1205">
+              <div class="title inline-block">开户银行：</div>
+              <div class="content inline-block">{{inv.bankName || '-'}}</div>
+            </div>
+            <div class="content-line" v-if="inv.kind === 1205">
+              <div class="title inline-block">开户银行账户：</div>
+              <div class="content inline-block">{{inv.bankAccount || '-'}}</div>
+            </div>
+            <div class="content-line">
+              <div class="title inline-block">收票人：</div>
+              <div class="content inline-block">{{inv.name || '-'}}</div>
+            </div>
+            <div class="content-line">
+              <div class="title inline-block">联系电话：</div>
+              <div class="content inline-block">{{inv.telephone || '-'}}</div>
+            </div>
+            <div class="content-line">
+              <div class="title inline-block">详细地址：</div>
+              <div class="content inline-block">{{inv.area + inv.detailAddress}}</div>
+            </div>
           </div>
-          <div class="content-line">
-            <div class="title inline-block">详细地址：</div>
-            <div class="content inline-block">{{inv.area + inv.detailAddress}}</div>
+          <div class="edit-addr-area">
+            <a class="inline-block addr-btn" @click.stop="updateInvoice(inv)"><i class="iconfont icon-xinzeng"></i>编辑</a>
+            <a class="inline-block addr-btn" @click.stop="deleteFn(inv)"><i class="iconfont icon-lajitong"></i>删除</a>
           </div>
         </li>
       </ul>
+      <div class="inv-btn" v-if="invoiceData.length < 2">
+        <button class="add-addr-btn" @click.stop="addInvoiceNew()"><i class="iconfont icon-add"></i>添加发票</button>
+      </div>
     </modal-wrapper>
     <!-- 选择发票弹框end -->
 
@@ -378,12 +389,20 @@
                 :text="'手续费：是指第三方支付机构在交易过程中，按照一定的百分比进行收取的费用。手续费金额=订单金额 * 0.45%'"
                 @closeAction="showRemindStr = false"
     ></remind-str>
+    <addinvoice
+      :chooseItem="chooseItem"
+      @addinvoiceBtn="addinvoiceFn"
+      v-if="showAddinvoice"
+      :isSaveinvoiceType="$kind"
+      :joinType="joinType"
+    ></addinvoice>
   </div>
 </template>
 <script>
   import { LinkUser, ModalWrapper, BottomModalWrapper, AddressEdit, RemindStr } from '~components/mobile/base'
   import { RemindBox } from '~components/mobile/common'
   import { goodsPurchaseOperate } from '~utils/mixin'
+  import { addinvoice } from '~components/mobile/center'
   export default {
     layout: 'mobile',
     middleware: 'authenticated',
@@ -417,7 +436,11 @@
         currentTakeSelfStoreId: '',
         editAddr: false,
         currentAddress: {},
-        showRemindStr: false
+        showRemindStr: false,
+        chooseItem: {},
+        showAddinvoice: false,
+        $kind: 0,
+        joinType: 'add'
       }
     },
     mixins: [goodsPurchaseOperate],
@@ -427,7 +450,8 @@
       RemindBox,
       BottomModalWrapper,
       AddressEdit,
-      RemindStr
+      RemindStr,
+      addinvoice
     },
     fetch ({ store, params }) {
       return Promise.all([
@@ -709,7 +733,9 @@
         if (this.invoiceData && this.invoiceData.length) {
           this.showInvoiceModal = true
         } else {
-          this.setRemindText('暂无发票信息，请前往pc端维护')
+          this.showInvoiceModal = true
+          this.showAddinvoice = true
+//          this.setRemindText('暂无发票信息，请前往pc端维护')
         }
       },
       setAddressCheck (index) {
@@ -948,6 +974,33 @@
         }, err => {
           this.setRemindText(err.response.data || '删除失败，系统错误')
         })
+      },
+      reloadInvoice () {
+        this.$store.dispatch('userCenter/loadPayInvoice')
+      },
+      async addinvoiceFn(ty, item) {
+        this.showAddinvoice = false
+        if (ty) {
+          this.reloadInvoice()
+        }
+      },
+      updateInvoice(item, index) {
+        this.joinType = 'update'
+        this.chooseItem = this.baseUtils.deepCopy(item)
+        this.$kind = 0
+        this.showAddinvoice = true
+      },
+      addInvoiceNew() {
+        this.joinType = 'add'
+        this.$kind = this.invoiceData.length > 0 ? this.invoiceData[0].kind : 0
+        this.chooseItem = {}
+        this.showAddinvoice = true
+      },
+      deleteFn(item) {
+        this.$http.delete(`/trade/bill/delete/${item.id}`).then(res => {
+          this.setRemindText('删除成功')
+          this.reloadInvoice()
+        })
       }
     }
   }
@@ -1393,11 +1446,13 @@
           margin-bottom: 0;
         }
         background: #fff;
-        padding: .26rem .16rem .32rem .25rem;
         .inv-head {
           margin-left: .17rem;
           max-width: 5.3rem;
         }
+        .inv-content {
+          padding: .26rem .16rem .32rem .25rem;
+        }
         .inv-type {
           position: absolute;
           right: 0;
@@ -1474,22 +1529,22 @@
             color: #666;
           }
         }
-        .edit-addr-area {
-          border-top: 1px solid #d9d9d9;
-          .addr-btn {
-            width: 50%;
-            height: .8rem;
-            line-height: .8rem;
-            color: #333;
-            text-align: center;
-            i {
-              font-size: .34rem;
-              margin-right: .1rem;
-            }
-            &:first-child {
-              border-right: 1px solid #d9d9d9;
-            }
-          }
+      }
+    }
+    .edit-addr-area {
+      border-top: 1px solid #d9d9d9;
+      .addr-btn {
+        width: 50%;
+        height: .8rem;
+        line-height: .8rem;
+        color: #333;
+        text-align: center;
+        i {
+          font-size: .34rem;
+          margin-right: .1rem;
+        }
+        &:first-child {
+          border-right: 1px solid #d9d9d9;
         }
       }
     }
@@ -1511,6 +1566,13 @@
         margin-right: .08rem;
       }
     }
+    .inv-btn {
+      background: #f1f3f7;
+      padding-top: .26rem;
+      .add-addr-btn {
+        margin-top: 0;
+      }
+    }
     .takeself-list {
       li {
         .info-line {

pages/mobile/center/vendor/invoice/index.vue

@@ -80,6 +80,38 @@
             </span>
             <span class="inline-block content">{{inv.invoicetitle}}</span>
           </div>
+          <template v-if="inv.invoicetype == 1205">
+            <div class="line">
+            <span class="inline-block title">
+              单位地址：
+            </span>
+              <span class="inline-block content">{{inv.billInfo.companyAddress || '-'}}</span>
+            </div>
+            <div class="line">
+            <span class="inline-block title">
+              单位电话：
+            </span>
+              <span class="inline-block content">{{inv.billInfo.companyPhone || '-'}}</span>
+            </div>
+            <div class="line">
+            <span class="inline-block title">
+              税务登记号：
+            </span>
+              <span class="inline-block content">{{inv.billInfo.companyTaxNumber || '-'}}</span>
+            </div>
+            <div class="line">
+            <span class="inline-block title">
+              开户银行：
+            </span>
+              <span class="inline-block content">{{inv.billInfo.bankName || '-'}}</span>
+            </div>
+            <div class="line">
+            <span class="inline-block title">
+              开户银行账户：
+            </span>
+              <span class="inline-block content">{{inv.billInfo.bankAccount || '-'}}</span>
+            </div>
+          </template>
           <div class="line">
             <span class="inline-block title">
               收票人：
@@ -167,6 +199,7 @@
             arr.forEach(item => {
 //              item.orderidArr = item.orderids.split(',')
 //              item.purchaseidArr = item.purchaseids ? item.purchaseids.split(',') : null
+              item.billInfo = item.billInfo ? JSON.parse(item.billInfo) : {}
               item.$active = false
             })
             this.invoiceList = [...this.invoiceList, ...arr]