Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
T
take_order
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
和慭琛
take_order
Commits
295cad1c
Commit
295cad1c
authored
Apr 02, 2021
by
李俊赕
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
第二轮测试bug修复
parent
edac86b7
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
25 additions
and
18 deletions
+25
-18
standard.vue
take-order/components/photo/standard.vue
+1
-0
list.vue
take-order/pages/photo/list.vue
+16
-10
take.vue
take-order/pages/photo/take.vue
+8
-8
No files found.
take-order/components/photo/standard.vue
View file @
295cad1c
...
@@ -122,6 +122,7 @@
...
@@ -122,6 +122,7 @@
display
:
flex
;
display
:
flex
;
flex-direction
:
column
;
flex-direction
:
column
;
height
:
calc
(
100vh
-
var
(
--
window-top
)
-
200rpx
);
height
:
calc
(
100vh
-
var
(
--
window-top
)
-
200rpx
);
padding-top
:
100rpx
;
width
:
100%
;
width
:
100%
;
}
}
...
...
take-order/pages/photo/list.vue
View file @
295cad1c
...
@@ -2,9 +2,9 @@
...
@@ -2,9 +2,9 @@
<view
class=
"backView"
>
<view
class=
"backView"
>
<u-loading
style=
"position: fixed;top: 50%;"
:show=
"loading"
size=
"36"
mode=
"flower"
></u-loading>
<u-loading
style=
"position: fixed;top: 50%;"
:show=
"loading"
size=
"36"
mode=
"flower"
></u-loading>
<view
class=
"topView"
>
<view
class=
"topView"
>
<view
:class=
"['topItemView',
{'active':activeTop===ikey}]" @click="handleTopItemChange(ikey,item)"
v-for="(item,ikey) in dataList" :key="ikey">
<view
:class=
"['topItemView',
{'active':activeTop===ikey}]" @click="handleTopItemChange(ikey,item)"
<text
v-for="(item,ikey) in dataList" :key="ikey">
:class=
"['ph-lst-top-index',
{'active':activeTop===ikey}]">
{{
ikey
+
1
}}
</text>
<text
:class=
"['ph-lst-top-index',
{'active':activeTop===ikey}]">
{{
ikey
+
1
}}
</text>
<text
class=
"topItemTitle"
>
{{
item
.
type
}}
</text>
<text
class=
"topItemTitle"
>
{{
item
.
type
}}
</text>
</view>
</view>
</view>
</view>
...
@@ -19,8 +19,8 @@
...
@@ -19,8 +19,8 @@
<!--
<text
class=
"rightContent u-m-t-14 u-m-l-30 u-p-b-30"
>
{{
item
.
describe
}}
</text>
-->
<!--
<text
class=
"rightContent u-m-t-14 u-m-l-30 u-p-b-30"
>
{{
item
.
describe
}}
</text>
-->
</view>
</view>
<view
class=
"rightImageView"
v-if=
"item.imageList.length > 0"
>
<view
class=
"rightImageView"
v-if=
"item.imageList.length > 0"
>
<image
class=
"rightImage"
v-for=
"(image, index) in item.imageList.slice(0 , 10)"
:src=
"image"
:key=
"index"
<image
class=
"rightImage"
v-for=
"(image, index) in item.imageList.slice(0 , 10)"
:src=
"image"
@
click
.
stop=
"handleClickImage(item, index)"
mode=
"aspectFill"
></image>
:key=
"index"
@
click
.
stop=
"handleClickImage(item, index)"
mode=
"aspectFill"
></image>
</view>
</view>
</view>
</view>
</
template
>
</
template
>
...
@@ -117,7 +117,7 @@
...
@@ -117,7 +117,7 @@
handleClickImage
(
item
,
index
)
{
handleClickImage
(
item
,
index
)
{
uni
.
previewImage
({
uni
.
previewImage
({
urls
:
item
.
imageList
,
urls
:
item
.
imageList
,
current
:
index
current
:
index
})
})
},
},
...
@@ -127,7 +127,7 @@
...
@@ -127,7 +127,7 @@
photo
.
currentItem
=
item
photo
.
currentItem
=
item
photo
.
itemIndex
=
ikey
photo
.
itemIndex
=
ikey
uni
.
navigateTo
({
uni
.
navigateTo
({
url
:
'/pages/photo/take'
url
:
'/pages/photo/take'
})
})
},
},
...
@@ -199,7 +199,7 @@
...
@@ -199,7 +199,7 @@
margin
:
0
rpx
30
rpx
20
rpx
30
rpx
;
margin
:
0
rpx
30
rpx
20
rpx
30
rpx
;
padding
:
36
rpx
30
rpx
18
rpx
30
rpx
;
padding
:
36
rpx
30
rpx
18
rpx
30
rpx
;
border-radius
:
12
rpx
;
border-radius
:
12
rpx
;
background-color
:
#FFFFFF
;
background-color
:
#FFFFFF
;
min-height
:
108
rpx
;
min-height
:
108
rpx
;
}
}
...
@@ -213,7 +213,7 @@
...
@@ -213,7 +213,7 @@
text-align
:
center
;
text-align
:
center
;
border-width
:
1px
;
border-width
:
1px
;
border-style
:
solid
;
border-style
:
solid
;
margin-right
:
10
rpx
;
margin-right
:
10
rpx
;
margin-top
:
4
rpx
;
margin-top
:
4
rpx
;
}
}
...
@@ -226,6 +226,7 @@
...
@@ -226,6 +226,7 @@
/* flex-direction: column; */
/* flex-direction: column; */
/* border-left: 2rpx solid #F3F3F3; */
/* border-left: 2rpx solid #F3F3F3; */
}
}
.rightContentView.active
{
.rightContentView.active
{
color
:
#666666
;
color
:
#666666
;
border-color
:
#666666
;
border-color
:
#666666
;
...
@@ -259,6 +260,10 @@
...
@@ -259,6 +260,10 @@
width
:
116
rpx
;
width
:
116
rpx
;
height
:
116
rpx
;
height
:
116
rpx
;
margin
:
0
rpx
12
rpx
12
rpx
0
rpx
;
margin
:
0
rpx
12
rpx
12
rpx
0
rpx
;
}
.rightImage
:nth-child
(
5n
)
{
margin-right
:
0
;
}
}
...
@@ -283,6 +288,7 @@
...
@@ -283,6 +288,7 @@
background-color
:
#FFFFFF
;
background-color
:
#FFFFFF
;
color
:
#999999
;
color
:
#999999
;
}
}
.topItemView.active
{
.topItemView.active
{
color
:
#2272FF
;
color
:
#2272FF
;
}
}
...
@@ -296,4 +302,4 @@
...
@@ -296,4 +302,4 @@
.greenBackColor
{
.greenBackColor
{
background-color
:
#4CD964
;
background-color
:
#4CD964
;
}
}
</
style
>
</
style
>
take-order/pages/photo/take.vue
View file @
295cad1c
...
@@ -198,11 +198,11 @@
...
@@ -198,11 +198,11 @@
const
globalData
=
getApp
().
globalData
const
globalData
=
getApp
().
globalData
this
.
navHeight
=
globalData
.
navHeight
this
.
navHeight
=
globalData
.
navHeight
this
.
cameraHeight
=
parseInt
(
globalData
.
safeHeight
*
2
-
globalData
.
navHeight
-
200
)
;
this
.
cameraHeight
=
parseInt
(
globalData
.
safeHeight
*
2
-
globalData
.
navHeight
-
200
)
;
console
.
log
(
globalData
.
safeHeight
,
'globalData.safeHeight'
)
//
console.log(globalData.safeHeight,'globalData.safeHeight')
console
.
log
(
this
.
cameraHeight
,
'this.cameraHeight'
)
//
console.log(this.cameraHeight,'this.cameraHeight')
console
.
log
(
globalData
.
navHeight
,
'globalData.navHeight'
)
//
console.log(globalData.navHeight,'globalData.navHeight')
this
.
ratio
=
globalData
.
screenHeight
/
globalData
.
rpxScreenHeight
this
.
ratio
=
globalData
.
screenHeight
/
globalData
.
rpxScreenHeight
console
.
log
(
globalData
.
screenHeight
,
globalData
.
rpxScreenHeight
,
this
.
ratio
)
//
console.log(globalData.screenHeight,globalData.rpxScreenHeight,this.ratio)
this
.
waterSetting
=
globalData
.
photo
.
waterSetting
this
.
waterSetting
=
globalData
.
photo
.
waterSetting
// this.cameraHeight = globalData.rpxScreenHeight
// this.cameraHeight = globalData.rpxScreenHeight
},
},
...
@@ -368,9 +368,9 @@
...
@@ -368,9 +368,9 @@
if
(
txt
.
indexOf
(
'时间'
)
>=
0
){
if
(
txt
.
indexOf
(
'时间'
)
>=
0
){
canvas
.
fillText
(
txt
,
10
,
canvasHeight
-
txtHeight
*
h
++
);
canvas
.
fillText
(
txt
,
10
,
canvasHeight
-
txtHeight
*
h
++
);
}
else
{
}
else
{
if
(
txt
.
length
>
14
){
if
(
txt
.
length
>
20
){
canvas
.
fillText
(
txt
.
substr
(
1
4
,
14
),
10
,
canvasHeight
-
txtHeight
*
h
++
);
canvas
.
fillText
(
txt
.
substr
(
1
8
,
20
),
10
,
canvasHeight
-
txtHeight
*
h
++
);
canvas
.
fillText
(
txt
.
substr
(
0
,
14
),
10
,
canvasHeight
-
txtHeight
*
h
++
);
canvas
.
fillText
(
txt
.
substr
(
0
,
20
),
10
,
canvasHeight
-
txtHeight
*
h
++
);
}
else
{
}
else
{
canvas
.
fillText
(
txt
,
10
,
canvasHeight
-
txtHeight
*
h
++
);
canvas
.
fillText
(
txt
,
10
,
canvasHeight
-
txtHeight
*
h
++
);
}
}
...
@@ -512,7 +512,7 @@
...
@@ -512,7 +512,7 @@
padding
:
20rpx
;
padding
:
20rpx
;
.txt
{
.txt
{
max-width
:
4
00rpx
;
max-width
:
5
00rpx
;
max-height
:
80rpx
;
max-height
:
80rpx
;
overflow
:
hidden
;
overflow
:
hidden
;
margin-top
:
5rpx
;
margin-top
:
5rpx
;
...
...
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