Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
T
taobao-mini-template
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
2
Issues
2
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
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
qinhaitao
taobao-mini-template
Commits
92540133
Commit
92540133
authored
Sep 14, 2021
by
管新明
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 优化中奖弹窗列表奖品类型、发奖来源展示问题,切换库存类型,重置库存
parent
48512b41
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
19 additions
and
3 deletions
+19
-3
prize-dialog.js
client/components/dialog/prize-dialog/prize-dialog.js
+11
-0
rank-dialog.axml
client/components/dialog/rank-dialog/rank-dialog.axml
+2
-2
rank-dialog.js
client/components/dialog/rank-dialog/rank-dialog.js
+3
-1
mixins.js
client/mixins/mixins.js
+1
-0
project.data.js
client/project.data.js
+2
-0
No files found.
client/components/dialog/prize-dialog/prize-dialog.js
View file @
92540133
...
@@ -149,6 +149,17 @@ Component({
...
@@ -149,6 +149,17 @@ Component({
});
});
}
}
},
},
// 重置库存
resetStock
(
value
,
name
)
{
if
(
name
===
'switchStock'
&&
value
===
2
)
{
this
.
setData
({
formData
:
{
...
this
.
data
.
formData
,
stock
:
''
}
})
}
},
navigateToPlugin
()
{
navigateToPlugin
()
{
clearTimeout
(
this
.
$page
.
data
.
backPageTimeOut
);
clearTimeout
(
this
.
$page
.
data
.
backPageTimeOut
);
my
.
navigateTo
({
my
.
navigateTo
({
...
...
client/components/dialog/rank-dialog/rank-dialog.axml
View file @
92540133
...
@@ -92,13 +92,13 @@
...
@@ -92,13 +92,13 @@
</table-column>
</table-column>
<table-column a:if="{{tableData.includes('type')}}" title="奖品类型" dataIndex="type">
<table-column a:if="{{tableData.includes('type')}}" title="奖品类型" dataIndex="type">
<view slot-scope="x">
<view slot-scope="x">
<text>{{
!!prizeTypes.find(v => v.value === x.record.type) ? prizeTypes.find(v => v.value === x.record.type).name : '/'
}}</text>
<text>{{
prizeTypesObj[x.record.type]
}}</text>
</view>
</view>
</table-column>
</table-column>
<table-column a:if="{{tableData.includes('name')}}" title="奖品名称" dataIndex="name"/>
<table-column a:if="{{tableData.includes('name')}}" title="奖品名称" dataIndex="name"/>
<table-column a:if="{{tableData.includes('prizeDataType')}}" title="发奖来源" dataIndex="prizeDataType">
<table-column a:if="{{tableData.includes('prizeDataType')}}" title="发奖来源" dataIndex="prizeDataType">
<view slot-scope="x">
<view slot-scope="x">
<text>{{
!!prizeDataTypes.find(v => v.value === x.record.prizeDataType) ? prizeDataTypes.find(v => v.value === x.record.prizeDataType).name : '/'
}}</text>
<text>{{
prizeDataTypesObj[x.record.prizeDataType]
}}</text>
</view>
</view>
</table-column>
</table-column>
<table-column a:if="{{tableData.includes('receiveName')}}" title="收货信息(联系人+详细地址)" dataIndex="receiveName">
<table-column a:if="{{tableData.includes('receiveName')}}" title="收货信息(联系人+详细地址)" dataIndex="receiveName">
...
...
client/components/dialog/rank-dialog/rank-dialog.js
View file @
92540133
import
{
activityList
}
from
'../../../project.data'
import
{
activityList
}
from
'../../../project.data'
import
{
findWinnerInfoList
,
exportAwardsList
}
from
'/api'
;
import
{
findWinnerInfoList
,
exportAwardsList
}
from
'/api'
;
import
dayjs
from
'dayjs'
;
import
dayjs
from
'dayjs'
;
const
{
isLogistics
,
filters
,
prizeTypes
,
prizeDataTypes
,
tableData
}
=
activityList
.
winnerDialog
const
{
isLogistics
,
filters
,
prizeTypes
,
prizeDataTypes
,
tableData
,
prizeTypesObj
,
prizeDataTypesObj
}
=
activityList
.
winnerDialog
Component
({
Component
({
mixins
:
[],
mixins
:
[],
...
@@ -11,6 +11,8 @@ Component({
...
@@ -11,6 +11,8 @@ Component({
prizeTypes
,
prizeTypes
,
prizeDataTypes
,
prizeDataTypes
,
tableData
,
tableData
,
prizeTypesObj
,
prizeDataTypesObj
,
// 搜索条件
// 搜索条件
searchInfo
:
{
searchInfo
:
{
pageNo
:
1
,
pageNo
:
1
,
...
...
client/mixins/mixins.js
View file @
92540133
...
@@ -4,6 +4,7 @@ export const methods = {
...
@@ -4,6 +4,7 @@ export const methods = {
onInputChangeByDataName
(
e
)
{
onInputChangeByDataName
(
e
)
{
const
{
name
}
=
e
.
target
.
dataset
;
const
{
name
}
=
e
.
target
.
dataset
;
const
{
value
}
=
e
.
detail
;
const
{
value
}
=
e
.
detail
;
this
.
resetStock
&&
this
.
resetStock
(
value
,
name
);
this
.
setDataByKey
(
value
,
name
);
this
.
setDataByKey
(
value
,
name
);
},
},
onChangeByDataName
(
val
,
key
)
{
onChangeByDataName
(
val
,
key
)
{
...
...
client/project.data.js
View file @
92540133
...
@@ -16,7 +16,9 @@ const projectData = {
...
@@ -16,7 +16,9 @@ const projectData = {
winnerDialog
:
{
// 中奖弹窗配置
winnerDialog
:
{
// 中奖弹窗配置
isLogistics
:
true
,
// 是否需要物流
isLogistics
:
true
,
// 是否需要物流
prizeTypes
:
[{
name
:
"优惠券"
,
value
:
1
},
{
name
:
"积分"
,
value
:
2
},
{
name
:
"实物"
,
value
:
3
},
{
name
:
"谢谢参与"
,
value
:
5
}],
// 奖品类型集合-筛选
prizeTypes
:
[{
name
:
"优惠券"
,
value
:
1
},
{
name
:
"积分"
,
value
:
2
},
{
name
:
"实物"
,
value
:
3
},
{
name
:
"谢谢参与"
,
value
:
5
}],
// 奖品类型集合-筛选
prizeTypesObj
:
{
1
:
"优惠券"
,
2
:
"积分"
,
3
:
"实物"
,
5
:
"谢谢参与"
},
prizeDataTypes
:
[{
name
:
"普通奖池"
,
value
:
1
},
{
name
:
"排行榜奖池"
,
value
:
2
}],
// 发奖来源集合
prizeDataTypes
:
[{
name
:
"普通奖池"
,
value
:
1
},
{
name
:
"排行榜奖池"
,
value
:
2
}],
// 发奖来源集合
prizeDataTypesObj
:
{
1
:
"普通奖池"
,
2
:
"排行榜奖池"
},
filters
:
[
"prizeId"
,
"userNick"
,
"timeRange"
,
"shipStatus"
,
"prizeType"
,
"prizeDataType"
],
// 筛选条件 prizeId-奖品编号、userNick-用户id、timeRange-发奖时间、shipStatus-发货状态、prizeType-奖品类型、prizeDataType-发奖来源
filters
:
[
"prizeId"
,
"userNick"
,
"timeRange"
,
"shipStatus"
,
"prizeType"
,
"prizeDataType"
],
// 筛选条件 prizeId-奖品编号、userNick-用户id、timeRange-发奖时间、shipStatus-发货状态、prizeType-奖品类型、prizeDataType-发奖来源
tableData
:
[
"_id"
,
"userNick"
,
"createTime"
,
"receiveTime"
,
"type"
,
"name"
,
"prizeDataType"
,
"receiveName"
,
"shipStatus"
,
"shipCompany"
],
// 列表展示数据 _id-奖品编号、userNick-用户id、createTime-发奖时间、receiveTime-填写地址时间、type-奖品类型、name-奖品名称、prizeDataType-发奖来源、receiveName-收货信息(联系人+详细地址)、shipStatus-发货状态、shipCompany-物流信息
tableData
:
[
"_id"
,
"userNick"
,
"createTime"
,
"receiveTime"
,
"type"
,
"name"
,
"prizeDataType"
,
"receiveName"
,
"shipStatus"
,
"shipCompany"
],
// 列表展示数据 _id-奖品编号、userNick-用户id、createTime-发奖时间、receiveTime-填写地址时间、type-奖品类型、name-奖品名称、prizeDataType-发奖来源、receiveName-收货信息(联系人+详细地址)、shipStatus-发货状态、shipCompany-物流信息
},
},
...
...
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