Browse Source

求购列表修改

yangc 7 years ago
parent
commit
db0e4b5680
2 changed files with 116 additions and 71 deletions
  1. 115 70
      components/applyPurchase/ApplyInfo.vue
  2. 1 1
      nuxt.config.js

+ 115 - 70
components/applyPurchase/ApplyInfo.vue

@@ -33,21 +33,21 @@
       <ul v-if="purchaseManList.content && purchaseManList.content.length">
       <ul v-if="purchaseManList.content && purchaseManList.content.length">
         <li v-for="(purchaseMan, index) in purchaseManList.content" :class="{'active': purchaseMan.active}">
         <li v-for="(purchaseMan, index) in purchaseManList.content" :class="{'active': purchaseMan.active}">
           <div class="il-item il-left">
           <div class="il-item il-left">
-            <div v-if="purchaseMan.inquiry.enterprise && purchaseMan.inquiry.enterprise.enName" :title="user.logged ? purchaseMan.inquiry.enterprise.enName : null">{{[purchaseMan.inquiry.enterprise.enName, user] | enterpriseFilter}}</div>
-            <div v-else :title="user.logged ? purchaseMan.userName : null">{{[purchaseMan.userName, user] | userNameFilter}}</div>
+            <div class="item" v-if="purchaseMan.inquiry.enterprise && purchaseMan.inquiry.enterprise.enName" :title="user.logged ? purchaseMan.inquiry.enterprise.enName : null">{{[purchaseMan.inquiry.enterprise.enName, user] | enterpriseFilter}}</div>
+            <div class="item" v-else :title="user.logged ? purchaseMan.userName : null">{{[purchaseMan.userName, user] | userNameFilter}}</div>
             <div>{{purchaseMan.date| date}}</div>
             <div>{{purchaseMan.date| date}}</div>
           </div>
           </div>
           <div class="il-item il-center">
           <div class="il-item il-center">
-            <div class="il-box-large">
-              <div :title="purchaseMan.inbrand" class="fl"><span>类目:</span>{{purchaseMan.inbrand || '-'}}</div>
-              <div :title="purchaseMan.inbrand" class="fl"><span>品牌:</span>{{purchaseMan.inbrand || '-'}}</div>
-              <div :title="purchaseMan.cmpCode" class="fl"><span>型号:</span>{{purchaseMan.cmpCode || '-'}}</div>
-              <div :title="purchaseMan.cmpCode" class="fl"><span>规格:</span>{{purchaseMan.spec || '-'}}</div>
+            <div class="il-box-large il-box">
+              <div :title="purchaseMan.inbrand" class="fl item"><span>类目:</span><div class="content">{{purchaseMan.inbrand || '-'}}</div></div>
+              <div :title="purchaseMan.cmpCode" class="fl item"><span>型号:</span><div class="content">{{purchaseMan.cmpCode || '-'}}</div></div>
+              <div :title="purchaseMan.inbrand" class="fl item bottom"><span>品牌:</span><div class="content">{{purchaseMan.inbrand || '-'}}</div></div>
+              <div :title="purchaseMan.cmpCode" class="fl item bottom"><span>规格:</span><div class="content">{{purchaseMan.spec || '-'}}</div></div>
             </div>
             </div>
-            <div class="il-box-small">
-              <div :title="purchaseMan.cmpCode" class="fl"><span>封装:</span>{{purchaseMan.encapsulation || '-'}}</div>
-              <div :title="purchaseMan.cmpCode" class="fl"><span>采购数量:</span>{{purchaseMan.needquantity || '-'}}</div>
-              <div :title="purchaseMan.cmpCode" class="fl"><span>单价预算:</span>{{purchaseMan.unitPrice ? (purchaseMan.currency == 'RMB' ? '¥' : '$') + purchaseMan.unitPrice : '-'}}</div>
+            <div class="il-box-small il-box">
+              <div :title="purchaseMan.cmpCode" class="item"><span>封装:</span>{{purchaseMan.encapsulation || '-'}}</div>
+              <div :title="purchaseMan.cmpCode" class="item"><span>采购数量:</span>{{purchaseMan.needquantity || '-'}}</div>
+              <div :title="purchaseMan.cmpCode" class="item"><span>单价预算:</span>{{purchaseMan.unitPrice ? (purchaseMan.currency == 'RMB' ? '¥' : '$') + purchaseMan.unitPrice : '-'}}</div>
             </div>
             </div>
           </div>
           </div>
           <div class="il-item 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="il-item 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>
