Merge branch 'feature/dev_fight_order' of...

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

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

@@ -28,6 +28,7 @@ class OrderDetailCommodityListItemViewModel : BaseViewModel() {
     @BindingAdapter("commodityImageUrl")
     @JvmStatic
     fun loadCommodityImage(target: ImageView, url: String) {
+      if (url.isBlank()) return
       Glide.with(target.context).load(url)
         .apply(
           RequestOptions()
@@ -38,6 +39,10 @@ class OrderDetailCommodityListItemViewModel : BaseViewModel() {
         .into(target)
     }
 
+    /**
+     * 设置左外边距
+     * @param margin 外边距 单位dp
+     */
     @JvmStatic
     @BindingAdapter("layout_marginStart")
     fun setMarginStart(view: View, margin: Int) {

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

@@ -21,6 +21,6 @@ class OrderInfoViewModel : BaseViewModel() {
     val clipboard = YdBaseApplication.context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
     val data = ClipData.newPlainText("copyOrderId", orderId)
     clipboard.setPrimaryClip(data)
-    ToastUtils.showShortSafe("已复制")
+    ToastUtils.showShortSafe("已复制到剪切板")
   }
 }

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

@@ -19,6 +19,10 @@ import com.yidian.xpage.XPageManager
 class PickupPointListItemViewModel : BaseViewModel() {
 
   companion object {
+    /**
+     * 设置左外边距
+     * @param margin 外边距 单位dp
+     */
     @JvmStatic
     @BindingAdapter("layout_marginStart")
     fun setMarginStart(view: View, margin: Int) {