Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
account-book
Project
Project
Details
Activity
Releases
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
刘文虎
account-book
Commits
d66bae15
Commit
d66bae15
authored
Nov 09, 2022
by
Facius
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'lwh-dev'
parents
83bb399e
660bdd55
Pipeline
#4000
canceled with stages
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
28 additions
and
18 deletions
+28
-18
save-poster-popup.vue
pages/mine/share/components/save-poster-popup.vue
+21
-8
index.vue
pages/mine/share/index.vue
+3
-6
create.vue
pages/workpoint/workpoint-create/create.vue
+3
-3
config.js
utils/config.js
+1
-1
No files found.
pages/mine/share/components/save-poster-popup.vue
View file @
d66bae15
...
...
@@ -12,6 +12,7 @@
<view
class=
"content-view"
>
<view
class=
"qrcode-view"
><image
:src=
"qrcode"
></image></view>
</view>
<view
class=
"close-view"
@
click=
"close"
><u-icon
name=
"close"
></u-icon></view>
</view>
<view
class=
"btn"
>
<view
class=
"confirm"
@
click=
"$u.throttle(handleClickSure, 500)"
>
...
...
@@ -41,7 +42,7 @@ export default {
};
},
computed
:
{
...
mapGetters
([
'userInfo'
])
,
...
mapGetters
([
'userInfo'
])
},
methods
:
{
open
()
{
...
...
@@ -64,7 +65,7 @@ export default {
position
:
relative
;
.apply-refuse
{
background-color
:
$default-color
;
background
:
url('https://static-book.kaying.cc/icon/mine/
min-share-
haibao.jpg')
no-repeat
;
background
:
url('https://static-book.kaying.cc/icon/mine/
jizhangbaocun
haibao.jpg')
no-repeat
;
background-position
:
center
top
;
background-size
:
100%
;
width
:
620rpx
;
...
...
@@ -72,21 +73,32 @@ export default {
border-radius
:
12rpx
;
padding
:
52rpx
36rpx
;
position
:
relative
;
.close-view
{
position
:
absolute
;
right
:
36rpx
;
top
:
20rpx
;
font-size
:
32rpx
;
width
:
88rpx
;
height
:
88rpx
;
padding-right
:
8rpx
;
line-height
:
88rpx
;
text-align
:
right
;
}
.user
{
display
:
flex
;
align-items
:
center
;
color
:
#FFFFFF
;
.user-avatar
{
width
:
44rpx
;
height
:
44rpx
;
border-radius
:
50%
;
background
:
#
FFFFFF
;
background
:
#
ffffff
;
padding
:
4rpx
;
display
:
flex
;
margin-right
:
12rpx
;
}
.user-avatar-image
{
.user-avatar-image
{
border-radius
:
50%
;
}
}
...
...
@@ -98,12 +110,13 @@ export default {
transform
:
translateX
(
-50%
);
width
:
192rpx
;
height
:
192rpx
;
background
:
#FFFFFF
;
background
:
#ffffff
;
border
:
2rpx
solid
$default-color
;
border-radius
:
16rpx
;
display
:
flex
;
align-items
:
center
;
justify-content
:
center
;
.qrcode-view
{
width
:
160rpx
;
height
:
160rpx
;
...
...
pages/mine/share/index.vue
View file @
d66bae15
...
...
@@ -111,13 +111,9 @@ export default {
onLoad
(
options
)
{},
onUnload
()
{},
onReady
()
{
setTimeout
(()
=>
{
console
.
log
(
'handleCanvas-qrcode---onReady'
,
this
.
qrcode
);
},
1500
);
},
methods
:
{
handleCanvas
(
url
)
{
console
.
log
(
'handleCanvas-qrcode---'
,
url
);
this
.
qrcode
=
url
;
},
handleSave
()
{
...
...
@@ -214,7 +210,7 @@ export default {
css
:
{
width
:
'750rpx'
,
height
:
'1220rpx'
,
backgroundImage
:
'url(https://static-book.kaying.cc/icon/mine/
min-share-
haibao.jpg)'
,
backgroundImage
:
'url(https://static-book.kaying.cc/icon/mine/
jizhangbaocun
haibao.jpg)'
,
'object-fit'
:
'fill'
},
views
:
[
...
...
@@ -226,7 +222,7 @@ export default {
display
:
'flex'
,
'align-items'
:
'center'
,
fontSize
:
'24rpx'
,
color
:
'#
ffffff
'
,
color
:
'#
333333
'
,
'line-height'
:
'44rpx'
},
views
:
[
...
...
@@ -257,6 +253,7 @@ export default {
width
:
'192rpx'
,
height
:
'192rpx'
,
background
:
'#FFFFFF'
,
border
:
'2rpx solid #02A074'
,
'border-radius'
:
'16rpx'
,
display
:
'flex'
,
'align-items'
:
'center'
,
...
...
pages/workpoint/workpoint-create/create.vue
View file @
d66bae15
...
...
@@ -489,7 +489,7 @@ export default {
}
}
else
{
if
(
this
.
form
.
type
===
'TIME'
)
{
if
(
this
.
form
.
normalNumber
<=
0
&&
this
.
form
.
overNumber
<=
0
)
{
if
(
this
.
form
.
normalNumber
<=
0
&&
this
.
form
.
overNumber
<=
0
&&
this
.
form
.
rewardAmount
<=
0
)
{
flag
=
false
;
}
}
else
{
...
...
@@ -588,7 +588,7 @@ export default {
type
:
type
.
code
,
remark
,
// 点工
normalNumber
:
normalNumber
||
1
,
normalNumber
:
normalNumber
,
normalText
:
normalText
||
1
,
normalType
:
(
normalType
&&
normalType
.
code
)
||
'UNIT'
,
overNumber
,
...
...
@@ -631,7 +631,7 @@ export default {
form
.
deductText
=
1
;
}
this
.
form
=
form
;
console
.
log
(
form
);
console
.
log
(
"form"
,
form
);
this
.
setWageList
();
}
catch
(
e
)
{
//TODO handle the exception
...
...
utils/config.js
View file @
d66bae15
export
const
version
=
"1.0.3
3
"
export
const
version
=
"1.0.3
5
"
export
const
baseURL
=
"/baseapi"
export
const
token
=
"TOKEN"
export
const
PHONENUMBER
=
"PHONENUMBER"
...
...
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