@@ -283,6 +283,7 @@
           background: #3975f4;
           background: #3975f4;
           text-align: center;
           text-align: center;
           margin: 0 6px 0 -1px;
           margin: 0 6px 0 -1px;
+          height: 33px;
           /*vertical-align: middle;*/
           /*vertical-align: middle;*/
           border: {
           border: {
             top-right-radius: 3px;
             top-right-radius: 3px;
@@ -302,7 +303,7 @@
     }
     }
     .apply-info-list {
     .apply-info-list {
       .list-title {
       .list-title {
-        background: #ededed;
+        background: #e2ebff;
         height: 40px;
         height: 40px;
         line-height: 40px;
         line-height: 40px;
         margin: 9px 0 0 0;
         margin: 9px 0 0 0;
@@ -319,13 +320,13 @@
             margin-left: 21px;
             margin-left: 21px;
           }
           }
           &:nth-child(2) {
           &:nth-child(2) {
-            margin-left: 290px;
+            margin-left: 305px;
           }
           }
           &:nth-child(3) {
           &:nth-child(3) {
-            margin-left: 480px;
+            margin-left: 492px;
           }
           }
           &:nth-child(4) {
           &:nth-child(4) {
-            margin-left: 44px;
+            margin-left: 71px;
           }
           }
         }
         }
       }
       }
