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
8e257786
Commit
8e257786
authored
Mar 31, 2021
by
Facius
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev-photo-v2' of
https://git.banshouhui.com/heyinchen/take_order
into dev-photo-v2
parents
c37c5e69
c186de06
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
50 additions
and
27 deletions
+50
-27
list.vue
take-order/pages/photo/list.vue
+21
-21
preview.vue
take-order/pages/photo/preview.vue
+19
-3
take.vue
take-order/pages/photo/take.vue
+10
-3
continue.png
take-order/static/photo/continue.png
+0
-0
finish.png
take-order/static/photo/finish.png
+0
-0
No files found.
take-order/pages/photo/list.vue
View file @
8e257786
<
template
>
<
template
>
<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)" v-for="(item,ikey) in dataList" :key="ikey">
...
@@ -72,7 +72,7 @@
...
@@ -72,7 +72,7 @@
},
},
methods
:
{
methods
:
{
getListData
:
function
()
{
getListData
:
function
()
{
this
.
loading
=
true
this
.
loading
=
true
let
that
=
this
let
that
=
this
this
.
$u
.
cloudApi
.
getGroupStandardV2
({
this
.
$u
.
cloudApi
.
getGroupStandardV2
({
...
@@ -80,7 +80,7 @@
...
@@ -80,7 +80,7 @@
'classify_id'
:
this
.
classifyId
,
'classify_id'
:
this
.
classifyId
,
'system_id'
:
this
.
systemId
,
'system_id'
:
this
.
systemId
,
'brand_id'
:
this
.
brandId
'brand_id'
:
this
.
brandId
}).
then
(
res
=>
{
}).
then
(
res
=>
{
this
.
loading
=
false
this
.
loading
=
false
if
(
res
&&
res
.
result
)
{
if
(
res
&&
res
.
result
)
{
that
.
handleData
(
res
.
result
)
that
.
handleData
(
res
.
result
)
...
@@ -92,20 +92,20 @@
...
@@ -92,20 +92,20 @@
handleData
:
function
(
result
)
{
handleData
:
function
(
result
)
{
const
globalData
=
getApp
().
globalData
const
globalData
=
getApp
().
globalData
globalData
.
photo
.
productList
=
result
globalData
.
photo
.
productList
=
result
this
.
dataList
=
result
this
.
dataList
=
result
if
(
result
.
length
>
0
)
{
if
(
result
.
length
>
0
)
{
var
item
=
result
[
0
]
var
item
=
result
[
0
]
globalData
.
photo
.
waterSetting
=
item
.
userWatermark
globalData
.
photo
.
waterSetting
=
item
.
userWatermark
this
.
rightList
=
item
.
list
this
.
rightList
=
item
.
list
}
}
},
},
//顶部点击
//顶部点击
handleTopItemChange
:
function
(
ikey
,
item
)
{
handleTopItemChange
:
function
(
ikey
,
item
)
{
this
.
activeTop
=
ikey
this
.
activeTop
=
ikey
this
.
rightList
=
item
.
list
this
.
rightList
=
item
.
list
const
photo
=
getApp
().
globalData
.
photo
const
photo
=
getApp
().
globalData
.
photo
photo
.
topIndex
=
ikey
photo
.
topIndex
=
ikey
photo
.
waterSetting
=
item
.
userWatermark
photo
.
waterSetting
=
item
.
userWatermark
uni
.
pageScrollTo
({
uni
.
pageScrollTo
({
scrollTop
:
0
,
scrollTop
:
0
,
...
@@ -218,15 +218,15 @@
...
@@ -218,15 +218,15 @@
.rightContentView
{
.rightContentView
{
display
:
flex
;
display
:
flex
;
align-items
:
center
;
align-items
:
center
;
width
:
100%
;
width
:
100%
;
font-size
:
30
rpx
;
font-size
:
30
rpx
;
color
:
#2272FF
;
color
:
#2272FF
;
/* 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
;
}
}
.ph-list-item-arrow
{
.ph-list-item-arrow
{
...
@@ -278,12 +278,12 @@
...
@@ -278,12 +278,12 @@
justify-content
:
center
;
justify-content
:
center
;
-webkit-flex
:
1
;
-webkit-flex
:
1
;
flex
:
1
;
flex
:
1
;
background-color
:
#FFFFFF
;
background-color
:
#FFFFFF
;
color
:
#999999
;
color
:
#999999
;
}
}
.topItemView.active
{
.topItemView.active
{
color
:
#2272FF
;
color
:
#2272FF
;
}
}
.topItemTitle
{
.topItemTitle
{
...
...
take-order/pages/photo/preview.vue
View file @
8e257786
...
@@ -7,6 +7,7 @@
...
@@ -7,6 +7,7 @@
<image
class=
"btn"
:src=
"btn_remake"
@
click=
"remakePhoto"
></image>
<image
class=
"btn"
:src=
"btn_remake"
@
click=
"remakePhoto"
></image>
<image
class=
"btn"
:src=
"btn_continue"
@
click=
"continuePhoto"
></image>
<image
class=
"btn"
:src=
"btn_continue"
@
click=
"continuePhoto"
></image>
</view>
</view>
<image
class=
"btn finish"
src=
"/static/photo/finish.png"
@
click=
"finishPhoto"
></image>
</view>
</view>
</
template
>
</
template
>
...
@@ -19,7 +20,7 @@
...
@@ -19,7 +20,7 @@
return
{
return
{
protocolContent
:
''
,
protocolContent
:
''
,
btn_remake
:
'https://qn-static.banshouhui.com/take_order/photo/remake.png'
,
btn_remake
:
'https://qn-static.banshouhui.com/take_order/photo/remake.png'
,
btn_continue
:
'
https://qn-static.banshouhui.com/take_order
/photo/continue.png'
,
btn_continue
:
'
/static
/photo/continue.png'
,
standardId
:
''
,
standardId
:
''
,
images
:
[],
images
:
[],
files
:
[],
files
:
[],
...
@@ -119,7 +120,12 @@
...
@@ -119,7 +120,12 @@
delta
:
1
delta
:
1
})
})
},
},
finishPhoto
(){
// 完成本项
uni
.
navigateBack
({
delta
:
2
})
},
// 确认图片
// 确认图片
continuePhoto
()
{
continuePhoto
()
{
let
self
=
this
let
self
=
this
...
@@ -211,7 +217,7 @@
...
@@ -211,7 +217,7 @@
box-shadow
:
0
0
1rpx
6rpx
rgba
(
255
,
255
,
255
,
0
.05
);
box-shadow
:
0
0
1rpx
6rpx
rgba
(
255
,
255
,
255
,
0
.05
);
background-color
:
#333333
;
background-color
:
#333333
;
width
:
100%
;
width
:
100%
;
padding
:
70rpx
;
padding
:
70rpx
0
;
position
:
fixed
;
position
:
fixed
;
bottom
:
0
;
bottom
:
0
;
display
:
flex
;
display
:
flex
;
...
@@ -223,4 +229,14 @@
...
@@ -223,4 +229,14 @@
height
:
88rpx
;
height
:
88rpx
;
}
}
}
}
.btn
{
display
:
block
;
width
:
232rpx
;
height
:
80rpx
;
&
.finish
{
position
:
fixed
;
top
:
30rpx
;
right
:
30rpx
;
}
}
</
style
>
</
style
>
take-order/pages/photo/take.vue
View file @
8e257786
...
@@ -30,7 +30,7 @@
...
@@ -30,7 +30,7 @@
:style=
"
{'width':750 + 'rpx','height': cameraHeight + 'rpx'}">
</canvas>
:style=
"
{'width':750 + 'rpx','height': cameraHeight + 'rpx'}">
</canvas>
<view
v-if=
"standardShow"
class=
"page-mask"
:z-index=
"10000"
>
<view
v-if=
"standardShow"
class=
"page-mask"
:z-index=
"10000"
>
<photo-standard
:currentItem=
"currentItem"
/>
<photo-standard
:currentItem=
"currentItem"
/>
<view
class=
"btn-close"
@
click=
"
standardShow = false
"
>
<view
class=
"btn-close"
@
click=
"
closeShadow
"
>
<image
class=
"icon icon-close"
mode=
"aspectFit"
src=
"/static/photo/icon-close.png"
>
<image
class=
"icon icon-close"
mode=
"aspectFit"
src=
"/static/photo/icon-close.png"
>
</cover-image>
</cover-image>
</view>
</view>
...
@@ -85,6 +85,7 @@
...
@@ -85,6 +85,7 @@
ratio
:
0
,
ratio
:
0
,
cameraChange
:
true
,
cameraChange
:
true
,
waterSetting
:
null
,
waterSetting
:
null
,
shadowInitShow
:
true
,
// 第一次进入页面需显示弹窗
}
}
},
},
onLoad
(
e
)
{
onLoad
(
e
)
{
...
@@ -158,6 +159,10 @@
...
@@ -158,6 +159,10 @@
// })
// })
},
},
methods
:
{
methods
:
{
closeShadow
(){
this
.
shadowInitShow
=
false
this
.
standardShow
=
false
},
goBack
()
{
goBack
()
{
uni
.
navigateBack
({
uni
.
navigateBack
({
delta
:
1
delta
:
1
...
@@ -199,11 +204,13 @@
...
@@ -199,11 +204,13 @@
this
.
cameraInfo
[
type
]
=
val
this
.
cameraInfo
[
type
]
=
val
},
},
initData
()
{
initData
()
{
this
.
standardShow
=
true
const
globalData
=
getApp
().
globalData
const
globalData
=
getApp
().
globalData
this
.
navHeight
=
globalData
.
navHeight
this
.
navHeight
=
globalData
.
navHeight
this
.
ratio
=
globalData
.
screenHeight
/
globalData
.
rpxScreenHeight
this
.
ratio
=
globalData
.
screenHeight
/
globalData
.
rpxScreenHeight
this
.
waterSetting
=
getApp
().
globalData
.
photo
.
waterSetting
this
.
waterSetting
=
globalData
.
photo
.
waterSetting
if
(
this
.
shadowInitShow
){
this
.
standardShow
=
true
}
// this.cameraHeight = globalData.rpxScreenHeight
// this.cameraHeight = globalData.rpxScreenHeight
},
},
baiduLocation
()
{
baiduLocation
()
{
...
...
take-order/static/photo/continue.png
0 → 100644
View file @
8e257786
5.61 KB
take-order/static/photo/finish.png
0 → 100644
View file @
8e257786
5.31 KB
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