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
e11175e2
Commit
e11175e2
authored
Mar 26, 2021
by
李俊赕
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
合并代码
parent
251c3de0
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
146 additions
and
127 deletions
+146
-127
App.vue
take-order/App.vue
+134
-124
pages.json
take-order/pages.json
+10
-1
setting.vue
take-order/pages/photo/setting.vue
+0
-0
take.vue
take-order/pages/photo/take.vue
+2
-2
No files found.
take-order/App.vue
View file @
e11175e2
...
@@ -101,7 +101,17 @@
...
@@ -101,7 +101,17 @@
settleRecommend
:
''
,
settleRecommend
:
''
,
navHeight
:
0
,
//导航栏高度
navHeight
:
0
,
//导航栏高度
rpxScreenHeight
:
0
,
// 照相视框高度
rpxScreenHeight
:
0
,
// 照相视框高度
//拍照相关数据
photo
:{
product
:{
brandId
:
''
,
// 品牌id
brandName
:
''
,
// 品牌名称
classifyId
:
''
,
// 分类id
systemId
:
''
,
// 系统id
},
productList
:[],
currentItem
:
null
,
// 选择的某一项
},
// 用户信息
// 用户信息
tempUserInfo
:
''
,
// 临时用户选项
tempUserInfo
:
''
,
// 临时用户选项
userInfo
:
''
,
// 用户信息
userInfo
:
''
,
// 用户信息
...
...
take-order/pages.json
View file @
e11175e2
...
@@ -124,7 +124,16 @@
...
@@ -124,7 +124,16 @@
"navigationBarTitleText"
:
"工单详情"
"navigationBarTitleText"
:
"工单详情"
}
}
},
},
{
"path"
:
"pages/photo/setting"
,
"style"
:
{
"navigationStyle"
:
"custom"
,
"navigationBarTitleText"
:
"水印设置"
,
"navigationBarBackgroundColor"
:
"#333333"
,
"navigationBarTextStyle"
:
"#FFFFFF"
,
"disableScroll"
:
true
}
},
{
{
"path"
:
"pages/photo/take"
,
"path"
:
"pages/photo/take"
,
"style"
:
{
"style"
:
{
...
...
take-order/pages/photo/
markS
etting.vue
→
take-order/pages/photo/
s
etting.vue
View file @
e11175e2
File moved
take-order/pages/photo/take.vue
View file @
e11175e2
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
<cover-view
class=
"inner"
>
<cover-view
class=
"inner"
>
<cover-image
@
click=
"setCameraInfo('devicePosition')"
class=
"icon"
mode=
"aspectFit"
src=
"/static/photo/icon-switch.png"
></cover-image>
<cover-image
@
click=
"setCameraInfo('devicePosition')"
class=
"icon"
mode=
"aspectFit"
src=
"/static/photo/icon-switch.png"
></cover-image>
<cover-image
@
click=
"setCameraInfo('flash')"
class=
"icon"
mode=
"aspectFit"
src=
"/static/photo/icon-light.png"
></cover-image>
<cover-image
@
click=
"setCameraInfo('flash')"
class=
"icon"
mode=
"aspectFit"
src=
"/static/photo/icon-light.png"
></cover-image>
<cover-image
@
click=
"goPage('/pages/photo/
markS
etting')"
class=
"icon"
mode=
"aspectFit"
src=
"/static/photo/icon-setting.png"
></cover-image>
<cover-image
@
click=
"goPage('/pages/photo/
s
etting')"
class=
"icon"
mode=
"aspectFit"
src=
"/static/photo/icon-setting.png"
></cover-image>
</cover-view>
</cover-view>
</cover-view>
</cover-view>
<camera
class=
"camera-box"
v-if=
"cameraChange&&!standardShow"
:device-position=
"cameraInfo.devicePosition"
:flash=
"cameraInfo.flash"
:style=
"
{'height':cameraHeight + 'rpx'}"
<camera
class=
"camera-box"
v-if=
"cameraChange&&!standardShow"
:device-position=
"cameraInfo.devicePosition"
:flash=
"cameraInfo.flash"
:style=
"
{'height':cameraHeight + 'rpx'}"
...
@@ -112,7 +112,7 @@
...
@@ -112,7 +112,7 @@
methods
:
{
methods
:
{
goBack
(){
goBack
(){
uni
.
redirectTo
({
uni
.
redirectTo
({
url
:
'/pages/photo/
brand
'
url
:
'/pages/photo/
list
'
})
})
},
},
goPage
(
url
){
goPage
(
url
){
...
...
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