Merge remote-tracking branch 'origin/release-201836-wangcz' into release-201836-wangcz

components/mobile/applyPurchase/SeekList.vue

@@ -2,13 +2,13 @@
   <div>
     <ul class="seek-list">
       <li v-for="(item, index) in purchaseManListData" class="clearfix">
-        <p v-if="!(userType === 'buyer') && !(userType !== 'buyer' && item.quotation)">
+        <p v-if="!(userType === 'buyer') && !(userType !== 'buyer' && item.quotations)">
           <span v-if="item.inquiry && (item.inquiry.enName || (item.inquiry.enterprise && item.inquiry.enterprise.enName))">{{[item.inquiry.enName || item.inquiry.enterprise.enName, user.logged] | enterpriseFilter}}</span>
           <span v-else>{{[item.userName, user.logged] | userNameFilter}}</span>
         </p>
-        <div class="clearfix" :class="{'no-quot': !item.quotation}">
+        <div class="clearfix" :class="{'no-quot': !item.quotations}">
           <div class="fl">
-            <div class="content" v-if="item.quotation && userType !== 'buyer'">
+            <div class="content" v-if="item.quotations && userType !== 'buyer'">
               <span v-if="item.inquiry && (item.inquiry.enName || (item.inquiry.enterprise && item.inquiry.enterprise.enName))">{{[item.inquiry.enName || item.inquiry.enterprise.enName, user.logged] | enterpriseFilter}}</span>
               <span v-else>{{[item.userName, user.logged] | userNameFilter}}</span>
             </div>
@@ -60,7 +60,7 @@
               截止日期：
               <span class="date">{{(item.endDate || item.inquiry.endDate) | date}}</span>
             </div>
-            <!--<template v-if="item.quotation">
+            <!--<template v-if="item.quotations">
               <p class="remain-time" v-if="item.remainingTime > 0">剩余&nbsp;:
                 <span v-if="getDay(item.remainingTime) > 0" v-text="getDay(item.remainingTime)"></span>
                 <i v-if="getDay(item.remainingTime) > 0">&nbsp;天&nbsp;</i>
@@ -70,24 +70,24 @@
               <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}">
-            <template v-if="item.quotation">
+          <div class="fr" :class="{'no-btn': !isSelfSeek(item) && !canSayPrice(item) && !canSeeInfo(item), 'is-qutation': item.quotations, 'is-simple': userType !== 'buyer' && item.quotations}">
+            <template v-if="item.quotations">
               <div class="content" v-if="userType === 'buyer'">
-                <span>{{item.quotation.vendName || '-'}}</span>
+                <span>{{item.quotations.vendName || '-'}}</span>
               </div>
               <div class="content" v-if="seekType !== 'enquiry'">
                 报价人：
-                <span>{{item.quotation.user ? item.quotation.user.userName : '-'}}</span>
+                <span>{{item.quotations.user ? item.quotations.user.userName : '-'}}</span>
               </div>
               <div class="content" v-if="seekType !== 'enquiry'">
                 电话：
-                <span>{{item.quotation.user ? item.quotation.user.userTel : '-'}}</span>
+                <span>{{item.quotations.user ? item.quotations.user.userTel : '-'}}</span>
               </div>
               <div class="content">
                 交期(天)：
-                <span class="date">{{item.quotation.leadtime || '-'}}</span>
+                <span class="date">{{item.quotations.leadtime || '-'}}</span>
               </div>
-              <table class="com-price-list" v-if="item.quotation.replies && item.quotation.replies.length">
+              <table class="com-price-list" v-if="item.quotations.replies && item.quotations.replies.length">
                 <thead>
                 <tr>
                   <th>分段数量</th>
@@ -96,8 +96,8 @@
                 </thead>
                 <tbody>
                 <tr>
-                  <td class="date text-ellipse">{{item.quotation.replies[0].lapQty + '+'}}</td>
-                  <td class="date text-ellipse">{{item.quotation.replies[0].price}}</td>
+                  <td class="date text-ellipse">{{item.quotations.replies[0].lapQty + '+'}}</td>
+                  <td class="date text-ellipse">{{item.quotations.replies[0].price}}</td>
                 </tr>
                 </tbody>
               </table>
@@ -223,6 +223,7 @@ export default {
     'purchaseManList': {
       handler (newVal) {
         this.purchaseManListData = JSON.parse(JSON.stringify(this.purchaseManList))
+        console.log(this.purchaseManListData)
       },
       immediate: true
     }

components/mobile/center/Seek.vue

@@ -91,8 +91,9 @@
         handler: function (val) {
           let list = this.baseUtils.deepCopy(val.content || [])
           if (this.activeType === 'done' && this.userType === 'saler') {
+            console.log(this.activeType, this.userType)
             list.map(val => {
-              val.quotation = {
+              val.quotations = {
                 replies: val.replies,
                 vendName: val.vendName,
                 leadtime: val.leadtime,