报价

assets/scss/mobileCommon.scss

@@ -96,6 +96,17 @@ html {
     text-decoration: underline;
   }
 
+  button {
+    -webkit-appearance: none;
+    -moz-appearance: none;
+    appearance: none;
+    outline: none;
+    border: none;
+    -webkit-box-shadow: none;
+    -moz-box-shadow: none;
+    box-shadow: none;
+  }
+
   /* 默认不显示下划线，保持页面简洁 */
   ins, a {
     text-decoration: none;
@@ -444,3 +455,50 @@ html {
     }
   }
 }
+
+.mobile-center-header {
+  height: 1.26rem;
+  line-height: 1.26rem;
+  p {
+    line-height: normal;
+    margin-top: .13rem;
+    &.en-name {
+      font-size: .3rem;
+      margin-top: .06rem;
+      img {
+        width: .31rem;
+        margin-right: .05rem;
+      }
+    }
+  }
+}
+
+.mobile-centerfix-content {
+  top: 1.26rem;
+}
+
+$border-color: 1px solid #c5c5c5;
+table.com-price-list {
+  table-layout: fixed;
+  width: 3rem;
+  margin: .19rem 0 .21rem .11rem;
+  border: $border-color;
+  font-size: .28rem;
+  thead {
+    tr th {
+      background: #f3f3f3;
+      border-bottom: $border-color;
+    }
+  }
+  th, td {
+    border-right: $border-color;
+    text-align: center;
+    height: .44rem;
+    &:last-child {
+      border-right: none;
+    }
+    &.date {
+      color: #e6353d;
+    }
+  }
+}

components/mobile/MobileHeader.vue

@@ -54,11 +54,12 @@
         <div class="cancel-share" @click="showShare=false">取消</div>
       </div>
     </div>-->
-    <div class="mobile-header" v-if="showHeader && !showMainSearch">
+    <div class="mobile-header" :class="{'mobile-center-header': showEnHeader}" v-if="showHeader && !showMainSearch">
       <a @click="goLastPage"><i class="iconfont icon-fanhui"></i></a>
       <p>{{title}}
         <span @click="goMainSearch" v-if="showSearchIcon"><i class="icon-sousuo iconfont"></i>搜索</span>
       </p>
+      <p v-show="showEnHeader" class="en-name"><img src="/images/mobile/center/en.png" alt="">{{user.data.enterprise.enName}}</p>
     </div>
     <main-search v-if="showMainSearch" @cancelSearchAction="onCancelSearch"></main-search>
 <!--    <i v-show="rightIcon=='share'" class="iconfont icon-fenxiang" @click="showShare = true" @touchmove="onTouchMove($event)"></i>
@@ -105,6 +106,9 @@
       },
       component () {
         return this.$store.state.componentDetail.detail.data
+      },
+      showEnHeader () {
+        return this.startWith(this.$route.path, '/mobile/center')
       }
 //      showHeader () {
 //        return this.$route.path !== '/' || !this.$route.path || this.$route.path === ''
@@ -337,4 +341,20 @@
       color: #333;
     }
   }
+  .mobile-center-header {
+    height: 1.26rem;
+    line-height: 1.26rem;
+    p {
+      line-height: normal;
+      margin-top: .13rem;
+      &.en-name {
+        font-size: .3rem;
+        margin-top: .06rem;
+        img {
+          width: .31rem;
+          margin-right: .05rem;
+        }
+      }
+    }
+  }
 </style>

components/mobile/applyPurchase/SayPrice.vue

