Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
ShenghuoquanBusiness
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
bp
ShenghuoquanBusiness
Commits
bee3441e
Commit
bee3441e
authored
Sep 07, 2021
by
shiyl
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优惠券没有可用时候也能进选择优惠券并显示空页面
parent
02400d8c
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
29 additions
and
3 deletions
+29
-3
VoucherActivity.kt
.../com/yidian/shenghuoquan/buserorder/ui/VoucherActivity.kt
+10
-1
ConfirmOrderViewModel.kt
...henghuoquan/buserorder/viewmodel/ConfirmOrderViewModel.kt
+10
-0
border_activity_confirm_order.xml
...der/src/main/res/layout/border_activity_confirm_order.xml
+1
-2
border_activity_voncher.xml
...UserOrder/src/main/res/layout/border_activity_voncher.xml
+8
-0
No files found.
Components/BUserOrder/src/main/java/com/yidian/shenghuoquan/buserorder/ui/VoucherActivity.kt
View file @
bee3441e
...
@@ -4,6 +4,8 @@ import androidx.activity.viewModels
...
@@ -4,6 +4,8 @@ import androidx.activity.viewModels
import
com.yidian.bcommon.constant.IntentConstants
import
com.yidian.bcommon.constant.IntentConstants
import
com.yidian.bcommon.constant.XRouterPathConstants
import
com.yidian.bcommon.constant.XRouterPathConstants
import
com.yidian.bcommon.constant.XRouterPathConstants.Companion.CHOOSE_VOUCHER_ACTIVITY
import
com.yidian.bcommon.constant.XRouterPathConstants.Companion.CHOOSE_VOUCHER_ACTIVITY
import
com.yidian.bcommon.extensions.hide
import
com.yidian.bcommon.extensions.show
import
com.yidian.bcommon.mvvm.BaseMvvmActivity
import
com.yidian.bcommon.mvvm.BaseMvvmActivity
import
com.yidian.shenghuoquan.buserorder.R
import
com.yidian.shenghuoquan.buserorder.R
import
com.yidian.shenghuoquan.buserorder.adapter.VoucherAdapter
import
com.yidian.shenghuoquan.buserorder.adapter.VoucherAdapter
...
@@ -38,8 +40,15 @@ class VoucherActivity : BaseMvvmActivity<BorderActivityVoncherBinding, VoucherVi
...
@@ -38,8 +40,15 @@ class VoucherActivity : BaseMvvmActivity<BorderActivityVoncherBinding, VoucherVi
val
list
=
params
[
IntentConstants
.
KEY_EXTRA_COUPON_LIST
]
as
List
<
CouponDto
>
val
list
=
params
[
IntentConstants
.
KEY_EXTRA_COUPON_LIST
]
as
List
<
CouponDto
>
binding
.
rvVoucherList
.
addItemDecoration
(
SpaceItemDecoration
(
resources
.
getDimensionPixelSize
(
R
.
dimen
.
dp10
)))
binding
.
rvVoucherList
.
addItemDecoration
(
SpaceItemDecoration
(
resources
.
getDimensionPixelSize
(
R
.
dimen
.
dp10
)))
binding
.
rvVoucherList
.
adapter
=
listAdapter
binding
.
rvVoucherList
.
adapter
=
listAdapter
if
(
list
.
isNullOrEmpty
())
{
binding
.
emptyView
.
show
()
binding
.
rvVoucherList
.
hide
()
}
else
{
binding
.
emptyView
.
hide
()
binding
.
rvVoucherList
.
show
()
listAdapter
.
setList
(
list
)
listAdapter
.
setList
(
list
)
}
}
}
}
}
}
}
}
}
Components/BUserOrder/src/main/java/com/yidian/shenghuoquan/buserorder/viewmodel/ConfirmOrderViewModel.kt
View file @
bee3441e
...
@@ -28,6 +28,7 @@ class ConfirmOrderViewModel : BaseViewModel() {
...
@@ -28,6 +28,7 @@ class ConfirmOrderViewModel : BaseViewModel() {
var
marketingName
=
MutableLiveData
<
String
>()
//活动名称
var
marketingName
=
MutableLiveData
<
String
>()
//活动名称
var
selectedCouponList
=
MutableLiveData
<
MutableList
<
CouponDto
>?>()
// 选中的优惠券
var
selectedCouponList
=
MutableLiveData
<
MutableList
<
CouponDto
>?>()
// 选中的优惠券
var
couponsAvailableList
=
MutableLiveData
<
List
<
CouponDto
>?>()
// 可用优惠券列表
var
couponsAvailableList
=
MutableLiveData
<
List
<
CouponDto
>?>()
// 可用优惠券列表
var
couponsAvailableNum
=
MutableLiveData
<
String
>()
// 可用优惠券数量提示
var
totalAmount
=
MutableLiveData
(
0.00
)
// 合计金额 = 原价 - 优惠
var
totalAmount
=
MutableLiveData
(
0.00
)
// 合计金额 = 原价 - 优惠
var
remark
=
MutableLiveData
<
String
>()
var
remark
=
MutableLiveData
<
String
>()
...
@@ -84,11 +85,20 @@ class ConfirmOrderViewModel : BaseViewModel() {
...
@@ -84,11 +85,20 @@ class ConfirmOrderViewModel : BaseViewModel() {
_goodsSuccessEvent
.
value
=
it
.
goodsList
_goodsSuccessEvent
.
value
=
it
.
goodsList
calculateOriginalAmount
(
it
.
goodsList
)
calculateOriginalAmount
(
it
.
goodsList
)
couponsAvailableList
.
value
=
it
.
couponList
couponsAvailableList
.
value
=
it
.
couponList
calculateCouponsAvailableNum
(
it
.
couponList
)
// 上传页面埋点信息
// 上传页面埋点信息
commitPageBuriedPoint
()
commitPageBuriedPoint
()
}
}
}
}
private
fun
calculateCouponsAvailableNum
(
couponList
:
List
<
CouponDto
>?)
{
if
(
couponList
.
isNullOrEmpty
())
{
couponsAvailableNum
.
value
=
"当前暂无可使用优惠券"
}
else
{
couponsAvailableNum
.
value
=
"${couponList.size} 张优惠券可用"
}
}
/**
/**
* 计算商品原价 = 数量 * 单价
* 计算商品原价 = 数量 * 单价
*/
*/
...
...
Components/BUserOrder/src/main/res/layout/border_activity_confirm_order.xml
View file @
bee3441e
...
@@ -252,7 +252,6 @@
...
@@ -252,7 +252,6 @@
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/dp8"
android:layout_marginTop=
"@dimen/dp8"
android:onClick=
"@{() -> vm.chooseVoucher()}"
android:onClick=
"@{() -> vm.chooseVoucher()}"
app:isShow=
"@{vm.couponsAvailableList.size() > 0}"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@id/rv_goods_list"
>
app:layout_constraintTop_toBottomOf=
"@id/rv_goods_list"
>
...
@@ -282,7 +281,7 @@
...
@@ -282,7 +281,7 @@
android:paddingTop=
"@dimen/dp2"
android:paddingTop=
"@dimen/dp2"
android:paddingEnd=
"@dimen/dp5"
android:paddingEnd=
"@dimen/dp5"
android:paddingBottom=
"@dimen/dp2"
android:paddingBottom=
"@dimen/dp2"
android:text=
"@{vm.couponsAvailable
List.size() + @string/coupons_available_n
um}"
android:text=
"@{vm.couponsAvailable
N
um}"
android:textColor=
"@color/white"
android:textColor=
"@color/white"
android:textSize=
"11sp"
android:textSize=
"11sp"
app:isShow=
"@{vm.selectedCouponList.size() == 0}"
app:isShow=
"@{vm.selectedCouponList.size() == 0}"
...
...
Components/BUserOrder/src/main/res/layout/border_activity_voncher.xml
View file @
bee3441e
...
@@ -38,5 +38,13 @@
...
@@ -38,5 +38,13 @@
tools:itemCount=
"3"
tools:itemCount=
"3"
tools:listitem=
"@layout/border_voucher_item"
/>
tools:listitem=
"@layout/border_voucher_item"
/>
<com.yidian.bcommon.widget.CommonEmptyPageView
android:id=
"@+id/empty_view"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:visibility=
"gone"
app:CommonEmptyPageView_empty_content_text=
"暂无优惠券"
app:CommonEmptyPageView_place_holder_img=
"@drawable/img_empty_place_holder"
/>
</LinearLayout>
</LinearLayout>
</layout>
</layout>
\ No newline at end of file
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