Browse Source

求购请求后端渲染

yangc 7 years ago
parent
commit
1ea63321b9
2 changed files with 14 additions and 4 deletions
  1. 11 2
      components/applyPurchase/ApplyInfo.vue
  2. 3 2
      nuxt.config.js

+ 11 - 2
components/applyPurchase/ApplyInfo.vue

@@ -39,12 +39,21 @@
           <div :title="purchaseMan.userName || (purchaseMan.inquiry.enterprise ? purchaseMan.inquiry.enterprise.enName ? purchaseMan.inquiry.enterprise.enName : '-' : '-' || '-')">{{purchaseMan.userName || (purchaseMan.inquiry.enterprise ? purchaseMan.inquiry.enterprise.enName ? purchaseMan.inquiry.enterprise.enName : '-' : '-' || '-')}}</div>
           <div :title="purchaseMan.userName || (purchaseMan.inquiry.enterprise ? purchaseMan.inquiry.enterprise.enName ? purchaseMan.inquiry.enterprise.enName : '-' : '-' || '-')">{{purchaseMan.userName || (purchaseMan.inquiry.enterprise ? purchaseMan.inquiry.enterprise.enName ? purchaseMan.inquiry.enterprise.enName : '-' : '-' || '-')}}</div>
           <div :title="purchaseMan.cmpCode">{{purchaseMan.cmpCode || '-'}}</div>
           <div :title="purchaseMan.cmpCode">{{purchaseMan.cmpCode || '-'}}</div>
           <div :title="purchaseMan.inbrand">{{purchaseMan.inbrand || '-'}}</div>
           <div :title="purchaseMan.inbrand">{{purchaseMan.inbrand || '-'}}</div>
-          <div class="date-content"><span>剩余&nbsp;</span><span v-if="getDay(purchaseMan.remainingTime) > 0" v-text="getDay(purchaseMan.remainingTime)"></span><i v-if="getDay(purchaseMan.remainingTime) > 0">&nbsp;天&nbsp;</i><span v-if="getDay(purchaseMan.remainingTime) <= 0" v-text="getHours(purchaseMan.remainingTime)"></span><i v-if="getDay(purchaseMan.remainingTime) <= 0" >&nbsp;小时</i></div>
+          <div class="date-content">
+            <div v-if="purchaseMan.remainingTime > 0">
+              <span>剩余&nbsp;</span>
+              <span v-if="getDay(purchaseMan.remainingTime) > 0" v-text="getDay(purchaseMan.remainingTime)"></span>
+              <i v-if="getDay(purchaseMan.remainingTime) > 0">&nbsp;天&nbsp;</i>
+              <span v-if="getDay(purchaseMan.remainingTime) <= 0" v-text="getHours(purchaseMan.remainingTime)"></span>
+              <i v-if="getDay(purchaseMan.remainingTime) <= 0" >&nbsp;小时</i>
+            </div>
+            <div v-if="purchaseMan.remainingTime <= 0">-</div>
+          </div>
           <div class="number-content"><img src="/images/applyPurchase/hot-fire.png" alt="" v-if="purchaseMan.offerAmount > 10"><span :style="purchaseMan.offerAmount > 10 ? 'color: #ff9a00': ''">{{purchaseMan.offerAmount || 0}}</span>&nbsp;条</div>
           <div class="number-content"><img src="/images/applyPurchase/hot-fire.png" alt="" v-if="purchaseMan.offerAmount > 10"><span :style="purchaseMan.offerAmount > 10 ? 'color: #ff9a00': ''">{{purchaseMan.offerAmount || 0}}</span>&nbsp;条</div>
           <div class="btn-content">
           <div class="btn-content">
             <a>联系买家</a>
             <a>联系买家</a>
             <a v-if="!purchaseMan.quoted || purchaseMan.quoted != 1" @click="sayPrice(purchaseMan, index)">我要报价</a>
             <a v-if="!purchaseMan.quoted || purchaseMan.quoted != 1" @click="sayPrice(purchaseMan, index)">我要报价</a>
-            <div class="is-say-price" v-else>已报价 <img src="/images/applyPurchase/green-check.png" alt="">
+            <div class="is-say-price" v-if="purchaseMan.quoted == 1">已报价 <img src="/images/applyPurchase/green-check.png" alt="">
               <div class="say-price-history">
               <div class="say-price-history">
                 <p class="price-title">历史报价</p>
                 <p class="price-title">历史报价</p>
                 <div>
                 <div>

+ 3 - 2
nuxt.config.js

@@ -1,7 +1,7 @@
 const path = require('path')
 const path = require('path')
 const isProdMode = Object.is(process.env.NODE_ENV, 'production')
 const isProdMode = Object.is(process.env.NODE_ENV, 'production')
 const baseUrl = process.env.BASE_URL || (isProdMode ? 'http://192.168.253.60:9090/platform-b2c/' : 'http://10.1.51.90:8080/platform-b2c/')
 const baseUrl = process.env.BASE_URL || (isProdMode ? 'http://192.168.253.60:9090/platform-b2c/' : 'http://10.1.51.90:8080/platform-b2c/')
-const commonUrl = process.env.BASE_URL || (isProdMode ? 'http://10.1.51.88:8080/' : 'http://10.1.51.88:8080/')
+const commonUrl = process.env.COMMON_URL || (isProdMode ? 'http://218.17.158.219:24000/' : 'http://218.17.158.219:24000/')
 
 
 module.exports = {
 module.exports = {
   router: {
   router: {
@@ -82,7 +82,8 @@ module.exports = {
   ],
   ],
   dev: !isProdMode,
   dev: !isProdMode,
   env: {
   env: {
-    baseUrl
+    baseUrl,
+    commonUrl
   },
   },
   plugins: [{
   plugins: [{
     src: '~plugins/axios.js'
     src: '~plugins/axios.js'