Merge branch 'dev_commodity' of...

Merge branch 'dev_commodity' of https://git.yidian-inc.com:8021/bp/ShenghuoquanBusiness into dev_commodity

Components/commodity/src/main/java/com/yidian/shenghuoquan/commodity/ui/coupon/viewmodel/CommodityListViewModel.kt

@@ -67,8 +67,7 @@ class CommodityListViewModel : BaseViewModel(), IGetCommodityManagementListCallb
   }
 
   override fun getCommodityListSuccess(result: CommodityManagementListDto?) {
-    // lastId为-1时即没有下一页数据 此时不记录
-    result?.lastId?.let { if (it != "-1") lastId = it }
+    lastId = result?.lastId
     // 通知下拉刷新或上拉加载更多完成
     when (loadType) {
       LoadType.REFRESH -> refreshFinish.value = result?.goodsList

Components/commodity/src/main/res/layout/commodity_fragment_commodity_list.xml

 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools">
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <data>
 
@@ -35,8 +34,8 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:visibility="gone"
-            app:CommonEmptyPageView_empty_content_text="@string/no_coupons"
-            app:CommonEmptyPageView_empty_tips_text="@string/click_post_coupon"
+            app:CommonEmptyPageView_empty_content_text="@string/no_commodity"
+            app:CommonEmptyPageView_empty_tips_text="@string/click_post_commodity"
             app:CommonEmptyPageView_place_holder_img="@drawable/img_empty_place_holder" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>

Components/commodity/src/main/res/values/strings.xml

@@ -9,8 +9,8 @@
     <string name="edit">编辑</string>
     <string name="up_shelves">上架</string>
     <string name="publish_commodity">发布商品</string>
-    <string name="no_coupons">暂无优惠券</string>
-    <string name="click_post_coupon">点击下方发布优惠券</string>
+    <string name="no_commodity">暂无商品</string>
+    <string name="click_post_commodity">点击下方发布商品</string>
     <string name="no_search_result">暂无搜索结果</string>
     <string name="click_search_again">请点击搜索框重新进行搜索</string>
     <string name="commodity_down_shelves_confirm">确认下架商品？</string>