Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
self-support
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
李俊赕
self-support
Commits
01b5d11d
Commit
01b5d11d
authored
May 08, 2021
by
Morson
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
https://git.banshouhui.com/lijundan/self-support
# Conflicts: # src/components/order/index.vue
parents
260f5ae4
7461e0df
Changes
11
Show whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
138 additions
and
38 deletions
+138
-38
.env.js
.env.js
+2
-2
order.js
src/common/api/order.js
+1
-1
XhLocation.vue
src/components/createCom/XhLocation.vue
+1
-1
index.vue
src/components/order/index.vue
+7
-6
standard.vue
src/components/photo/standard.vue
+1
-1
pages.json
src/pages.json
+5
-2
index.vue
src/pages/index/index.vue
+36
-2
order.vue
src/pages/index/order.vue
+26
-5
complete.vue
src/pages/order/complete.vue
+21
-10
detail.vue
src/pages/order/detail.vue
+34
-3
list.vue
src/pages/photo/list.vue
+4
-5
No files found.
.env.js
View file @
01b5d11d
...
@@ -10,8 +10,8 @@
...
@@ -10,8 +10,8 @@
}
}
}
else
if
(
process
.
env
.
NODE_ENV
===
"production"
)
{
}
else
if
(
process
.
env
.
NODE_ENV
===
"production"
)
{
ENV_VAR
=
require
(
'./.env.prod.js'
);
//
ENV_VAR = require('./.env.prod.js');
//
ENV_VAR = require('./.env.test.js');
ENV_VAR
=
require
(
'./.env.test.js'
);
}
}
if
(
ENV_VAR
)
{
if
(
ENV_VAR
)
{
process
.
uniEnv
=
{};
process
.
uniEnv
=
{};
...
...
src/common/api/order.js
View file @
01b5d11d
...
@@ -53,7 +53,7 @@ let orderApiFun = function(vm){
...
@@ -53,7 +53,7 @@ let orderApiFun = function(vm){
/**
/**
* 接单
* 接单
*/
*/
let
orderAccept
=
async
(
params
=
{},
orderId
)
=>
await
vm
.
$u
.
post
(
prefix
+
vm
.
vuex_token
+
'/order/'
+
orderId
+
'/accept'
,
params
);
let
orderAccept
=
async
(
params
=
{},
orderId
)
=>
await
vm
.
$u
.
post
(
prefix
+
vm
.
vuex_token
+
'/order/'
+
orderId
+
'/accept'
,
params
,
{
'content-type'
:
'application/x-www-form-urlencoded'
}
);
/**
/**
* 抢单
* 抢单
...
...
src/components/createCom/XhLocation.vue
View file @
01b5d11d
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
<view
class=
"list u-flex u-row-between"
>
<view
class=
"list u-flex u-row-between"
>
<image
class=
"item-image"
:src=
"mixingImage"
v-if=
"item.required"
></image>
<image
class=
"item-image"
:src=
"mixingImage"
v-if=
"item.required"
></image>
<view
class=
"u-m-r-20"
>
{{
item
.
fieldsTitle
}}
</view>
<view
class=
"u-m-r-20"
>
{{
item
.
fieldsTitle
}}
</view>
<view
class=
"u-flex-1 location-name"
>
<view
class=
"u-flex-1 location-name"
@
click=
"getLocation"
>
<u-icon
name=
"map"
color=
"#2979ff"
size=
"30"
></u-icon>
自动定位
<u-icon
name=
"map"
color=
"#2979ff"
size=
"30"
></u-icon>
自动定位
</view>
</view>
</view>
</view>
...
...
src/components/order/index.vue
View file @
01b5d11d
...
@@ -20,7 +20,7 @@
...
@@ -20,7 +20,7 @@
<text>
{{
formatAddress
(
orderData
)
}}
</text>
<text>
{{
formatAddress
(
orderData
)
}}
</text>
</view>
</view>
<view
v-if=
"showDistance"
>
<view
v-if=
"showDistance"
>
{{
getDistance
(
orderData
.
contactAddressLatitud
,
orderData
.
contactAddressLongitud
)
}}
km
{{
orderDistance
}}
km
</view>
</view>
</view>
</view>
</view>
</view>
...
@@ -91,7 +91,7 @@
...
@@ -91,7 +91,7 @@
location
:
{
// 当前坐标
location
:
{
// 当前坐标
type
:
Array
,
type
:
Array
,
default
()
{
default
()
{
return
[
116.3896
,
39.91917
]
//
经度,纬
度
return
[
116.3896
,
39.91917
]
//
纬度,经
度
}
}
}
}
},
},
...
@@ -196,7 +196,7 @@
...
@@ -196,7 +196,7 @@
return
this
.
orderType
==
5
return
this
.
orderType
==
5
},
},
showDistance
()
{
showDistance
()
{
return
this
.
orderType
==
0
return
this
.
orderType
==
0
&&
this
.
location
.
length
>=
2
},
},
types
()
{
types
()
{
return
{
return
{
...
@@ -208,6 +208,10 @@
...
@@ -208,6 +208,10 @@
'exception'
:
5
,
// 异常单、
'exception'
:
5
,
// 异常单、
'finish'
:
6
,
//已完工
'finish'
:
6
,
//已完工
}
}
},
orderDistance
()
{
console
.
log
(
'orderData.contactAddressLatitud:'
,
this
.
orderData
.
contactAddressLatitud
,
'orderData.contactAddressLongitud'
,
this
.
orderData
.
contactAddressLongitud
,
'location:'
,
this
.
location
[
0
],
this
.
location
[
1
])
return
this
.
distance
(
this
.
orderData
.
contactAddressLatitud
,
this
.
orderData
.
contactAddressLongitud
,
this
.
location
[
0
],
this
.
location
[
1
])
}
}
},
},
created
()
{
created
()
{
...
@@ -265,9 +269,6 @@
...
@@ -265,9 +269,6 @@
},
1000
)
},
1000
)
}
}
},
},
getDistance
(
Latitud
,
Longitud
)
{
return
this
.
distance
(
Latitud
,
Longitud
,
this
.
location
[
0
],
this
.
location
[
1
])
},
formatAddress
(
order
)
{
formatAddress
(
order
)
{
let
address
=
""
let
address
=
""
if
(
order
)
{
if
(
order
)
{
...
...
src/components/photo/standard.vue
View file @
01b5d11d
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
<view
class=
"wrap"
>
<view
class=
"wrap"
>
<swiper
class=
"swiper-box"
:current=
"swiperCurrent"
@
transition=
"transition"
<swiper
class=
"swiper-box"
:current=
"swiperCurrent"
@
transition=
"transition"
@
animationfinish=
"animationfinish"
>
@
animationfinish=
"animationfinish"
>
<swiper-item
class=
"swiper-item"
>
<swiper-item
class=
"swiper-item"
v-if=
"currentItem.main_point && currentItem.main_point.length > 0"
>
<view
class=
"inner txt-inner"
:style=
"
{'background-image':'url(/static/photo/shadow-bg.png)'}">
<view
class=
"inner txt-inner"
:style=
"
{'background-image':'url(/static/photo/shadow-bg.png)'}">
<view
class=
"title"
>
<view
class=
"title"
>
拍照要求
拍照要求
...
...
src/pages.json
View file @
01b5d11d
...
@@ -231,7 +231,8 @@
...
@@ -231,7 +231,8 @@
"style"
:
{
"style"
:
{
"navigationBarTitleText"
:
"规范展示"
,
"navigationBarTitleText"
:
"规范展示"
,
"navigationBarBackgroundColor"
:
"#FFFFFF"
,
"navigationBarBackgroundColor"
:
"#FFFFFF"
,
"backgroundColor"
:
"#F4F5F7"
"backgroundColor"
:
"#F4F5F7"
,
"navigationStyle"
:
"custom"
//
隐藏系统导航栏
}
}
}
}
]
]
...
@@ -390,7 +391,9 @@
...
@@ -390,7 +391,9 @@
{
{
"name"
:
"完工配置"
,
//模式名称
"name"
:
"完工配置"
,
//模式名称
"path"
:
"pages/order/complete"
,
//启动页面,必选
"path"
:
"pages/order/complete"
,
//启动页面,必选
"query"
:
""
//启动参数,在页面的onLoad函数里面得到
"query"
:
{
"id"
:
11880091
}
//启动参数,在页面的onLoad函数里面得到
},
},
{
{
"name"
:
"资料信息"
,
//模式名称
"name"
:
"资料信息"
,
//模式名称
...
...
src/pages/index/index.vue
View file @
01b5d11d
...
@@ -86,7 +86,7 @@
...
@@ -86,7 +86,7 @@
data
()
{
data
()
{
return
{
return
{
status
:
0
,
// 入驻状态:0=>'待提交',1=>'待审核',2=>'已通过',3=>'备选',4=>'已驳回',6=>'已签约',7=>'已支付保证金',8=>'已通过考试',9=>'待提交'
status
:
0
,
// 入驻状态:0=>'待提交',1=>'待审核',2=>'已通过',3=>'备选',4=>'已驳回',6=>'已签约',7=>'已支付保证金',8=>'已通过考试',9=>'待提交'
location
:
[
116.3896
,
39.91917
],
// 经纬度
location
:
[],
// 经纬度
title
:
false
,
title
:
false
,
title
:
"Hello"
,
title
:
"Hello"
,
loaded
:
false
,
loaded
:
false
,
...
@@ -147,6 +147,7 @@
...
@@ -147,6 +147,7 @@
if
(
this
.
vuex_token
)
{
if
(
this
.
vuex_token
)
{
this
.
initSettleInfo
();
this
.
initSettleInfo
();
}
}
this
.
getLocation
()
},
},
// onPullDownRefresh() {
// onPullDownRefresh() {
// console.log('------下拉刷新------')
// console.log('------下拉刷新------')
...
@@ -365,6 +366,39 @@
...
@@ -365,6 +366,39 @@
}
}
});
});
},
},
/**
* 获取当前位置的经纬度
*/
getLocation
()
{
let
self
=
this
uni
.
getLocation
({
type
:
'gcj02'
,
success
:
function
(
res
)
{
self
.
location
=
[
res
.
latitude
,
res
.
longitude
]
},
complete
:
function
(
res
)
{
if
(
res
.
errMsg
.
indexOf
(
'auth'
)
!=
-
1
)
{
uni
.
showModal
({
title
:
'提示'
,
content
:
'获取权限失败,请到设置页面开启权限'
,
confirmText
:
'好的'
,
success
(
res
)
{
if
(
res
.
confirm
)
{
uni
.
openSetting
({
success
(
res
)
{
console
.
log
(
res
.
authSetting
)
}
});
}
}
})
}
},
fail
:
function
(
err
)
{
}
});
},
},
},
};
};
</
script
>
</
script
>
...
...
src/pages/index/order.vue
View file @
01b5d11d
...
@@ -90,11 +90,14 @@
...
@@ -90,11 +90,14 @@
_freshing
:
false
,
_freshing
:
false
,
};
};
},
},
onLoad
()
{
onLoad
(
e
)
{
this
.
_freshing
=
false
;
this
.
_freshing
=
false
;
this
.
getLocation
();
// this.getLocation(); // 不需要获取位置
// this.getOrderCount();
// this.getOrderCount();
// this.getOrderList(0);
// this.getOrderList(0);
if
(
e
&&
e
.
type
)
{
this
.
current
=
e
.
type
}
},
},
onShow
()
{
onShow
()
{
this
.
getOrderCount
()
this
.
getOrderCount
()
...
@@ -102,7 +105,7 @@
...
@@ -102,7 +105,7 @@
},
},
computed
:
{
computed
:
{
subList
()
{
subList
()
{
return
[
'待
受
理'
,
'已完工'
]
return
[
'待
处
理'
,
'已完工'
]
},
},
// 0:'去预约', 1:'去签到', 2:'去完工', 3:'审核中', 4:'去处理', 5'已完工'
// 0:'去预约', 1:'去签到', 2:'去完工', 3:'审核中', 4:'去处理', 5'已完工'
orderType
()
{
orderType
()
{
...
@@ -170,9 +173,27 @@
...
@@ -170,9 +173,27 @@
dataValue
.
push
(
res
.
latitude
)
dataValue
.
push
(
res
.
latitude
)
self
.
dataValue
=
dataValue
self
.
dataValue
=
dataValue
},
},
fail
(
err
)
{
complete
:
function
(
res
)
{
if
(
res
.
errMsg
.
indexOf
(
'auth'
)
!=
-
1
)
{
uni
.
showModal
({
title
:
'提示'
,
content
:
'获取权限失败,请到设置页面开启权限'
,
confirmText
:
'好的'
,
success
(
res
)
{
if
(
res
.
confirm
)
{
uni
.
openSetting
({
success
(
res
)
{
console
.
log
(
res
.
authSetting
)
}
});
}
}
}
})
}
},
fail
:
function
(
err
)
{
}
});
});
},
},
...
...
src/pages/order/complete.vue
View file @
01b5d11d
...
@@ -5,13 +5,13 @@
...
@@ -5,13 +5,13 @@
<u-navbar
:background=
"
{background: '#2272FF'}" back-icon-color="#fff" :title-size="32" title-color="#fff" :border-bottom="false" title="完工信息">
</u-navbar>
<u-navbar
:background=
"
{background: '#2272FF'}" back-icon-color="#fff" :title-size="32" title-color="#fff" :border-bottom="false" title="完工信息">
</u-navbar>
<u-tabs-swiper
class=
"order-tabs"
ref=
"tabs"
:current=
"tabIndex"
name=
"panelName"
:list=
"list"
@
change=
"tabsChange"
:is-scroll=
"false"
bg-color=
"#2272FF"
inactive-color=
"#a6c6ff"
active-color=
"#fff"
height=
"80"
font-size=
"32"
></u-tabs-swiper>
<u-tabs-swiper
class=
"order-tabs"
ref=
"tabs"
:current=
"tabIndex"
name=
"panelName"
:list=
"list"
@
change=
"tabsChange"
:is-scroll=
"false"
bg-color=
"#2272FF"
inactive-color=
"#a6c6ff"
active-color=
"#fff"
height=
"80"
font-size=
"32"
></u-tabs-swiper>
<view
class=
"u-menu-wrap"
>
<view
class=
"u-menu-wrap"
>
<
scroll-
view
scroll-y
scroll-with-animation
class=
"u-tab-view menu-scroll-view"
:scroll-top=
"scrollTop"
:scroll-into-view=
"itemId"
v-if=
"list[tabIndex].items.length > 1"
>
<view
scroll-y
scroll-with-animation
class=
"u-tab-view menu-scroll-view"
:scroll-top=
"scrollTop"
:scroll-into-view=
"itemId"
v-if=
"list[tabIndex].items.length > 1"
>
<view
v-for=
"(item,index) in list[tabIndex].items"
:key=
"index"
class=
"u-tab-item"
<view
v-for=
"(item,index) in list[tabIndex].items"
:key=
"index"
class=
"u-tab-item"
:class=
"[current == index ? 'u-tab-item-active' : '']"
@
tap
.
stop=
"swichMenu(index)"
>
:class=
"[current == index ? 'u-tab-item-active' : '']"
@
tap
.
stop=
"swichMenu(index)"
>
<text
class=
"u-line-1"
>
{{
item
.
name
}}
</text>
<text
class=
"u-line-1"
>
{{
item
.
name
}}
</text>
</view>
</view>
</
scroll-
view>
</view>
<
scroll-
view
:scroll-top=
"scrollRightTop"
scroll-y
scroll-with-animation
class=
"right-box"
@
scroll=
"rightScroll"
>
<view
:scroll-top=
"scrollRightTop"
scroll-y
scroll-with-animation
class=
"right-box"
@
scroll=
"rightScroll"
>
<u-form
:model=
"form"
ref=
"uForm"
>
<u-form
:model=
"form"
ref=
"uForm"
>
<template
v-for=
"(groupItem, groupIndex) in (list.length>0?list[tabIndex].items:[])"
>
<template
v-for=
"(groupItem, groupIndex) in (list.length>0?list[tabIndex].items:[])"
>
<view
class=
"class-item"
:key=
"groupIndex"
>
<view
class=
"class-item"
:key=
"groupIndex"
>
...
@@ -74,7 +74,7 @@
...
@@ -74,7 +74,7 @@
</view>
</view>
</template>
</template>
</u-form>
</u-form>
</
scroll-
view>
</view>
</view>
</view>
<view
:class=
"['btn-wrap', 'flex-xc', {'btn-bottom': tabIndex > 0}]"
>
<view
:class=
"['btn-wrap', 'flex-xc', {'btn-bottom': tabIndex > 0}]"
>
<u-button
class=
"btn-submit"
@
click=
"saveComplete"
<u-button
class=
"btn-submit"
@
click=
"saveComplete"
...
@@ -189,8 +189,8 @@
...
@@ -189,8 +189,8 @@
this
.
orderServiceType
=
decodeURIComponent
(
option
.
orderServiceType
)
this
.
orderServiceType
=
decodeURIComponent
(
option
.
orderServiceType
)
this
.
inGuaranteePeriod
=
option
.
inGuaranteePeriod
this
.
inGuaranteePeriod
=
option
.
inGuaranteePeriod
}
else
{
}
else
{
this
.
orderId
=
9708719
this
.
orderId
=
11880091
this
.
categoryId
=
88
this
.
categoryId
=
1100000214
this
.
orderServiceType
=
'安装'
this
.
orderServiceType
=
'安装'
this
.
inGuaranteePeriod
=
'Y'
this
.
inGuaranteePeriod
=
'Y'
}
}
...
@@ -264,6 +264,14 @@
...
@@ -264,6 +264,14 @@
})
})
})
})
})
})
if
(
!
param
.
base
[
0
].
fieldsValue
)
{
return
this
.
$refs
.
uToast
.
show
({
title
:
'请先选择产品规格'
,
type
:
'error'
,
})
}
self
.
$u
.
api
.
saveCompleteData
(
param
,
self
.
orderId
).
then
((
res
)
=>
{
self
.
$u
.
api
.
saveCompleteData
(
param
,
self
.
orderId
).
then
((
res
)
=>
{
if
(
res
.
code
==
200
)
{
if
(
res
.
code
==
200
)
{
this
.
$refs
.
uToast
.
show
({
this
.
$refs
.
uToast
.
show
({
...
@@ -649,6 +657,7 @@
...
@@ -649,6 +657,7 @@
width
:
200rpx
;
width
:
200rpx
;
height
:
100%
;
height
:
100%
;
border
:
4rpx
solid
#F4F5F7
;
border
:
4rpx
solid
#F4F5F7
;
overflow
:
auto
;
}
}
.u-tab-item
{
.u-tab-item
{
...
@@ -686,6 +695,8 @@
...
@@ -686,6 +695,8 @@
.right-box
{
.right-box
{
// background-color: rgb(250, 250, 250);
// background-color: rgb(250, 250, 250);
background-color
:
#FFFFFF
;
background-color
:
#FFFFFF
;
overflow
:
auto
;
width
:
100%
;
}
}
.page-view
{
.page-view
{
...
...
src/pages/order/detail.vue
View file @
01b5d11d
...
@@ -34,7 +34,7 @@
...
@@ -34,7 +34,7 @@
<u-icon
name=
"map"
size=
"28"
></u-icon>
<u-icon
name=
"map"
size=
"28"
></u-icon>
<text
class=
"address-txt"
>
{{
order
.
contactAddress
}}
</text>
<text
class=
"address-txt"
>
{{
order
.
contactAddress
}}
</text>
</view>
</view>
<u-image
width=
"48rpx"
height=
"48rpx"
:src=
"navigationIcon"
@
click=
"openLocation"
></u-image>
<u-image
width=
"48rpx"
height=
"48rpx"
:src=
"navigationIcon"
@
click=
"openLocation
(order.contactAddress)
"
></u-image>
</view>
</view>
<!--
<u-read-more
ref=
"uReadMore"
:show-height=
"40"
:shadowStyle=
"
{paddingTop: '0rpx',marginTop: '0rpx'}" close-text="查看更多" open-text="点击收起" toggle color="#2272FF" font-size="26"> -->
<!--
<u-read-more
ref=
"uReadMore"
:show-height=
"40"
:shadowStyle=
"
{paddingTop: '0rpx',marginTop: '0rpx'}" close-text="查看更多" open-text="点击收起" toggle color="#2272FF" font-size="26"> -->
<view
v-if=
"readMore"
@
click=
"readMore = false"
class=
"read-more-toggle"
>
<view
v-if=
"readMore"
@
click=
"readMore = false"
class=
"read-more-toggle"
>
...
@@ -268,7 +268,7 @@
...
@@ -268,7 +268,7 @@
}
}
},
},
methods
:
{
methods
:
{
openLocation
(){
openLocation
(
address
){
if
(
this
.
isAllowDianhuaAndDaohang
){
if
(
this
.
isAllowDianhuaAndDaohang
){
uni
.
getLocation
({
uni
.
getLocation
({
type
:
'gcj02'
,
//返回可以用于uni.openLocation的经纬度
type
:
'gcj02'
,
//返回可以用于uni.openLocation的经纬度
...
@@ -281,8 +281,36 @@
...
@@ -281,8 +281,36 @@
success
:
function
()
{
success
:
function
()
{
console
.
log
(
'success'
);
console
.
log
(
'success'
);
}
}
});
},
complete
:
function
(
res
)
{
console
.
log
(
'-------complete-----'
,
res
)
if
(
res
.
errMsg
.
indexOf
(
'auth'
)
!=
-
1
)
{
uni
.
showModal
({
title
:
'提示'
,
content
:
'获取权限失败,请到设置页面开启权限'
,
confirmText
:
'好的'
,
success
(
res
)
{
if
(
res
.
confirm
)
{
uni
.
openSetting
({
success
(
res
)
{
console
.
log
(
res
.
authSetting
)
}
});
}
}
})
}
else
{
uni
.
setClipboardData
({
data
:
address
,
success
:
function
()
{
console
.
log
(
'success'
);
}
});
});
}
}
}
});
});
}
}
},
},
...
@@ -346,7 +374,7 @@
...
@@ -346,7 +374,7 @@
self
.
order
=
res
.
data
self
.
order
=
res
.
data
this
.
getCurrentBtn
()
this
.
getCurrentBtn
()
var
nowTime
=
new
Date
();
var
nowTime
=
new
Date
();
if
(
nowTime
.
getTime
()
>
this
.
order
.
currentOverTime
){
if
(
this
.
order
.
currentOverTime
&&
nowTime
.
getTime
()
>
this
.
order
.
currentOverTime
){
this
.
btnClass
=
'timeOut-btn'
this
.
btnClass
=
'timeOut-btn'
}
}
if
(
self
.
order
.
isFirstOrder
){
if
(
self
.
order
.
isFirstOrder
){
...
@@ -789,6 +817,9 @@
...
@@ -789,6 +817,9 @@
line-height
:
24rpx
;
line-height
:
24rpx
;
margin-top
:
20rpx
;
margin-top
:
20rpx
;
margin-bottom
:
40rpx
;
margin-bottom
:
40rpx
;
display
:
flex
;
justify-content
:
space-between
;
align-items
:
center
;
.left
{
.left
{
.address-txt
{
.address-txt
{
margin-left
:
8rpx
;
margin-left
:
8rpx
;
...
...
src/pages/photo/list.vue
View file @
01b5d11d
<
template
>
<
template
>
<view
class=
"backView"
>
<view
class=
"backView"
>
<u-navbar
:title-size=
"32"
title-color=
"#000"
:border-bottom=
"false"
:title=
"title"
></u-navbar>
<u-loading
style=
"position: fixed;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)"
<view
:class=
"['topItemView',
{'active':activeTop===ikey}]" @click="handleTopItemChange(ikey,item)"
...
@@ -74,7 +75,8 @@
...
@@ -74,7 +75,8 @@
dataList
:
[],
dataList
:
[],
loading
:
true
,
loading
:
true
,
isPopShow
:
false
,
isPopShow
:
false
,
userWatermark
:{}
userWatermark
:{},
title
:
'规范展示'
}
}
},
},
onLoad
(
e
)
{
onLoad
(
e
)
{
...
@@ -84,9 +86,7 @@
...
@@ -84,9 +86,7 @@
}
}
if
(
e
&&
e
.
brand
)
{
if
(
e
&&
e
.
brand
)
{
this
.
brand
=
decodeURIComponent
(
e
.
brand
)
this
.
brand
=
decodeURIComponent
(
e
.
brand
)
uni
.
setNavigationBarTitle
({
this
.
title
=
this
.
brand
title
:
this
.
brand
});
}
}
if
(
e
&&
e
.
orderId
)
{
if
(
e
&&
e
.
orderId
)
{
...
@@ -351,7 +351,6 @@
...
@@ -351,7 +351,6 @@
width
:
100%
;
width
:
100%
;
display
:
flex
;
display
:
flex
;
flex-direction
:
column
;
flex-direction
:
column
;
padding-top
:
100
rpx
;
padding-bottom
:
50
rpx
;
padding-bottom
:
50
rpx
;
}
}
...
...
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