Skip to content

S
shop-new
提交 1465c103 authored 作者: PC-20210205TDZC\Administrator's avatar PC-20210205TDZC\Administrator
浏览文件
操作

Merge branch 'dev_hxz' of http://120.27.146.32:8888/wangfulong/shop-new into dev_hxz

上级 2261701c 2adddc4c
隐藏空白字符变更
内嵌 并排
正在显示 包含 653 行增加 和 452 行删除
.env.development
浏览文件 @ 1465c103
...@@ -3,7 +3,7 @@ ENV = 'development' ...@@ -3,7 +3,7 @@ ENV = 'development'
# 正式环境 # 正式环境
#VUE_APP_BASE_API = 'http://sjapi.jxhh.com' #VUE_APP_BASE_API = 'http://sjapi.jxhh.com'
#VUE_APP_BASE_SYS_API = 'http://sysapi.jxhh.com' VUE_APP_BASE_SYS_API = 'http://sysapi.jxhh.com'
# 开发环境 # 开发环境
#VUE_APP_BASE_API = 'http://192.168.111.34:8200' #VUE_APP_BASE_API = 'http://192.168.111.34:8200'
VUE_APP_BASE_API = 'http://192.168.26.179:8200' VUE_APP_BASE_API = 'http://192.168.26.179:8200'
......
public/index.html
浏览文件 @ 1465c103
...@@ -228,7 +228,7 @@ ...@@ -228,7 +228,7 @@
} }
} }
}; };
xhttp.open("GET", 'http://192.168.26.179:6601/api/v1/oem/webSite/domainChannel?domain='+ssa+'&field='+op, true); xhttp.open("GET", '//sysapi.jxhh.com/api/v1/oem/webSite/domainChannel?domain='+ssa+'&field='+op, true); // 直接上正式，以防上线忘改
xhttp.send(); xhttp.send();
} }
</script> </script>
......
src/api/module/bankcard.js
浏览文件 @ 1465c103
...@@ -171,10 +171,17 @@ export function addInvoiceData (data) { ...@@ -171,10 +171,17 @@ export function addInvoiceData (data) {
} }
// 获取验证码 // 获取验证码
// export function getCheckCodeData(data) {
// return request({
// url: '/system/withdrawlog/getCheckCode',
// method: 'post',
// data: data
// })
// }
export function getCheckCodeData(data) { export function getCheckCodeData(data) {
return request({ return request({
url: '/system/withdrawlog/getCheckCode', url: '/local/seller/sendMobile',
method: 'post', method: 'get',
data: data data: data
}) })
} }
......
src/api/module/operation/index.js
浏览文件 @ 1465c103
// import request from '@/utils/request'; import request from '@/utils/request';
import axios from 'axios' import axios from 'axios'
//
// 获取分类列表 // // 获取分类列表
// export function getDocList (docType) { // export function getDocList (docType) {
// return request({ // return request({
// url: '/api/v1/document/externalTypeListALL?docType='+docType, // url: '//sysapi.jxhh.com/api/v1/document/externalTypeListALL?docType='+docType,
// method: 'get' // method: 'get'
// }) // })
// } // }
// // //
// // 查询文档 // // // 查询文档
// export function getDoc (query) { // export function getDoc (query) {
// return request({ // return request({
// url: '/api/v1/document/externalShow', // url: '/api/v1/document/externalShow',
......
src/views/entry/newyuncang.vue
浏览文件 @ 1465c103
...@@ -4,12 +4,20 @@ ...@@ -4,12 +4,20 @@
<header :class="{ 'head-scroll': isScroll }"> <header :class="{ 'head-scroll': isScroll }">
<div class="header-con"> <div class="header-con">
<ul class="nav"> <ul class="nav">
<li> <li v-if="settitle && settitle.toplogo">
<img style="width:114px;height:35px;" :src="settitle.topLogo" alt=""> <img style="width:114px;height:35px;" :src="settitle.topLogo" alt="">
<!-- <img style="width:114px;height:35px;" src="../../../public/images/logo_white_sm.png" alt=""> -->
</li> </li>
<li v-for="(item,index) in ycList" :key="item.id"> <li>
<a :href=" item.src " target="_blank">{{ item.name}}</a> <a href="/">首页</a>
</li>
<li v-if="navigationObj.open">
<a :href=" '//' + navigationObj.open" target="_blank">开放平台</a>
</li>
<li v-if="navigationObj.shop">
<a :href=" '//' + navigationObj.shop">云仓</a>
</li>
<li>
<a :href=" '//' + navigationObj.aboutUs + '/user' " target="_blank">关于我们</a>
</li> </li>
</ul> </ul>
<div class="register-login-btn"> <div class="register-login-btn">
...@@ -19,11 +27,17 @@ ...@@ -19,11 +27,17 @@
</div> </div>
</header> </header>
<section class="banner"> <section class="banner">
<!-- <el-carousel height="561px" :autoplay="false" arrow="never">--> <!-- <el-carousel height="561px" :autoplay="false" arrow="never">-->
<!-- <el-carousel-item v-for="item in 4" :key="item">--> <!-- <el-carousel-item v-for="item in 4" :key="item">-->
<!-- <img style="width:100%;" src="../../assets/image/website/banner.png" alt="">--> <!-- <img style="width:100%;" src="../../assets/image/website/banner.png" alt="">-->
<!-- </el-carousel-item>--> <!-- </el-carousel-item>-->
<!-- </el-carousel>--> <!-- </el-carousel>-->
<swiper :options="swiperOption" v-if="bannerList && bannerList.length > 0">
<swiper-slide v-for="(item,index) in bannerList" :key="index">
<a :href=" '//' + item.redirect_url" target="_blank"><img style="width: 100%;height: 562px;" :src="item.image_url"
alt=""></a>
</swiper-slide>
</swiper>
</section> </section>
<!-- 主体 --> <!-- 主体 -->
...@@ -31,69 +45,41 @@ ...@@ -31,69 +45,41 @@
<div class="advantage" :class="{ 'mgB100': isAdHover }"> <div class="advantage" :class="{ 'mgB100': isAdHover }">
<p class="advantage-title">核心优势</p> <p class="advantage-title">核心优势</p>
<div class="advantage-con" :class="{ 'mgT20' : isAdHover }"> <div class="advantage-con" :class="{ 'mgT20' : isAdHover }">
<div class="pre-advantage" @mouseover="adHover(1)" @mouseleave="adLeave(1)" :class="{ 'noBorder': indexAddom === 1 }" style="z-index: 4">
<dl class="dl-con" :class="{ 'noDlCon': indexAddom === 1 }"> <div
<dt class="dl-con-ad1"></dt> class="pre-advantage"
<dd>技术优势</dd> v-for="(adItem,index) in cloud_advantage_lst"
</dl> :key="index"
<div class="pre-advantage-details" :class="{ 'up-ad-details': indexAddom === 1 }"> :style="{zIndex: cloud_advantage_lst.length - index}"
<p class="ad-details-title"> @mouseover="adHover(index + 1)"
技术优势 @mouseleave="adLeave(index + 1)"
</p > >
<p class="ad-details"> <dl class="dl-con" :class="{ 'noDlCon': indexAddom === (index+1) }">
数字化、智能化云仓系统支持商品一键导入，快速编辑上架；订单批量发货、流程简洁，实时同步物流状态； 结算流水实时同步，资金链及时回笼 <dt :class=" 'dl-con-ad' + (index+1) "></dt>
</p> <dd>{{ adItem.title }}</dd>
</div>
</div>
<div class="pre-advantage" @mouseover="adHover(2)" @mouseleave="adLeave(2)" :class="{ 'noBorder': indexAddom === 2 }" style="z-index: 3">
<dl style="text-align: center" class="dl-con" :class="{ 'noDlCon': indexAddom === 2 }">
<dt class="dl-con-ad2"></dt>
<dd>成本优势</dd>
</dl>
<div class="pre-advantage-details" :class="{ 'up-ad-details': indexAddom === 2 }">
<p class="ad-details-title">
成本优势
</p >
<p class="ad-details">
云仓支持线上快速提交资料，入驻、审核简便；对接数万B端商家，流量大、出单快；接口一键导入批量发货，节省人力物力成本；多维度分析，助力数字营销和运营营销和运营
</p>
</div>
</div>
<div class="pre-advantage" @mouseover="adHover(3)" @mouseleave="adLeave(3)" :class="{ 'noBorder': indexAddom === 3 }" style="z-index: 2">
<dl style="text-align: center" class="dl-con" :class="{ 'noDlCon': indexAddom === 3 }">
<dt class="dl-con-ad3"></dt>
<dd>响应式</dd>
</dl>
<div class="pre-advantage-details" :class="{ 'up-ad-details': indexAddom === 3 }">
<p class="ad-details-title">
响应式
</p >
<p class="ad-details">
一键导入商品<br/>
一键轻松上架<br/>
一键自动结算<br/>
一键批量发货<br/>
一键对接商家<br/>
一键库存同步<br/>
一键售后响应<br/>
一键财务管理
</p>
</div>
</div>
<div class="pre-advantage" @mouseover="adHover(4)" @mouseleave="adLeave(4)" :class="{ 'noBorder': indexAddom === 4 }" style="z-index: 1">
<dl style="text-align: center" class="dl-con" :class="{ 'noDlCon': indexAddom === 4 }">
<dt class="dl-con-ad4"></dt>
<dd>解决方案</dd>
</dl> </dl>
<div class="pre-advantage-details" :class="{ 'up-ad-details': indexAddom === 4 }">
<p class="ad-details-title"> <div class="pre-advantage-details" :class="{ 'up-ad-details': indexAddom === (index+1) }">
解决方案 <p class="ad-details-title">{{ adItem.title }}</p>
</p > <p class="ad-details">{{ adItem.content_summary }}</p>
<p class="ad-details">
商品对接供应链B端数万商家，多条渠道同时出单；对多网店的商品和订单等日常事务同时管理，提高整体效率；供应商的KPI考核，把控采购风险，提高采购效益
</p>
</div> </div>
</div> </div>
<!-- <div class="pre-advantage" @mouseover="adHover(1)" @mouseleave="adLeave(1)" :class="{ 'noBorder': indexAddom === 1 }" style="z-index: 4">-->
<!-- <dl class="dl-con" :class="{ 'noDlCon': indexAddom === 1 }">-->
<!-- <dt class="dl-con-ad1"></dt>-->
<!-- <dd>技术优势</dd>-->
<!-- </dl>-->
<!-- <div class="pre-advantage-details" :class="{ 'up-ad-details': indexAddom === 1 }">-->
<!-- <p class="ad-details-title">-->
<!-- 技术优势-->
<!-- </p >-->
<!-- <p class="ad-details">-->
<!-- 数字化、智能化云仓系统支持商品一键导入，快速编辑上架；订单批量发货、流程简洁，实时同步物流状态； 结算流水实时同步，资金链及时回笼-->
<!-- </p>-->
<!-- </div>-->
<!-- </div>-->
</div> </div>
</div> </div>
</section> </section>
...@@ -154,7 +140,7 @@ ...@@ -154,7 +140,7 @@
<div class="pro-ma"> <div class="pro-ma">
<p class="set-in-ma n-m-bg">入驻选填材料</p> <p class="set-in-ma n-m-bg">入驻选填材料</p>
<div class="optional"> <div class="optional">
<ul > <ul>
<li>品牌LOGO</li> <li>品牌LOGO</li>
<li>其它行业资质</li> <li>其它行业资质</li>
</ul> </ul>
...@@ -174,25 +160,39 @@ ...@@ -174,25 +160,39 @@
<p class="brands-tip">我们已与各行业领域的优秀品牌达成合作</p> <p class="brands-tip">我们已与各行业领域的优秀品牌达成合作</p>
<div> <div>
<p class="brand-type"> <p class="brand-type">
<span class="clothes" :class="{ 'light-word' : isLight === 0 }" @click="brandTypeChange(0)">服饰</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)">电器</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)">食品</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)">母婴</span> <span class="maternal" :class="{ 'light-word' : isLight === 3 }" @click="brandTypeChange(3)">{{ detail_img4.type }}</span>
</p> </p>
<div class="brand-carousel"> <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 ref="cardShow" @change="brandCarChange()" :autoplay="false" arrow="never"
<el-carousel-item name="1" class="pre-el-carousel-item"> indicator-position="none" type="card" class="card-show" height="400px">
<img src="../../assets/image/website/clothesImgs.png" alt="">
<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>
<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>
<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>
<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-item>
</el-carousel> </el-carousel>
</div> </div>
</div> </div>
...@@ -201,19 +201,16 @@ ...@@ -201,19 +201,16 @@
<footer> <footer>
<div class="contact"> <div class="contact">
<p>如果你想要更多的<span>了解</span>，请联系我们</p> <p>如果你想要更多的<span>了解</span>，请联系我们</p>
<p>4000-188-199</p> <p>{{ settitle.contactTel }}</p>
</div> </div>
<div class="about-con"> <div class="about-con">
<div class="about-list"> <div class="about-list">
<ul> <ul>
<li>企业简介</li> <li v-for="(footerItem,index) in footerList" :key="index" @click="goToUser(footerItem.id)">{{ footerItem.title }}</li>
<li>发展历程</li>
<li>荣誉资质</li>
<li>团队介绍</li>
<li>新闻动态</li>
</ul> </ul>
<p class="about-gs"> <p class="about-gs">
{{settitle.bottomCopyright}}   {{settitle.recordNum}} {{settitle.bottomCopyright}}  <img class="icon-image" style="margin-right:4px;"
src="@/assets/image/national.png">{{settitle.recordNum}}
</p> </p>
</div> </div>
<div class="about-us"> <div class="about-us">
...@@ -228,34 +225,123 @@ ...@@ -228,34 +225,123 @@
<script> <script>
import store from '@/store'; import store from '@/store';
import { indexInfo, newsList, companyCounsel ,webSite,getdomain,getallCloudList} from '@/api/webSite' import {indexInfo, newsList, companyCounsel, webSite, getdomain, getallCloudList} from '@/api/webSite'
export default { export default {
name: "newyuncang", name: "newyuncang",
data() { data() {
return { return {
menurl:{}, // banner 图
settitle:{}, bannerList: [],
channel_id:0, // 核心优势
cloud_advantage_lst: [],
settitle: {
bottomCopyright: "",
businessHours: 1,
companyAddress: "",
contactTel: "",
custServiceQrcode: "",
hotlineTel1: "",
hotlineTel2: "",
onlineTimeEnd: "18:00",
onlineTimeStart: "09:00",
recordNum: "",
topLogo: "",
},
channel_id: 0,
isScroll: false, isScroll: false,
isAdHover: false, isAdHover: false,
isHasBorder: false, isHasBorder: false,
indexAddom: false, indexAddom: false,
isLight: 0, isLight: 0,
ycList: [ navigationObj: {
{ name: '首页',id:0,src: '/' }, 'home': '',
{ name: '开放平台',id:1,src: 'http://open.jxhh.com/doc/api.html' }, 'open':'',
{ name: '云仓',id:2,src: 'http://scm.jxhh.com' }, 'shop':'',
{ name: '关于我们',id:3,src: 'http://www.stbz.net' }, 'aboutUs':'',
], },
gwToken: '' gwToken: '',
swiperOption: {
loop: true, // 循环模式选项
pagination: {
el: '.swiper-pagination',
clickable: true,
// bulletClass:'my-bullet',
bulletActiveClass: 'my-bullet'
},
autoplay: {
delay: 6000,
disableOnInteraction: false
},
// 设定初始化时slide的索引
initialSlide: 0,
// Slides的滑动方向，可设置水平(horizontal)或垂直(vertical)
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() { mounted() {
this.getIndexInfo() this.getIndexInfo()
window.addEventListener('scroll',this.handleScroll,true); window.addEventListener('scroll', this.handleScroll, true);
}, },
destroyed() { destroyed() {
window.removeEventListener('scroll',this.handleScroll); window.removeEventListener('scroll', this.handleScroll);
}, },
methods: { methods: {
...@@ -277,79 +363,70 @@ ...@@ -277,79 +363,70 @@
} }
}) })
}, },
// 获取通用设置 /** 获取通用设置 */
getWebSite() { getWebSite() {
let params = { let params = {
channel_ids: this.channel_id channel_ids: this.channel_id
} }
webSite(params).then(res => { webSite(params).then(res => {
if (res.code==1) { if (res.code == 1) {
if(res.data.universal_lst&&res.data.universal_lst!='null'){ if (res.data.universal_lst && res.data.universal_lst != 'null') {
this.settitle = res.data.universal_lst this.settitle = res.data.universal_lst
}else{ } else {
this.settitle = { // this.settitle = {
bottomCopyright: "Copyright © 2015 - 2021 北京胜天半子科技有限公司 All Rights Reserved.", // bottomCopyright: "Copyright © 2015 - 2021 北京胜天半子科技有限公司 All Rights Reserved.",
businessHours: 1, // businessHours: 1,
companyAddress: "北京市丰台区诺德中心一期四号楼21层", // companyAddress: "北京市丰台区诺德中心一期四号楼21层",
contactTel: "4000-188-199", // contactTel: "4000-188-199",
custServiceQrcode: "http://excel.jxhh.com/public/upload/1629540531.png", // custServiceQrcode: "http://excel.jxhh.com/public/upload/1629540531.png",
hotlineTel1: "010-5335 9558", // hotlineTel1: "010-5335 9558",
hotlineTel2: "400-188-199", // hotlineTel2: "400-188-199",
onlineTimeEnd: "18:00", // onlineTimeEnd: "18:00",
onlineTimeStart: "09:00", // onlineTimeStart: "09:00",
recordNum: "京ICP备19033223号-1", // recordNum: "京ICP备19033223号-1",
topLogo: "http://excel.jxhh.com/public/upload/1629540557.png", // topLogo: "http://excel.jxhh.com/public/upload/1629540557.png",
// }
}
} }
} }
}) })
}, },
//获取所有域名 /** 获取所有域名 */
getDomain(){ getDomain() {
let data = { let data = {
channel_ids:this.channel_id channel_ids: this.channel_id
} }
getdomain(data).then(res=>{ getdomain(data).then(res => {
if(res.code==1){ if (res.code == 1 && res.data) {
this.menurl = res.data this.navigationObj.home = '';
if(this.menurl&&this.menurl!='null'){ this.navigationObj.open = res.data.Open.domain;
this.ycList = [ this.navigationObj.shop = res.data.Cloud.domain;
{ name: '首页',id:0,src: '/' }, this.navigationObj.aboutUs = res.data.Official.domain;
{ name: '开放平台',id:1,src: '' }, }
{ name: '云仓',id:2,src: '' },
{ name: '关于我们',id:3,src: '' }
]
this.menurl.forEach((item,index)=>{
if(item.label=='open'){
this.ycList[1].src = item.value
}
if(item.label=='cloud'){
this.ycList[2].src = item.value
}
if(item.label=='official'){
this.ycList[3].src = item.value
}
})
}else{
this.ycList = [
{ name: '首页',id:0,src: '/' },
{ name: '开放平台',id:1,src: 'http://open.jxhh.com' },
{ name: '云仓',id:2,src: 'http://scm.jxhh.com' },
{ name: '关于我们',id:3,src: 'http://www.stbz.net' }
]
}
}
}) })
}, },
getAllcloud(){ /** 获取 云仓 banner图信息、核心优势、入驻logo图片集 */
getAllcloud() {
let data = { let data = {
new_channel_id:this.channel_id new_channel_id: this.channel_id
} }
getallCloudList(data).then(res=>{ getallCloudList(data).then(res => {
if (res.code == 1 && res.data) {
// 核心优势
if (res.data.cloud_advantage_lst && res.data.cloud_advantage_lst.length > 0) {
this.cloud_advantage_lst = res.data.cloud_advantage_lst
}
// banner图
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];
}
}
}) })
}, },
// 监听浏览器滚动 // 监听浏览器滚动
...@@ -375,6 +452,14 @@ ...@@ -375,6 +452,14 @@
this.isAdHover = false; this.isAdHover = false;
this.indexAddom = -1; this.indexAddom = -1;
}, },
/** 底部 路由跳转 */
goToUser(id) {
let completeWebsite = ''
if (this.navigationObj.aboutUs) {
completeWebsite = this.navigationObj.aboutUs + '/user?id=' + id
window.location.href = '//' + completeWebsite
}
},
// 去注册 // 去注册
toRegister() { toRegister() {
store.dispatch('LogOut').then(() => { store.dispatch('LogOut').then(() => {
...@@ -393,11 +478,12 @@ ...@@ -393,11 +478,12 @@
</script> </script>
<style lang="scss" type="text/stylus" scoped> <style lang="scss" type="text/stylus" scoped>
header,section,footer,ul,li,p,dl,dt,dd { header, section, footer, ul, li, p, dl, dt, dd {
margin: 0; margin: 0;
padding: 0; padding: 0;
} }
ul,li {
ul, li {
list-style: none; list-style: none;
} }
...@@ -406,6 +492,7 @@ ...@@ -406,6 +492,7 @@
height: 100%; height: 100%;
min-width: 960px; min-width: 960px;
} }
/* 公用 */ /* 公用 */
/* header */ /* header */
...@@ -418,7 +505,7 @@ ...@@ -418,7 +505,7 @@
} }
.head-scroll { .head-scroll {
background-color : #070D41; background-color: #070D41;
} }
.header-con { .header-con {
...@@ -427,59 +514,65 @@ ...@@ -427,59 +514,65 @@
height: 100px; height: 100px;
color: #fff; color: #fff;
display: flex; display: flex;
flex-direction : row; flex-direction: row;
justify-content : space-between; justify-content: space-between;
align-items : center; align-items: center;
} }
.nav,.register-login-btn { .nav, .register-login-btn {
display: flex; display: flex;
flex-direction : row; flex-direction: row;
justify-content : start; justify-content: start;
align-items: center; align-items: center;
} }
.nav { .nav {
} }
.register-login-btn { .register-login-btn {
} }
.nav > li{
.nav > li {
padding: 10px 25px; padding: 10px 25px;
cursor: pointer; cursor: pointer;
font-size: 18px; font-size: 18px;
} }
.register-btn,.login-btn { .register-btn, .login-btn {
padding: 5px 20px; padding: 5px 20px;
border-radius: 4px; border-radius: 4px;
cursor: pointer; cursor: pointer;
} }
.register-btn { .register-btn {
border: 1px solid #fff; border: 1px solid #fff;
} }
.login-btn { .login-btn {
border: 1px solid #1D8EFE; border: 1px solid #1D8EFE;
background: #1D8EFE; background: #1D8EFE;
margin-left: 20px; margin-left: 20px;
} }
/* banner图 */ /* banner图 */
.banner { .banner {
width: 100%; width: 100%;
height: 562px; height: 562px;
position : relative; margin-right: auto;
background : url("../../assets/image/website/banner.png") no-repeat center center; margin-left: auto;
background-size: cover; overflow: hidden;
//background-color : #bbb; // 为了当云仓官网没有banner图时候，看清导航的设置
} }
.advantage { .advantage {
margin-bottom: 0; margin-bottom: 0;
transition : all 0.5s; transition: all 0.5s;
} }
.advantage-title,.process-title,.brands-title { .advantage-title, .process-title, .brands-title {
text-align: center; text-align: center;
font-size: 38px; font-size: 38px;
font-weight: 400; font-weight: 400;
...@@ -491,12 +584,13 @@ ...@@ -491,12 +584,13 @@
width: 80%; width: 80%;
margin: 0 auto; margin: 0 auto;
display: flex; display: flex;
flex-direction : row; flex-direction: row;
justify-content : center; justify-content: center;
align-items : center; align-items: center;
position: relative; position: relative;
transition: 0.5s; transition: 0.5s;
} }
.pre-advantage { .pre-advantage {
width: 268px; width: 268px;
height: 190px; height: 190px;
...@@ -507,41 +601,47 @@ ...@@ -507,41 +601,47 @@
z-index: 0; z-index: 0;
border-radius: 2px; border-radius: 2px;
} }
.dl-con { .dl-con {
width: 100%; width: 100%;
height: 100%; height: 100%;
text-align : center; text-align: center;
background: #FFFFFF; background: #FFFFFF;
z-index: 0; /* 这个值要保证和 当前容器dom 一致 */ z-index: 0; /* 这个值要保证和 当前容器dom 一致 */
border: none; border: none;
overflow : hidden; overflow: hidden;
} }
.dl-con > dt{ .dl-con > dt {
width: 85px; width: 85px;
height: 88px; height: 88px;
margin: 25px auto; margin: 25px auto;
} }
.dl-con > dd { .dl-con > dd {
font-size: 18px; font-size: 18px;
color: #232323; color: #232323;
margin: 0 auto; margin: 0 auto;
} }
.dl-con > .dl-con-ad1 { .dl-con > .dl-con-ad1 {
background : url("../../assets/image/website/ad1.png") no-repeat center center; background: url("../../assets/image/website/ad1.png") no-repeat center center;
background-size : cover; background-size: cover;
} }
.dl-con > .dl-con-ad2 { .dl-con > .dl-con-ad2 {
background : url("../../assets/image/website/ad2.png") no-repeat center center; background: url("../../assets/image/website/ad2.png") no-repeat center center;
background-size : cover; background-size: cover;
} }
.dl-con > .dl-con-ad3 { .dl-con > .dl-con-ad3 {
background : url("../../assets/image/website/ad3.png") no-repeat center center; background: url("../../assets/image/website/ad3.png") no-repeat center center;
background-size : cover; background-size: cover;
} }
.dl-con > .dl-con-ad4 { .dl-con > .dl-con-ad4 {
background : url("../../assets/image/website/ad4.png") no-repeat center center; background: url("../../assets/image/website/ad4.png") no-repeat center center;
background-size : cover; background-size: cover;
} }
.pre-advantage-details { .pre-advantage-details {
...@@ -551,22 +651,22 @@ ...@@ -551,22 +651,22 @@
top: -110px; top: -110px;
left: -1px; left: -1px;
z-index: 199; z-index: 199;
background :#fff url("../../assets/image/website/adfooter.png") no-repeat bottom center; background: #fff url("../../assets/image/website/adfooter.png") no-repeat bottom center;
box-shadow: 0 6px 18px 1px rgba(57, 124, 255, 0.26); box-shadow: 0 6px 18px 1px rgba(57, 124, 255, 0.26);
overflow : hidden; overflow: hidden;
display: none; display: none;
} }
.ad-details-title { .ad-details-title {
width: 100%; width: 100%;
height: 76px; height: 76px;
line-height : 76px; line-height: 76px;
text-align : center; text-align: center;
color: #fff; color: #fff;
font-weight: 400; font-weight: 400;
font-size: 20px; font-size: 20px;
background: linear-gradient(118deg, #0157FF 0%, #538DFF 100%); background: linear-gradient(118deg, #0157FF 0%, #538DFF 100%);
overflow :hidden; overflow: hidden;
} }
.ad-details { .ad-details {
...@@ -575,10 +675,10 @@ ...@@ -575,10 +675,10 @@
font-size: 16px; font-size: 16px;
font-weight: 400; font-weight: 400;
line-height: 28px; line-height: 28px;
text-align : justify; text-align: justify;
text-align-last : center; text-align-last: center;
-ms-text-align-last : center; -ms-text-align-last: center;
-moz-text-align-last : center; -moz-text-align-last: center;
} }
/* hover 时候的效果 class */ /* hover 时候的效果 class */
...@@ -605,12 +705,12 @@ ...@@ -605,12 +705,12 @@
} }
/* 入驻流程 */ /* 入驻流程 */
.process-steps,.process-mater { .process-steps, .process-mater {
display: flex; display: flex;
flex-direction : row; flex-direction: row;
justify-content : center; justify-content: center;
align-items : center; align-items: center;
} }
.pro-step { .pro-step {
...@@ -619,19 +719,20 @@ ...@@ -619,19 +719,20 @@
background: #fff; background: #fff;
margin: 0 20px; margin: 0 20px;
} }
.pro-ma{
.pro-ma {
width: 590px; width: 590px;
height: 190px; height: 190px;
background : #fff; background: #fff;
margin: 35px 20px 0; margin: 35px 20px 0;
background : #fff url("../../assets/image/website/mate-bg.png") no-repeat 100%; background: #fff url("../../assets/image/website/mate-bg.png") no-repeat 100%;
} }
.pro-ma:hover,.pro-step:hover{ .pro-ma:hover, .pro-step:hover {
box-shadow :0 2px 10px 0 rgba(0,0,0,0.05); box-shadow: 0 2px 10px 0 rgba(0, 0, 0, 0.05);
} }
.step-one,.step-two,.step-three,.step-four { .step-one, .step-two, .step-three, .step-four {
width: 58px; width: 58px;
height: 58px; height: 58px;
text-align: center; text-align: center;
...@@ -639,17 +740,21 @@ ...@@ -639,17 +740,21 @@
} }
.step-one { .step-one {
background : url("../../assets/image/website/step1.png") no-repeat center center; background: url("../../assets/image/website/step1.png") no-repeat center center;
} }
.step-two { .step-two {
background : url("../../assets/image/website/step2.png") no-repeat center center; background: url("../../assets/image/website/step2.png") no-repeat center center;
} }
.step-three { .step-three {
background : url("../../assets/image/website/step3.png") no-repeat center center; background: url("../../assets/image/website/step3.png") no-repeat center center;
} }
.step-four { .step-four {
background : url("../../assets/image/website/step4.png") no-repeat center center; background: url("../../assets/image/website/step4.png") no-repeat center center;
} }
.pro-step > dl > dd { .pro-step > dl > dd {
height: 20px; height: 20px;
font-size: 20px; font-size: 20px;
...@@ -657,6 +762,7 @@ ...@@ -657,6 +762,7 @@
margin: 0 auto; margin: 0 auto;
text-align: center; text-align: center;
} }
.pro-step > span { .pro-step > span {
display: block; display: block;
width: 100px; width: 100px;
...@@ -665,17 +771,17 @@ ...@@ -665,17 +771,17 @@
color: #666; color: #666;
background: #F0F0F5; background: #F0F0F5;
border-radius: 13px; border-radius: 13px;
line-height : 25px; line-height: 25px;
margin: 18px auto; margin: 18px auto;
text-align : center; text-align: center;
} }
.pro-step > p { .pro-step > p {
font-size: 14px; font-size: 14px;
font-weight: 400; font-weight: 400;
color: #666666; color: #666666;
line-height : 28px; line-height: 28px;
text-align : center; text-align: center;
padding: 0 20px; padding: 0 20px;
} }
...@@ -688,29 +794,32 @@ ...@@ -688,29 +794,32 @@
text-indent: 30px; text-indent: 30px;
margin: 35px 0 15px 68px; margin: 35px 0 15px 68px;
} }
.m-bg { .m-bg {
background : url("../../assets/image/website/setIn1.png") no-repeat 0 center; background: url("../../assets/image/website/setIn1.png") no-repeat 0 center;
} }
.n-m-bg { .n-m-bg {
background : url("../../assets/image/website/setIn2.png") no-repeat 0 center; background: url("../../assets/image/website/setIn2.png") no-repeat 0 center;
} }
.optional{ .optional {
display : flex; display: flex;
justify-content : start; justify-content: start;
flex-direction : row; flex-direction: row;
} }
.optional > ul:nth-child(1){
.optional > ul:nth-child(1) {
margin: 0 50px 0 72px; margin: 0 50px 0 72px;
} }
.optional > ul > li { .optional > ul > li {
margin: 15px 0; margin: 15px 0;
text-indent: 20px; text-indent: 20px;
background : url("../../assets/image/website/arrow.png") no-repeat 0 center; background: url("../../assets/image/website/arrow.png") no-repeat 0 center;
} }
.pro-step:hover,.pro-ma:hover { .pro-step:hover, .pro-ma:hover {
//box-shadow: 0 2px 12px 0 #ccc; //box-shadow: 0 2px 12px 0 #ccc;
} }
...@@ -719,6 +828,7 @@ ...@@ -719,6 +828,7 @@
padding: 0 0 90px; padding: 0 0 90px;
background: linear-gradient(0deg, #DEE8F9 46%, #FEFEFF 100%); background: linear-gradient(0deg, #DEE8F9 46%, #FEFEFF 100%);
} }
.brands-title { .brands-title {
text-align: center; text-align: center;
font-size: 38px; font-size: 38px;
...@@ -733,21 +843,22 @@ ...@@ -733,21 +843,22 @@
font-weight: 400; font-weight: 400;
color: #333333; color: #333333;
opacity: 0.82; opacity: 0.82;
padding : 35px 0 20px; padding: 35px 0 20px;
} }
.brand-type { .brand-type {
display: flex; display: flex;
flex-direction : row; flex-direction: row;
justify-content : space-around; justify-content: space-around;
align-items : center; align-items: center;
width: 40%; width: 40%;
margin: 60px auto 12px; margin: 60px auto 12px;
} }
.clothes, .electrical, .food, .maternal { .clothes, .electrical, .food, .maternal {
height: 30px; height: 30px;
line-height : 30px; line-height: 30px;
cursor: pointer; cursor: pointer;
font-size: 20px; font-size: 20px;
font-weight: 400; font-weight: 400;
...@@ -760,80 +871,95 @@ ...@@ -760,80 +871,95 @@
} }
.clothes { .clothes {
background : url("../../assets/image/website/clothes.png") no-repeat 0 center; background: url("../../assets/image/website/clothes.png") no-repeat 0 center;
} }
.electrical { .electrical {
background : url("../../assets/image/website/electrical.png") no-repeat 0 center; background: url("../../assets/image/website/electrical.png") no-repeat 0 center;
} }
.food { .food {
background : url("../../assets/image/website/food.png") no-repeat 0 center; background: url("../../assets/image/website/food.png") no-repeat 0 center;
} }
.maternal { .maternal {
background : url("../../assets/image/website/maternal.png") no-repeat 0 center; background: url("../../assets/image/website/maternal.png") no-repeat 0 center;
} }
.clothes:hover, .electrical:hover, .food:hover, .maternal:hover { .clothes:hover, .electrical:hover, .food:hover, .maternal:hover {
color: #1966FF; color: #1966FF;
} }
/*品牌 logo*/
.brand-carousel { .brand-carousel {
width:70%; width: 100%;
min-width: 600px; min-width: 600px;
max-width: 1920px; max-width: 1520px;
display : flex; display: flex;
justify-content : center; justify-content: center;
flex-direction : row; flex-direction: row;
margin: 0 auto; margin: 20px auto;
} }
.card-show { .card-show {
width: 100%; width: 1520px;
} overflow: hidden;
/deep/ .el-carousel__container {
padding: 20px;
}
/deep/.pre-el-carousel-item > img {
object-fit:cover;
width:100%;
height: 100%;
//border: 1px solid #ccc;
} }
/deep/.is-active { /deep/ .is-active {
border: 1px solid #e9e9e9; border: 1px solid #e9e9e9;
background : #fff; background: #fff;
overflow : hidden; overflow: hidden;
box-shadow: 0 25px 28px 10px rgba(152, 150, 150, 0.1); box-shadow: 0 25px 28px 10px rgba(152, 150, 150, 0.1);
} }
.el-carousel__item:nth-child(2n) { .el-carousel__item:nth-child(2n) {
background-color: #fff; background-color: #fff;
transform : scaleY(1.8); transform: scaleY(1.8);
} }
// //
.el-carousel__item:nth-child(2n+1) { .el-carousel__item:nth-child(2n+1) {
background: #fff; background: #fff;
} }
/* footer 联系我们 */ .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;
overflow : hidden;
}
.pre-img {
width:100%;
height: 100%;
}
/* footer 联系我们 */
.contact { .contact {
height: 243px; height: 243px;
background : url("../../assets/image/website/footer-bg.png") no-repeat center 0; background: url("../../assets/image/website/footer-bg.png") no-repeat center 0;
background-size: 100% 100%; background-size: 100% 100%;
display: flex; display: flex;
flex-direction : column; flex-direction: column;
justify-content : center; justify-content: center;
align-items : center; align-items: center;
} }
.contact > p { .contact > p {
letter-spacing: 2px; letter-spacing: 2px;
text-align : center; text-align: center;
font-size: 26px; font-size: 26px;
font-weight: 400; font-weight: 400;
color: #FFFFFF; color: #FFFFFF;
line-height : 46px; line-height: 46px;
} }
.contact > p > span { .contact > p > span {
...@@ -845,22 +971,22 @@ ...@@ -845,22 +971,22 @@
color: #fff; color: #fff;
background: #242A37; background: #242A37;
display: flex; display: flex;
flex-direction : row; flex-direction: row;
justify-content : center; justify-content: center;
align-items : center; align-items: center;
font-size: 14px; font-size: 14px;
} }
.about-list,.about-us { .about-list, .about-us {
//margin: 52px; //margin: 52px;
} }
.about-list { .about-list {
height: 110px; height: 110px;
display: flex; display: flex;
flex-direction : column; flex-direction: column;
justify-content : center; justify-content: center;
align-items : center; align-items: center;
border-right: 1px solid #50555f; border-right: 1px solid #50555f;
padding-right: 80px; padding-right: 80px;
} }
...@@ -871,20 +997,20 @@ ...@@ -871,20 +997,20 @@
font-weight: 400; font-weight: 400;
color: #FFFFFF; color: #FFFFFF;
display: flex; display: flex;
flex-direction : row; flex-direction: row;
justify-content : space-around; justify-content: space-around;
} }
.about-list > ul > li { .about-list > ul > li {
height: 30px; height: 30px;
padding: 0 40px; padding: 0 40px;
line-height : 30px; line-height: 30px;
border-right: 1px solid #50555f; border-right: 1px solid #50555f;
cursor: pointer; cursor: pointer;
} }
.about-list > ul > li:last-child { .about-list > ul > li:last-child {
border : none; border: none;
} }
.about-gs { .about-gs {
...@@ -910,5 +1036,4 @@ ...@@ -910,5 +1036,4 @@
color: #FFFFFF; color: #FFFFFF;
line-height: 40px; line-height: 40px;
} }
</style> </style>
src/views/system/asset/myAsset/index.vue
浏览文件 @ 1465c103
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<!-- 商品信息 --> <!-- 商品信息 -->
<div class="card-header-custom"> <div class="card-header-custom">
<div class="card-header-title"> <div class="card-header-title">
<span class="blue-block blue-block-goods-title"></span>账号资产 <span class="blue-block blue-block-goods-title"></span>账户资产
</div> </div>
<div class="card-header-handle"> <div class="card-header-handle">
<el-button plain type="primary" size="small" @click="explainWithdrawal">提现说明</el-button> <el-button plain type="primary" size="small" @click="explainWithdrawal">提现说明</el-button>
...@@ -111,7 +111,7 @@ ...@@ -111,7 +111,7 @@
</el-form-item> </el-form-item>
<el-form-item label="对公银行账号：" prop="bank_account_sn"> <el-form-item label="对公银行账号：" prop="bank_account_sn">
<el-input v-model="bankcardForm.bank_account_sn" placeholder="请输入快递单号" style="width: 70%"></el-input> <el-input v-model="bankcardForm.bank_account_sn" placeholder="请输入对公银行账号" style="width: 70%"></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
...@@ -204,15 +204,7 @@ ...@@ -204,15 +204,7 @@
getBankDetailsData({ id: id }).then(res=> { getBankDetailsData({ id: id }).then(res=> {
if(res.code == 1 && res.data) { if(res.code == 1 && res.data) {
this.addBankcardInfoDialog = true; this.addBankcardInfoDialog = true;
if(res.data.bank_name) { this.bankcardForm.bank_name = res.data.bank_name
for(let i = 0; i < this.bankOptions.length; i++) {
if(res.data.bank_name == this.bankOptions[i].name) {
this.bankcardForm.bank_name = this.bankOptions[i].code;
break
}
}
}
this.bankcardForm.bankAccountName = res.data.corporate_account_name; this.bankcardForm.bankAccountName = res.data.corporate_account_name;
this.bankcardForm.bank_branch_name = res.data.bank_branch_name; this.bankcardForm.bank_branch_name = res.data.bank_branch_name;
this.bankcardForm.bank_account_sn = res.data.bank_account_sn; this.bankcardForm.bank_account_sn = res.data.bank_account_sn;
...@@ -232,7 +224,7 @@ ...@@ -232,7 +224,7 @@
type: 'warning' type: 'warning'
}).then(async ()=> { }).then(async ()=> {
let delResult = await delBankcardData({id: indexId}); let delResult = await delBankcardData({id: indexId});
console.log('删除结果',delResult); // console.log('删除结果',delResult);
if (delResult.code == 1) { if (delResult.code == 1) {
this.$message({type:'success',message:'删除成功'}); this.$message({type:'success',message:'删除成功'});
this.getMyAssetList(); this.getMyAssetList();
...@@ -255,7 +247,7 @@ ...@@ -255,7 +247,7 @@
submitBankcard() { submitBankcard() {
let params = { let params = {
bank_name: '', bank_name: this.bankcardForm.bank_name,
bank_branch_name: this.bankcardForm.bank_branch_name, bank_branch_name: this.bankcardForm.bank_branch_name,
bank_account_sn: this.bankcardForm.bank_account_sn bank_account_sn: this.bankcardForm.bank_account_sn
} }
...@@ -308,6 +300,11 @@ ...@@ -308,6 +300,11 @@
/** 初始化 添加 银行卡 数据 */ /** 初始化 添加 银行卡 数据 */
resetAddBankcardForm() { resetAddBankcardForm() {
this.bankcardForm = {
bank_name: '',
bank_branch_name: '',
bank_account_sn: '',
}
this.$refs['bankcardForm'].resetFields(); this.$refs['bankcardForm'].resetFields();
}, },
......
src/views/system/asset/wddetails.vue
浏览文件 @ 1465c103
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
<el-card class="box-card"> <el-card class="box-card">
<p class="card-header-tip"> <p class="card-header-tip">
提现状态：<span class="pay-status">{{ payStatusFormatter(withdrawInfo.pay_status) }}</span> 提现状态：<span class="pay-status">{{ payStatusFormatter(withdrawInfo.pay_status) }}</span>
<!-- 提现状态：<strong>{{ payStatusFormatter(withdrawInfo.pay_status) }}</strong>-->
<span>如果您是电子发票，则不用填写快递公司和单号信息，需上传电子发票图片，同时将电子发票发送至电子邮箱，查看</span> <span>如果您是电子发票，则不用填写快递公司和单号信息，需上传电子发票图片，同时将电子发票发送至电子邮箱，查看</span>
<span class="checked-email-rule" @click="isViewSendRuleDialog = true">【电子邮箱及发票发送格式】</span> <span class="checked-email-rule" @click="isViewSendRuleDialog = true">【电子邮箱及发票发送格式】</span>
</p> </p>
...@@ -81,7 +82,7 @@ ...@@ -81,7 +82,7 @@
<p><span class="span-title spe-1">附件：</span>电子发票</p> <p><span class="span-title spe-1">附件：</span>电子发票</p>
</div> </div>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button type="primary" @click="isViewSendRuleDialog = false" >取 消</el-button> <el-button type="primary" @click="isViewSendRuleDialog = false" size="small">关 闭</el-button>
</span> </span>
</el-dialog> </el-dialog>
...@@ -147,8 +148,19 @@ ...@@ -147,8 +148,19 @@
width="40%" width="40%"
center> center>
<el-form :model="viewInvoiceForm" label-width="150px" class="add-invoice-form" size="small"> <el-form :model="viewInvoiceForm" label-width="150px" class="add-invoice-form" size="small">
<el-form-item label="快递公司：" > <!-- <el-form-item label="快递公司：" >-->
<el-input v-model="viewInvoiceForm.express_name" placeholder="请输入快递单号" disabled style="width: 80%;"></el-input> <!-- <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>
<el-form-item label="快递单号："> <el-form-item label="快递单号：">
...@@ -163,12 +175,12 @@ ...@@ -163,12 +175,12 @@
:preview-src-list="viewInvoiceForm.invoiceImgList"> :preview-src-list="viewInvoiceForm.invoiceImgList">
</el-image> </el-image>
</div> </div>
<div class="textTip">最多上传一张图片，仅限jpg/png格式，大小限制在500kb以内</div> <!-- <div class="textTip">最多上传一张图片，仅限jpg/png格式，大小限制在500kb以内</div>-->
</el-form-item> </el-form-item>
</el-form> </el-form>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button type="primary" @click="isViewInvoiceAgainDialog = false" size="small">确 定</el-button> <el-button type="primary" @click="isViewInvoiceAgainDialog = false" size="small">关 闭</el-button>
</span> </span>
</el-dialog> </el-dialog>
...@@ -274,14 +286,20 @@ ...@@ -274,14 +286,20 @@
/** 导出商品明细 */ /** 导出商品明细 */
exportGoodsDetails() { exportGoodsDetails() {
exportGoodsDetailsData( {id: this.withdrawId} ).then(res=> { exportGoodsDetailsData( {id: this.withdrawId} ).then(res=> {
if (res.code == 1 && res.data) { //debugger
const aLink = document.createElement('a'); if (res.code == 1) {
aLink.href = res.data; if(res.data) {
//aLink.download = '订单.xls'; //下载的文件名 this.$message({type:'success',message:'导出成功'});
aLink.style.display = 'none'; const aLink = document.createElement('a');
document.body.appendChild(aLink); aLink.href = res.data;
aLink.click(); //aLink.download = '订单.xls'; //下载的文件名
document.body.removeChild(aLink); 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 { }else {
this.$message({type:'error',message: res.message ? res.message: '导出失败'}); this.$message({type:'error',message: res.message ? res.message: '导出失败'});
} }
...@@ -307,7 +325,7 @@ ...@@ -307,7 +325,7 @@
}); });
return false; return false;
} }
let isImgSize = (file.size / 1024 / 1024 / 1024) > 500; let isImgSize = (file.size / 1024 ) > 500;
if (isImgSize) { if (isImgSize) {
this.$message({ this.$message({
message: '上传图片大小不能超过500kb', message: '上传图片大小不能超过500kb',
...@@ -395,10 +413,16 @@ ...@@ -395,10 +413,16 @@
this.$refs.addInvoiceForm.validate((valid)=> { this.$refs.addInvoiceForm.validate((valid)=> {
if (valid) { if (valid) {
params.id = this.withdrawId; params.id = this.withdrawId;
params.express_company = this.addInvoiceForm.express_name; //params.express_company = this.addInvoiceForm.express_name;
params.express_no = this.addInvoiceForm.express_sn; params.express_no = this.addInvoiceForm.express_sn;
params.invoice_img = this.invoiceImgBase64List params.invoice_img = this.invoiceImgBase64List
for(let i = 0; i < this.expressLists.length; i++) {
if(this.addInvoiceForm.express_name == this.expressLists[i].value) {
params.express_company = this.expressLists[i].label
}
}
addInvoiceData(params).then(res=> { addInvoiceData(params).then(res=> {
if(res.code == 1) { if(res.code == 1) {
this.$message({type:'success',message: '补充发票信息成功'}); this.$message({type:'success',message: '补充发票信息成功'});
...@@ -503,6 +527,7 @@ ...@@ -503,6 +527,7 @@
color: #333333; color: #333333;
padding: 0 15px; padding: 0 15px;
margin-bottom: 0; margin-bottom: 0;
overflow: hidden;
} }
.pay-status { .pay-status {
margin: 0 10px; margin: 0 10px;
......
src/views/system/asset/withdraw/index.vue
浏览文件 @ 1465c103
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<el-form-item label="提现至：" prop="bank_id"> <el-form-item label="提现至：" prop="bank_id">
<el-select v-model="assetForm.bank_id" placeholder="选择到账银行卡" style="width:420px;"> <el-select v-model="assetForm.bank_id" placeholder="选择到账银行卡" style="width:420px;">
<el-option v-for="item in bankList" :key="item.id" :label="item.bank_name" :value="item.id"></el-option> <el-option v-for="item in bankList" :key="item.id" :label="formatBankName(item.bank_name,item.bank_account_sn)" :value="item.id"></el-option>
</el-select> </el-select>
<span class="withdraw-tip"> <span class="withdraw-tip">
您还没有账户，<span class="spe-span-a" @click="goToAddBank">去添加</span> 您还没有账户，<span class="spe-span-a" @click="goToAddBank">去添加</span>
...@@ -30,7 +30,8 @@ ...@@ -30,7 +30,8 @@
<el-form-item label="提现金额："> <el-form-item label="提现金额：">
<el-input v-model="withdrawalBalance" disabled placeholder="全部提现金额" style="width:420px;"/> <el-input v-model="withdrawalBalance" disabled placeholder="全部提现金额" style="width:420px;"/>
<span class="withdraw-tip"> <span class="withdraw-tip">
提现金额为全部的可提现余额，手续费将从您的提现金额中扣除，以实际到账为准（开票以实际到账金额开具） 不允许手动输入，提现金额为全部的可提现余额，手续费将从您的提现金额中扣除，以实际到账为准（开票以实际到账金额开具）。
提现金额至少为100元才可以操作提现
</span> </span>
<p class="withdraw-tip-spe">当前提现手续费为：{{ chargeCount }} 元</p> <p class="withdraw-tip-spe">当前提现手续费为：{{ chargeCount }} 元</p>
</el-form-item> </el-form-item>
...@@ -55,7 +56,7 @@ ...@@ -55,7 +56,7 @@
<div class="footer-btn"> <div class="footer-btn">
<el-button type="primary" @click="submitForm" :disabled="inSureCashOut" style="margin-right:20px;">确 定</el-button> <el-button type="primary" @click="submitForm" :disabled="inSureCashOut" style="margin-right:20px;">确 定</el-button>
<el-button @click="resetAssetForm">取 消</el-button> <!-- <el-button @click="resetAssetForm">取 消</el-button>-->
</div> </div>
</el-card> </el-card>
</div> </div>
...@@ -182,9 +183,12 @@ ...@@ -182,9 +183,12 @@
// 倒计时效果 // 倒计时效果
this.getCode() this.getCode()
getCheckCodeData({seller_id: this.seller_id}).then(response => { // 获取验证码接口
if (response.code == 0) { getCheckCodeData().then(res => {
this.msgSuccess(response.msg); if (res.code == 1) {
this.$message({type:'success',message: '验证码发送成功'});
}else {
this.$message({type:'error',message: res.message ? res.message : '发送失败'});
} }
}); });
}, },
...@@ -233,6 +237,11 @@ ...@@ -233,6 +237,11 @@
/** 提交按钮 */ /** 提交按钮 */
submitForm() { submitForm() {
if( Number(this.withdrawalBalance) < 100) {
this.$message({type: 'warning',message: '提现金额至少为100才可操作提现'});
return;
}
this.$refs["assetForm"].validate(valid => { this.$refs["assetForm"].validate(valid => {
if (valid) { if (valid) {
applyWithdraw(this.assetForm).then(res => { applyWithdraw(this.assetForm).then(res => {
...@@ -247,6 +256,22 @@ ...@@ -247,6 +256,22 @@
} }
}); });
}, },
/** 提现 银行卡名称 + ***后四位卡号 */
formatBankName(name,num) {
let newBnakName = '';
let newNum = '';
// 为了以防万一，先将num转为字符串
let numStr = num + '';
if(numStr && numStr.length > 4) {
newNum = '****' + numStr.substring(numStr.length-4)
}else {
newNum = numStr
}
newBnakName = name + ' (' + newNum + ')'
return newBnakName
}
} //methods结束 } //methods结束
}; };
</script> </script>
......
src/views/system/freight/freight_list/index.vue
浏览文件 @ 1465c103
...@@ -32,15 +32,15 @@ ...@@ -32,15 +32,15 @@
</el-form> </el-form>
</div> </div>
<el-table v-loading="loading" :data="freightList" :height="tableHeight" @selection-change="handleSelectionChange"> <el-table :data="freightList" :height="tableHeight" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center"/> <el-table-column type="selection" width="55" align="center"/>
<el-table-column label="ID" align="center" prop="Id"/> <el-table-column label="ID" align="center" prop="id"/>
<el-table-column label="模板名称" align="center" prop="Name"/> <el-table-column label="模板名称" align="center" prop="name"/>
<el-table-column label="排序" align="center" prop="Sort"/> <el-table-column label="排序" align="center" prop="sort"/>
<el-table-column label="是否是默认模板" align="center" :formatter="formatDefault" prop="IsDefault"/> <el-table-column label="是否是默认模板" align="center" :formatter="formatDefault" prop="is_default"/>
<!-- <el-table-column label="类型" align="center" :formatter="formatType" prop="ChargeType"/> --> <!-- <el-table-column label="类型" align="center" :formatter="formatType" prop="ChargeType"/> -->
<el-table-column label="启用状态" align="center" :formatter="formaStatus" prop="Publish"/> <el-table-column label="启用状态" align="center" :formatter="formaStatus" prop="publish"/>
<el-table-column label="创建时间" align="center" :formatter="formatTime" prop="Created"/> <el-table-column label="创建时间" align="center" :formatter="formatTime" prop="created"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
...@@ -84,8 +84,6 @@ ...@@ -84,8 +84,6 @@
return { return {
fullHeight: 0, fullHeight: 0,
tableHeight: 0, tableHeight: 0,
// 遮罩层
loading: false,
// 选中数组 // 选中数组
ids: [], ids: [],
// 非单个禁用 // 非单个禁用
...@@ -148,9 +146,9 @@ ...@@ -148,9 +146,9 @@
this.isOpen = val; this.isOpen = val;
this.getList(); this.getList();
}, },
// 模板是否启用状态 /** 启用状态 格式化*/
formaStatus(row) { formaStatus(row) {
let isPublish = row.Publish; let isPublish = row.publish;
let publish = ''; let publish = '';
if(isPublish === 1) { if(isPublish === 1) {
publish = '启用'; publish = '启用';
...@@ -161,7 +159,7 @@ ...@@ -161,7 +159,7 @@
return publish return publish
}, },
formatType(row) { formatType(row) {
var typese = row.ChargeType var typese = row.chargeType
var optDess = '' var optDess = ''
if (typese == 1) { if (typese == 1) {
optDess = "按重量" optDess = "按重量"
...@@ -172,7 +170,7 @@ ...@@ -172,7 +170,7 @@
}, },
//格式化状态 //格式化状态
formatDefault(row) { formatDefault(row) {
var types = row.IsDefault var types = row.is_default
var optDes = '' var optDes = ''
if (types == 1) { if (types == 1) {
optDes = "是" optDes = "是"
...@@ -183,7 +181,7 @@ ...@@ -183,7 +181,7 @@
}, },
//格式化时间 //格式化时间
formatTime(row) { formatTime(row) {
var Time = row.Created var Time = row.created
var newtime = "" var newtime = ""
if (Time > 0) { if (Time > 0) {
newtime = dateFormat(Time * 1000, "Y-m-d H:i:s"); newtime = dateFormat(Time * 1000, "Y-m-d H:i:s");
...@@ -194,7 +192,7 @@ ...@@ -194,7 +192,7 @@
getList() { getList() {
listFreight(this.queryParams).then(res => { listFreight(this.queryParams).then(res => {
if(res.data) { if(res.data) {
debugger //
this.freightList = res.data.list; this.freightList = res.data.list;
this.total = res.data.count; this.total = res.data.count;
} }
...@@ -208,7 +206,7 @@ ...@@ -208,7 +206,7 @@
// 表单重置 // 表单重置
reset() { reset() {
this.form = { this.form = {
id: null, id: 0,
seller_id: null, seller_id: null,
name: null, name: null,
sort: null, sort: null,
...@@ -234,7 +232,7 @@ ...@@ -234,7 +232,7 @@
}, },
// 多选框选中数据 // 多选框选中数据
handleSelectionChange(selection) { handleSelectionChange(selection) {
this.ids = selection.map(item => item.Id) this.ids = selection.map(item => item.id)
this.single = selection.length !== 1 this.single = selection.length !== 1
this.multiple = !selection.length this.multiple = !selection.length
}, },
...@@ -247,12 +245,12 @@ ...@@ -247,12 +245,12 @@
this.reset(); this.reset();
this.isOpen = true; this.isOpen = true;
this.form = { this.form = {
Id: 0, id: 0,
Sort: 0, sort: 0,
Name: "0", name: "",
IsDefault: 0, isDefault: 0,
ChargeType: 0, chargeType: 0,
Dispatching: [ dispatching: [
{ {
a: "全国", a: "全国",
f: 500, f: 500,
...@@ -261,20 +259,18 @@ ...@@ -261,20 +259,18 @@
np: 5, np: 5,
} }
], ],
Disdispatching: "", disDispatching: "",
Publish: 0, publish: 0,
}; };
this.title = "添加运费模板"; this.title = "添加运费模板";
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
this.reset(); this.reset();
const id = row.Id const id = row.id
getFreight(id).then(response => { getFreight(id).then(response => {
let formdate = response.data //let formdate = response.data
debugger //response.data.dispatching = JSON.parse(formdate.dispatching)
response.data.Dispatching = JSON.parse(formdate.Dispatching)
console.log("点击修改获取的数据：",formdate.Dispatching);
this.form = response.data this.form = response.data
this.isOpen = true; this.isOpen = true;
this.title = "修改运费模板"; this.title = "修改运费模板";
...@@ -283,10 +279,10 @@ ...@@ -283,10 +279,10 @@
/** 提交按钮 */ /** 提交按钮 */
submitForm() { submitForm() {
this.$refs["form"].validate(valid => { this.$refs["form"].validate(valid => {
debugger
if (valid) { if (valid) {
if (this.form.id != null) { if (this.form.id != 0) {
updateFreight(this.form).then(response => { updateFreight(this.form).then(response => {
if (response.code === 0) { if (response.code === 0) {
this.msgSuccess("修改成功"); this.msgSuccess("修改成功");
...@@ -311,23 +307,19 @@ ...@@ -311,23 +307,19 @@
* */ * */
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const ids = row.Id || this.ids; const ids = row.id || this.ids;
debugger
this.$confirm('是否确认删除运费模板编号为“' + ids + '"的数据？','警告',{ this.$confirm('是否确认删除运费模板编号为“' + ids + '"的数据？','警告',{
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(async()=> { }).then(async()=> {
this.loading = true;
let delResult = await delFreight(ids); let delResult = await delFreight(ids);
if(delResult.code === 1) { if(delResult.code === 1) {
this.$message({type: 'success',message: delResult.msg}); this.$message({type: 'success',message: '删除成功'});
this.getList(); this.getList();
} else {
this.$message({type: 'error',message: delResult.msg ? delResult.msg : '删除失败'});
} }
if(delResult.code === 0) {
this.$message({type: 'error',message: delResult.msg});
}
this.loading = false;
}).catch(()=> {}); }).catch(()=> {});
}, },
} //methods结束 } //methods结束
......
src/views/system/freight/freight_list/indexbtn.vue
浏览文件 @ 1465c103
...@@ -3,26 +3,26 @@ ...@@ -3,26 +3,26 @@
<el-form class='el_form' ref="form" label-width="100px"> <el-form class='el_form' ref="form" label-width="100px">
<el-form-item label="排序"> <el-form-item label="排序">
<el-input <el-input
v-model="goodsDate.Sort" v-model="goodsDate.sort"
placeholder="" placeholder=""
style="width: 70%" style="width: 70%"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="模板名称"> <el-form-item label="模板名称">
<el-input <el-input
v-model="goodsDate.Name" v-model="goodsDate.name"
placeholder="" placeholder=""
style="width: 70%" style="width: 70%"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="是否默认"> <el-form-item label="是否默认">
<el-radio-group v-model="goodsDate.IsDefault"> <el-radio-group v-model="goodsDate.is_default">
<el-radio :label="1">是</el-radio> <el-radio :label="1">是</el-radio>
<el-radio :label="0">否</el-radio> <el-radio :label="0">否</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="计费方式"> <el-form-item label="计费方式">
<el-radio-group v-model="goodsDate.ChargeType"> <el-radio-group v-model="goodsDate.charge_type">
<el-radio :label="1">按重量</el-radio> <el-radio :label="1">按重量</el-radio>
<el-radio :label="2">按数量</el-radio> <el-radio :label="2">按数量</el-radio>
</el-radio-group> </el-radio-group>
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
<p class="col_pr">管理</p> <p class="col_pr">管理</p>
</div> </div>
<div <div
v-for="(item, index) in goodsDate.Dispatching" v-for="(item, index) in goodsDate.dispatching"
:key="index" :key="index"
class="tablessst" class="tablessst"
> >
...@@ -106,20 +106,19 @@ ...@@ -106,20 +106,19 @@
</el-form-item> </el-form-item>
<el-form-item label="不配送区域"> <el-form-item label="不配送区域">
<el-input <el-input
v-model="goodsDate.Disdispatching" v-model="goodsDate.dis_dispatching"
placeholder="" placeholder=""
style="width: 80%" style="width: 80%"
disabled disabled
> >
<template slot="prepend"> <template slot="prepend">
<span @click="opendias(goodsDate.Disdispatching, 1, 99)" <span @click="opendias(goodsDate.dis_dispatching, 1, 99)"
>选择</span >选择</span>
>
</template> </template>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="状态"> <el-form-item label="状态">
<el-radio-group v-model="goodsDate.Publish"> <el-radio-group v-model="goodsDate.publish">
<el-radio :label="1">启用</el-radio> <el-radio :label="1">启用</el-radio>
<el-radio :label="0">禁用</el-radio> <el-radio :label="0">禁用</el-radio>
</el-radio-group> </el-radio-group>
...@@ -201,16 +200,16 @@ export default { ...@@ -201,16 +200,16 @@ export default {
disabledate: [], //不能选择 disabledate: [], //不能选择
dialogVisible: false, dialogVisible: false,
goodsDate: { goodsDate: {
Id:0, id:0,
Sort: 0, sort: 0,
Name: "0", name: "0",
IsDefault: 0, is_default: 0,
ChargeType: 0, charge_type: 0,
Dispatching: [ dispatching: [
{ a: "全国", f: 500, fp: 10, n: 100, np: 5 } { a: "全国", f: 500, fp: 10, n: 100, np: 5 }
], ],
Disdispatching: "", dis_dispatching: "",
Publish: 0, publish: 0,
}, },
}; };
}, },
...@@ -226,9 +225,9 @@ export default { ...@@ -226,9 +225,9 @@ export default {
if(checkListString.substr(0,1) === ',') { if(checkListString.substr(0,1) === ',') {
checkListString = checkListString.slice(1); checkListString = checkListString.slice(1);
} }
this.goodsDate.Disdispatching = checkListString; this.goodsDate.dis_dispatching = checkListString;
}else{ }else{
this.goodsDate.Dispatching[this.btnindex].a = this.checkList.join() this.goodsDate.dispatching[this.btnindex].a = this.checkList.join()
} }
this.dialogVisible = false this.dialogVisible = false
}, },
...@@ -240,13 +239,13 @@ export default { ...@@ -240,13 +239,13 @@ export default {
}, },
opendias(type, i, index) { opendias(type, i, index) {
this.goodsDate.Dispatching.forEach((element) => { this.goodsDate.dispatching.forEach((element) => {
let arrd = element.a.split(',') let arrd = element.a.split(',')
for(let i=0;i<arrd.length;i++){ for(let i=0;i<arrd.length;i++){
this.disabledate.push(arrd[i]); this.disabledate.push(arrd[i]);
} }
}); });
let arr = this.goodsDate.Disdispatching.split(','); let arr = this.goodsDate.dis_dispatching.split(',');
for(let i=0;i<arr.length;i++){ for(let i=0;i<arr.length;i++){
this.disabledate.push(arr[i]); this.disabledate.push(arr[i]);
} }
...@@ -266,25 +265,30 @@ export default { ...@@ -266,25 +265,30 @@ export default {
this.dialogVisible = true; this.dialogVisible = true;
}, },
handleinfomationclick() {//提交 /** 运费模板 修改/新增 的保存 */
this.goodsDate.Dispatching.forEach(item=>{ handleinfomationclick() {
this.goodsDate.dispatching.forEach(item=>{
item.fp= Number(item.fp*100).toFixed(); item.fp= Number(item.fp*100).toFixed();
item.np = Number(item.np*100).toFixed(); item.np = Number(item.np*100).toFixed();
}) })
this.loading = true
addFreight(this.goodsDate).then(res => { addFreight(this.goodsDate).then(res => {
//console.log(275,res); //console.log(275,res);
if(res.code === 1) { if(res.code === 1) {
this.$emit("closeIndexbtn",false); this.$emit("closeIndexbtn",false);
if(this.goodsDate.Id === 0) { if(this.goodsDate.id === 0) {
this.$message({ message: '新增成功', type: 'success'}); this.$message({ message: '新增成功', type: 'success'});
}else { }else {
this.$message({ message: '修改成功', type: 'success'}); this.$message({ message: '修改成功', type: 'success'});
} }
}else {
this.goodsDate.dispatching.forEach(item=>{
item.fp= Number(item.fp/100).toFixed();
item.np = Number(item.np/100).toFixed();
})
} }
this.loading = false;
}); });
}, },
/** 配送区域 添加参数 操作 */
addguild() { addguild() {
//添加 //添加
let arrchild = { let arrchild = {
...@@ -294,15 +298,11 @@ export default { ...@@ -294,15 +298,11 @@ export default {
n: "", n: "",
np: "", np: "",
}; };
this.$set( this.$set(this.goodsDate.dispatching, this.goodsDate.dispatching.length, arrchild);
this.goodsDate.Dispatching,
this.goodsDate.Dispatching.length,
arrchild
);
}, },
/** 删除 运费模板 */
deletearrinput(index) { deletearrinput(index) {
//删除 this.goodsDate.dispatching.splice(index, 1);
this.goodsDate.Dispatching.splice(index, 1);
}, },
info() { info() {
this.goodsDate = this.option this.goodsDate = this.option
......
src/views/system/goods/add/components/goodsinfomation.vue
浏览文件 @ 1465c103
...@@ -360,7 +360,7 @@ ...@@ -360,7 +360,7 @@
return file; return file;
}, ()=>{ }, ()=>{
this.$message({ this.$message({
message:'商品图片尺寸必须为800 * 800，请重新选择!', message:'商品图片尺寸必须为800 * 800像素，请重新选择!',
type: 'warning' type: 'warning'
}); });
return Promise.reject(); return Promise.reject();
...@@ -379,9 +379,9 @@ ...@@ -379,9 +379,9 @@
if(res.data) { if(res.data) {
urlObj.url = res.data.image_url; urlObj.url = res.data.image_url;
this.goodsImgFileList.push(urlObj); this.goodsImgFileList.push(urlObj);
// this.goodsImgFileList.forEach(item=> { this.goodsImgFileList.forEach(item=> {
// this.goodsInfoForm.imgs.push(item.url) this.goodsInfoForm.imgs.push(item.url)
// }) })
this.$message({type:'success',message:'图片上传成功'}); this.$message({type:'success',message:'图片上传成功'});
// 只清除一次，不浪费哦 // 只清除一次，不浪费哦
if(this.goodsImgFileList.length === 1) { if(this.goodsImgFileList.length === 1) {
......
src/views/system/goods/add/components/goodsparameter.vue
浏览文件 @ 1465c103
...@@ -318,9 +318,11 @@ export default { ...@@ -318,9 +318,11 @@ export default {
}); });
}, },
// 如果保存失败，将乘以100的价格还原 /**如果保存失败，将乘以100的价格还原
* 当多规格数据时候，才调用
* */
priceReduce() { priceReduce() {
debugger // debugger
if(this.parameterdata.pamTableList && this.parameterdata.pamTableList.length > 0) { if(this.parameterdata.pamTableList && this.parameterdata.pamTableList.length > 0) {
this.parameterdata.pamTableList.forEach((item)=> { this.parameterdata.pamTableList.forEach((item)=> {
if(item[0].js_price) { if(item[0].js_price) {
...@@ -336,20 +338,21 @@ export default { ...@@ -336,20 +338,21 @@ export default {
item[0].sl_price = item[0].sl_price / 100; item[0].sl_price = item[0].sl_price / 100;
} }
}) })
}else {
if(this.singleSpecTable[0].js_price) {
this.singleSpecTable[0].js_price = this.singleSpecTable[0].js_price / 100
}
if(this.singleSpecTable[0].price) {
this.singleSpecTable[0].price = this.singleSpecTable[0].price / 100
}
if(this.singleSpecTable[0].sc_price) {
this.singleSpecTable[0].sc_price = this.singleSpecTable[0].sc_price / 100
}
if(this.singleSpecTable[0].sl_price) {
this.singleSpecTable[0].sl_price = this.singleSpecTable[0].sl_price / 100
}
} }
// else {
// if(this.singleSpecTable[0].js_price) {
// this.singleSpecTable[0].js_price = this.singleSpecTable[0].js_price / 100
// }
// if(this.singleSpecTable[0].price) {
// this.singleSpecTable[0].price = this.singleSpecTable[0].price / 100
// }
// if(this.singleSpecTable[0].sc_price) {
// this.singleSpecTable[0].sc_price = this.singleSpecTable[0].sc_price / 100
// }
// if(this.singleSpecTable[0].sl_price) {
// this.singleSpecTable[0].sl_price = this.singleSpecTable[0].sl_price / 100
// }
// }
}, },
// 删除 单个规格的图片 // 删除 单个规格的图片
......
src/views/system/goods/add/index.vue
浏览文件 @ 1465c103
...@@ -577,7 +577,7 @@ ...@@ -577,7 +577,7 @@
delete this.goodsAllData.specs_group; delete this.goodsAllData.specs_group;
} }
// 商品id 不为 0 是修改 // 修改 商品id不为 0
if( this.goodsAllData.goods_id ) { if( this.goodsAllData.goods_id ) {
// 商品id 为 0 是新增 // 商品id 为 0 是新增
let goodsStatus = 1; let goodsStatus = 1;
...@@ -587,6 +587,7 @@ ...@@ -587,6 +587,7 @@
goodsStatus = 3; goodsStatus = 3;
} }
updateGoodsNew(this.goodsAllData).then(res=> { updateGoodsNew(this.goodsAllData).then(res=> {
//debugger
if( res.code === 1 ) { if( res.code === 1 ) {
this.$message({type: 'success', message:'编辑成功'}); this.$message({type: 'success', message:'编辑成功'});
this.initAllGoodsInfo(); this.initAllGoodsInfo();
...@@ -594,15 +595,16 @@ ...@@ -594,15 +595,16 @@
path: '/system/goods/management', path: '/system/goods/management',
query: { goodsStatus: goodsStatus } query: { goodsStatus: goodsStatus }
}); });
} } else {
if(res.code === 0) { // 如果保存失败，将价格还原,仅处理 多规格数据
this.$refs.goodsparameter.priceReduce() this.$refs.goodsparameter.priceReduce()
let msg = res.message ? res.message : '编辑失败' let msg = res.message ? res.message : '编辑失败'
this.$message({type: 'error', message: msg}); this.$message({type: 'error', message: msg});
} }
}); });
}else { }else {
// 商品id 为 0 是新增 //debugger
// 新增 商品id 为 0
let goodsStatus = 1; let goodsStatus = 1;
if ( this.goodsAllData.submit === 0 ) { if ( this.goodsAllData.submit === 0 ) {
goodsStatus = 2; goodsStatus = 2;
...@@ -617,9 +619,8 @@ ...@@ -617,9 +619,8 @@
path: '/system/goods/management', path: '/system/goods/management',
query: { goodsStatus: goodsStatus } query: { goodsStatus: goodsStatus }
}); });
} }else {
if(res.code === 0) { // 如果保存失败，将价格还原,仅处理 多规格数据
// 如果保存失败，将价格还原
this.$refs.goodsparameter.priceReduce() this.$refs.goodsparameter.priceReduce()
let msg = res.message ? res.message : '新增失败' let msg = res.message ? res.message : '新增失败'
this.$message({type: 'error', message: msg}); this.$message({type: 'error', message: msg});
......
src/views/system/order/components/orderDetail.vue
浏览文件 @ 1465c103
...@@ -178,8 +178,11 @@ ...@@ -178,8 +178,11 @@
<el-input size="mini" v-model="addressForm.tel" placeholder="请输入联系电话"></el-input> <el-input size="mini" v-model="addressForm.tel" placeholder="请输入联系电话"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="收货地址："> <el-form-item label="收货地址：">
<el-cascader v-model="addressForm.areaList" :props='props' ref="ssqCascader" placeholder="请选择具体的省市区" style="width:100%"></el-cascader> <el-cascader v-model="addressForm.areaList" :props='props' @change="handleChanges" ref="ssqCascader" placeholder="请选择具体的省市区" style="width:100%"></el-cascader>
</el-form-item> </el-form-item>
<!-- <el-form-item label="省市区：" prop="address_ids">-->
<!-- <el-cascader v-model="areaList" :props='props' @change="handleChanges" placeholder="请选择具体的省市区" style="width:100%"></el-cascader>-->
<!-- </el-form-item>-->
<el-form-item label="街道："> <el-form-item label="街道：">
<el-input size="mini" v-model="addressForm.street" placeholder="请输入街道"></el-input> <el-input size="mini" v-model="addressForm.street" placeholder="请输入街道"></el-input>
</el-form-item> </el-form-item>
...@@ -590,13 +593,15 @@ export default { ...@@ -590,13 +593,15 @@ export default {
if(this.orderDetail.mobile) { if(this.orderDetail.mobile) {
this.addressForm.tel = this.orderDetail.mobile; this.addressForm.tel = this.orderDetail.mobile;
} }
// if(this.orderDetail.provice && this.orderDetail.city && this.orderDetail.district) {
// this.addressForm.areaList.push(this.orderDetail.provice) //this.orderDetail.provice + this.orderDetail.city + this.orderDetail.district if(this.orderDetail.provice && this.orderDetail.city && this.orderDetail.district) {
// this.addressForm.areaList.push(this.orderDetail.this.city) //this.orderDetail.provice + this.orderDetail.city + this.orderDetail.district this.addressForm.areaList[0] = Number(this.orderDetail.provice)
// this.addressForm.areaList.push(this.orderDetail.district) //this.orderDetail.provice + this.orderDetail.city + this.orderDetail.district this.addressForm.areaList[1] = Number(this.orderDetail.city)
// }else { this.addressForm.areaList[2] = Number(this.orderDetail.district)
// this.addressForm.areaList = [] //console.log(66,this.addressForm.areaList);
// } }else {
this.addressForm.areaList = []
}
if(this.orderDetail.street) { if(this.orderDetail.street) {
this.addressForm.street = this.orderDetail.street; this.addressForm.street = this.orderDetail.street;
...@@ -605,8 +610,6 @@ export default { ...@@ -605,8 +610,6 @@ export default {
this.addressForm.address = this.orderDetail.address; this.addressForm.address = this.orderDetail.address;
} }
this.modifyinfoDialog = true this.modifyinfoDialog = true
}, },
/** 保存 买家信息 */ /** 保存 买家信息 */
...@@ -788,6 +791,10 @@ export default { ...@@ -788,6 +791,10 @@ export default {
resolve(result) resolve(result)
}) })
}, },
handleChanges(value) {
this.addressForm.areaList = value;
console.log(797,value);
},
} }
} }
</script> </script>
......
src/views/system/order/index.vue
浏览文件 @ 1465c103
...@@ -595,7 +595,6 @@ ...@@ -595,7 +595,6 @@
this.$refs.upload.clearFiles(); this.$refs.upload.clearFiles();
this.isDeliveryOpen = false; this.isDeliveryOpen = false;
this.excelList = []; this.excelList = [];
//console.log(88,this.excelList); //console.log(88,this.excelList);
}, },
// 提交导入数据 // 提交导入数据
...@@ -609,6 +608,7 @@ ...@@ -609,6 +608,7 @@
deliveryOrderExport(this.excelList).then(res => { deliveryOrderExport(this.excelList).then(res => {
if (res.code === 1) { if (res.code === 1) {
this.isDeliveryOpen = false; this.isDeliveryOpen = false;
this.excelList = [];
this.$message({type: 'success', message: '批量发货成功'}); this.$message({type: 'success', message: '批量发货成功'});
this.getListOrder(); this.getListOrder();
} else { } else {
......
src/views/system/retreat/edit.vue
浏览文件 @ 1465c103
...@@ -149,8 +149,8 @@ ...@@ -149,8 +149,8 @@
<el-button class="as-btn" type="primary" @click="refuseHandle(4)" :disabled="isFinishedButtonDisabled">拒绝退货退款</el-button> <el-button class="as-btn" type="primary" @click="refuseHandle(4)" :disabled="isFinishedButtonDisabled">拒绝退货退款</el-button>
</div> </div>
<div class="as-handle-btn" v-if="onlyOrRefundBtnType == 3"> <div class="as-handle-btn" v-if="onlyOrRefundBtnType == 3">
<el-button class="as-btn" type="primary" @click="refuseHandle(4)" :disabled="isFinishedButtonDisabled">拒收包裹</el-button> <el-button class="as-btn" type="primary" @click="refuseHandle(4)" :disabled="isFinishedButtonDisabled || returnRefundDisabled">拒收包裹</el-button>
<el-button class="as-btn" type="primary" @click="agreeHandle(1)" :disabled="isFinishedButtonDisabled">确定退款</el-button> <el-button class="as-btn" type="primary" @click="agreeHandle(1)" :disabled="isFinishedButtonDisabled || returnRefundDisabled" >确定退款</el-button>
</div> </div>
</el-card> </el-card>
...@@ -265,7 +265,8 @@ ...@@ -265,7 +265,8 @@
sellerId: 0, sellerId: 0,
asAddressOptions: [], asAddressOptions: [],
order_refund_address:'', order_refund_address:'',
isFinishedButtonDisabled: false isFinishedButtonDisabled: false,
returnRefundDisabled: false, // 仅 退货退款 订单，需要此参数，控制，拒收包裹-同意退款按钮是否可以点击
} // return end } // return end
}, },
watch: { watch: {
...@@ -479,6 +480,7 @@ ...@@ -479,6 +480,7 @@
this.onlyOrRefundBtnType = 1 this.onlyOrRefundBtnType = 1
}else if(row.refund_type == 2) { }else if(row.refund_type == 2) {
this.onlyOrRefundBtnType = (row.status == 1) ? 2 : 3 this.onlyOrRefundBtnType = (row.status == 1) ? 2 : 3
this.returnRefundDisabled = (row.status == 2) ? true : false // 仅 退货退款 订单，当买家未回填物流单号时，不允许点击 “拒收包裹” 按钮
}else { }else {
this.onlyOrRefundBtnType = 0; this.onlyOrRefundBtnType = 0;
} }
...@@ -676,13 +678,21 @@ ...@@ -676,13 +678,21 @@
reasonFormatter(type) { reasonFormatter(type) {
let reasonText = '' let reasonText = ''
if ( type == 1 ) { if ( type == 1 ) {
reasonText = '其他' reasonText = '协商一致退款'
} else if( type == 2 ) { } else if( type == 2 ) {
reasonText = '漏发' reasonText = '质量问题'
}else if( type == 3 ) { }else if( type == 3 ) {
reasonText = '协商一致' reasonText = '物流问题'
}else if( type == 4 ) { }else if( type == 4 ) {
reasonText = '质量不符' reasonText = '假冒品牌'
}else if( type == 5 ) {
reasonText = '少件/漏发/破损/污渍'
}else if( type == 6 ) {
reasonText = '7天无理由'
}else if( type == 7 ) {
reasonText = '拍错/多拍/不想要'
}else if( type == 8 ) {
reasonText = '其他'
} }
return reasonText return reasonText
}, },
......
src/views/system/retreat/retreat/index.vue
浏览文件 @ 1465c103
...@@ -79,10 +79,14 @@ ...@@ -79,10 +79,14 @@
</el-table-column> </el-table-column>
<el-table-column label="退换货原因" align="center" prop="reason"> <el-table-column label="退换货原因" align="center" prop="reason">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.reason==1">其他</span> <span v-if="scope.row.reason==1">协商一致退款</span>
<span v-if="scope.row.reason==2">漏发</span> <span v-if="scope.row.reason==2">质量问题</span>
<span v-if="scope.row.reason==3">协商一致</span> <span v-if="scope.row.reason==3">物流问题</span>
<span v-if="scope.row.reason==4">质量不符</span> <span v-if="scope.row.reason==4">假冒品牌</span>
<span v-if="scope.row.reason==5">少件/漏发/破损/污渍</span>
<span v-if="scope.row.reason==6">7天无理由</span>
<span v-if="scope.row.reason==7">拍错/多拍/不想要</span>
<span v-if="scope.row.reason==8">其他</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="申请时间" align="center" prop="created_time"> <el-table-column label="申请时间" align="center" prop="created_time">
...@@ -172,10 +176,14 @@ ...@@ -172,10 +176,14 @@
// 退换货原因 // 退换货原因
needMsgOptions: [ needMsgOptions: [
{value: -1,label: '全部原因'}, {value: -1,label: '全部原因'},
{value: 3,label: '协商一致退款'}, {value: 1,label: '协商一致退款'},
{value: 1,label: '其他'}, {value: 2,label: '质量问题'},
{value: 2,label: '漏发'}, {value: 3,label: '物流问题'},
{value: 4,label: '质量不符'}, {value: 4,label: '假冒品牌'},
{value: 5,label: '少件/漏发/破损/污渍'},
{value: 6,label: '7天无理由'},
{value: 7,label: '拍错/多拍/不想要'},
{value: 8,label: '其他'},
], ],
fullHeight: 0, fullHeight: 0,
afterSaleHeight: 200, afterSaleHeight: 200,
...@@ -195,12 +203,13 @@ ...@@ -195,12 +203,13 @@
} }
}, },
created() { created() {
this.searchList();
this.$nextTick(() => { this.$nextTick(() => {
this.fullHeight = document.getElementsByClassName('box-card')[0].clientHeight this.fullHeight = document.getElementsByClassName('box-card')[0].clientHeight
}) })
}, },
mounted() {}, mounted() {
this.searchList();
},
methods: { methods: {
/** 顶部 状态页签切换 /** 顶部 状态页签切换
* 1-未处理；2-处理中；3-已完成 * 1-未处理；2-处理中；3-已完成
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论