1.积分商城相关UI

app/src/main/AndroidManifest.xml

@@ -94,6 +94,7 @@
         <activity android:name="com.zswc.creativity.activity.MyWalletActivity"/>
         <activity android:name="com.zswc.creativity.activity.WithdrawActivity"/>
         <activity android:name="com.zswc.creativity.activity.PaySuessActivity"/>
+        <activity android:name=".activity.ConvetSuessActivity"/>
         <activity android:name="com.zswc.creativity.activity.TibOrderActivity"/>
         <activity android:name="com.zswc.creativity.activity.GiftOrderActivity"/>
         <activity android:name="com.zswc.creativity.activity.WithdrawSuessActivity"/>
@@ -103,6 +104,11 @@
         <activity android:name=".activity.TrannsferActivity"/>
         <activity android:name=".activity.IntegralDetailsActivity"/>
         <activity android:name=".activity.SureOrderActivity"/>
+        <activity android:name=".activity.MallActivity"/>
+        <activity android:name=".activity.MallOrderActivity"/>
+        <activity android:name=".activity.AddressActivity"/>
+        <activity android:name=".activity.AddAddressActivity"/>
+        <activity android:name=".activity.AllCollectDetailsActivity"/>
 
 
         <activity

app/src/main/java/com/zswc/creativity/activity/AddAddressActivity.kt

@@ -0,0 +1,25 @@
+package com.zswc.creativity.activity
+
+import com.zswc.creativity.base.MBActivity
+import com.zswc.creativity.databinding.ActivityAddAddressBinding
+import com.zswc.creativity.vmodel.AddAddressVModel
+
+/**
+ *on 2022/7/29
+ */
+class AddAddressActivity: MBActivity<AddAddressVModel, ActivityAddAddressBinding>() {
+
+
+    override fun vmClass(): Class<AddAddressVModel> {
+        return AddAddressVModel::class.java
+    }
+    override fun binding(): ActivityAddAddressBinding {
+        return ActivityAddAddressBinding.inflate(layoutInflater)
+    }
+
+    override fun title(): String? {
+        return "收货地址"
+    }
+
+
+}

app/src/main/java/com/zswc/creativity/activity/AddressActivity.kt

@@ -0,0 +1,27 @@
+package com.zswc.creativity.activity
+
+import com.zswc.creativity.base.MBActivity
+import com.zswc.creativity.databinding.ActivityAddressBinding
+import com.zswc.creativity.vmodel.AddressVModel
+
+/**
+ *on 2022/7/29
+ */
+class AddressActivity : MBActivity<AddressVModel, ActivityAddressBinding>(){
+
+
+    override fun vmClass(): Class<AddressVModel> {
+        return AddressVModel::class.java
+    }
+
+    override fun binding(): ActivityAddressBinding {
+       return ActivityAddressBinding.inflate(layoutInflater)
+    }
+
+    override val isRxbus: Boolean
+        get() = true
+
+    override fun title(): String? {
+        return "收货地址"
+    }
+}

app/src/main/java/com/zswc/creativity/activity/AllCollectDetailsActivity.kt

@@ -0,0 +1,279 @@
+package com.zswc.creativity.activity
+
+import android.graphics.Color
+import android.os.Build
+import android.os.Build.VERSION.SDK_INT
+import android.os.Bundle
+import android.text.TextUtils
+import android.view.KeyEvent
+import android.view.View
+import coil.ImageLoader
+import coil.decode.GifDecoder
+import coil.decode.ImageDecoderDecoder
+import coil.load
+import coil.request.Disposable
+import coil.transform.RoundedCornersTransformation
+import com.githang.statusbar.StatusBarCompat
+import com.qmuiteam.qmui.kotlin.onClick
+import com.ysnows.base.utils.UiUtils
+import com.zswc.creativity.R
+import com.zswc.creativity.base.MBActivity
+import com.zswc.creativity.databinding.ActivityAllCollectDetailsBinding
+import com.zswc.creativity.databinding.ActivityCollectDetailsBinding
+import com.zswc.creativity.utils.ColorUtils
+import com.zswc.creativity.utils.glide.GlideUtils
+import com.zswc.creativity.view.MyScrollView
+import com.zswc.creativity.vmodel.AllCollectDetailsVModel
+import com.zswc.creativity.vmodel.CollectDetailsVModel
+import java.text.DecimalFormat
+
+/**
+ * 全部的藏品详情
+ *on 2022/7/23
+ */
+class AllCollectDetailsActivity : MBActivity<AllCollectDetailsVModel, ActivityAllCollectDetailsBinding>() {
+
+    var disposable: Disposable? = null
+     var islide = true //是否滑动的时候标题改变
+     var screenHeightPixels = 0
+
+
+    override fun init(savedInstanceState: Bundle?) {
+        super.init(savedInstanceState)
+        StatusBarCompat.setStatusBarColor(this, Color.parseColor("#00ffffff"))
+
+        titleBar()?.imgRight?.setImageResource(R.drawable.ct_share)
+        screenHeightPixels = UiUtils.getScreenHeightPixels()
+        setShow()
+
+
+        vm.ll = binding.ll
+        var id = intent?.extras?.getString("id")
+//        vm.id.value=id
+//        vm.getInfo(id!!)
+
+        vm.data.observe(this) {
+
+            //设置详情图片
+            binding.tvShowTitle.text=it.name
+
+
+            //设置详情图片
+
+            GlideUtils.lImg(this,it.pro_info.describe, 16, binding.imgDeatils)
+
+            //设置头 图片
+
+            if (!TextUtils.isEmpty(it.pro_info.detail_img)) {
+                var ss = it.pro_info.detail_img.substring(it.pro_info.detail_img.length - 3, it.pro_info.detail_img.length);
+
+                if (ss == "gif" || ss == "GIF") {
+                    GlideUtils.lImg(this, it.pro_info.detail_img, binding.imageGifView)
+                    binding.imageView.visibility = View.GONE
+                    binding.imageGifView.visibility = View.VISIBLE
+                } else {
+                    GlideUtils.lImg(this, it.pro_info.detail_img, binding.imageView)
+                    binding.imageView.visibility = View.VISIBLE
+                    binding.imageGifView.visibility = View.GONE
+
+                }
+
+
+            }
+
+
+
+
+
+        }
+
+
+    }
+
+    private fun setShow() {
+
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) { //不支持沉浸式状态栏
+        } else {
+            //获取状态栏的高度
+            val statusBarHeight: Int = UiUtils.getStatusBarHeight()
+
+            //动态设置高度  tv
+            val params = binding.tv.getLayoutParams()
+            //获取当前控件的布局对象
+            //params.height=UiUtils.dp2dip(getContext(), statusBarHeight);//设置当前控件布局的高度
+            params.height = statusBarHeight
+            binding.tv.layoutParams = params //将设置好的布局参数应用到控件中
+            binding.tv.visibility = View.VISIBLE
+
+            binding.tvTwo.layoutParams = params
+            binding.tvTwo.visibility = View.VISIBLE
+
+
+        }
+    }
+
+
+
+
+
+        override fun listeners() {
+            super.listeners()
+            binding.butBuy.onClick {
+
+                vm.toBuy(binding.butBuy)
+            }
+
+
+
+            binding.scroll.setOnScrollListener { x, y, oldX, oldY ->
+                if (islide) {
+
+                    if (y == 0) {
+                        binding.llShowTwo.visibility = View.GONE
+                        binding.llShowOne.visibility = View.VISIBLE
+
+                    } else if (y - oldY > 0) {
+                        if (screenHeightPixels <= 960) {
+                            setBarVisibility(y, 100)
+                        } else {
+                            setBarVisibility(y, 200)
+                        }
+                    } else if (y - oldY < 0) {
+                    }
+                }
+            }
+
+
+
+            titleBar()?.imgLeft?.onClick {
+
+                finishActivity()
+            }
+
+
+//        screenHeightPixels = UiUtils.getScreenHeightPixels(getContext());
+//
+//        obscroll.setOnScrollListener(object : OnScrollChangedListener() {
+//            /**
+//             * @param x
+//             * @param y
+//             * @param oldX
+//             * @param oldY
+//             */
+//            fun onScrollChanged(x: Int, y: Int, oldX: Int, oldY: Int) {
+//                if (islide) {
+//                    if (affix_type != null && affix_type.equals("3")) {
+//                        return
+//                    }
+//                    if (y == 0) {
+//                        tvTitleName.setVisibility(View.INVISIBLE)
+//                        lineL.setAlpha(0)
+//                        tvTitleName.setAlpha(1)
+//                        bar.setBackgroundColor(Color.parseColor("#00000000"))
+//                    } else if (y - oldY > 0) {
+//                        if (screenHeightPixels <= 960) {
+//                            setBarVisibility(y, 100)
+//                        } else {
+//                            setBarVisibility(y, 200)
+//                        }
+//                    } else if (y - oldY < 0) {
+//                    }
+//                }
+//            }
+//        })
+
+        }
+
+        private fun setBarVisibility(y: Int, height: Int) {
+            if (y > 0 && y < height) {
+                binding.llShowOne.visibility = View.GONE
+                binding.llShowTwo.visibility = View.VISIBLE
+
+
+                val df = DecimalFormat("0.00")
+                val s = df.format((y.toFloat() / height).toDouble())
+                val a = s.toFloat() //0~1
+
+                // float a = y / height;//0~1
+                val ratio = 255 - (255 * a).toFloat() //255-(0~255)=255~0
+                val bgColor: Int = ColorUtils.getColorWithAlpha(Color.parseColor("#FFFFFF"), ratio)
+                binding.llShowTwo.setBackgroundColor(bgColor)
+                binding.tvShowTitle.alpha = a
+
+            } else if (y > height) {
+                binding.llShowTwo.setBackgroundColor(Color.WHITE)
+                binding.llShowTwo.visibility = View.VISIBLE
+
+                binding.tvShowTitle.alpha = 1f
+                binding.tvShowTitle.visibility = View.VISIBLE
+            }
+        }
+
+
+//    private fun setBarVisibility(y: Int, height: Int) {
+//        if (y > 0 && y < height) {
+//            line.setVisibility(View.GONE)
+//            bar.setVisibility(View.VISIBLE)
+//            val df = DecimalFormat("0.00")
+//            val s: String = df.format(y.toFloat() / height)
+//            val a = s.toFloat() //0~1
+//
+//            // float a = y / height;//0~1
+//            val ratio = 255 - (255 * a).toInt() //255-(0~255)=255~0
+//            val bgColor: Int = ColorUtils.getColorWithAlpha(Color.parseColor("#FFFFFF"), ratio)
+//            bar.setBackgroundColor(bgColor)
+//            tvTitleName.setAlpha(a)
+//            line.setAlpha(a)
+//        } else if (y > height) {
+//            bar.setBackgroundColor(Color.WHITE)
+//            bar.setVisibility(View.VISIBLE)
+//            lineL.setVisibility(View.VISIBLE)
+//            lineL.setAlpha(1)
+//            tvTitleName.setAlpha(1)
+//            tvTitleName.setVisibility(View.VISIBLE)
+//        }
+//    }
+
+
+        override fun binding(): ActivityAllCollectDetailsBinding {
+            return ActivityAllCollectDetailsBinding.inflate(layoutInflater)
+        }
+
+        override fun vmClass(): Class<AllCollectDetailsVModel> {
+            return AllCollectDetailsVModel::class.java
+        }
+
+        override fun title(): String? {
+            return null
+        }
+
+        override val isRxbus: Boolean
+        get() = true
+
+
+        override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
+            return if (keyCode == KeyEvent.KEYCODE_BACK) {
+                if (null != disposable) {
+                    disposable?.dispose()
+                }
+                finishActivity()
+                return false
+            } else {
+                super.onKeyDown(keyCode, event)
+            }
+        }
+
+        override fun transluent(): Boolean {
+            return true
+        }
+
+        override fun onDestroy() {
+            super.onDestroy()
+            if (null != disposable) {
+                disposable?.dispose()
+            }
+        }
+
+
+
+}

app/src/main/java/com/zswc/creativity/activity/CollectDetailsActivity.kt

