Merge branch 'dev-mysql' into feature_release-tomysql

src/main/webapp/resources/view/vendor/forstore/seekPurchase.html

@@ -363,7 +363,7 @@
     .seek-purchase .say-price-box {
       /*  display: none;*/
         position: fixed;
-        width: 456px;
+        width: 480px;
         top: 30%;
         left: 33%;
         /*-webkit-box-shadow: 0 5px 15px rgba(0,0,0,.5);
@@ -423,7 +423,15 @@
         text-align: right;
     }
     .seek-purchase .say-price-box .content .content-line .form-left input {
-        width: 64px;
+        width: 104px;
+    }
+    .seek-purchase .say-price-box .content .content-line .form-left.text-line {
+        width: 100%;
+    }
+    .seek-purchase .say-price-box .content .content-line .form-left.text-line span.text {
+        width: 300px;
+        text-align: left;
+        color: #4290f7;
     }
     .seek-purchase .say-price-box .content .content-line .form-upload {
         text-align: center;
@@ -466,15 +474,14 @@
         white-space: nowrap;
     }
     .seek-purchase .say-price-box .content .content-line .form-right {
-        padding-left: 13px;
         position: relative;
     }
     .seek-purchase .say-price-box .content .content-line .form-right input {
-        width: 101px;
-    }
-    .seek-purchase .say-price-box .content .content-line .form-right > i {
-        margin-left: 4px;
+        width: 104px;
     }
+    /*.seek-purchase .say-price-box .content .content-line .form-right > i {*/
+        /*margin-left: 4px;*/
+    /*}*/
     .seek-purchase .say-price-box .content .content-line .form-right select {
         position: absolute;
         top: 0;
@@ -492,6 +499,7 @@
     }
     .seek-purchase .say-price-box .content .content-line .form-right select + input {
         padding-left: 36px;
+        width: 133px;
     }
     .seek-purchase .say-price-box .operate {
         border-top: 1px solid #e4e5e6;
@@ -708,11 +716,22 @@
     <div class="com-modal-wrap" ng-show="isShowSayPriceBox">
         <div class="say-price-box">
             <div class="title">
-                <div>型号：<span ng-bind="inquiryItem.cmpCode" title="{{inquiryItem.cmpCode}}">PMDIDASJD</span></div>
-                <div>品牌：<span ng-bind="inquiryItem.inbrand" title="{{inquiryItem.inbrand}}">台积电</span></div>
+                <!--<div>型号：<span ng-bind="inquiryItem.cmpCode" title="{{inquiryItem.cmpCode}}">PMDIDASJD</span></div>-->
+                <!--<div>品牌：<span ng-bind="inquiryItem.inbrand" title="{{inquiryItem.inbrand}}">台积电</span></div>-->
+                <div>我要报价</div>
                 <i class="fa fa-close" ng-click="setSeekActive(seek, false, index)"></i>
             </div>
             <div class="content">
+                <div class="content-line">
+                    <div class="form-item form-left text-line">
+                        <span>型号：</span><span class="text" ng-bind="inquiryItem.cmpCode" title="{{inquiryItem.cmpCode}}"></span>
+                    </div>
+                </div>
+                <div class="content-line">
+                    <div class="form-item form-left text-line">
+                        <span>品牌：</span><span class="text" ng-bind="inquiryItem.inbrand" title="{{inquiryItem.inbrand}}"></span>
+                    </div>
+                </div>
                 <div class="content-line">
                     <div class="form-item form-left">
                         <span><i>*</i>交期：</span>