修复 生活圈C端项目SHQCLIENT-1602

Components/BUserOrder/src/main/java/com/yidian/shenghuoquan/buserorder/viewmodel/ConfirmOrderViewModel.kt

@@ -201,7 +201,7 @@ class ConfirmOrderViewModel : BaseViewModel() {
     // 防止重复多次点击立即支付按钮
     paymentEnable(false)
     if (!selectedCouponList.value.isNullOrEmpty()) {// 添加上选中的优惠券
-      currentParamsJson.put("coupon_list", JSONArray(selectedCouponList.value))
+      currentParamsJson.put("coupon_list", JSONArray(Gson().toJson(selectedCouponList.value)))
     }
     currentParamsJson.put("take_place_id", selectedPickUpPoint.value?.takePlaceId)
     currentParamsJson.put("receiver_name", receivingName.value)

Components/BUserOrder/src/main/res/layout/border_activity_confirm_order.xml

@@ -339,7 +339,7 @@
                             android:text="@string/already_discount"
                             android:textColor="@color/color_333333"
                             android:textSize="@dimen/sp14"
-                            app:isShow="@{vm.couponAmount > 0}"
+                            app:isShow="@{vm.couponAmountValue > 0}"
                             app:layout_constraintBaseline_toBaselineOf="@id/tv_goods_total_amount"
                             app:layout_constraintEnd_toStartOf="@id/tv_discount_amount" />
 
@@ -348,10 +348,10 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginEnd="@dimen/dp10"
-                            android:text="@{@string/amount(vm.couponAmount)}"
+                            android:text="@{@string/amount(vm.couponAmountValue)}"
                             android:textColor="@color/color_FD7823"
                             android:textSize="@dimen/sp14"
-                            app:isShow="@{vm.couponAmount > 0}"
+                            app:isShow="@{vm.couponAmountValue > 0}"
                             app:layout_constraintBaseline_toBaselineOf="@id/tv_goods_total_amount"
                             app:layout_constraintEnd_toStartOf="@id/tv_goods_total_title"
                             tools:text="¥ 10.00" />

Components/BUserOrder/src/main/res/layout/border_activity_voncher.xml

@@ -43,8 +43,8 @@
             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" />
+            app:CommonEmptyPageView_empty_tips_text="这里什么都没有"
+            app:CommonEmptyPageView_place_holder_img="@drawable/bcommon_icon_nothing_place_holder" />
 
     </LinearLayout>
 </layout>
\ No newline at end of file