@@ -309,11 +309,11 @@
 <style lang="scss" scoped>
   .mobile-modal {
     .mobile-modal-box {
-      top: 10%;
+      top: 1.2rem;
       left: 3%;
       right: 3%;
       width: 7rem;
-      bottom: 10%;
+      bottom: 1.2rem;
       margin: 0 auto;
       .say-price {
         background: #f3f3f3;

components/mobile/applyPurchase/SayPriceInfo.vue

@@ -1,11 +1,16 @@
 <template>
   <div class="mobile-modal" @touchmove="preventTouchMove($event)">
-    <div class="mobile-modal-box" ref="modalBody">
-      <div class="mobile-modal-header">{{purchaseDetail.agreed == 1 || agreed == 1 ? '已采纳' : '已报价'}}<i class="icon-guanbi iconfont" @click="cancel"></i></div>
+    <div class="mobile-modal-box">
+      <div class="mobile-modal-header">
+        查看报价
+        <!--{{purchaseDetail.agreed == 1 || agreed == 1 ? '已采纳' : '已报价'}}-->
+        <i class="icon-guanbi iconfont" @click="cancel"></i>
+      </div>
+      <!--<i class="icon-guanbi iconfont" @click="cancel"></i>-->
       <div class="say-price-info" ref="mobileModalBox">
         <div>
-          <div v-if="isBuyer">
-           <!-- <div class="base-info">
+          <div v-if="isBuyer" class="is-buyer">
+            <div class="base-info base">
               <div class="content-line">
                 品牌：<span>{{purchaseDetail.inbrand || '-'}}</span>
               </div>
@@ -21,17 +26,20 @@
               <div class="content-line">
                 采购数量(PCS)：<span>{{purchaseDetail.needquantity || '-'}}</span>
               </div>
-              &lt;!&ndash;<div class="content-line">
+             <!-- <div class="content-line">
                 币种：<span>{{purchaseDetail.custCurrency || '不限'}}</span>
-              </div>
-              <div class="content-line">
+              </div>-->
+              <!--<div class="content-line">
                 生产日期：<span>{{purchaseDetail.produceDate || '-'}}</span>
-              </div>&ndash;&gt;
+              </div>-->
               <div class="content-line">
                 截止日期：<span>{{purchaseDetail.endDate | date}}</span>
               </div>
+              <div class="content-line">
+                联系电话：<span>{{purchaseDetail.userTel || '-'}}</span>
+              </div>
             </div>
-            <div class="base-info">
+           <!-- <div class="base-info">
               <div class="content-line">
                 买家：<span>{{purchaseDetail.inquiry && purchaseDetail.inquiry.enterprise ? purchaseDetail.inquiry.enterprise.enName : purchaseDetail.userName}}</span>
               </div>
@@ -39,12 +47,15 @@
                 联系电话：<span>{{purchaseDetail.userTel || '-'}}</span>
               </div>
             </div>-->
-            <div class="base-info say-info" v-for="(item, index) in purchaseDetail.qutations" @click="selectQutation(index)">
-              <img v-if="agreed != 1 && (!item.agreed || item.agreed !== 1) && activeIndex == index" src="/images/mobile/@2x/applyPurchase/say-price-check.png" alt="">
+            <div class="base-info say-info say" :class="{'long': item.showRefuseList}" v-for="(item, index) in qutationsTemp">
+          <!--    <img v-if="agreed != 1 && (!item.agreed || item.agreed !== 1) && activeIndex == index" src="/images/mobile/@2x/applyPurchase/say-price-check.png" alt="">
               <img v-if="agreed != 1 && (!item.agreed || item.agreed !== 1) && activeIndex != index" src="/images/mobile/@2x/applyPurchase/say-price-default.png" alt="">
-              <img v-if="item.agreed == 1" src="/images/mobile/@2x/applyPurchase/say-price-accept.png" alt="">
-              <div class="content-line">
-                {{item.vendName}}
+              <img v-if="item.agreed == 1" src="/images/mobile/@2x/applyPurchase/say-price-accept.png" alt="">-->
+              <div class="content-title">
+                <i>{{index + 1}}</i>
+                <div class="inline-block text-ellipse vend-name">{{item.vendName}}</div>
+                <img src="/images/mobile/center/accept.png" alt="" v-if="item.agreed == 1">
+                <img src="/images/mobile/center/refuse.png" alt="" v-if="item.agreed == 0">
               </div>
               <div class="content-line">
                 报价人：<span v-if="item.user">{{item.user.userName}}</span>
@@ -57,8 +68,28 @@
               <div class="content-line date">
                 交期(天)：<span>{{item.leadtime}}</span>
               </div>
-              <p>{{item.offerTime | date}}</p>
-              <div class="price-level">
+              <div class="content-line date">
+                报价时间：<span>{{item.offerTime | date}}</span>
+              </div>
+              <!--<p>{{item.offerTime | date}}</p>-->
+              <div class="price clearfix">
+                <span>价格梯度：<br/>(PCS)</span>
+                <table class="com-price-list">
+                <thead>
+                <tr>
+                  <th>分段数量</th>
+                  <th>分段单价</th>
+                </tr>
+                </thead>
+                <tbody>
+                <tr v-for="replie in item.replies">
+                  <td class="date">{{replie.lapQty ? replie.lapQty + '+' : '-'}}</td>
+                  <td class="date">{{replie.price ? (item.currency == 'USD' ? '$' : '¥') + replie.price : '-'}}</td>
+                </tr>
+                </tbody>
+              </table>
+              </div>
+              <!--<div class="price-level">
                 <p>价格梯度：<span>(pcs)</span></p>
                 <ul>
                   <li v-for="replie in item.replies">
@@ -66,71 +97,111 @@
                     <span>{{replie.price ? (item.currency == 'USD' ? '$' : '¥') + replie.price : '-'}}</span>
                   </li>
                 </ul>
+              </div>-->
+              <div class="operate-say" v-if="item.agreed != 1 && item.agreed != 0">
+                <a class="operate-say-btn inline-block" @click="acceptQutation(item)">采纳报价</a>
+                <a class="operate-say-btn inline-block refuse" @click="setShowRefuseList(item, !item.showRefuseList)">
+                  拒绝报价
+                  <img src="/images/mobile/center/refuse-arrow-down.png" alt="">
+                  <ul v-if="item.showRefuseList">
+                    <li class="text-ellipse" @click.stop="selectRefuse(item, '采购需求变更')">采购需求变更</li>
+                    <li class="text-ellipse" @click.stop="selectRefuse(item, '价格过高')">价格过高</li>
+                    <li class="text-ellipse" @click.stop="selectRefuse(item, '需进一步了解原因')">需进一步了解原因</li>
+                    <li class="text-ellipse" @click.stop="selectRefuse(item, '已选定合适供应商')">已选定合适供应商</li>
+                    <li class="text-ellipse" @click.stop="selectRefuse(item, '交期过长')">交期过长</li>
+                  </ul>
+                </a>
               </div>
             </div>
-            <a class="say-price-btn" v-if="purchaseDetail.agreed != 1" @click="acceptQutation">采纳报价</a>
-            <div style="height: 0.5rem;width: 100%"></div>
+           <!-- <a class="say-price-btn" v-if="purchaseDetail.agreed != 1" @click="acceptQutation">采纳报价</a>
+            <div style="height: 0.5rem;width: 100%"></div>-->
           </div>
-          <div v-if="!isBuyer">
-          <div class="base-info">
-            <!--<div class="content-line">
-              品牌：<span>{{purchaseDetail.inbrand || '-'}}</span>
-            </div>
-            <div class="content-line">
-              类目(产品名称)：<span>{{purchaseDetail.prodTitle || '-'}}</span>
-            </div>
-            <div class="content-line">
-              型号：<span>{{purchaseDetail.cmpCode || '-'}}</span>
-            </div>
-            <div class="content-line">
-              规格：<span>{{purchaseDetail.spec || '-'}}</span>
-            </div>
-            <div class="content-line">
-              采购数量(PCS)：<span>{{purchaseDetail.needquantity || '-'}}</span>
-            </div>-->
-            <!--<div class="content-line">
-              币种：<span>{{purchaseDetail.custCurrency || '不限'}}</span>
+          <div v-if="!isBuyer" class="is-vendor">
+            <div class="base-info">
+              <div class="content-title">
+                <span class="inline-block text-ellipse">{{purchaseDetail.inquiry && purchaseDetail.inquiry.enterprise ? purchaseDetail.inquiry.enterprise.enName : purchaseDetail.userName}}</span>
+              </div>
+              <div class="content-line">
+                品牌：<span>{{purchaseDetail.inbrand || '-'}}</span>
+              </div>
+              <div class="content-line">
+                类目(产品名称)：<span>{{purchaseDetail.prodTitle || '-'}}</span>
+              </div>
+              <div class="content-line">
+                型号：<span>{{purchaseDetail.cmpCode || '-'}}</span>
+              </div>
+              <div class="content-line">
+                规格：<span>{{purchaseDetail.spec || '-'}}</span>
+              </div>
+              <div class="content-line">
+                采购数量(PCS)：<span>{{purchaseDetail.needquantity || '-'}}</span>
+              </div>
+              <div class="content-line">
+                币种：<span>{{purchaseDetail.custCurrency || '不限'}}</span>
+              </div>
+             <!-- <div class="content-line">
+                生产日期：<span>{{purchaseDetail.produceDate || '-'}}</span>
+              </div>-->
+              <div class="content-line">
+                截止日期：<span>{{purchaseDetail.endDate | date}}</span>
+              </div>
+              <div class="content-line">
+                联系电话：<span>{{purchaseDetail.userTel || '-'}}</span>
+              </div>
             </div>
-            <div class="content-line">
-              生产日期：<span>{{purchaseDetail.produceDate || '-'}}</span>
-            </div>-->
-         <!--   <div class="content-line">
-              截止日期：<span>{{purchaseDetail.endDate | date}}</span>
+            <!--<div class="base-info">
+              <div class="content-line">
+                报价人：<span v-if="purchaseDetail.user">{{purchaseDetail.user.userName}}</span>
+                <span v-else>-</span>
+              </div>
+              <div class="content-line">
+                联系电话：<span v-if="purchaseDetail.user">{{purchaseDetail.user.userTel || '-'}}</span>
+                <span v-else>-</span>
+              </div>
             </div>-->
-            <div class="content-line">
-              买家：<span>{{purchaseDetail.inquiry && purchaseDetail.inquiry.enterprise ? purchaseDetail.inquiry.enterprise.enName : purchaseDetail.userName}}</span>
-            </div>
-            <div class="content-line">
-              联系电话：<span>{{purchaseDetail.userTel || '-'}}</span>
-            </div>
-          </div>
-          <div class="base-info">
-            <div class="content-line">
-              报价人：<span v-if="purchaseDetail.user">{{purchaseDetail.user.userName}}</span>
-              <span v-else>-</span>
-            </div>
-            <div class="content-line">
-              联系电话：<span v-if="purchaseDetail.user">{{purchaseDetail.user.userTel || '-'}}</span>
-              <span v-else>-</span>
-            </div>
-          </div>
-          <div class="base-info say-info">
-            <div class="content-line date">
-              交期(天)：<span>{{purchaseDetail.leadtime}}</span>
-            </div>
-            <p>{{purchaseDetail.offerTime | date}}</p>
-            <div class="price-level vendor">
-              <p>价格梯度：<span>(pcs)</span></p>
-              <ul>
-                <li v-for="replie in purchaseDetail.replies">
-                  <span>{{replie.lapQty ? replie.lapQty + '+' : '-'}}</span>
-                  <span>{{replie.price ? (purchaseDetail.currency == 'USD' ? '$' : '¥') + replie.price : '-'}}</span>
-                </li>
-              </ul>
+            <div class="base-info say-info">
+              <div class="content-line inline-block">
+                报价人：<span>{{purchaseDetail.user ? purchaseDetail.user.userName : '-'}}</span>
+              </div>
+              <div class="content-line inline-block">
+                电话：<span>{{purchaseDetail.user ? purchaseDetail.user.userTel : '-'}}</span>
+              </div>
+              <div class="content-line inline-block date">
+                交期(天)：<span>{{purchaseDetail.leadtime}}</span>
+              </div>
+              <div class="content-line inline-block date">
+                报价时间：<span>{{purchaseDetail.offerTime | date}}</span>
+              </div>
+              <!--<p>{{purchaseDetail.offerTime | date}}</p>-->
+              <div class="price clearfix">
+                <span>价格梯度：<br/>(PCS)</span>
+                <table class="com-price-list">
+                  <thead>
+                  <tr>
+                    <th>分段数量</th>
+                    <th>分段单价</th>
+                  </tr>
+                  </thead>
+                  <tbody>
+                  <tr v-for="replie in purchaseDetail.replies">
+                    <td class="date">{{replie.lapQty ? replie.lapQty + '+' : '-'}}</td>
+                    <td class="date">{{replie.price ? (purchaseDetail.currency == 'USD' ? '$' : '¥') + replie.price : '-'}}</td>
+                  </tr>
+                  </tbody>
+                </table>
+              </div>
+              <!--<div class="price-level vendor">
+                <p>价格梯度：<span>(pcs)</span></p>
+                <ul>
+                  <li v-for="replie in purchaseDetail.replies">
+                    <span>{{replie.lapQty ? replie.lapQty + '+' : '-'}}</span>
+                    <span>{{replie.price ? (purchaseDetail.currency == 'USD' ? '$' : '¥') + replie.price : '-'}}</span>
+                  </li>
+                </ul>
+              </div>-->
             </div>
           </div>
         </div>
-        </div>
         <remind-box :title="remindText" :timeoutCount="timeoutCount"></remind-box>
       </div>
     </div>
@@ -138,12 +209,14 @@
 </template>
 <script>
   import {RemindBox} from '~components/mobile/common'
+  import {deepCopy} from '~utils/baseUtils'
   export default {
     data () {
       return {
         activeIndex: -1,
         remindText: '',
-        timeoutCount: 0
+        timeoutCount: 0,
+        qutationsTemp: []
       }
     },
     components: {
@@ -169,7 +242,19 @@
     },
     computed: {
       purchaseDetail () {
-        return this.isBuyer ? this.$store.state.applyPurchase.purchaseManList.buyerInquiryDetail.data : this.$store.state.applyPurchase.purchaseManList.vendorInquiryDetail.data
+        let obj = {}
+        if (this.isBuyer) {
+          obj = deepCopy(this.$store.state.applyPurchase.purchaseManList.buyerInquiryDetail.data)
+          if (obj.qutations) {
+            this.qutationsTemp = obj.qutations
+            for (let i = 0; i < this.qutationsTemp.length; i++) {
+              this.$set(this.qutationsTemp[i], 'showRefuseList', false)
+            }
+          }
+        } else {
+          obj = this.$store.state.applyPurchase.purchaseManList.vendorInquiryDetail.data
+        }
+        return obj
       },
       user () {
         return this.$store.state.option.user
@@ -185,35 +270,50 @@
       selectQutation: function (index) {
         this.activeIndex = this.activeIndex === index ? -1 : index
       },
-      acceptQutation: function () {
-        if (this.activeIndex > -1) {
-          let obj = this.purchaseDetail.qutations[this.activeIndex]
-          this.$http.post('/inquiry/buyer/decide?id=' + obj.id + '&status=1')
-            .then(response => {
+      acceptQutation: function (item) {
+//        if (this.activeIndex > -1) {
+//        } else {
+// //          this.$message.success('请选择报价信息')
+//          this.onRemind('请选择报价信息')
+//        }
+        this.$http.post('/inquiry/buyer/decide?id=' + item.id + '&status=1')
+          .then(response => {
 //              this.$message.success('采纳成功')
-//              this.onRemind('采纳成功')
-              this.$emit('cancelSayPriceInfoAction', true)
+              this.onRemind('采纳成功')
+//            this.$emit('cancelSayPriceInfoAction', true)
+            item.agreed = 1
 //              this.$route.query.type === 'saler' ? this.$store.dispatch('applyPurchase/loadVendorInquiryDetail', {id: this.$route.params.id}) : this.$store.dispatch('applyPurchase/loadBuyerInquiryDetail', {id: this.$route.params.id})
-            }, err => {
-              console.log(err)
+          }, err => {
+            console.log(err)
 //              this.$message.success('系统错误')
-              this.onRemind('系统错误')
-            })
-        } else {
-//          this.$message.success('请选择报价信息')
-          this.onRemind('请选择报价信息')
-        }
+            this.onRemind('系统错误')
+          })
       },
       onRemind: function (str) {
         this.remindText = str
         this.timeoutCount ++
+      },
+      selectRefuse: function (item, reason) {
+        item.showRefuseList = false
+        this.$http.post(`/inquiry/buyer/refuse?id=${item.id}&status=0&refusereason=${encodeURIComponent(reason)}`)
+          .then(res => {
+            item.agreed = 0
+            this.onRemind('拒绝报价成功')
+          }, err => {
+            this.onRemind('拒绝报价失败,系统错误')
+            console.log(err)
+          })
+      },
+      setShowRefuseList: function (item, flag) {
+        console.log(flag)
+        item.showRefuseList = flag
       }
     },
     mounted() {
       this.$nextTick(() => {
         this._initscroll()
 //        console.log(this.$refs.modalBody.scrollHeight)
-        this.$refs.modalBody.style.marginTop = (0 - (this.$refs.modalBody.scrollHeight / 2)) / 100 - 2.5 + 'rem'
+//        this.$refs.modalBody.style.marginTop = (0 - (this.$refs.modalBody.scrollHeight / 2)) / 100 - 2.5 + 'rem'
       })
     }
   }
@@ -221,25 +321,38 @@
 <style lang="scss" scoped>
   .mobile-modal {
     .mobile-modal-box {
-      top: 50%;
+      top: 1.66rem;
       left: 3%;
       right: 3%;
+      bottom: 1.66rem;
       width: 7rem;
       margin: 0 auto;
+      background: #fff;
+      .icon-guanbi {
+        position: absolute;
+        right: -.25rem;
+        font-size: .6rem;
+        top: -.4rem;
+        color: #fff;
+        z-index: 1;
+      }
       .say-price-info {
-        background: #f3f3f3;
-        padding: 0px;
+        /*background: #f3f3f3;*/
+        padding: 0;
         width: 100%;
         overflow: hidden;
         max-height: 90%;
+        position: relative;
         .base-info {
-          &:last-child {
+          margin: 0 auto;
+          /*border-bottom: .18rem solid #f3f3f3;*/
+         /* &:last-child {
             margin-bottom: 0;
-          }
+          }*/
           &.say-info {
             /*height: 4.54rem;*/
             position: relative;
-            margin-top: .18rem;
+           /* margin-top: .18rem;*/
             > img {
               position: absolute;
               right: 0;
@@ -308,8 +421,150 @@
             }
           }
         }
+        .price {
+          margin-top: .3rem;
+          span {
+            width: 1.4rem;
+            color: #666;
+            font-size: .28rem;
+            display: inline-block;
+            float: left;
+          }
+          table {
+            float: left;
+            margin: 0 0 .32rem 0;
+          }
+        }
+        .is-buyer {
+          .base {
+            background: #3f84f6;
+            color: #fff;
+            .content-line {
+              span {
+                color: #fff;
+              }
+            }
+          }
+          .say {
+            .content-title {
+              border-bottom: 1px solid #d3d3d3;
+              font-size: .28rem;
+              font-weight: bold;
+              height: .81rem;
+              line-height: .81rem;
+              .vend-name {
+                width: 5rem;
+              }
+              img {
+                width: .69rem;
+                margin-left: .2rem;
+              }
+              i {
+                display: inline-block;
+                width: .4rem;
+                height: .4rem;
+                line-height: .4rem;
+                color: #fff;
+                font-weight: bold;
+                font-style: normal;
+                background: #3f84f6;
+                border-radius: .05rem;
+                text-align: center;
+                margin-right: .12rem;
+              }
+            }
+            .content-line {
+              width: 50%;
+              margin-top: .3rem;
+              display: inline-block;
+              vertical-align: middle;
+            }
+            .operate-say {
+              text-align: center;
+              margin-bottom: .73rem;
+              .operate-say-btn {
+                width: 3rem;
+                height: .54rem;
+                line-height: .54rem;
+                text-align: center;
+                font-size: .28rem;
+                background: #fff;
+                color: #3f84f6;
+                border: 1px solid #3f84f6;
+                border-radius: .08rem;
+                &.refuse {
+                  color: #666;
+                  border-color: #e5e5e5;
+                  margin-left: .2rem;
+                  position: relative;
+                  img {
+                    width: .1rem;
+                    position: absolute;
+                    right: .21rem;
+                    top: .25rem;
+                  }
+                  ul {
+                    position: absolute;
+                    width: 3rem;
+                    li {
+                      height: .58rem;
+                      line-height: .58rem;
+                      padding-left: .16rem;
+                      font-size: .28rem;
+                      color: #666;
+                      background: #fff;
+                      text-align: left;
+                      border: 1px solid #e5e5e5;
+                      border-bottom-left-radius: .08rem;
+                      border-bottom-right-radius: .08rem;
+                      border-top: none;
+                      &:active, &:hover, &:focus {
+                        background: #dbf0fd;
+                        color: #333;
+                      }
+                    }
+                  }
+                }
+              }
+            }
+            &.long {
+              .operate-say {
+                margin-bottom: 3rem;
+              }
+            }
+          }
+        }
+        .is-vendor {
+          .base-info {
+            .content-title {
+              color: #3f84f6;
+              font-size: .28rem;
+              font-weight: bold;
+              height: .82rem;
+              line-height: .82rem;
+              border-bottom: 1px solid #d3d3d3;
+              margin-bottom: .1rem;
+              span {
+                width: 4.92rem;
+              }
+              img {
+                width: .76rem;
+              }
+            }
+          }
+          .say-info {
+            border-top: 1px solid #d3d3d3;
+            .inline-block {
+              width: 50%;
+              margin-top: .1rem;
+            }
+            .price {
+              margin-top: .1rem;
+            }
+          }
+        }
         .say-price-btn {
-          margin: .37rem auto 0rem;
+          margin: .37rem auto 0;
         }
       }
     }

components/mobile/applyPurchase/SeekList.vue

@@ -1,51 +1,98 @@
 <template>
   <div>
     <ul class="seek-list">
-      <li v-for="(item, index) in purchaseManListData">
-        <p v-if="userType !== 'buyer'">
+      <li v-for="(item, index) in purchaseManListData" class="clearfix">
+        <p v-if="!item.quotation">
           <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">
           <div class="fl">
-            <div>
+            <div class="content" v-if="item.quotation && 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>
+            <div class="content">
               品牌：
               <span>{{item.inbrand || '-'}}</span>
             </div>
-            <div>
+            <div class="content">
               类目(产品名称)：
               <span>{{item.title || item.prodTitle || '-'}}</span>
             </div>
-            <div>
+            <div class="content">
               型号：
               <span>{{item.cmpCode || '-'}}</span>
             </div>
-            <div>
+            <div class="content">
               规格：
               <span>{{item.spec || '-'}}</span>
             </div>
-            <div>
+            <div class="content">
               采购数量(PCS)：
               <span>{{item.needQty || item.needquantity || '-'}}</span>
             </div>
-            <div>
+            <div class="content">
               截止日期：
               <span class="date">{{item.endDate | date}}</span>
             </div>
+            <template v-if="item.quotation">
+              <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>
+                <span v-if="getDay(item.remainingTime) <= 0" v-text="getHours(item.remainingTime)"></span>
+                <i v-if="getDay(item.remainingTime) <= 0">&nbsp;小时</i>
+              </p>
+              <p class="remain-time" v-else><span>已截止</span></p>
+            </template>
           </div>
-          <div class="fr" :class="{'no-btn': !isSelfSeek(item) && !canSayPrice(item) && !canSeeInfo(item)}">
-            <p 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>
-              <span v-if="getDay(item.remainingTime) <= 0" v-text="getHours(item.remainingTime)"></span>
-              <i v-if="getDay(item.remainingTime) <= 0">&nbsp;小时</i>
-            </p>
-            <p class="over-deadline" v-else>已截止</p>
-            <!--<a v-if="!userType && item.quoted == 1">已报价</a>-->
-            <a v-if="isSelfSeek(item)" class="self-publish" @click="onRemind('此为贵公司的求购')">我要报价</a>
-            <a v-if="canSayPrice(item)" @click="goSayPrice(item.itemId || item.id, index)">我要报价</a>
-            <!--<a v-if="item.newId" class="self-publish" @click="onRemind('您已报价')">我要报价</a>-->
-            <a v-if="canSeeInfo(item)" @click="goSayPriceInfo(item.newId || item.quteId || item.id, item.agreed, index)">查看报价</a>
+          <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="content" v-if="userType === 'buyer'">
+                <span>{{item.quotation.vendName || '-'}}</span>
+              </div>
+              <div class="content">
+                报价人：
+                <span>{{item.quotation.user ? item.quotation.user.userName : '-'}}</span>
+              </div>
+              <div class="content">
+                电话：
+                <span>{{item.quotation.user ? item.quotation.user.userTel : '-'}}</span>
+              </div>
+              <div class="content">
+                交期：
+                <span class="date">{{item.quotation.leadtime || '-'}}</span>
+              </div>
+              <table class="com-price-list">
+                <thead>
+                <tr>
+                  <th>分段数量</th>
+                  <th>分段单价</th>
+                </tr>
+                </thead>
+                <tbody>
+                <tr>
+                  <td class="date">{{item.quotation.replies[0].lapQty + '+'}}</td>
+                  <td class="date">{{item.quotation.replies[0].price}}</td>
+                </tr>
+                </tbody>
+              </table>
+              <button class="more-btn" @click="goSayPriceInfo(item.newId || item.quteId || item.id, item.agreed, index)">查看更多</button>
+            </template>
+            <template v-else>
+              <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>
+                <span v-if="getDay(item.remainingTime) <= 0" v-text="getHours(item.remainingTime)"></span>
+                <i v-if="getDay(item.remainingTime) <= 0">&nbsp;小时</i>
+              </p>
+              <p class="remain-time" v-else><span>已截止</span></p>
+              <!--<a v-if="!userType && item.quoted == 1">已报价</a>-->
+              <a v-if="isSelfSeek(item)" class="self-publish" @click="onRemind('此为贵公司的求购')">我要报价</a>
+              <a v-if="canSayPrice(item)" @click="goSayPrice(item.itemId || item.id, index)">我要报价</a>
+              <!--<a v-if="item.newId" class="self-publish" @click="onRemind('您已报价')">我要报价</a>-->
+              <a v-if="canSeeInfo(item)" @click="goSayPriceInfo(item.newId || item.quteId || item.id, item.agreed, index)">查看报价</a>
+            </template>
           </div>
         </div>
       </li>
@@ -215,7 +262,7 @@ export default {
     padding: .13rem .12rem 0;
     background: #f1f3f6;
 
-    li {
+    li.clearfix {
       border: 1px solid #e0e0e4;
       /*height: 4.2rem;*/
       margin: auto;
@@ -239,60 +286,75 @@ export default {
 
       }
       > div {
-        font-size: .3rem;
+        font-size: .28rem;
+        .remain-time {
+          font-size: .28rem;
+          text-align: center;
+          span {
+            font-size: .35rem;
+            color: #ff3208;
+          }
+
+          i {
+            font-style: normal;
+          }
+
+        }
+        .content {
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+          padding: 0 .18rem;
+          line-height: .46rem;
 
+          span {
+            color: #333;
+          }
+
+        }
         .fl {
           color: #666;
-          width: 4.8rem;
-          height: 2.62rem;
-          margin: .27rem 0 .29rem .18rem;
+          width: 50%;
+          /*height: 2.62rem;*/
           line-height: .46rem;
+          margin: .27rem 0;
           border-right: 1px dashed #9f9f9f;
 
-          > div {
-            overflow: hidden;
-            text-overflow: ellipsis;
-            white-space: nowrap;
-
-            span {
-              color: #333;
-              &.date {
-                color: #e6353d;
-              }
-
-            }
-
+          .remain-time {
+            margin-top: .41rem;
           }
 
         }
         .fr {
-          width: 2.2rem;
+          width: 50%;
           padding: .9rem 0 0 0;
+          &.is-qutation {
+            margin: .27rem 0;
+            padding: 0 .18rem;
+            color: #666;
+            .more-btn {
+              width: 3.2rem;
+              margin: 0 auto;
+              color: #fff;
+              font-size: .28rem;
+              height: .54rem;
+              background: #3f84f6;
+              border-radius: .08rem;
+            }
+          }
+
+          &.is-simple {
+            margin-top: .73rem;
+            .more-btn {
+              margin-top: .38rem;
+            }
+          }
 
           &.no-btn {
             padding-top: 0;
             line-height: 3.18rem;
           }
 
-          p {
-            font-size: .28rem;
-            text-align: center;
-
-            &.over-deadline {
-              text-align: center;
-              padding-right: .2rem;
-            }
-
-            span {
-              font-size: .35rem;
-              color: #ff3208;
-            }
-
-            i {
-              font-style: normal;
-            }
-
-          }
           a {
             display: block;
             width: 1.7rem;
@@ -314,6 +376,9 @@ export default {
           }
 
         }
+        .date {
+          color: #e6353d !important;
+        }
       }
     }
 

components/mobile/center/Seek.vue

@@ -1,10 +1,11 @@
 <template>
   <div class="seek">
-    <div class="com-mobile-header">
+    <div class="com-mobile-header mobile-center-header">
       <a @click="goLastPage"><i class="iconfont icon-fanhui"></i></a>
       <p>{{seekTitle}}</p>
+      <p class="en-name"><img src="/images/mobile/center/en.png" alt="">{{user.data.enterprise.enName}}</p>
     </div>
-    <div class="mobile-fix-content" id="mobileFixContent">
+    <div class="mobile-fix-content mobile-centerfix-content" id="mobileFixContent">
       <div class="seek-title com-switch-item" v-if="userType == 'saler'">
         <span class="mobile-switch-btn" :class="{'active': activeType=='all'}" @click="switchActiveType('all')">公司商机</span>
         <span class="mobile-switch-btn" :class="{'active': activeType=='self'}" @click="switchActiveType('self')">我的商机</span>
@@ -114,6 +115,8 @@
     padding: .25rem 0 0 0;
     input {
       border: 1px solid #376ff3;
+      width: 7.2rem;
+      margin: 0 0 0 -.02rem;
     }
     span {
       height: .46rem;
@@ -125,8 +128,8 @@
     height: $seekTitleLine;
     line-height: $seekTitleLine;
     .mobile-switch-btn {
-      height: $seekTitleLine;
-      line-height: $seekTitleLine;
+     /* height: $seekTitleLine;
+      line-height: $seekTitleLine;*/
       font-size: .28rem;
       /*&.active {
         border-bottom-width: .07rem;

components/mobile/store/StoreDetail.vue

@@ -29,6 +29,15 @@
           <p>抱歉，暂无应用领域信息</p>
         </div>
       </div>
+      <div class="store-description">
+        <h4>企业介绍</h4>
+        <p class="content" v-if="store.enterprise.description">
+          {{store.enterprise.description}}
+        </p>
+        <div class="com-none-state" v-else>
+          <p>抱歉，暂无企业介绍</p>
+        </div>
+      </div>
      <div class="contact-info">
       <h4>联系我们</h4>
       <ul class="list-unstyled clearfix">
@@ -64,15 +73,6 @@
         </li>-->
       </ul>
      </div>
-      <div class="store-description">
-        <h4>企业简介</h4>
-        <p class="content" v-if="store.enterprise.description">
-          {{store.enterprise.description}}
-        </p>
-        <div class="com-none-state" v-else>
-          <p>抱歉，暂无企业简介</p>
-        </div>
-      </div>
     </div>
   <!--  <div class="com-none-state" v-if="activeType=='detail'">
       <img src="/images/mobile/@2x/empty-collect.png">
@@ -81,7 +81,7 @@
     </div>-->
     <div class="product-store" v-else>
       <div class="search-content">
-        <input type="text" v-model="keyword" placeholder="请输入品牌/类目/型号/规格" @keyup.13="search">
+        <input type="text" v-model="keyword" placeholder="品牌/类目/型号/规格" @keyup.13="search">
         <span @click="search">
         <i class="iconfont icon-sousuo"></i>
         </span>
@@ -143,7 +143,7 @@
         </tbody>
       </table>
       <empty-status :type="isSearch ? 'search' : 'collect'"
-                    :text="isSearch ? `抱歉，暂无与“${keyword}”匹配的产品信息`: '抱歉，暂无产品信息'"
+                    :text="isSearch ? `抱歉，暂无与“${remindKeyword}”匹配的产品信息`: '抱歉，暂无产品信息'"
                     :showLink="false"
                     v-else
       ></empty-status>
@@ -170,6 +170,7 @@
         isScrollOverTab: false,
         url: '',
         keyword: '',
+        remindKeyword: '',
         isChange: false,
         isSearch: false
       }
@@ -305,6 +306,7 @@
         this.page = 1
         this.isChange = true
         this.isSearch = true
+        this.remindKeyword = this.keyword
         this.pageCommodity({ page: this.page, count: this.count })
       }
     }
@@ -584,13 +586,18 @@
   }
   .com-none-state {
     background: #fff !important;
+    padding: .3rem;
+    margin: 0;
+    p {
+      margin: 0;
+    }
   }
   .search-content {
     background: #fff;
     padding: .07rem 0;
     input {
       width: 6.37rem;
-      border: .01rem solid #376ff3;
+      border: 1px solid #376ff3;
     }
   }
 </style>

components/mobile/supplier/List.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <search-header @searchAction="search" :similarUrl="similarUrl" :type="'supplier'" :placeholder="'品牌/类目(产品名称)/型号/公司名'"></search-header>
+    <search-header @searchAction="search" :similarUrl="similarUrl" :type="'supplier'" :placeholder="'品牌/类目/型号/公司名'"></search-header>
     <div class="supplier-list mobile-content">
       <ul v-if="listData && listData.length">
         <li v-for="item in listData" @click="goSupplierDetail(item)">

components/mobile/supplier/List2.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <search-header2 @searchAction="search" :similarUrl="similarUrl" :type="'supplier'" :placeholder="'品牌/类目(产品名称)/型号/公司名'"></search-header2>
+    <search-header2 @searchAction="search" :similarUrl="similarUrl" :type="'supplier'" :placeholder="'品牌/类目/型号/公司名'"></search-header2>
     <div class="supplier-list mobile-content">
       <ul v-if="listData && listData.length">
         <li v-for="item in listData" @click="goSupplierDetail(item)">

components/mobile/supplier/SupplierDetail.vue

@@ -49,7 +49,7 @@
       <ul v-if="productListData && productListData.length">
         <li v-for="product in productListData">
           <div class="prop">
-            <span class="head">品牌/类目：</span>
+            <span class="head">品牌/类目(产品名称)：</span>
             <span class="item">{{(product.standard == 1 ? product.pbranden : product.brand) || '—'}}</span>
             <span class="item">{{product.kind || product.prodName || '—'}}</span>
           </div>

components/mobile/user/Info.vue

@@ -56,6 +56,7 @@
                   .then(response => {
                     if (response.data) {
                       this.imageUploadUrl = response.data.imageUrl
+                      this.$store.dispatch('loadUserInfo')
                     }
                   })
               }

components/provider/ExcellentSuppliers.vue

@@ -13,7 +13,7 @@
               <span>{{store.storeName}}</span>
             </div>
             <div class="description">
-              商家介绍：<span>{{store.enterprise.description}}</span>
+              企业介绍：<span>{{store.enterprise.description}}</span>
             </div>
           </div>
         </a>

components/provider/NewStore.vue

@@ -17,7 +17,7 @@
             主营：<span>暂无</span>
           </div>
           <div class="subject">
-            商家简介：<span>{{store.description}}</span>
+            企业介绍：<span>{{store.enterprise.description}}</span>
           </div>
         </div>
       </li>

components/provider/RecommendOriginal.vue

@@ -13,7 +13,7 @@
             <!--<div class="subject" style="min-height: 5px;">
             </div>-->
             <div class="description">
-              <strong>商家介绍</strong>：
+              <strong>企业介绍</strong>：
               <span>{{store.enterprise.description || '暂无简介'}}</span>
             </div>
           </div>

components/provider/Suppliers.vue

@@ -6,7 +6,7 @@
         <td width="175"></td>
         <td width="auto"></td>
         <td width="400">
-          <search-header :outerKeyword="keyword" @searchAction="search" :placeholder="'品牌/类目(产品名称)/型号/店铺名'"></search-header>
+          <search-header :outerKeyword="keyword" @searchAction="search" :placeholder="'品牌/类目/型号/店铺名'"></search-header>
           <!--<div class="input-group" style="display: table;">-->
             <!--<input class="form-control" type="search" v-model="keyword" placeholder="品牌/类目/型号/店铺名" @search="search()" />-->
             <!--<span class="input-group-btn">-->

components/search/ResultTitle.vue

@@ -38,12 +38,13 @@
   #searchResult .result-title {
     margin-top: 5px;
     padding: 10px 5px;
-    height: 30px;
+    min-height: 30px;
     line-height: 30px;
     font-size: 14px;
   }
   .text-inverse {
     color: #f40!important;
+    word-break: break-all;
   }
   .text-num {
     font-style: normal;

components/store/BaseInfo.vue

@@ -26,6 +26,12 @@
           </h3>
         </div>
         <div class="intro-text" v-text="storeInfo.storeApplication || '暂无应用领域信息'"></div>
+        <div class="intro-title row">
+          <h3 class="col-xs-2">
+            企业介绍
+          </h3>
+        </div>
+        <div class="intro-text" v-text="storeInfo.enterprise.description || '暂无企业介绍信息'"></div>
       </div>
     </div>
     <div id="contact-fragment">
@@ -48,18 +54,6 @@
           </div>
         </div>
       </div>
-      <div class="container" style="margin-top: 30px;">
-        <div class="contact-title">
-          <h3>
-            企业简介
-          </h3>
-        </div>
-        <div v-if="storeInfo.enterprise">
-          <div class="contact-text">
-            <div class="intro-text" v-text="storeInfo.enterprise.description || '暂无企业简介'"></div>
-          </div>
-        </div>
-      </div>
     </div>
     <div id="proof-fragment" v-show="qualifications.length > 0">
       <div class="container" style="margin-top: 30px; margin-bottom: 60px;">

components/supplier/merchant.vue

@@ -13,7 +13,7 @@
         </div>
       </div>
       <div class="search">
-        <search-header :outerKeyword="searchCode" :similarUrl="similarUrl" :type="'supplier'" @searchAction="search" :placeholder="'品牌/类目(产品名称)/型号/公司名'"></search-header>
+        <search-header :outerKeyword="searchCode" :similarUrl="similarUrl" :type="'supplier'" @searchAction="search" :placeholder="'品牌/类目/型号/公司名'"></search-header>
       </div>
     </div>
     <div class="list_info">

nuxt.config.js

@@ -3,7 +3,7 @@ const isProdMode = Object.is(process.env.NODE_ENV, 'production')
 // b2c后台
 const baseUrl = process.env.BASE_URL || (isProdMode ? 'http://api.usoftmall.com/' : 'http://192.168.253.121:9090/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://10.1.51.82:24002/')
 // 公共物料
 const materialUrl = process.env.MATERIAL_URL || (isProdMode ? 'https://api-product.usoftmall.com/' : 'http://218.17.158.219:24000/')
 

pages/mobile/applyPurchase/list/index.vue

@@ -3,7 +3,7 @@
     <div class="mobile-header">
       <a @click="goLastPage"><i class="iconfont icon-fanhui"></i></a>
       <div class="search-content">
-        <input type="text" v-model="seekKeyword" :placeholder="user.logged ? '品牌/类目型号//规格/公司' : '品牌/类目/型号/规格'" @keyup.13="searchSeek">
+        <input type="text" v-model="seekKeyword" :placeholder="user.logged ? '品牌/类目/型号/规格/公司' : '品牌/类目/型号/规格'" @keyup.13="searchSeek">
         <span @click="searchSeek">
         <i class="iconfont icon-sousuo"></i>
         </span>

pages/mobile/center/user/collect/component.vue

@@ -1,10 +1,11 @@
 <template>
   <div class="mobile-center">
-    <div class="com-mobile-header">
+    <div class="com-mobile-header mobile-center-header">
       <a @click="goLastPage"><i class="iconfont icon-fanhui"></i></a>
       <p>器件收藏</p>
+      <p class="en-name"><img src="/images/mobile/center/en.png" alt="">{{user.data.enterprise.enName}}</p>
     </div>
-    <div class="mobile-fix-content" id="mobileFixContent">
+    <div class="mobile-fix-content mobile-centerfix-content" id="mobileFixContent">
       <ul v-if="compList && compList.length">
         <li class="clearfix" :key="comp.componentid" v-for="comp in compList" @click="goUrl('/mobile/brand/componentDetail/' + comp.componentinfo.uuid)">
           <div class="fl">

pages/mobile/center/user/collect/store.vue

@@ -1,8 +1,9 @@
 <template>
   <div class="mobile-center">
-    <div class="com-mobile-header">
+    <div class="com-mobile-header mobile-center-header">
       <a @click="goLastPage"><i class="iconfont icon-fanhui"></i></a>
       <p>店铺关注</p>
+      <p class="en-name"><img src="/images/mobile/center/en.png" alt="">{{user.data.enterprise.enName}}</p>
     </div>
     <div class="mobile-content">
       <div v-if="storeList.length" class="shop-list" v-bind:key="item.id" v-for="item in storeList" @click="goStoreDetail(item.storeInfo.uuid)">
@@ -141,6 +142,9 @@
   }
 </script>
 <style lang="scss" scoped>
+  .mobile-content {
+    padding-top: 1.26rem !important;
+  }
   .shop-list {
     background:#fff;
     border-bottom: .1rem solid #dfe2e4;

pages/mobile/center/user/index.vue

@@ -1,10 +1,11 @@
 <template>
   <div class="mobile-center">
-    <div class="com-mobile-header">
+    <div class="com-mobile-header mobile-center-header">
       <a @click="goLastPage"><i class="iconfont icon-fanhui"></i></a>
       <p>买家中心</p>
+      <p class="en-name"><img src="/images/mobile/center/en.png" alt="">{{user.data.enterprise.enName}}</p>
     </div>
-    <div class="mobile-fix-content">
+    <div class="mobile-fix-content mobile-centerfix-content">
       <div class="seek-banner block-wrap">
         <img src="/images/mobile/center/user/adv.jpg" alt="">
       </div>

pages/mobile/center/vendor/index.vue

@@ -1,10 +1,11 @@
 <template>
   <div class="mobile-center">
-    <div class="com-mobile-header">
+    <div class="com-mobile-header mobile-center-header">
       <a @click="goLastPage"><i class="iconfont icon-fanhui"></i></a>
       <p>卖家中心</p>
+      <p class="en-name"><img src="/images/mobile/center/en.png" alt="">{{user.data.enterprise.enName}}</p>
     </div>
-    <div class="mobile-fix-content">
+    <div class="mobile-fix-content mobile-centerfix-content">
       <div class="seek-banner block-wrap">
         <img src="/images/mobile/center/vendor/adv.jpg" alt="">
       </div>

pages/mobile/center/vendor/product.vue

@@ -532,7 +532,7 @@
 <style scoped lang="scss">
   .user-content{
     margin-bottom: .98rem;
-    margin-top: 0.88rem;
+    margin-top: 1.26rem;
     .sa-pub {
       display: inline-block;
       width: 1.41rem;

pages/mobile/product/_batchCode.vue

@@ -55,7 +55,7 @@
       <p>产品参数</p>
       <ul v-if="component.properties && component.properties.length">
         <li v-for="prop in component.properties" v-if="prop.property">
-          <span class="inline-block" v-text="prop.property.labelCn"></span>
+          <span class="inline-block text-ellipse" v-text="prop.property.labelCn"></span>
           <span class="inline-block text-ellipse" v-text="prop.value"></span>
         </li>
       </ul>
@@ -173,6 +173,7 @@
       -webkit-box-shadow: 0 0 7px 0 rgba(143, 141, 141, 0.25);
       -moz-box-shadow: 0 0 7px 0 rgba(143, 141, 141, 0.25);
       box-shadow: 0 0 7px 0 rgba(143, 141, 141, 0.25);
+      margin-bottom: .1rem;
       .content-line {
         height: 1.04rem;
         border-bottom: .01rem solid #d9d9d9;
@@ -273,6 +274,10 @@
                 font-size: .44rem;
                 position: relative;
                 top: -.05rem;
+                color: #ff6000;
+                &.icon-shouye-copy {
+                  color: #3f84f6;
+                }
                 & + p {
                   margin-top: -.07rem;
                 }
@@ -306,13 +311,13 @@
             height: .67rem;
             line-height: .67rem;
             text-align: center;
+            padding: 0 .15rem;
             &:first-child {
-              width: 25%;
+              width: 50%;
             }
             &:last-child {
-              width: 75%;
+              width: 50%;
               text-align: left;
-              padding: 0 .15rem;
             }
           }
         }

pages/mobile/shop/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <search-header @searchAction="onSearch" :outerKeyword="keyword" :placeholder="'品牌/类目(产品名称)/型号/店铺名'"></search-header>
+    <search-header @searchAction="onSearch" :outerKeyword="keyword" :placeholder="'品牌/类目/型号/店铺名'"></search-header>
     <div class="shop mobile-content">
       <div class="shop-top">
         <p><i class="iconfont icon-dianpu1"></i><span>{{list.totalElements || 0}}</span>家店铺</p>

pages/mobile/user/storeinfo.vue

@@ -40,14 +40,14 @@
                 <li class="clearfix" :class="{border:  storeState !== 'look'}">
                   <div class="name pull-left" :class="{update: storeState !== 'look'}">应用领域：</div>
                   <div class="text pull-left clearfix" v-if="storeState === 'look'">
-                    {{storeInfo.storeApplication}}
+                    {{storeInfo.storeApplication || '暂无信息'}}
                   </div>
                   <div class="text pull-left" v-else>
                     <textarea v-model="storeInfo.storeApplication" maxlength="100" ref="applicationTextarea"></textarea>
                   </div>
                 </li>
                 <li class="clearfix" :class="{border:  storeState !== 'look'}">
-                  <div class="name pull-left" :class="{update: storeState !== 'look'}">企业简介：</div>
+                  <div class="name pull-left" :class="{update: storeState !== 'look'}">企业介绍：</div>
                   <div class="text pull-left clearfix" v-if="storeState === 'look'">
                     {{IsEnlook ? dealWithEnText(storeInfo.enterprise.description) : dealWithEnText()}}
                     <a class="pull-right" @click="dealWithEnText2('open')" v-show="IsEnlook">
@@ -280,11 +280,11 @@
           this.timeoutCount++
           return false
         }
-        if (!this.storeInfo.enterprise.description || this.storeInfo.enterprise.description === '') {
-          this.collectResult = '企业简介不能为空'
-          this.timeoutCount++
-          return false
-        }
+//        if (!this.storeInfo.enterprise.description || this.storeInfo.enterprise.description === '') {
+//          this.collectResult = '企业介绍不能为空'
+//          this.timeoutCount++
+//          return false
+//        }
         if (!this.storeInfo.enterprise.enTel || this.storeInfo.enterprise.enTel === '' || !/^[\d-]{8,20}$/.test(this.storeInfo.enterprise.enTel)) {
           this.collectResult = '请输入正确的电话号码'
           this.timeoutCount++