|
|
@@ -757,8 +757,11 @@ export default {
|
|
|
<input type="search" class="form-control" id="search_input" title="code" placeholder="型号/品牌"
|
|
|
v-model="searchCode" @search="goodsSearch(searchCode)"/>
|
|
|
<span class="input-group-btn">
|
|
|
- <button type="button" class="btn" id="search_btn" @click="goodsSearch(searchCode)"> 搜 索 </button>
|
|
|
- </span>
|
|
|
+ <button type="button" class="btn" id="search_btn" @click="goodsSearch(searchCode)"> 搜 索 </button>
|
|
|
+ </span>
|
|
|
+ <span class="input-group-btn">
|
|
|
+ <button type="button" class="btn sendprove" @click="sendprove()">我要发布产品</button>
|
|
|
+ </span>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="title-area">
|
|
|
@@ -766,9 +769,9 @@ export default {
|
|
|
<span style="line-height: 34px;">产品分类</span>
|
|
|
</div>
|
|
|
<div class="category-content">
|
|
|
- <el-tree v-if="kinds[0].children && kinds[0].children.length" :data="kinds" :props="defaultProps" accordion :highlight-current="true" @current-change="handlerCurrentNode" :default-expanded-keys="[0]" node-key="level">
|
|
|
+ <el-tree :data="kinds" :props="defaultProps" accordion :highlight-current="true" @current-change="handlerCurrentNode" :default-expanded-keys="[0]" node-key="level">
|
|
|
</el-tree>
|
|
|
- <span class="empty" v-if="!kinds[0].children || !kinds[0].children.length">暂无数据</span>
|
|
|
+ <!--<span class="empty" v-if="!kinds[0].children || !kinds[0].children.length">暂无数据</span>-->
|
|
|
</div>
|
|
|
</div>
|
|
|
<!-- 产品列表 -->
|
|
|
@@ -777,15 +780,16 @@ export default {
|
|
|
<table class="goodslist" style="width: 936px;background:#fff;" >
|
|
|
<thead>
|
|
|
<tr>
|
|
|
- <th width="172"><div>品牌/型号</div></th>
|
|
|
- <th width="140"><div>包装/生产日期</div></th>
|
|
|
+ <th width="189"><div>品牌/类目(产品名称)</div></th>
|
|
|
+ <th width="148"><div>型号/规格</div></th>
|
|
|
+ <th width="114"><div>包装/生产日期</div></th>
|
|
|
<th width="100"><div>库存</div></th>
|
|
|
<!-- <th width="90">数量</th>
|
|
|
<th width="90">香港交货<span style="font-size: 12px;">($)</span></th>
|
|
|
<th width="100">大陆交货<span style="font-size: 12px;">(¥)</span></th>-->
|
|
|
- <th width="216"><div>价格梯度(PCS)</div></th>
|
|
|
- <th width="109"><div>交期(天)</div></th>
|
|
|
- <th width="90"><div>规格书</div></th>
|
|
|
+ <th width="149"><div>价格梯度(PCS)</div></th>
|
|
|
+ <th width="67"><div>交期(天)</div></th>
|
|
|
+ <th width="66"><div>规格书</div></th>
|
|
|
<th width="95"><div>操作</div></th>
|
|
|
</tr>
|
|
|
</thead>
|
|
|
@@ -799,10 +803,14 @@ export default {
|
|
|
<span v-if="commodity.brandNameEn && !commodity.branduuid" v-text="commodity.brandNameEn"></span>
|
|
|
<span v-if="commodity.brandEn">{{commodity.brandEn}}</span>
|
|
|
</div>
|
|
|
- <div class="brand" v-if="!commodity.brandNameEn && !commodity.brandEn && commodity.code">—</div>
|
|
|
+ <div class="brand" v-if="!commodity.brandNameEn && !commodity.brandEn">—</div>
|
|
|
+ <a v-if="commodity.kindNameCn" @click="goBrandDetail('/product/kind/' + commodity.kindUuid, $event)" v-text="commodity.kindNameCn"></a>
|
|
|
+ <div class="brand" v-if="!commodity.kindNameCn">—</div>
|
|
|
+ </td>
|
|
|
+ <td class="brand-code">
|
|
|
<div class="code" v-if="commodity.code" v-text="commodity.code"></div>
|
|
|
- <div class="code" v-if="!commodity.code && commodity.brandNameEn ">—</div>
|
|
|
- <div class="brand" v-if="!commodity.brandNameEn && !commodity.brandEn && !commodity.code">—</div>
|
|
|
+ <div class="code" v-if="!commodity.code">—</div>
|
|
|
+ <div class="brand spec" v-text="commodity.spec || '—'"></div>
|
|
|
</td>
|
|
|
<td>
|
|
|
<div class="package" v-if="commodity.packaging" v-text="commodity.packaging"></div>
|
|
|
@@ -855,25 +863,37 @@ export default {
|
|
|
<buy :item="commodity"></buy>
|
|
|
</td>
|
|
|
</tr>
|
|
|
- <tr v-if="!commodities.content || commodities.content.length == 0">
|
|
|
+ <tr class="active-empty" v-if="!commodities.content || commodities.content.length == 0">
|
|
|
<td colspan="10">
|
|
|
<div class="text-center">
|
|
|
<div class="col-xs-offset-3 col-xs-2">
|
|
|
<img src="/images/brandList/empty-cart.jpg">
|
|
|
</div>
|
|
|
<div class="col-xs-4 txt-info">
|
|
|
- <p class="grey f16">暂无器件信息</p>
|
|
|
- <i class="iconfont"></i> <a href="/">返回首页</a>
|
|
|
+ <!--<p class="grey f16">暂无器件信息</p>-->
|
|
|
+ <p class="grey f16"> 暂无产品信息</p>
|
|
|
+ <!-- <i class="iconfont"></i> <a href="/">返回首页</a>-->
|
|
|
+ <img src="/images/brandList/upload.png"> <a href="/vendor#/vendor_upload?type=company">马上去上传</a>
|
|
|
</div>
|
|
|
</div>
|
|
|
</td>
|
|
|
</tr>
|
|
|
</tbody>
|
|
|
</table>
|
|
|
+ <div class="remind-area">
|
|
|
+ <img src="/images/store/store-remind.png" alt="">
|
|
|
+ 所有报价、库存信息的真实性及准确性均由店铺负责,如有疑问请点击
|
|
|
+ <a @click="goLink" class="link-seller">联系卖家</a>
|
|
|
+ </div>
|
|
|
<div style="float: right;">
|
|
|
<page :total="commodities.totalElements" :page-size="pageParams.count"
|
|
|
:current="pageParams.page" @childEvent="handleCurrentChange"></page>
|
|
|
</div>
|
|
|
+ <link-saler-box
|
|
|
+ :tel="tel"
|
|
|
+ v-if="showLinkBox"
|
|
|
+ @cancelAction="showLinkBox = false">
|
|
|
+ </link-saler-box>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -898,12 +918,14 @@ export default {
|
|
|
}
|
|
|
import Buy from '~components/common/buyOrCar/buyComponent.vue'
|
|
|
import Page from '~components/common/page/pageComponent.vue'
|
|
|
+ import LinkSalerBox from '~components/common/LinkSalerBox.vue'
|
|
|
export default {
|
|
|
name: 'commodity-list',
|
|
|
props: ['kinds'],
|
|
|
components: {
|
|
|
Buy,
|
|
|
- Page
|
|
|
+ Page,
|
|
|
+ LinkSalerBox
|
|
|
},
|
|
|
data () {
|
|
|
return {
|
|
|
@@ -917,7 +939,9 @@ export default {
|
|
|
},
|
|
|
searchCode: '',
|
|
|
parentKindId: 0,
|
|
|
- ids: null
|
|
|
+ ids: null,
|
|
|
+ showLinkBox: false,
|
|
|
+ tel: ''
|
|
|
}
|
|
|
},
|
|
|
filters: {
|
|
|
@@ -949,6 +973,26 @@ export default {
|
|
|
computed: {
|
|
|
commodities () {
|
|
|
return this.$store.state.shop.storeInfo.storeCommodity.data
|
|
|
+ },
|
|
|
+ storeInfo () {
|
|
|
+ return this.$store.state.shop.storeInfo.store.data
|
|
|
+ },
|
|
|
+ user () {
|
|
|
+ return this.$store.state.option.user
|
|
|
+ },
|
|
|
+ tab () {
|
|
|
+ return this.$store.state.chat.tab.tab.data
|
|
|
+ },
|
|
|
+ isConsignment () {
|
|
|
+ return this.storeInfo.type === 'CONSIGNMENT'
|
|
|
+ },
|
|
|
+ enterprise () {
|
|
|
+ let ens = this.user.data.enterprises
|
|
|
+ if (ens && ens.length) {
|
|
|
+ return ens.find(item => item.current) || {enName: '个人账户'}
|
|
|
+ } else {
|
|
|
+ return {enName: '个人账户'}
|
|
|
+ }
|
|
|
}
|
|
|
},
|
|
|
mounted () {
|
|
|
@@ -958,6 +1002,20 @@ export default {
|
|
|
// alert(JSON.stringify(this.kinds))
|
|
|
},
|
|
|
methods: {
|
|
|
+ sendprove: function () {
|
|
|
+ if (this.user.logged) {
|
|
|
+ if (this.enterprise && this.enterprise.isVendor === 313) {
|
|
|
+ window.open('/vendor#/vendor_upload')
|
|
|
+ } else {
|
|
|
+ this.$router.push('/register-saler')
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ this.$router.push('/auth/login?returnUrl=' + window.location.href)
|
|
|
+ }
|
|
|
+ },
|
|
|
+ goLink: function () {
|
|
|
+ this.baseUtils.goLinkUser(this, this.storeInfo.enUU)
|
|
|
+ },
|
|
|
KindsNameChange: function (obj) {
|
|
|
// obj.nameCn += obj.level
|
|
|
document.getElementsByClassName('el-tree-node__content').innerHTML = ('<span>1</span>')
|
|
|
@@ -1056,7 +1114,7 @@ export default {
|
|
|
/* 产品分类调整*/
|
|
|
#goods-list-fragment .category-content{
|
|
|
max-height: 496px;
|
|
|
- min-height: 53px;
|
|
|
+ min-height: 224px;
|
|
|
overflow-y: scroll;
|
|
|
overflow-x: hidden;
|
|
|
position: relative;
|
|
|
@@ -1223,20 +1281,30 @@ export default {
|
|
|
|
|
|
/* 物品列表 */
|
|
|
#goods-list-fragment .goodslist .brand-code {
|
|
|
- font-size: 14px;
|
|
|
+ font-size: 12px;
|
|
|
text-align: center;
|
|
|
+ position: relative;
|
|
|
}
|
|
|
-
|
|
|
#goods-list-fragment #search_btn {
|
|
|
- background: #3b7cf4;
|
|
|
- color: #FFFFFF;
|
|
|
- border-bottom-right-radius: 25px;
|
|
|
- border-top-right-radius: 25px;
|
|
|
+ background: #3c7cf5;
|
|
|
+ color: #FFF;
|
|
|
+ border-bottom-right-radius: 3px;
|
|
|
+ border-top-right-radius: 3px;
|
|
|
+ border-bottom-left-radius: 0px;
|
|
|
+ border-top-left-radius: 0px;
|
|
|
height: 28px;
|
|
|
- width: 58px;
|
|
|
+ width: 69px;
|
|
|
padding-right: 50px;
|
|
|
}
|
|
|
-
|
|
|
+ #goods-list-fragment .sendprove {
|
|
|
+ width: 110px;
|
|
|
+ height: 28px;
|
|
|
+ color: #fff;
|
|
|
+ background-color: #ff9000;
|
|
|
+ border-radius: 3px;
|
|
|
+ float: right;
|
|
|
+ margin-left: 10px
|
|
|
+ }
|
|
|
.btn:focus,.btn:active:focus,.btn.active:focus,.btn.focus,.btn:active.focus,.btn.active.focus {
|
|
|
outline: none;
|
|
|
border-color: transparent;
|
|
|
@@ -1246,15 +1314,15 @@ export default {
|
|
|
font-size: 14px;
|
|
|
height: 28px;
|
|
|
line-height: 28px;
|
|
|
- width: 200px;
|
|
|
+ width: 189px;
|
|
|
float: right;
|
|
|
- border-bottom-left-radius: 25px;
|
|
|
- border-top-left-radius: 25px;
|
|
|
+ border-bottom-left-radius: 3px;
|
|
|
+ border-top-left-radius: 3px;
|
|
|
border: 1px solid #3b7cf4;
|
|
|
}
|
|
|
|
|
|
#goods-list-fragment .brand-code .code {
|
|
|
- font-weight: 600;
|
|
|
+ /*font-weight: 600;*/
|
|
|
}
|
|
|
#goods-list-fragment .brand-code .brand a {
|
|
|
color: #3c7df5;
|
|
|
@@ -1289,16 +1357,16 @@ export default {
|
|
|
color: #f01010;
|
|
|
}
|
|
|
#goodslist-content .amount {
|
|
|
- width: 50%;
|
|
|
+ width: 60%;
|
|
|
float: left;
|
|
|
- padding-left: 50px;
|
|
|
+ padding-left: 30px;
|
|
|
text-align:left;
|
|
|
}
|
|
|
- #goodslist-content .amount div:last-child, #goodslist-content .price div:last-child{
|
|
|
+ #goodslist-content .amount div:last-child{
|
|
|
color: #f01010;
|
|
|
}
|
|
|
#goodslist-content .price {
|
|
|
- width: 50%;
|
|
|
+ width: 40%;
|
|
|
float:right;
|
|
|
text-align:left;
|
|
|
}
|
|
|
@@ -1386,12 +1454,15 @@ export default {
|
|
|
.no-record i{
|
|
|
margin-right: 5px;
|
|
|
}
|
|
|
+ .active-empty:hover{
|
|
|
+ background-color: #fff!important;
|
|
|
+ }
|
|
|
.text-center{
|
|
|
text-align: center;
|
|
|
margin-top: 30px;
|
|
|
}
|
|
|
.text-center .col-xs-2 img{
|
|
|
- margin: 50px 0 50px 135px;
|
|
|
+ margin: 55px 0 85px 135px;
|
|
|
vertical-align: middle;
|
|
|
}
|
|
|
.text-center .txt-info{
|
|
|
@@ -1400,20 +1471,37 @@ export default {
|
|
|
}
|
|
|
.text-center .col-xs-4 p{
|
|
|
color: #999;
|
|
|
- margin-top: 3px;
|
|
|
- margin-bottom: 2px;
|
|
|
+ margin: 11px 0px 4px -6px;
|
|
|
+ }
|
|
|
+ .text-center .txt-info i{
|
|
|
+ color: #5078cb;
|
|
|
}
|
|
|
.text-center .txt-info a{
|
|
|
font-size: 14px;
|
|
|
- }
|
|
|
- .text-center .col-xs-4 i{
|
|
|
color: #5078cb;
|
|
|
- font-size: 14px;
|
|
|
+ }
|
|
|
+ .text-center .col-xs-5 img{
|
|
|
+ margin-left: -235px;
|
|
|
}
|
|
|
.goodslist{
|
|
|
margin-bottom: 20px;
|
|
|
}
|
|
|
-
|
|
|
+ .remind-area {
|
|
|
+ font-size: 12px;
|
|
|
+ color: #666;
|
|
|
+ }
|
|
|
+ .remind-area img {
|
|
|
+ margin-right: 12px;
|
|
|
+ }
|
|
|
+ .remind-area .link-seller {
|
|
|
+ font-size: 12px;
|
|
|
+ color: #fff;
|
|
|
+ line-height: 20px;
|
|
|
+ height: 20px;
|
|
|
+ padding: 0 7px;
|
|
|
+ background: #ef7f03;
|
|
|
+ border-radius: 2px;
|
|
|
+ }
|
|
|
@font-face {
|
|
|
font-family: 'iconfont'; /* project id 357960 */
|
|
|
src: url('//at.alicdn.com/t/font_27kjyd082ezpk3xr.eot');
|