Skip to content

E
etao-sjht-sd
提交 0bebd385 编写于 作者: zhangzhiwei's avatar zhangzhiwei
浏览文件
操作

新市代

上级 749e5fda
展开全部 隐藏空白字符变更
内嵌 并排
正在显示 包含 5766 行增加 和 2482 行删除
dist/index.html 已删除 100644 → 0
浏览文件 @ 749e5fda
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport><link rel=icon type=image/x-icon href=./static/favicon.ico><link rel=stylesheet href=//at.alicdn.com/t/font_1586872_yhll0m2jcs.css><title>E淘供货商</title><link href=/static/css/app.29a902e336f3f59783dbb76e553f738a.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.6e7874cbf02c6e8d7cd9.js></script><script type=text/javascript src=/static/js/vendor.02a8d01969b52bb78b9a.js></script><script type=text/javascript src=/static/js/app.4fa13b62c094d39066dd.js></script></body></html>
\ No newline at end of file
dist/static/js/0.1708e1f4e7b561ec8140.js 已删除 100644 → 0
浏览文件 @ 749e5fda
此差异已折叠。
dist/static/js/3.ca2708494961454b4374.js 已删除 100644 → 0
浏览文件 @ 749e5fda
因为 它太大了无法显示 源差异 。您可以改为 查看blob。
dist/static/js/4.c569c81ffe41d4800bf8.js 已删除 100644 → 0
浏览文件 @ 749e5fda
webpackJsonp([4],{OHjh:function(n,c){}});
\ No newline at end of file
dist/static/js/5.cb7f3344fd930f577a5c.js 已删除 100644 → 0
浏览文件 @ 749e5fda
此差异已折叠。
dist/static/js/app.4fa13b62c094d39066dd.js 已删除 100644 → 0
浏览文件 @ 749e5fda
此差异已折叠。
dist/static/js/manifest.6e7874cbf02c6e8d7cd9.js 已删除 100644 → 0
浏览文件 @ 749e5fda
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,c,a){for(var i,u,f,s=0,l=[];s<r.length;s++)u=r[s],t[u]&&l.push(t[u][0]),t[u]=0;for(i in c)Object.prototype.hasOwnProperty.call(c,i)&&(e[i]=c[i]);for(n&&n(r,c,a);l.length;)l.shift()();if(a)for(s=0;s<a.length;s++)f=o(o.s=a[s]);return f};var r={},t={6:0};function o(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,o){n=t[e]=[r,o]});n[2]=r;var c=document.getElementsByTagName("head")[0],a=document.createElement("script");a.type="text/javascript",a.charset="utf-8",a.async=!0,a.timeout=12e4,o.nc&&a.setAttribute("nonce",o.nc),a.src=o.p+"static/js/"+e+"."+{0:"1708e1f4e7b561ec8140",3:"ca2708494961454b4374",4:"c569c81ffe41d4800bf8",5:"cb7f3344fd930f577a5c"}[e]+".js";var i=setTimeout(u,12e4);function u(){a.onerror=a.onload=null,clearTimeout(i);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return a.onerror=a.onload=u,c.appendChild(a),r},o.m=e,o.c=r,o.d=function(e,n,r){o.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="/",o.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
dist/static/js/vendor.02a8d01969b52bb78b9a.js 已删除 100644 → 0
浏览文件 @ 749e5fda
此差异已折叠。
index.html
浏览文件 @ 0bebd385
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<link rel="icon" type="image/x-icon" href="./static/favicon.ico"> <link rel="icon" type="image/x-icon" href="./static/favicon.ico">
<!-- iconfont 字符 --> <!-- iconfont 字符 -->
<link rel="stylesheet" href="//at.alicdn.com/t/font_1586872_yhll0m2jcs.css"> <link rel="stylesheet" href="//at.alicdn.com/t/font_1586872_yhll0m2jcs.css">
<title>E淘供货商</title> <title>EDS供货商</title>
</head> </head>
<body> <body>
<div id="app"></div> <div id="app"></div>
......
package-lock.json
浏览文件 @ 0bebd385
此差异已折叠。
src/App.vue
浏览文件 @ 0bebd385
...@@ -24,7 +24,7 @@ export default { ...@@ -24,7 +24,7 @@ export default {
if(_getStorage('info')){ if(_getStorage('info')){
let {brandId} = _getStorage('info') let {brandId} = _getStorage('info')
this.brandId = brandId this.brandId = brandId
this.init() // this.init()
} }
} }
}, },
...@@ -33,7 +33,6 @@ export default { ...@@ -33,7 +33,6 @@ export default {
}, },
methods: { methods: {
init(){ init(){
console.log(1)
this.$axios.get('/account/renovateBrand?brandId='+this.brandId).then(res=>{ this.$axios.get('/account/renovateBrand?brandId='+this.brandId).then(res=>{
let {code,data} =res.data; let {code,data} =res.data;
if(code ==200){ if(code ==200){
......
src/assets/img/lianhe.png 0 → 100644
浏览文件 @ 0bebd385
此差异已折叠。
src/assets/img/logo.png
查看替换文件 @ 749e5fda 浏览文件 @ 0bebd385
src/assets/img/logo.png

4.7 KB | W: | H:

src/assets/img/logo.png

5.3 KB | W: | H:

src/assets/img/logo.png
src/assets/img/logo.png
src/assets/img/logo.png
src/assets/img/logo.png
  • 2-up
  • Swipe
  • Onion skin
src/assets/styles/_var.scss
浏览文件 @ 0bebd385
...@@ -37,7 +37,7 @@ $generalColor : ( ...@@ -37,7 +37,7 @@ $generalColor : (
table_header : #F8F8F8, table_header : #F8F8F8,
white: #fff, white: #fff,
black: #000, black: #000,
f60:#f60 f60:#147ef9
); );
@mixin textOver($line:1){ @mixin textOver($line:1){
display: -webkit-box; display: -webkit-box;
......
src/assets/styles/order.scss
浏览文件 @ 0bebd385
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
background:#fff; background:#fff;
} }
/deep/.el-table--enable-row-hover .el-table__body tr:hover>td{background: #fff !important;} /deep/.el-table--enable-row-hover .el-table__body tr:hover>td{background: #fff !important;}
/deep/.el-table--enable-row-hover .el-table__body tr>td:nth-child(1):hover{background: #fff;color: #f60;cursor: pointer;} /deep/.el-table--enable-row-hover .el-table__body tr>td:nth-child(1):hover{background: #fff;color: #147ef9;cursor: pointer;}
/deep/.el-table .el-table__header-wrapper{overflow-x: auto;} /deep/.el-table .el-table__header-wrapper{overflow-x: auto;}
/deep/.el-loading-parent--relative .el-loading-mask .el-loading-spinner{ /deep/.el-loading-parent--relative .el-loading-mask .el-loading-spinner{
top:2% !important; top:2% !important;
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
} }
.container{padding-bottom: 0;} .container{padding-bottom: 0;}
.redColor{ .redColor{
color: #f60; color: #147ef9;
cursor: pointer; cursor: pointer;
} }
.blueColor{ .blueColor{
...@@ -110,7 +110,7 @@ ...@@ -110,7 +110,7 @@
} }
//订单详情--步骤sss //订单详情--步骤sss
.countdown{ .countdown{
color: #ff6601; color: #147ef9;
} }
.countdownend{color: #000;} .countdownend{color: #000;}
.stepsBox{ .stepsBox{
...@@ -125,7 +125,7 @@ ...@@ -125,7 +125,7 @@
} }
.textP{ .textP{
margin-top: 16px; margin-top: 16px;
>span{display: block;padding: 4px 0;font-size: 14px;color: #ff6601;} >span{display: block;padding: 4px 0;font-size: 14px;color: #147ef9;}
p{ p{
padding: 5px 0; padding: 5px 0;
} }
...@@ -212,7 +212,7 @@ ...@@ -212,7 +212,7 @@
font-size: 14px; font-size: 14px;
margin-bottom: 15px; margin-bottom: 15px;
span { span {
color: #ff6601; color: #147ef9;
} }
} }
.bottom_info { .bottom_info {
......
src/assets/theme/element-variables.scss
浏览文件 @ 0bebd385
/* 改变主题色变量 */ /* 改变主题色变量 */
$--color-primary: #FF6600; $--color-primary: #147ef9;
/* 改变 icon 字体路径变量，必需 */ /* 改变 icon 字体路径变量，必需 */
$--font-path: '~element-ui/lib/theme-chalk/fonts'; $--font-path: '~element-ui/lib/theme-chalk/fonts';
......
src/assets/theme/index.css
浏览文件 @ 0bebd385
此差异已折叠。
src/components/Aside.vue
浏览文件 @ 0bebd385
...@@ -99,7 +99,7 @@ export default { ...@@ -99,7 +99,7 @@ export default {
{ {
icon: require("@/assets/img/icons/dailishang.png"), icon: require("@/assets/img/icons/dailishang.png"),
index: "/order/orderlist", index: "/order/orderlist",
title: "E淘市级代理", title: "EDS市级代理",
showBadge: true, showBadge: true,
subs: [ subs: [
{ {
...@@ -173,7 +173,7 @@ export default { ...@@ -173,7 +173,7 @@ export default {
// { // {
// icon: require("@/assets/img/icons/dianpu.png"), // icon: require("@/assets/img/icons/dianpu.png"),
// index: "/order/orderlistbrand", // index: "/order/orderlistbrand",
// title: "E淘品牌共享中心", // title: "EDS品牌共享中心",
// subs: [ // subs: [
// { // {
// icon: "iconfont iconshangpinguanli", // icon: "iconfont iconshangpinguanli",
...@@ -292,6 +292,48 @@ export default { ...@@ -292,6 +292,48 @@ export default {
// }, // },
// ], // ],
items_3: [ items_3: [
// {
// icon: require("@/assets/img/icons/ziyuanwei.png"),
// index: "/ad/advertisementList",
// title: "推广资源位",
// subs: [
// {
// icon: "iconfont iconxiaoshou-",
// index: "/ad/advertisementList",
// title: "热销广告位",
// },
// {
// icon: "iconfont iconxiaoshou-",
// index: "/ad/advertisementList/16",
// title: "E淘宝广告位",
// },
// {
// icon: "iconfont iconxiaoshou-",
// index: "/ad/advertisementList/2",
// title: "APP广告位",
// },
// {
// icon: "iconfont iconxiaoshou-",
// index: "/ad/advertisementList/3",
// title: "电脑版广告位",
// },
// // {
// // icon: "iconfont iconxiaoshou-",
// // index: "/ad/advertisementList/4",
// // title: "活动直播广告位",
// // },
// {
// icon: "iconfont iconxiaoshou-",
// index: "/ad/advertisementList/14",
// title: "消费者小程序广告位",
// },
// {
// icon: "iconfont iconxiaoshou-",
// index: "/ad/myAdvertisement",
// title: "我的广告位",
// },
// ],
// },
{ {
icon: require("@/assets/img/icons/dianpuguanli.png"), icon: require("@/assets/img/icons/dianpuguanli.png"),
index: "/marketing/shoprenovation", index: "/marketing/shoprenovation",
...@@ -319,11 +361,11 @@ export default { ...@@ -319,11 +361,11 @@ export default {
// // index: "/marketing/coupon", // // index: "/marketing/coupon",
// // title: "优惠券", // // title: "优惠券",
// // }, // // },
// { // // {
// icon: "iconfont iconxiaoshou-", // // icon: "iconfont iconxiaoshou-",
// index: "/marketing/pay", // // index: "/marketing/pay",
// title: "EDS扫码付", // // title: "EDS扫码付",
// }, // // },
// ], // ],
// }, // },
// { // {
...@@ -385,6 +427,7 @@ export default { ...@@ -385,6 +427,7 @@ export default {
// title: "运营数据", // title: "运营数据",
// }, // },
{ {
icon: require("@/assets/img/icons/actIcon.png"),
index: "/marketing/activity", index: "/marketing/activity",
title: "活动管理", title: "活动管理",
subs: [ subs: [
...@@ -437,11 +480,16 @@ export default { ...@@ -437,11 +480,16 @@ export default {
index: "/checking/order", index: "/checking/order",
title: "订单流水", title: "订单流水",
}, },
// { {
// icon: "iconfont iconxiaoshou-", icon: "iconfont iconxiaoshou-",
// index: "/checking/record", index: "/checking/record",
// title: "提现记录", title: "提现记录",
// }, },
{
icon: "iconfont iconxiaoshou-",
index: "/checking/showzhifubao",
title: "我的支付宝",
},
], ],
}, },
...@@ -468,11 +516,11 @@ export default { ...@@ -468,11 +516,11 @@ export default {
// index: "/help/exvip", // index: "/help/exvip",
// title: "E淘工厂权益升级" // title: "E淘工厂权益升级"
// }, // },
{ // {
icon: "iconfont iconxiaoshou-", // icon: "iconfont iconxiaoshou-",
index: "/help/exshort", // index: "/help/exshort",
title: "桌面快捷方式说明", // title: "桌面快捷方式说明",
}, // },
// { // {
// icon: "iconfont iconxiaoshou-", // icon: "iconfont iconxiaoshou-",
// index: "/help/exproducts", // index: "/help/exproducts",
...@@ -575,19 +623,19 @@ export default { ...@@ -575,19 +623,19 @@ export default {
// } // }
// E淘家居权限 // E淘家居权限
if (isHome == 1) { if (isHome == 1) {
// this.itemsData.items_1.push({ this.itemsData.items_1.push({
// icon: require("@/assets/img/icons/self.png"), icon: require("@/assets/img/icons/self.png"),
// index: "/order/orderlistself", index: "/order/orderlistself",
// title: "自营订单管理", title: "自营订单管理",
// subs: [ subs: [
// { {
// icon: "iconfont iconshangpinguanli", icon: "iconfont iconshangpinguanli",
// index: "/order/orderlistself", index: "/order/orderlistself",
// title: "快捷订单", title: "快捷订单",
// }, },
//
// ], ],
// }) })
} }
else{ else{
if(this.$route.path=='/order/orderlistself'){ if(this.$route.path=='/order/orderlistself'){
...@@ -703,6 +751,6 @@ export default { ...@@ -703,6 +751,6 @@ export default {
} }
/deep/.sidebar .el-menu-item.is-active { /deep/.sidebar .el-menu-item.is-active {
color: #fff; color: #fff;
background: #f60; background: #147ef9;
} }
</style> </style>
src/components/Footer.vue
浏览文件 @ 0bebd385
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
<div> <div>
<div :class="{'footer_bg':true,'footer_bg_login':this.login}"> <div :class="{'footer_bg':true,'footer_bg_login':this.login}">
<div class="copy_box" v-if="!login"> <div class="copy_box" v-if="!login">
<a href="https://img.edsmall.com/ROOT/ETao/resource/policy.html" class="a1" target="_blank">隐私政策</a><span>|</span> <a href="https://img.edsshop.cn/ROOT/ETao/resource/policy.html" class="a1" target="_blank">隐私政策</a><span>|</span>
<a href="https://img.edsmall.com/ROOT/ETao/resource/service.html" class="a1" target="_blank">服务协议</a><span>|</span> <a href="https://img.edsshop.cn/ROOT/ETao/resource/service.html" class="a1" target="_blank">服务协议</a><span>|</span>
<a href="https://img.edsmall.com/ROOT/ETao/resource/deal.html" target="_blank">交易指引</a> <a href="https://img.edsshop.cn/ROOT/ETao/resource/deal.html" target="_blank">交易指引</a>
</div> </div>
<div class="copyText">免费热线4006-621-721 粤ICP备14009360号</div> <div class="copyText">加盟热线 0760-22381586 粤ICP备2025445664号</div>
</div> </div>
</div> </div>
</template> </template>
...@@ -40,7 +40,7 @@ export default { ...@@ -40,7 +40,7 @@ export default {
font-size: 12px; font-size: 12px;
} }
.copy_box a:hover{ .copy_box a:hover{
color: #f60; color: #147ef9;
} }
.copy_box{ .copy_box{
font-size: 0; font-size: 0;
......
src/components/FooterOthers.vue
浏览文件 @ 0bebd385
...@@ -5,10 +5,10 @@ ...@@ -5,10 +5,10 @@
<div class="inner"> <div class="inner">
<div class="d0 d1"> <div class="d0 d1">
<img class="erwei" src="@/assets/img/demo_codeimg.jpg" alt=""> <img class="erwei" src="@/assets/img/demo_codeimg.jpg" alt="">
<p>E淘家居公众号</p> <p>EDS家居公众号</p>
</div> </div>
<div class="d0 d2"> <div class="d0 d2">
<p class="p1">全球服务热线</p> <p class="p1">全球服务热线</p>
<p> <img class="phone" src="@/assets/img/phone.png" alt=""><span class="tel">4006-621-721</span></p> <p> <img class="phone" src="@/assets/img/phone.png" alt=""><span class="tel">4006-621-721</span></p>
</div> </div>
...@@ -46,7 +46,7 @@ export default { ...@@ -46,7 +46,7 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.footer_bg { .footer_bg {
width: 100%; width: 100%;
background-color: #626262; background-color: #626262;
...@@ -61,7 +61,7 @@ export default { ...@@ -61,7 +61,7 @@ export default {
align-items: center; align-items: center;
.d0{ .d0{
width: 33%; width: 33%;
} }
.d1{ .d1{
text-align: center; text-align: center;
......
src/components/Header.vue
浏览文件 @ 0bebd385
...@@ -2,16 +2,16 @@ ...@@ -2,16 +2,16 @@
<div class="headerbigbox"> <div class="headerbigbox">
<div class="topNavBox"> <div class="topNavBox">
<div class="topNav containerWidth"> <div class="topNav containerWidth">
<div class="right-text">您好！欢迎使用E淘供货商平台</div> <div class="right-text">您好！欢迎使用EDS家居供货商平台</div>
<div class="left-menu"> <div class="left-menu">
<!-- <span> <!--<span>-->
<a class="aheft" style="color:#f60;padding-right:20px;" :href="this.sjEdsmallUrl" target="_black">旧版供货商2.0</a> <!--<a class="aheft" style="color:#f60;padding-right:20px;" :href="Echat" target="_black"></a>-->
</span> --> <!--</span>-->
<span v-if="newOrderTip.lookFlag" <span v-if="newOrderTip.lookFlag"
class="helplink bell" class="helplink bell"
@click="goPage(1,'/order/orderlist/' + (newOrderTip.status))"> @click="goPage(1,'/order/orderlist/' + (newOrderTip.status))">
<i class="el-icon-bell"></i><i class="xiaoxi"></i> <i class="el-icon-bell"></i><i class="xiaoxi"></i>
<span>消息</span> <span>系统通知</span>
</span> </span>
<span v-else <span v-else
class="helplink bell" class="helplink bell"
...@@ -19,9 +19,9 @@ ...@@ -19,9 +19,9 @@
<i class="el-icon-bell"></i> <i class="el-icon-bell"></i>
<span>消息</span> <span>消息</span>
</span> </span>
<span style="padding-left:0;padding-right:30px;" v-if="false"> <span style="padding-left:0;padding-right:30px;">
<img class="icon" src="../assets/img/icon_baike.png" alt /> <img class="icon" src="../assets/img/icon_baike.png" alt />
<a class="aheft" href="https://edspicserver.oss-cn-hangzhou.aliyuncs.com/ROOT/ETao/resource/supplierHandbook.pdf" target="_black">供应链管理手册</a> <a class="aheft" href="https://img.edsshop.cn/ROOT/ETao/resource/supplierHandbook.pdf" target="_black">供应链管理手册</a>
</span> </span>
<router-link class="helplink" :to="supplierhelpPath"> <router-link class="helplink" :to="supplierhelpPath">
<img class="icon" src="../assets/img/icon_ask.png" alt /> <img class="icon" src="../assets/img/icon_ask.png" alt />
...@@ -41,9 +41,9 @@ ...@@ -41,9 +41,9 @@
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown>--> </el-dropdown>-->
<span v-if="false"> <span>
<img class="icon" src="../assets/img/icon_baike.png" alt /> <!--<img class="icon" src="../assets/img/icon_baike.png" alt />-->
<a class="aheft" href="http://wiki.edsmall.cn/" target="_black">EDS百科</a> <!--<a class="aheft" href="http://wiki.edsmall.cn/" target="_black">EDS百科</a>-->
</span> </span>
<!-- <span> <!-- <span>
<img class="icon" src="../assets/img/icon_jx.png" alt /> <img class="icon" src="../assets/img/icon_jx.png" alt />
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
</div> </div>
<div class="topNavMenusBox"> <div class="topNavMenusBox">
<div class="topNavMenus containerWidth"> <div class="topNavMenus containerWidth">
<div class="logo"> <div class="logo" >
<a href="/"> <a href="/">
<img src="../assets/img/logo.png" alt /> <img src="../assets/img/logo.png" alt />
</a> </a>
...@@ -113,6 +113,7 @@ export default { ...@@ -113,6 +113,7 @@ export default {
inject: ["reload"], inject: ["reload"],
data() { data() {
return { return {
supplierhelpPath:'/supplierhelp', supplierhelpPath:'/supplierhelp',
usernameArr: "", usernameArr: "",
hdglUrl:'', hdglUrl:'',
...@@ -180,6 +181,7 @@ export default { ...@@ -180,6 +181,7 @@ export default {
this.getActUrl(); this.getActUrl();
this.getNewOrder(); this.getNewOrder();
this.getSupplierhelp(); this.getSupplierhelp();
}, },
computed: { computed: {
...mapState("navBar", ["actNavItem","newOrderTip"]), ...mapState("navBar", ["actNavItem","newOrderTip"]),
...@@ -387,7 +389,7 @@ export default { ...@@ -387,7 +389,7 @@ export default {
height: auto; height: auto;
} }
>>> .el-cascader-menu .el-cascader-menu__wrap { >>> .el-cascader-menu .el-cascader-menu__wrap {
height: auto; height: 200px;
} }
.helplink { .helplink {
color: #333; color: #333;
...@@ -439,7 +441,7 @@ export default { ...@@ -439,7 +441,7 @@ export default {
line-height: 70px; line-height: 70px;
height: 70px; height: 70px;
background-color: #fff; background-color: #fff;
border-bottom: 2px solid #ff6800; border-bottom: 2px solid #147ef9;
.logo { .logo {
img { img {
...@@ -461,7 +463,7 @@ export default { ...@@ -461,7 +463,7 @@ export default {
padding: 0 25px; padding: 0 25px;
cursor: pointer; cursor: pointer;
&:hover { &:hover {
color: #f60; color: #147ef9;
} }
.navItem { .navItem {
padding: 0 5px; padding: 0 5px;
...@@ -471,7 +473,7 @@ export default { ...@@ -471,7 +473,7 @@ export default {
} }
.actNavItem { .actNavItem {
color: #f60; color: #147ef9;
// border-bottom: 2px solid #f60; // border-bottom: 2px solid #f60;
} }
} }
......
src/components/HeaderLogin.vue
浏览文件 @ 0bebd385
<template> <template>
<div class="loginpage"> <div class="loginpage">
<div class="login_top_class"> <div class="login_top_class">
<div class="bgcenter" @click="gopage"> <div class="bgcenter" @click="gopage" style="position: relative;">
<img class="storeIcon_img" src="../assets/img/logo.png" alt=""> <img class="storeIcon_img" src="../assets/img/logo.png" alt="">
</div> </div>
<div class="loginNav"> <div class="loginNav">
<router-link class="alink" to="/pt">平台介绍</router-link> <!--<router-link class="alink" to="/pt">平台介绍</router-link>-->
<router-link class="alink" to="/brand">品牌共享</router-link> <!--<router-link class="alink" to="/brand">品牌共享</router-link>-->
<router-link class="alink" to="/ashop">E淘A店</router-link> <!--<router-link class="alink" to="/ashop">E淘A店</router-link>-->
<router-link class="alink" to="/joinin">招商加盟</router-link> <!--<router-link class="alink" to="/joinin">招商加盟</router-link>-->
<a class="alink" href="http://wiki.edsmall.cn/" target="_black" >E百科</a> <!--<a class="alink" href="http://wiki.edsmall.cn/" target="_black" >E百科</a>-->
<router-link v-if="!curlogin" class="loginbtn" to="/login">登录</router-link> <router-link v-if="!curlogin" class="loginbtn" to="/login">登录</router-link>
</div> </div>
</div> </div>
...@@ -80,14 +80,14 @@ export default { ...@@ -80,14 +80,14 @@ export default {
padding-left: 70px; padding-left: 70px;
} }
a.alink.router-link-exact-active.router-link-active{ a.alink.router-link-exact-active.router-link-active{
color:#f60 color:#147ef9
} }
.loginbtn{ .loginbtn{
display: inline-block; display: inline-block;
border:1px solid #f60; border:1px solid #147ef9;
text-align: center; text-align: center;
border-radius: 4px; border-radius: 4px;
color: #f60; color: #147ef9;
font-size: 14px; font-size: 14px;
padding: 4px 16px; padding: 4px 16px;
margin-left: 70px; margin-left: 70px;
......
src/components/Home.vue
浏览文件 @ 0bebd385
...@@ -2,9 +2,11 @@ ...@@ -2,9 +2,11 @@
<div> <div>
<el-container> <el-container>
<v-header></v-header> <v-header></v-header>
<el-main> <el-main>
<ToTopTool v-if="!$route.meta.noToTop" :items="toolitems"></ToTopTool> <ToTopTool v-if="!$route.meta.noToTop" :items="toolitems"></ToTopTool>
<div class="containerWidth header_m_top_112"> <div class="containerWidth header_m_top_112">
<img @click="toBao" v-if="showUpdateBtn&&$route.fullPath=='/home'" style="width: 100%;cursor: pointer;margin-bottom: 10px" :src="`${ImgServerUrl}20250225baoming.png?t=${new Date().getTime()}`" alt="">
<div class="breadc" v-show="breadcrumb && breadcrumb.length>0"> <div class="breadc" v-show="breadcrumb && breadcrumb.length>0">
<com-breadcrumb :breadcrumb="breadcrumb"></com-breadcrumb> <com-breadcrumb :breadcrumb="breadcrumb"></com-breadcrumb>
</div> </div>
...@@ -43,9 +45,11 @@ export default { ...@@ -43,9 +45,11 @@ export default {
name: 'home', name: 'home',
data () { data () {
return { return {
showUpdateBtn:false,
toolitems: [ toolitems: [
// {name:'品牌管理员',icon:'el-icon-service'}, {name:'客服消息',icon:'el-icon-service'},
{name:'反馈',icon:'el-icon-edit-outline'}, {name:'反馈',icon:'el-icon-edit-outline'},
], ],
breadcrumb: [], breadcrumb: [],
hideSidebar:true, hideSidebar:true,
...@@ -66,7 +70,7 @@ export default { ...@@ -66,7 +70,7 @@ export default {
}, },
created(){ created(){
this.hideSidebar = this.$route.meta.hideSidebar == true?true:false this.hideSidebar = this.$route.meta.hideSidebar == true?true:false
this.breadcrumb = this.$route.meta.breadcrumb; this.breadcrumb = this.$route.meta.breadcrumb;
this.isBackTran = this.$route.meta.isBackTran == true?true:false; this.isBackTran = this.$route.meta.isBackTran == true?true:false;
// console.log('ce',this.$route) // console.log('ce',this.$route)
...@@ -74,9 +78,20 @@ export default { ...@@ -74,9 +78,20 @@ export default {
}, },
mounted() { mounted() {
// 时间钩子 // 时间钩子
this.getZoneList()
}, },
methods:{ methods:{
toBao(){
this.$router.push({path:'/marketing/activityMall'})
},
getZoneList() {
this.$axios.get("/actregist/zoneList").then(res => {
let { code, data } = res.data;
if (code === 200) {
this.showUpdateBtn=data.showUpdateBtn
}
});
},
// 执行方法 // 执行方法
...mapMutations("navBar",['clickNavItem']), ...mapMutations("navBar",['clickNavItem']),
......
src/components/ToTopToolScroll.vue
浏览文件 @ 0bebd385
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<div class="toolbox isFixed"> <div class="toolbox isFixed">
<div v-for="(item,index) in items" :key="index"> <div v-for="(item,index) in items" :key="index">
<div :class="actIndex==index?'itembox act':'itembox'" @click="onClick(item,index)"> <div :class="actIndex==index?'itembox act':'itembox'" @click="onClick(item,index)">
<div v-if="index==0&&dataList.length>0"> <div v-if="index==0&&dataList.length>0&&false">
<el-popover <el-popover
popper-class="monitor-yt-popover" popper-class="monitor-yt-popover"
placement="left-start" placement="left-start"
...@@ -28,7 +28,13 @@ ...@@ -28,7 +28,13 @@
</div> </div>
</el-popover> </el-popover>
</div> </div>
<div style="font-size: 12px" v-else @click="pushUrl(index)"> <el-badge :max="99" :value="total" v-if="index==0">
<div style="font-size: 12px" @click="pushUrl(index)">
<p style="text-align: center"><i :class="item.icon" style="font-size: 25px"></i></p>
<p>{{item.name}}</p>
</div>
</el-badge>
<div style="font-size: 12px" @click="pushUrl(index)" v-else>
<p style="text-align: center"><i :class="item.icon" style="font-size: 25px"></i></p> <p style="text-align: center"><i :class="item.icon" style="font-size: 25px"></i></p>
<p>{{item.name}}</p> <p>{{item.name}}</p>
</div> </div>
...@@ -48,6 +54,8 @@ ...@@ -48,6 +54,8 @@
export default { export default {
data() { data() {
return { return {
total:0,
Echat:'',
dataList: [], dataList: [],
actIndex: -1, actIndex: -1,
isShow:false, isShow:false,
...@@ -64,6 +72,23 @@ ...@@ -64,6 +72,23 @@
mounted() { mounted() {
this.isShow=this.$route.meta.isShow this.isShow=this.$route.meta.isShow
this.getDataList(); this.getDataList();
this.$axios.get("/chat/room/getChatUserTokenId" ).then(res=>{
let { code, data } = res.data;
if (code == 200) {
this.initgetNotReadMsgCount(data)
let test = ''
if(window.location.href.indexOf('gl-pre')>-1){
test='https://chat-pre.edstao.com'
}else {
test='https://chat.edsshop.cn'
}
if(window.location.href.indexOf('http://localhost')>-1){
test='http://localhost:8082'
}
console.log(test);
this.Echat= `${test}/instant-chat/message?uid=${data}&token=${_getStorage("info").token}&merId=${_getStorage("info").merId}`
}
})
}, },
watch: { watch: {
'$route' (to) { '$route' (to) {
...@@ -130,6 +155,11 @@ ...@@ -130,6 +155,11 @@
}, },
}, },
methods: { methods: {
initgetNotReadMsgCount(data){
this.$axios.get(`/chat/room/getNotReadMsgCount?uid=${data}&userId=${_getStorage("info").brandId}`).then(res=>{
this.total=res.data.data
})
},
getDataList() { getDataList() {
this.$axios.get("/channel/list", { this.$axios.get("/channel/list", {
params: { params: {
...@@ -144,7 +174,7 @@ ...@@ -144,7 +174,7 @@
}, },
pushUrl(index) { pushUrl(index) {
if(index==0){ if(index==0){
this.$message.warning('暂无数据') window.open(this.Echat)
}else { }else {
this.$router.push({ this.$router.push({
path: "/help/feedback", path: "/help/feedback",
...@@ -211,10 +241,10 @@ ...@@ -211,10 +241,10 @@
line-height: 18px; line-height: 18px;
&.act { &.act {
color: #f60; color: #147ef9;
} }
&:hover { &:hover {
background: #f60; background: #147ef9;
color: #fff; color: #fff;
} }
} }
......
src/components/common/addproducts.vue
浏览文件 @ 0bebd385
...@@ -20,19 +20,19 @@ ...@@ -20,19 +20,19 @@
<el-card class="box-card"> <el-card class="box-card">
<div slot="header" class="clearfix title-card"> <div slot="header" class="clearfix title-card">
<span class="title-left">选择商品</span> <span class="title-left">选择商品</span>
<el-checkbox class="title-left20" <el-checkbox class="title-left20"
v-model="productTypeVal" v-model="productTypeVal"
:true-label="1" :true-label="1"
:false-label="0" :false-label="0"
@change="changeType" @change="changeType"
>{{productType?productType:'商品筛选'}}</el-checkbox> >{{productType?productType:'商品筛选'}}</el-checkbox>
<el-checkbox class="title-left2" <el-checkbox class="title-left2"
v-model="onlySeriesVal" v-model="onlySeriesVal"
:true-label="1" :true-label="1"
:false-label="0" :false-label="0"
@change="changeType2" @change="changeType2"
>只显示同系列</el-checkbox> >只显示同系列</el-checkbox>
<div class="title-right"> <div class="title-right">
<input class="input" v-model="searchPro" @keyup="handleKeyup" placeholder="搜索关键词" /> <input class="input" v-model="searchPro" @keyup="handleKeyup" placeholder="搜索关键词" />
...@@ -122,7 +122,7 @@ export default { ...@@ -122,7 +122,7 @@ export default {
}else{ }else{
this.getoldData2(); this.getoldData2();
} }
}, },
changeType2(e){ changeType2(e){
this.onlySeriesVal = e; this.onlySeriesVal = e;
...@@ -134,7 +134,7 @@ export default { ...@@ -134,7 +134,7 @@ export default {
}else{ }else{
this.getoldData2(); this.getoldData2();
} }
}, },
//获取旧数据 //获取旧数据
getoldData(v){ getoldData(v){
...@@ -170,14 +170,14 @@ export default { ...@@ -170,14 +170,14 @@ export default {
}).then(r => { }).then(r => {
let { code, data } = r.data; let { code, data } = r.data;
if(code == 200){ if(code == 200){
this.listdata = data.list?data.list:''; this.listdata = data.list?data.list:'';
this.total = parseInt(data.total); this.total = parseInt(data.total);
} }
this.loading = false; this.loading = false;
}).catch(r => console.log(r)); }).catch(r => console.log(r));
}, },
//sku设置--绑定商品 //sku设置--绑定商品
getoldData2(v){ getoldData2(v){
...@@ -289,7 +289,7 @@ export default { ...@@ -289,7 +289,7 @@ export default {
} }
} }
&:hover{ &:hover{
color: #f60; color: #147ef9;
cursor: pointer; cursor: pointer;
} }
} }
......
src/components/common/orderSearchSelf.vue
浏览文件 @ 0bebd385
...@@ -112,7 +112,7 @@ export default { ...@@ -112,7 +112,7 @@ export default {
let blob = new Blob([data], { type: 'application/vnd.ms-excel' }) let blob = new Blob([data], { type: 'application/vnd.ms-excel' })
let link = document.createElement('a') let link = document.createElement('a')
link.href = window.URL.createObjectURL(blob) link.href = window.URL.createObjectURL(blob)
link.download = 'E淘家居' + this.getNowTime() link.download = 'EDS家居' + this.getNowTime()
link.click() link.click()
this.downloadLoading = false this.downloadLoading = false
}).catch((error)=>{ }).catch((error)=>{
...@@ -160,7 +160,7 @@ export default { ...@@ -160,7 +160,7 @@ export default {
// let dataparams = qs.stringify(params); // let dataparams = qs.stringify(params);
// this.downloadLoading = false // this.downloadLoading = false
// return this.exportdetailUrl +'?' + dataparams; // return this.exportdetailUrl +'?' + dataparams;
// } // }
} }
} }
......
src/components/common/qrcodeCanvas.vue
浏览文件 @ 0bebd385
...@@ -12,7 +12,16 @@ ...@@ -12,7 +12,16 @@
:key="item">{{item}}<span v-if="index<canInfo.models.length-1">，</span></span> :key="item">{{item}}<span v-if="index<canInfo.models.length-1">，</span></span>
</div></div> --> </div></div> -->
<div class=""><span class="txt">{{canInfo.model}}</span> <div class=""><span class="txt">{{canInfo.model}}</span>
</div></div>
</div>
</div>
<div class="divtxt models"><span class="tit">零售价：</span>
<<<<<<< HEAD
<div class=""><span class="txt">￥{{canInfo.productPrice}}</span></div></div>
=======
<div class=""><span class="txt">{{canInfo.productPrice}}</span></div></div>
>>>>>>> release-pre
<div id="qrcodeImg" class="qcodeImg"> <div id="qrcodeImg" class="qcodeImg">
<canvas width="266" height="266" style="display: none;"></canvas> <canvas width="266" height="266" style="display: none;"></canvas>
<img style="display: block;" v-if="code" :src="code"> <img style="display: block;" v-if="code" :src="code">
...@@ -214,7 +223,7 @@ img { ...@@ -214,7 +223,7 @@ img {
display: flex; display: flex;
.tit{ .tit{
width: 50px; width: 50px;
min-width: 50px; min-width: 70px;
display: inline-flex; display: inline-flex;
justify-content: flex-end; justify-content: flex-end;
} }
......
src/components/common/shelf.vue
浏览文件 @ 0bebd385
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<span class="name">操作平台</span> <span class="name">操作平台</span>
<div class="right"> <div class="right">
<el-checkbox v-model="checked">EDS</el-checkbox> <el-checkbox v-model="checked">EDS</el-checkbox>
<el-checkbox v-model="checked">E淘</el-checkbox> <el-checkbox v-model="checked">EDS家居</el-checkbox>
</div> </div>
</div> </div>
......
src/components/common/topTitle.vue
浏览文件 @ 0bebd385
...@@ -30,7 +30,7 @@ export default { ...@@ -30,7 +30,7 @@ export default {
.name { .name {
font-weight: bold; font-weight: bold;
padding: 2px 0 2px 6px; padding: 2px 0 2px 6px;
border-left: 4px solid #FF6800; border-left: 4px solid #147ef9;
} }
>>>a{ >>>a{
color: #fff !important; color: #fff !important;
......
src/components/common/uploadImg.vue
浏览文件 @ 0bebd385
...@@ -5,14 +5,14 @@ ...@@ -5,14 +5,14 @@
v-for="(item,index) in imgsJson['supMainImgs']" :key="index" v-for="(item,index) in imgsJson['supMainImgs']" :key="index"
> >
<div style="width:100%;height:100%;"> <div style="width:100%;height:100%;">
<img class="el-upload-list__item-thumbnail" <img class="el-upload-list__item-thumbnail"
:src="item.url+'?x-oss-process=image/format,png'" alt=""> :src="item.url+'?x-oss-process=image/format,png'" alt="">
</div> </div>
<!-- 操作按钮 --> <!-- 操作按钮 -->
<span class="el-upload-list__item-actions"> <span class="el-upload-list__item-actions">
<span <span
class="el-upload-list__item-delete"> class="el-upload-list__item-delete">
<i class="el-icon-zoom-in" @click="handlePictureCardPreview(item)"></i> <i class="el-icon-zoom-in" @click="handlePictureCardPreview(item),picIndex=index"></i>
</span> </span>
<span <span
class="el-upload-list__item-delete"> class="el-upload-list__item-delete">
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
</span> </span>
</span> </span>
</li> </li>
<li class="el-upload-list__item is-ready" <li class="el-upload-list__item is-ready"
:style="{'border':'none','display':imgsJson['supMainImgs'].length>=hideLength?'none':''}"> :style="{'border':'none','display':imgsJson['supMainImgs'].length>=hideLength?'none':''}">
<el-upload <el-upload
ref="supMainImgs" ref="supMainImgs"
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
:on-preview="handlePictureCardPreview" :on-preview="handlePictureCardPreview"
:on-success="(response, file, fileList) => handleSuccess(response, file, fileList)" :on-success="(response, file, fileList) => handleSuccess(response, file, fileList)"
:on-error="onError" :on-error="onError"
:on-remove="(file) => handleRemove(file,'supMainImgs')" :on-remove="(file) => handleRemove(file,'supMainImgs')"
:show-file-list="false" :show-file-list="false"
:on-exceed="(files,fileList) => handleExceed(files,fileList,'supMainImgs')" :on-exceed="(files,fileList) => handleExceed(files,fileList,'supMainImgs')"
:before-upload="(file) => beforeUpload(file,'supMainImgs',)" :before-upload="(file) => beforeUpload(file,'supMainImgs',)"
...@@ -41,9 +41,9 @@ ...@@ -41,9 +41,9 @@
:limit="limitNum" :limit="limitNum"
> >
<!-- 支持多张上传 multiple --> <!-- 支持多张上传 multiple -->
<!-- :show-file-list="false" 隐藏状态. <!-- :show-file-list="false" 隐藏状态.
:file-list="imgsJson.supMainImgs" 必须加上这一行，才能在删除图片后，再次上传图片，有超出提示--> :file-list="imgsJson.supMainImgs" 必须加上这一行，才能在删除图片后，再次上传图片，有超出提示-->
<i class="el-icon-plus"></i> <i class="el-icon-plus"></i>
</el-upload> </el-upload>
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
:before-remove="(file,fileList) => handleError(file,fileList,'supMainImgs')" :before-remove="(file,fileList) => handleError(file,fileList,'supMainImgs')"
:on-remove="(file) => handleRemove(file,'supMainImgs')" :on-remove="(file) => handleRemove(file,'supMainImgs')"
:before-upload="(file) => beforeUpload(file,'supMainImgs')"> :before-upload="(file) => beforeUpload(file,'supMainImgs')">
<template v-if="imgsJson.supMainImgs.length != 0"> <template v-if="imgsJson.supMainImgs.length != 0">
<div v-for="(item,index) in imgsJson.supMainImgs" :key="index"> <div v-for="(item,index) in imgsJson.supMainImgs" :key="index">
<video v-if="item.url" :src="item.url" controls="controls"> <video v-if="item.url" :src="item.url" controls="controls">
...@@ -77,16 +77,18 @@ ...@@ -77,16 +77,18 @@
<div class="closebtn" v-if="imgsJson.supMainImgs.length>0" @click="handleRemove('','supMainImgs')"> <div class="closebtn" v-if="imgsJson.supMainImgs.length>0" @click="handleRemove('','supMainImgs')">
<i class="el-icon-circle-close"></i> <i class="el-icon-circle-close"></i>
</div> </div>
</div> </div>
<!-- <el-dialog :visible.sync="dialogVisible" :modal="false"> <!-- <el-dialog :visible.sync="dialogVisible" :modal="false">
<img width="100%" :src="dialogImageUrl +'?x-oss-process=image/format,png'" alt=""> <img width="100%" :src="dialogImageUrl +'?x-oss-process=image/format,png'" alt="">
</el-dialog> --> </el-dialog> -->
<el-image-viewer <el-image-viewer
style="z-index:9999"
v-if="showViewer" v-if="showViewer"
:on-close="closeViewer" :on-close="closeViewer"
:url-list="ImageViewerUrl" :url-list="ImageViewerUrl"
:initial-index="picIndex"
/> />
</div> </div>
</template> </template>
...@@ -136,6 +138,7 @@ export default { ...@@ -136,6 +138,7 @@ export default {
}, },
data(){ data(){
return { return {
picIndex:0,
uploadData: {keys:[],successNum:0,beforeNum:0}, // 临时存放上传文件 uploadData: {keys:[],successNum:0,beforeNum:0}, // 临时存放上传文件
imgsJson:{ imgsJson:{
supMainImgs: [], supMainImgs: [],
...@@ -184,12 +187,12 @@ export default { ...@@ -184,12 +187,12 @@ export default {
this.loadingEnd(1) this.loadingEnd(1)
}, },
handleRemove(file, label,idx) { handleRemove(file, label,idx) {
let fileList = _deepClone(this.imgsJson[label]) let fileList = _deepClone(this.imgsJson[label])
let index = fileList.indexOf(file); let index = fileList.indexOf(file);
this.imgsJson[label].splice(idx,1) this.imgsJson[label].splice(idx,1)
const imgResult = this.pictureFun(); const imgResult = this.pictureFun();
this.$emit('uploadResult',imgResult.supMainImgs) this.$emit('uploadResult',imgResult.supMainImgs)
}, },
...@@ -199,7 +202,6 @@ export default { ...@@ -199,7 +202,6 @@ export default {
this.showViewer =true this.showViewer =true
}, },
handleExceed(files, fileList,label) { handleExceed(files, fileList,label) {
this.$message.warning(`超出限制文件个数`); this.$message.warning(`超出限制文件个数`);
}, },
...@@ -207,7 +209,7 @@ export default { ...@@ -207,7 +209,7 @@ export default {
let self = this let self = this
const fv = new FileVerification(file); const fv = new FileVerification(file);
let rules; let rules;
if(this.uploadWH && this.uploadWH.length){ if(this.uploadWH && this.uploadWH.length){
if(this.uploadWH.length==1){ if(this.uploadWH.length==1){
//[00]只传一个默认设置宽度vImgW //[00]只传一个默认设置宽度vImgW
...@@ -244,6 +246,9 @@ export default { ...@@ -244,6 +246,9 @@ export default {
} }
//只要有一个条件不满足就弹出 //只要有一个条件不满足就弹出
if(res && !res.result){ if(res && !res.result){
if(self.uploadType!='video'){
self.$refs.supMainImgs.clearFiles();
}
return res return res
} }
} }
...@@ -411,4 +416,4 @@ export default { ...@@ -411,4 +416,4 @@ export default {
transform: translate(-50%,-50%); transform: translate(-50%,-50%);
} }
} }
</style> </style>
\ No newline at end of file
src/pages/Index.vue
浏览文件 @ 0bebd385
...@@ -56,26 +56,25 @@ ...@@ -56,26 +56,25 @@
<!-- <router-link class="alink" to="">库存预警</router-link> --> <!-- <router-link class="alink" to="">库存预警</router-link> -->
</div> </div>
</div> </div>
<div class="backc center-small-box">
<div class="newTitle">
{{noticeData.title}}
</div>
<div class="newText ellipsis_3" v-html="noticeData.content"/>
<div class="moreBtn" v-if="noticeData.title">
<router-link class="alink" :to="{path:'/notice/details',query:{noticeId:noticeData.id}}">查看详情&gt;&gt;</router-link>
</div>
</div>
<div class="managesboxTop"> <div class="managesboxTop">
<div class="title">售后工单</div> <div class="title">售后工单</div>
<div class="contentTop"> <div class="contentTop">
<div class="item" @click="goPage3(1,index)" <div class="item" @click="goPage3(1,index)"
v-for="(item,index) in goodsArr3" :key="index"> v-for="(item,index) in goodsArr3" :key="index">
<div class="num"><countUp :delay="1000" :endVal="~~item.count || 0"/></div> <div class="num"><countUp :delay="1000" :endVal="~~item.count || 0"/></div>
<span>{{item.status}}</span> <span>{{item.status}}</span>
</div> </div>
</div> </div>
</div> </div>
<div class="backc center-small-box" style="visibility: hidden">
<div class="newTitle" >
{{noticeData.title}}
</div >
<div class="newText ellipsis_3" v-html="noticeData.content"/>
<div class="moreBtn" v-if="noticeData.title">
<router-link class="alink" :to="{path:'/notice/details',query:{noticeId:noticeData.id}}">查看详情&gt;&gt;</router-link>
</div>
</div>
</div> </div>
<div class="justify-between" v-if="showInfo != undefined"> <div class="justify-between" v-if="showInfo != undefined">
<div v-if="showInfo" class="left-box"> <div v-if="showInfo" class="left-box">
...@@ -137,13 +136,19 @@ ...@@ -137,13 +136,19 @@
</el-carousel-item> </el-carousel-item>
</el-carousel> </el-carousel>
<!-- 单张 --> <!-- 单张 -->
<img <div v-else style="position: relative">
v-else <img
style="cursor: pointer"
:src="indexPopupBanner[0].imgUrl" style="cursor: pointer"
@click="() => { :src="indexPopupBanner[0].imgUrl"
@click="() => {
indexPopupBanner[0].uri?goto(indexPopupBanner[0].uri):(isShowIndexBanner = false) indexPopupBanner[0].uri?goto(indexPopupBanner[0].uri):(isShowIndexBanner = false)
}"> }">
<div style="position: absolute;bottom: 20px;text-align: left;left: 30px" v-if="false">
<p style="color: #e14649;margin-bottom: 10px;font-size: 14px;font-weight: bold">报名时间：截止到2024-9-5 24点</p>
<p style="color: #e14649;margin-bottom: 10px;font-size: 14px;font-weight: bold">投放时间：2024-9-6 到 2024-9-21</p>
</div>
</div>
<span class="close" @click="isShowIndexBanner = false"> <span class="close" @click="isShowIndexBanner = false">
<img src="https://img.edsmall.com/ROOT/ETao/fenxiao/pc_v3/banner_close.png" alt=""> <img src="https://img.edsmall.com/ROOT/ETao/fenxiao/pc_v3/banner_close.png" alt="">
</span> </span>
...@@ -867,7 +872,7 @@ export default { ...@@ -867,7 +872,7 @@ export default {
cursor: pointer; cursor: pointer;
.num{ .num{
font-weight: bold; font-weight: bold;
color: #FF6800; color: #147ef9;
font-size: 28px; font-size: 28px;
margin-bottom: 16px; margin-bottom: 16px;
} }
......
src/pages/Login.vue
浏览文件 @ 0bebd385
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<div class="login-wrap header_m_top"> <div class="login-wrap header_m_top">
<div class="ms-login-box"> <div class="ms-login-box">
<div class="ms-login" v-if="login_status == 0"> <div class="ms-login" v-if="login_status == 0">
<div class="ms-title">E淘供货商平台</div> <div class="ms-title">EDS家居供货商平台</div>
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="0px" class="ms-content"> <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="0px" class="ms-content">
<el-form-item prop="username"> <el-form-item prop="username">
<el-input size="medium" v-model="ruleForm.username" placeholder="用户账号"> <el-input size="medium" v-model="ruleForm.username" placeholder="用户账号">
...@@ -101,15 +101,15 @@ ...@@ -101,15 +101,15 @@
<el-footer> <el-footer>
<v-footer :login="true"></v-footer> <v-footer :login="true"></v-footer>
</el-footer> </el-footer>
<div class="exshortbtn" v-if="isPC"> <!--<div class="exshortbtn" v-if="isPC">-->
<!-- <router-link class="alink" to="exshort"> <!--&lt;!&ndash; <router-link class="alink" to="exshort">-->
桌面快捷方式 <!--桌面快捷方式-->
</router-link> --> <!--</router-link> &ndash;&gt;-->
<a class="alink" <!--<a class="alink"-->
download="快捷方式" <!--download="快捷方式"-->
href="https://img.edsmall.com/ROOT/ETao/resource/E%E6%B7%98%E4%BE%9B%E8%B4%A7%E5%95%86%E6%A1%8C%E9%9D%A2%E5%BF%AB%E6%8D%B7%E6%96%B9%E5%BC%8F.zip"> <!--href="https://img.edsmall.com/ROOT/ETao/resource/E%E6%B7%98%E4%BE%9B%E8%B4%A7%E5%95%86%E6%A1%8C%E9%9D%A2%E5%BF%AB%E6%8D%B7%E6%96%B9%E5%BC%8F.zip">-->
桌面快捷方式</a> <!--桌面快捷方式</a>-->
</div> <!--</div>-->
</div> </div>
</template> </template>
...@@ -180,7 +180,6 @@ import { checkPC } from '../utils/utils'; ...@@ -180,7 +180,6 @@ import { checkPC } from '../utils/utils';
this.$refs[formName].validate((valid) => { this.$refs[formName].validate((valid) => {
if (valid) { if (valid) {
this.$axios.post('/account/login',{ this.$axios.post('/account/login',{
glsd:1,
username:this.ruleForm.username, username:this.ruleForm.username,
password:this.ruleForm.password password:this.ruleForm.password
}).then((res)=>{ }).then((res)=>{
...@@ -330,12 +329,12 @@ import { checkPC } from '../utils/utils'; ...@@ -330,12 +329,12 @@ import { checkPC } from '../utils/utils';
background-color: #fff; background-color: #fff;
} }
/deep/ .el-input-group__prepend .iconstyle{ /deep/ .el-input-group__prepend .iconstyle{
color: #f60; color: #147ef9;
font-size: 18px; font-size: 18px;
} }
/deep/ .el-button--primary { /deep/ .el-button--primary {
background-color:#f60; background-color:#147ef9;
border-color: #f60; border-color: #147ef9;
} }
.padsswordBox{ .padsswordBox{
position: relative; position: relative;
...@@ -375,7 +374,7 @@ import { checkPC } from '../utils/utils'; ...@@ -375,7 +374,7 @@ import { checkPC } from '../utils/utils';
line-height: 100px; line-height: 100px;
// text-align: center; // text-align: center;
font-size:36px; font-size:36px;
color: #f60; color: #147ef9;
color: #fff; color: #fff;
padding-left: 50px; padding-left: 50px;
box-sizing: border-box; box-sizing: border-box;
......
src/pages/afterSale/detailSale.vue
浏览文件 @ 0bebd385
...@@ -551,7 +551,7 @@ export default { ...@@ -551,7 +551,7 @@ export default {
color: ''; color: '';
} }
>>>.el-tabs__item.is-active { >>>.el-tabs__item.is-active {
color: #FF6800; color: #147ef9;
} }
>>>.el-input.is-disabled .el-input__inner{ >>>.el-input.is-disabled .el-input__inner{
color: #666; color: #666;
......
src/pages/afterSale/details.vue
浏览文件 @ 0bebd385
此差异已折叠。
src/pages/afterSale/index.vue
浏览文件 @ 0bebd385
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<div class="search-box" :style="{height: searchHeight}"> <div class="search-box" :style="{height: searchHeight}">
<div class="search-item"> <div class="search-item">
<span class="label">订单编号：</span> <span class="label">订单编号：</span>
<el-input class="input" @keyup.enter.native="onSearch" <el-input class="input" @keyup.enter.native="onSearch"
clearable v-model="params.orderCode" placeholder="请输入订单编号"></el-input> clearable v-model="params.orderCode" placeholder="请输入订单编号"></el-input>
</div> </div>
<div class="search-item"> <div class="search-item">
...@@ -18,11 +18,11 @@ ...@@ -18,11 +18,11 @@
<el-option v-for="item in statusList" :key="item.value" :label="item.label" :value="item.value"></el-option> <el-option v-for="item in statusList" :key="item.value" :label="item.label" :value="item.value"></el-option>
</el-select> </el-select>
</div> </div>
<div class="search-btn-box2 search-item"> <div class="search-btn-box2 search-item">
<el-button type="primary" @click="onSearch">搜索</el-button> <el-button type="primary" @click="onSearch">搜索</el-button>
<el-button @click="onReset">重置</el-button> <el-button @click="onReset">重置</el-button>
</div> </div>
</div> </div>
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
<el-table-column prop="updateTime" label="状态" align="center"> <el-table-column prop="updateTime" label="状态" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<div :style="{'color':scope.row.moveTypeContent=='待处理'?'#f60':scope.row.moveTypeContent=='已处理'?'#31B907':''}">{{scope.row.moveTypeContent}}</div> <div :style="{'color':scope.row.moveTypeContent=='待处理'?'#147ef9':scope.row.moveTypeContent=='已处理'?'#31B907':''}">{{scope.row.moveTypeContent}}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="updateTime" label="发起人" align="center" width="200"> <el-table-column prop="updateTime" label="发起人" align="center" width="200">
...@@ -153,7 +153,7 @@ export default { ...@@ -153,7 +153,7 @@ export default {
// 备注 // 备注
showRemark(id,remark){ showRemark(id,remark){
this.objPropsRemark.id = id; this.objPropsRemark.id = id;
this.objPropsRemark.ghRemark = remark this.objPropsRemark.ghRemark = remark
this.objPropsRemark.dialogFormVisible = true; this.objPropsRemark.dialogFormVisible = true;
}, },
cancelFormRemark(res,type){ cancelFormRemark(res,type){
......
src/pages/checking/order.vue
浏览文件 @ 0bebd385
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div class="p_all_20"> <div class="p_all_20">
<div class="tit titborder"> <div class="tit titborder">
<el-radio-group v-model="tabPosition"> <el-radio-group v-model="tabPosition">
<!--<el-radio-button :label="1">余额</el-radio-button>--> <el-radio-button :label="1">余额</el-radio-button>
<el-radio-button :label="2">支付宝</el-radio-button> <el-radio-button :label="2">支付宝</el-radio-button>
</el-radio-group> </el-radio-group>
<span <span
...@@ -255,7 +255,7 @@ export default { ...@@ -255,7 +255,7 @@ export default {
name: "order", name: "order",
data() { data() {
return { return {
tabPosition:2, tabPosition:1,
infoData: {}, infoData: {},
tableData: [], tableData: [],
date: "", date: "",
...@@ -537,7 +537,7 @@ export default { ...@@ -537,7 +537,7 @@ export default {
display: inline-block; display: inline-block;
width: 4px; width: 4px;
height: 24px; height: 24px;
background: #FF6800; background: #147ef9;
border-radius: 2px; border-radius: 2px;
vertical-align: middle; vertical-align: middle;
margin-right: 5px; margin-right: 5px;
...@@ -566,10 +566,10 @@ export default { ...@@ -566,10 +566,10 @@ export default {
display: block; display: block;
padding: 6px 8px; padding: 6px 8px;
border-radius: 4px; border-radius: 4px;
border: 1px solid #ff6800; border: 1px solid #147ef9;
font-size: 14px; font-size: 14px;
cursor: pointer; cursor: pointer;
color: #f60; color: #147ef9;
} }
.showbox { .showbox {
margin: 15px; margin: 15px;
...@@ -618,20 +618,20 @@ export default { ...@@ -618,20 +618,20 @@ export default {
border-radius: 3px; border-radius: 3px;
font-size: 12px; font-size: 12px;
cursor: pointer; cursor: pointer;
background-color: #f60; background-color: #147ef9;
//border:1px solid #f60; //border:1px solid #f60;
color: #fff; color: #fff;
} }
.el-button--primary { .el-button--primary {
background-color: #f60; background-color: #147ef9;
border-color: #f60; border-color: #147ef9;
} }
.timeInput01 { .timeInput01 {
padding-left: 10px; padding-left: 10px;
} }
.jihuoText { .jihuoText {
font-size: 34px; font-size: 34px;
color: #f60; color: #147ef9;
} }
.btndef a { .btndef a {
background-color: #ccc; background-color: #ccc;
...@@ -690,7 +690,7 @@ export default { ...@@ -690,7 +690,7 @@ export default {
position: relative; position: relative;
} }
.dataTotal .actf60 { .dataTotal .actf60 {
color: #f60; color: #147ef9;
position: relative; position: relative;
} }
.dataTotal .actf60:after { .dataTotal .actf60:after {
...@@ -698,7 +698,7 @@ export default { ...@@ -698,7 +698,7 @@ export default {
content: ""; content: "";
width: 60%; width: 60%;
height: 2px; height: 2px;
background: #f60; background: #147ef9;
bottom: -3px; bottom: -3px;
left: 20%; left: 20%;
z-index: 2; z-index: 2;
......
src/pages/checking/record.vue
浏览文件 @ 0bebd385
...@@ -24,10 +24,10 @@ ...@@ -24,10 +24,10 @@
:clearable="false" :clearable="false"
/> />
</span> </span>
<div style="float:right;"> <div style="float:right;">
<el-button type="primary" @click="handleSearch">搜索</el-button> <el-button type="primary" @click="handleSearch">搜索</el-button>
<el-button type="" @click="handleRest">重置</el-button> <el-button type="" @click="handleRest">重置</el-button>
</div> </div>
</div> </div>
...@@ -181,9 +181,9 @@ export default { ...@@ -181,9 +181,9 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
.tit{font-size:16px;color:#6B6B6B;margin-bottom:20px;} .tit{font-size:16px;color:#6B6B6B;margin-bottom:20px;}
.tit:before{content:'';display:inline-block;width:4px; .tit:before{content:'';display:inline-block;width:4px;
height:24px;background:#FF6800;border-radius:2px;vertical-align:middle;margin-right:5px;} height:24px;background:#147ef9;border-radius:2px;vertical-align:middle;margin-right:5px;}
.table-box{border:1px solid #DADADA;padding:10px;text-align:center;} .table-box{border:1px solid #DADADA;padding:10px;text-align:center;}
.table-tit{color:#FF6800;} .table-tit{color:#147ef9;}
.layui-table th{text-align:center;} .layui-table th{text-align:center;}
.table-box img{width:30px;height:30px;} .table-box img{width:30px;height:30px;}
[type="checkbox"] {width:15px;height:15px;vertical-align:middle;} [type="checkbox"] {width:15px;height:15px;vertical-align:middle;}
......
src/pages/checking/setPassword.vue
浏览文件 @ 0bebd385
...@@ -12,13 +12,13 @@ ...@@ -12,13 +12,13 @@
</el-form-item> </el-form-item>
<el-form-item label="输入提现密码：" prop="password"> <el-form-item label="输入提现密码：" prop="password">
<el-col :span="12"> <el-col :span="12">
<pay-box ref="payBox"></pay-box> <pay-box ref="payBox"></pay-box>
</el-col> </el-col>
</el-form-item> </el-form-item>
<el-form-item label="再次输入提现密码：" prop="newPassword"> <el-form-item label="再次输入提现密码：" prop="newPassword">
<el-col :span="12"> <el-col :span="12">
<pay-box ref="payBoxConfirm"></pay-box> <pay-box ref="payBoxConfirm"></pay-box>
</el-col> </el-col>
</el-form-item> </el-form-item>
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
<el-button @click="handleSend" v-if="sendTextMessage">发送验证码</el-button> <el-button @click="handleSend" v-if="sendTextMessage">发送验证码</el-button>
<el-button v-else>{{countingDownTime}}秒后重新发送</el-button> <el-button v-else>{{countingDownTime}}秒后重新发送</el-button>
</el-col> </el-col>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
...@@ -127,7 +127,7 @@ export default { ...@@ -127,7 +127,7 @@ export default {
if (this.sendTextMessage) { if (this.sendTextMessage) {
this.$axios.post('/mypay/sendpwdcode').then(function (res) { this.$axios.post('/mypay/sendpwdcode').then(function (res) {
if (res.data.code == 200) { if (res.data.code == 200) {
var data = res.data.data; var data = res.data.data;
if (data) { if (data) {
_this.countingDownTime = parseInt(data.retry); _this.countingDownTime = parseInt(data.retry);
...@@ -137,7 +137,7 @@ export default { ...@@ -137,7 +137,7 @@ export default {
} else { } else {
_this.$message.error(res.data.message); _this.$message.error(res.data.message);
} }
}).catch(function (res) { }).catch(function (res) {
}) })
...@@ -182,13 +182,13 @@ export default { ...@@ -182,13 +182,13 @@ export default {
this.$message.error("两次密码输入不一致，请重新输入"); this.$message.error("两次密码输入不一致，请重新输入");
return return
} }
if (_this.isGoAct) { if (_this.isGoAct) {
this.$axios.post('/mypay/activate', _this.form).then((res) => { this.$axios.post('/mypay/activate', _this.form).then((res) => {
if (res.data && res.data.code == 200) { if (res.data && res.data.code == 200) {
this.$message.success(res.data.message); this.$message.success(res.data.message);
this.$router.push({ this.$router.push({
path:'/checking/order', path:'/checking/order',
query:{} query:{}
...@@ -203,10 +203,10 @@ export default { ...@@ -203,10 +203,10 @@ export default {
}).catch((res) => { console.log(res) }) }).catch((res) => { console.log(res) })
} else { } else {
this.$axios.post('/mypay/paypwd', _this.form).then((res) => { this.$axios.post('/mypay/paypwd', _this.form).then((res) => {
if (res.data.code == 200) { if (res.data.code == 200) {
this.$message.success(res.data.message); this.$message.success(res.data.message);
this.$router.push({ this.$router.push({
path:'/checking/order', path:'/checking/order',
query:{} query:{}
...@@ -234,9 +234,9 @@ export default { ...@@ -234,9 +234,9 @@ export default {
.recommend_wrap {display: inline-block;box-shadow: 1px 0 5px #ccc;margin-left: 15px;width: 83%;background: #fff;color:#6B6B6B;} .recommend_wrap {display: inline-block;box-shadow: 1px 0 5px #ccc;margin-left: 15px;width: 83%;background: #fff;color:#6B6B6B;}
.big-tit{padding:10px;font-size: 16px;} .big-tit{padding:10px;font-size: 16px;}
.tit{padding:20px 10px 0 20px;font-size:16px;color:#6B6B6B;margin-bottom:20px;} .tit{padding:20px 10px 0 20px;font-size:16px;color:#6B6B6B;margin-bottom:20px;}
.tit:before{content:'';display:inline-block;width:4px;height:24px;background:#FF6800;border-radius:2px;vertical-align:middle;margin-right:5px;} .tit:before{content:'';display:inline-block;width:4px;height:24px;background:#147ef9;border-radius:2px;vertical-align:middle;margin-right:5px;}
.table-box{border:1px solid #DADADA;padding:10px;text-align:center;} .table-box{border:1px solid #DADADA;padding:10px;text-align:center;}
.table-tit{color:#FF6800;} .table-tit{color:#147ef9;}
.layui-table th{text-align:center;} .layui-table th{text-align:center;}
.table-box img{width:30px;height:30px;} .table-box img{width:30px;height:30px;}
[type="checkbox"] {width:15px;height:15px;vertical-align:middle;} [type="checkbox"] {width:15px;height:15px;vertical-align:middle;}
...@@ -245,8 +245,8 @@ export default { ...@@ -245,8 +245,8 @@ export default {
.form{width:900px;padding-left:20px;} .form{width:900px;padding-left:20px;}
.search-box{margin-bottom:10px;overflow: hidden;} .search-box{margin-bottom:10px;overflow: hidden;}
.search-input input{border:1px solid #FFEBDD;border-radius: 50px 0 0 50px;} .search-input input{border:1px solid #FFEBDD;border-radius: 50px 0 0 50px;}
.search-btn{background: #FF6800;border:1px solid #FF6800;border-radius: 0 50px 50px 0;} .search-btn{background: #147ef9;border:1px solid #147ef9;border-radius: 0 50px 50px 0;}
.search-btn:hover{background: #f46e11;border:1px solid #f46e11;} .search-btn:hover{background: #147ef9;border:1px solid #147ef9;}
.page{margin-top:15px;text-align: center;} .page{margin-top:15px;text-align: center;}
.selected{background: transparent;} .selected{background: transparent;}
.tips { .tips {
......
src/pages/checking/showzhifubao.vue 0 → 100644
浏览文件 @ 0bebd385
<template>
<div class="p_all_20">
<div class="tit">我的支付宝</div>
<div style="border: 1px solid #f2f2f2;padding: 40px 0">
<el-form ref="form" label-width="140px">
<el-form-item label="支付宝真实姓名">
{{infoData.aliPayName}}
</el-form-item>
<el-form-item label="支付宝账户">
{{infoData.aliPayAccount}}
</el-form-item>
<el-form-item label="支付宝授权图">
<div v-if="srcList.length>0">
<el-image
v-for="item in srcList"
style="width: 150px; height: 150px;border-radius: 10px;margin-right: 10px"
:src="item"
:preview-src-list="srcList">
</el-image>
</div>
</el-form-item>
</el-form>
</div>
<div style="font-size: 12px;color: #ff6600;margin-top: 15px">* 若需要更换支付宝账号，请联系平台客服人员</div>
</div>
</template>
<script>
export default {
name: "showzhifubao",
data() {
return {
infoData:{},
srcList: [],
};
},
mounted(){
this.getInfo()
},
methods:{
getInfo() {
let _this = this;
this.$axios
.get("/mypay/aliInfo")
.then(function(res) {
if (res.data.code == 200) {
_this.infoData = res.data.data;
if(_this.infoData.aliPayImg){
if(_this.infoData.aliPayImg.indexOf(',')>-1){
_this.srcList=_this.infoData.aliPayImg.split(',')
}else {
_this.srcList=[_this.infoData.aliPayImg]
}
}
} else {
_this.$message.warning(res.data.message);
}
})
.catch(function(res) {
console.log(res);
});
},
}
};
</script>
<style lang="scss" scoped>
.tit {
font-size: 16px;
color: #6B6B6B;
margin-bottom: 20px;
}
.tit:before {
content: '';
display: inline-block;
width: 4px;
height: 24px;
background: #147ef9;
border-radius: 2px;
vertical-align: middle;
margin-right: 5px;
}
.table-box {
border: 1px solid #DADADA;
padding: 10px;
text-align: center;
}
.table-tit {
color: #147ef9;
}
.layui-table th {
text-align: center;
}
.table-box img {
width: 30px;
height: 30px;
}
[type="checkbox"] {
width: 15px;
height: 15px;
vertical-align: middle;
}
// .layui-input-block span{vertical-align:middle;}
// .layui-input-block{line-height:36px;}
.page {
margin-top: 15px;
text-align: center;
}
.box {
padding: 15px;
.search {
color: #333;
}
}
.timeInput01 {
padding-left: 10px;
}
</style>
src/pages/checking/withdraw.vue
浏览文件 @ 0bebd385
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
<el-button><router-link to="/checking/order">返回</router-link></el-button> <el-button><router-link to="/checking/order">返回</router-link></el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
...@@ -145,7 +145,7 @@ export default { ...@@ -145,7 +145,7 @@ export default {
let data = res.data.data; let data = res.data.data;
_this.form.account = data.account; _this.form.account = data.account;
_this.form.mobile = data.mobile; _this.form.mobile = data.mobile;
} else { } else {
_this.$message.error(res.data.message); _this.$message.error(res.data.message);
} }
...@@ -175,10 +175,10 @@ export default { ...@@ -175,10 +175,10 @@ export default {
}) })
}, },
handleSave(ruleForm) { handleSave(ruleForm) {
var _this = this; var _this = this;
let salt = "1cGciJNLA0IvAXzWw2Lw6CKnkndFTKYs"; let salt = "1cGciJNLA0IvAXzWw2Lw6CKnkndFTKYs";
let patrn = /^[0-9]{1,10}$/; let patrn = /^[0-9]{1,10}$/;
let pass = this.$refs.payBox.inputPass; let pass = this.$refs.payBox.inputPass;
...@@ -186,14 +186,14 @@ export default { ...@@ -186,14 +186,14 @@ export default {
if (valid) { if (valid) {
if (patrn.exec(pass)) { if (patrn.exec(pass)) {
if (pass && pass.length != 6) { if (pass && pass.length != 6) {
this.$message.error("请输入六位数的密码"); this.$message.error("请输入六位数的密码");
return return
} else { } else {
let p1 = md5(md5(pass)+ salt); let p1 = md5(md5(pass)+ salt);
this.form.payPwd = p1; this.form.payPwd = p1;
} }
} else { } else {
this.$message.error("密码只支持纯数字0~9"); this.$message.error("密码只支持纯数字0~9");
...@@ -213,7 +213,7 @@ export default { ...@@ -213,7 +213,7 @@ export default {
this.$axios.post('/mypay/cash', _this.form).then((res) => { this.$axios.post('/mypay/cash', _this.form).then((res) => {
if (res.data && res.data.code == 200) { if (res.data && res.data.code == 200) {
_this.$message.success(res.data.message); _this.$message.success(res.data.message);
this.$router.push({ this.$router.push({
path:'/checking/record' path:'/checking/record'
}) })
...@@ -224,10 +224,10 @@ export default { ...@@ -224,10 +224,10 @@ export default {
}).catch((res) => { console.log(res) }) }).catch((res) => { console.log(res) })
}) })
}) })
} else { } else {
this.$message.error("请正确填写信息"); this.$message.error("请正确填写信息");
...@@ -247,9 +247,9 @@ export default { ...@@ -247,9 +247,9 @@ export default {
.big-tit{padding:10px;font-size: 16px;} .big-tit{padding:10px;font-size: 16px;}
.titborder{border-bottom:1px solid #ccc;} .titborder{border-bottom:1px solid #ccc;}
.tit{padding:10px 15px;font-size:16px;color:#6B6B6B;overflow:hidden;} .tit{padding:10px 15px;font-size:16px;color:#6B6B6B;overflow:hidden;}
.tit:before{content:'';display:inline-block;width:4px;height:24px;background:#FF6800;border-radius:2px;vertical-align:middle;margin-right:5px;} .tit:before{content:'';display:inline-block;width:4px;height:24px;background:#147ef9;border-radius:2px;vertical-align:middle;margin-right:5px;}
.table-box{border:1px solid #DADADA;padding:10px;text-align:center;} .table-box{border:1px solid #DADADA;padding:10px;text-align:center;}
.table-tit{color:#FF6800;} .table-tit{color:#147ef9;}
.layui-table th{text-align:center;} .layui-table th{text-align:center;}
.table-box img{width:30px;height:30px;} .table-box img{width:30px;height:30px;}
[type="checkbox"] {width:15px;height:15px;vertical-align:middle;} [type="checkbox"] {width:15px;height:15px;vertical-align:middle;}
...@@ -258,7 +258,7 @@ export default { ...@@ -258,7 +258,7 @@ export default {
.form{width:900px;padding-left:20px;} .form{width:900px;padding-left:20px;}
.search-box{margin-bottom:10px;overflow: hidden;} .search-box{margin-bottom:10px;overflow: hidden;}
.search-input input{border:1px solid #FFEBDD;border-radius: 50px 0 0 50px;} .search-input input{border:1px solid #FFEBDD;border-radius: 50px 0 0 50px;}
.search-btn{background: #FF6800;border:1px solid #FF6800;border-radius: 0 50px 50px 0;} .search-btn{background: #147ef9;border:1px solid #147ef9;border-radius: 0 50px 50px 0;}
.search-btn:hover{background: #f46e11;border:1px solid #f46e11;} .search-btn:hover{background: #f46e11;border:1px solid #f46e11;}
.page{margin-top:15px;text-align: center;} .page{margin-top:15px;text-align: center;}
.selected{background: transparent;} .selected{background: transparent;}
......
src/pages/checking/zhifubao.vue
浏览文件 @ 0bebd385
...@@ -448,7 +448,7 @@ ...@@ -448,7 +448,7 @@
display: inline-block; display: inline-block;
width: 4px; width: 4px;
height: 24px; height: 24px;
background: #FF6800; background: #147ef9;
border-radius: 2px; border-radius: 2px;
vertical-align: middle; vertical-align: middle;
margin-right: 5px; margin-right: 5px;
...@@ -476,7 +476,7 @@ ...@@ -476,7 +476,7 @@
display: block; display: block;
padding: 6px 8px; padding: 6px 8px;
border-radius: 4px; border-radius: 4px;
border: 1px solid #ff6800; border: 1px solid #147ef9;
font-size: 14px; font-size: 14px;
cursor: pointer; cursor: pointer;
color: #f60; color: #f60;
......
src/pages/goods/ProductDetails.vue
浏览文件 @ 0bebd385
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
</template> </template>
<script> <script>
import { _getStorage,_saveStorage,_removeStorage } from '@/utils/utils'
import productInfo from "@/components/common/edtail/ProductInfo"; import productInfo from "@/components/common/edtail/ProductInfo";
import productEdtail from "@/components/common/edtail/ProductEdtail"; import productEdtail from "@/components/common/edtail/ProductEdtail";
export default { export default {
...@@ -29,6 +29,9 @@ export default { ...@@ -29,6 +29,9 @@ export default {
productEdtail productEdtail
}, },
mounted() { mounted() {
if(this.$route.query.isChat){
this.handleSelect(this.$route.query.isChat)
}
var skuId=this.$route.query.skuId; var skuId=this.$route.query.skuId;
let spuId = this.$route.query.spuId; let spuId = this.$route.query.spuId;
// if(!skuId){ // if(!skuId){
...@@ -36,10 +39,25 @@ export default { ...@@ -36,10 +39,25 @@ export default {
// } // }
this.skuId = skuId; this.skuId = skuId;
this.spuId = spuId; this.spuId = spuId;
this.getEdtail(); this.getEdtail();
}, },
methods: { methods: {
handleSelect(key) {
this.$axios.post("/account/switchbrand?brandId=" + key).then(res => {
let { code, data, message } = res.data;
if (code == 200) {
_removeStorage("firstTan"); //首页第一次弹窗
_removeStorage("info");
this.$axios.defaults.headers.common["Authorization"] = data.token;
_saveStorage("info", data);
localStorage.setItem('priceformulaId',data.priceformulaId||null)
this.reload();
} else {
this.$message.error(message);
}
});
},
onChangeSku(skuId){ onChangeSku(skuId){
// console.log(this.$route) // console.log(this.$route)
var path=this.$route.path; var path=this.$route.path;
......
src/pages/goods/details.vue
浏览文件 @ 0bebd385
...@@ -72,17 +72,17 @@ ...@@ -72,17 +72,17 @@
<span>{{scope.row.supplyPrice}}</span> <span>{{scope.row.supplyPrice}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="purchasePrice" label="采购价(¥)" align="center" v-if="!priceformulaId&&false"> <el-table-column prop="purchasePrice" label="采购价(¥)" align="center" v-if="!priceformulaId">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{scope.row.purchasePrice}}</span> <span>{{scope.row.purchasePrice}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="salePrice" label="优惠价(¥)" align="center" v-if="!priceformulaId&&false"> <el-table-column prop="salePrice" label="优惠价(¥)" align="center" v-if="!priceformulaId">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{scope.row.salePrice}}</span> <span>{{scope.row.salePrice}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="productPrice" label="零售价(¥)" align="center" v-if="!priceformulaId&&false"> <el-table-column prop="productPrice" label="零售价(¥)" align="center" v-if="!priceformulaId">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{scope.row.productPrice}}</span> <span>{{scope.row.productPrice}}</span>
</template> </template>
...@@ -250,6 +250,7 @@ ...@@ -250,6 +250,7 @@
</template> </template>
<script> <script>
import { _supplierId, _deepClone, _areaId2AreaString,_getStorage } from '@/utils/utils' import { _supplierId, _deepClone, _areaId2AreaString,_getStorage } from '@/utils/utils'
export default { export default {
......
src/pages/goods/list.vue
浏览文件 @ 0bebd385
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
></el-option> ></el-option>
</el-select> </el-select>
</div> </div>
<div class="search-item" v-if="false"> <div class="search-item">
<span class="label">审核状态：</span> <span class="label">审核状态：</span>
<el-select class="input" style="width:120px;" clearable v-model="params.review" placeholder="请选择审核状态"> <el-select class="input" style="width:120px;" clearable v-model="params.review" placeholder="请选择审核状态">
<el-option <el-option
...@@ -115,7 +115,9 @@ ...@@ -115,7 +115,9 @@
<el-table-column prop="spuId" label="SPU ID" align="center" width="100"> <el-table-column prop="spuId" label="SPU ID" align="center" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<div> <div>
<span><i v-if="scope.row.isNew" style="display: inline-block;background: #31B907;width:8px;height: 8px;border-radius:100%;"></i> {{scope.row.spuId}}</span> <span>
<!-- <i v-if="scope.row.isNew" style="display: inline-block;background: #31B907;width:8px;height: 8px;border-radius:100%;"></i> -->
{{scope.row.spuId}}</span>
</div> </div>
<div>交货期：{{scope.row.deliveryTime | delivery}}</div> <div>交货期：{{scope.row.deliveryTime | delivery}}</div>
<div> <div>
...@@ -203,7 +205,7 @@ ...@@ -203,7 +205,7 @@
<span @click="handleToEdit(scope.row.spuId)" v-if="scope.row.isSecKill!=1">编辑</span> <span @click="handleToEdit(scope.row.spuId)" v-if="scope.row.isSecKill!=1">编辑</span>
<div> <div>
<span @click="handleToView(scope.row.spuId)">查看</span> <span @click="handleToView(scope.row.spuId)">查看</span>
<span @click="handleSkuDialog(scope.row.spuId)" v-if="false">吊牌</span> <span @click="handleSkuDialog(scope.row.spuId)">吊牌</span>
</div> </div>
<!-- <div v-if="scope.row.isEtao == '仓库中'||scope.row.isEtao=='已上架'"> <!-- <div v-if="scope.row.isEtao == '仓库中'||scope.row.isEtao=='已上架'">
<span @click="getSkuModelEditList(scope.row.spuId)" style="color: #ff6600">修改SKU型号</span> <span @click="getSkuModelEditList(scope.row.spuId)" style="color: #ff6600">修改SKU型号</span>
...@@ -669,7 +671,7 @@ export default { ...@@ -669,7 +671,7 @@ export default {
}, },
setEnableBatch(spuIds, saleable) { setEnableBatch(spuIds, saleable) {
this.$axios this.$axios
.post("/products/sdSetEnableBatch", { .post("/products/setEnableBatch", {
spuIds: spuIds, spuIds: spuIds,
saleable: saleable saleable: saleable
}) })
...@@ -885,7 +887,7 @@ export default { ...@@ -885,7 +887,7 @@ export default {
transition: transform 0.25s ease-in-out; transition: transform 0.25s ease-in-out;
} }
.more { .more {
color: #ff6600; color: #147ef9;
margin-left: 10px; margin-left: 10px;
cursor: pointer; cursor: pointer;
line-height: 33px; line-height: 33px;
......
src/pages/goods/listold.vue
浏览文件 @ 0bebd385
<template> <template>
<div class="goods-list"> <div class="goods-list">
<toptitle name="商品列表"> <toptitle name="商品列表">
<el-button type="primary"> <el-button type="primary">
<router-link :to="{path:'/goods/templateold'}">+发布商品</router-link> <router-link :to="{path:'/goods/templateold'}">+发布商品</router-link>
</el-button> </el-button>
</toptitle> </toptitle>
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
end-placeholder="结束日期"> end-placeholder="结束日期">
</el-date-picker> </el-date-picker>
</div> </div>
</div> </div>
<div class="search-btn-box"> <div class="search-btn-box">
<el-button type="primary" size="medium " @click="onSearch">搜索</el-button> <el-button type="primary" size="medium " @click="onSearch">搜索</el-button>
...@@ -113,7 +113,7 @@ ...@@ -113,7 +113,7 @@
<el-table-column prop="brandName" label="品牌" align="center"></el-table-column> <el-table-column prop="brandName" label="品牌" align="center"></el-table-column>
<el-table-column prop="model" label="SPU型号" align="center"></el-table-column> <el-table-column prop="model" label="SPU型号" align="center"></el-table-column>
<!-- <el-table-column prop="supplierName" label="供应商" align="center"></el-table-column> --> <!-- <el-table-column prop="supplierName" label="供应商" align="center"></el-table-column> -->
<el-table-column prop="addTime" label="商品状态" align="center"> <el-table-column prop="addTime" label="商品状态" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="edit"> <div class="edit">
...@@ -441,7 +441,7 @@ export default { ...@@ -441,7 +441,7 @@ export default {
transition: transform 0.25s ease-in-out; transition: transform 0.25s ease-in-out;
} }
.more { .more {
color: #ff6600; color: #147ef9;
margin-left: 10px; margin-left: 10px;
cursor: pointer; cursor: pointer;
line-height: 33px; line-height: 33px;
......
src/pages/goods/newProduct.vue
浏览文件 @ 0bebd385
此差异已折叠。
src/pages/goods/template.vue
浏览文件 @ 0bebd385
...@@ -167,7 +167,7 @@ export default { ...@@ -167,7 +167,7 @@ export default {
}, },
init() { init() {
let { brandId } = _getStorage('info'); let { brandId } = _getStorage('info');
this.$axios.get("/products/sdSupplierMenuList",{ this.$axios.get("/products/operationsMenuList",{
params:{ params:{
brandId:brandId brandId:brandId
} }
...@@ -227,7 +227,7 @@ export default { ...@@ -227,7 +227,7 @@ export default {
// min-height: 500px; // min-height: 500px;
padding-top: 50px; padding-top: 50px;
.f_c_theme{ .f_c_theme{
color: #f60; color: #147ef9;
} }
.select-product { .select-product {
width:540px; width:540px;
......
src/pages/goods/warnStock.vue
浏览文件 @ 0bebd385
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
</div> </div>
<div class="search-item"> <div class="search-item">
<span class="label">库存状态：</span> <span class="label">库存状态：</span>
<el-select style="width:120px;" class="input" clearable v-model="params.stockType" placeholder="请选择状态"> <el-select class="input" clearable v-model="params.stockType" placeholder="请选择状态">
<el-option <el-option
v-for="item in statusList" v-for="item in statusList"
:key="item.value" :key="item.value"
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
<template slot-scope="scope"> <template slot-scope="scope">
<p class="price">供货价：{{scope.row.supplyPrice}}</p> <p class="price">供货价：{{scope.row.supplyPrice}}</p>
<div v-if="!priceformulaId"> <div v-if="!priceformulaId">
<!--<p class="price">采购价：{{scope.row.purchasePrice}}</p>--> <p class="price">采购价：{{scope.row.purchasePrice}}</p>
<p class="price">优惠价：{{scope.row.salePrice}}</p> <p class="price">优惠价：{{scope.row.salePrice}}</p>
<p class="price">零售价：{{scope.row.productPrice}}</p> <p class="price">零售价：{{scope.row.productPrice}}</p>
</div> </div>
......
src/pages/help/exVip.vue
浏览文件 @ 0bebd385
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
<div class="p_all_30"> <div class="p_all_30">
<div class="txt"> <div class="txt">
1.铂金品牌的权益有哪些？ 1.铂金品牌的权益有哪些？
<br>铂金品牌的商品，是全网销售的商品，没有区域限制，并且在E淘宝里全部开放销售。铂金品牌享有3大权益，分别是：全部商品销售，铂金品牌区，专属活动。全部商品销售是没有区域限制，可全网开放销售所有商品；铂金品牌区是E淘平台为铂金品牌设立的采购区域，仅铂金品牌享有此特权；专属活动是铂金品牌的商品在E淘全网享有专属活动销售。 <br>铂金品牌的商品，是全网销售的商品，没有区域限制，并且在EDS宝里全部开放销售。铂金品牌享有3大权益，分别是：全部商品销售，铂金品牌区，专属活动。全部商品销售是没有区域限制，可全网开放销售所有商品；铂金品牌区是E淘平台为铂金品牌设立的采购区域，仅铂金品牌享有此特权；专属活动是铂金品牌的商品在E淘全网享有专属活动销售。
<br>2.普通品牌的权益有哪些？ <br>2.普通品牌的权益有哪些？
<br>普通品牌的商品，是全网销售的商品，有区域限制，并且在E淘宝里不开放销售。普通品牌不开放在铂金品牌区域销售。 <br>普通品牌的商品，是全网销售的商品，有区域限制，并且在EDS宝里不开放销售。普通品牌不开放在铂金品牌区域销售。
<br>3.铂金品牌 VS 普通品牌权益 <br>3.铂金品牌 VS 普通品牌权益
</div> </div>
<el-table <el-table
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
label="普通品牌"> label="普通品牌">
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
</div> </div>
</template> </template>
......
src/pages/help/exproducts.vue
浏览文件 @ 0bebd385
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<div class="p_all_30"> <div class="p_all_30">
<div class="txt"> <div class="txt">
1、 什么是商品信息？ 1、 什么是商品信息？
<br>商品信息中的的商品，是全网销售的商品，没有区域的限制，并且在E淘里全部开放销售。 <br>商品信息中的的商品，是全网销售的商品，没有区域的限制，并且在EDS里全部开放销售。
<br>商品信息中的商品，有3种状态，分别是：出售中的商品，已售罄的商品，已下架的商品。出售中的商品是正在卖并有库存的商品；已售罄的商品是已经卖光了，库存为0的商品；已下架的商品是没有在卖，放在仓库的商品。 <br>商品信息中的商品，有3种状态，分别是：出售中的商品，已售罄的商品，已下架的商品。出售中的商品是正在卖并有库存的商品；已售罄的商品是已经卖光了，库存为0的商品；已下架的商品是没有在卖，放在仓库的商品。
</div> </div>
......
src/pages/help/logouser.vue
浏览文件 @ 0bebd385
<template> <template>
<div class="p_all_20"> <div class="p_all_20">
<div class="title">E淘Logo使用规范</div> <div class="title">EDSLogo使用规范</div>
<div class="txt"> <div class="txt">
<a class="el-icon-download" href="https://edspicserver.oss-cn-hangzhou.aliyuncs.com/ROOT/ETao/gl/help/logoImg.png" target="_blank">下载图片文件</a> <a class="el-icon-download" href="https://edspicserver.oss-cn-hangzhou.aliyuncs.com/ROOT/ETao/gl/help/logoImg.png" target="_blank">下载图片文件</a>
<a class="el-icon-download" href="https://edspicserver.oss-cn-hangzhou.aliyuncs.com/ROOT/ETao/gl/help/logoImg2.psd" target="_blank">下载psd文件</a> <a class="el-icon-download" href="https://edspicserver.oss-cn-hangzhou.aliyuncs.com/ROOT/ETao/gl/help/logoImg2.psd" target="_blank">下载psd文件</a>
<a href="https://edspicserver.oss-cn-hangzhou.aliyuncs.com/ROOT/ETao/gl/help/logoImg.png" target="_blank" download="etaoIcon" class="imgbox"> <a href="https://edspicserver.oss-cn-hangzhou.aliyuncs.com/ROOT/ETao/gl/help/logoImg.png" target="_blank" download="etaoIcon" class="imgbox">
<img src="https://edspicserver.oss-cn-hangzhou.aliyuncs.com/ROOT/ETao/gl/help/logoImg.png" alt=""> <img src="https://edspicserver.oss-cn-hangzhou.aliyuncs.com/ROOT/ETao/gl/help/logoImg.png" alt="">
</a> </a>
</div> </div>
</div> </div>
</template> </template>
...@@ -22,7 +22,7 @@ export default { ...@@ -22,7 +22,7 @@ export default {
}, },
mounted() { mounted() {
// 时间钩子 // 时间钩子
}, },
methods:{ methods:{
// 执行方法 // 执行方法
......
src/pages/marketing/activity/activityMall.vue
浏览文件 @ 0bebd385
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
活动报名时间：{{applyEndDate}}&nbsp&nbsp 活动报名时间：{{applyEndDate}}&nbsp&nbsp
</div> </div>
<!--<div class="actHead" @click="dialogVisible=true" style="cursor: pointer">--> <!--<div class="actHead" @click="dialogVisible=true" style="cursor: pointer">-->
<!--查看活动规则--> <!--查看活动规则-->
<!--</div>--> <!--</div>-->
<el-button type="primary" @click="goback" v-if="!showUpdateBtn"> <el-button type="primary" @click="goback" v-if="!showUpdateBtn">
添加活动商品 添加活动商品
......
src/pages/marketing/activity/model/AddActivityProduct.vue
浏览文件 @ 0bebd385
...@@ -244,7 +244,7 @@ ...@@ -244,7 +244,7 @@
} }
this.loading=true this.loading=true
this.otherLoading = true; this.otherLoading = true;
this.$axios.post("/actLocalRegist/addActGoods", { this.$axios.post("/actregist/addActGoods", {
skuIds: this.selection, skuIds: this.selection,
"actId": this.activeStatus, "actId": this.activeStatus,
}).then(res => { }).then(res => {
...@@ -264,7 +264,7 @@ ...@@ -264,7 +264,7 @@
// 未参加活动的商品 // 未参加活动的商品
getNotRegistsList() { getNotRegistsList() {
this.loading = true; this.loading = true;
this.$axios.post("/actLocalRegist/notRegistsList", { this.$axios.post("/actregist/notRegistsList", {
...this.params2, ...this.params2,
"actId":this.activeStatus, "actId":this.activeStatus,
}).then(res => { }).then(res => {
...@@ -284,7 +284,7 @@ ...@@ -284,7 +284,7 @@
// 参加活动的商品 // 参加活动的商品
getRegisteredList() { getRegisteredList() {
this.loading = true; this.loading = true;
this.$axios.post("/actLocalRegist/registered", { this.$axios.post("/actregist/registered", {
...this.params, ...this.params,
"actId":this.activeStatus, "actId":this.activeStatus,
}).then(res => { }).then(res => {
...@@ -302,7 +302,7 @@ ...@@ -302,7 +302,7 @@
}); });
}, },
getZoneList() { getZoneList() {
this.$axios.get("/actLocalRegist/zoneList").then(res => { this.$axios.get("/actregist/zoneList").then(res => {
let { code, data } = res.data; let { code, data } = res.data;
if (code === 200) { if (code === 200) {
this.zoneList = data.list.filter(item=>item.actId!='defaultActRegist'); this.zoneList = data.list.filter(item=>item.actId!='defaultActRegist');
...@@ -440,7 +440,7 @@ ...@@ -440,7 +440,7 @@
// min-height: 500px; // min-height: 500px;
padding-top: 50px; padding-top: 50px;
.f_c_theme { .f_c_theme {
color: #f60; color: #147ef9;
} }
.btn-box { .btn-box {
text-align: center; text-align: center;
......
src/pages/marketing/activityCopy/activityMall.vue
浏览文件 @ 0bebd385
...@@ -398,7 +398,7 @@ ...@@ -398,7 +398,7 @@
}, },
getActSkuList() { getActSkuList() {
this.loading=true this.loading=true
this.$axios.post("/actLocalRegist/actSkuList", { this.$axios.post(this.headTitle.type==2?"/actregist/autonom/actSkuList":"/actregist/actSkuList", {
...this.params, ...this.params,
"actId":this.headTitle.type==2?this.headTitle.actId:this.activeStatus, "actId":this.headTitle.type==2?this.headTitle.actId:this.activeStatus,
}).then(res => { }).then(res => {
......
src/pages/marketing/activityCopy/model/AddActivityProduct.vue
浏览文件 @ 0bebd385
...@@ -171,7 +171,7 @@ ...@@ -171,7 +171,7 @@
// 未参加活动的商品 // 未参加活动的商品
getNotRegistsList() { getNotRegistsList() {
this.loading = true; this.loading = true;
this.$axios.post("/actregist/notRegistsList", { this.$axios.post(this.temType==2?"/actregist/autonom/notRegistsList":"/actregist/notRegistsList", {
...this.params2, ...this.params2,
"actId":this.temType==2?this.temActId:'f4f15eac-0699-11ed-9da2-7cd30aeb12-7z', "actId":this.temType==2?this.temActId:'f4f15eac-0699-11ed-9da2-7cd30aeb12-7z',
}).then(res => { }).then(res => {
...@@ -191,7 +191,7 @@ ...@@ -191,7 +191,7 @@
// 参加活动的商品 // 参加活动的商品
getRegisteredList() { getRegisteredList() {
this.loading = true; this.loading = true;
this.$axios.post("/actregist/registered", { this.$axios.post(this.temType==2?"/actregist/autonom/actSkuList":"/actregist/registered", {
...this.params, ...this.params,
"actId":this.temType==2?this.temActId:'f4f15eac-0699-11ed-9da2-7cd30aeb12-7z', "actId":this.temType==2?this.temActId:'f4f15eac-0699-11ed-9da2-7cd30aeb12-7z',
}).then(res => { }).then(res => {
...@@ -224,7 +224,7 @@ ...@@ -224,7 +224,7 @@
// } // }
// } // }
this.otherLoading1 = true; this.otherLoading1 = true;
this.$axios.post("/actregist/delActGoods",params).then(res => { this.$axios.post(this.temType==2?"/actregist/autonom/delActGoods":"/actregist/delActGoods",params).then(res => {
let { code, msg } = res.data; let { code, msg } = res.data;
if (code == 200) { if (code == 200) {
if(this.actSkuList.length-this.delSelection.length==0){ if(this.actSkuList.length-this.delSelection.length==0){
...@@ -247,7 +247,7 @@ ...@@ -247,7 +247,7 @@
return; return;
} }
this.otherLoading = true; this.otherLoading = true;
this.$axios.post("/actregist/addActGoods", { this.$axios.post(this.temType==2?"/actregist/autonom/addActGoods":"/actregist/addActGoods", {
skuIds: this.selection, skuIds: this.selection,
"actId":this.temType==2?this.temActId:'f4f15eac-0699-11ed-9da2-7cd30aeb12-7z', "actId":this.temType==2?this.temActId:'f4f15eac-0699-11ed-9da2-7cd30aeb12-7z',
}).then(res => { }).then(res => {
......
src/pages/marketing/advert/adList.vue
浏览文件 @ 0bebd385
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<el-form-item label="投放端口：" prop="portStatus"> <el-form-item label="投放端口：" prop="portStatus">
<el-select v-model="params.portStatus" placeholder="投放端口"> <el-select v-model="params.portStatus" placeholder="投放端口">
<el-option label="分销App" value="1"></el-option> <el-option label="分销App" value="1"></el-option>
<el-option label="E淘宝" value="2"></el-option> <el-option label="TV版" value="2"></el-option>
<el-option label="分销PC" value="3"></el-option> <el-option label="分销PC" value="3"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
<div class="adtext"> <div class="adtext">
<p class="p1"> <p class="p1">
<span>{{item.advertisementTitle}}</span> <span>{{item.advertisementTitle}}</span>
<span v-if="item.statusType==2 && item.tip<3">仅剩<span style="color:#f60;"> {{item.tip}} </span>天</span> <span v-if="item.statusType==2 && item.tip<3">仅剩<span style="color:#147ef9;"> {{item.tip}} </span>天</span>
</p> </p>
<p>投放端口：{{item.portContent}}</p> <p>投放端口：{{item.portContent}}</p>
<p>投放时间：{{item.timeContent}}</p> <p>投放时间：{{item.timeContent}}</p>
...@@ -53,10 +53,10 @@ ...@@ -53,10 +53,10 @@
-- 暂无数据 -- -- 暂无数据 --
</div> </div>
<div class="pagination"> <div class="pagination">
<pagination <pagination
@eventSizeChange="eventSizeChange" @eventSizeChange="eventSizeChange"
@eventCurrentChange="eventCurrentChange" @eventCurrentChange="eventCurrentChange"
:total="total" :total="total"
:pageSize="params.pageSize" :pageSize="params.pageSize"
:pageSizes=[6] :pageSizes=[6]
></pagination> ></pagination>
...@@ -203,7 +203,7 @@ import adMall from "./adMall" ...@@ -203,7 +203,7 @@ import adMall from "./adMall"
.brand_nav::-webkit-scrollbar-thumb{background-color: #8b8b8b;border-radius: 10px;} .brand_nav::-webkit-scrollbar-thumb{background-color: #8b8b8b;border-radius: 10px;}
.brand_nav .listName{display: inline-block;color: #797979;font-size: 14px;padding: 0px 40px; .brand_nav .listName{display: inline-block;color: #797979;font-size: 14px;padding: 0px 40px;
border-right:1px solid #E4E4E4;border-bottom:1px solid #E4E4E4;background: #F6FAFD;cursor: pointer;border-top:2px solid #E4E4E4;height:46px;line-height:46px;} border-right:1px solid #E4E4E4;border-bottom:1px solid #E4E4E4;background: #F6FAFD;cursor: pointer;border-top:2px solid #E4E4E4;height:46px;line-height:46px;}
.brand_nav .actCss {background:#fff;border-bottom:1px solid #fff;border-top:2px solid #f60;} .brand_nav .actCss {background:#fff;border-bottom:1px solid #fff;border-top:2px solid #147ef9;}
/*列表*/ /*列表*/
.searchInput::-webkit-input-placeholder {color: #aab2bd;font-size: 12px;padding-left:4px;} .searchInput::-webkit-input-placeholder {color: #aab2bd;font-size: 12px;padding-left:4px;}
......
src/pages/marketing/advert/adMall.vue
浏览文件 @ 0bebd385
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<el-form-item label="投放端口：" prop="portNum"> <el-form-item label="投放端口：" prop="portNum">
<el-select v-model="params.portNum" placeholder="投放端口"> <el-select v-model="params.portNum" placeholder="投放端口">
<el-option label="分销App" value="1"></el-option> <el-option label="分销App" value="1"></el-option>
<el-option label="E淘宝" value="2"></el-option> <el-option label="TV版" value="2"></el-option>
<el-option label="分销PC" value="3"></el-option> <el-option label="分销PC" value="3"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -38,10 +38,10 @@ ...@@ -38,10 +38,10 @@
-- 暂无数据 -- -- 暂无数据 --
</div> </div>
<div class="pagination"> <div class="pagination">
<pagination <pagination
@eventSizeChange="eventSizeChange" @eventSizeChange="eventSizeChange"
@eventCurrentChange="eventCurrentChange" @eventCurrentChange="eventCurrentChange"
:total="total" :total="total"
:pageSize="params.pageSize" :pageSize="params.pageSize"
:pageSizes=[6] :pageSizes=[6]
></pagination> ></pagination>
...@@ -164,7 +164,7 @@ import { _getStorage } from '@/utils/utils'; ...@@ -164,7 +164,7 @@ import { _getStorage } from '@/utils/utils';
.brand_nav::-webkit-scrollbar-thumb{background-color: #8b8b8b;border-radius: 10px;} .brand_nav::-webkit-scrollbar-thumb{background-color: #8b8b8b;border-radius: 10px;}
.brand_nav .listName{display: inline-block;color: #797979;font-size: 14px;padding: 0px 40px; .brand_nav .listName{display: inline-block;color: #797979;font-size: 14px;padding: 0px 40px;
border-right:1px solid #E4E4E4;border-bottom:1px solid #E4E4E4;background: #F6FAFD;cursor: pointer;border-top:2px solid #E4E4E4;height:46px;line-height:46px;} border-right:1px solid #E4E4E4;border-bottom:1px solid #E4E4E4;background: #F6FAFD;cursor: pointer;border-top:2px solid #E4E4E4;height:46px;line-height:46px;}
.brand_nav .actCss {background:#fff;border-bottom:1px solid #fff;border-top:2px solid #f60;} .brand_nav .actCss {background:#fff;border-bottom:1px solid #fff;border-top:2px solid #147ef9;}
/*列表*/ /*列表*/
.searchInput::-webkit-input-placeholder {color: #aab2bd;font-size: 12px;padding-left:4px;} .searchInput::-webkit-input-placeholder {color: #aab2bd;font-size: 12px;padding-left:4px;}
......
src/pages/marketing/info/holiday.vue
浏览文件 @ 0bebd385
...@@ -5,7 +5,8 @@ ...@@ -5,7 +5,8 @@
<div class="warmNotice"> <div class="warmNotice">
<p>温馨提示：</p> <p>温馨提示：</p>
<p>1、年假期间，为避免出现下单后工厂无法发货的情况，请已经彻底停止接单、发货的品牌在下方设置具体的工厂放假时间，以通知客户避免在此期间下单后无法完成收货安装的问题。</p> <p>1、年假期间，为避免出现下单后工厂无法发货的情况，请已经彻底停止接单、发货的品牌在下方设置具体的工厂放假时间，以通知客户避免在此期间下单后无法完成收货安装的问题。</p>
<p>2、设置好放假时间后，勾选“通知客户”即可在分销系统通知客户，<span style="color:red">假期结束后需要关闭通知客户功能</span>。</p> <p>2、设置好放假时间，点击"提交放假"后，即可在分销系统通知客户，同时，对应品牌商品将显示"年后发货"角标，<span style="color:red">时间结束后，将自动关闭放假通知</span>。</p>
<p>3、放假期间生成的订单，将不会受到发货超时的惩罚。</p>
</div> </div>
<div class="vacationDate"> <div class="vacationDate">
<div class="block"> <div class="block">
...@@ -19,8 +20,8 @@ ...@@ -19,8 +20,8 @@
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
></el-date-picker> ></el-date-picker>
</div> </div>
<div class="buttonWrapper"> <div class="buttonWrapper" style="margin-top: 30px">
<el-checkbox v-model="checked" class="checkBox">通知客户</el-checkbox> <!--<el-checkbox v-model="checked" class="checkBox">通知客户</el-checkbox>-->
<el-button type="primary" class="vacationSubmit" @click="handleBtnClick">提交</el-button> <el-button type="primary" class="vacationSubmit" @click="handleBtnClick">提交</el-button>
</div> </div>
</div> </div>
...@@ -39,7 +40,7 @@ export default { ...@@ -39,7 +40,7 @@ export default {
}; };
}, },
components: { components: {
}, },
mounted() { mounted() {
this.init() this.init()
...@@ -67,7 +68,7 @@ export default { ...@@ -67,7 +68,7 @@ export default {
let params = {} let params = {}
let e = this let e = this
params.enable = e.checked == true?1:0 params.enable = 1
params.start = e.dateArray[0] params.start = e.dateArray[0]
params.end = e.dateArray[1] params.end = e.dateArray[1]
......
src/pages/marketing/info/message.vue
浏览文件 @ 0bebd385
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
<div class="copy-list" v-if="showCcList"> <div class="copy-list" v-if="showCcList">
<p class="title"> <p class="title">
<span>{{titShow}}（E淘商城）</span> 抄送列表 <span>{{titShow}}（EDS商城）</span> 抄送列表
</p> </p>
<el-table :data="ccList" style="width: 100%" v-loading="ccListLoading"> <el-table :data="ccList" style="width: 100%" v-loading="ccListLoading">
<el-table-column prop="name" label="姓名"></el-table-column> <el-table-column prop="name" label="姓名"></el-table-column>
...@@ -313,4 +313,4 @@ export default { ...@@ -313,4 +313,4 @@ export default {
} }
} }
} }
</style> </style>
\ No newline at end of file
src/pages/marketing/shop/brand/introduce.vue
浏览文件 @ 0bebd385
...@@ -340,7 +340,7 @@ export default { ...@@ -340,7 +340,7 @@ export default {
this.brandInfo.resource = []; this.brandInfo.resource = [];
this.brandInfo.bannerPath=''; this.brandInfo.bannerPath='';
} }
this.loading = false; this.loading = false;
} }
}); });
...@@ -652,7 +652,7 @@ export default { ...@@ -652,7 +652,7 @@ export default {
.brand_nav .actCss { .brand_nav .actCss {
background: #fff; background: #fff;
border-bottom: 1px solid #fff; border-bottom: 1px solid #fff;
border-top: 2px solid #f60; border-top: 2px solid #147ef9;
} }
.brandContent { .brandContent {
......
src/pages/marketing/shop/brand/planAdd.vue
浏览文件 @ 0bebd385
...@@ -345,7 +345,7 @@ export default { ...@@ -345,7 +345,7 @@ export default {
var route=this.$route; var route=this.$route;
var planId=route.query.planId || ''; var planId=route.query.planId || '';
this.planId =planId; this.planId =planId;
if(planId){ if(planId){
this.titleLabel = "编辑方案"; this.titleLabel = "编辑方案";
this.getTplData(); this.getTplData();
...@@ -961,7 +961,7 @@ img{ ...@@ -961,7 +961,7 @@ img{
.ulBox {position:absolute;bottom:-1px;background-color:#fff;} .ulBox {position:absolute;bottom:-1px;background-color:#fff;}
.brand_nav {white-space: nowrap;font-size: 0;} .brand_nav {white-space: nowrap;font-size: 0;}
.brand_nav .listName{display: inline-block;color: #797979;font-size: 14px;padding: 12px 40px;border-right:1px solid #E4E4E4;background: #fff;cursor: pointer;border-top:2px solid #E4E4E4;} .brand_nav .listName{display: inline-block;color: #797979;font-size: 14px;padding: 12px 40px;border-right:1px solid #E4E4E4;background: #fff;cursor: pointer;border-top:2px solid #E4E4E4;}
.brand_nav .actCss {background:#fff;border-top:2px solid #f60;} .brand_nav .actCss {background:#fff;border-top:2px solid #147ef9;}
.goback{position:absolute;right:30px;top:6px;border:1px solid #E4E4E4;border-radius:4px;padding:5px 16px;color:#797979;font-size:14px;cursor:pointer;} .goback{position:absolute;right:30px;top:6px;border:1px solid #E4E4E4;border-radius:4px;padding:5px 16px;color:#797979;font-size:14px;cursor:pointer;}
.brandContent{padding:40px;padding-bottom:0;} .brandContent{padding:40px;padding-bottom:0;}
...@@ -992,7 +992,7 @@ img{ ...@@ -992,7 +992,7 @@ img{
border-radius: 6px; border-radius: 6px;
} }
.titleP{padding:20px 40px;} .titleP{padding:20px 40px;}
.totalCss{color:#f60;} .totalCss{color:#147ef9;}
.saveBtnBox{padding:20px;padding-left:40px;cursor:pointer;} .saveBtnBox{padding:20px;padding-left:40px;cursor:pointer;}
.saveBtnBox .saveBtn{background:#409eff;color:#fff;width:100px;height:38px;line-height:38px;text-align:center;border-radius:4px;display:inline-block;margin-right:20px;border:1px solid #409eff;} .saveBtnBox .saveBtn{background:#409eff;color:#fff;width:100px;height:38px;line-height:38px;text-align:center;border-radius:4px;display:inline-block;margin-right:20px;border:1px solid #409eff;}
......
src/pages/marketing/statistics/printReport.vue
浏览文件 @ 0bebd385
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<el-button type="primary" @click="onExport('pdf')">立即生成PDF<i class="el-icon-arrow-right"></i> </el-button> <el-button type="primary" @click="onExport('pdf')">立即生成PDF<i class="el-icon-arrow-right"></i> </el-button>
</div> </div>
<div id="printArea" class="print_area f_18 t_center" style="margin-left: -20px"> <div id="printArea" class="print_area f_18 t_center" style="margin-left: -20px">
<div class="f_24 f_w">E淘运营数据报告</div> <div class="f_24 f_w">EDS运营数据报告</div>
<div class="f_12 m_tb_5">更新日期：2022/7/25</div> <div class="f_12 m_tb_5">更新日期：2022/7/25</div>
<div class="stripe_table p_b_10"> <div class="stripe_table p_b_10">
<div v-for="rItem in tableList" class="stripe_row d_flex flex_row"> <div v-for="rItem in tableList" class="stripe_row d_flex flex_row">
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
</div> </div>
</div> </div>
<div class="p_b_20"> <div class="p_b_20">
<div class="chart_title">E淘平台现金流表</div> <div class="chart_title">EDS平台现金流表</div>
<el-table class="chart_container" :data="table2List" stripe header-cell-class-name="stripe2_table" <el-table class="chart_container" :data="table2List" stripe header-cell-class-name="stripe2_table"
:cell-class-name="getCellClass"> :cell-class-name="getCellClass">
<el-table-column prop="i201" label="行次" width="80" /> <el-table-column prop="i201" label="行次" width="80" />
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
</el-table> </el-table>
</div> </div>
<div class="p_b_20"> <div class="p_b_20">
<div class="chart_title">E淘平台利润表</div> <div class="chart_title">EDS平台利润表</div>
<el-table class="chart_container" :data="table3List" stripe header-cell-class-name="stripe2_table" <el-table class="chart_container" :data="table3List" stripe header-cell-class-name="stripe2_table"
:cell-class-name="getCellClass"> :cell-class-name="getCellClass">
<el-table-column prop="i301" label="行次" width="80" /> <el-table-column prop="i301" label="行次" width="80" />
...@@ -240,7 +240,7 @@ ...@@ -240,7 +240,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="chart_title m_t_20">E淘宝开机情况</div> <div class="chart_title m_t_20">TV版开机情况</div>
<div class="chart_container"> <div class="chart_container">
<div class="flex_x_between"> <div class="flex_x_between">
<div> <div>
...@@ -289,7 +289,7 @@ ...@@ -289,7 +289,7 @@
</el-table> </el-table>
</div> </div>
<div> <div>
<el-divider class="chart_divider">E淘宝平板开机情况</el-divider> <el-divider class="chart_divider">TV版平板开机情况</el-divider>
<el-table :data="table11List" show-summary stripe <el-table :data="table11List" show-summary stripe
:summary-method="(params) => getSummaries(params, table11NP)" header-cell-class-name="top20_table" :summary-method="(params) => getSummaries(params, table11NP)" header-cell-class-name="top20_table"
:cell-class-name="getTop20CellClass"> :cell-class-name="getTop20CellClass">
...@@ -869,7 +869,7 @@ export default { ...@@ -869,7 +869,7 @@ export default {
}, },
downLoad(url) { downLoad(url) {
var a = document.createElement("a"); var a = document.createElement("a");
a.download = 'E淘运营数据报告.jpg'; a.download = 'EDS运营数据报告.jpg';
a.href = url; a.href = url;
document.body.appendChild(a); document.body.appendChild(a);
a.click(); a.click();
...@@ -908,7 +908,7 @@ export default { ...@@ -908,7 +908,7 @@ export default {
} }
} }
} }
pdf.save('E淘运营数据报告.pdf'); pdf.save('EDS运营数据报告.pdf');
}).finally(() => { }).finally(() => {
this.loading = false this.loading = false
}) })
...@@ -1179,4 +1179,4 @@ export default { ...@@ -1179,4 +1179,4 @@ export default {
} }
} }
} }
</style> </style>
\ No newline at end of file
src/pages/marketing/tools/addShop.jpg 0 → 100644
浏览文件 @ 0bebd385
此差异已折叠。
src/pages/marketing/tools/msn.vue
浏览文件 @ 0bebd385
此差异已折叠。
src/pages/marketing/tools/set1.png 0 → 100644
浏览文件 @ 0bebd385
此差异已折叠。
src/pages/marketing/tools/set3.png 0 → 100644
浏览文件 @ 0bebd385
此差异已折叠。
src/pages/marketing/tools/ziyuanwei.vue 0 → 100644
浏览文件 @ 0bebd385
此差异已折叠。
src/pages/marketing/tools/ziyuanweiDetails.vue 0 → 100644
浏览文件 @ 0bebd385
此差异已折叠。
src/pages/order/advertisementList.vue 0 → 100644
浏览文件 @ 0bebd385
此差异已折叠。
src/pages/order/component/addShop.jpg 0 → 100644
浏览文件 @ 0bebd385
此差异已折叠。
src/pages/order/component/advertisementModel.vue 0 → 100644
浏览文件 @ 0bebd385
此差异已折叠。
src/pages/order/component/set1.png 0 → 100644
浏览文件 @ 0bebd385
此差异已折叠。
src/pages/order/component/set3.png 0 → 100644
浏览文件 @ 0bebd385
此差异已折叠。
src/pages/order/component/xufeiModel.vue 0 → 100644
浏览文件 @ 0bebd385
此差异已折叠。
src/pages/order/frmOrderDetail.vue
浏览文件 @ 0bebd385
此差异已折叠。
src/pages/order/myAdvertisement.vue 0 → 100644
浏览文件 @ 0bebd385
此差异已折叠。
src/pages/order/sss.png 0 → 100644
浏览文件 @ 0bebd385
此差异已折叠。
src/pages/others/platform.vue
浏览文件 @ 0bebd385
此差异已折叠。
src/router/index.js
浏览文件 @ 0bebd385
此差异已折叠。
src/router/routers/checking.js
浏览文件 @ 0bebd385
此差异已折叠。
src/router/routers/marketing.js
浏览文件 @ 0bebd385
此差异已折叠。
src/router/routers/order.js
浏览文件 @ 0bebd385
此差异已折叠。
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或