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
7d7254be
Commit
7d7254be
authored
Mar 31, 2021
by
李俊赕
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
df0b5559
55de306d
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
26 additions
and
25 deletions
+26
-25
index.vue
take-order/pages/photo/index.vue
+1
-1
list.vue
take-order/pages/photo/list.vue
+23
-22
setting.vue
take-order/pages/photo/setting.vue
+1
-1
index.js
...r/uniCloud-tcb/cloudfunctions/getGroupStandardV2/index.js
+1
-1
No files found.
take-order/pages/photo/index.vue
View file @
7d7254be
...
@@ -135,7 +135,7 @@
...
@@ -135,7 +135,7 @@
url
:
'/pages/photo/list'
+
url
:
'/pages/photo/list'
+
'?brandId='
+
this
.
param
.
brandId
+
'?brandId='
+
this
.
param
.
brandId
+
'&brand='
+
this
.
brandName
+
'&brand='
+
this
.
brandName
+
'&classifyId='
+
this
.
param
.
system
Id
+
'&classifyId='
+
this
.
param
.
classify
Id
+
'&systemId='
+
this
.
param
.
systemId
,
'&systemId='
+
this
.
param
.
systemId
,
})
})
}
}
...
...
take-order/pages/photo/list.vue
View file @
7d7254be
<
template
>
<
template
>
<view
class=
"backView"
>
<view
class=
"backView"
>
<u-loading
style=
"position:
absolute
;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">
<text
<text
...
@@ -20,7 +20,7 @@
...
@@ -20,7 +20,7 @@
</view>
</view>
<view
class=
"rightImageView"
v-if=
"item.imageList.length > 0 || item.images.length > 0"
>
<view
class=
"rightImageView"
v-if=
"item.imageList.length > 0 || item.images.length > 0"
>
<image
class=
"rightImage"
v-for=
"(image, index) in (item.imageList.length > 0 ? item.imageList : item.images)"
:src=
"image"
:key=
"image"
<image
class=
"rightImage"
v-for=
"(image, index) in (item.imageList.length > 0 ? item.imageList : item.images)"
:src=
"image"
:key=
"image"
@
click
.
stop=
"handleClickImage(item, index)"
mode=
""
></image>
@
click
.
stop=
"handleClickImage(item, index)"
mode=
"
aspectFill
"
></image>
</view>
</view>
</view>
</view>
</
template
>
</
template
>
...
@@ -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
)
...
@@ -93,18 +93,19 @@
...
@@ -93,18 +93,19 @@
const
globalData
=
getApp
().
globalData
const
globalData
=
getApp
().
globalData
globalData
.
photo
.
productList
=
result
globalData
.
photo
.
productList
=
result
this
.
dataList
=
result
this
.
dataList
=
result
let
item
=
result
[
0
]
if
(
result
.
length
>
0
)
{
console
.
log
(
result
,
item
,
'item'
)
var
item
=
result
[
0
]
globalData
.
photo
.
waterSetting
=
item
&&
item
.
userWatermark
||
null
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
,
...
@@ -217,15 +218,15 @@
...
@@ -217,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
{
...
@@ -277,12 +278,12 @@
...
@@ -277,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/setting.vue
View file @
7d7254be
<
template
>
<
template
>
<view
class=
"backView"
>
<view
class=
"backView"
>
<u-loading
style=
"position:
absolute
;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=
"itemView firstItem"
>
<view
class=
"itemView firstItem"
>
<view
class=
"itemTitleView"
>
<view
class=
"itemTitleView"
>
<text
class=
"itemTitle"
>
保存原图
</text>
<text
class=
"itemTitle"
>
保存原图
</text>
...
...
take-order/uniCloud-tcb/cloudfunctions/getGroupStandardV2/index.js
View file @
7d7254be
...
@@ -25,7 +25,7 @@ exports.main = async (event, context) => {
...
@@ -25,7 +25,7 @@ exports.main = async (event, context) => {
})
})
.
done
(),
.
done
(),
as
:
'imageList'
as
:
'imageList'
}).
end
()
}).
match
({
"classify_id"
:
event
.
classify_id
,
"system_id"
:
event
.
system_id
,
"brand_id"
:
event
.
brand_id
}).
end
()
const
watermarkC
=
uniCloud
.
database
().
collection
(
"user_watermark"
).
field
({
'_id'
:
false
})
const
watermarkC
=
uniCloud
.
database
().
collection
(
"user_watermark"
).
field
({
'_id'
:
false
})
let
userWatermark
=
await
watermarkC
.
where
({
let
userWatermark
=
await
watermarkC
.
where
({
user_id
:
user_id
,
user_id
:
user_id
,
...
...
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