Merge remote-tracking branch 'origin/feature-201830-wangcz' into dev

# Conflicts:
#	nuxt.config.js

components/applyPurchase/SayPrice.vue

@@ -419,6 +419,9 @@
                   width: 300px;
                   text-align: left;
                   color: #4290f7;
+                  word-break: break-all;
+                  word-wrap: break-word;
+                  vertical-align: top;
                 }
               }
             }

components/default/Header.vue

@@ -54,6 +54,7 @@
             <a class="item" href="/user#/index">买家中心</a>
             <a class="item" @click="toVendor">卖家中心</a>
             <a class="item" href="/sso#/index">帐户中心</a>
+            <a class="item" href="/user#/messagePersonal">消息 ({{count}})</a>
           </template>
           <template v-else>
             <a class="item" @click="onLoginClick()">登录</a>
@@ -77,7 +78,9 @@
 //        keyword: '',
 //        isSearching: false
 //         ShowApplyAdv: true,
-        showEnterpriseToggle: false
+        showEnterpriseToggle: false,
+        messageUrl: process.env.messageUrl,
+        count: 0
       }
     },
     computed: {
@@ -98,6 +101,30 @@
         return this.$store.state.option.url
       }
     },
+    mounted () {
+      if(this.user.logged && this.user.data) {
+        let userUU = this.user.data.userUU
+        let enUU = this.user.data.enterprise ? this.user.data.enterprise.uu : null
+        if(userUU && enUU) {
+          let param = {
+            'receiverUu': userUU,
+            'receiverEnuu': enUU,
+            'consumerApp': 'MALL',
+            'isRead': 0
+          }
+          this.$http.get(`/messages/count`, {params: param})
+            .then((res) => {
+              if(res.data) {
+                this.count = res.data.count ? (res.data.count < 100 ? res.data.count : '99+') : 0
+              } else {
+                this.count = 0
+              }
+            }).catch((err) => {
+              console.log(err)
+          })
+        }
+      }
+    },
     methods: {
       logout () {
         this.$http.get('/logout/crossBefore').then(response => {

components/default/MessageBoard.vue

@@ -170,8 +170,8 @@
       date: function (num) {
         const d = new Date(num)
         const year = d.getFullYear()
-        const month = d.getMonth() + 1 < 10 ? '0' + d.getMonth() : '' + d.getMonth()
-        const day = d.getDay() < 10 ? '0' + d.getDay() : '' + d.getDay()
+        const month = d.getMonth() + 1 < 10 ? '0' + (d.getMonth() + 1) : '' + d.getMonth() + 1
+        const day = d.getDate() < 10 ? '0' + d.getDate() : '' + d.getDate()
         return year + '-' + month + '-' + day
       }
     },

components/main/Nav.vue

@@ -44,6 +44,12 @@
       <nuxt-link to="/pcb" class="item">
         <span>PCB专区</span>
       </nuxt-link>
+      <a class="item" href="https://zb.usoftchina.com/" target="_blank">
+        <span>U创网</span>
+      </a>
+      <a class="item" href="https://bbs.usoftchina.com/" target="_blank">
+        <span>U客论坛</span>
+      </a>
       <nuxt-link to="/news" class="item">
         <span>优软快讯</span>
       </nuxt-link>

components/mobile/center/outOfStorage/StorageList.vue

@@ -15,8 +15,11 @@
         <div class="linetext">{{switchType === 'INBOUND' ? '入库单号' : '出库单号'}}： <span>系统自动生成</span></div>
         <div class="linetext" v-if="switchType === 'INBOUND'">发货单： <span v-text="item.invoiceid || '-'">21324</span></div>
         <div class="linetext" v-if="switchType === 'OUTBOUND'">订单号： <span v-text="item.orderid || '-'">21324</span></div>
-        <div class="linetext">{{switchType === 'INBOUND' ? '卖家名称' : '买家名称'}}： <span v-text="item.buyentername || item.buyerentername || item.buyername || '-'">21324</span></div>
-        <div class="linetext">录入人： <span v-text="item.sellername || '-'">21324</span></div>
+        <div class="linetext">{{switchType === 'INBOUND' ? '卖家名称' : '买家名称'}}：
+          <span v-if="switchType === 'INBOUND'" v-text="item.sellername || '-'">21324</span>
+          <span v-else v-text="item.buyentername || item.buyername || '-'">21324</span>
+        </div>
+        <!--<div class="linetext">录入人： <span v-text="item.sellername || '-'">21324</span></div>-->
         <div class="linetext">录入时间： <span v-text="item.createtime ? baseUtils.formatDate(new Date(item.createtime), 'yyyy-MM-dd hh:mm:ss') : '-'">21324</span></div>
         <div class="look-btn">
           <span @click="loadAllInfo(item, 1)" v-text="switchType === 'INBOUND' ? '收货入库' : '发货出库'"></span>

components/mobile/center/upoff-material.vue

@@ -111,12 +111,12 @@
                              <!--maxlength="9"/>-->
                     </div>
                     <div class="pull-right">
-                      <input v-show="chooseItem.goods.currencyName === 'RMB'"
+                      <input v-show="storeInfoStore.enType !== 'HK'"
                              class="priceM" type="text"
                              placeholder="单价(¥)"
                              v-model.lazy="item.rMBPrice"
                              @blur="rMBPriceBlur(item, 'rMBPrice')"/>
-                      <input v-show="chooseItem.goods.currencyName !== 'RMB'"
+                      <input v-show="storeInfoStore.enType === 'HK'"
                              class="priceM" type="text"
                              placeholder="单价($)"
                              v-model.lazy="item.uSDPrice"

components/pcb/product/Detail.vue

@@ -230,7 +230,7 @@
         }
       },
       buy (flag) {
-        this.baseUtils.buyOrCar(flag, null, this, this.commodity)
+        this.baseUtils.buyOrCar(flag, null, this, this.commodity, '/user#/order/pay/', this.fragment.num)
       },
       goLink: function () {
         this.baseUtils.goLinkUser(this, this.storeInfo.enUU)

components/product/component/StoreInfo.vue

@@ -40,9 +40,9 @@
       <table class="table">
         <thead>
           <tr class="height54">
-            <th class="text-center" width="100">型号</th>
-            <th class="text-center" width="80">包装方式</th>
-            <th class="text-center" width="110">生产日期</th>
+            <th class="text-center" width="160">型号</th>
+            <th class="text-center" width="130">包装方式</th>
+            <!--<th class="text-center" width="110">生产日期</th>-->
             <th class="text-center" width="170">库存</th>
             <th class="text-center" width="80">梯度/pcs</th>
             <th class="text-center" width="100">香港交货<span style="font-size: 12px;">($)</span></th>
@@ -62,10 +62,10 @@
               <a v-if="list.packaging">{{list.packaging}}</a>
               <a v-if="!list.packaging">—</a>
             </td>
-            <td>
-              <a v-if="list.produceDate">{{list.produceDate}}</a>
-              <a v-if="!list.produceDate">—</a>
-            </td>
+            <!--<td>-->
+              <!--<a v-if="list.produceDate">{{list.produceDate}}</a>-->
+              <!--<a v-if="!list.produceDate">—</a>-->
+            <!--</td>-->
             <td style="text-align: left;padding-left: 25px;">
               <a>
                 <div v-if="list.reserve">

nuxt.config.js

@@ -34,7 +34,7 @@ module.exports = {
       { 'http-equiv': 'X-UA-Compatible', content: 'IE=edge,chrome=1' },
       { name: 'render', content: 'webkit' },
       { name: 'viewport', content: 'width=device-width, initial-scale=1' },
-      { hid: 'description', name: 'description', content: '优软商城（mall.usoftchina.com）是中国领先的IC电子元器件现货采购交易网上商城，提供上千万种电子元器件现货采购交易，采购电子元器件就上优软商城！' }
+      { hid: 'description', name: 'description', content: '优软商城（usoftmall.com）是中国领先的IC电子元器件现货采购交易网上商城，提供上千万种电子元器件现货采购交易，采购电子元器件就上优软商城！' }
     ],
     link: [
       { rel: 'icon', type: 'image/x-icon', href: '/u.png' }
@@ -207,8 +207,6 @@ module.exports = {
     '/sso**': baseUrl,
     // 代办事项
     '/adminToDo/**': baseUrl,
-    // 抽奖
-    '/lottery/**': baseUrl,
     // 账户中心获取申请绑定列表接口
     '/api/userspace/apply/**': ssoUrl
   }

pages/mobile/center/vendor/index.vue

@@ -85,7 +85,7 @@
       }
     },
     fetch ({ store }) {
-     let user = store.state.option.user.data
+       let user = store.state.option.user.data
       return Promise.all([
         store.dispatch('loadStoreStatus', { op: 'check' }),
         // store.dispatch('messageShow/loadMessageCount', {receiverUu: user.userUU, receiverEnuu: user.enterprise.uu, consumerApp: 'MALL', isRead: 0})

pages/mobile/center/vendor/material.vue

@@ -318,6 +318,11 @@
       }
     },
     created() {
+      this.$http.get('/store-service/stores', { params: { op: 'check' } }).then(response => {
+        this.$store.commit('option/REQUEST_STORE_STATUS_SUCCESS', response.data)
+      }, err => {
+        this.$store.commit('option/REQUEST_STORE_STATUS_FAILURE', err)
+      })
       this.getResourceProvidor()
       // this.MaterielItem.packaging = this.packObj[0]
     },

pages/mobile/center/vendor/message.vue

@@ -17,6 +17,10 @@
       let user = this.user.data
       this.$store.dispatch('messageShow/getAllMessage', { receiverUu: user.userUU, receiverEnuu: user.enterprise.uu, consumerApp: 'MALL', count: 10, page: 1, sorting: {'createTime': 'DESC'} })
     },
+//    created () {
+//      let user = this.user.data
+//      this.$store.dispatch('messageShow/getAllMessage', { receiverUu: user.userUU, receiverEnuu: user.enterprise.uu, consumerApp: 'MALL', count: 10, page: 1, sorting: {'createTime': 'DESC'} })
+//    },
     components: {
       Message
     }

pages/mobile/center/vendor/outOfStorage/index.vue

@@ -20,8 +20,8 @@
           </div>
           <div class="tab-content">
             <span :class="{'active': handleItem === 0}" @click="setHandleItem(0)">{{switchType === 'INBOUND' ? '查看入库记录' : '查看出库记录'}}</span>
-            <span :class="{'active': handleItem === 1}" @click="setHandleItem(1)">{{switchType === 'INBOUND' ? '其它入库' : '其它出库'}}</span>
             <span :class="{'active': handleItem === 2}" @click="setHandleItem(2)">{{switchType === 'INBOUND' ? '采购入库' : '销售出库'}}</span>
+            <span :class="{'active': handleItem === 1}" @click="setHandleItem(1)">{{switchType === 'INBOUND' ? '其它入库' : '其它出库'}}</span>
           </div>
           <div class="filters-wrap" v-show="handleItem !== 1">
             <base-filter

pages/mobile/center/vendor/outOfStorage/purchase/_storeid.vue

@@ -13,11 +13,11 @@
         </div>
         <div class="storage-info">
           <div class="linetext">入库单： <span>系统自动生成</span></div>
-          <div class="linetext">卖家名称： <span v-text="storageList.buyentername || storageList.buyername">21324</span></div>
+          <div class="linetext">卖家名称： <span v-text="storageList.sellername || '-'">21324</span></div>
           <div class="linetext">所属订单： <span v-text="storageList.orid || '-'">21324</span></div>
           <div class="linetext" v-if="allObj.logistics">物流公司：<span v-text="allObj.logistics.companyName"></span></div>
           <div class="linetext" v-if="allObj.logistics">物流单号：<span v-text="allObj.logistics.number"></span></div>
-          <div class="linetext">录入人： <span v-text="storageList.sellername || '-'">21324</span></div>
+          <!--<div class="linetext">录入人： <span v-text="storageList.sellername || '-'">21324</span></div>-->
           <div class="linetext">录入时间： <span v-text="storageList.createtime ? baseUtils.formatDate(new Date(storageList.createtime), 'yyyy-MM-dd hh:mm:ss') : '-'">21324</span></div>
         </div>
         <ul class="list-unstyled" v-if="storageList.invoiceDetails" style="margin-bottom:.8rem;">
@@ -55,13 +55,13 @@
           <div class="linetext"><em>*</em>物流单号：<span>
             <input style="width:3rem;" type="text" v-model="allObj.logisticsInfo.number">
           </span></div>
-          <div class="linetext">录入人： <span v-text="storageList.sellername || '-'">21324</span></div>
+          <!--<div class="linetext">录入人： <span v-text="storageList.sellername || '-'">21324</span></div>-->
           <div class="linetext">录入时间： <span v-text="storageList.createtime ? baseUtils.formatDate(new Date(storageList.createtime), 'yyyy-MM-dd hh:mm:ss') : '-'">21324</span></div>
         </div>
         <ul class="list-unstyled" v-if="storageList.purchaseDetails" style="margin-bottom:.8rem;">
           <li class="info-list clearfix" v-for="(item, index) in storageList.purchaseDetails">
             <span class="super"><em v-text="index + 1">1</em></span>
-            <div class="linetext width50 fl">型号： <span v-text="item.batchCode || '-'">21324</span></div>
+            <div class="linetext width50 fl">型号： <span v-text="item.cmpCode || '-'">21324</span></div>
             <div class="linetext width50 fl">品牌： <span v-text="item.brName || '-'">21324</span></div>
             <div class="linetext width50 fl">物料名称： <span v-text="item.kiName || '-'">21324</span></div>
             <div class="linetext width50 fl">规格： <span v-text="item.spec || '-'">21324</span></div>

pages/mobile/order/details.vue

@@ -265,7 +265,7 @@
     ></remind-str>
     <!-- 发票信息 -->
     <div class="mobile-modal"  @touchmove="preventTouchMove($event)" v-if="orderList.invoicetype === 1205 || orderList.invoicetype === 1206" v-show="showinvoiceType">
-      <div class="mobile-modal-box mobile-link-en mobile-link-en2" style="margin-top: -3.5rem">
+      <div class="mobile-modal-box mobile-link-en mobile-link-en2" style="margin-top: -4.5rem">
         <div class="mobile-modal-header">发票信息<i @click="showinvoiceType = false" class="icon-guanbi iconfont"></i></div>
         <div class="order-details-invoiceinfo" >
           <div class="order-details-invoiceinfo-content">
@@ -1817,6 +1817,8 @@
       left: 2.5%;
     }
     .order-details-invoiceinfo {
+      max-height:65vh;
+      overflow-y: auto;
       background: #f3f3f3;
       padding: 0.2rem;
       border-bottom-left-radius: 0.07rem;

pages/mobile/order/logistics.vue

@@ -91,23 +91,43 @@
           this.getInfo()
         },
         getInfo() {
-          this.$http.get(`/trade/order/invoiceid?id=${this.detailsInfo.id}&invoiceid=${this.idsList[this.nowIds]}`).then(data => {
-            this.logistics = data.data.data.logistics
-            this.$http.get(`/kdn/logistics/query?companyName=${this.logistics.companyName}&logisticsCode=${this.logistics.number}`).then(res => {
-              let str = res.data.traces
-              this.logisticsInfo = JSON.parse(res.data.traces).reverse()
-              if (str.indexOf('揽件') !== -1 || str.indexOf('收件') !== -1 || str.indexOf('转运') !== -1 || str.indexOf('运输') !== -1 || str.indexOf('发往') !== -1 ||
-                str.indexOf('发出') !== -1 || str.indexOf('收入') !== -1 || str.indexOf('扫描') !== -1 || str.indexOf('到达') !== -1) {
-                this.status = 'transit'
-              }
-              if (str.indexOf('派送') !== -1 || str.indexOf('派件') !== -1) {
-                this.status = 'send'
-              }
-              if (str.indexOf('签收') !== -1) {
-                this.status = 'signin'
-              }
+          if (this.$route.query.type === 'buyer') {
+            this.$http.get(`/trade/order/invoiceid?id=${this.detailsInfo.id}&invoiceid=${this.idsList[this.nowIds]}`).then(data => {
+              this.logistics = data.data.data.logistics
+              this.$http.get(`/kdn/logistics/query?companyName=${this.logistics.companyName}&logisticsCode=${this.logistics.number}`).then(res => {
+                let str = res.data.traces
+                this.logisticsInfo = JSON.parse(res.data.traces).reverse()
+                if (str.indexOf('揽件') !== -1 || str.indexOf('收件') !== -1 || str.indexOf('转运') !== -1 || str.indexOf('运输') !== -1 || str.indexOf('发往') !== -1 ||
+                  str.indexOf('发出') !== -1 || str.indexOf('收入') !== -1 || str.indexOf('扫描') !== -1 || str.indexOf('到达') !== -1) {
+                  this.status = 'transit'
+                }
+                if (str.indexOf('派送') !== -1 || str.indexOf('派件') !== -1) {
+                  this.status = 'send'
+                }
+                if (str.indexOf('签收') !== -1) {
+                  this.status = 'signin'
+                }
+              })
             })
-          })
+          } else {
+            this.$http.get(`/trade/logistics/${this.detailsInfo.lgtId}`).then(data => {
+              this.logistics = data.data
+              this.$http.get(`/kdn/logistics/query?companyName=${this.logistics.companyName}&logisticsCode=${this.logistics.number}`).then(res => {
+                let str = res.data.traces
+                this.logisticsInfo = JSON.parse(res.data.traces).reverse()
+                if (str.indexOf('揽件') !== -1 || str.indexOf('收件') !== -1 || str.indexOf('转运') !== -1 || str.indexOf('运输') !== -1 || str.indexOf('发往') !== -1 ||
+                  str.indexOf('发出') !== -1 || str.indexOf('收入') !== -1 || str.indexOf('扫描') !== -1 || str.indexOf('到达') !== -1) {
+                  this.status = 'transit'
+                }
+                if (str.indexOf('派送') !== -1 || str.indexOf('派件') !== -1) {
+                  this.status = 'send'
+                }
+                if (str.indexOf('签收') !== -1) {
+                  this.status = 'signin'
+                }
+              })
+            })
+          }
         }
       }
     }