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
f0601de2
Commit
f0601de2
authored
Mar 30, 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
0859fccb
881ccae4
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
23 additions
and
27 deletions
+23
-27
standard.vue
take-order/components/photo/standard.vue
+1
-7
wxlogin.vue
take-order/pages/login/wxlogin.vue
+1
-1
index.vue
take-order/pages/photo/index.vue
+6
-0
list.vue
take-order/pages/photo/list.vue
+1
-1
setting.vue
take-order/pages/photo/setting.vue
+14
-18
No files found.
take-order/components/photo/standard.vue
View file @
f0601de2
...
@@ -50,13 +50,7 @@
...
@@ -50,13 +50,7 @@
},
{
},
{
name
:
'之约'
name
:
'之约'
}],
}],
swiperList
:[{
swiperList
:[],
title
:
'记录的距离大家零点九零杰拉德杰拉德建立的连接就111111111111'
,
},{
title
:
'记录的距离大家零点九零杰拉德杰拉德建立的连接就222222'
,
},{
title
:
'记录的距离大家零点九零杰拉德杰拉德建立的连接就333333'
,
},],
// 因为内部的滑动机制限制,请将tabs组件和swiper组件的current用不同变量赋值
// 因为内部的滑动机制限制,请将tabs组件和swiper组件的current用不同变量赋值
current
:
0
,
// tabs组件的current值,表示当前活动的tab选项
current
:
0
,
// tabs组件的current值,表示当前活动的tab选项
swiperCurrent
:
0
,
// swiper组件的current值,表示当前那个swiper-item是活动的
swiperCurrent
:
0
,
// swiper组件的current值,表示当前那个swiper-item是活动的
...
...
take-order/pages/login/wxlogin.vue
View file @
f0601de2
...
@@ -123,7 +123,7 @@ export default {
...
@@ -123,7 +123,7 @@ export default {
signupLogin
(
e
)
{
signupLogin
(
e
)
{
var
that
=
this
var
that
=
this
if
(
!
e
||
!
detail
||
e
.
detail
.
errMsg
.
indexOf
(
'user deny'
)
>
-
1
)
{
if
(
!
e
||
!
e
.
detail
||
e
.
detail
.
errMsg
.
indexOf
(
'user deny'
)
>
-
1
)
{
wx
.
showModal
({
wx
.
showModal
({
title
:
'提示'
,
title
:
'提示'
,
showCancel
:
false
,
showCancel
:
false
,
...
...
take-order/pages/photo/index.vue
View file @
f0601de2
...
@@ -121,6 +121,12 @@
...
@@ -121,6 +121,12 @@
handleClick
()
{
handleClick
()
{
// 点击下一步设置全局拍照品牌品类
// 点击下一步设置全局拍照品牌品类
const
globalData
=
getApp
().
globalData
const
globalData
=
getApp
().
globalData
if
(
!
globalData
.
token
)
{
uni
.
navigateTo
({
url
:
'/pages/login/wxlogin'
})
return
}
let
keys
=
[
'brandId'
,
'brandName'
,
'classifyId'
,
'systemId'
]
let
keys
=
[
'brandId'
,
'brandName'
,
'classifyId'
,
'systemId'
]
keys
.
map
(
key
=>
{
keys
.
map
(
key
=>
{
globalData
.
photo
.
product
[
key
]
=
this
[
key
]
||
this
.
param
[
key
]
globalData
.
photo
.
product
[
key
]
=
this
[
key
]
||
this
.
param
[
key
]
...
...
take-order/pages/photo/list.vue
View file @
f0601de2
...
@@ -14,7 +14,7 @@
...
@@ -14,7 +14,7 @@
<view
class=
"rightItemView"
@
click=
"rightItemClick(item,ikey)"
:key=
"ikey"
>
<view
class=
"rightItemView"
@
click=
"rightItemClick(item,ikey)"
:key=
"ikey"
>
<view
:class=
"['rightContentView',
{'active':item.images.length > 0}]">
<view
:class=
"['rightContentView',
{'active':item.images.length > 0}]">
<text
class=
"ph-lst-item-index"
>
{{
ikey
+
1
}}
</text>
<text
class=
"ph-lst-item-index"
>
{{
ikey
+
1
}}
</text>
<text
class=
""
>
{{
item
.
name
}}
(
{{
item
.
image_count
}}
张)
</text>
<text
class=
""
>
{{
item
.
name
}}
</text>
<image
class=
"ph-list-item-arrow"
src=
"/static/photo/arrow.png"
></image>
<image
class=
"ph-list-item-arrow"
src=
"/static/photo/arrow.png"
></image>
<!--
<text
class=
"rightContent u-m-t-14 u-m-l-30 u-p-b-30"
>
{{
item
.
describe
}}
</text>
-->
<!--
<text
class=
"rightContent u-m-t-14 u-m-l-30 u-p-b-30"
>
{{
item
.
describe
}}
</text>
-->
</view>
</view>
...
...
take-order/pages/photo/setting.vue
View file @
f0601de2
<
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: absolute;top: 50%;"
:show=
"loading"
size=
"36"
mode=
"flower"
></u-loading>
<view
class=
"itemView firstItem"
>
<view
class=
"itemView firstItem"
>
<view
class=
"itemTitleView"
>
<view
class=
"itemTitleView"
>
...
@@ -21,10 +21,10 @@
...
@@ -21,10 +21,10 @@
<text
class=
"itemTitle"
>
{{
item
[
'watemark_text'
]
||
'自定义'
+
(
ikey
+
1
)
}}
</text>
<text
class=
"itemTitle"
>
{{
item
[
'watemark_text'
]
||
'自定义'
+
(
ikey
+
1
)
}}
</text>
<text
class=
"itemNotice"
>
{{
item
[
'watemark_value'
]
||
'点击可编辑更改'
}}
</text>
<text
class=
"itemNotice"
>
{{
item
[
'watemark_value'
]
||
'点击可编辑更改'
}}
</text>
</view>
</view>
<switch
class=
"itemSwitch"
:checked=
"item['enable']"
@
change=
"itemChange(item, ikey)"
<switch
class=
"itemSwitch"
:checked=
"item['enable']"
@
change=
"itemChange(item, ikey)"
color=
"#007AFF"
/>
color=
"#007AFF"
/>
</view>
</view>
<view
class=
"shadowBackView"
v-if=
"isPopShow"
>
<u-popup
border-radius=
"10"
v-model=
"isPopShow"
safe-area-inset-bottom
:mask-close-able=
"false"
mode=
"center"
width=
"690rp"
height=
"600rpx"
>
<view
class=
"popCenterView"
>
<view
class=
"popCenterView"
>
<text
class=
"popTitle"
>
设置自定义项
</text>
<text
class=
"popTitle"
>
设置自定义项
</text>
<view
class=
"inputBackView"
>
<view
class=
"inputBackView"
>
...
@@ -56,7 +56,7 @@
...
@@ -56,7 +56,7 @@
</view>
</view>
</view>
</view>
</view>
</view>
</
view
>
</
u-popup
>
</view>
</view>
</
template
>
</
template
>
...
@@ -80,7 +80,7 @@
...
@@ -80,7 +80,7 @@
},
},
editingItem
:
{},
editingItem
:
{},
showTipLeft
:
false
,
showTipLeft
:
false
,
showTipRight
:
false
,
showTipRight
:
false
,
loading
:
true
loading
:
true
}
}
},
},
...
@@ -118,7 +118,7 @@
...
@@ -118,7 +118,7 @@
}).
then
(
res
=>
{
}).
then
(
res
=>
{
if
(
res
&&
res
.
result
)
{
if
(
res
&&
res
.
result
)
{
this
.
result
=
res
.
result
this
.
result
=
res
.
result
}
}
this
.
loading
=
false
this
.
loading
=
false
})
})
...
@@ -129,10 +129,10 @@
...
@@ -129,10 +129,10 @@
'token'
:
getApp
().
globalData
.
token
,
'token'
:
getApp
().
globalData
.
token
,
'watermark'
:
this
.
result
'watermark'
:
this
.
result
}).
then
(
res
=>
{
}).
then
(
res
=>
{
if
(
res
.
result
==
true
)
{
if
(
res
.
result
==
true
)
{
const
photo
=
getApp
().
globalData
.
photo
const
photo
=
getApp
().
globalData
.
photo
photo
.
waterSetting
=
this
.
result
photo
.
waterSetting
=
this
.
result
}
}
this
.
loading
=
false
this
.
loading
=
false
})
})
...
@@ -201,11 +201,11 @@
...
@@ -201,11 +201,11 @@
//自定义弹窗 关闭
//自定义弹窗 关闭
popCancelClick
:
function
()
{
popCancelClick
:
function
()
{
this
.
currenItem
=
{
this
.
isPopShow
=
false
'watemark_text'
:
''
,
this
.
currenItem
=
{
'watemark_value'
:
''
'watemark_text'
:
''
,
'watemark_value'
:
''
}
}
this
.
isPopShow
=
false
},
},
//自定义弹窗 保存
//自定义弹窗 保存
...
@@ -318,10 +318,6 @@
...
@@ -318,10 +318,6 @@
.popCenterView
{
.popCenterView
{
background-color
:
#FFFFFF
;
background-color
:
#FFFFFF
;
width
:
690
rpx
;
height
:
600
rpx
;
margin-top
:
300
rpx
;
border-radius
:
12
rpx
;
display
:
flex
;
display
:
flex
;
flex-direction
:
column
;
flex-direction
:
column
;
...
...
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