Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
lumastoreapp
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
xieyishang
lumastoreapp
Commits
fa4681d0
Commit
fa4681d0
authored
Dec 18, 2020
by
home
Browse files
Options
Browse Files
Download
Plain Diff
zxf
parents
7af45ea8
2fe885fc
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
1000 additions
and
667 deletions
+1000
-667
manifest.json
manifest.json
+5
-5
pages/addEditEleProduct/addEditEleProduct.vue
pages/addEditEleProduct/addEditEleProduct.vue
+38
-21
pages/eleProduct/eleProduct.vue
pages/eleProduct/eleProduct.vue
+3
-1
pages/index/index.vue
pages/index/index.vue
+19
-10
pages/order/order.vue
pages/order/order.vue
+1
-1
pages/order/shoporderdetail/shoporderdetail.vue
pages/order/shoporderdetail/shoporderdetail.vue
+526
-470
pages/publishActivities/activityDetail/activityDetail.vue
pages/publishActivities/activityDetail/activityDetail.vue
+324
-84
pages/publishActivities/activityList/activityList.vue
pages/publishActivities/activityList/activityList.vue
+54
-51
pages/storeqrcode/storeqrcode.vue
pages/storeqrcode/storeqrcode.vue
+15
-5
utils/api/merchant.js
utils/api/merchant.js
+9
-9
utils/debug.js
utils/debug.js
+6
-10
No files found.
manifest.json
View file @
fa4681d0
...
...
@@ -3,8 +3,8 @@
//
"appid"
:
"__UNI__FC9419E"
,
"appid"
:
"__UNI__1EA80F1"
,
//这个是
web
的
"description"
:
"商家"
,
"versionName"
:
"1.
0.99
"
,
"versionCode"
:
1
99
,
"versionName"
:
"1.
1.00
"
,
"versionCode"
:
1
10
,
"transformPx"
:
false
,
"compatible"
:
{
"ignoreVersion"
:
true
,
//
true
表示忽略版本检查提示框,HBuilderX
1.9
.
0
及以上版本支持
...
...
@@ -126,9 +126,9 @@
},
"splashscreen"
:
{
"android"
:
{
"hdpi"
:
"C:/Users/Administrator/Desktop/
证书/d0abce82961b508e6a0b9924d15fe86
.png"
,
"xhdpi"
:
"C:/Users/Administrator/Desktop/
证书/d0abce82961b508e6a0b9924d15fe86
.png"
,
"xxhdpi"
:
"C:/Users/Administrator/Desktop/
证书/d0abce82961b508e6a0b9924d15fe86
.png"
"hdpi"
:
"C:/Users/Administrator/Desktop/
da/6b51802bba0a32ac69392831b1fc324
.png"
,
"xhdpi"
:
"C:/Users/Administrator/Desktop/
da/6b51802bba0a32ac69392831b1fc324
.png"
,
"xxhdpi"
:
"C:/Users/Administrator/Desktop/
da/6b51802bba0a32ac69392831b1fc324
.png"
},
"ios"
:
{
"iphone"
:
{
...
...
pages/addEditEleProduct/addEditEleProduct.vue
View file @
fa4681d0
...
...
@@ -341,6 +341,7 @@
},
data
()
{
return
{
linkage_id
:
''
,
is_datashow
:
true
,
bools
:
''
,
...
...
@@ -429,7 +430,13 @@
{}
],
isShow
:
false
,
chindformList
:[],
chindformList
:[],
myProps
:{
label
:
'
cate_name
'
,
value
:
'
cate_id
'
,
children
:
''
,
},
//上传图片相关的
c_pics
:
[],
c_pics1
:[],
...
...
@@ -731,7 +738,6 @@
},
confirm
(
e
){
console
.
log
(
this
.
chindformList
);
return
;
this
.
cate_name
=
e
.
item
.
cate_name
;
this
.
form
.
cate_id
=
e
.
item
.
cate_id
;
this
.
index
=
e
.
index
;
...
...
@@ -768,7 +774,8 @@
},
//修改的时候赋初始值
async
eleProductInfofun
(){
async
eleProductInfofun
(){
let
that
=
this
;
let
res
=
await
eleProductInfo
({
product_id
:
this
.
product_id
,
});
...
...
@@ -808,24 +815,32 @@
this
.
form
.
commission
=
res
.
data
.
commission
,
//返佣比例
this
.
form
.
sell_type
=
res
.
data
.
sell_type
,
// 售卖类型
this
.
form
.
mandatory
=
res
.
data
.
mandatory
this
.
video_photos
=
res
.
data
.
video_photos
;
//轮播
this
.
detail_photos
=
res
.
data
.
detail_photos
;
//详情
res
.
data
.
video_photos
.
map
(
item
=>
{
//轮播
this
.
c_pics1
.
push
({
code
:
0
,
data
:
item
,
msg
:
"
success
"
,
time
:
"
1587101904
"
})
})
res
.
data
.
detail_photos
.
map
(
item
=>
{
//详情
this
.
c_pics2
.
push
({
code
:
0
,
data
:
item
,
msg
:
"
success
"
,
time
:
"
1587101904
"
})
})
if
(
typeof
res
.
data
.
video_photos
==
'
object
'
){
this
.
video_photos
=
res
.
data
.
video_photos
;
//轮播
for
(
let
i
in
res
.
data
.
video_photos
){
this
.
c_pics1
.
push
({
code
:
0
,
data
:
res
.
data
.
video_photos
[
i
],
msg
:
"
success
"
,
time
:
"
1587101904
"
});
}
}
if
(
typeof
res
.
data
.
detail_photos
==
'
object
'
){
this
.
detail_photos
=
res
.
data
.
detail_photos
;
//详情
for
(
let
i
in
res
.
data
.
detail_photos
){
this
.
c_pics2
.
push
({
code
:
0
,
data
:
res
.
data
.
detail_photos
[
i
],
msg
:
"
success
"
,
time
:
"
1587101904
"
});
}
}
//下拉分类 初始值
this
.
chindformList
.
forEach
((
item
,
index
)
=>
{
if
(
item
.
cate_id
==
res
.
data
.
cate_id
){
...
...
@@ -834,6 +849,8 @@
}
});
if
(
res
.
data
.
commodity_type
==
'
ordinary
'
)
{
this
.
ordinary
.
map
(
item
=>
{
if
(
this
.
linkage_product_id
==
item
.
product_id
){
...
...
pages/eleProduct/eleProduct.vue
View file @
fa4681d0
...
...
@@ -230,9 +230,11 @@
this
.
goods_list
=
[];
this
.
page
=
1
;
this
.
isallshow
=
false
;
this
.
tabactive
=
1
,
// this.goods_product_list();
this
.
searchProduct
();
},
},
computed
:
{
staticUrl
()
{
//静态资源地址
return
this
.
$store
.
state
.
staticUrl
;
...
...
pages/index/index.vue
View file @
fa4681d0
...
...
@@ -368,15 +368,6 @@
}
},
onLoad
()
{
getskipShop
({
type
:
'
bld
'
}).
then
(
res
=>
{
if
(
res
.
code
==
0
)
{
this
.
is_bld
=
res
.
data
.
is_bld
// this.is_bld = 1
}
})
//显示欢迎回来~
setTimeout
(()
=>
{
this
.
$refs
.
Welcome
.
show
();
...
...
@@ -410,6 +401,16 @@
// uni.stopPullDownRefresh();//结束下拉刷新
},
onShow
()
{
getskipShop
({
type
:
'
bld
'
}).
then
(
res
=>
{
if
(
res
.
code
==
0
)
{
this
.
is_bld
=
res
.
data
.
is_bld
// this.is_bld = 1
}
})
this
.
storeIndexfun
();
...
...
@@ -439,7 +440,15 @@
activity_nucleus
(
param
).
then
(
res
=>
{
if
(
res
.
code
==
0
)
{
this
.
$api
.
msg
(
res
.
msg
);
uni
.
showModal
({
title
:
'
提示
'
,
content
:
res
.
msg
,
showCancel
:
false
,
confirmText
:
'
确定
'
,
success
()
{
}
})
}
else
{
this
.
$api
.
msg
(
res
.
msg
);
}
...
...
pages/order/order.vue
View file @
fa4681d0
...
...
@@ -333,6 +333,6 @@
}
.orderlist
{
padding
:
10
0upx
24upx
0
24upx
;
box-sizing
:
border-box
;
padding
:
4
0upx
24upx
0
24upx
;
box-sizing
:
border-box
;
}
</
style
>
pages/order/shoporderdetail/shoporderdetail.vue
View file @
fa4681d0
<
template
>
<!-- 商家查看自己店铺的订单详情 -->
<!-- 订单 order -->
<view
class=
"shoporderdetale xiangq yocode"
>
<view
class=
"beijingimg"
style=
"height:80px"
>
<!--
<view
class=
"onetitle"
>
{{
detail
.
orderstatus
}}
</view>
<view
class=
"twotitle"
>
{{
detail
.
statusdesc
}}
</view>
-->
</view>
<view
class=
"boxs"
>
<view
class=
"topbox_20 addresone"
v-if=
"detail.delivery_type>=1"
>
<view
class=
"ali-c"
>
<view
class=
"weizhiimg"
>
<image
class=
"imgs"
src=
"/static/news/address.png"
></image>
</view>
<view
class=
"flex1 ml-20 addrnamesv"
>
<view
class=
"sz_30 bt_hei"
>
{{
detail
.
addr
.
name
}}
{{
detail
.
addr
.
mobile
}}
</view>
<view
class=
"sz_30 bt_hei mt-10"
>
{{
detail
.
addr
.
addr
}}
</view>
</view>
</view>
</view>
<view
class=
"topbox_20 mt-60 addresone"
v-else
>
<view
class=
"ali-c"
>
<view
class=
"weizhiimg"
>
<image
class=
"imgs"
src=
"/static/news/storeicon.png"
></image>
</view>
<view
class=
"flex1 ml-20"
>
<view
class=
"sz_30 bt_hei"
>
到店支付
</view>
</view>
</view>
</view>
<view
class=
"topbox_20 mt-20"
>
<view
class=
"ali-c"
>
<view
class=
"tubiimg mr-20"
>
<image
class=
"imgs"
src=
"/static/news/storeicon.png"
></image>
</view>
<view
class=
"bt_min flex1"
>
{{
detail
.
shop_name
}}
</view>
</view>
<view
class=
"flex mt-30"
v-for=
'(item,index) in detail.products'
:key=
'index'
>
<view
class=
"tuimg br_10 ov"
>
<image
class=
"imgs"
:src=
"staticUrl+item.photo"
v-if=
"item.photo"
></image>
<image
class=
"imgs"
:src=
"staticUrl+detail.photo"
v-else
></image>
</view>
<view
class=
"flex1 ml-25 goodsboxs"
>
<view
class=
"sz_30 bt_hei twoline names"
style=
"height:65upx"
>
{{
item
.
goods_name
}}
</view>
<view
class=
"sz_26 bt_hei mt-10 prices"
>
价格
{{
item
.
fprice
}}
元
<!--
<text
class=
"ml-20 prices"
v-if=
"detail.buytype==0 && item.recprice >0"
>
充值价
{{
item
.
recprice
}}
元
</text>
-->
</view>
<view
class=
"sz_26 inp_hui mt-10 skunames"
>
规格:
{{
item
.
sku_name
}}
<text
class=
"ml-20"
></text>
</view>
<view
class=
"sz_26 inp_hui mt-10 sumns"
>
数量: x
{{
item
.
goodsnum
}}
</view>
</view>
</view>
</view>
<view
class=
"topbox_20 mt-20 "
>
<view
class=
"ali-z sz_30 bt_hei flex ali-c jus-b"
>
<view>
已优惠:
</view>
<view
style=
"color: red;font-size: 20upx;"
>
-¥
{{
detail
.
cprice
}}
</view>
</view>
</view>
<view
class=
"topbox_20 mt-20 "
>
<view
class=
"ali-z sz_30 bt_hei flex ali-c jus-b"
>
<view>
总计:
</view>
<view
style=
"color: red;"
>
¥
{{
detail
.
total
}}
</view>
</view>
</view>
<!-- 第二排 -->
<view
class=
"cellboxs cellboxstow"
v-if=
'logs'
>
<view
class=
"subsbox cellitems flex ali-c jus-b"
>
<view
class=
"name"
>
订单信息
</view>
</view>
<view
class=
"cellitems flex ali-c jus-b"
>
<view
class=
"name"
>
订单编号
</view>
<view
class=
"vlas"
>
{{
logs
.
order_sn
}}
</view>
</view>
<view
class=
"cellitems flex ali-c jus-b"
>
<view
class=
"name"
>
创建时间
</view>
<view
class=
"vlas"
>
{{
logs
.
createtime
}}
</view>
</view>
<view
class=
"cellitems flex ali-c jus-b"
v-if=
"detail.status==4"
>
<view
class=
"name"
>
退款原因
</view>
<view
class=
"vlas"
>
{{
detail
.
refund_details
}}
</view>
</view>
</view>
<!-- 订单信息 -->
<!-- 联系客服 -->
<view
class=
"ordertelbox flex "
>
<view
class=
"itemboxss flex1 flex flexc"
@
tap=
"xlsj"
:data-tel=
'detail.addr.mobile'
>
<image
class=
"img"
src=
"/static/news/telicon1.png"
mode=
""
></image>
<view
class=
"name"
>
联系客户
</view>
</view>
<view
class=
"itemboxss flex1 flex flexc"
@
tap=
"lxpt"
>
<image
class=
"img"
src=
"/static/news/kefuicon.png"
mode=
""
></image>
<view
class=
"name"
>
联系平台
</view>
</view>
</view>
<!-- 猜你会买 -->
</view>
</view>
</
template
>
<
script
>
import
{
orderDetails
}
from
"
@/utils/api/api.js
"
;
export
default
{
data
(){
return
{
order_id
:
""
,
detail
:{
addr
:{
mobile
:
""
}},
logs
:{},
}
},
computed
:
{
staticUrl
()
{
//静态资源地址
return
this
.
$store
.
state
.
staticUrl
;
}
},
onLoad
(
options
)
{
this
.
order_id
=
options
.
order_id
;
this
.
initializedata
();
},
methods
:{
xlsj
(){
//联系客户
uni
.
makePhoneCall
({
phoneNumber
:
this
.
detail
.
addr
.
mobile
//仅为示例
});
},
//联系平台
lxpt
(){
uni
.
makePhoneCall
({
phoneNumber
:
'
15907083784
'
//仅为示例
});
},
initializedata
()
{
var
that
=
this
;
let
params
=
{
order_id
:
that
.
order_id
,
};
orderDetails
(
params
).
then
(
res
=>
{
console
.
log
(
res
);
if
(
res
.
code
<
0
){
// app.showToast({title: res.msg});
this
.
$api
.
msg
(
res
.
msg
);
}
else
{
// that.setData({
// detail: res.data.detail,
// logs:res.data.logs,
// CONFIG: app.globalData.CONFIG
// })
this
.
detail
=
res
.
data
.
detail
;
this
.
logs
=
res
.
data
.
logs
;
//this.CONFIG =
}
})
},
callTel
:
function
(
e
)
{
uni
.
makePhoneCall
({
phoneNumber
:
e
.
currentTarget
.
dataset
.
tel
// 仅为示例,并非真实的电话号码
})
},
},
}
</
script
>
<
style
lang=
"scss"
>
/* pages/shop//order/weidianorder/weidianLine_item/weidianLine_item.wxss */
.ml-20
{
margin-left
:
20upx
;
}
.mt-20
{
margin-top
:
20upx
;
}
.mr-20
{
margin-right
:
20upx
;
}
.mt-30
{
margin-top
:
30upx
;
}
.ml-25
{
margin-left
:
25upx
;
}
.sz_30
{
font-size
:
30upx
;
}
.beijingimg
{
background
:
linear-gradient
(
#FF5A03
,
#FF4216
);
width
:
100%
;
height
:
300upx
;
position
:
absolute
;
top
:
0
;
z-index
:
1
;
padding-left
:
20upx
;
padding-top
:
25px
;
.onetitle
{
color
:
#FFFFFF
;
font-size
:
30upx
;
}
.twotitle
{
color
:
#FFFFFF
;
font-size
:
28upx
;
}
}
.addresone
{
margin-top
:
20px
;
}
.boxs
{
position
:
relative
;
z-index
:
2
;
width
:
100%
;
padding
:
24upx
;
box-sizing
:
border-box
;
}
.bt_min
{
font-size
:
30upx
;
}
.addrnamesv
{
font-size
:
30upx
;
}
.topbox_20
{
width
:
100%
;
background
:
rgba
(
255
,
255
,
255
,
1
);
border-radius
:
14rpx
;
padding
:
20upx
;
box-sizing
:
border-box
;
font-size
:
30upx
;
}
.skunames
{
font-size
:
24upx
;
}
page
{
position
:
relative
;
padding-bottom
:
100upx
;
background
:
#F5F5F5
;
}
.weizhiimg
{
width
:
30upx
;
height
:
46upx
;
.imgs
{
width
:
30upx
;
height
:
46upx
;
}
}
.shuwuimg
{
width
:
67upx
;
height
:
67upx
;
border-radius
:
4upx
;
overflow
:
hidden
;
}
.btbox
{
width
:
190upx
;
height
:
77upx
;
background
:rgba
(
255
,
255
,
255
,
1
)
;
border-radius
:
4upx
;
}
.xiangyouimg
{
width
:
14upx
;
height
:
24upx
;
}
.dianhuimg
{
width
:
42upx
;
height
:
42upx
;
}
.kuai
{
width
:
40upx
;
height
:
40upx
;
text-align
:
center
;
line-height
:
40upx
;
font-size
:
24upx
;
font-weight
:
500
;
color
:rgba
(
255
,
255
,
255
,
1
)
;
}
.dibu_qr
{
position
:
fixed
;
bottom
:
0
;
width
:
100%
;
background
:rgba
(
255
,
255
,
255
,
1
)
;
padding
:
10upx
24upx
;
box-sizing
:
border-box
;
}
.beizhu
{
width
:
150upx
;
text-align
:
right
;
}
.tubiimg
{
width
:
27upx
;
height
:
24upx
;
.imgs
{
width
:
27upx
;
height
:
24upx
;
}
}
.tuimg
{
width
:
183upx
;
height
:
183upx
;
.imgs
{
width
:
183upx
;
height
:
183upx
;
}
}
view
{
line-height
:
112%
;
letter-spacing
:
3upx
}
.dianhuimg
{
width
:
43upx
;
height
:
43upx
;
}
.shuxian
{
width
:
1px
;
height
:
100upx
;
background
:rgba
(
242
,
242
,
242
,
1
)
;
}
.duanxian
{
width
:
45upx
;
height
:
1px
;
background
:
rgba
(
181
,
181
,
181
,
1
);
}
.cptjimg
{
width
:
100%
;
height
:
310upx
;
}
/* 取消弹窗 */
.zan-dialog__mask
{
position
:
fixed
;
top
:
0
;
left
:
0
;
right
:
0
;
bottom
:
0
;
z-index
:
10
;
background
:
rgba
(
0
,
0
,
0
,
.5
);
display
:
none
;
}
.zan-dialog__container
{
position
:
fixed
;
bottom
:
400upx
;
width
:
650upx
;
height
:
350upx
;
margin-left
:
50upx
;
background
:
#f8f8f8
;
transform
:
translateY
(
300%
);
transition
:
all
0
.4s
ease
;
z-index
:
12
;
border-radius
:
20upx
;
/* box-shadow: 0px 3px 3px 2px gainsboro; */
}
.zan-dialog--show
.zan-dialog__container
{
transform
:
translateY
(
0
);
}
.zan-dialog--show
.zan-dialog__mask
{
display
:
block
;
}
.goodsboxs
{
font-size
:
30upx
;
.names
{
font-size
:
30upx
;
}
.prices
{
font-size
:
30upx
;
}
.sumns
{
color
:rgb
(
192
,
190
,
190
)
;
}
}
//联系kefu 客服
.ordertelbox
{
margin
:
0
24upx
;
margin-top
:
20upx
;
height
:
89upx
;
background
:rgba
(
255
,
255
,
255
,
1
)
;
border-radius
:
0px
0px
14upx
14upx
;
.itemboxss
{
position
:
relative
;
height
:
89upx
;
line-height
:
89upx
;
.img
{
width
:
43upx
;
height
:
43upx
;
margin-right
:
20upx
;
}
.name
{
font-size
:
30upx
;
color
:rgba
(
0
,
0
,
0
,
1
)
;
}
}
.itemboxss
:nth-child
(
1
)
:after
{
content
:
""
;
width
:
1px
;
height
:
89px
;
background
:rgba
(
242
,
242
,
242
,
1
)
;
position
:
absolute
;
top
:
0
;
right
:
0
;
}
}
//客服end
//价格明细列表
.cellboxs
{
margin
:
20upx
0
;
margin-top
:
20upx
;
.cellitems
{
padding
:
0
20upx
;
height
:
88upx
;
line-height
:
88upx
;
border-bottom
:
1px
solid
#F5F1F1
;
background
:
#FFFFFF
;
.name
{
font-size
:
30upx
;
color
:rgba
(
0
,
0
,
0
,
1
)
;
}
.vlas
{
font-size
:
30upx
;
color
:rgba
(
0
,
0
,
0
,
1
)
;
}
}
.cellitems
:nth-last-child
(
1
)
{
border
:
0
;
}
.subsbox
{
.name
{
font-size
:
30upx
;
font-family
:
PingFang
SC
;
font-weight
:bold
;
color
:rgba
(
0
,
0
,
0
,
1
)
;
}
.vlas
{
color
:
#FF6900
;
.fuhao
{
font-size
:
30upx
;
}
.shuzi
{
font-family
:
PingFang
SC
;
font-weight
:bold
;
font-size
:
36upx
;
}
}
}
}
// .cellboxstow{
// margin-top: 0;
// margin-bottom: 0;
// }
<
template
>
<!-- 商家查看自己店铺的订单详情 -->
<!-- 订单 order -->
<view
class=
"shoporderdetale xiangq yocode"
>
<view
class=
"beijingimg"
style=
"height:80px"
>
<!--
<view
class=
"onetitle"
>
{{
detail
.
orderstatus
}}
</view>
<view
class=
"twotitle"
>
{{
detail
.
statusdesc
}}
</view>
-->
</view>
<view
class=
"boxs"
>
<view
class=
"topbox_20 addresone"
v-if=
"detail.delivery_type>=1"
>
<view
class=
"ali-c"
>
<view
class=
"weizhiimg"
>
<image
class=
"imgs"
src=
"/static/news/address.png"
></image>
</view>
<view
class=
"flex1 ml-20 addrnamesv"
>
<view
class=
"sz_30 bt_hei"
>
{{
detail
.
addr
.
name
}}
{{
detail
.
addr
.
mobile
}}
</view>
<view
class=
"sz_30 bt_hei mt-10"
>
{{
detail
.
addr
.
addr
}}
</view>
</view>
</view>
</view>
<view
class=
"topbox_20 mt-60 addresone"
v-else
>
<view
class=
"ali-c"
>
<view
class=
"weizhiimg"
>
<image
class=
"imgs"
src=
"/static/news/storeicon.png"
></image>
</view>
<view
class=
"flex1 ml-20"
>
<view
class=
"sz_30 bt_hei"
>
到店支付
</view>
</view>
</view>
</view>
<view
class=
"topbox_20 mt-20"
>
<view
class=
"ali-c"
>
<view
class=
"tubiimg mr-20"
>
<image
class=
"imgs"
src=
"/static/news/storeicon.png"
></image>
</view>
<view
class=
"bt_min flex1"
>
{{
detail
.
shop_name
}}
</view>
</view>
<view
class=
"flex mt-30"
v-for=
'(item,index) in detail.products'
:key=
'index'
>
<view
class=
"tuimg br_10 ov"
>
<image
class=
"imgs"
:src=
"staticUrl+item.photo"
v-if=
"item.photo"
></image>
<image
class=
"imgs"
:src=
"staticUrl+detail.photo"
v-else
></image>
</view>
<view
class=
"flex1 ml-25 goodsboxs"
>
<view
class=
"sz_30 bt_hei twoline names"
style=
"height:65upx"
>
{{
item
.
goods_name
}}
</view>
<view
class=
"sz_26 bt_hei mt-10 prices"
>
价格
{{
item
.
fprice
}}
元
<!--
<text
class=
"ml-20 prices"
v-if=
"detail.buytype==0 && item.recprice >0"
>
充值价
{{
item
.
recprice
}}
元
</text>
-->
</view>
<view
class=
"sz_26 inp_hui mt-10 skunames"
>
规格:
{{
item
.
sku_name
}}
<text
class=
"ml-20"
></text>
</view>
<view
class=
"sz_26 inp_hui mt-10 sumns"
>
数量: x
{{
item
.
goodsnum
}}
</view>
</view>
</view>
</view>
<view
class=
"topbox_20 mt-20 "
>
<view
class=
"ali-z sz_30 bt_hei flex ali-c jus-b"
>
<view>
已优惠:
</view>
<view
style=
"color: red;font-size: 20upx;"
>
-¥
{{
detail
.
cprice
}}
</view>
</view>
</view>
<view
class=
"topbox_20 mt-20 "
>
<view
class=
"ali-z sz_30 bt_hei flex ali-c jus-b"
>
<view>
总计:
</view>
<view
style=
"color: red;"
>
¥
{{
detail
.
total
}}
</view>
</view>
</view>
<!-- 第二排 -->
<view
class=
"cellboxs cellboxstow"
v-if=
'logs'
>
<view
class=
"subsbox cellitems flex ali-c jus-b"
>
<view
class=
"name"
>
订单信息
</view>
</view>
<view
class=
"cellitems flex ali-c jus-b"
>
<view
class=
"name"
>
订单编号
</view>
<view
class=
"vlas"
>
{{
logs
.
order_sn
}}
</view>
</view>
<view
class=
"cellitems flex ali-c jus-b"
>
<view
class=
"name"
>
创建时间
</view>
<view
class=
"vlas"
>
{{
logs
.
createtime
}}
</view>
</view>
<view
class=
"cellitems flex ali-c jus-b"
v-if=
"detail.status==4"
>
<view
class=
"name"
>
退款原因
</view>
<view
class=
"vlas"
>
{{
detail
.
refund_details
}}
</view>
</view>
<view
class=
"cellitems flex ali-c jus-b"
>
<view
class=
"name"
style=
"width: 30%;"
>
订单备注:
</view>
<view
class=
"vlas"
style=
"text-align: left;"
>
{{
detail
.
message
==
''
?
'
无
'
:
detail
.
message
}}
</view>
</view>
</view>
<!-- 订单信息 -->
<!-- 联系客服 -->
<view
class=
"ordertelbox flex "
>
<view
class=
"itemboxss flex1 flex flexc"
@
tap=
"xlsj"
:data-tel=
'detail.addr.mobile'
>
<image
class=
"img"
src=
"/static/news/telicon1.png"
mode=
""
></image>
<view
class=
"name"
>
联系客户
</view>
</view>
<view
class=
"itemboxss flex1 flex flexc"
@
tap=
"lxpt"
>
<image
class=
"img"
src=
"/static/news/kefuicon.png"
mode=
""
></image>
<view
class=
"name"
>
联系平台
</view>
</view>
</view>
<!-- 猜你会买 -->
</view>
</view>
</
template
>
<
script
>
import
{
orderDetails
}
from
"
@/utils/api/api.js
"
;
export
default
{
data
()
{
return
{
order_id
:
""
,
detail
:
{
addr
:
{
mobile
:
""
}
},
logs
:
{},
}
},
computed
:
{
staticUrl
()
{
//静态资源地址
return
this
.
$store
.
state
.
staticUrl
;
}
},
onLoad
(
options
)
{
this
.
order_id
=
options
.
order_id
;
this
.
initializedata
();
},
methods
:
{
xlsj
()
{
//联系客户
uni
.
makePhoneCall
({
phoneNumber
:
this
.
detail
.
addr
.
mobile
//仅为示例
});
},
//联系平台
lxpt
()
{
uni
.
makePhoneCall
({
phoneNumber
:
'
15907083784
'
//仅为示例
});
},
initializedata
()
{
var
that
=
this
;
let
params
=
{
order_id
:
that
.
order_id
,
};
orderDetails
(
params
).
then
(
res
=>
{
console
.
log
(
res
);
if
(
res
.
code
<
0
)
{
// app.showToast({title: res.msg});
this
.
$api
.
msg
(
res
.
msg
);
}
else
{
// that.setData({
// detail: res.data.detail,
// logs:res.data.logs,
// CONFIG: app.globalData.CONFIG
// })
this
.
detail
=
res
.
data
.
detail
;
this
.
logs
=
res
.
data
.
logs
;
//this.CONFIG =
}
})
},
callTel
:
function
(
e
)
{
uni
.
makePhoneCall
({
phoneNumber
:
e
.
currentTarget
.
dataset
.
tel
// 仅为示例,并非真实的电话号码
})
},
},
}
</
script
>
<
style
lang=
"scss"
>
/* pages/shop//order/weidianorder/weidianLine_item/weidianLine_item.wxss */
.ml-20
{
margin-left
:
20upx
;
}
.mt-20
{
margin-top
:
20upx
;
}
.mr-20
{
margin-right
:
20upx
;
}
.mt-30
{
margin-top
:
30upx
;
}
.ml-25
{
margin-left
:
25upx
;
}
.sz_30
{
font-size
:
30upx
;
}
.beijingimg
{
background
:
linear-gradient
(
#FF5A03
,
#FF4216
);
width
:
100%
;
height
:
300upx
;
position
:
absolute
;
top
:
0
;
z-index
:
1
;
padding-left
:
20upx
;
padding-top
:
25px
;
.onetitle
{
color
:
#FFFFFF
;
font-size
:
30upx
;
}
.twotitle
{
color
:
#FFFFFF
;
font-size
:
28upx
;
}
}
.addresone
{
margin-top
:
20px
;
}
.boxs
{
position
:
relative
;
z-index
:
2
;
width
:
100%
;
padding
:
24upx
;
box-sizing
:
border-box
;
}
.bt_min
{
font-size
:
30upx
;
}
.addrnamesv
{
font-size
:
30upx
;
}
.topbox_20
{
width
:
100%
;
background
:
rgba
(
255
,
255
,
255
,
1
);
border-radius
:
14rpx
;
padding
:
20upx
;
box-sizing
:
border-box
;
font-size
:
30upx
;
}
.skunames
{
font-size
:
24upx
;
}
page
{
position
:
relative
;
padding-bottom
:
100upx
;
background
:
#F5F5F5
;
}
.weizhiimg
{
width
:
30upx
;
height
:
46upx
;
.imgs
{
width
:
30upx
;
height
:
46upx
;
}
}
.shuwuimg
{
width
:
67upx
;
height
:
67upx
;
border-radius
:
4upx
;
overflow
:
hidden
;
}
.btbox
{
width
:
190upx
;
height
:
77upx
;
background
:
rgba
(
255
,
255
,
255
,
1
);
border-radius
:
4upx
;
}
.xiangyouimg
{
width
:
14upx
;
height
:
24upx
;
}
.dianhuimg
{
width
:
42upx
;
height
:
42upx
;
}
.kuai
{
width
:
40upx
;
height
:
40upx
;
text-align
:
center
;
line-height
:
40upx
;
font-size
:
24upx
;
font-weight
:
500
;
color
:
rgba
(
255
,
255
,
255
,
1
);
}
.dibu_qr
{
position
:
fixed
;
bottom
:
0
;
width
:
100%
;
background
:
rgba
(
255
,
255
,
255
,
1
);
padding
:
10upx
24upx
;
box-sizing
:
border-box
;
}
.beizhu
{
width
:
150upx
;
text-align
:
right
;
}
.tubiimg
{
width
:
27upx
;
height
:
24upx
;
.imgs
{
width
:
27upx
;
height
:
24upx
;
}
}
.tuimg
{
width
:
183upx
;
height
:
183upx
;
.imgs
{
width
:
183upx
;
height
:
183upx
;
}
}
view
{
line-height
:
112%
;
letter-spacing
:
3upx
}
.dianhuimg
{
width
:
43upx
;
height
:
43upx
;
}
.shuxian
{
width
:
1px
;
height
:
100upx
;
background
:
rgba
(
242
,
242
,
242
,
1
);
}
.duanxian
{
width
:
45upx
;
height
:
1px
;
background
:
rgba
(
181
,
181
,
181
,
1
);
}
.cptjimg
{
width
:
100%
;
height
:
310upx
;
}
/* 取消弹窗 */
.zan-dialog__mask
{
position
:
fixed
;
top
:
0
;
left
:
0
;
right
:
0
;
bottom
:
0
;
z-index
:
10
;
background
:
rgba
(
0
,
0
,
0
,
.5
);
display
:
none
;
}
.zan-dialog__container
{
position
:
fixed
;
bottom
:
400upx
;
width
:
650upx
;
height
:
350upx
;
margin-left
:
50upx
;
background
:
#f8f8f8
;
transform
:
translateY
(
300%
);
transition
:
all
0
.4s
ease
;
z-index
:
12
;
border-radius
:
20upx
;
/* box-shadow: 0px 3px 3px 2px gainsboro; */
}
.zan-dialog--show
.zan-dialog__container
{
transform
:
translateY
(
0
);
}
.zan-dialog--show
.zan-dialog__mask
{
display
:
block
;
}
.goodsboxs
{
font-size
:
30upx
;
.names
{
font-size
:
30upx
;
}
.prices
{
font-size
:
30upx
;
}
.sumns
{
color
:
rgb
(
192
,
190
,
190
);
}
}
//联系kefu 客服
.ordertelbox
{
margin
:
0
24upx
;
margin-top
:
20upx
;
height
:
89upx
;
background
:
rgba
(
255
,
255
,
255
,
1
);
border-radius
:
0px
0px
14upx
14upx
;
.itemboxss
{
position
:
relative
;
height
:
89upx
;
line-height
:
89upx
;
.img
{
width
:
43upx
;
height
:
43upx
;
margin-right
:
20upx
;
}
.name
{
font-size
:
30upx
;
color
:
rgba
(
0
,
0
,
0
,
1
);
}
}
.itemboxss
:nth-child
(
1
)
:after
{
content
:
""
;
width
:
1px
;
height
:
89px
;
background
:
rgba
(
242
,
242
,
242
,
1
);
position
:
absolute
;
top
:
0
;
right
:
0
;
}
}
//客服end
//价格明细列表
.cellboxs
{
margin
:
20upx
0
;
margin-top
:
20upx
;
.cellitems
{
padding
:
0
20upx
;
height
:
88upx
;
line-height
:
88upx
;
border-bottom
:
1px
solid
#F5F1F1
;
background
:
#FFFFFF
;
.name
{
font-size
:
30upx
;
color
:
rgba
(
0
,
0
,
0
,
1
);
}
.vlas
{
font-size
:
30upx
;
color
:
rgba
(
0
,
0
,
0
,
1
);
}
}
.cellitems
:nth-last-child
(
1
)
{
border
:
0
;
}
.subsbox
{
.name
{
font-size
:
30upx
;
font-family
:
PingFang
SC
;
font-weight
:
bold
;
color
:
rgba
(
0
,
0
,
0
,
1
);
}
.vlas
{
color
:
#FF6900
;
.fuhao
{
font-size
:
30upx
;
}
.shuzi
{
font-family
:
PingFang
SC
;
font-weight
:
bold
;
font-size
:
36upx
;
}
}
}
}
// .cellboxstow{
// margin-top: 0;
// margin-bottom: 0;
// }
</
style
>
pages/publishActivities/activityDetail/activityDetail.vue
View file @
fa4681d0
<
template
>
<view>
<view
class=
""
>
<view
class=
""
style=
"text-align: center;height: 120upx;line-height: 120upx;font-weight: bold;font-size: 32upx;"
>
已有
<text
style=
"color: #21B94C;font-size: 60upx;"
>
{{
receivePeopleNumber
}}
</text>
人领取 还剩
{{
unreceivePeopleNumber
}}
人未核销
<view
class=
"projuctTab flex"
>
<view
class=
"tabitems flex1"
:class=
"
{active:tabactive==1}" @tap="taggletab(1)">
<view
class=
"tabtitle"
>
参与人员
</view>
<!-- (
{{
count
[
0
]
}}
) -->
</view>
<view
class=
"tabitems flex1"
:class=
"
{active:tabactive==2}" @tap="taggletab(2)">
<view
class=
"tabtitle"
>
核销人员
</view>
<!-- (
{{
count
[
1
]
}}
) -->
</view>
</view>
<view
class=
""
style=
"height: 160upx;padding: 0 24upx;background-color: rgb(255, 255, 255);margin-bottom: 20upx;"
v-if=
"getDetail.length > 0 "
v-for=
"(item,index) in getDetail"
>
<view
class=
"fx "
style=
"justify-content: space-between;background-color: #fff; align-items: center;
height: 100%"
>
<view
class=
"fx"
style=
"width: 75%;align-items: center;"
>
<view
style=
"height: 120upx;width: 120upx;border-radius: 120upx;text-align: center;line-height: 80upx;overflow: hidden;"
>
<image
:src=
"item.face"
style=
"display: inline;"
></image>
<view
class=
""
style=
"margin-top:90upx ;"
:hidden=
"!(tabactive==1)"
>
<view
class=
""
>
<view
class=
""
style=
"text-align: center;height: 120upx;line-height: 120upx;font-weight: bold;font-size: 32upx;"
>
已有
<text
style=
"color: #21B94C;font-size: 60upx;"
>
{{
receivePeopleNumber
}}
</text>
人参与
</view>
</view>
<view
class=
""
style=
"height: 100upx;padding: 0 24upx;background-color: rgb(255, 255, 255);margin-bottom: 2upx;"
v-for=
"(item,index) in getAllDetail"
>
<view
class=
"fx "
style=
"justify-content: space-between;background-color: #fff; align-items: center;height: 100%"
>
<view
class=
"fx"
style=
"width: 75%;align-items: center;"
>
<view
style=
"height: 80upx;width: 80upx;border-radius: 120upx;text-align: center;line-height: 80upx;overflow: hidden;"
>
<image
:src=
"item.face"
style=
"display: inline;"
></image>
</view>
<view
style=
"margin:0 0 0 10upx;width: 75%;padding: 20upx 10upx;"
>
<view
style=
"font: 34upx 微软雅黑;padding-bottom:10upx ;"
class=
"oneline"
>
{{
item
.
nickname
}}
</view>
<view
style=
"font-size:20upx;color:rgb(116, 113, 113);padding-top: 10upx;"
>
{{
item
.
create_time
}}
</view>
</view>
</view>
<view
style=
"margin:0 0 0 10upx;width: 75%;padding: 20upx 10upx;"
>
<view
style=
"font: 34upx 微软雅黑;padding-bottom:10upx ;"
class=
"oneline"
>
{{
item
.
nickname
}}
</view
>
<
view
style=
"font-size:20upx;color:rgb(116, 113, 113);padding-top: 10upx;"
>
{{
item
.
verification_time
}}
</view
>
<view
style=
"width: 15%;height: 104upx;"
>
<
!--
<image
src=
"/static/lingqu.png"
mode=
""
style=
"width:100% ;height: 100%;display: inline;"
></image>
--
>
</view>
<!-- 关注插槽 -->
<!--
<slot
name=
"before"
></slot>
-->
</view>
<view
style=
"width: 15%;height: 104upx;"
>
<!--
<text
style=
"color:#DC143C;padding: 0 12upx;border-radius: 10upx;font-size: 32upx;"
>
</text>
-->
<image
src=
"/static/lingqu.png"
mode=
""
style=
"width:100% ;height: 100%;display: inline;"
></image>
</view>
<!-- 关注插槽 -->
<!--
<slot
name=
"before"
></slot>
-->
<!--
<slot
name=
"content"
>
</slot>
-->
</view>
<view
v-if=
"getAllDetail.length
<
=
0
"
style=
"text-align: center;width: 100%;height:1000upx;line-height: 1000upx;font-size: 50upx;color:#8C8C8C ;"
>
<image
src=
"https://luma.jxdsy.cn//static/applet5/images/uts/meiyoule.png"
mode=
""
></image>
</view>
</view>
<view
class=
""
style=
"margin-top:90upx ;"
:hidden=
"tabactive==1"
>
<view
class=
""
>
<view
class=
""
style=
"text-align: center;height: 120upx;line-height: 120upx;font-weight: bold;font-size: 32upx;"
>
已有
<text
style=
"color: #21B94C;font-size: 60upx;"
>
{{
enterPeopleNumber
}}
</text>
人核销
</view>
</view>
<!--
<slot
name=
"content"
>
</slot>
-->
</view>
<view
v-if=
"getDetail.length
<
=
0
"
style=
"text-align: center;width: 100%;height:1000upx;line-height: 1000upx;font-size: 50upx;color:#8C8C8C ;"
>
还没有人领取~~
<view
class=
""
style=
"height: 100upx;padding: 0 24upx;background-color: rgb(255, 255, 255);margin-bottom: 2upx;"
v-for=
"(item,index) in getScanDetail"
>
<view
class=
"fx "
style=
"justify-content: space-between;background-color: #fff; align-items: center;
height: 100%"
>
<view
class=
"fx"
style=
"width: 75%;align-items: center;"
>
<view
style=
"height: 80upx;width: 80upx;border-radius: 120upx;text-align: center;line-height: 80upx;overflow: hidden;"
>
<image
:src=
"item.face"
style=
"display: inline;"
></image>
</view>
<view
style=
"margin:0 0 0 10upx;width: 75%;padding: 20upx 10upx;"
>
<view
style=
"font: 34upx 微软雅黑;padding-bottom:10upx ;"
class=
"oneline"
>
{{
item
.
nickname
}}
</view>
<view
style=
"font-size:20upx;color:rgb(116, 113, 113);padding-top: 10upx;"
>
{{
item
.
verification_time
}}
</view>
</view>
</view>
<view
style=
"width: 10%;height: 70upx;"
>
<image
src=
"/static/lingqu.png"
mode=
""
style=
"width:100% ;height: 100%;display: inline;"
></image>
</view>
<!-- 关注插槽 -->
<!--
<slot
name=
"before"
></slot>
-->
</view>
<!--
<slot
name=
"content"
>
</slot>
-->
</view>
<view
v-if=
"getScanDetail.length
<
=
0
"
style=
"text-align: center;width: 100%;height:1000upx;line-height: 1000upx;font-size: 50upx;color:#8C8C8C ;"
>
<image
src=
"https://luma.jxdsy.cn//static/applet5/images/uts/meiyoule.png"
mode=
""
></image>
</view>
</view>
</view>
</
template
>
...
...
@@ -46,51 +105,22 @@
activity_user
}
from
'
@/utils/api/merchant.js
'
;
export
default
{
data
(){
data
()
{
return
{
shop_id
:
''
,
activity_id
:
''
,
getDetail
:[],
page
:
1
,
receivePeopleNumber
:
0
,
unreceivePeopleNumber
:
0
,
shop_id
:
''
,
activity_id
:
''
,
getAllDetail
:
[],
// 参与人员列表
getScanDetail
:
[],
//核销人员列表
allpage
:
0
,
// 参与人员分页数
scanpage
:
0
,
//核销人员分页数
enterPeopleNumber
:
0
,
//核销人数
receivePeopleNumber
:
0
,
//参与人数
// unreceivePeopleNumber: 0,
tabactive
:
1
,
}
},
onReachBottom
()
{
activity_user
({
shop_id
:
this
.
shop_id
,
activity_id
:
this
.
activity_id
,
nucleus
:
1
,
page
:
this
.
page
}).
then
(
res
=>
{
if
(
res
.
code
==
0
&&
res
.
data
.
list
.
length
>
0
){
this
.
page
++
this
.
getDetail
=
res
.
data
.
list
;
this
.
receivePeopleNumber
=
res
.
data
.
receivePeopleNumber
;
this
.
unreceivePeopleNumber
=
res
.
data
.
unreceivePeopleNumber
;
uni
.
stopPullDownRefresh
();
}
else
{
uni
.
$api
.
msg
(
'
没有更多数据了
'
)
}
})
},
onPullDownRefresh
()
{
this
.
page
=
1
activity_user
({
shop_id
:
this
.
shop_id
,
activity_id
:
this
.
activity_id
,
nucleus
:
1
}).
then
(
res
=>
{
if
(
res
.
code
==
0
){
this
.
getDetail
=
res
.
data
.
list
this
.
receivePeopleNumber
=
res
.
data
.
receivePeopleNumber
;
this
.
unreceivePeopleNumber
=
res
.
data
.
unreceivePeopleNumber
;
uni
.
stopPullDownRefresh
();
}
})
},
onLoad
(
options
)
{
let
that
=
this
that
.
activity_id
=
options
.
activity_id
...
...
@@ -100,28 +130,238 @@
that
.
shop_id
=
res
.
data
.
shop_id
}
})
activity_user
({
shop_id
:
that
.
shop_id
,
activity_id
:
that
.
activity_id
,
nucleus
:
1
}).
then
(
res
=>
{
if
(
res
.
code
==
0
){
this
.
getDetail
=
res
.
data
.
list
;
this
.
receivePeopleNumber
=
res
.
data
.
receivePeopleNumber
;
this
.
unreceivePeopleNumber
=
res
.
data
.
unreceivePeopleNumber
;
this
.
activityUserAll
(
that
.
shop_id
,
that
.
activity_id
);
//获取参与人员
},
/**
* 触底事件
*/
onReachBottom
()
{
// console.log('触底了',this.tabactive)
if
(
this
.
tabactive
==
1
)
{
this
.
allpage
++
// this.activityUserAll(this.shop_id, this.activity_id, 0, this.allpage)
activity_user
({
shop_id
:
shop_id
,
activity_id
:
activity_id
,
nucleus
:
0
,
page
:
this
.
allpage
}).
then
(
res
=>
{
if
(
res
.
code
==
0
)
{
this
.
getScanDetail
=
[...
this
.
getScanDetail
,...
res
.
data
.
list
]
this
.
receivePeopleNumber
=
res
.
data
.
receivePeopleNumber
;
// this.unreceivePeopleNumber = res.data.unreceivePeopleNumber;
}
})
}
else
if
(
this
.
tabactive
==
2
)
{
this
.
scanpage
++
activity_user
({
shop_id
:
shop_id
,
activity_id
:
activity_id
,
nucleus
:
1
,
page
:
this
.
scanpage
}).
then
(
res
=>
{
if
(
res
.
code
==
0
)
{
this
.
getScanDetail
=
[
this
.
getScanDetail
,...
res
.
data
.
list
]
this
.
enterPeopleNumber
=
res
.
data
.
receivePeopleNumber
;
// this.unreceivePeopleNumber = res.data.unreceivePeopleNumber;
}
})
// this.activityUserScan(this.shop_id, this.activity_id, 1, this.scanpage)
}
else
{
return
false
;
}
},
/**
* 下拉刷新
*/
onPullDownRefresh
()
{
this
.
allpage
=
1
this
.
scanpage
=
1
this
.
activityUserAll
(
this
.
shop_id
,
this
.
activity_id
,
)
this
.
activityUserScan
(
this
.
shop_id
,
this
.
activity_id
)
uni
.
stopPullDownRefresh
();
},
methods
:
{
taggletab
(
index
)
{
this
.
tabactive
=
index
;
if
(
index
==
1
)
{
this
.
activityUserAll
(
this
.
shop_id
,
this
.
activity_id
,
)
}
else
if
(
index
==
2
)
{
this
.
activityUserScan
(
this
.
shop_id
,
this
.
activity_id
)
}
})
},
/**
* @param {Number} nucleus
* @param {Number} activity_id
* @param {Number} shop_id
*/
activityUserAll
(
shop_id
,
activity_id
,
nucleus
=
0
,
pages
=
0
)
{
activity_user
({
shop_id
:
shop_id
,
activity_id
:
activity_id
,
nucleus
:
nucleus
,
page
:
pages
}).
then
(
res
=>
{
if
(
res
.
code
==
0
)
{
this
.
getAllDetail
=
res
.
data
.
list
this
.
receivePeopleNumber
=
res
.
data
.
receivePeopleNumber
;
// this.unreceivePeopleNumber = res.data.unreceivePeopleNumber;
}
})
},
/**
* @param {Number} nucleus
* @param {Number} activity_id
* @param {Number} shop_id
*/
activityUserScan
(
shop_id
,
activity_id
,
nucleus
=
1
,
pages
=
0
)
{
activity_user
({
shop_id
:
shop_id
,
activity_id
:
activity_id
,
nucleus
:
nucleus
,
page
:
pages
}).
then
(
res
=>
{
if
(
res
.
code
==
0
)
{
this
.
getScanDetail
=
res
.
data
.
list
this
.
enterPeopleNumber
=
res
.
data
.
receivePeopleNumber
;
// this.unreceivePeopleNumber = res.data.unreceivePeopleNumber;
}
})
}
},
}
</
script
>
<
style
>
page
{
background-color
:
#EEEEEE
;
<
style
lang=
"scss"
>
.projuctlist
{
margin
:
130upx
24upx
;
padding-top
:
18upx
;
background
:
rgba
(
255
,
255
,
255
,
1
);
border-radius
:
14upx
;
.itempro
{
position
:
relative
;
border-bottom
:
1px
solid
rgba
(
220
,
220
,
220
,
1
);
padding
:
20upx
;
.thumbnail
{
width
:
170upx
;
height
:
170upx
;
border-radius
:
6upx
;
margin-right
:
27upx
;
margin-left
:
20upx
;
}
.infobox
{
.title
{
font-size
:
34upx
;
color
:
rgba
(
51
,
51
,
51
,
1
);
//margin-bottom: 5upx;
}
.time
{
//margin-bottom: 5upx;
}
.time
,
.price
{
font-size
:
30upx
;
color
:
rgba
(
153
,
153
,
153
,
1
);
}
}
.btnbox
{
position
:
absolute
;
bottom
:
5px
;
right
:
5px
;
.btns
{
width
:
100upx
;
height
:
60upx
;
line-height
:
60upx
;
text-align
:
center
;
border
:
1upx
solid
rgba
(
160
,
160
,
160
,
1
);
border-radius
:
4upx
;
font-size
:
30upx
;
color
:
rgba
(
0
,
0
,
0
,
1
);
}
.btnboxdel
{
margin-left
:
16upx
;
}
.btnboxxj
{
background
:
#FF6900
;
color
:
#FFFFFF
;
border
:
0
;
margin-left
:
16upx
;
}
}
}
}
.projuctTab
{
background
:
#FFFFFF
;
width
:
100%
;
height
:
98upx
;
line-height
:
98upx
;
position
:
fixed
;
top
:
0
;
/* #ifdef H5 */
top
:
86upx
;
/* #endif */
left
:
0
;
z-index
:
99
;
.tabitems
{
text-align
:
center
;
.tabtitle
{
text-align
:
center
;
height
:
98upx
;
line-height
:
98upx
;
font-size
:
30upx
;
display
:
inline-block
;
box-sizing
:
border-box
;
color
:
#333333
;
}
}
.tabitems.active
{
.tabtitle
{
font-family
:
PingFang
SC
;
font-weight
:
bold
;
color
:
#FF6900
;
border-bottom
:
1px
solid
#FF6900
;
}
}
}
.fx
{
display
:
flex
;
}
...
...
pages/publishActivities/activityList/activityList.vue
View file @
fa4681d0
...
...
@@ -15,7 +15,7 @@
<view
class=
"projuctlist"
:hidden=
"!(tabactive==1)"
>
<view
class=
""
v-if=
"start_activity.length>0"
>
<checkbox-group
>
<checkbox-group>
<!-- 单个商品 -->
<view
class=
"itempro flex "
v-for=
"(item,index) in start_activity"
:key=
"index"
@
click=
"jumpDetail(item.activity_id)"
>
<!--
<label
class=
"ali-c"
>
...
...
@@ -23,40 +23,43 @@
</label>
-->
<image
class=
"thumbnail"
:src=
"staticUrl + item.picture"
mode=
""
></image>
<view
class=
"infobox"
style=
"width: 70%;"
>
<view
class=
"title oneline"
style=
"height:45upx ;"
>
{{
item
.
goods_name
}}
</view>
<!--
<view
class=
"time"
>
上架时间:
{{
item
.
create_time
}}
</view>
-->
<view>
<view
style=
"font-size:26rpx;font-weight:bold;"
>
领取时间:
</view>
<view
style=
"font-size:24rpx;color:#656565"
>
{{
item
.
start
}}
—
{{
item
.
end
}}
</view>
</view>
</view>
<view
class=
"btnbox flex"
>
<view
class=
"btnbox flex"
>
<!--
<view
class=
"btns btnboxdel"
@
tap=
"deleteEleProductfun(item,index)"
>
删 除
</view>
-->
<!--
<view
class=
"btns btnboxxj"
@
tap=
"Selectiondata(item)"
v-if=
"tabactive==1 && isselect==1"
>
加入活动
</view>
-->
<!--
<view
class=
"btns btnboxxj"
@
tap=
"sold_outfun(item.id,1,index)"
v-else-if=
"tabactive==1"
>
下 架
</view>
-->
<!--
<view
class=
"btns btnboxxj"
@
tap=
"sold_outfun(item.id,0,index)"
v-show=
"tabactive==2"
>
上 架
</view>
-->
<!--
<view
class=
"btns btnboxxj"
@
click=
"setSpecs(item.product_id)"
>
规格
</view>
-->
<view
>
<view
class=
"btnboxdel flex"
style=
"align-items: center;"
@
click.stop=
"switch1Change"
>
活动开关:
<switch
:data-activity_id=
"item.activity_id"
:checked=
"item.state==1"
@
change=
"switch1Change"
/>
<view
class=
"btns btnboxdel"
@
tap.stop=
"tochanges(item,index)"
>
修 改
</view>
<view>
<view
class=
"btnboxdel flex"
style=
"align-items: center;"
@
click.stop=
"switch1Change"
>
活动开关:
<switch
:data-activity_id=
"item.activity_id"
:checked=
"item.state==1"
@
change=
"switch1Change"
/>
<view
class=
"btns btnboxdel"
@
tap.stop=
"tochanges(item,index)"
>
修 改
</view>
</view>
</view>
</view>
</view>
</checkbox-group>
</view>
<view
v-if=
"start_activity.length
<
=
0
"
style=
"text-align: center;width: 100%;height:1000upx;line-height: 1000upx;font-size: 50upx;color:#8C8C8C ;"
>
还没有人领取~~
<image
src=
"https://luma.jxdsy.cn//static/applet5/images/uts/meiyoule.png"
mode=
""
></image>
</view>
</view>
<view
class=
"projuctlist"
:hidden=
"!(tabactive==2)"
>
<view
class=
""
v-if=
"end_activity.length > 0"
>
<checkbox-group
>
<checkbox-group>
<!-- 单个商品 -->
<view
class=
"itempro flex "
v-for=
"(item,index) in end_activity"
:key=
"index"
@
click=
"jumpDetail(item.activity_id)"
>
<!--
<label
class=
"ali-c"
>
...
...
@@ -86,7 +89,7 @@
</checkbox-group>
</view>
<view
v-if=
"end_activity.length
<
=
0
"
style=
"text-align: center;width: 100%;height:1000upx;line-height: 1000upx;font-size: 50upx;color:#8C8C8C ;"
>
还没有人领取~~
<image
src=
"https://luma.jxdsy.cn//static/applet5/images/uts/meiyoule.png"
mode=
""
></image>
</view>
</view>
...
...
@@ -109,8 +112,8 @@
page
:
0
,
start_activity
:
[],
end_activity
:
[],
endpages
:
0
,
startpages
:
0
endpages
:
0
,
startpages
:
0
}
},
...
...
@@ -130,8 +133,8 @@
})
},
//下拉刷新
onPullDownRefresh
(){
if
(
this
.
tabactive
==
1
)
{
onPullDownRefresh
()
{
if
(
this
.
tabactive
==
1
)
{
this
.
startpages
=
0
activity_select
({
shop_id
:
this
.
shop_id
,
...
...
@@ -143,8 +146,8 @@
uni
.
stopPullDownRefresh
();
}
})
}
else
if
(
this
.
tabactive
==
2
)
{
}
else
if
(
this
.
tabactive
==
2
)
{
this
.
endpages
=
0
activity_select
({
shop_id
:
this
.
shop_id
,
...
...
@@ -156,34 +159,34 @@
uni
.
stopPullDownRefresh
();
}
})
}
},
//上拉触底
onReachBottom
(){
onReachBottom
()
{
if
(
this
.
tabactive
==
1
)
{
activity_select
({
shop_id
:
this
.
shop_id
,
page
:
++
this
.
startpages
,
is_date
:
2
}).
then
(
res
=>
{
if
(
res
.
code
==
0
)
{
this
.
start_activity
=
[...
this
.
start_activity
,
...
res
.
data
.
data
]
}
})
activity_select
({
shop_id
:
this
.
shop_id
,
page
:
++
this
.
startpages
,
is_date
:
2
}).
then
(
res
=>
{
if
(
res
.
code
==
0
)
{
this
.
start_activity
=
[...
this
.
start_activity
,
...
res
.
data
.
data
]
}
})
}
else
if
(
this
.
tabactive
==
2
)
{
activity_select
({
shop_id
:
this
.
shop_id
,
page
:
++
this
.
endpages
,
is_date
:
1
}).
then
(
res
=>
{
if
(
res
.
code
==
0
)
{
this
.
end_activity
=
[...
this
.
this
.
end_activity
,
...
res
.
data
.
data
]
}
})
}
activity_select
({
shop_id
:
this
.
shop_id
,
page
:
++
this
.
endpages
,
is_date
:
1
}).
then
(
res
=>
{
if
(
res
.
code
==
0
)
{
this
.
end_activity
=
[...
this
.
end_activity
,
...
res
.
data
.
data
]
}
})
}
},
onShow
()
{
...
...
@@ -214,10 +217,10 @@
},
methods
:
{
jumpDetail
(
activity_id
){
jumpDetail
(
activity_id
)
{
uni
.
navigateTo
({
url
:
`/pages/publishActivities/activityDetail/activityDetail?activity_id=
${
activity_id
}
`
url
:
`/pages/publishActivities/activityDetail/activityDetail?activity_id=
${
activity_id
}
`
})
},
//修改活动
...
...
@@ -227,14 +230,14 @@
url
:
`/pages/publishActivities/publishActivity/publishActivity?id=
${
data
.
activity_id
}
&type=edit`
,
})
},
// 查找产品
findEleProduct
(){
findEleProduct
()
{
},
switch1Change
(
e
)
{
if
(
e
.
type
==
'
change
'
)
{
if
(
e
.
type
==
'
change
'
)
{
console
.
log
(
e
)
if
(
e
.
detail
.
value
)
{
activity_close
({
...
...
@@ -258,10 +261,10 @@
}
})
}
}
else
{
return
;
}
else
{
return
;
}
},
//交互end
taggletab
(
index
)
{
...
...
pages/storeqrcode/storeqrcode.vue
View file @
fa4681d0
...
...
@@ -163,6 +163,7 @@
const
d
=
await
getSharePoster
({
// backgroundImage:"/static/news/sjrwm.png",
backgroundImage
:
this
.
statictowUrl
+
"
static/applet5/images/uts/sjrwm.png
"
,
...
...
@@ -239,16 +240,23 @@
// Context.setFillStyle('black');
// Context.setGlobalAlpha(0.3);
// Context.fillRect(0, bgObj.height - bgObj.height*0.2, bgObj.width, bgObj.height*0.2);
}
},
});
console
.
log
(
'
海报生成成功, 临时路径:
'
+
d
.
poster
.
tempFilePath
)
this
.
poster
.
finalPath
=
d
.
poster
.
tempFilePath
;
console
.
log
(
'
海报生成成功, 临时路径:
'
+
d
.
poster
.
tempFilePath
)
this
.
poster
.
finalPath
=
d
.
poster
.
tempFilePath
;
console
.
log
(
this
.
poster
.
finalPath
)
}
this
.
qrShow
=
true
;
}
catch
(
e
)
{
_app
.
hideLoading
();
_app
.
showToast
(
JSON
.
stringify
(
e
));
console
.
log
(
JSON
.
stringify
(
e
));
console
.
log
(
JSON
.
stringify
(
e
));
console
.
log
(
'
海报生成成功, 临时路径:
'
+
d
.
poster
.
tempFilePath
)
}
},
saveImage
()
{
...
...
@@ -278,7 +286,9 @@
}
}
}
</
script
>
</
script
>
<
style
lang=
"scss"
>
.hideCanvasView
{
...
...
utils/api/merchant.js
View file @
fa4681d0
...
...
@@ -38,12 +38,12 @@ export function getActivityList(data){
//判断商家类型 商品入库
export
function
getskipShop
(
data
){
return
request
.
post
(
"
/
user/skipShop
"
,
data
,
{
noAuth
:
true
});
return
request
.
post
(
"
user/skipShop
"
,
data
,
{
noAuth
:
true
});
}
//获取分类 列表
export
function
getshopclass
(
data
){
return
request
.
post
(
"
/
ele/weigh
"
,
data
,
{
noAuth
:
true
});
return
request
.
post
(
"
ele/weigh
"
,
data
,
{
noAuth
:
true
});
}
...
...
@@ -52,7 +52,7 @@ export function getshopclass(data){
*/
//获取分类 列表
export
function
activity_nucleus
(
data
){
return
request
.
post
(
"
/
ele/activity_nucleus
"
,
data
,
{
noAuth
:
true
});
return
request
.
post
(
"
ele/activity_nucleus
"
,
data
,
{
noAuth
:
true
});
}
/**
...
...
@@ -60,7 +60,7 @@ export function activity_nucleus(data){
* @param {Object} data
*/
export
function
activity_add
(
data
){
return
request
.
post
(
"
/
ele/activity_add
"
,
data
,
{
noAuth
:
true
});
return
request
.
post
(
"
ele/activity_add
"
,
data
,
{
noAuth
:
true
});
}
/**
...
...
@@ -68,7 +68,7 @@ export function activity_add(data){
* @param {Object} data
*/
export
function
activity_select
(
data
){
return
request
.
post
(
"
/
ele/activity_select
"
,
data
,
{
noAuth
:
true
});
return
request
.
post
(
"
ele/activity_select
"
,
data
,
{
noAuth
:
true
});
}
/**
...
...
@@ -76,7 +76,7 @@ export function activity_select(data){
* @param {Object} data
*/
export
function
activity_close
(
data
){
return
request
.
post
(
"
/
ele/activity_close
"
,
data
,
{
noAuth
:
true
});
return
request
.
post
(
"
ele/activity_close
"
,
data
,
{
noAuth
:
true
});
}
/**
...
...
@@ -84,7 +84,7 @@ export function activity_close(data){
* @param {} data
*/
export
function
activity_find
(
data
){
return
request
.
post
(
"
/
ele/activity_find
"
,
data
,
{
noAuth
:
true
});
return
request
.
post
(
"
ele/activity_find
"
,
data
,
{
noAuth
:
true
});
}
...
...
@@ -93,7 +93,7 @@ export function activity_find(data){
* @param {} data
*/
export
function
activity_user
(
data
){
return
request
.
post
(
"
/
ele/activity_user
"
,
data
,
{
noAuth
:
true
});
return
request
.
post
(
"
ele/activity_user
"
,
data
,
{
noAuth
:
true
});
}
...
...
@@ -102,5 +102,5 @@ export function activity_user(data){
* @param {} data
*/
export
function
activity_update
(
data
){
return
request
.
post
(
"
/
ele/activity_update
"
,
data
,
{
noAuth
:
true
});
return
request
.
post
(
"
ele/activity_update
"
,
data
,
{
noAuth
:
true
});
}
\ No newline at end of file
utils/debug.js
View file @
fa4681d0
...
...
@@ -8,14 +8,10 @@ module.exports = {
// isdebug:true,//测试
// xqdebug:false,//正式权限
xqdebug
:
true
,
//发布审核权限 也是测试环境的 主要用于ios
/**
* PS
*
* 正式环境 选 false !
* 本地开发环境 选 true
*
* */
xqdebug
:
true
,
//发布审核权限 也是测试环境的 主要用于ios
// #ifdef APP-PLUS
// isdebug:false,//正式 APP里面绝对是正式
// #endif
}
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