@@ -26,7 +26,7 @@ import com.zswc.creativity.vmodel.CollectDetailsVModel
 import java.text.DecimalFormat
 
 /**
- * 藏品详情
+ * 自己的藏品详情
  *on 2022/7/23
  */
 class CollectDetailsActivity : MBActivity<CollectDetailsVModel, ActivityCollectDetailsBinding>() {

app/src/main/java/com/zswc/creativity/activity/ConvetSuessActivity.kt

@@ -0,0 +1,40 @@
+package com.zswc.creativity.activity
+
+import android.os.Bundle
+import com.zswc.creativity.base.MBActivity
+import com.zswc.creativity.databinding.ActivityConvetSuessBinding
+import com.zswc.creativity.vmodel.ConvetSuessVModel
+
+/**
+ * 兑换成功界面
+ *Created by shihuiyun
+ *on 2020/9/24
+ */
+class ConvetSuessActivity : MBActivity<ConvetSuessVModel, ActivityConvetSuessBinding>() {
+
+    override fun init(savedInstanceState: Bundle?) {
+        super.init(savedInstanceState)
+
+//        vm.orderid.value=intent.extras?.getString("orderid","0")
+//        vm.type.value=intent.extras?.getString("type","0")
+
+
+    }
+
+    override fun binding(): ActivityConvetSuessBinding {
+       return ActivityConvetSuessBinding.inflate(layoutInflater)
+    }
+
+    override fun vmClass(): Class<ConvetSuessVModel> {
+        return ConvetSuessVModel::class.java
+    }
+
+    override fun title(): String? {
+        return "兑换成功"
+    }
+
+    override val isRxbus: Boolean
+        get() = true
+
+
+}

app/src/main/java/com/zswc/creativity/activity/IntegralDetailsActivity.kt

@@ -63,8 +63,8 @@ class IntegralDetailsActivity : MBActivity<IntegralDetailsVModel, ActivityIntegr
 
 
         vm.ll = binding.ll
-        var id = intent?.extras?.getString("id")
-        vm.getInfo(id!!)
+//        var id = intent?.extras?.getString("id")
+//        vm.getInfo(id!!)
 
         vm.data.observe(this) {
 
@@ -436,6 +436,13 @@ class IntegralDetailsActivity : MBActivity<IntegralDetailsVModel, ActivityIntegr
         finish()
     }
 
+
+    @Subscribe(tags = [Tag(ConfigRx.INTEGRAL_COMPLETE_CLOSE)])
+    fun setIntegralCompleteClose(type: String) {//关闭
+        //刷新 todo：
+        finish()
+    }
+
     override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
         return if (keyCode == KeyEvent.KEYCODE_BACK) {
             if (null != disposable) {

app/src/main/java/com/zswc/creativity/activity/MallActivity.kt

@@ -0,0 +1,100 @@
+package com.zswc.creativity.activity
+
+import android.os.Bundle
+import androidx.fragment.app.Fragment
+import com.qmuiteam.qmui.widget.tab.QMUITab
+import com.qmuiteam.qmui.widget.tab.QMUITabBuilder
+import com.ysnows.base.utils.B
+import com.zswc.creativity.base.MBTabActivity
+import com.zswc.creativity.databinding.ActivityMallBinding
+import com.zswc.creativity.databinding.ActivityOrderListBinding
+import com.zswc.creativity.fragment.MallListFragment
+import com.zswc.creativity.fragment.OrderListFragment
+import com.zswc.creativity.vmodel.MallVModel
+import com.zswc.creativity.vmodel.OrderVModel
+
+/**
+ *商城订单
+ *on 2021/3/15
+ */
+class MallActivity : MBTabActivity<MallVModel, ActivityMallBinding>(){
+
+
+    override fun init(savedInstanceState: Bundle?) {
+        super.init(savedInstanceState)
+
+
+    }
+
+    override fun vmClass(): Class<MallVModel> {
+        return MallVModel::class.java
+    }
+
+
+    override fun createTabs(tabBuilder: QMUITabBuilder): Array<QMUITab> {
+
+        val one = tabBuilder
+                .setText("全部")
+                .build(context())
+        val two = tabBuilder
+                .setText("已兑换")
+                .build(context())
+
+        val three = tabBuilder
+                .setText("已完成")
+                .build(context())
+
+
+        return arrayOf(one, two, three)
+    }
+
+    override fun binding(): ActivityMallBinding {
+       return ActivityMallBinding.inflate(layoutInflater)
+    }
+
+    override fun getPageItem(position: Int): Fragment {
+        var ownerFragment = MallListFragment()
+        when (position) {
+            0 -> {
+
+                ownerFragment.arguments = B().putString("state", "0")
+                        .ok()
+                return ownerFragment
+            }
+            1 -> {
+
+                ownerFragment.arguments = B().putString("state", "1")
+                        .ok()
+                return ownerFragment
+
+            }
+            2 -> {
+
+                ownerFragment.arguments = B().putString("state", "-1")
+                        .ok()
+                return ownerFragment
+
+            }
+
+
+            else->{
+
+                ownerFragment.arguments = B().putString("state", "0")
+                        .ok()
+                return ownerFragment
+            }
+
+        }
+    }
+
+    override fun getPageCount(): Int {
+        return 3
+    }
+
+    override fun title(): String? {
+        return "商城订单"
+    }
+
+    override val isRxbus: Boolean
+        get() = true
+}

app/src/main/java/com/zswc/creativity/activity/MallOrderActivity.kt

@@ -0,0 +1,37 @@
+package com.zswc.creativity.activity
+
+import android.os.Bundle
+import com.zswc.creativity.base.MBActivity
+import com.zswc.creativity.databinding.*
+import com.zswc.creativity.vmodel.*
+
+/**
+ * 商城订单详情
+ *Created by shihuiyun
+ */
+class MallOrderActivity : MBActivity<MallOrderVModel, ActivityMallOrderBinding>() {
+
+    override fun init(savedInstanceState: Bundle?) {
+        super.init(savedInstanceState)
+//        var orderid=intent?.extras?.getString("orderid")
+//        vm.getOrderDetals(orderid)
+
+    }
+
+    override fun binding(): ActivityMallOrderBinding {
+       return ActivityMallOrderBinding.inflate(layoutInflater)
+    }
+
+    override fun vmClass(): Class<MallOrderVModel> {
+        return MallOrderVModel::class.java
+    }
+    override fun transluent(): Boolean {
+        return true
+    }
+
+    override fun title(): String? {
+        return null
+    }
+
+
+}

app/src/main/java/com/zswc/creativity/activity/PaySuessActivity.kt

@@ -34,5 +34,8 @@ class PaySuessActivity : MBActivity<PaySuessVModel, ActivityPaySuessBinding>() {
         return "支付结果"
     }
 
+    override val isRxbus: Boolean
+        get() = true
+
 
 }

app/src/main/java/com/zswc/creativity/activity/SureOrderActivity.kt

@@ -1,7 +1,10 @@
 package com.zswc.creativity.activity
 
 import android.os.Bundle
+import com.hwangjr.rxbus.annotation.Subscribe
+import com.hwangjr.rxbus.annotation.Tag
 import com.zswc.creativity.base.MBActivity
+import com.zswc.creativity.config.ConfigRx
 import com.zswc.creativity.databinding.*
 import com.zswc.creativity.vmodel.*
 
@@ -13,9 +16,9 @@ class SureOrderActivity : MBActivity<SureOrderVModel, ActivitySureOrderBinding>(
 
     override fun init(savedInstanceState: Bundle?) {
         super.init(savedInstanceState)
-        var orderid=intent?.extras?.getString("orderid")
-        var type=intent?.extras?.getString("type")
-        vm.getOrderDetals(orderid,type)
+//        var orderid=intent?.extras?.getString("orderid")
+//        var type=intent?.extras?.getString("type")
+//        vm.getOrderDetals(orderid,type)
 
     }
 
@@ -32,5 +35,13 @@ class SureOrderActivity : MBActivity<SureOrderVModel, ActivitySureOrderBinding>(
         return "确认订单"
     }
 
+    override val isRxbus: Boolean
+        get() =true
+
+    @Subscribe(tags = [Tag(ConfigRx.INTEGRAL_COMPLETE_CLOSE)])
+    fun setIntegralCompleteClose(type: String) {//关闭
+        //刷新 todo：
+        finish()
+    }
 
 }

app/src/main/java/com/zswc/creativity/adapter/MallListAdapter.kt

@@ -0,0 +1,31 @@
+package com.zswc.creativity.adapter
+
+import com.chad.library.adapter.base.viewholder.BaseDataBindingHolder
+import com.qmuiteam.qmui.kotlin.onClick
+import com.ysnows.base.base.BAdapter
+import com.ysnows.base.utils.B
+import com.ysnows.base.utils.UiSwitch
+import com.zswc.creativity.R
+import com.zswc.creativity.activity.GiftOrderActivity
+import com.zswc.creativity.activity.MallOrderActivity
+import com.zswc.creativity.activity.TibOrderActivity
+import com.zswc.creativity.databinding.ItemMallListBinding
+import com.zswc.creativity.databinding.ItemOrderListBinding
+import com.zswc.creativity.model.MyOrderInfo
+import com.zswc.creativity.vmodel.MallListVModel
+import com.zswc.creativity.vmodel.OrderListFragmentVModel
+
+class MallListAdapter(val vm: MallListVModel) : BAdapter<MyOrderInfo, BaseDataBindingHolder<ItemMallListBinding>>(R.layout.item_mall_list) {
+    override fun convert(holder: BaseDataBindingHolder<ItemMallListBinding>, item: MyOrderInfo) {
+        holder.dataBinding?.vm = vm
+        holder.dataBinding?.item = item
+        holder.dataBinding?.ll?.onClick {
+
+            UiSwitch.bundle(vm.repository().context, MallOrderActivity::class.java,
+                    B().putString("orderid", item.id)
+                            .ok())
+
+        }
+
+    }
+}

app/src/main/java/com/zswc/creativity/adapter/SaleListFragmentAdapter.kt

@@ -1,8 +1,13 @@
 package com.zswc.creativity.adapter
 
 import com.chad.library.adapter.base.viewholder.BaseDataBindingHolder
+import com.qmuiteam.qmui.kotlin.onClick
 import com.ysnows.base.base.BAdapter
+import com.ysnows.base.utils.B
+import com.ysnows.base.utils.UiSwitch
 import com.zswc.creativity.R
+import com.zswc.creativity.activity.AllCollectDetailsActivity
+import com.zswc.creativity.activity.CollectDetailsActivity
 import com.zswc.creativity.databinding.ItemOrderListBinding
 import com.zswc.creativity.databinding.ItemSaleListBinding
 import com.zswc.creativity.model.MyOrderInfo
@@ -12,5 +17,12 @@ class SaleListFragmentAdapter(val vm: SaleListFragmentVModel) : BAdapter<MyOrder
     override fun convert(holder: BaseDataBindingHolder<ItemSaleListBinding>, item:MyOrderInfo) {
         holder.dataBinding?.vm=vm
         holder.dataBinding?.item = item
+        holder.dataBinding?.ll?.onClick {
+            //寄售详情
+            UiSwitch.bundle(context(), AllCollectDetailsActivity::class.java,
+                    B().putString("id", item.id)
+                            .ok())
+
+        }
     }
 }

app/src/main/java/com/zswc/creativity/config/ConfigRx.kt

@@ -37,6 +37,8 @@ object ConfigRx {
     const val STOP_REFRSH = "STOP_REFRSH"
 
 
+    const val INTEGRAL_COMPLETE_CLOSE = "INTEGRAL_COMPLETE_CLOSE" //回到首页
+
 
 
 

app/src/main/java/com/zswc/creativity/fragment/MallListFragment.kt

@@ -0,0 +1,81 @@
+package com.zswc.creativity.fragment
+
+import android.app.Activity
+import android.content.Intent
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import com.hwangjr.rxbus.annotation.Subscribe
+import com.hwangjr.rxbus.annotation.Tag
+import com.zswc.creativity.adapter.MallListAdapter
+import com.zswc.creativity.adapter.OrderListFragmentAdapter
+import com.zswc.creativity.base.MBRFragment
+import com.zswc.creativity.config.ConfigRx
+import com.zswc.creativity.config.MIntentAction
+import com.zswc.creativity.databinding.FragmentMallListBinding
+import com.zswc.creativity.databinding.FragmentOrderListBinding
+import com.zswc.creativity.vmodel.MallListVModel
+import com.zswc.creativity.vmodel.OrderListFragmentVModel
+
+/**
+ *
+ *on 2021/3/15
+ */
+class MallListFragment: MBRFragment<MallListVModel, MallListAdapter, FragmentMallListBinding>() {
+
+
+    override fun __before(savedInstanceState: Bundle?) {
+        super.__before(savedInstanceState)
+        vm.state=arguments?.getString("state")
+
+    }
+
+    override fun init(savedInstanceState: Bundle?) {
+        super.init(savedInstanceState)
+    }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+
+        if (resultCode != Activity.RESULT_OK) {
+            return
+        }
+        if (requestCode == MIntentAction.REQUEST_CODE_ONE) {//刷新
+            onRefresh()
+        }
+    }
+    override fun vmClass(): Class<MallListVModel> {
+        return MallListVModel::class.java
+    }
+
+    override fun binding(inflater: LayoutInflater, container: ViewGroup?): FragmentMallListBinding {
+        return FragmentMallListBinding.inflate(layoutInflater)
+    }
+
+    override fun initAdapter(): MallListAdapter {
+        return MallListAdapter(vm)
+    }
+
+    override fun title(): String? {
+        return null
+    }
+
+    override val isRxbus: Boolean
+        get() = true
+
+
+//    @Subscribe(tags = [Tag(ConfigRx.ORDER_SEARCH)])
+//    fun setOrderSearch(k: String) {
+//        vm.k=k
+//        onRefresh()
+//
+//    }
+//
+//
+//    @Subscribe(tags = [Tag(ConfigRx.ORDER_REFRESH)])
+//    fun setOrderRefresh(type: String) {
+//
+//        onRefresh()
+//
+//    }
+}

app/src/main/java/com/zswc/creativity/fragment/OrderListFragment.kt

@@ -29,7 +29,6 @@ class OrderListFragment: MBRFragment<OrderListFragmentVModel, OrderListFragmentA
 
     override fun init(savedInstanceState: Bundle?) {
         super.init(savedInstanceState)
-        vm.fragment=this
     }
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {

app/src/main/java/com/zswc/creativity/fragment/SaleListFragment.kt

@@ -24,9 +24,6 @@ class SaleListFragment: MBRFragment<SaleListFragmentVModel, SaleListFragmentAdap
         super.__before(savedInstanceState)
         vm.state=arguments?.getString("state")
 
-        binding.recyclerView.addItemDecoration(GridSpaceItemToDecoration(2,
-                UiUtils.dp2Px(context(), 12f),
-                UiUtils.dp2Px(context(), 15f)))
 
     }
 

app/src/main/java/com/zswc/creativity/fragment/ShopListFragment.kt

@@ -27,9 +27,9 @@ class ShopListFragment: MBRFragment<ShopListFragmentVModel, ShopListFragmentAdap
         super.__before(savedInstanceState)
         vm.state=arguments?.getString("state")
 
-        binding.recyclerView.addItemDecoration(GridSpaceItemToDecoration(2,
-                UiUtils.dp2Px(context(), 12f),
-                UiUtils.dp2Px(context(), 15f)))
+//        binding.recyclerView.addItemDecoration(GridSpaceItemToDecoration(2,
+//                UiUtils.dp2Px(context(), 12f),
+//                UiUtils.dp2Px(context(), 15f)))
 
     }
 