@@ -334,6 +335,14 @@
         > li {
         > li {
           position: relative;
           position: relative;
           border: 1px solid #ededed;
           border: 1px solid #ededed;
+          &.active {
+            border: 1px solid #4290f7;
+            box-shadow: 2px 4px 5px 0 rgb( 205, 221, 252 );
+          }
+          &:hover {
+            border: 1px solid #4290f7;
+            box-shadow: 2px 4px 5px 0 rgb( 205, 221, 252 );
+          }
           .il-item {
           .il-item {
             height: 120px;
             height: 120px;
             display: inline-block;
             display: inline-block;
@@ -341,14 +350,18 @@
             color: #3c3c3c;
             color: #3c3c3c;
             padding-top: 16px;
             padding-top: 16px;
             vertical-align: middle;
             vertical-align: middle;
-            > div {
+            .item {
               display: inline-block;
               display: inline-block;
+              overflow: hidden;
+              text-overflow: ellipsis;
+              white-space: nowrap;
               span {
               span {
                 color: #999;
                 color: #999;
               }
               }
             }
             }
             &.il-left {
             &.il-left {
-              margin-left: 17px;
+              width: 136px;
+              padding-left: 17px;
               div {
               div {
                 display: block;
                 display: block;
                 &:last-child {
                 &:last-child {
@@ -360,78 +373,110 @@
             &.il-center {
             &.il-center {
               margin-left: 47px;
               margin-left: 47px;
               text-align: left;
               text-align: left;
-              .fl {
-                overflow: hidden;
-                white-space: nowrap;
-                text-overflow: ellipsis;
+              width: 707px;
+              .il-box {
+                display: inline-block;
+                float: left;
               }
               }
               .il-box-large {
               .il-box-large {
-                width: 420px;
+                width: 570px;
                 .fl {
                 .fl {
-                  width: 209px;
-                  height: 38px;
+                  width: 284px;
                   line-height: 19px;
                   line-height: 19px;
+                  word-break: break-all;
+                  white-space: unset;
+                  &.bottom {
+                    margin-top: 14px;
+                  }
+                  .content {
+                    display: inline-block;
+                    width: 220px;
+                    overflow: hidden;
+                    vertical-align: middle;
+                    height: 38px;
+                  }
+                  span {
+                    float: left;
+                  }
                 }
                 }
               }
               }
               .il-box-small {
               .il-box-small {
-                width: 250px;
-                .fl {
+                width: 121px;
+                margin-left: 12px;
+                .item {
+                  color: #020202;
                   width: 121px;
                   width: 121px;
-                  &:nth-child(n + 2) {
-                    margin-top: 14px;
+                  margin-bottom: 16px;
+                  span {
+                    color: #666;
+                  }
+                  &:first-child {
+                    span {
+                      color: #999;
+                    }
                   }
                   }
                 }
                 }
               }
               }
             }
             }
-            .date-content {
-              span {
-                &:first-child {
-                  font-size: 12px;
-                  color: #666;
+            &.il-right {
+              width: 100px;
+              .date-content {
+                margin-top: 14px;
+                margin-bottom: 17px;
+                span {
+                  &:first-child {
+                    font-size: 12px;
+                    color: #666;
+                  }
+                  color: #f71026;
                 }
                 }
-                color: #f71026;
-              }
-              i {
-                font-style: normal;
-              }
-            }
-            .number-content {
-              span {
-                color: #5392f9;
-                &.active {
-                  color: #ff9a00;
+                i {
+                  font-style: normal;
                 }
                 }
               }
               }
-              >img {
-                margin-bottom: 5px;
-                margin-right: 2px;
+              .btn-content {
+                >div a {
+                  display: inline-block;
+                  width: 71px;
+                  height: 28px;
+                  line-height: 28px;
+                  color: #fff;
+                  background: #3c7cf5;
+                  border-radius: 3px;
+                  cursor: pointer;
+                  /*  &:first-child {
+                      background: #ffa200;
+                      float: left;
+                      margin-top: 19px;
+                    }*/
+                }
+                .is-say-price {
+                  display: inline-block;
+                  color: #39ae05;
+                  margin-left: 11px;
+                  img {
+                    margin-bottom: 2px;
+                  }
+                }
               }
               }
             }
             }
-            .btn-content {
-              >div a {
-                display: inline-block;
-                width: 71px;
-                height: 28px;
-                line-height: 28px;
-                color: #fff;
-                background: #3c7cf5;
-                border-radius: 3px;
-                cursor: pointer;
-                /*  &:first-child {
-                    background: #ffa200;
-                    float: left;
-                    margin-top: 19px;
-                  }*/
-              }
-              .is-say-price {
-                display: inline-block;
-                color: #39ae05;
-                margin-left: 11px;
-                img {
-                  margin-bottom: 2px;
-                }
+          }
+          .number-content {
+            margin-left: 56px;
+            line-height: 120px;
+            padding-top: 0;
+            width: 77px;
+            margin-right: 34px;
+            span {
+              color: #5392f9;
+              &.active {
+                color: #ff9a00;
               }
               }
             }
             }
+            >img {
+              margin-bottom: 5px;
+              margin-right: 2px;
+            }
           }
           }
         }
         }
       }
       }

+ 1 - 1
nuxt.config.js

@@ -1,6 +1,6 @@
 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://192.168.253.121:9090/platform-b2c/')
+const baseUrl = process.env.BASE_URL || (isProdMode ? 'http://192.168.253.60:9090/platform-b2c/' : 'http://10.1.51.124:8080/platform-b2c/')
 const commonUrl = process.env.COMMON_URL || (isProdMode ? 'https://api-inquiry.usoftmall.com/' : 'http://218.17.158.219:24000/')
 const commonUrl = process.env.COMMON_URL || (isProdMode ? 'https://api-inquiry.usoftmall.com/' : 'http://218.17.158.219:24000/')
 
 
 module.exports = {
 module.exports = {