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
022407ce
Commit
022407ce
authored
Mar 27, 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
5097b821
f82046bc
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
433 additions
and
356 deletions
+433
-356
pages.json
take-order/pages.json
+6
-4
index.vue
take-order/pages/photo/index.vue
+19
-43
preview.vue
take-order/pages/photo/preview.vue
+14
-0
setting.vue
take-order/pages/photo/setting.vue
+394
-309
No files found.
take-order/pages.json
View file @
022407ce
...
@@ -124,10 +124,12 @@
...
@@ -124,10 +124,12 @@
{
{
"path"
:
"pages/photo/setting"
,
"path"
:
"pages/photo/setting"
,
"style"
:
{
"style"
:
{
"navigationBarTitleText"
:
"水印设置"
,
"navigationBarTitleText"
:
"水印设置"
,
"navigationBarBackgroundColor"
:
"#333333"
,
"navigationBarBackgroundColor"
:
"#FFFFFF"
,
"navigationBarTextStyle"
:
"#FFFFFF"
,
"backgroundColor"
:
"#F4F5F7"
"disableScroll"
:
true
//
"navigationBarBackgroundColor"
:
"#333333"
,
//
"navigationBarTextStyle"
:
"#FFFFFF"
,
//
"disableScroll"
:
true
}
}
},
},
{
{
...
...
take-order/pages/photo/index.vue
View file @
022407ce
...
@@ -5,8 +5,8 @@
...
@@ -5,8 +5,8 @@
<view
class=
"topTitle"
><text>
{{
dataItem
.
title
}}
</text></view>
<view
class=
"topTitle"
><text>
{{
dataItem
.
title
}}
</text></view>
<view
class=
"ph-pr-content"
>
<view
class=
"ph-pr-content"
>
<view
v-for=
"(item,ikey) in dataItem.data"
<view
v-for=
"(item,ikey) in dataItem.data"
:class=
"param[dataItem.type] === item.
_
id ? 'select-item-view' : 'item-view'"
:class=
"param[dataItem.type] === item.id ? 'select-item-view' : 'item-view'"
@
click=
"itemClick(dataItem.type, item
)"
:key=
"item._
id"
>
@
click=
"itemClick(dataItem.type, item
, ikey)"
:key=
"item.
id"
>
<text
class=
"itemTitle"
>
{{
item
.
name
}}
</text>
<text
class=
"itemTitle"
>
{{
item
.
name
}}
</text>
</view>
</view>
</view>
</view>
...
@@ -59,8 +59,7 @@
...
@@ -59,8 +59,7 @@
},
},
onLoad
(
e
)
{
onLoad
(
e
)
{
getApp
().
trackPage
(
'选择产品页'
)
getApp
().
trackPage
(
'选择产品页'
)
this
.
getclassifyList
()
this
.
getRelationDictionaryV2
()
},
},
onShareAppMessage
(
res
)
{
onShareAppMessage
(
res
)
{
let
shareObj
=
{
let
shareObj
=
{
...
@@ -72,69 +71,46 @@
...
@@ -72,69 +71,46 @@
}
}
return
shareObj
return
shareObj
},
},
methods
:
{
methods
:
{
getRelationDictionaryV2
:
function
()
{
getclassifyList
:
function
()
{
this
.
$u
.
cloudApi
.
getRelationDictionaryV2
().
then
(
res
=>
{
console
.
log
(
'V2:'
)
let
that
=
this
this
.
$u
.
cloudApi
.
getClassifyDictionary
().
then
(
res
=>
{
console
.
log
(
'获取产品数据:'
)
console
.
log
(
res
)
console
.
log
(
res
)
if
(
res
.
result
&&
res
.
result
.
data
)
{
if
(
res
&&
res
.
result
)
{
that
.
classifyList
=
res
.
result
.
data
this
.
classifyList
=
res
.
result
that
.
param
.
classifyId
=
that
.
classifyList
[
0
].
_id
this
.
param
.
classifyId
=
res
.
result
[
0
].
id
that
.
$u
.
cloudApi
.
getRelationDictionary
({
this
.
systemList
=
res
.
result
[
0
].
child
"classify_id"
:
that
.
param
.
classifyId
,
"field"
:
"system_id"
}).
then
(
res1
=>
{
that
.
systemList
=
res1
.
result
})
}
}
})
})
},
},
//选择 点击
//选择 点击
itemClick
:
function
(
type
,
item
)
{
itemClick
:
function
(
type
,
item
,
ikey
)
{
switch
(
type
)
{
switch
(
type
)
{
case
'classifyId'
:
case
'classifyId'
:
this
.
param
=
{
this
.
param
=
{
classifyId
:
item
.
_
id
,
classifyId
:
item
.
id
,
systemId
:
''
,
systemId
:
''
,
brandId
:
''
brandId
:
''
}
}
this
.
selectedAll
=
false
this
.
selectedAll
=
false
this
.
systemList
=
[]
this
.
systemList
=
this
.
classifyList
[
ikey
].
child
this
.
brandList
=
[]
this
.
brandList
=
[]
this
.
$u
.
cloudApi
.
getRelationDictionary
({
"classify_id"
:
this
.
param
.
classifyId
,
"field"
:
"system_id"
}).
then
(
res
=>
{
this
.
systemList
=
res
.
result
})
break
break
case
'systemId'
:
case
'systemId'
:
this
.
param
=
{
this
.
param
=
{
classifyId
:
this
.
param
.
classifyId
,
classifyId
:
this
.
param
.
classifyId
,
systemId
:
item
.
_
id
,
systemId
:
item
.
id
,
brandId
:
''
brandId
:
''
}
}
this
.
selectedAll
=
false
this
.
selectedAll
=
false
this
.
brandList
=
[]
this
.
brandList
=
this
.
systemList
[
ikey
].
child
this
.
$u
.
cloudApi
.
getRelationDictionary
({
"classify_id"
:
this
.
param
.
classifyId
,
"system_id"
:
this
.
param
.
systemId
,
"field"
:
"brand_id"
}).
then
(
res
=>
{
console
.
log
(
'获取品牌数据:'
,
res
)
this
.
brandList
=
res
.
result
})
break
break
case
'brandId'
:
case
'brandId'
:
this
.
param
.
brandId
=
item
.
_
id
this
.
param
.
brandId
=
item
.
id
this
.
selectedAll
=
true
this
.
selectedAll
=
true
this
.
brandName
=
item
.
name
this
.
brandName
=
item
.
name
break
break
...
...
take-order/pages/photo/preview.vue
View file @
022407ce
...
@@ -12,6 +12,7 @@
...
@@ -12,6 +12,7 @@
<
script
>
<
script
>
import
qiniup
from
'@/components/upload/qiniup'
;
import
qiniup
from
'@/components/upload/qiniup'
;
const
app
=
getApp
()
export
default
{
export
default
{
mixins
:
[
qiniup
],
mixins
:
[
qiniup
],
data
()
{
data
()
{
...
@@ -25,9 +26,18 @@
...
@@ -25,9 +26,18 @@
fileMaps
:
[],
fileMaps
:
[],
keys
:
[],
keys
:
[],
token
:
''
,
token
:
''
,
product
:
''
,
}
}
},
},
onLoad
(
e
)
{
onLoad
(
e
)
{
// 获取照片选项对象
const
product
=
app
.
globalData
.
photo
.
product
this
.
product
=
`?brandId=
${
product
.
brandId
}
&brand=
${
product
.
brandName
}
&classifyId=
${
product
.
classifyId
}
&systemId=
${
product
.
systemId
}
`
if
(
app
.
globalData
.
photo
.
currentItem
)
{
// 获取规格Id
this
.
standardId
=
app
.
globalData
.
photo
.
currentItem
.
_id
}
getApp
().
trackPage
(
'照片预览页'
)
getApp
().
trackPage
(
'照片预览页'
)
const
globalTempPath
=
getApp
().
globalData
.
photo
.
tempPath
const
globalTempPath
=
getApp
().
globalData
.
photo
.
tempPath
if
(
globalTempPath
&&
globalTempPath
.
mixWater
){
if
(
globalTempPath
&&
globalTempPath
.
mixWater
){
...
@@ -41,6 +51,9 @@
...
@@ -41,6 +51,9 @@
this
.
images
=
[
e
.
img
]
this
.
images
=
[
e
.
img
]
// this.downloadImages()
// this.downloadImages()
}
}
// if() {
// }
console
.
log
(
this
.
images
,
'this.images'
)
console
.
log
(
this
.
images
,
'this.images'
)
this
.
token
=
getApp
().
globalData
.
token
this
.
token
=
getApp
().
globalData
.
token
...
@@ -122,6 +135,7 @@
...
@@ -122,6 +135,7 @@
},
},
submitFile
()
{
submitFile
()
{
let
self
=
this
let
self
=
this
if
(
self
.
keys
.
length
)
{
if
(
self
.
keys
.
length
)
{
for
(
let
s
of
self
.
keys
)
{
for
(
let
s
of
self
.
keys
)
{
self
.
$u
.
cloudApi
.
saveImage
({
self
.
$u
.
cloudApi
.
saveImage
({
...
...
take-order/pages/photo/setting.vue
View file @
022407ce
This diff is collapsed.
Click to expand it.
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