Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Z
zhichan
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
蒋勇
zhichan
Commits
386e7525
Commit
386e7525
authored
Nov 14, 2019
by
刘泽奇
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
123
parent
96ca0a3d
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
143 additions
and
11 deletions
+143
-11
igirl-channel-web/app/front/entry/public/css/pagecom.css
+0
-0
igirl-channel-web/app/front/entry/public/imgs/zwtp.png
+0
-0
igirl-channel-web/app/front/entry/public/imgs/zwtp1.png
+0
-0
igirl-channel-web/app/front/vues/pages/jdindentdetail/jdindentdetail.html
+10
-1
igirl-channel-web/app/front/vues/pages/jdindentdetail/jdindentdetail.js
+42
-2
igirl-channel-web/app/front/vues/pages/selftmreg/index.css
+37
-2
igirl-channel-web/app/front/vues/pages/selftmreg/selftmreg.html
+0
-0
igirl-channel-web/app/front/vues/pages/selftmreg/selftmreg.js
+54
-6
No files found.
igirl-channel-web/app/front/entry/public/css/pagecom.css
View file @
386e7525
This source diff could not be displayed because it is too large. You can
view the blob
instead.
igirl-channel-web/app/front/entry/public/imgs/zwtp.png
View file @
386e7525
937 Bytes
|
W:
|
H:
2.54 KB
|
W:
|
H:
2-up
Swipe
Onion skin
igirl-channel-web/app/front/entry/public/imgs/zwtp1.png
0 → 100755
View file @
386e7525
937 Bytes
igirl-channel-web/app/front/vues/pages/jdindentdetail/jdindentdetail.html
View file @
386e7525
...
...
@@ -378,7 +378,7 @@
<div
v-else
style=
"overflow: auto;height: 100%;padding: 60px 20px 0px;box-sizing: border-box;text-align: center;"
>
<img
src=
"/imgs/kong-2.png"
style=
"margin-top: 124px;"
alt=
""
>
<div
style=
"color: #828282;margin-top:
10px
;"
>
请点击左侧选择商标类别
</div>
<div
style=
"color: #828282;margin-top:
330px;text-align: center
;"
>
请点击左侧选择商标类别
</div>
</div>
</el-main>
...
...
@@ -832,4 +832,12 @@
</span>
</el-dialog>
</div>
<!-- -->
<transition
name=
"message"
>
<div
class=
"selftmreg-message"
v-if=
"message.show"
>
<i
class=
"el-icon-warning"
></i>
{{message.info}}
</div>
</transition>
</div>
\ No newline at end of file
igirl-channel-web/app/front/vues/pages/jdindentdetail/jdindentdetail.js
View file @
386e7525
...
...
@@ -312,6 +312,10 @@
editNcl
:
{},
editDeliveryInfo
:
{},
editApply
:
{},
message
:
{
info
:
""
,
show
:
false
,
},
}
},
mounted
:
function
()
{
...
...
@@ -371,6 +375,42 @@
computed
:
{
},
watch
:
{
nclOne
:
{
handler
(
newVal
,
oldVal
){
if
(
newVal
.
length
>
0
)
{
if
(
newVal
.
length
>
1
)
{
this
.
$refs
.
tree
.
setChecked
(
newVal
[
1
],
false
);
this
.
$refs
.
tree
.
setChecked
(
newVal
[
1
].
nclThree
[
0
],
false
);
newVal
.
pop
();
this
.
message
.
show
=
!
this
.
message
.
show
;
this
.
message
.
info
=
"只能选择同一个类别"
;
var
tiemr
=
setTimeout
(()
=>
{
this
.
message
.
show
=
false
;
},
2000
);
clearTimeout
(
tiemr
);
};
if
(
newVal
[
0
].
nclThree
.
length
>
10
)
{
this
.
$refs
.
tree
.
setChecked
(
newVal
[
0
].
nclThree
[
10
],
false
);
newVal
[
0
].
nclThree
.
pop
();
console
.
log
(
newVal
,
newVal
[
0
].
nclThree
,
`xxxxxxxxxxxxxxxxxxxxxxxxxxxxx`
);
this
.
message
.
show
=
!
this
.
message
.
show
;
this
.
message
.
info
=
"最多只能选择10项"
;
var
tiemr2
=
setTimeout
(()
=>
{
this
.
message
.
show
=
false
;
},
2000
);
clearTimeout
(
tiemr2
);
}
}
},
deep
:
true
}
},
methods
:
{
/*初始化订单数据 */
...
...
@@ -421,7 +461,7 @@
item
.
nclSmallCodes
=
JSON
.
parse
(
item
.
nclSmallCodes
);
console
.
log
(
item
,
item
.
nclSmallCodes
,
"////////////////////////////////"
);
item
.
code
=
item
.
nclOneCodes
;
item
.
name
=
this
.
ncldata
[
item
.
nclOneCodes
.
replace
(
/
\b(
0+
)
/gi
,
""
)
-
1
].
name
;
item
.
name
=
this
.
ncldata
[
item
.
nclOneCodes
.
replace
(
/
\b(
0+
)
/gi
,
""
)
-
1
].
name
;
item
.
nclThree
=
item
.
nclSmallCodes
;
this
.
nclOne
.
push
(
item
);
});
...
...
@@ -888,7 +928,7 @@
}
},
nodeClick
(
obj
,
e
,
a
){
console
.
log
(
obj
,
e
,
a
);
console
.
log
(
obj
,
e
,
a
);
if
(
e
.
level
==
1
)
{
this
.
ppnclArr
=
obj
;
}
...
...
igirl-channel-web/app/front/vues/pages/selftmreg/index.css
View file @
386e7525
...
...
@@ -29,8 +29,8 @@
height
:
34px
!important
;
line-height
:
34px
!important
;
}
#selftmreg
#selftmreg
.el-step__head.is-success
{
#selftmreg
#selftmreg
.el-step__head.is-success
{
color
:
#409EFF
;
border-color
:
#409EFF
;
}
...
...
@@ -475,6 +475,10 @@
left
:
100%
;
}
.categoryFrom
.el-form-item__error
{
left
:
45%
!important
;
}
#selftmreg
h4
{
font-size
:
16px
;
font-family
:
PingFangSC
;
...
...
@@ -676,4 +680,34 @@
height
:
40px
;
border-radius
:
0
;
background
:
#0989C5
;
}
.selftmreg-message
{
position
:
fixed
;
transform
:
translateX
(
-50%
);
left
:
50%
;
top
:
20px
;
box-sizing
:
border-box
;
min-width
:
380px
;
border-radius
:
5px
;
border
:
1px
solid
#faecd8
;
background-color
:
#fdf6ec
;
color
:
#e6A23c
;
padding
:
15px
15px
15px
20px
;
z-index
:
8888
;
}
.message-enter-active
,
.message-leave-active
{
transition
:
opacity
.5s
;
}
.message-enter
,
.message-leave-to
/* .fade-leave-active below version 2.1.8 */
{
opacity
:
0
;
}
\ No newline at end of file
igirl-channel-web/app/front/vues/pages/selftmreg/selftmreg.html
View file @
386e7525
This diff is collapsed.
Click to expand it.
igirl-channel-web/app/front/vues/pages/selftmreg/selftmreg.js
View file @
386e7525
...
...
@@ -287,6 +287,11 @@
channelOrder
:
null
,
channelParams
:
null
,
channelUser
:
null
,
nclTime
:
null
,
message
:
{
info
:
""
,
show
:
false
,
},
}
},
computed
:
Vuex
.
mapState
({
...
...
@@ -331,6 +336,42 @@
}
},
watch
:
{
nclOne
:
{
handler
(
newVal
,
oldVal
){
if
(
newVal
.
length
>
0
)
{
if
(
newVal
.
length
>
1
)
{
this
.
$refs
.
tree
.
setChecked
(
newVal
[
1
],
false
);
this
.
$refs
.
tree
.
setChecked
(
newVal
[
1
].
nclThree
[
0
],
false
);
newVal
.
pop
();
this
.
message
.
show
=
!
this
.
message
.
show
;
this
.
message
.
info
=
"只能选择同一个类别"
;
var
tiemr
=
setTimeout
(()
=>
{
this
.
message
.
show
=
false
;
},
2000
);
clearTimeout
(
tiemr
);
};
if
(
newVal
[
0
].
nclThree
.
length
>
10
)
{
this
.
$refs
.
tree
.
setChecked
(
newVal
[
0
].
nclThree
[
10
],
false
);
newVal
[
0
].
nclThree
.
pop
();
console
.
log
(
newVal
,
newVal
[
0
].
nclThree
,
`xxxxxxxxxxxxxxxxxxxxxxxxxxxxx`
);
this
.
message
.
show
=
!
this
.
message
.
show
;
this
.
message
.
info
=
"最多只能选择10项"
;
var
tiemr2
=
setTimeout
(()
=>
{
this
.
message
.
show
=
false
;
},
2000
);
clearTimeout
(
tiemr2
);
}
}
},
deep
:
true
}
},
mounted
:
function
()
{
this
.
$root
.
getChannelPath
();
var
that
=
this
;
...
...
@@ -748,11 +789,12 @@
return
false
;
}
var
publicExpense
=
this
.
serviceitem
.
publicExpense
||
0
;
console
.
log
(
this
.
serviceitem
.
publicExpense
,
'????????????????????'
);
console
.
log
(
this
.
serviceitem
.
publicExpense
,
'????????????????????'
,
nclThree
);
publicExpense
=
Number
(
publicExpense
);
var
nclSmallPrice
=
publicExpense
/
10
;
nclSmallPrice
=
Number
(
nclSmallPrice
.
toFixed
(
2
));
this
.
$refs
.
tree
.
setChecked
(
nclThree
,
false
);
this
.
nclOne
[
index
].
nclThree
.
splice
(
index2
,
1
);
if
(
this
.
nclOne
[
index
].
nclThree
.
length
>
10
)
{
this
.
nclOne
[
index
].
price
=
Number
(
publicExpense
+
(
this
.
nclOne
[
index
].
nclThree
.
length
-
10
)
*
nclSmallPrice
);
...
...
@@ -820,7 +862,7 @@
})
},
handleCheckChange
(
obj
,
a
,
b
)
{
console
.
log
(
obj
,
a
,
b
,
'1233333333333333333333344444444444444444444'
);
console
.
log
(
obj
,
a
,
b
,
this
.
nclOne
,
'1233333333333333333333344444444444444444444'
);
let
dataRecieve
=
this
.
$refs
.
tree
.
getCheckedNodes
();
if
(
obj
.
type
)
{
return
...
...
@@ -838,7 +880,7 @@
}
var
nclThree
=
[
eData
];
var
publicExpense
=
this
.
publicExpense
||
0
;
console
.
log
(
this
.
publicExpense
,
'/////////////////////'
);
console
.
log
(
this
.
publicExpense
,
'/////////////////////'
);
publicExpense
=
Number
(
publicExpense
);
var
nclSmallPrice
=
publicExpense
/
10
;
nclSmallPrice
=
Number
(
nclSmallPrice
.
toFixed
(
2
));
...
...
@@ -884,6 +926,8 @@
}
})
}
},
nodeClick
(
obj
,
e
,
a
){
if
(
e
.
level
==
1
)
{
...
...
@@ -894,6 +938,7 @@
this
.
$message
.
warning
(
"已生成订单,不可修改"
);
return
false
;
}
/*节点层级 */
if
(
e
.
level
<
3
&&
e
.
childNodes
.
length
==
0
)
{
this
.
nclSearchLoading
=
true
;
var
getNcl
=
{
...
...
@@ -910,6 +955,7 @@
that
.
nclSearchLoading
=
false
;
}
}
/*节点层级 */
if
(
e
.
level
==
2
)
{
that
.
nclSearchLoading
=
false
;
that
.
nclOne
.
forEach
((
item
,
index
)
=>
{
...
...
@@ -923,7 +969,7 @@
});
}
/*节点层级 */
if
(
e
.
level
==
3
)
{
this
.
$refs
.
tree
.
setChecked
(
e
.
data
,
true
);
return
;
...
...
@@ -957,6 +1003,8 @@
this
.
nclOne
.
push
(
data
);
}
}
},
nclThreeIsExist
(
name
,
nclThree
){
if
(
nclThree
.
length
<
1
)
{
...
...
@@ -1062,9 +1110,9 @@
if
(
formName
==
"form"
||
formName
==
"apply"
)
{
if
(
formName
==
"apply"
)
{
console
.
log
(
this
.
apply
);
if
(
this
.
apply
.
customerType
!=
'person'
&&
this
.
apply
.
sealAuthorizeStuff
==
''
||
this
.
apply
.
businessLicensePic
==
''
)
{
if
(
this
.
apply
.
customerType
!=
'person'
&&
this
.
apply
.
sealAuthorizeStuff
==
''
||
this
.
apply
.
businessLicensePic
==
''
)
{
return
that
.
$message
.
warning
(
`请按要求上传资料`
);
}
else
if
(
this
.
apply
.
customerType
==
'person'
&&
this
.
apply
.
identityCardPic
==
''
||
this
.
apply
.
sealAuthorizeStuff
==
''
||
this
.
apply
.
businessLicensePic
==
''
)
{
}
else
if
(
this
.
apply
.
customerType
==
'person'
&&
this
.
apply
.
identityCardPic
==
''
||
this
.
apply
.
sealAuthorizeStuff
==
''
||
this
.
apply
.
businessLicensePic
==
''
)
{
return
that
.
$message
.
warning
(
`请按要求上传资料`
);
}
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment