跳转详情

Components/BUserOrder/src/main/java/com/yidian/shenghuoquan/buserorder/adapter/OrderListAdapter.kt

@@ -8,10 +8,13 @@ import android.widget.TextView
 import com.bumptech.glide.Glide
 import com.chad.library.adapter.base.BaseQuickAdapter
 import com.chad.library.adapter.base.viewholder.BaseViewHolder
+import com.yidian.bcommon.constant.IntentConstants
+import com.yidian.bcommon.constant.XRouterPathConstants
 import com.yidian.shenghuoquan.buserorder.R
 import com.yidian.shenghuoquan.buserorder.app.bean.OrderWebData
 import com.yidian.shenghuoquan.buserorder.utils.Utils
 import com.yidian.shenghuoquan.buserorder.view.RoundImageView
+import com.yidian.xpage.XPageManager
 
 class OrderListAdapter : BaseQuickAdapter<OrderWebData, BaseViewHolder>(R.layout.border_recycle_order_item){
   override fun convert(holder: BaseViewHolder, item: OrderWebData) {
@@ -62,6 +65,9 @@ class OrderListAdapter : BaseQuickAdapter<OrderWebData, BaseViewHolder>(R.layout
     money.text = "${data.payment}"
     holder.itemView.findViewById<RelativeLayout>(R.id.rl_show_order_detail).setOnClickListener {
       //跳转订单详情页面
+      var map = HashMap<String, Any?>()
+      map[IntentConstants.KEY_EXTRA_ORDER_ID] = data.order_id
+      XPageManager.push(XRouterPathConstants.ORDER_DETAIL_ACTIVITY, map)
     }
     if (data.online_status.equals("4")) {
       holder.itemView.findViewById<TextView>(R.id.tv_pay_money_status).text = "已退款:"

Components/BUserOrder/src/main/java/com/yidian/shenghuoquan/buserorder/ui/OrderListActivity.kt

@@ -58,6 +58,7 @@ class OrderListActivity : BaseMvvmActivity<BorderActivityOrderListBinding, Order
         binding.tvOrderlistAll.setCompoundDrawables(null, null, null, null)
         var param = HashMap<String, String?>()
         param["order_status"] = "4"
+        param["business_from"] = "2"
         vm.requestUserOrder(param)
       }
       binding.tvOrderlistAll.setOnClickListener {
@@ -67,7 +68,9 @@ class OrderListActivity : BaseMvvmActivity<BorderActivityOrderListBinding, Order
         val dra: Drawable? = getDrawable(R.drawable.icon_react_under_text)
         dra!!.setBounds(0, 0, dra!!.intrinsicWidth, dra!!.intrinsicHeight)
         binding.tvOrderlistAll.setCompoundDrawables(null, null, null, dra)
-        vm.requestUserOrder(HashMap<String, String?>())
+        var param = HashMap<String, String?>()
+        param["business_from"] = "2"
+        vm.requestUserOrder(param)
       }
   }
 

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

@@ -56,7 +56,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/dp40"
-                android:text="已退款 (17)"
+                android:text="已退款/售后"
                 android:textColor="#333333"
                 android:textSize="16sp"
                 android:layout_gravity="center_vertical">

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

@@ -218,16 +218,16 @@
         android:layout_below="@+id/rl_time_and_pay_money"
         android:layout_alignParentRight="true"
         android:layout_marginTop="@dimen/dp16">
+
         <TextView
             android:id="@+id/tv_scan_order"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:layout_centerHorizontal="true"
+            android:gravity="center"
             android:text="查看订单"
             android:textColor="#999999"
-            android:textSize="12sp"
-            android:layout_centerHorizontal="true"
-            android:gravity="center">
-        </TextView>
+            android:textSize="12sp"></TextView>
     </RelativeLayout>
 
 </RelativeLayout>
\ No newline at end of file