[提交人]：王雪伟

[提交简述] ：小象省钱
[实现方案] ：调整订单列表

cms/src/main/res/layout/activity_web.xml

@@ -9,7 +9,7 @@
         android:id="@+id/app_bar_layout"
         android:layout_width="match_parent"
         android:layout_height="64dp"
-        android:paddingTop="20dp"
+        android:paddingTop="10dp"
         android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
         app:elevation="0dp">
 

moduleMain/src/main/java/com/zxbw/modulemain/adapter/ItemVipOrderAdapter.kt

 package com.zxbw.modulemain.adapter
 
-import android.content.ClipData
-import android.content.ClipboardManager
 import android.content.Context
-import android.text.TextUtils
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.ImageView
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.zxbw.modulemain.R
 import com.zxhl.cms.AppContext
 import com.zxhl.cms.common.base.BaseRecyclerAdapter
-import com.zxhl.cms.net.model.box.GoodList
 import com.zxhl.cms.net.model.qy.RightsDetailEntity
-import com.zxhl.cms.utils.JumpUtils
-import com.zxhl.cms.utils.Utils
 import com.zxhl.cms.widget.RecycleImageView
 
 
-class ItemVipOrderAdapter : BaseRecyclerAdapter<RightsDetailEntity, ItemVipOrderAdapter.ViewHolder> {
+class ItemVipOrderAdapter :
+    BaseRecyclerAdapter<RightsDetailEntity, ItemVipOrderAdapter.ViewHolder> {
     private var mContext: Context? = null
 
     constructor(
@@ -31,9 +25,10 @@ class ItemVipOrderAdapter : BaseRecyclerAdapter<RightsDetailEntity, ItemVipOrder
 
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
         var bean = mList[position]
-
-//        holder.id_tv_vip_goods_name.text = bean.goodsName
-
+        holder.id_img_rights_icon?.setLoadImageUrl(bean.icon,0, 4)
+        holder.id_tv_vip_goods_name?.text = "${bean.brand} ${bean.category} ${bean.goodsName}"
+        holder.id_tv_vip_goods_price?.text = "¥${bean.salePrice}"
+//        holder.id_tv_vip_goods_num?.text = "${bean.salePrice}"
     }
 
 

moduleMain/src/main/java/com/zxbw/modulemain/adapter/MyOrderAdapter.kt

@@ -73,13 +73,12 @@ class MyOrderAdapter : BaseRecyclerAdapter<ShopOrderEntity, RecyclerView.ViewHol
             holder.id_tv_vip_pay_time?.text = "付款时间：${bean.payTime}"
             holder.id_tv_vip_phone_number?.text = "会员手机号：${bean.phone}"
             if (!bean.equitCard.isNullOrEmpty()) {
-//                var mAdapter: ItemOrderAdapter? = ItemOrderAdapter(mContext)
-//                holder.id_rl_order_item?.layoutManager =
-//                    LinearLayoutManager(mContext)
-//                holder.id_rl_order_item?.adapter = mAdapter
-//                mAdapter?.clear()
-//                mAdapter?.appendToList(bean.goodsList)
-//                mAdapter?.notifyDataSetChanged()
+                var mAdapter: ItemVipOrderAdapter? = ItemVipOrderAdapter(mContext)
+                holder.id_rl_vip_order_item?.layoutManager =
+                    LinearLayoutManager(mContext)
+                holder.id_rl_vip_order_item?.adapter = mAdapter
+                mAdapter?.clear()
+                mAdapter?.appendToList(bean.equitCard)
             }
 
         } else {

moduleMain/src/main/res/layout/items_layout_vip_rights_order.xml

@@ -5,13 +5,12 @@
     android:layout_margin="5dp"
     android:background="@drawable/shape_ffffff_r5"
     android:orientation="vertical"
-    android:paddingLeft="10dp"
-    android:paddingRight="10dp">
+    android:padding="10dp">
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:gravity="center_vertical"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical">
 
         <TextView
             android:layout_width="70dp"
@@ -42,7 +41,8 @@
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/id_rl_vip_order_item"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
+        android:layout_height="wrap_content"
+        android:layout_marginTop="20dp" />
 
     <TextView
         android:id="@+id/id_tv_vip_phone_number"