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
052d508a
Commit
052d508a
authored
Dec 31, 2020
by
李超鹏
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/dev-photo-tools' into dev-photo-tools
parents
7b16d146
ef96161a
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
8 deletions
+13
-8
brand.vue
take-order/pages/photo/brand.vue
+2
-2
product.vue
take-order/pages/photo/product.vue
+3
-3
try.vue
take-order/pages/photo/try.vue
+8
-3
No files found.
take-order/pages/photo/brand.vue
View file @
052d508a
...
@@ -2,8 +2,8 @@
...
@@ -2,8 +2,8 @@
<view
class=
"backView"
>
<view
class=
"backView"
>
<text
class=
"topTitle"
>
{{
product
}}
> 选择产品
</text>
<text
class=
"topTitle"
>
{{
product
}}
> 选择产品
</text>
<view
class=
"u-p-b-48"
>
<view
class=
"u-p-b-48"
>
<view
class=
"itemView u-m-t-48"
v-for=
"(item,ikey) in brandList"
:key=
"ikey"
>
<view
class=
"itemView u-m-t-48"
@
click=
"itemClick(item)"
v-for=
"(item,ikey) in brandList"
:key=
"ikey"
>
<text
class=
"itemTitle"
@
click=
"itemClick(item)"
>
{{
item
.
name
}}
</text>
<text
class=
"itemTitle"
>
{{
item
.
name
}}
</text>
</view>
</view>
</view>
</view>
...
...
take-order/pages/photo/product.vue
View file @
052d508a
...
@@ -2,8 +2,8 @@
...
@@ -2,8 +2,8 @@
<view
class=
"backView"
>
<view
class=
"backView"
>
<text
class=
"topTitle"
>
选择产品
</text>
<text
class=
"topTitle"
>
选择产品
</text>
<view
class=
"u-p-b-48"
>
<view
class=
"u-p-b-48"
>
<view
class=
"itemView u-m-t-48"
v-for=
"(item,ikey) in productList"
:key=
"ikey"
>
<view
class=
"itemView u-m-t-48"
@
click=
"itemClick(item)"
v-for=
"(item,ikey) in productList"
:key=
"ikey"
>
<text
class=
"itemTitle"
@
click=
"itemClick(item)"
>
{{
item
.
name
}}
</text>
<text
class=
"itemTitle"
>
{{
item
.
name
}}
</text>
</view>
</view>
</view>
</view>
...
@@ -34,7 +34,7 @@
...
@@ -34,7 +34,7 @@
this
.
$u
.
cloudApi
.
getAllProduct
().
then
(
res
=>
{
this
.
$u
.
cloudApi
.
getAllProduct
().
then
(
res
=>
{
console
.
log
(
'获取产品数据:'
)
console
.
log
(
'获取产品数据:'
)
console
.
log
(
res
)
console
.
log
(
res
)
if
(
res
.
result
.
data
){
if
(
res
.
result
&&
res
.
result
.
data
){
that
.
productList
=
res
.
result
.
data
that
.
productList
=
res
.
result
.
data
}
}
...
...
take-order/pages/photo/try.vue
View file @
052d508a
...
@@ -234,10 +234,11 @@
...
@@ -234,10 +234,11 @@
},
},
fail
:
function
(
e
)
{
fail
:
function
(
e
)
{
that
.
showImage
=
false
uni
.
hideLoading
()
uni
.
hideLoading
()
uni
.
showToast
({
uni
.
showToast
({
title
:
'出错啦...
'
,
icon
:
'none
'
,
icon
:
'loading'
title
:
'还没有准备好'
,
})
})
console
.
log
(
'处理图片 失败:'
)
console
.
log
(
'处理图片 失败:'
)
console
.
log
(
e
)
console
.
log
(
e
)
...
@@ -258,7 +259,11 @@
...
@@ -258,7 +259,11 @@
icon
:
'none'
,
icon
:
'none'
,
title
:
'已将照片保存到本地相册'
title
:
'已将照片保存到本地相册'
})
})
setTimeout
(
function
()
{
that
.
goBack
()
that
.
goBack
()
},
1000
);
},
},
fail
()
{
fail
()
{
console
.
log
(
'保存本地相册 失败'
)
console
.
log
(
'保存本地相册 失败'
)
...
...
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