Browse Source

我要报价判断

liusw 8 years ago
parent
commit
0f513aa94b

+ 15 - 10
components/applyPurchase/ApplyInfo.vue

@@ -53,9 +53,11 @@
           <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">
             <!--<a @click="setLinkBoxIndex(index)">联系买家</a>-->
-            <a v-if="purchaseMan.remainingTime > 0 && (!purchaseMan.quoted || purchaseMan.quoted != 1) && (user.logged && ((purchaseMan.inquiry.enterprise && user.data.enterprise && (purchaseMan.inquiry.enterprise.uu === user.data.enterprise.uu)) || (!user.data.enterprise.uu && purchaseMan.userUU == user.data.userUU  && !purchaseMan.inquiry.enterprise)))" style="background: #cccbcb;">我要报价</a>
-            <a v-else @click="sayPrice(purchaseMan, index)">我要报价</a>
-            <div class="is-say-price" v-if="purchaseMan.remainingTime > 0 && purchaseMan.quoted == 1">已报价 <img src="/images/applyPurchase/green-check.png" alt="">
+            <!--判断该求购是自己的-->
+            <div class="is-say-price" v-if="purchaseMan.remainingTime > 0 && purchaseMan.quoted == 1">已报价 <img src="/images/applyPurchase/green-check.png" alt=""></div>
+            <div v-else>
+              <a v-if="purchaseMan.remainingTime > 0 && (!purchaseMan.quoted || purchaseMan.quoted != 1) && (user.logged && ((purchaseMan.inquiry.enterprise && user.data.enterprise && (purchaseMan.inquiry.enterprise.uu === user.data.enterprise.uu)) || (!user.data.enterprise.uu && purchaseMan.userUU == user.data.userUU  && !purchaseMan.inquiry.enterprise)))" style="background: #cccbcb;">我要报价</a>
+              <a v-if="purchaseMan.remainingTime > 0 && (!purchaseMan.quoted || purchaseMan.quoted != 1) && !(user.logged && ((purchaseMan.inquiry.enterprise && user.data.enterprise && (purchaseMan.inquiry.enterprise.uu === user.data.enterprise.uu)) || (!user.data.enterprise.uu && purchaseMan.userUU == user.data.userUU  && !purchaseMan.inquiry.enterprise)))" @click="sayPrice(purchaseMan, index)">我要报价</a>
             </div>
           </div>
           <div class="expand-content">
@@ -203,7 +205,7 @@
               this.$message.error('抱歉,您需开通卖家功能才可报价')
             }
           } else {
-            this.$message.error('个人账户不可报价')
+            this.$message.error('个人账户不可报价')
           }
         } else {
           this.$router.push('/auth/login?returnUrl=' + window.location.href)
@@ -353,8 +355,8 @@
         margin-bottom: 29px;
         > li {
           position: relative;
-          min-height: 67px;
-          line-height: 67px;
+          min-height: 61px;
+          line-height: 61px;
           border: 1px solid #ededed;
           >div {
             overflow-x: hidden;
@@ -412,7 +414,7 @@
               }
             }
             &.btn-content {
-              > a {
+              >div a {
                 display: inline-block;
                 width: 71px;
                 height: 28px;
@@ -552,14 +554,17 @@
             }
           }
           &:hover {
-            border: 1px solid #4290f7;
+            border-top: 1px solid #4290f7;
+            border-left: 1px solid #4290f7;
+            border-right: 1px solid #4290f7;
             .expand-content {
               display: flex;
               width: 1190px;
               z-index: 1;
-              border: 1px solid #4290f7;
+              border-bottom: 1px solid #4290f7;
+              border-left: 1px solid #4290f7;
+              border-right: 1px solid #4290f7;
               left: -1px;
-              border-top: none;
             }
           }
           .say-price {

+ 1 - 1
components/applyPurchase/SayPrice.vue

@@ -124,7 +124,7 @@
               this.$message.error('抱歉,您需开通卖家功能才可报价')
             }
           } else {
-            this.$message.error('个人账户不可报价')
+            this.$message.error('个人账户不可报价')
           }
         } else {
           this.$router.push('/auth/login?returnUrl=' + window.location.href)

+ 5 - 3
components/home/floor/FloorList.vue

@@ -29,8 +29,10 @@
                     <div :title="purchaseMan.cmpCode">{{purchaseMan.cmpCode}}</div>
                     <div>
                       <div class="is-say-price" v-if="purchaseMan.remainingTime > 0 && purchaseMan.quoted == 1">已报价 <img src="/images/applyPurchase/green-check.png" alt=""></div>
-                      <a v-if="purchaseMan.remainingTime > 0 && (!purchaseMan.quoted || purchaseMan.quoted != 1) && (user.logged && ((purchaseMan.inquiry.enterprise && user.data.enterprise && (purchaseMan.inquiry.enterprise.uu === user.data.enterprise.uu)) || (!user.data.enterprise.uu && purchaseMan.userUU == user.data.userUU  && !purchaseMan.inquiry.enterprise)))" class="is-same">我要报价</a>
-                      <a v-else @click="sayPrice(purchaseMan, index)">我要报价</a>
+                      <div v-else>
+                        <a v-if="purchaseMan.remainingTime > 0 && (!purchaseMan.quoted || purchaseMan.quoted != 1) && (user.logged && ((purchaseMan.inquiry.enterprise && user.data.enterprise && (purchaseMan.inquiry.enterprise.uu === user.data.enterprise.uu)) || (!user.data.enterprise.uu && purchaseMan.userUU == user.data.userUU  && !purchaseMan.inquiry.enterprise)))" style="background: #cccbcb;">我要报价</a>
+                        <a v-if="purchaseMan.remainingTime > 0 && (!purchaseMan.quoted || purchaseMan.quoted != 1) && !(user.logged && ((purchaseMan.inquiry.enterprise && user.data.enterprise && (purchaseMan.inquiry.enterprise.uu === user.data.enterprise.uu)) || (!user.data.enterprise.uu && purchaseMan.userUU == user.data.userUU  && !purchaseMan.inquiry.enterprise)))" @click="sayPrice(purchaseMan, index)">我要报价</a>
+                      </div>
                     </div>
                   </li>
                 </ul>
@@ -208,7 +210,7 @@
               this.$message.error('抱歉,您需开通卖家功能才可报价')
             }
           } else {
-            this.$message.error('个人账户不可报价')
+            this.$message.error('个人账户不可报价')
           }
         } else {
           this.$router.push('/auth/login?returnUrl=' + window.location.href)

+ 1 - 1
pages/applyPurchase/result.vue

@@ -12,7 +12,7 @@
       <p>发布求购</p>
       <img src="/images/applyPurchase/batch-error.png" alt="">
       <h1>上传失败</h1>
-      <h2>请完善型号和品牌信息</h2>
+      <h2>请完善产品信息</h2>
       <div class="footer1">立刻
         <label>
           <input type="file" @change="upload" accept="*.xls, *.xlsx">