app/src/main/java/com/zswc/creativity/utils/PopuBuyIntegralUtils.kt

@@ -0,0 +1,160 @@
+package com.zswc.creativity.utils
+
+import android.content.Context
+import android.text.Editable
+import android.text.TextUtils
+import android.text.TextWatcher
+import android.view.LayoutInflater
+import android.view.View
+import android.view.View.OnFocusChangeListener
+import android.widget.*
+import coil.load
+import com.google.gson.Gson
+import com.hwangjr.rxbus.RxBus
+import com.qmuiteam.qmui.kotlin.onClick
+import com.qmuiteam.qmui.layout.QMUIFrameLayout
+import com.qmuiteam.qmui.skin.QMUISkinValueBuilder
+import com.qmuiteam.qmui.util.QMUIDisplayHelper
+import com.qmuiteam.qmui.widget.popup.QMUIPopup
+import com.qmuiteam.qmui.widget.popup.QMUIPopups
+import com.zswc.creativity.R
+import com.zswc.creativity.config.ConfigRx
+import com.zswc.creativity.inte.ChoiceData
+import com.zswc.creativity.model.bean.PayTypeBen
+
+
+/***
+ *on 2020/9/21
+ */
+object PopuBuyIntegralUtils {
+
+
+    fun show(context: Context, cover: String?, name: String?, price: String?, view: View) {
+
+        var mNormalPopup = QMUIPopups.fullScreenPopup(context)
+        val builder: QMUISkinValueBuilder = QMUISkinValueBuilder.acquire()
+        val frameLayout = QMUIFrameLayout(context)
+        //自定义布局
+        val layoutInflater = context?.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater
+        var layout = layoutInflater.inflate(R.layout.item_pop_integral, null)
+        val llAlipay: LinearLayout = layout.findViewById(R.id.ll_alipay)
+        val llWx: LinearLayout = layout.findViewById(R.id.ll_wx)
+        val tvPay: TextView = layout.findViewById(R.id.tv_pay)
+
+        val imgCover: ImageView = layout.findViewById(R.id.img_cover)
+        val tvTitle: TextView = layout.findViewById(R.id.tv_title)
+        val tvPrice: TextView = layout.findViewById(R.id.tv_price)
+
+        val imgAlipay: ImageView = layout.findViewById(R.id.img_alipay)
+        val imgWx: ImageView = layout.findViewById(R.id.img_wx)
+        val llWallet: LinearLayout = layout.findViewById(R.id.ll_wallet)
+        val imgWallet: ImageView = layout.findViewById(R.id.img_wallet)
+
+        val ll: LinearLayout = layout.findViewById(R.id.ll)
+        val butCancel: ImageView = layout.findViewById(R.id.img_close)
+
+        imgCover.load(cover){
+            size(150,150)
+            placeholder(R.drawable.bg_need_error)
+            error(R.drawable.bg_need_error)
+        }
+
+        tvTitle.text = name
+        tvPrice.text = price
+
+        //设置变量
+        var all_nums: String = "1"
+
+        var choseType = 3//1支付宝 2微信 3钱包 //默认钱包
+
+        // mNormalPopup.dismiss()
+
+        llAlipay.onClick {
+            choseType = 1
+            llAlipay.setBackgroundResource(R.drawable.bg_pop_pay_on)
+            llWx.setBackgroundResource(R.drawable.bg_pop_pay_off)
+            llWallet.setBackgroundResource(R.drawable.bg_pop_pay_off)
+            imgAlipay.setImageResource(R.drawable.ct_tr_chose_on)
+            imgWx.setImageResource(R.drawable.ct_tr_chose_off)
+            imgWallet.setImageResource(R.drawable.ct_tr_chose_off)
+
+        }
+        llWx.onClick {
+            choseType = 2
+            llWx.setBackgroundResource(R.drawable.bg_pop_pay_on)
+            llAlipay.setBackgroundResource(R.drawable.bg_pop_pay_off)
+            llWallet.setBackgroundResource(R.drawable.bg_pop_pay_off)
+            imgAlipay.setImageResource(R.drawable.ct_tr_chose_off)
+            imgWx.setImageResource(R.drawable.ct_tr_chose_on)
+            imgWallet.setImageResource(R.drawable.ct_tr_chose_off)
+
+
+        }
+
+        llWallet.onClick {
+            choseType = 3
+            llWx.setBackgroundResource(R.drawable.bg_pop_pay_off)
+            llAlipay.setBackgroundResource(R.drawable.bg_pop_pay_off)
+            llWallet.setBackgroundResource(R.drawable.bg_pop_pay_on)
+            imgAlipay.setImageResource(R.drawable.ct_tr_chose_off)
+            imgWx.setImageResource(R.drawable.ct_tr_chose_off)
+            imgWallet.setImageResource(R.drawable.ct_tr_chose_on)
+        }
+
+
+        tvPay.onClick {
+            //输入支付密码
+            if(choseType==3){//钱包支付
+
+                PopuSureUtils.show(context,view, object :ChoiceData{
+                    override fun onRestuse(password: String?) {
+                       //todo:
+                        var payTypeBen= PayTypeBen(choseType,all_nums,password)
+
+                        RxBus.get().post(ConfigRx.CHOSE_PAY_TYPE,payTypeBen)
+
+                        mNormalPopup.dismiss()
+
+                    }
+
+                })
+
+             return@onClick
+            }
+
+           // RxBus.get().post(ConfigRx.CHOSE_PAY_TYPE, choseType.toString())
+        }
+
+        butCancel.onClick {
+            mNormalPopup.dismiss()
+        }
+        ll.onClick {
+            mNormalPopup.dismiss()
+        }
+
+        builder.release();
+
+        val size = QMUIDisplayHelper.getScreenWidth(context)
+        val height = QMUIDisplayHelper.getScreenHeight(context)
+
+
+        val lp: FrameLayout.LayoutParams = FrameLayout.LayoutParams(size,
+                height)
+        frameLayout.addView(layout, lp)
+
+
+        mNormalPopup.addView(frameLayout)
+        mNormalPopup.onDismiss() {
+        }
+
+        mNormalPopup.dismissIfOutsideTouch(false)
+        mNormalPopup.animStyle(QMUIPopup.ANIM_GROW_FROM_CENTER)
+        mNormalPopup.show(view)
+
+
+    }
+
+
+
+
+}

app/src/main/java/com/zswc/creativity/utils/PopuBuyUtils.kt

@@ -23,9 +23,7 @@ import com.zswc.creativity.inte.ChoiceData
 import com.zswc.creativity.model.bean.PayTypeBen
 
 
