Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
E
etao-sjht-sd
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
张志伟
etao-sjht-sd
提交
0080bad0
提交
0080bad0
编写于
7月 29, 2024
作者:
zhangzhiwei
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
.
上级
a2922d3c
变更
9
展开全部
隐藏空白字符变更
内嵌
并排
正在显示
9 个修改的文件
包含
66 行增加
和
18 行删除
+66
-18
index.html
dist/index.html
+1
-1
app.dd9904fb821b676818eac8edf817d723.css
dist/static/css/app.dd9904fb821b676818eac8edf817d723.css
+1
-1
0.0d853226043309eb903c.js
dist/static/js/0.0d853226043309eb903c.js
+5
-5
app.4b2c6164a0f24d0d12d8.js
dist/static/js/app.4b2c6164a0f24d0d12d8.js
+1
-0
app.dfcefe57a10ba583abd2.js
dist/static/js/app.dfcefe57a10ba583abd2.js
+0
-1
manifest.411fc796e91a53bd6ce0.js
dist/static/js/manifest.411fc796e91a53bd6ce0.js
+1
-1
App.vue
src/App.vue
+1
-0
newProduct.vue
src/pages/goods/newProduct.vue
+55
-8
activityMall.vue
src/pages/marketing/activity/activityMall.vue
+1
-1
未找到文件。
dist/index.html
浏览文件 @
0080bad0
<!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.61a1c84465019ded16d4aa014961dc4e.css
rel=
stylesheet
></head><body><div
id=
app
></div><script
type=
text/javascript
src=
/static/js/manifest.f8521be88ba303d03ddf.js
></script><script
type=
text/javascript
src=
/static/js/vendor.02a8d01969b52bb78b9a.js
></script><script
type=
text/javascript
src=
/static/js/app.dfcefe57a10ba583abd2.js
></script></body></html>
\ No newline at end of file
<!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.dd9904fb821b676818eac8edf817d723.css
rel=
stylesheet
></head><body><div
id=
app
></div><script
type=
text/javascript
src=
/static/js/manifest.411fc796e91a53bd6ce0.js
></script><script
type=
text/javascript
src=
/static/js/vendor.02a8d01969b52bb78b9a.js
></script><script
type=
text/javascript
src=
/static/js/app.4b2c6164a0f24d0d12d8.js
></script></body></html>
\ No newline at end of file
dist/static/css/app.
61a1c84465019ded16d4aa014961dc4e
.css
→
dist/static/css/app.
dd9904fb821b676818eac8edf817d723
.css
浏览文件 @
0080bad0
此差异已折叠。
点击以展开。
dist/static/js/0.
66a87bf7ecd2fcbaae3b
.js
→
dist/static/js/0.
0d853226043309eb903c
.js
浏览文件 @
0080bad0
此差异已折叠。
点击以展开。
dist/static/js/app.4b2c6164a0f24d0d12d8.js
0 → 100644
浏览文件 @
0080bad0
此差异已折叠。
点击以展开。
dist/static/js/app.dfcefe57a10ba583abd2.js
已删除
100644 → 0
浏览文件 @
a2922d3c
此差异已折叠。
点击以展开。
dist/static/js/manifest.
f8521be88ba303d03ddf
.js
→
dist/static/js/manifest.
411fc796e91a53bd6ce0
.js
浏览文件 @
0080bad0
!
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
=
12
e4
,
o
.
nc
&&
a
.
setAttribute
(
"nonce"
,
o
.
nc
),
a
.
src
=
o
.
p
+
"static/js/"
+
e
+
"."
+
{
0
:
"66a87bf7ecd2fcbaae3b"
,
3
:
"ca2708494961454b4374"
,
4
:
"c569c81ffe41d4800bf8"
,
5
:
"cb7f3344fd930f577a5c"
}[
e
]
+
".js"
;
var
i
=
setTimeout
(
u
,
12
e4
);
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
!
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
=
12
e4
,
o
.
nc
&&
a
.
setAttribute
(
"nonce"
,
o
.
nc
),
a
.
src
=
o
.
p
+
"static/js/"
+
e
+
"."
+
{
0
:
"0d853226043309eb903c"
,
3
:
"ca2708494961454b4374"
,
4
:
"c569c81ffe41d4800bf8"
,
5
:
"cb7f3344fd930f577a5c"
}[
e
]
+
".js"
;
var
i
=
setTimeout
(
u
,
12
e4
);
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
src/App.vue
浏览文件 @
0080bad0
...
...
@@ -39,6 +39,7 @@ export default {
localStorage
.
setItem
(
'priceformulaId'
,
data
.
priceformulaId
||
null
)
localStorage
.
setItem
(
'actSw'
,
data
.
actSw
)
localStorage
.
setItem
(
'allowCustomActDate'
,
data
.
allowCustomActDate
||
null
)
localStorage
.
setItem
(
'isCustomPriceMode'
,
data
.
isCustomPriceMode
||
0
)
}
})
},
...
...
src/pages/goods/newProduct.vue
浏览文件 @
0080bad0
...
...
@@ -207,6 +207,20 @@
</div>
</div>
</div>
<div
class=
"m_t_20 m_b_20"
style=
"font-size: 18px;font-weight: bold"
v-if=
"isCustomPriceMode==1"
>
自定义价格模式
<el-tooltip
placement=
"top"
>
<div
slot=
"content"
>
自定义价格模式：可以设置商品的供货价、批发价、优惠价、零售价
</div>
<span
style=
"margin-left: 10px;margin-right: 20px"
><i
style=
"color: #ff6600"
class=
"el-icon-question"
></i></span>
</el-tooltip>
<el-switch
:active-value=
"1"
:inactive-value=
"0"
v-model=
"isCustomPriceModeS"
>
</el-switch>
</div>
<div
class=
"m_t_20 m_b_20"
>
商品SKU设置
<span
class=
"f_14 f_c_disable form_tip"
>
SKU图必须为高清无底图，推荐图片像素为800*800PX， 大小不可超过512k，格式为png
</span>
...
...
@@ -323,7 +337,7 @@
</
template
>
</el-table-column>
<el-table-column
prop=
"purchasePrice"
label=
"
采购价"
width=
"120"
v-if=
"!priceformulaId&&false
"
>
<el-table-column
prop=
"purchasePrice"
label=
"
批发价"
width=
"120"
v-if=
"isCustomPriceModeS==1
"
>
<!-- <template slot="header" slot-scope="scope">
<el-tooltip placement="top" effect="light" v-if="pifaTip">
<div slot="content">
...
...
@@ -333,9 +347,21 @@
</el-tooltip>
<div v-else>采购价</div>
</template> -->
<
template
slot=
"header"
slot-scope=
"slot"
>
<el-tooltip
class=
"item"
placement=
"top"
>
<div
slot=
"content"
>
批发价：是指经销商购买的价格
<br/>
优惠价：是指消费者购买的结算价
<br/>
零售价：是指消费者看到的商品划线价
<br/>
锁定价格：所有系统看到的优惠价、零售价都与填写的价格一致
</div>
<span><i
style=
"color: #ff6600;font-size: 18px"
class=
"el-icon-question"
></i>
&
nbsp
&
nbsp批发价
&
nbsp
<i
@
click=
"Lock"
style=
"color: #575758;font-size: 18px;cursor: pointer"
:class=
"isPriceLock==1?'el-icon-lock':'el-icon-unlock'"
></i>
</span>
</el-tooltip>
</
template
>
<
template
slot-scope=
"scope"
>
<!--:disabled="hasFormula?true:false"-->
<el-input
v-model
.
trim=
"scope.row.purchasePrice"
placeholder=
"
采购
价"
<el-input
v-model
.
trim=
"scope.row.purchasePrice"
placeholder=
"
批发
价"
>
<i
slot=
"prefix"
class=
"iconfont iconrenminbi1 f_12 l_h_32 p_l_5"
></i>
</el-input>
...
...
@@ -343,7 +369,7 @@
</el-table-column>
<el-table-column
prop=
"salePrice"
label=
"优惠价"
width=
"120"
v-if=
"
!priceformulaId&&false
"
>
<el-table-column
prop=
"salePrice"
label=
"优惠价"
width=
"120"
v-if=
"
isCustomPriceModeS==1
"
>
<!-- <template slot="header" slot-scope="scope">
<el-tooltip placement="top" effect="light" v-if="youhuiTip">
<div slot="content">
...
...
@@ -353,6 +379,12 @@
</el-tooltip>
<div v-else>优惠价</div>
</template> -->
<
template
slot=
"header"
slot-scope=
"slot"
>
<span>
优惠价
&
nbsp
<i
@
click=
"Lock"
style=
"color: #575758;font-size: 18px;cursor: pointer"
:class=
"isPriceLock==1?'el-icon-lock':'el-icon-unlock'"
></i>
</span>
</
template
>
<
template
slot-scope=
"scope"
>
<!--:disabled="hasFormula?true:false"-->
<el-input
...
...
@@ -364,7 +396,7 @@
</el-input>
</
template
>
</el-table-column>
<el-table-column
prop=
"productPrice"
label=
"零售价"
width=
"120"
v-if=
"
!priceformulaId&&false
"
>
<el-table-column
prop=
"productPrice"
label=
"零售价"
width=
"120"
v-if=
"
isCustomPriceModeS==1
"
>
<!-- <template slot="header" slot-scope="scope">
<el-tooltip placement="top" effect="light" v-if="lingshouTip">
<div slot="content">
...
...
@@ -834,6 +866,9 @@ export default {
}
};
return
{
isPriceLock
:
0
,
isCustomPriceModeS
:
0
,
isCustomPriceMode
:
0
,
priceformulaId
:
null
,
beforeArr
:[],
//批量上传顺序
isDetails
:
false
,
...
...
@@ -898,6 +933,7 @@ export default {
inputNewValueVisible
:
{},
//新增参数
skuListInit
:
{
isPriceLock
:
0
,
"specs"
:
[],
"mainImg"
:
""
,
"model"
:
""
,
...
...
@@ -958,11 +994,19 @@ export default {
}
},
mounted
()
{
this
.
isCustomPriceMode
=
_getStorage
(
'isCustomPriceMode'
)
this
.
priceformulaId
=
_getStorage
(
'priceformulaId'
)
this
.
init
()
window
.
addEventListener
(
'scroll'
,
this
.
dataScroll
,
true
);
},
methods
:
{
Lock
(){
if
(
this
.
isPriceLock
==
1
){
this
.
isPriceLock
=
0
}
else
{
this
.
isPriceLock
=
1
}
},
loadingStart
(
tx
){
this
.
loading
=
this
.
$loading
({
lock
:
true
,
...
...
@@ -1003,9 +1047,9 @@ export default {
let
{
code
,
data
,
msg
,
message
}
=
r
.
data
if
(
code
==
200
){
row
.
supplyPrice
=
this
.
inputSupplyPrice
row
.
purchasePrice
=
data
.
purchasePrice
;
row
.
salePrice
=
data
.
salePrice
;
row
.
productPrice
=
data
.
productPrice
;
//
row.purchasePrice = data.purchasePrice;
//
row.salePrice = data.salePrice;
//
row.productPrice = data.productPrice;
// this.$message.success('自动计算成功');
}
else
{
this
.
$message
.
error
(
msg
||
message
);
...
...
@@ -1134,6 +1178,7 @@ export default {
}}).
then
(
r
=>
{
let
{
code
,
data
}
=
r
.
data
if
(
code
==
200
){
this
.
isCustomPriceModeS
=
data
.
isCustomPriceMode
this
.
editJson
=
data
// this.baseJson = { ...this.baseJson, ...data} //编辑源数据
// console.log(this.baseJson)
...
...
@@ -1247,7 +1292,7 @@ export default {
})
this
.
specsData
=
specs
console
.
log
(
this
.
skuList
,
'this.skuList'
);
}
})
.
catch
(
r
=>
console
.
log
(
r
));
...
...
@@ -2030,6 +2075,8 @@ export default {
postUrl
=
'/products/sdAdd'
}
// 提交数据
baseJson
.
isCustomPriceMode
=
this
.
isCustomPriceModeS
baseJson
.
isPriceLock
=
this
.
isPriceLock
this
.
$axios
.
post
(
postUrl
,
baseJson
).
then
(
r
=>
{
let
{
code
,
data
,
msg
,
message
}
=
r
.
data
if
(
code
==
200
){
...
...
src/pages/marketing/activity/activityMall.vue
浏览文件 @
0080bad0
...
...
@@ -28,7 +28,7 @@
<!--
<div
class=
"actHead"
@
click=
"dialogVisible=true"
style=
"cursor: pointer"
>
-->
<!--查看活动规则-->
<!--
</div>
-->
<el-button
type=
"primary"
@
click=
"goback"
v-if=
"showUpdateBtn"
>
<el-button
type=
"primary"
@
click=
"goback"
v-if=
"
!
showUpdateBtn"
>
添加活动商品
</el-button>
</div>
...
...
写
预览
Markdown
格式
0%
请重试
or
附加一个文件
附加文件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑！
取消
想要评论请
注册
或
登录
