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
b1fc2f7d
Commit
b1fc2f7d
authored
Mar 22, 2021
by
李超鹏
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/dev-photo-v2' into dev-photo-v2
parents
50a5e668
01df1405
Changes
9
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
980 additions
and
992 deletions
+980
-992
App.vue
take-order/App.vue
+17
-4
pages.json
take-order/pages.json
+14
-27
index.vue
take-order/pages/photo/index.vue
+234
-650
take.vue
take-order/pages/photo/take.vue
+708
-307
try - 副本.vue
take-order/pages/photo/try - 副本.vue
+7
-4
icon-light.png
take-order/static/photo/icon-light.png
+0
-0
icon-setting.png
take-order/static/photo/icon-setting.png
+0
-0
icon-switch.png
take-order/static/photo/icon-switch.png
+0
-0
icon-take.png
take-order/static/photo/icon-take.png
+0
-0
No files found.
take-order/App.vue
View file @
b1fc2f7d
...
@@ -97,12 +97,14 @@
...
@@ -97,12 +97,14 @@
signUrl
:
''
,
signUrl
:
''
,
jumpLoginStatus
:
true
,
jumpLoginStatus
:
true
,
settleRecommend
:
''
settleRecommend
:
''
,
navHeight
:
0
,
//导航栏高度
rpxScreenHeight
:
0
,
// 照相视框高度
},
},
onLaunch
:
function
()
{
onLaunch
:
function
()
{
this
.
getSystemInfo
()
this
.
checkUpdate
()
this
.
checkUpdate
()
var
that
=
this
var
that
=
this
...
@@ -122,7 +124,18 @@
...
@@ -122,7 +124,18 @@
},
},
onShow
:
function
()
{},
onShow
:
function
()
{},
methods
:
{
methods
:
{
getSystemInfo
(){
try
{
let
a
=
wx
.
getSystemInfoSync
();
// this.globalData.platform = systemInfo.platform, this.globalData.pixelRatio = a.pixelRatio,
// this.globalData.statusBarHeight = a.statusBarHeight, this.globalData.navHeight = a.statusBarHeight / a.screenWidth * 750 + 90,
// this.globalData.rpxScreenHeight = a.screenHeight / a.screenWidth * 750, this.globalData.screenWidth = a.screenWidth,
// this.globalData.screenHeight = a.screenHeight;
this
.
globalData
.
navHeight
=
a
.
statusBarHeight
/
a
.
screenWidth
*
750
+
90
this
.
globalData
.
rpxScreenHeight
=
a
.
screenHeight
/
a
.
screenWidth
*
750
}
catch
(
a
)
{}
},
//检查更新
//检查更新
checkUpdate
:
function
()
{
checkUpdate
:
function
()
{
const
updateManager
=
wx
.
getUpdateManager
()
const
updateManager
=
wx
.
getUpdateManager
()
...
...
take-order/pages.json
View file @
b1fc2f7d
...
@@ -110,25 +110,29 @@
...
@@ -110,25 +110,29 @@
},
},
{
{
"path"
:
"pages/
photo/product
"
,
"path"
:
"pages/
take/detail
"
,
"style"
:
{
"style"
:
{
"navigationBarTitleText"
:
"
扳手会工单规范
"
"navigationBarTitleText"
:
"
工单详情
"
}
}
},
},
{
{
"path"
:
"pages/
take/detail
"
,
"path"
:
"pages/
photo/index
"
,
"style"
:
{
"style"
:
{
"navigationBarTitleText"
:
"工单详情"
"navigationBarTitleText"
:
"拍照小工具首页"
}
},
{
"path"
:
"pages/photo/product"
,
"style"
:
{
"navigationBarTitleText"
:
"扳手会工单规范"
}
}
},
},
{
{
"path"
:
"pages/photo/t
ry
"
,
"path"
:
"pages/photo/t
ake
"
,
"style"
:
{
"style"
:
{
"navigationStyle"
:
"custom"
,
"navigationBarTitleText"
:
"拍照"
,
"navigationBarTitleText"
:
"拍照"
,
"navigationBarBackgroundColor"
:
"#333333"
,
"navigationBarBackgroundColor"
:
"#333333"
,
"navigationBarTextStyle"
:
"#FFFFFF"
,
"navigationBarTextStyle"
:
"#FFFFFF"
,
...
@@ -136,8 +140,6 @@
...
@@ -136,8 +140,6 @@
}
}
},
},
{
{
"path"
:
"pages/photo/detail"
,
"path"
:
"pages/photo/detail"
,
"style"
:
{
"style"
:
{
...
@@ -148,10 +150,6 @@
...
@@ -148,10 +150,6 @@
}
}
},
},
{
{
"path"
:
"pages/photo/preview"
,
"path"
:
"pages/photo/preview"
,
"style"
:
{
"style"
:
{
...
@@ -177,17 +175,6 @@
...
@@ -177,17 +175,6 @@
"navigationBarTitleText"
:
"扳手会工单规范"
"navigationBarTitleText"
:
"扳手会工单规范"
}
}
},
},
{
"path"
:
"pages/photo/take"
,
"style"
:
{
"navigationBarTitleText"
:
"拍照-ljd"
,
"disableScroll"
:
true
}
},
{
{
"path"
:
"pages/index/success"
,
"path"
:
"pages/index/success"
,
"style"
:
{
"style"
:
{
...
@@ -289,7 +276,7 @@
...
@@ -289,7 +276,7 @@
"query"
:
""
//启动参数,在页面的onLoad函数里面得到
"query"
:
""
//启动参数,在页面的onLoad函数里面得到
},{
},{
"name"
:
"拍照小工具"
,
//模式名称
"name"
:
"拍照小工具"
,
//模式名称
"path"
:
"pages/photo/t
ry
"
,
//启动页面,必选
"path"
:
"pages/photo/t
ake
"
,
//启动页面,必选
"query"
:
""
//启动参数,在页面的onLoad函数里面得到
"query"
:
""
//启动参数,在页面的onLoad函数里面得到
},{
},{
"name"
:
"基本信息"
,
//模式名称
"name"
:
"基本信息"
,
//模式名称
...
...
take-order/pages/photo/index.vue
View file @
b1fc2f7d
This diff is collapsed.
Click to expand it.
take-order/pages/photo/take.vue
View file @
b1fc2f7d
This diff is collapsed.
Click to expand it.
take-order/pages/photo/try.vue
→
take-order/pages/photo/try
- 副本
.vue
View file @
b1fc2f7d
...
@@ -185,10 +185,12 @@
...
@@ -185,10 +185,12 @@
getLocation
()
{
getLocation
()
{
let
that
=
this
let
that
=
this
uni
.
getLocation
({
uni
.
getLocation
({
type
:
'
wgs84
'
,
type
:
'
gcj02
'
,
success
:
function
(
res
)
{
success
:
function
(
res
)
{
that
.
longitude
=
res
.
longitude
console
.
log
(
res
,
'res'
)
that
.
latitude
=
res
.
latitude
that
.
longitude
=
parseFloat
(
res
.
longitude
).
toFixed
(
4
)
that
.
latitude
=
parseFloat
(
res
.
latitude
).
toFixed
(
3
)
console
.
log
(
that
.
longitude
,
'that.longitude'
,
that
.
latitude
,
'that.latitude'
)
that
.
baiduLocation
()
that
.
baiduLocation
()
},
},
fail
()
{
fail
()
{
...
@@ -342,7 +344,8 @@
...
@@ -342,7 +344,8 @@
//第一步: 拍照
//第一步: 拍照
takePhoto
()
{
takePhoto
()
{
this
.
getLocation
()
return
let
that
=
this
let
that
=
this
this
.
ctx
.
takePhoto
({
this
.
ctx
.
takePhoto
({
quality
:
'high'
,
quality
:
'high'
,
...
...
take-order/static/photo/icon-light.png
0 → 100644
View file @
b1fc2f7d
1.67 KB
take-order/static/photo/icon-setting.png
0 → 100644
View file @
b1fc2f7d
6 KB
take-order/static/photo/icon-switch.png
0 → 100644
View file @
b1fc2f7d
1.77 KB
take-order/static/photo/icon-take.png
0 → 100644
View file @
b1fc2f7d
8.88 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