-/**
- * 导航-调用手机自带的 高德/百度
- *
+/***
  *on 2020/9/21
  */
 object PopuBuyUtils {

app/src/main/java/com/zswc/creativity/vmodel/AddAddressVModel.kt

@@ -0,0 +1,56 @@
+package com.zswc.creativity.vmodel
+
+import android.app.Activity
+import android.app.Application
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.viewModelScope
+import com.tencent.mmkv.MMKV
+import com.ysnows.base.base.BRepository
+import com.ysnows.base.base.BViewModel
+import com.ysnows.base.utils.B
+import com.ysnows.base.utils.UiSwitch
+import com.zswc.creativity.activity.*
+import com.zswc.creativity.model.MyOrderListDetail
+import com.zswc.creativity.utils.net.NetEngine
+import kotlinx.coroutines.launch
+
+class AddAddressVModel(application: Application) : BViewModel<BRepository>(application) {
+
+    var checked: MutableLiveData<Int> = MutableLiveData()
+
+    var bean = MutableLiveData<MyOrderListDetail>()
+
+
+    fun choseDefault() {
+        //选择默认
+        if (checked.value == 1) checked.value = 0 else checked.value = 1
+
+    }
+
+    fun toBack() {
+        (repository().context as Activity).finish()
+    }
+
+
+    fun setShowTips(pay_type: String?): String {
+
+        if (pay_type == "qb") {
+            return "余额支付"
+        }
+        return ""
+    }
+
+
+
+    fun getOrderDetals(orderid: String?, type: String?) {
+        viewModelScope.launch {
+            var it = repository().lreq { NetEngine.service.setMyOrderListDetail(orderid, type) }
+            if (it.ok()) {
+                bean.value = it.data
+            }
+
+        }
+    }
+
+
+}

app/src/main/java/com/zswc/creativity/vmodel/AddressVModel.kt

@@ -0,0 +1,20 @@
+package com.zswc.creativity.vmodel
+
+import android.app.Application
+import com.ysnows.base.base.BRepository
+import com.ysnows.base.base.BViewModel
+import com.ysnows.base.utils.UiSwitch
+import com.zswc.creativity.activity.AddAddressActivity
+import com.zswc.creativity.activity.BindBankActivity
+
+
+class AddressVModel(application: Application) : BViewModel<BRepository>(application)  {
+
+    fun toAddAddress(){
+        UiSwitch.single(repository().context, AddAddressActivity::class.java)
+
+    }
+
+
+
+}

app/src/main/java/com/zswc/creativity/vmodel/AllCollectDetailsVModel.kt

@@ -0,0 +1,65 @@
+package com.zswc.creativity.vmodel
+
+import android.app.Activity
+import android.app.Application
+import android.content.ClipData
+import android.content.ClipboardManager
+import android.content.Context
+import android.text.TextUtils
+import android.view.View
+import android.widget.LinearLayout
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.viewModelScope
+import com.ysnows.base.base.BRepository
+import com.ysnows.base.base.BViewModel
+import com.ysnows.base.utils.B
+import com.ysnows.base.utils.UiSwitch
+import com.zswc.creativity.activity.CollectDetailsActivity
+import com.zswc.creativity.activity.TrannsferActivity
+import com.zswc.creativity.model.MyTibetaDetails
+import com.zswc.creativity.model.TibetaDetails
+import com.zswc.creativity.utils.*
+import com.zswc.creativity.utils.net.NetEngine
+import kotlinx.coroutines.launch
+
+class AllCollectDetailsVModel(application: Application) : BViewModel<BRepository>(application)  {
+    var ll: LinearLayout? = null
+
+    var id= MutableLiveData<String>()
+
+    var data= MutableLiveData<MyTibetaDetails>()
+
+    fun toCopy(text:String){
+
+        val cm: ClipboardManager? = repository().context?.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager?
+        val mClipData = ClipData.newPlainText("Label", text)
+        cm?.setPrimaryClip(mClipData)
+        toast("文字已复制到粘贴板")
+    }
+
+    fun toClose(){
+
+        (repository().context as Activity).finish()
+    }
+
+    fun getInfo(id:String){
+        viewModelScope.launch {
+            var it=repository().lreq { NetEngine.service.myCollectionDetail(id) }
+            if(it.ok()){
+
+                data.value=it.data
+
+            }
+
+        }
+    }
+
+    fun  toBuy(view :View){//支付弹框
+        PopuBuyIntegralUtils.show(repository().context!!, data.value?.cover,data.value?.name,"79.9", view)
+    }
+
+
+
+
+
+}

app/src/main/java/com/zswc/creativity/vmodel/ConvetSuessVModel.kt

@@ -0,0 +1,46 @@
+package com.zswc.creativity.vmodel
+
+import android.app.Activity
+import android.app.Application
+import androidx.lifecycle.MutableLiveData
+import com.hwangjr.rxbus.RxBus
+import com.zswc.creativity.activity.LoginActivity
+import com.tencent.mmkv.MMKV
+import com.ysnows.base.base.BRepository
+import com.ysnows.base.base.BViewModel
+import com.ysnows.base.utils.B
+import com.ysnows.base.utils.UiSwitch
+import com.zswc.creativity.activity.MallOrderActivity
+import com.zswc.creativity.activity.PaySuessActivity
+import com.zswc.creativity.activity.TibOrderActivity
+import com.zswc.creativity.config.ConfigRx
+
+class ConvetSuessVModel(application: Application) : BViewModel<BRepository>(application)  {
+
+    var orderid = MutableLiveData<String>()
+    var type = MutableLiveData<String>()
+
+
+
+    fun toGoHome(){
+
+        RxBus.get().post(ConfigRx.INTEGRAL_COMPLETE_CLOSE,"")
+
+        ( repository().context as Activity).finish()
+
+    }
+    fun toOrderList(){
+
+        //todo：
+        UiSwitch.bundle(repository().context, MallOrderActivity::class.java,
+                B().putString("orderid", orderid.value.toString())
+                        .putString("type", type.value.toString())
+                        .ok())
+
+    }
+
+
+
+
+
+}

app/src/main/java/com/zswc/creativity/vmodel/HomeMyVModel.kt

@@ -58,6 +58,11 @@ open class HomeMyVModel(application: Application) : BViewModel<BRepository>(appl
 
     }
 
+    fun toMall(){
+        UiSwitch.single(repository().context, MallActivity::class.java)
+
+    }
+
 
     fun isShowAuth(is_auth:Boolean,isLogin:Boolean):Int{
         if(isLogin&&!is_auth){

app/src/main/java/com/zswc/creativity/vmodel/MallListVModel.kt

@@ -0,0 +1,117 @@
+package com.zswc.creativity.vmodel
+
+import android.app.Application
+import android.graphics.Color
+import android.view.View
+import com.ysnows.base.base.BRRepository
+import com.ysnows.base.base.BRViewModel
+import com.ysnows.base.net.IResp
+import com.zswc.creativity.fragment.OrderListFragment
+import com.zswc.creativity.utils.net.NetEngine
+
+class MallListVModel(application: Application) : BRViewModel<BRRepository>(application) {
+
+
+//    var bean =MutableLiveData<List<FishpondBean>>()
+    var state:String?=""
+
+
+   // state //   0:待付款  1待开始 2进行中 3待评论  4已完成 9:已取消
+    fun toShowTips(state:String?):String{
+        if(state=="2"){
+            return "已转赠"
+        }
+       if(state=="1"){
+           return "已购买"
+       }
+       return "待支付"
+    }
+
+    fun toShowColor(state:String?):Int{
+        if(state=="2"){
+            return Color.parseColor("#62E0F8")
+        }
+        if(state=="1"){
+            return Color.parseColor("#62E0F8")
+        }
+
+        return Color.parseColor("F14351")
+    }
+
+    fun isNumOne(state:String?):Int{
+
+        if(state=="2"){
+            return View.GONE
+        }
+        if(state=="1"){
+            return View.VISIBLE
+        }
+        return View.VISIBLE
+    }
+    fun isNumTwo(state:String?):Int{
+
+        if(state=="2"){
+            return View.VISIBLE
+        }
+        if(state=="1"){
+            return View.GONE
+        }
+        return View.GONE
+    }
+
+
+
+
+    fun  getMoneyColor(state:Int?):Int{
+
+
+        if(state==0){
+            return Color.parseColor("#FF0000")
+        }
+        if(state==1){
+            return Color.parseColor("#FF0000")
+        }
+        return Color.parseColor("#333333")
+
+    }
+    fun  getMoneyTips(state:Int?,total_fee:String?,refund_fee:String?):String{
+        if(state==9){
+            return ""+refund_fee
+        }
+
+        return ""+total_fee
+
+    }
+
+    fun getShowCancel(state:Int?):Int{
+        if(state==0||state==1){
+            return View.VISIBLE
+        }
+        return View.GONE
+    }
+
+
+//
+//    fun  toReceOrder(id: String){
+//
+//        UiSwitch.bundleRes(fragment!!, OrderDetailActivity::class.java, Bundle().apply {
+//            putString("order_id", id)},MIntentAction.REQUEST_CODE_ONE)
+//
+//    }
+
+
+
+    override fun apiFunc(): suspend () -> IResp<*> {
+
+        if(state.equals("-1")){//已转赠
+            return {
+                NetEngine.service.getMySendList(10,repository().page)
+            }
+        }
+        return {
+            NetEngine.service.getMyOrderList(state,10,repository().page)
+        }
+    }
+
+
+}

app/src/main/java/com/zswc/creativity/vmodel/MallOrderVModel.kt

@@ -0,0 +1,50 @@
+package com.zswc.creativity.vmodel
+
+import android.app.Activity
+import android.app.Application
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.viewModelScope
+import com.zswc.creativity.activity.LoginActivity
+import com.tencent.mmkv.MMKV
+import com.ysnows.base.base.BRepository
+import com.ysnows.base.base.BViewModel
+import com.ysnows.base.utils.UiSwitch
+import com.zswc.creativity.model.MyOrderListDetail
+import com.zswc.creativity.utils.net.NetEngine
+import kotlinx.coroutines.launch
+
+class MallOrderVModel(application: Application) : BViewModel<BRepository>(application)  {
+
+
+    var bean = MutableLiveData<MyOrderListDetail>()
+
+
+    fun toBack(){
+        (repository().context as Activity).finish()
+    }
+
+
+    fun setShowTips(pay_type:String?):String{
+
+        if(pay_type == "qb"){
+            return "余额支付"
+        }
+        return ""
+    }
+
+
+    fun getOrderDetals(orderid:String?){
+        viewModelScope.launch {
+            var it= repository().lreq { NetEngine.service.getMySendListDetail(orderid) }
+            if(it.ok()){
+                bean.value=it.data
+            }
+
+        }
+    }
+
+
+
+
+
+}

app/src/main/java/com/zswc/creativity/vmodel/MallVModel.kt

@@ -0,0 +1,23 @@
+package com.zswc.creativity.vmodel
+
+import android.app.Application
+import android.text.Editable
+import android.text.TextUtils
+import androidx.databinding.Bindable
+import com.hwangjr.rxbus.RxBus
+import com.ysnows.base.base.BRepository
+import com.ysnows.base.base.BViewModel
+import com.zswc.creativity.BR
+import com.zswc.creativity.config.ConfigRx
+import com.zswc.creativity.view.SimpleTextWatcher
+
+/**
+ *
+ *on 2021/3/16
+ */
+class MallVModel(application: Application) : BViewModel<BRepository>(application)  {
+
+
+
+
+}

app/src/main/java/com/zswc/creativity/vmodel/OrderListFragmentVModel.kt

@@ -15,7 +15,6 @@ class OrderListFragmentVModel(application: Application) : BRViewModel<BRReposito
 //    var bean =MutableLiveData<List<FishpondBean>>()
     var state:String?=""
 
-    var fragment: OrderListFragment?=null
 
    // state //   0:待付款  1待开始 2进行中 3待评论  4已完成 9:已取消
     fun toShowTips(state:String?):String{

app/src/main/java/com/zswc/creativity/vmodel/ShopListVModel.kt

@@ -7,6 +7,8 @@ import com.ysnows.base.utils.B
 import com.ysnows.base.utils.UiSwitch
 import com.zswc.creativity.activity.ArticleDetailActivity
 import com.zswc.creativity.activity.IntegralDetailsActivity
+import com.zswc.creativity.activity.MallActivity
+import com.zswc.creativity.activity.MyInfoActivity
 
 /**
  *
@@ -22,4 +24,12 @@ class ShopListVModel(application: Application) : BViewModel<BRepository>(applica
 
   }
 
+    fun  toMall(){
+        //商城订单
+        UiSwitch.single(repository().context, MallActivity::class.java)
+
+    }
+
+
+
 }

app/src/main/java/com/zswc/creativity/vmodel/SureOrderVModel.kt

@@ -4,47 +4,59 @@ import android.app.Activity
 import android.app.Application
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.viewModelScope
-import com.zswc.creativity.activity.LoginActivity
 import com.tencent.mmkv.MMKV
 import com.ysnows.base.base.BRepository
 import com.ysnows.base.base.BViewModel
+import com.ysnows.base.utils.B
 import com.ysnows.base.utils.UiSwitch
+import com.zswc.creativity.activity.*
 import com.zswc.creativity.model.MyOrderListDetail
 import com.zswc.creativity.utils.net.NetEngine
 import kotlinx.coroutines.launch
 
-class SureOrderVModel(application: Application) : BViewModel<BRepository>(application)  {
+class SureOrderVModel(application: Application) : BViewModel<BRepository>(application) {
 
 
     var bean = MutableLiveData<MyOrderListDetail>()
 
 
-    fun toBack(){
+    fun toBack() {
         (repository().context as Activity).finish()
     }
 
 
-    fun setShowTips(pay_type:String?):String{
+    fun setShowTips(pay_type: String?): String {
 
-        if(pay_type == "qb"){
+        if (pay_type == "qb") {
             return "余额支付"
         }
         return ""
     }
 
+    fun toSuess() {
+        UiSwitch.bundle(
+                repository().context, ConvetSuessActivity::class.java,
+                B().putString("type", "2")
+                        .ok()
+        )
+    }
 
-    fun getOrderDetals(orderid:String?,type:String?){
-        viewModelScope.launch {
-            var it= repository().lreq { NetEngine.service.setMyOrderListDetail(orderid,type) }
-            if(it.ok()){
-                bean.value=it.data
-            }
+    fun toChoseAddress(){//选择地址
+
+        UiSwitch.single(repository().context, AddressActivity::class.java)
 
-        }
     }
 
 
+    fun getOrderDetals(orderid: String?, type: String?) {
+        viewModelScope.launch {
+            var it = repository().lreq { NetEngine.service.setMyOrderListDetail(orderid, type) }
+            if (it.ok()) {
+                bean.value = it.data
+            }
 
+        }
+    }
 
 
 }

app/src/main/res/layout/activity_add_address.xml

@@ -0,0 +1,217 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+
+        <variable
+            name="vm"
+            type="com.zswc.creativity.vmodel.AddAddressVModel" />
+
+    </data>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/white"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="18dp"
+            android:layout_marginTop="22dp"
+            android:layout_marginEnd="15dp"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="65dp"
+                android:text="收货人"
+                android:textColor="#222222"
+                android:textSize="14sp" />
+
+            <com.ysnows.base.widget.DelEditText
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="65dp"
+                android:background="@null"
+                android:hint="请填写收货人姓名"
+                android:textColor="@color/text_title"
+                android:textColorHint="#CDCDCD"
+                android:textSize="14sp" />
+
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="18dp"
+            android:layout_marginTop="26dp"
+            android:layout_marginEnd="15dp"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="50dp"
+                android:text="手机号码"
+                android:textColor="#222222"
+                android:textSize="14sp" />
+
+            <com.ysnows.base.widget.DelEditText
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="65dp"
+                android:background="@null"
+                android:hint="请填写收货人手机号码"
+                android:textColor="@color/text_title"
+                android:textColorHint="#CDCDCD"
+                android:textSize="14sp" />
+
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="18dp"
+            android:layout_marginTop="26dp"
+            android:layout_marginEnd="15dp"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="50dp"
+                android:text="所在地区"
+                android:textColor="#222222"
+                android:textSize="14sp" />
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="65dp"
+                android:background="@null"
+                android:hint="请选择所在地区"
+                android:textColor="@color/text_title"
+                android:textColorHint="#CDCDCD"
+                android:textSize="14sp" />
+
+            <ImageView
+                android:src="@drawable/ct_location"
+                android:layout_width="14dp"
+                android:layout_height="16dp"/>
+
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="18dp"
+            android:layout_marginTop="26dp"
+            android:layout_marginEnd="15dp"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="50dp"
+                android:text="详细地址"
+                android:textColor="#222222"
+                android:textSize="14sp" />
+
+            <com.ysnows.base.widget.DelEditText
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="65dp"
+                android:background="@null"
+                android:hint="请输入街道、楼牌号"
+                android:textColor="@color/text_title"
+                android:textColorHint="#CDCDCD"
+                android:textSize="14sp" />
+
+
+        </LinearLayout>
+
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="18dp"
+            android:layout_marginTop="27dp"
+            android:layout_marginEnd="15dp"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="设为默认地址"
+                android:textColor="@color/text_title"
+                android:textSize="15sp"></TextView>
+
+            <ImageView
+                android:id="@+id/img_default"
+                android:layout_width="48dp"
+                android:layout_height="24dp"
+                tools:src="@drawable/ct_default_on"
+                android:layout_marginLeft="18dp"
+                android:onClick="@{v->vm.choseDefault()}"
+                android:src="@{vm.checked==1?@drawable/ct_default_on:@drawable/ct_default_off,default=@drawable/ct_default_on}">
+
+            </ImageView>
+
+        </LinearLayout>
+
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="83dp"
+            android:background="@color/white"
+            android:orientation="horizontal">
+
+            <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+                android:layout_width="115dp"
+                android:layout_height="40dp"
+                android:layout_marginStart="15dp"
+                android:layout_marginTop="6dp"
+                android:text="删除"
+                android:textColor="#38D3D3"
+                android:textSize="18sp"
+                app:qmui_backgroundColor="@color/white"
+                app:qmui_borderColor="#53D7E8"
+                app:qmui_borderWidth="@dimen/dp_1"
+                app:qmui_radius="@dimen/dp_4" />
+
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="40dp"
+                android:layout_marginStart="15dp"
+                android:layout_marginTop="6dp"
+                android:layout_marginEnd="15dp"
+                android:layout_weight="1"
+                android:background="@drawable/bg_logo_but"
+                android:gravity="center"
+                android:text="保存"
+                android:textColor="@color/white"
+                android:textSize="20sp" />
+
+
+        </LinearLayout>
+
+
+    </LinearLayout>
+</layout>

app/src/main/res/layout/activity_address.xml

@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+
+        <variable
+            name="vm"
+            type="com.zswc.creativity.vmodel.AddressVModel" />
+
+    </data>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/color_bg"
+        android:orientation="vertical">
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1">
+
+            <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                app:qmui_radius="12dp"
+                android:layout_marginEnd="15dp"
+                android:layout_marginStart="15dp"
+                android:layout_marginTop="10dp"
+                app:qmui_backgroundColor="@color/white"
+                app:qmui_borderColor="@color/translucent"
+                android:layout_marginBottom="20dp"
+                android:orientation="vertical">
+
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/recycler_recommend"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                    tools:listitem="@layout/item_address" />
+
+
+            </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
+
+            <!--            没有数据的界面-->
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:gravity="center"
+                android:orientation="vertical"
+                android:visibility="gone">
+
+
+                <ImageView
+                    android:layout_width="100dp"
+                    android:layout_height="100dp"
+                    android:src="@drawable/ct_no_address" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="20dp"
+                    android:text="暂无地址，请去添加地址" />
+
+
+            </LinearLayout>
+
+
+        </FrameLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="40dp"
+            android:layout_marginStart="25dp"
+            android:layout_marginEnd="25dp"
+            android:gravity="center"
+            android:layout_marginBottom="38dp"
+            android:background="@drawable/bg_logo_but"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="+"
+                android:textColor="#FFFFFF"
+                android:textSize="24sp" />
+
+            <TextView
+                android:onClick="@{v->vm.toAddAddress()}"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="新增收货地址"
+                android:textColor="#FFFFFF"
+                android:textSize="18sp" />
+
+
+        </LinearLayout>
+
+
+    </LinearLayout>
+</layout>

app/src/main/res/layout/activity_all_collect_details.xml

@@ -0,0 +1,611 @@
+<?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">
+
+    <data>
+
+        <variable
+            name="vm"
+            type="com.zswc.creativity.vmodel.AllCollectDetailsVModel" />
+
+        <import type="android.view.View" />
+
+    </data>
+
+    <LinearLayout
+        android:id="@+id/ll"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/white"
+        android:orientation="vertical">
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1">
+
+            <com.zswc.creativity.view.MyScrollView
+                android:id="@+id/scroll"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:scrollbars="none">
+
+
+                <FrameLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:orientation="vertical">
+
+                    <FrameLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content">
+
+
+                        <ImageView
+                            android:id="@+id/image_gif_view"
+                            android:layout_width="match_parent"
+                            android:layout_height="360dp"
+                            android:src="@drawable/bg_need_error" />
+
+                        <ImageView
+                            android:id="@+id/image_view"
+                            android:layout_width="match_parent"
+                            android:layout_height="360dp"
+                            android:background="@drawable/bg_need_error"
+                            android:scaleType="centerCrop" />
+
+
+
+                        <TextView
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="12dp"
+                            android:layout_marginEnd="14dp"
+                            android:layout_weight="1"
+                            android:gravity="right"
+                            android:text="@{vm.data.create_at}"
+                            android:textColor="#333333"
+                            android:textSize="12sp" />
+
+                    </FrameLayout>
+
+                    <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="336dp"
+                        android:orientation="vertical"
+                        app:qmui_backgroundColor="@color/white"
+                        app:qmui_borderColor="@color/translucent"
+                        app:qmui_radius="16dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_horizontal"
+                            android:layout_marginTop="8dp"
+                            android:text="@{vm.data.name}"
+                            android:textColor="#141414"
+                            android:textSize="22sp"
+                            android:textStyle="bold" />
+
+                        <LinearLayout
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_horizontal"
+                            android:layout_marginTop="5dp">
+
+
+                            <ImageView
+                                android:layout_width="30dp"
+                                android:layout_height="18dp"
+                                android:src="@drawable/ct_collect" />
+
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="18dp"
+                                android:background="@drawable/bg_kuang_blue"
+                                android:hint="100份"
+                                android:paddingStart="9dp"
+                                android:paddingTop="2dp"
+                                android:paddingEnd="9dp"
+                                android:paddingBottom="2dp"
+                                android:text="@{vm.data.tag}"
+                                android:textColor="#54D7E9"
+                                android:textColorHint="#54D7E9"
+                                android:textSize="@dimen/dp_11" />
+
+                        </LinearLayout>
+
+                        <LinearLayout
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="15dp"
+                            android:layout_marginTop="11dp"
+                            android:gravity="center_vertical"
+                            android:orientation="horizontal">
+
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="认证"
+                                android:textColor="#222222"
+                                android:textSize="16sp"
+                                android:textStyle="bold" />
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:shadowColor="#38D3D3"
+                                android:shadowDx="11"
+                                android:shadowDy="22"
+                                android:shadowRadius="2"
+                                android:text="信息"
+                                android:textColor="#222222"
+                                android:textSize="16sp"
+                                android:textStyle="bold" />
+
+
+                        </LinearLayout>
+
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="15dp"
+                            android:layout_marginTop="8dp"
+                            android:gravity="center_vertical"
+                            android:orientation="horizontal">
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="区块链"
+                                android:textColor="#333333"
+                                android:textSize="12sp" />
+
+                            <TextView
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginEnd="14dp"
+                                android:gravity="right"
+                                android:text="蚂蚁链LASH"
+                                android:textColor="#333333"
+                                android:textSize="12sp" />
+
+
+                        </LinearLayout>
+
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="15dp"
+                            android:layout_marginTop="8dp"
+                            android:gravity="center_vertical"
+                            android:orientation="horizontal">
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="合约地址"
+                                android:textColor="#333333"
+                                android:textSize="12sp" />
+
+                            <TextView
+                                android:layout_width="0dp"
+                                android:layout_height="wrap_content"
+                                android:layout_marginStart="12dp"
+                                android:layout_marginEnd="6dp"
+                                android:layout_weight="1"
+                                android:ellipsize="middle"
+                                android:gravity="right"
+                                android:singleLine="true"
+                                android:text="@{vm.data.collectors_hash}"
+                                android:textColor="#333333"
+                                android:textSize="12sp" />
+
+                            <ImageView
+                                android:layout_width="17dp"
+                                android:layout_height="17dp"
+                                android:layout_marginEnd="14dp"
+                                android:onClick="@{v->vm.toCopy(vm.data.collectors_hash)}"
+                                android:src="@drawable/ct_copy" />
+
+
+                        </LinearLayout>
+
+                        <LinearLayout
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="15dp"
+                            android:layout_marginTop="11dp"
+                            android:gravity="center_vertical"
+                            android:orientation="horizontal">
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="卖家"
+                                android:textColor="#222222"
+                                android:textSize="16sp"
+                                android:textStyle="bold" />
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:shadowColor="#38D3D3"
+                                android:shadowDx="11"
+                                android:shadowDy="22"
+                                android:shadowRadius="2"
+                                android:text="信息"
+                                android:textColor="#222222"
+                                android:textSize="16sp"
+                                android:textStyle="bold" />
+
+
+                        </LinearLayout>
+
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="15dp"
+                            android:layout_marginTop="8dp"
+                            android:gravity="center_vertical"
+                            android:orientation="horizontal">
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="收藏者"
+                                android:textColor="#333333"
+                                android:textSize="12sp" />
+
+                            <TextView
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginEnd="14dp"
+                                android:gravity="right"
+                                android:text="@{vm.data.collectors_name}"
+                                android:textColor="#333333"
+                                android:textSize="12sp" />
+
+
+                        </LinearLayout>
+
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="15dp"
+                            android:layout_marginTop="8dp"
+                            android:gravity="center_vertical"
+                            android:orientation="horizontal">
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="收藏时间"
+                                android:textColor="#333333"
+                                android:textSize="12sp" />
+
+                            <TextView
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginEnd="14dp"
+                                android:gravity="right"
+                                android:text="@{vm.data.create_at}"
+                                android:textColor="#333333"
+                                android:textSize="12sp" />
+
+
+                        </LinearLayout>
+
+
+                        <LinearLayout
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="15dp"
+                            android:layout_marginTop="11dp"
+                            android:gravity="center_vertical"
+                            android:orientation="horizontal">
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="藏品"
+                                android:textColor="#222222"
+                                android:textSize="16sp"
+                                android:textStyle="bold" />
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:shadowColor="#38D3D3"
+                                android:shadowDx="11"
+                                android:shadowDy="22"
+                                android:shadowRadius="2"
+                                android:text="描述"
+                                android:textColor="#222222"
+                                android:textSize="16sp"
+                                android:textStyle="bold" />
+
+                        </LinearLayout>
+
+                        <androidx.appcompat.widget.AppCompatImageView
+                            android:id="@+id/img_deatils"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="15dp"
+                            android:layout_marginTop="10dp"
+                            android:layout_marginEnd="15dp"
+                            android:adjustViewBounds="true"
+                            android:scaleType="fitXY"
+                            android:src="@drawable/bg_need_error" />
+
+
+                        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="16dp"
+                            android:orientation="vertical"
+                            android:paddingStart="10dp"
+                            android:paddingTop="10dp"
+                            android:paddingEnd="10dp"
+                            android:paddingBottom="6dp"
+                            app:qmui_backgroundColor="#F1F9F9"
+                            app:qmui_borderColor="@color/translucent"
+                            app:qmui_radius="8dp">
+
+                            <LinearLayout
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:gravity="center_vertical"
+                                android:orientation="horizontal">
+
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="购买"
+                                    android:textColor="#222222"
+                                    android:textSize="16sp"
+                                    android:textStyle="bold" />
+
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:shadowColor="#38D3D3"
+                                    android:shadowDx="11"
+                                    android:shadowDy="22"
+                                    android:shadowRadius="2"
+                                    android:text="须知"
+                                    android:textColor="#222222"
+                                    android:textSize="16sp"
+                                    android:textStyle="bold" />
+
+                            </LinearLayout>
+
+                            <TextView
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="10dp"
+                                android:text="@{vm.data.pro_info.buy_notice}"
+                                android:textColor="#B5B5B5"
+                                android:textSize="11sp" />
+
+
+                        </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
+
+
+                        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="16dp"
+                            android:orientation="vertical"
+                            android:paddingStart="10dp"
+                            android:paddingTop="10dp"
+                            android:paddingEnd="10dp"
+                            android:paddingBottom="6dp"
+                            app:qmui_backgroundColor="#F1F9F9"
+                            app:qmui_borderColor="@color/translucent"
+                            app:qmui_radius="8dp">
+
+                            <LinearLayout
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:gravity="center_vertical"
+                                android:orientation="horizontal">
+
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="温馨"
+                                    android:textColor="#222222"
+                                    android:textSize="16sp"
+                                    android:textStyle="bold" />
+
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:shadowColor="#38D3D3"
+                                    android:shadowDx="11"
+                                    android:shadowDy="22"
+                                    android:shadowRadius="2"
+                                    android:text="提示"
+                                    android:textColor="#222222"
+                                    android:textSize="16sp"
+                                    android:textStyle="bold" />
+
+
+                            </LinearLayout>
+
+                            <TextView
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="10dp"
+                                android:text="@{vm.data.pro_info.warm_prompt}"
+                                android:textColor="#B5B5B5"
+
+                                android:textSize="11sp" />
+
+
+                        </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
+
+
+                        <View
+                            android:layout_width="match_parent"
+                            android:layout_height="@dimen/dp_20" />
+
+                    </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
+
+                    <LinearLayout
+                        android:id="@+id/ll_show_one"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical">
+
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:orientation="vertical">
+
+                            <TextView
+                                android:id="@+id/tv"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:visibility="gone" />
+
+                        </LinearLayout>
+
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:orientation="horizontal"
+                            android:paddingTop="10dp"
+                            android:paddingBottom="10dp">
+
+                            <ImageView
+                                android:layout_width="28dp"
+                                android:layout_height="28dp"
+                                android:layout_marginStart="16dp"
+                                android:onClick="@{v->vm.toClose()}"
+                                android:src="@drawable/ct_tib_back" />
+
+                            <View
+                                android:layout_width="0dp"
+                                android:layout_height="match_parent"
+                                android:layout_weight="1" />
+
+
+                        </LinearLayout>
+
+                    </LinearLayout>
+
+
+                </FrameLayout>
+
+            </com.zswc.creativity.view.MyScrollView>
+            <!--             滑动时候显示的   -->
+
+
+            <LinearLayout
+                android:id="@+id/ll_show_two"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:visibility="gone">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:id="@+id/tv_two"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:visibility="gone" />
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:paddingTop="10dp"
+                    android:paddingBottom="10dp">
+
+                    <ImageView
+                        android:layout_width="38dp"
+                        android:layout_height="20dp"
+                        android:onClick="@{v->vm.toClose()}"
+                        android:paddingLeft="20dp"
+                        android:src="@drawable/ic_back_black" />
+
+                    <TextView
+                        android:id="@+id/tv_show_title"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginEnd="14dp"
+                        android:layout_weight="1"
+                        android:gravity="center_horizontal"
+                        android:text="臧品详情"
+                        android:textColor="@color/text_title"
+                        android:textSize="18sp"
+                        android:textStyle="bold" />
+
+                    <ImageView
+                        android:layout_width="28dp"
+                        android:layout_height="20dp"
+                        android:layout_marginEnd="16dp"
+                        android:src="@drawable/ct_share"
+                        android:visibility="invisible" />
+
+                </LinearLayout>
+            </LinearLayout>
+
+
+        </FrameLayout>
+
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_marginStart="16dp"
+                android:layout_weight="1"
+                android:hint="￥29.9"
+                android:text="￥29.9"
+                android:textColor="@color/text_title"
+                android:textSize="26sp" />
+
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1" />
+
+            <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+                android:id="@+id/but_buy"
+                android:layout_width="180dp"
+                android:layout_height="36dp"
+                android:layout_marginEnd="25dp"
+                android:text="立即购买"
+                android:textColor="@color/white"
+                android:textSize="16sp"
+                app:qmui_backgroundColor="#38D3D3"
+                app:qmui_borderColor="@color/translucent"
+                app:qmui_radius="4dp" />
+
+
+        </LinearLayout>
+
+
+    </LinearLayout>
+</layout>

app/src/main/res/layout/activity_convet_suess.xml

@@ -0,0 +1,75 @@
+<?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">
+
+    <data>
+
+        <variable
+            name="vm"
+            type="com.zswc.creativity.vmodel.ConvetSuessVModel" />
+
+    </data>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/white"
+        android:orientation="vertical">
+
+        <ImageView
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="84dp"
+            android:src="@drawable/ct_pay_suess" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="20dp"
+            android:text="兑换成功，可在商城订单查看该商品"
+            android:textColor="#666666"
+            android:textSize="12sp" />
+
+
+        
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:orientation="horizontal"
+            android:layout_marginTop="83dp"
+            android:layout_marginEnd="35dp"
+            android:layout_marginStart="35dp"
+            android:layout_height="wrap_content">
+            
+            <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                app:qmui_radius="4dp"
+                android:onClick="@{v->vm.toGoHome()}"
+                app:qmui_borderColor="#DCDCDC"
+                app:qmui_borderWidth="@dimen/dp_1"
+                android:text="返货首页"
+                android:textColor="@color/text_title"
+                android:textSize="16sp"
+                android:layout_height="40dp"/>
+
+            <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_marginStart="25dp"
+                app:qmui_radius="4dp"
+                app:qmui_borderColor="#38D3D3"
+                app:qmui_backgroundColor="#38D3D3"
+                app:qmui_borderWidth="@dimen/dp_1"
+                android:onClick="@{v->vm.toOrderList()}"
+                android:text="查看订单"
+                android:textColor="@color/white"
+                android:textSize="16sp"
+                android:layout_height="40dp"/>
+
+        </LinearLayout>
+
+
+    </LinearLayout>
+</layout>

app/src/main/res/layout/activity_mall.xml

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <data>
+
+        <import type="android.view.View" />
+
+        <variable
+            name="vm"
+            type="com.zswc.creativity.vmodel.MallVModel" />
+    </data>
+
+    <LinearLayout
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="#F2F2F2"
+        android:orientation="vertical">
+
+        <FrameLayout
+            android:id="@+id/lay_container"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <com.qmuiteam.qmui.widget.tab.QMUITabSegment
+                android:id="@+id/tabs"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/title_bar_height"
+                android:background="@color/white"
+                android:textSize="16sp" />
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginTop="@dimen/title_bar_height"
+                android:background="#E4E4E4" />
+
+            <com.qmuiteam.qmui.widget.QMUIViewPager
+                android:id="@+id/view_pager"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginTop="51dp" />
+
+        </FrameLayout>
+
+
+    </LinearLayout>
+
+
+</layout>

app/src/main/res/layout/activity_mall_order.xml

@@ -0,0 +1,221 @@
+<?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">
+
+    <data>
+
+        <variable
+            name="vm"
+            type="com.zswc.creativity.vmodel.MallOrderVModel" />
+
+    </data>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@drawable/bg_home_bg"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="46dp"
+            android:orientation="horizontal">
+
+            <ImageView
+                android:layout_width="38dp"
+                android:layout_height="20dp"
+                android:onClick="@{v->vm.toBack()}"
+                android:paddingLeft="20dp"
+                android:src="@drawable/ic_back_black" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="58dp"
+                android:gravity="center_horizontal"
+                android:text="订单详情"
+                android:textColor="@color/text_title"
+                android:textSize="18sp"
+                android:textStyle="bold" />
+
+        </LinearLayout>
+
+
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="20dp"
+            android:layout_marginTop="10dp"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <ImageView
+                android:src="@drawable/ct_order_tips"
+                android:layout_width="@dimen/dp_22"
+                android:layout_height="@dimen/dp_22"/>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="已兑换"
+                android:layout_marginStart="8dp"
+                android:textColor="@color/text_title"
+                android:textSize="18sp" />
+
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginTop="14sp"
+            android:background="@drawable/bg_money_top"
+            android:orientation="vertical"
+            android:paddingStart="15dp"
+            android:paddingEnd="15dp">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:orientation="horizontal"
+                android:layout_marginTop="14dp"
+                android:layout_height="wrap_content">
+
+                <com.qmuiteam.qmui.widget.QMUIRadiusImageView
+                    android:id="@+id/img_cover"
+                    android:layout_width="100dp"
+                    android:layout_height="100dp"
+                    android:src="@drawable/bg_need_error"
+                    app:qmui_border_color="@color/translucent"
+                    app:url="@{vm.bean.pro_info.cover}"
+                    app:qmui_corner_radius="16dp"
+                     />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:orientation="vertical"
+                    android:layout_marginStart="10dp"
+                    android:layout_height="wrap_content">
+
+                    <TextView
+                        android:text="@{vm.bean.pro_info.name}"
+                        android:textSize="15sp"
+                        android:layout_marginTop="20dp"
+                        android:hint="122344"
+                        android:textColor="@color/text_title"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"/>
+
+                    <LinearLayout
+                        android:layout_width="wrap_content"
+                        android:orientation="horizontal"
+                        android:layout_marginTop="23dp"
+                        android:layout_height="wrap_content">
+
+
+                        <TextView
+                            android:textSize="14sp"
+                            android:textColor="#888888"
+                            android:hint="X1"
+                            android:text="X1"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"/>
+
+                    </LinearLayout>
+
+
+
+
+                </LinearLayout>
+
+
+
+
+            </LinearLayout>
+
+
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:orientation="horizontal"
+                android:layout_marginTop="14dp"
+                android:layout_height="wrap_content">
+                <TextView
+                    android:text="消耗积分"
+                    android:textSize="13sp"
+                    android:textColor="#888888"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"/>
+
+                <TextView
+                    android:text="@{vm.bean.over_time}"
+                    android:textSize="13sp"
+                    android:textColor="#222222"
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:gravity="right"
+                    android:layout_height="wrap_content"/>
+
+
+            </LinearLayout>
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:orientation="horizontal"
+                android:layout_marginTop="14dp"
+                android:layout_height="wrap_content">
+                <TextView
+                    android:text="兑换时间"
+                    android:textSize="13sp"
+                    android:textColor="#888888"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"/>
+
+                <TextView
+                    android:text="@{vm.bean.send_name}"
+                    android:textSize="13sp"
+                    android:textColor="#222222"
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:gravity="right"
+                    android:layout_height="wrap_content"/>
+
+
+
+            </LinearLayout>
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:orientation="horizontal"
+                android:layout_marginTop="14dp"
+                android:layout_height="wrap_content">
+                <TextView
+                    android:text="订单编号"
+                    android:textSize="13sp"
+                    android:textColor="#888888"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"/>
+
+                <TextView
+                    android:text="铸造中"
+                    android:textSize="13sp"
+                    android:textColor="#222222"
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:gravity="right"
+                    android:layout_height="wrap_content"/>
+
+                  <ImageView
+                      android:layout_marginStart="4dp"
+                      android:src="@drawable/ct_copy"
+                      android:layout_width="13dp"
+                      android:layout_height="13dp"/>
+
+            </LinearLayout>
+
+
+
+        </LinearLayout>
+
+
+    </LinearLayout>
+</layout>

app/src/main/res/layout/activity_sure_order.xml

@@ -25,6 +25,7 @@
             android:layout_marginTop="10dp"
             android:layout_marginEnd="15dp"
             android:gravity="center_vertical"
+            android:onClick="@{v->vm.toChoseAddress()}"
             android:paddingStart="@dimen/dp_10"
             android:paddingEnd="@dimen/dp_10"
             app:qmui_backgroundColor="@color/white"
@@ -249,6 +250,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="40dp"
                 android:layout_marginStart="15dp"
+                android:onClick="@{v->vm.toSuess()}"
                 android:layout_marginTop="6dp"
                 android:layout_marginEnd="15dp"
                 android:background="@drawable/bg_logo_but"

app/src/main/res/layout/fragment_home_my.xml

@@ -345,49 +345,51 @@
 
                         </LinearLayout>
 
-
                         <LinearLayout
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
                             android:layout_weight="1"
                             android:gravity="center"
-                            android:onClick="@{v->vm.toCertification()}"
-                            android:orientation="vertical">
+                            android:onClick="@{v->vm.toMall()}"
+                            android:orientation="vertical"
+                            >
 
                             <ImageView
                                 android:layout_width="24dp"
                                 android:layout_height="24dp"
-                                android:src="@drawable/ct_my_renzheng" />
+                                android:src="@drawable/ct_my_store" />
 
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_marginTop="1dp"
-                                android:text="实名认证"
+                                android:text="商城订单"
                                 android:textColor="#222222"
                                 android:textSize="12sp" />
 
 
                         </LinearLayout>
 
+
                         <LinearLayout
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
                             android:layout_weight="1"
                             android:gravity="center"
-                            android:onClick="@{v->vm.toSpread()}"
-                            android:orientation="vertical">
+                            android:orientation="vertical"
+                            android:visibility="invisible"
+                            tools:visibility="visible">
 
                             <ImageView
                                 android:layout_width="24dp"
                                 android:layout_height="24dp"
-                                android:src="@drawable/ct_my_tuiguang" />
+                                android:src="@drawable/ct_my_zeng" />
 
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_marginTop="1dp"
-                                android:text="推广"
+                                android:text="转赠"
                                 android:textColor="#222222"
                                 android:textSize="12sp" />
 
@@ -395,6 +397,9 @@
                         </LinearLayout>
 
 
+
+
+
                     </LinearLayout>
 
 
@@ -409,19 +414,19 @@
                             android:layout_height="wrap_content"
                             android:layout_weight="1"
                             android:gravity="center"
-                            android:onClick="@{v->vm.toSetting()}"
+                            android:onClick="@{v->vm.toCertification()}"
                             android:orientation="vertical">
 
                             <ImageView
                                 android:layout_width="24dp"
                                 android:layout_height="24dp"
-                                android:src="@drawable/ct_my_setting" />
+                                android:src="@drawable/ct_my_renzheng" />
 
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_marginTop="1dp"
-                                android:text="设置"
+                                android:text="实名认证"
                                 android:textColor="#222222"
                                 android:textSize="12sp" />
 
@@ -433,20 +438,19 @@
                             android:layout_height="wrap_content"
                             android:layout_weight="1"
                             android:gravity="center"
-                            android:orientation="vertical"
-                            android:visibility="invisible"
-                            tools:visibility="visible">
+                            android:onClick="@{v->vm.toSetting()}"
+                            android:orientation="vertical">
 
                             <ImageView
                                 android:layout_width="24dp"
                                 android:layout_height="24dp"
-                                android:src="@drawable/ct_my_zeng" />
+                                android:src="@drawable/ct_my_setting" />
 
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_marginTop="1dp"
-                                android:text="转赠"
+                                android:text="设置"
                                 android:textColor="#222222"
                                 android:textSize="12sp" />
 
@@ -458,20 +462,19 @@
                             android:layout_height="wrap_content"
                             android:layout_weight="1"
                             android:gravity="center"
-                            android:orientation="vertical"
-                            android:visibility="invisible"
-                            tools:visibility="visible">
+                            android:onClick="@{v->vm.toSpread()}"
+                            android:orientation="vertical">
 
                             <ImageView
                                 android:layout_width="24dp"
                                 android:layout_height="24dp"
-                                android:src="@drawable/ct_my_store" />
+                                android:src="@drawable/ct_my_tuiguang" />
 
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_marginTop="1dp"
-                                android:text="商城订单"
+                                android:text="推广"
                                 android:textColor="#222222"
                                 android:textSize="12sp" />
 
@@ -479,6 +482,8 @@
                         </LinearLayout>
 
 
+
+
                         <LinearLayout
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"

app/src/main/res/layout/fragment_mall_list.xml

@@ -0,0 +1,38 @@
+<?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">
+
+    <data>
+
+        <variable
+            name="vm"
+            type="com.zswc.creativity.vmodel.MallListVModel" />
+    </data>
+
+    <LinearLayout
+        android:id="@+id/ll"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/color_bg"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
+        android:orientation="vertical">
+
+        <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+            android:id="@+id/refresh_layout"
+            android:layout_width="match_parent"
+            android:layout_marginTop="8dp"
+            android:layout_height="match_parent">
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/recycler_view"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                tools:listitem="@layout/item_mall_list" />
+
+        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+    </LinearLayout>
+
+</layout>

app/src/main/res/layout/fragment_sale_list.xml

@@ -14,7 +14,7 @@
         android:id="@+id/ll"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/color_bg"
+        android:background="@color/white"
         android:focusable="true"
         android:focusableInTouchMode="true"
         android:orientation="vertical">
@@ -22,9 +22,7 @@
         <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
             android:id="@+id/refresh_layout"
             android:layout_width="match_parent"
-            android:paddingEnd="15dp"
             android:paddingStart="15dp"
-            android:layout_marginTop="8dp"
             android:layout_height="match_parent">
 
             <androidx.recyclerview.widget.RecyclerView

app/src/main/res/layout/fragment_shop_goods.xml

@@ -14,7 +14,7 @@
         android:id="@+id/ll"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/color_bg"
+        android:background="@color/white"
         android:focusable="true"
         android:focusableInTouchMode="true"
         android:orientation="vertical">
@@ -22,9 +22,7 @@
         <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
             android:id="@+id/refresh_layout"
             android:layout_width="match_parent"
-            android:paddingEnd="15dp"
             android:paddingStart="15dp"
-            android:layout_marginTop="8dp"
             android:layout_height="match_parent">
 
             <androidx.recyclerview.widget.RecyclerView
@@ -33,7 +31,7 @@
                 android:layout_height="match_parent"
                 app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
                 app:spanCount="2"
-                tools:listitem="@layout/item_sale_list" />
+                tools:listitem="@layout/item_sale_good" />
 
         </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
     </LinearLayout>

app/src/main/res/layout/fragment_shop_list.xml

@@ -42,6 +42,7 @@
                 <TextView
                     android:layout_width="0dp"
                     android:layout_weight="1"
+                    android:onClick="@{v->vm.toIntegral()}"
                     android:layout_height="wrap_content"
                     android:text="3568"
                     android:textColor="@color/text_title"
@@ -50,6 +51,7 @@
 
                   <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
                       android:layout_width="wrap_content"
+                      android:onClick="@{v->vm.toMall()}"
                       android:paddingStart="8dp"
                       android:paddingEnd="8dp"
                       android:paddingTop="3dp"
@@ -66,66 +68,10 @@
 
         </LinearLayout>
 
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="15dp"
-            android:layout_marginTop="12dp"
-            android:layout_marginEnd="15dp"
-            android:gravity="center"
-            android:orientation="horizontal">
-
-            <LinearLayout
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:gravity="center"
-                android:orientation="vertical">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="藏品"
-                    android:textColor="#222222"
-                    android:textSize="18sp" />
-
-                <View
-                    android:layout_width="16dp"
-                    android:layout_height="4dp"
-                    android:background="@drawable/bg_sale_line" />
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:onClick="@{v->vm.toIntegral()}"
-                android:gravity="center"
-                android:orientation="vertical">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="盲盒"
-                    android:textColor="#888888"
-                    android:textSize="18sp" />
-
-                <View
-                    android:layout_width="16dp"
-                    android:layout_height="4dp"
-                    android:background="@drawable/bg_sale_line"
-                    android:visibility="invisible" />
-
-            </LinearLayout>
-        </LinearLayout>
-
-
         <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginTop="11dp"
+            android:layout_marginTop="8dp"
             android:orientation="vertical"
             app:qmui_backgroundColor="@color/white"
             app:qmui_borderColor="@color/translucent"

app/src/main/res/layout/item_address.xml

@@ -0,0 +1,85 @@
+<?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">
+
+    <data>
+
+        <import type="android.view.View" />
+
+        <variable
+            name="item"
+            type="com.zswc.creativity.vmodel.AddressVModel" />
+
+    </data>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="15dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="15dp"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="12dp"
+            android:orientation="horizontal">
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:orientation="vertical">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="北京市昌平区天通苑北街道天通苑北
+一区"
+                    android:textColor="#333333"
+                    android:textSize="17sp" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="4dp"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="章鱼小丸子"
+                        android:textColor="#333333"
+                        android:textSize="12sp" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="5dp"
+                        android:text="18790653414"
+                        android:textColor="#666666"
+                        android:textSize="12sp" />
+
+
+                </LinearLayout>
+
+
+            </LinearLayout>
+
+            <ImageView
+                android:layout_width="12dp"
+                android:layout_height="12dp"
+                android:layout_marginStart="31dp"
+                android:src="@drawable/ct_address_et" />
+
+
+        </LinearLayout>
+
+        <View
+            android:background="#F2F2F2"
+            android:layout_width="match_parent"
+            android:layout_height="1dp" />
+
+    </LinearLayout>
+</layout>

app/src/main/res/layout/item_mall_list.xml

@@ -0,0 +1,134 @@
+<?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">
+
+    <data>
+
+        <import type="android.view.View" />
+
+        <variable
+            name="vm"
+            type="com.zswc.creativity.vmodel.MallListVModel" />
+
+        <variable
+            name="item"
+            type="com.zswc.creativity.model.MyOrderInfo" />
+        <import type="android.text.TextUtils"/>
+
+    </data>
+
+    <LinearLayout
+        android:id="@+id/ll"
+        android:layout_width="match_parent"
+        android:layout_marginStart="15dp"
+        android:layout_marginEnd="15dp"
+        android:orientation="vertical"
+        android:layout_marginBottom="11dp"
+        android:layout_height="wrap_content">
+
+
+        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
+            android:layout_width="match_parent"
+            app:qmui_radius="12dp"
+            app:qmui_backgroundColor="@color/white"
+            app:qmui_borderColor="@color/white"
+            android:paddingEnd="10dp"
+            android:paddingStart="10dp"
+            android:paddingBottom="12dp"
+            android:paddingTop="10dp"
+            android:orientation="vertical"
+            android:layout_height="wrap_content">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:orientation="horizontal"
+                android:gravity="center_vertical"
+                android:layout_height="wrap_content">
+                <TextView
+                    android:text="订单编号：122938832929392"
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:textSize="12sp"
+                    android:textColor="#333333"
+                    android:layout_height="wrap_content"/>
+
+                <TextView
+                    android:text="已付款"
+                    android:textColor="@{vm.toShowColor(item.status)}"
+                    android:textSize="13sp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"/>
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:orientation="horizontal"
+                android:layout_marginTop="10dp"
+                android:layout_height="wrap_content">
+
+
+<!--                  app:url="@{item.activity.images[0]}"-->
+                <com.qmuiteam.qmui.widget.QMUIRadiusImageView
+                    android:layout_width="80dp"
+                    android:layout_height="80dp"
+                    app:url="@{item.pro_info.cover}"
+                    android:src="@drawable/bg_need_error"
+                    app:qmui_border_color="@color/translucent"
+                    app:qmui_corner_radius="8dp" />
+
+                   <LinearLayout
+                      android:layout_width="match_parent"
+                      android:orientation="vertical"
+                      android:layout_marginTop="14dp"
+                      android:layout_marginStart="12dp"
+                      android:layout_height="wrap_content">
+
+                      <TextView
+                          android:textSize="15sp"
+                          android:textColor="@color/text_title"
+                          android:textStyle="bold"
+                          android:text="唐宫手办-神山的苏醒"
+                          android:layout_width="wrap_content"
+                          android:layout_height="wrap_content"/>
+
+                       <TextView
+                           android:textSize="12sp"
+                           android:textColor="#888888"
+                           android:text="价格：2100积分"
+                           android:layout_marginTop="5dp"
+                           android:layout_width="wrap_content"
+                           android:layout_height="wrap_content"/>
+                       <TextView
+                           android:textSize="12sp"
+                           android:textColor="#888888"
+                           android:text="时间：2022-05-28 14:34:23"
+                           android:layout_marginTop="8dp"
+                           android:layout_width="wrap_content"
+                           android:layout_height="wrap_content"/>
+
+
+
+
+                  </LinearLayout>
+
+
+
+            </LinearLayout>
+
+
+
+
+        </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
+
+
+
+
+
+
+
+
+
+    </LinearLayout>
+</layout>

app/src/main/res/layout/item_pop_integral.xml

@@ -0,0 +1,327 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout 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"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center"
+    android:orientation="vertical">
+
+
+    <LinearLayout
+        android:id="@+id/ll"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:orientation="vertical">
+
+    </LinearLayout>
+
+
+    <LinearLayout xmlns:tools="http://schemas.android.com/tools"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@drawable/bg_pop_white"
+            android:orientation="vertical"
+            android:paddingStart="15dp"
+            android:paddingEnd="15dp">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="立即购买"
+                    android:textColor="@color/text_title"
+                    android:textSize="18sp" />
+
+                <ImageView
+                    android:id="@+id/img_close"
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
+                    android:paddingLeft="2dp"
+                    android:src="@drawable/ct_pop_close" />
+
+
+            </LinearLayout>
+
+            <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="10dp"
+                android:layout_marginTop="21dp"
+                android:layout_marginEnd="10dp"
+                app:qmui_backgroundColor="#F3F3F3"
+                app:qmui_borderColor="@null"
+                android:gravity="center_horizontal"
+                android:orientation="vertical"
+                app:qmui_radius="10dp">
+                <TextView
+                    android:textSize="14sp"
+                    android:textColor="#333333"
+                    android:layout_marginTop="10dp"
+                    android:text="支付剩余时间：23小时5分钟"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"/>
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:orientation="horizontal"
+                    android:layout_marginTop="5dp"
+                    android:layout_marginBottom="10dp"
+                    android:layout_height="wrap_content">
+                    <TextView
+                        android:text="¥"
+                        android:textSize="14sp"
+                        android:textColor="#000000"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"/>
+                    <TextView
+                        android:text="79.9"
+                        android:textSize="30sp"
+                        android:textColor="#000000"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"/>
+
+
+                </LinearLayout>
+
+
+
+
+            </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
+
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="24dp"
+                android:orientation="horizontal">
+
+                <com.qmuiteam.qmui.widget.QMUIRadiusImageView
+                    android:id="@+id/img_cover"
+                    android:layout_width="100dp"
+                    android:layout_height="100dp"
+                    android:src="@drawable/bg_need_error"
+                    app:qmui_border_color="@color/translucent"
+                    app:qmui_corner_radius="16dp" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="14dp"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:id="@+id/tv_title"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="元宇宙IP热梗盲盒"
+                        android:textColor="#222222"
+                        android:textSize="16sp"
+                        android:textStyle="bold" />
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="20dp"
+                        android:orientation="horizontal">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="¥"
+                            android:textColor="#000000"
+                            android:textSize="14sp" />
+
+                        <TextView
+                            android:id="@+id/tv_price"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="20.00"
+                            android:textColor="#000000"
+                            android:textSize="20sp" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="X1"
+                            android:layout_marginStart="14dp"
+                            android:textColor="#666666"
+                            android:textSize="13sp" />
+
+
+
+                    </LinearLayout>
+
+
+                </LinearLayout>
+
+
+            </LinearLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/dp_1"
+                android:layout_marginTop="16dp"
+                android:background="#F3F3F3" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="48dp"
+                android:gravity="center_vertical"
+                android:text="选择支付方式"
+                android:textColor="@color/text_title"
+                android:textSize="14sp" />
+
+            <LinearLayout
+                android:id="@+id/ll_alipay"
+                android:layout_width="match_parent"
+                android:layout_height="48dp"
+                android:background="@drawable/bg_pop_pay_off"
+                android:gravity="center"
+                android:orientation="horizontal"
+                android:paddingStart="20dp"
+                android:paddingEnd="21dp"
+                android:visibility="gone"
+                tools:visibility="visible"
+
+                >
+
+                <ImageView
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
+                    android:src="@drawable/ct_tr_alipay" />
+
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="9dp"
+                    android:layout_weight="1"
+                    android:text="支付宝支付"
+                    android:textColor="@color/text_title"
+                    android:textSize="14sp" />
+
+                <ImageView
+                    android:id="@+id/img_alipay"
+                    android:layout_width="16dp"
+                    android:layout_height="16dp"
+                    android:src="@drawable/ct_tr_chose_off" />
+
+
+            </LinearLayout>
+
+
+            <LinearLayout
+                android:id="@+id/ll_wx"
+                android:layout_width="match_parent"
+                android:layout_height="48dp"
+                android:layout_marginTop="20dp"
+                android:background="@drawable/bg_pop_pay_off"
+                android:gravity="center"
+                android:orientation="horizontal"
+                android:paddingStart="20dp"
+                android:paddingEnd="21dp"
+                android:visibility="gone"
+                tools:visibility="visible">
+
+                <ImageView
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
+                    android:src="@drawable/ct_tr_wx" />
+
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="9dp"
+                    android:layout_weight="1"
+                    android:text="微信支付"
+                    android:textColor="@color/text_title"
+                    android:textSize="14sp" />
+
+                <ImageView
+                    android:id="@+id/img_wx"
+                    android:layout_width="16dp"
+                    android:layout_height="16dp"
+                    android:src="@drawable/ct_tr_chose_off" />
+
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/ll_wallet"
+                android:layout_width="match_parent"
+                android:layout_height="48dp"
+                android:layout_marginTop="20dp"
+                android:background="@drawable/bg_pop_pay_on"
+                android:gravity="center"
+                android:orientation="horizontal"
+                android:paddingStart="20dp"
+                android:paddingEnd="21dp">
+
+                <ImageView
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
+                    android:src="@drawable/ct_wallet" />
+
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="9dp"
+                    android:layout_weight="1"
+                    android:text="我的钱包"
+                    android:textColor="@color/text_title"
+                    android:textSize="14sp" />
+
+                <ImageView
+                    android:id="@+id/img_wallet"
+                    android:layout_width="16dp"
+                    android:layout_height="16dp"
+                    android:src="@drawable/ct_tr_chose_on" />
+
+
+            </LinearLayout>
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="14dp"
+                android:text="支付说明"
+                android:textColor="#999999"
+                android:textSize="10sp" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/pay_tips"
+                android:textColor="#999999"
+                android:textSize="10sp" />
+
+            <TextView
+                android:id="@+id/tv_pay"
+                android:layout_width="match_parent"
+                android:layout_height="46dp"
+                android:layout_marginTop="32dp"
+                android:layout_marginBottom="39dp"
+                android:background="@drawable/bg_logo_but"
+                android:gravity="center"
+                android:text="立即支付"
+                android:textColor="@color/white"
+                android:textSize="20sp" />
+
+        </LinearLayout>
+
+
+    </LinearLayout>
+
+</LinearLayout>

app/src/main/res/layout/item_sale_good.xml

@@ -22,18 +22,21 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginEnd="15dp"
+        android:layout_marginBottom="12dp"
         android:orientation="vertical">
 
 
-        <com.qmuiteam.qmui.layout.QMUILinearLayout
+        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
             android:id="@+id/ll_center"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@color/white"
             android:orientation="vertical"
-            app:qmui_radius="12dp"
-            app:qmui_shadowAlpha="0.56"
-            app:qmui_shadowElevation="7dp">
+            app:qmui_borderColor="@null"
+            app:qmui_backgroundColor="@color/white"
+            app:qmui_radius="16dp"
+            >
 
             <com.qmuiteam.qmui.widget.QMUIRadiusImageView
                 android:layout_width="match_parent"
@@ -80,8 +83,7 @@
 
 
 
-        </com.qmuiteam.qmui.layout.QMUILinearLayout>
-
+</com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
 
     </LinearLayout>
 </layout>

app/src/main/res/layout/item_sale_list.xml

@@ -20,20 +20,24 @@
     </data>
 
     <LinearLayout
+        android:id="@+id/ll"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginEnd="15dp"
+        android:layout_marginBottom="@dimen/dp_10"
         android:orientation="vertical">
 
 
-        <com.qmuiteam.qmui.layout.QMUILinearLayout
+        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
             android:id="@+id/ll_center"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@color/white"
             android:orientation="vertical"
-            app:qmui_radius="12dp"
-            app:qmui_shadowAlpha="0.56"
-            app:qmui_shadowElevation="7dp">
+            app:qmui_borderColor="@null"
+            app:qmui_backgroundColor="@color/white"
+            app:qmui_radius="16dp"
+           >
 
             <com.qmuiteam.qmui.widget.QMUIRadiusImageView
                 android:layout_width="match_parent"
@@ -79,6 +83,7 @@
                 android:orientation="horizontal"
                 android:layout_marginStart="10dp"
                 android:layout_marginEnd="20dp"
+                android:layout_marginBottom="14dp"
                 android:layout_marginTop="7dp"
                 app:qmui_radius="4dp"
                 app:qmui_borderColor="@color/translucent"
@@ -106,7 +111,7 @@
 
 
 
-        </com.qmuiteam.qmui.layout.QMUILinearLayout>
+        </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
 
 
     </LinearLayout>