Skip to content

S
shop-new
提交 d5b89e64 authored 作者: huaxinzhu's avatar huaxinzhu
浏览文件
操作

Merge branch 'dev_hxz' into test

上级 bc9e1377 ca0a1c3b
隐藏空白字符变更
内嵌 并排
正在显示 包含 159 行增加 和 52 行删除
src/views/entry/newyuncang.vue
浏览文件 @ d5b89e64
......@@ -10,10 +10,10 @@
<li>
<a href="">首页</a>
</li>
<li>
<li v-if="navigationObj.open">
<a :href=" '//' + navigationObj.open" target="_blank">开放平台</a>
</li>
<li>
<li v-if="navigationObj.shop">
<a :href=" '//' + navigationObj.shop">云仓</a>
</li>
<li>
......@@ -160,27 +160,39 @@
<p class="brands-tip">我们已与各行业领域的优秀品牌达成合作</p>
<div>
<p class="brand-type">
<span class="clothes" :class="{ 'light-word' : isLight === 0 }" @click="brandTypeChange(0)">服饰</span>
<span class="electrical" :class="{ 'light-word' : isLight === 1 }" @click="brandTypeChange(1)">电器</span>
<span class="food" :class="{ 'light-word' : isLight === 2 }" @click="brandTypeChange(2)">食品</span>
<span class="maternal" :class="{ 'light-word' : isLight === 3 }" @click="brandTypeChange(3)">母婴</span>
<span class="clothes" :class="{ 'light-word' : isLight === 0 }" @click="brandTypeChange(0)">{{ detail_img1.type }}</span>
<span class="electrical" :class="{ 'light-word' : isLight === 1 }" @click="brandTypeChange(1)">{{ detail_img2.type }}</span>
<span class="food" :class="{ 'light-word' : isLight === 2 }" @click="brandTypeChange(2)">{{ detail_img3.type }}</span>
<span class="maternal" :class="{ 'light-word' : isLight === 3 }" @click="brandTypeChange(3)">{{ detail_img4.type }}</span>
</p>
<div class="brand-carousel">
<el-carousel ref="cardShow" @change="brandCarChange()" :autoplay="false" arrow="never"
indicator-position="none" type="card" class="card-show" height="400px"
style="margin: 20px auto;">
<el-carousel-item name="1" class="pre-el-carousel-item">
<img src="../../assets/image/website/clothesImgs.png" alt="">
indicator-position="none" type="card" class="card-show" height="400px">
<el-carousel-item class="pre-el-carousel-item el-carousel-item-spe" name="1">
<div class="pre-img-con" v-for="(item,index) in detail_img1.logo_urls" :key="index">
<img class="pre-img" :src="item.url" alt="">
</div>
</el-carousel-item>
<el-carousel-item name="2" class="pre-el-carousel-item">
<img src="../../assets/image/website/electricalImgs.png" alt="">
<el-carousel-item class="pre-el-carousel-item el-carousel-item-spe" name="2">
<div class="pre-img-con" v-for="(item,index) in detail_img2.logo_urls" :key="index">
<img class="pre-img" :src="item.url" alt="">
</div>
</el-carousel-item>
<el-carousel-item name="3" class="pre-el-carousel-item">
<img src="../../assets/image/website/foodImgs.png" alt="">
<el-carousel-item class="pre-el-carousel-item el-carousel-item-spe" name="3">
<div class="pre-img-con" v-for="(item,index) in detail_img3.logo_urls" :key="index">
<img class="pre-img" :src="item.url" alt="">
</div>
</el-carousel-item>
<el-carousel-item name="4" class="pre-el-carousel-item">
<img src="../../assets/image/website/maternalImgs.png" alt="">
<el-carousel-item class="pre-el-carousel-item el-carousel-item-spe" name="4">
<div class="pre-img-con" v-for="(item,index) in detail_img4.logo_urls" :key="index">
<img class="pre-img" :src="item.url" alt="">
</div>
</el-carousel-item>
</el-carousel>
</div>
</div>
......@@ -194,11 +206,7 @@
<div class="about-con">
<div class="about-list">
<ul>
<li>企业简介</li>
<li>发展历程</li>
<li>荣誉资质</li>
<li>团队介绍</li>
<li>新闻动态</li>
<li v-for="(footerItem,index) in footerList" :key="index" @click="goToUser(footerItem.id)">{{ footerItem.title }}</li>
</ul>
<p class="about-gs">
{{settitle.bottomCopyright}}  <img class="icon-image" style="margin-right:4px;"
......@@ -271,7 +279,61 @@
direction: 'horizontal',
// 一个屏幕展示的数量
slidesPerView: 1
}
},
// logo
detail_img1: {
index: 1,
type: '',
logo_urls: [
{url: ''},{url: ''},{url: ''},{url: ''},
{url: ''},{url: ''},{url: ''},{url: ''},
{url: ''},{url: ''},{url: ''},{url: ''},
]
},
detail_img2: {
index: 2,
type: '',
logo_urls: [
{url: ''},{url: ''},{url: ''},{url: ''},
{url: ''},{url: ''},{url: ''},{url: ''},
{url: ''},{url: ''},{url: ''},{url: ''},
]
},
detail_img3: {
index: 3,
type: '',
logo_urls: [
{url: ''},{url: ''},{url: ''},{url: ''},
{url: ''},{url: ''},{url: ''},{url: ''},
{url: ''},{url: ''},{url: ''},{url: ''},
]
},
detail_img4: {
index: 4,
type: '',
logo_urls: [
{url: ''},{url: ''},{url: ''},{url: ''},
{url: ''},{url: ''},{url: ''},{url: ''},
{url: ''},{url: ''},{url: ''},{url: ''},
]
},
footerList: [
{
id:1, title:'企业简介'
},
{
id:2, title:'发展历程'
},
{
id:3, title:'荣誉资质'
},
{
id:4, title:'团队介绍'
},
{
id:5, title:'新闻动态'
}
]
}
},
mounted() {
......@@ -356,6 +418,13 @@
if (res.data.cloud_banner_lst && res.data.cloud_banner_lst.banners_json && res.data.cloud_banner_lst.banners_json.length > 0) {
this.bannerList = res.data.cloud_banner_lst.banners_json;
}
// logo 图
if (res.data.cloud_supplier_lst && res.data.cloud_supplier_lst.detail_json) {
this.detail_img1 = res.data.cloud_supplier_lst.detail_json[0];
this.detail_img2 = res.data.cloud_supplier_lst.detail_json[1];
this.detail_img3 = res.data.cloud_supplier_lst.detail_json[2];
this.detail_img4 = res.data.cloud_supplier_lst.detail_json[3];
}
}
})
},
......@@ -382,6 +451,17 @@
this.isAdHover = false;
this.indexAddom = -1;
},
/** 底部 路由跳转 */
goToUser(id) {
debugger
let completeWebsite = ''
if (this.navigationObj.aboutUs) {
// completeWebsite = this.navigationObj.aboutUs + '/user'
// console.log(11111,completeWebsite);
// this.$router.push({path: completeWebsite ,query:{id:id} })
}
},
// 去注册
toRegister() {
store.dispatch('LogOut').then(() => {
......@@ -486,6 +566,7 @@
margin-right: auto;
margin-left: auto;
overflow: hidden;
//background-color : #bbb; // 为了当云仓官网没有banner图时候，看清导航的设置
}
.advantage {
......@@ -810,11 +891,11 @@
.clothes:hover, .electrical:hover, .food:hover, .maternal:hover {
color: #1966FF;
}
/*品牌 logo*/
.brand-carousel {
width: 70%;
width: 100%;
min-width: 600px;
max-width: 1920px;
max-width: 1520px;
display: flex;
justify-content: center;
flex-direction: row;
......@@ -822,18 +903,8 @@
}
.card-show {
width: 100%;
}
/deep/ .el-carousel__container {
padding: 20px;
}
/deep/ .pre-el-carousel-item > img {
object-fit: cover;
width: 100%;
height: 100%;
//border: 1px solid #ccc;
width: 1520px;
overflow: hidden;
}
/deep/ .is-active {
......@@ -853,6 +924,27 @@
background: #fff;
}
.el-carousel-item-spe {
display : flex;
justify-content : start;
flex-direction :row;
flex-flow: wrap;
padding: 20px 0;
}
.pre-img-con {
width:169px;
height:75px;
margin:20px 10px;
background-color: #eee;
overflow : hidden;
}
.pre-img {
width:100%;
height: 100%;
}
/* footer 联系我们 */
.contact {
height: 243px;
......@@ -947,5 +1039,4 @@
color: #FFFFFF;
line-height: 40px;
}
</style>
src/views/system/asset/wddetails.vue
浏览文件 @ d5b89e64
......@@ -147,8 +147,19 @@
width="40%"
center>
<el-form :model="viewInvoiceForm" label-width="150px" class="add-invoice-form" size="small">
<el-form-item label="快递公司：" >
<el-input v-model="viewInvoiceForm.express_name" placeholder="请输入快递单号" disabled style="width: 80%;"></el-input>
<!-- <el-form-item label="快递公司：" >-->
<!-- <el-input v-model="viewInvoiceForm.express_name" placeholder="请输入快递单号" disabled style="width: 80%;"></el-input>-->
<!-- </el-form-item>-->
<el-form-item label="快递公司：" prop="express_name">
<el-select v-model="viewInvoiceForm.express_name" disabled placeholder="请选择快递公司" style="width: 80%;">
<el-option
v-for="item in expressLists"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="快递单号：">
......@@ -274,14 +285,19 @@
/** 导出商品明细 */
exportGoodsDetails() {
exportGoodsDetailsData( {id: this.withdrawId} ).then(res=> {
if (res.code == 1 && res.data) {
const aLink = document.createElement('a');
aLink.href = res.data;
//aLink.download = '订单.xls'; //下载的文件名
aLink.style.display = 'none';
document.body.appendChild(aLink);
aLink.click();
document.body.removeChild(aLink);
//debugger
if (res.code == 1) {
if(res.data) {
const aLink = document.createElement('a');
aLink.href = res.data;
//aLink.download = '订单.xls'; //下载的文件名
aLink.style.display = 'none';
document.body.appendChild(aLink);
aLink.click();
document.body.removeChild(aLink);
}else {
this.$message({type:'warning',message: res.message ? res.message: '导出失败'});
}
}else {
this.$message({type:'error',message: res.message ? res.message: '导出失败'});
}
......@@ -307,7 +323,7 @@
});
return false;
}
let isImgSize = (file.size / 1024 / 1024 / 1024) > 500;
let isImgSize = (file.size / 1024 ) > 500;
if (isImgSize) {
this.$message({
message: '上传图片大小不能超过500kb',
......
src/views/system/goods/add/components/goodsinfomation.vue
浏览文件 @ d5b89e64
......@@ -379,9 +379,9 @@
if(res.data) {
urlObj.url = res.data.image_url;
this.goodsImgFileList.push(urlObj);
// this.goodsImgFileList.forEach(item=> {
// this.goodsInfoForm.imgs.push(item.url)
// })
this.goodsImgFileList.forEach(item=> {
this.goodsInfoForm.imgs.push(item.url)
})
this.$message({type:'success',message:'图片上传成功'});
// 只清除一次，不浪费哦
if(this.goodsImgFileList.length === 1) {
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论