Commit bee3441e authored by shiyl's avatar shiyl

优惠券没有可用时候也能进选择优惠券并显示空页面

parent 02400d8c
...@@ -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,7 +40,14 @@ class VoucherActivity : BaseMvvmActivity<BorderActivityVoncherBinding, VoucherVi ...@@ -38,7 +40,14 @@ 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
listAdapter.setList(list) if (list.isNullOrEmpty()) {
binding.emptyView.show()
binding.rvVoucherList.hide()
} else {
binding.emptyView.hide()
binding.rvVoucherList.show()
listAdapter.setList(list)
}
} }
} }
} }
......
...@@ -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} 张优惠券可用"
}
}
/** /**
* 计算商品原价 = 数量 * 单价 * 计算商品原价 = 数量 * 单价
*/ */
......
...@@ -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.couponsAvailableList.size() + @string/coupons_available_num}" android:text="@{vm.couponsAvailableNum}"
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}"
......
...@@ -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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment