1.积分藏品。

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

@@ -46,6 +46,15 @@ class TibOrderActivity : MBActivity<TibOrderVModel, ActivityTibOrderBinding>() {
 
         vm.bean.observe(this){
 
+
+            if(it.payType=="jf"){
+                binding.tvMoney.text="积分"+it.price
+                binding.tvZMoney.text="积分"+it.payPrice
+            }else{
+                binding.tvMoney.text="￥"+it.price
+                binding.tvZMoney.text="￥"+it.payPrice
+            }
+
             if (!TextUtils.isEmpty(it.cover)) {
                 var ss = it.cover!!.substring(it.cover.length - 3, it.cover.length)
                 if (ss == "gif" || ss == "GIF") {

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

@@ -63,6 +63,8 @@ class TibetanDetailsActivity : MBActivity<TibetanDetailsVModel, ActivityTibetanD
 
         vm.ll = binding.ll
         vm.id = intent?.extras?.getString("id")
+
+         vm.type=intent?.extras?.getString("type")
         vm.getInfoTo()
 
         vm.data.observe(this) {
@@ -281,8 +283,14 @@ class TibetanDetailsActivity : MBActivity<TibetanDetailsVModel, ActivityTibetanD
 //                toast("请先开通钱包功能")
 //                return@onClick
 //            }
-            vm.toBuy(binding.butBuy)
+            if(vm.type=="1") {
+                vm.toBuy(binding.butBuy)
 //            }
+            }else{
+                //积分藏品
+                vm.toInterBuy(binding.butBuy)
+            }
+
         }
         binding.imgShare.onClick {
             //分享
@@ -413,6 +421,13 @@ class TibetanDetailsActivity : MBActivity<TibetanDetailsVModel, ActivityTibetanD
 
         }
 
+        if(bean.choseType==5){//积分支付
+
+            vm.toInterBuy(bean.num,"jf")
+
+
+        }
+
 
 //        lifecycleScope.launch {
 //

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

@@ -0,0 +1,142 @@
+package com.zswc.creativity.adapter
+
+import android.graphics.Color
+import android.os.CountDownTimer
+import android.util.Log
+import android.view.View
+import com.chad.library.adapter.base.viewholder.BaseDataBindingHolder
+import com.ysnows.base.base.BAdapter
+import com.zswc.creativity.R
+import com.zswc.creativity.databinding.ItemCollectionBinding
+import com.zswc.creativity.databinding.ItemRecommedBinding
+import com.zswc.creativity.model.CollectionList
+import com.zswc.creativity.utils.TimeUtils
+import com.zswc.creativity.utils.glide.GlideUtils
+import com.zswc.creativity.vmodel.CollectionVModel
+import com.zswc.creativity.vmodel.RecommendVModel
+import java.text.DecimalFormat
+import java.text.SimpleDateFormat
+import java.util.*
+
+
+class CollectionAdapter(val vm: CollectionVModel) : BAdapter<CollectionList,
+        BaseDataBindingHolder<ItemCollectionBinding>>(R.layout.item_collection) {
+
+
+    //state 1:进行中2：即将开售3：已售罄）
+    override fun convert(holder: BaseDataBindingHolder<ItemCollectionBinding>, item: CollectionList) {
+        holder.dataBinding?.vm = vm
+        holder.dataBinding?.item = item
+
+        GlideUtils.lImg(context, item.cover, holder.dataBinding?.imgBg!!)
+
+        if (item.soldOut == 0) {
+            holder.dataBinding?.llOne?.visibility=View.GONE
+            holder.dataBinding?.llTwo?.visibility=View.GONE
+            holder.dataBinding?.llThree?.visibility=View.VISIBLE
+
+        } else {
+            when (item.state) {
+                1 -> {
+                    holder.dataBinding?.llOne?.visibility=View.VISIBLE
+                    holder.dataBinding?.llTwo?.visibility=View.GONE
+                    holder.dataBinding?.llThree?.visibility=View.GONE
+
+                }
+                2 -> {
+
+                    holder.dataBinding?.llOne?.visibility=View.GONE
+                    holder.dataBinding?.llTwo?.visibility=View.VISIBLE
+                    holder.dataBinding?.llThree?.visibility=View.GONE
+                    //设置倒计时-毫秒
+                    holder.dataBinding?.tvState?.text=""
+                    var sumSecond = getTimeTo(TimeUtils.getTime(), item.sellTime)
+
+                    //创建一个时长30秒的倒计时器,倒计时间隔1秒,参数1为计时总时长,参数2为计时间隔
+                    val countDownTimer = object : CountDownTimer(sumSecond, 1000) {
+                        //方法会在1秒后回调,参数millisUntilFinished表示剩余时间的毫秒值
+                        override fun onTick(millisUntilFinished: Long) {
+
+                            val remainderTime = millisUntilFinished / 1000 - 1
+                            holder.dataBinding?.tvState?.text = "即将开售 " + formatTime(remainderTime.toInt())
+//                            Log.e("-shy-", "onTick: =" + remainderTime)
+
+                            if (remainderTime.toInt() == 0) {
+                                onFinish()
+                                cancel()
+                                item.state = 1//改变状态
+                                notifyItemChanged(holder.adapterPosition)
+
+                            }
+                        }
+
+                        //计时器结束时执行的方法
+                        override fun onFinish() {
+
+                        }
+                    }
+
+                    countDownTimer.start()
+                    //调用cancel方法取消计时器结束计时
+                    //  countDownTimer.cancel()
+                    //  holder.dataBinding?.tvState?.text = "即将开售 " + item.sellTime
+
+                }
+                3 -> {
+                    holder.dataBinding?.llOne?.visibility=View.GONE
+                    holder.dataBinding?.llTwo?.visibility=View.GONE
+                    holder.dataBinding?.llThree?.visibility=View.VISIBLE
+
+                }
+                else -> {
+                    holder.dataBinding?.llOne?.visibility=View.GONE
+                    holder.dataBinding?.llTwo?.visibility=View.GONE
+                    holder.dataBinding?.llThree?.visibility=View.VISIBLE
+
+                }
+
+            }
+
+        }
+
+    }
+
+
+    /**
+     * 将秒转化为 HH:mm:io.agora.rtc.ss 的格式
+     *
+     * @param time 秒
+     * @return
+     */
+    var decimalFormat: DecimalFormat? = null
+
+    private fun formatTime(time: Int): String? {
+        if (decimalFormat == null) {
+            decimalFormat = DecimalFormat("00")
+        }
+        val hh: String = decimalFormat!!.format(time / 3600)
+        val mm: String = decimalFormat!!.format(time % 3600 / 60)
+        val ss: String = decimalFormat!!.format(time % 60)
+        // return "$hh:$mm:$io.agora.rtc.ss"
+        return "$hh:$mm:$ss"
+    }
+
+
+    //计算两个时间相差的秒数
+    fun getTime(startTime: String?, endTime: String?): Long {
+        val df = SimpleDateFormat("yyyy-MM-dd HH:mm:ss")
+        val eTime: Long = df.parse(endTime).time
+        val sTime: Long = df.parse(startTime).time
+        return (eTime - sTime) / 1000
+    }
+
+    //计算两个时间相差的毫秒数
+    fun getTimeTo(startTime: String?, endTime: String?): Long {
+        val df = SimpleDateFormat("yyyy-MM-dd HH:mm:ss")
+        val eTime: Long = df.parse(endTime).time
+        val sTime: Long = df.parse(startTime).time
+        return (eTime - sTime)
+    }
+
+
+}

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

@@ -26,6 +26,16 @@ class OrderListFragmentAdapter(val vm: OrderListFragmentVModel) : BAdapter<MyOrd
             holder.dataBinding?.llOrder?.visibility=View.GONE
 
         }
+        if(item.payType=="jf"){
+            holder.dataBinding?.tvTipsOne?.visibility=View.GONE
+            holder.dataBinding?.tvZMoney?.text=item.payPrice+"积分"
+            holder.dataBinding?.tvTipsTwo?.visibility=View.VISIBLE
+        }else{
+            holder.dataBinding?.tvTipsOne?.visibility=View.VISIBLE
+            holder.dataBinding?.tvZMoney?.text="￥"+item.payPrice
+            holder.dataBinding?.tvTipsTwo?.visibility=View.GONE
+
+        }
 
         //图片
         if (!TextUtils.isEmpty(item.proInfoObj.cover)) {

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

@@ -10,6 +10,7 @@ object  Config : IConfig {
 //        return "http://39.104.166.197:8080/api/" //正式
          return "http://120.79.86.50:8080/api/" //测试
 
+
 //        return "http://d06u7pg536nk.ngrok.xiaomiqiu123.top/api/"
 
     }

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

@@ -73,6 +73,8 @@ object ConfigRx {
 
     const val REFRESH_SHOP_INTER = "REFRESH_SHOP_INTER"//购买得积分
 
+    const val REFRESH_STORE_INTER = "REFRESH_STORE_INTER"
+
 
     const val ADDRESS_DELETE = "ADDRESS_DELETE"//地址删除
 

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

@@ -0,0 +1,182 @@
+package com.zswc.creativity.fragment
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import coil.Coil
+import coil.ImageLoader
+import coil.request.CachePolicy
+import coil.util.CoilUtils
+import com.hwangjr.rxbus.RxBus
+import com.hwangjr.rxbus.annotation.Subscribe
+import com.hwangjr.rxbus.annotation.Tag
+import com.ysnows.base.utils.B
+import com.ysnows.base.utils.UiSwitch
+import com.zswc.creativity.App
+import com.zswc.creativity.activity.TibetanDetailsActivity
+import com.zswc.creativity.adapter.CollectionAdapter
+import com.zswc.creativity.adapter.RecommedAdapter
+import com.zswc.creativity.base.MBFragment
+import com.zswc.creativity.config.ConfigRx
+import com.zswc.creativity.databinding.FragmentCollectionBinding
+import com.zswc.creativity.databinding.FragmentRecommendBinding
+import com.zswc.creativity.model.CollectionList
+import com.zswc.creativity.vmodel.CollectionVModel
+import com.zswc.creativity.vmodel.RecommendVModel
+
+
+/**
+ * 积分藏品
+ *Created by shihuiyun
+ *on 2020/9/11
+ */
+class CollectionFragment : MBFragment<CollectionVModel, FragmentCollectionBinding>() {
+
+
+    var  page:Int=1
+    var listTo=ArrayList<CollectionList>()//未加载到界面的剩余的数据
+    var listTwo=ArrayList<CollectionList>()
+    var adapter:CollectionAdapter? = null
+    override fun init(savedInstanceState: Bundle?) {
+        super.init(savedInstanceState)
+        //禁止下拉刷新和下拉加载
+        binding.recyclerRecommend.overScrollMode = View.OVER_SCROLL_NEVER
+//        val linearLayoutManager = LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false)
+//        binding.recyclerRecommend.layoutManager = linearLayoutManager
+
+         adapter = CollectionAdapter(vm)
+        binding.recyclerRecommend.adapter = adapter
+
+        vm.toGetCollectionList()
+
+        vm.list.observe(this, androidx.lifecycle.Observer {
+            if (null == it) {
+                return@Observer
+            }
+//            if(it.size>10){
+//                var list=ArrayList<CollectionList>()
+//               var i=0
+//                for(item in it){
+//                   if(i<10){
+//                       list.add(item)
+//                   }else{
+//                       listTo.add(item)
+//                   }
+//                    i++
+//                }
+//                setAdapter(list)
+//                return@Observer
+//            }
+
+           setAdapter(it)
+
+        })
+
+
+    }
+
+
+
+    override fun listeners() {
+        super.listeners()
+
+//        binding.recyclerRecommend.addOnScrollListener(object : RecyclerView.OnScrollListener() {
+//            override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
+//                super.onScrolled(recyclerView, dx, dy)
+//                val topRowVerticalPosition =
+//                        if (recyclerView == null || recyclerView.childCount === 0)
+//                            0 else recyclerView.getChildAt(0).top
+//                // 大于0表示正在向上滑动，小于等于0表示停止或向下滑动
+//
+//                var flag= topRowVerticalPosition >= 0
+//                //发送消息
+//                RxBus.get().post(ConfigRx.STOP_REFRSH, flag)
+//
+//            }
+//        })
+
+
+
+//        binding.recyclerRecommend.addOnScrollListener(object : RecyclerView.OnScrollListener() {
+//            override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) {
+//                super.onScrollStateChanged(recyclerView, newState)
+//            }
+//
+//            override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
+//                super.onScrolled(recyclerView, dx, dy)
+//                if (isSlideToBottom(recyclerView)) {
+//                  if(page*10<vm.list.value!!.size ){
+//                      //说明还有数据
+//                      var i=0
+//                      var list=ArrayList<CollectionList>()
+//
+//                      for(item in listTo){
+//                          if(i<10){
+//                              list.add(item)
+//                          }else{
+//                              listTwo.add(item)
+//                          }
+//                      }
+//
+//                      listTo.clear()
+//                      listTo.addAll(listTwo)
+//                      listTwo.clear()
+//                      //设置adapter
+//                      adapter?.addData(list)
+//
+//                      page++
+//                  }
+//                }
+//            }
+//        })
+
+    }
+
+    private fun isSlideToBottom(recyclerView: RecyclerView?): Boolean {
+        if (recyclerView == null) return false
+        return recyclerView.computeVerticalScrollExtent() + recyclerView.computeVerticalScrollOffset() >= recyclerView.computeVerticalScrollRange()
+    }
+
+    fun setAdapter(list: List<CollectionList>) {
+
+        adapter?.clearList()
+        adapter?.addData(list)
+        adapter?.setOnItemClickListener { adapter, view, position ->
+
+            var item=adapter.getItem(position) as CollectionList
+
+            UiSwitch.bundle(context, TibetanDetailsActivity::class.java,
+                    B().putString("id", item.id)
+                        .putString("type","2")
+                            .ok())
+          //  adapter.notifyItemChanged(position)
+        }
+
+
+    }
+
+
+    override val isRxbus: Boolean
+        get() = true
+
+    override fun vmClass(): Class<CollectionVModel> {
+        return CollectionVModel::class.java
+    }
+
+    override fun binding(inflater: LayoutInflater, container: ViewGroup?): FragmentCollectionBinding {
+        return FragmentCollectionBinding.inflate(layoutInflater)
+    }
+
+    override fun title(): String? {
+        return null
+    }
+
+    @Subscribe(tags = [Tag(ConfigRx.REFRESH_STORE_INTER)])
+    fun setRefreshList(type: String) {
+
+        vm.toGetCollectionListTo()
+
+    }
+}

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

@@ -90,10 +90,12 @@ class HomeFirstFragment : MBFragment<HomeFirstVModel, FragmentHomeFirstBinding>(
 
     private fun initFragments() {
         val oneFragment = RecommendFragment()
+        val threeFragment = CollectionFragment()
         val twoFragment = MyCalendarFragment()
 
         fragments = arrayOf(
             oneFragment,
+            threeFragment,
             twoFragment
         )
     }
@@ -127,12 +129,23 @@ class HomeFirstFragment : MBFragment<HomeFirstVModel, FragmentHomeFirstBinding>(
         binding.tvMyChose.setOnClickListener(View.OnClickListener { view: View? ->
             switchContent(0)
             binding.tvMyChose.setTextColor(Color.parseColor("#222222"))
+            binding.tvMyCollection.setTextColor(Color.parseColor("#888888"))
             binding.tvMyAppointment.setTextColor(Color.parseColor("#888888"))
 
+
         })
-        binding.tvMyAppointment.setOnClickListener(View.OnClickListener { view: View? ->
+        binding.tvMyCollection.setOnClickListener(View.OnClickListener { view: View? ->
             switchContent(1)
             binding.tvMyChose.setTextColor(Color.parseColor("#888888"))
+            binding.tvMyCollection.setTextColor(Color.parseColor("#222222"))
+            binding.tvMyAppointment.setTextColor(Color.parseColor("#888888"))
+        })
+
+
+        binding.tvMyAppointment.setOnClickListener(View.OnClickListener { view: View? ->
+            switchContent(2)
+            binding.tvMyChose.setTextColor(Color.parseColor("#888888"))
+            binding.tvMyCollection.setTextColor(Color.parseColor("#888888"))
             binding.tvMyAppointment.setTextColor(Color.parseColor("#222222"))
         })
 

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

@@ -146,6 +146,7 @@ class RecommendFragment : MBFragment<RecommendVModel, FragmentRecommendBinding>(
 
             UiSwitch.bundle(context, TibetanDetailsActivity::class.java,
                     B().putString("id", item.id)
+                        .putString("type","1")
                             .ok())
           //  adapter.notifyItemChanged(position)
         }

app/src/main/java/com/zswc/creativity/model/bean/PayTypeBen.kt

@@ -3,7 +3,7 @@ package com.zswc.creativity.model.bean
 /**
  *Created by shihuiyun
  *on 2020/9/9
- * //1支付宝 2微信  //默认支付宝  3钱包
+ * //1支付宝 2微信 3钱包 //默认钱包 4快捷银行卡支付  5积分支付
  * num:数量
  */
 open class PayTypeBen (var choseType: Int, var num: String,var second_password:String? )

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

@@ -0,0 +1,249 @@
+package com.zswc.creativity.utils
+
+import android.content.Context
+import android.os.CountDownTimer
+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 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.QMUIFullScreenPopup
+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.model.bean.PayTypeBen
+import com.zswc.creativity.utils.glide.GlideUtils
+import java.lang.Exception
+
+
+/***
+ *on 2020/9/21
+ */
+object PopuInterBuyUtils {
+
+
+       var mNormalPopup1: QMUIFullScreenPopup? =null
+    fun show(
+        context: Context,
+        cover: String?,
+        name: String?,
+        price: String?,
+        buy_count: Int?,
+        view: View
+    ) {
+
+        mNormalPopup1 = 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_inter_buy, null)
+
+
+        val ll: LinearLayout = layout.findViewById(R.id.ll)
+        val butCancel: ImageView = layout.findViewById(R.id.img_close)
+        val imgCover: ImageView = layout.findViewById(R.id.img_cover)
+        val imgCoverGif: ImageView = layout.findViewById(R.id.img_cover_gif)
+        val tvTitle: TextView = layout.findViewById(R.id.tv_title)
+        val tvPrice: TextView = layout.findViewById(R.id.tv_price)
+        val llOne: LinearLayout = layout.findViewById(R.id.ll_one)
+        val llTwo: LinearLayout = layout.findViewById(R.id.ll_two)
+        val et: EditText = layout.findViewById(R.id.et)
+        val tvReduce: TextView = layout.findViewById(R.id.tv_reduce)
+        val tvAdd: TextView = layout.findViewById(R.id.tv_add)
+        val llWallet: LinearLayout = layout.findViewById(R.id.ll_wallet)
+        val imgWallet: ImageView = layout.findViewById(R.id.img_wallet)
+        val tvPay: TextView = layout.findViewById(R.id.tv_pay)
+
+        try {
+
+            if (buy_count!! > 1) {
+                llOne.visibility = View.GONE
+                llTwo.visibility = View.VISIBLE
+            } else {
+                llOne.visibility = View.VISIBLE
+                llTwo.visibility = View.GONE
+            }
+
+        } catch (e: Exception) {
+            llOne.visibility = View.VISIBLE
+            llTwo.visibility = View.GONE
+        }
+
+
+
+        if (!TextUtils.isEmpty(cover)) {
+            var ss = cover!!.substring(cover.length - 3, cover.length)
+            if (ss == "gif" || ss == "GIF") {
+                GlideUtils.lImg(context, cover, imgCoverGif)
+                imgCoverGif.visibility = View.VISIBLE
+                imgCover.visibility = View.GONE
+
+            } else {
+                GlideUtils.lImg(context, cover, 150, 150, imgCover!!)
+                imgCoverGif?.visibility = View.GONE
+                imgCover?.visibility = View.VISIBLE
+
+            }
+        } else {
+            imgCoverGif?.visibility = View.GONE
+            imgCover?.visibility = View.VISIBLE
+        }
+
+        tvTitle.text = name
+        tvPrice.text = price
+
+        //设置变量
+        var all_nums: String = "1"
+        var oldnums: String? = null//保存的数量,防止同样的执行多次
+
+
+
+        tvReduce.onClick {
+
+            var s = et.text.toString().trim()
+            if (TextUtils.isEmpty(s)) {
+                et.setText("1")
+                all_nums = "1"
+            } else {
+                var i = s.toInt()
+                i = if (i > 1) {
+                    i - 1
+                } else {
+                    1
+                }
+                et.setText("" + i)
+                all_nums = "" + i
+            }
+
+        }
+        tvAdd.onClick {
+
+            val s: String = et.getText().toString()
+            if (TextUtils.isEmpty(s)) {
+                et.setText("1")
+                all_nums = "1"
+            } else {
+                var i = s.toInt()
+                i += 1
+                et.setText("" + i)
+                all_nums = "" + i
+            }
+
+        }
+
+        et.addTextChangedListener(object : TextWatcher {
+            override fun beforeTextChanged(charSequence: CharSequence, i: Int, i1: Int, i2: Int) {}
+            override fun onTextChanged(charSequence: CharSequence, i: Int, i1: Int, i2: Int) {}
+            override fun afterTextChanged(editable: Editable) {
+
+                val number = editable.toString()
+                if (!TextUtils.isEmpty(number)) {
+                    all_nums = number
+                } else {
+                    all_nums = "0"
+                }
+                if (oldnums != null && oldnums.equals(all_nums)) {
+                    return
+                }
+                oldnums = all_nums
+
+            }
+        })
+
+        et.onFocusChangeListener = OnFocusChangeListener { view, b ->
+            if (!b) {
+                val number: String = et.text.toString().trim()
+                if (!TextUtils.isEmpty(number)) {
+                    all_nums = number
+                } else {
+                    all_nums = "0"
+                }
+            }
+        }
+
+        var choseType = 5//1支付宝 2微信 3钱包 //默认钱包 4快捷银行卡支付  5积分支付
+
+        // mNormalPopup.dismiss()
+
+        llWallet.onClick {
+            choseType = 5
+
+            llWallet.setBackgroundResource(R.drawable.bg_pop_pay_on)
+            imgWallet.setImageResource(R.drawable.ct_tr_chose_on)
+
+
+        }
+
+
+
+        tvPay.onClick {
+            //去支付
+
+            if (choseType == 5) {//积分支付
+
+
+                var payTypeBen = PayTypeBen(choseType, all_nums, "")
+
+                RxBus.get().post(ConfigRx.CHOSE_PAY_TYPE, payTypeBen)
+
+
+                return@onClick
+            }
+
+            // RxBus.get().post(ConfigRx.CHOSE_PAY_TYPE, choseType.toString())
+        }
+
+        butCancel.onClick {
+
+            mNormalPopup1?.dismiss()
+        }
+        ll.onClick {
+
+            mNormalPopup1?.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)
+
+
+        mNormalPopup1?.addView(frameLayout)
+        mNormalPopup1?.onDismiss() {
+        }
+
+        mNormalPopup1?.dismissIfOutsideTouch(false)
+        mNormalPopup1?.animStyle(QMUIPopup.ANIM_GROW_FROM_CENTER)
+        mNormalPopup1?.show(view)
+
+
+    }
+
+    fun detDismiss(){
+        if(null!=mNormalPopup1){
+            mNormalPopup1?.dismiss()
+        }
+    }
+
+
+
+
+
+}

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

@@ -32,11 +32,14 @@ object PopuPaySuesstils {
         var layout = layoutInflater.inflate(R.layout.popu_suess_pay, null)
 
         val tvMoney: TextView = layout.findViewById(R.id.tv_money)
+        val tvMoneyTips: TextView = layout.findViewById(R.id.tv_money_tips)
+
         val tvNumber: TextView = layout.findViewById(R.id.tv_number)
         val tvTime: TextView = layout.findViewById(R.id.tv_time)
         val tvPay: TextView = layout.findViewById(R.id.tv_pay)
         val tvSure: TextView = layout.findViewById(R.id.tv_sure)
 
+
         tvMoney.text = bean.payPrice
         tvNumber.text = "订单编号：" + bean.orderNo
         tvTime.text = "下单时间：" + bean.createAt
@@ -47,6 +50,11 @@ object PopuPaySuesstils {
         if (bean.payType == "qb") {
             tvPay.text = "支付方式：钱包支付"
         }
+        if (bean.payType == "jf") {
+            tvMoney.text = bean.payPrice+"积分"
+            tvMoneyTips.visibility=View.GONE
+            tvPay.text = "支付方式：积分支付"
+        }
 
         tvSure.onClick {
 

app/src/main/java/com/zswc/creativity/utils/net/ApiService.kt

@@ -73,6 +73,22 @@ interface ApiService {
     suspend fun getCollectionList(): Resp<List<CollectionList>>
 
     /**
+     *首页积分兑换藏品列表
+     * @return
+     */
+    @POST("Index/indexCollectionJFDHList")
+    suspend fun getInterList(): Resp<List<CollectionList>>
+
+
+
+    /**
+     *首页积分-积分兑换 (购买)
+     * @return
+     */
+    @POST("Order/createOrderJFDH")
+    suspend fun createOrderJFDH(@Body body: JSONObject?): Resp<String>
+
+    /**
      * 购买的藏品详情
      * @return
      */

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

@@ -0,0 +1,65 @@
+package com.zswc.creativity.vmodel
+
+import android.app.Application
+import android.graphics.Color
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.viewModelScope
+import com.zswc.creativity.model.CollectionList
+import com.zswc.creativity.utils.net.NetEngine
+import com.ysnows.base.base.BRepository
+import com.ysnows.base.base.BViewModel
+import com.zswc.creativity.R
+import kotlinx.coroutines.launch
+
+/**
+ *Created by shihuiyun
+ *on 2020/9/23
+ */
+open class CollectionVModel(application: Application) : BViewModel<BRepository>(application) {
+
+    var list = MutableLiveData<List<CollectionList>>()//总数据
+
+
+    fun toGetCollectionList() {
+
+        viewModelScope.launch {
+            var it = repository().preq { NetEngine.service.getInterList() }
+            if(it.ok()){
+               list.value=it.result
+            }
+        }
+    }
+
+
+    fun toGetCollectionListTo() {
+
+        viewModelScope.launch {
+            var it = repository().lreq { NetEngine.service.getInterList() }
+            if(it.ok()){
+                list.value=it.result
+            }
+        }
+    }
+
+
+    fun toShowTips(state:Int?,sellTime:String?):String{
+        when(state){
+            1->{
+               return "热卖中"
+            }
+            2->{
+                sellTime
+            }
+            3->{
+               return "已售罄"
+            }
+        }
+
+        return ""
+    }
+
+
+
+
+
+}

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

@@ -27,9 +27,16 @@ class GiftOrderVModel(application: Application) : BViewModel<BRepository>(applic
 
     fun setShowTips(pay_type:String?):String{
 
-        if(pay_type == "qb"){
+
+        if(pay_type == "ye"){
             return "余额支付"
         }
+        if(pay_type == "qb"){
+            return "钱包支付"
+        }
+        if(pay_type=="qbkj"){
+            return "银行卡支付"
+        }
         return ""
     }
 

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

@@ -70,6 +70,12 @@ class TibOrderVModel(application: Application) : BViewModel<BRepository>(applica
         if(pay_type == "qb"){
             return "钱包支付"
         }
+        if(pay_type=="qbkj"){
+            return "银行卡支付"
+        }
+        if(pay_type=="jf"){
+            return "积分支付"
+        }
         return ""
     }
 

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

@@ -46,6 +46,9 @@ class TibetanDetailsVModel(application: Application) : BViewModel<BRepository>(a
 
     var isRemind = MutableLiveData<Boolean>()
 
+    //藏品类型
+    var type:String?=null //1 是正常藏品 2是积分藏品
+
     fun isShowEnd(state:Int?,soldOut:Int?):Int{
 
         if(soldOut==0){
@@ -140,6 +143,16 @@ class TibetanDetailsVModel(application: Application) : BViewModel<BRepository>(a
         popuBuyUtils?.show(repository().context!!, data.value?.cover, data.value?.name, data.value?.price, data.value?.buyCount, view)
     }
 
+
+
+
+    var popuInterBuyUtils: PopuInterBuyUtils? = null
+    fun toInterBuy(view: View) {//支付弹框
+        popuInterBuyUtils = PopuInterBuyUtils
+        popuInterBuyUtils?.show(repository().context!!, data.value?.cover, data.value?.name, data.value?.price, data.value?.buyCount, view)
+    }
+
+
     fun getUrl() {
 
 
@@ -227,6 +240,31 @@ class TibetanDetailsVModel(application: Application) : BViewModel<BRepository>(a
         }
     }
 
+    fun toInterBuy(num: String,pay_type: String ){
+
+        var param = JSONObject()
+        param["id"] = data.value?.id
+        param["num"] = num
+        param["pay_type"] =pay_type
+
+
+        viewModelScope.launch {
+            var it=repository().lreq { NetEngine.service.createOrderJFDH(param) }
+            if (it.ok(true)) {
+                popuInterBuyUtils?.detDismiss()
+
+                RxBus.get().post(ConfigRx.REFRESH_STORE_INTER, "")
+
+                getMyOrder(it.result)
+
+
+
+            }
+
+        }
+
+    }
+
     fun getMyOrder(order_no:String?){
 
         var param=JSONObject()

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

@@ -159,9 +159,9 @@
                         android:orientation="horizontal">
 
                         <TextView
+                            android:id="@+id/tv_money"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="@{`￥`+vm.bean.price}"
                             android:textColor="#888888"
                             android:textSize="16sp" />
 
@@ -196,11 +196,11 @@
                     android:textSize="13sp" />
 
                 <TextView
+                    android:id="@+id/tv_z_money"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:gravity="right"
-                    android:text="@{`￥`+vm.bean.payPrice}"
                     android:textColor="@color/login_on"
                     android:textSize="16sp" />
 

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

@@ -0,0 +1,27 @@
+<?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.CollectionVModel" />
+
+    </data >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:orientation="horizontal" >
+
+        <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_collection" />
+
+    </LinearLayout >
+</layout >

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

@@ -124,6 +124,17 @@
                                 android:textSize="18sp"
                                 android:textStyle="bold" />
 
+
+                            <TextView
+                                android:id="@+id/tv_my_collection"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginStart="54dp"
+                                android:text="积分藏品"
+                                android:textColor="#888888"
+                                android:textSize="18sp"
+                                android:textStyle="bold" />
+
                             <TextView
                                 android:id="@+id/tv_my_appointment"
                                 android:layout_width="wrap_content"

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

@@ -0,0 +1,266 @@
+<?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.model.CollectionList" />
+
+        <variable
+            name="vm"
+            type="com.zswc.creativity.vmodel.CollectionVModel" />
+
+    </data>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <com.qmuiteam.qmui.layout.QMUILinearLayout
+            android:id="@+id/ll_center"
+            android:layout_width="match_parent"
+            android:layout_height="345dp"
+            android:background="@color/white"
+            android:orientation="horizontal"
+            app:qmui_radius="12dp"
+            app:qmui_shadowAlpha="0.56"
+            app:qmui_shadowElevation="7dp">
+
+            <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+                <!--       app:url="@{item.cover}"-->
+
+
+                <androidx.appcompat.widget.AppCompatImageView
+                    android:id="@+id/img_bg"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:scaleType="centerCrop"
+                    android:adjustViewBounds="true"
+                    android:src="@drawable/bg_need_error"
+                    />
+
+<!--                <com.qmuiteam.qmui.widget.QMUIRadiusImageView-->
+<!--                    android:id="@+id/img_bg"-->
+<!--                    android:layout_width="match_parent"-->
+<!--                    android:layout_height="match_parent"-->
+<!--                    android:scaleType="centerCrop"-->
+<!--                    android:src="@drawable/bg_need_error"-->
+<!--                    app:qmui_border_color="@color/translucent"-->
+<!--                    app:qmui_corner_radius="20dp"-->
+<!--                    app:url="@{item.cover}"-->
+<!--                    />-->
+
+
+                <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="bottom"
+                    android:layout_marginStart="10dp"
+                    android:layout_marginEnd="10dp"
+                    android:layout_marginBottom="10dp"
+                    android:orientation="vertical"
+                    android:paddingStart="10dp"
+                    android:paddingTop="12dp"
+                    android:paddingEnd="10dp"
+                    android:paddingBottom="10dp"
+                    app:qmui_backgroundColor="#66000000"
+                    app:qmui_borderColor="@color/translucent"
+                    app:qmui_radius="14dp">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:hint="潮玩设计 | 闹仔NOWKNOW"
+                        android:text="@{item.name}"
+                        android:textColor="#FFFFFF"
+                        android:textSize="18sp"
+                        android:textStyle="bold" />
+
+                    <LinearLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="6dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:background="#38D3D3"
+                            android:paddingStart="9dp"
+                            android:paddingTop="2dp"
+                            android:paddingEnd="9dp"
+                            android:paddingBottom="2dp"
+                            android:text="限量"
+                            android:textColor="@color/white"
+                            android:textSize="11sp" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:background="@drawable/bg_kuang_blue"
+                            android:hint="100份"
+                            android:paddingStart="9dp"
+                            android:paddingTop="2dp"
+                            android:paddingEnd="9dp"
+                            android:paddingBottom="2dp"
+                            android:text="@{item.inventory+`份`}"
+                            android:textColor="#54D7E9"
+                            android:textColorHint="#54D7E9"
+                            android:textSize="11sp" />
+
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="10dp"
+                        android:orientation="horizontal">
+
+
+                        <com.qmuiteam.qmui.widget.QMUIRadiusImageView
+                            android:layout_width="18dp"
+                            android:layout_height="18dp"
+                            android:layout_gravity="center_vertical"
+                            android:src="@drawable/bg_need_error"
+                            app:qmui_border_color="@color/translucent"
+                            app:qmui_is_circle="true"
+                            app:url="@{item.authImg}" />
+
+                        <TextView
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical"
+                            android:layout_marginStart="6dp"
+                            android:layout_weight="1"
+                            android:text="@{item.authName}"
+                            android:textColor="#D2D2D2"
+                            android:textSize="12sp" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="￥"
+                            android:textColor="@color/white"
+                            android:textSize="18sp" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@{item.price}"
+                            android:textColor="@color/white"
+                            android:textSize="24sp" />
+
+
+                    </LinearLayout>
+
+
+                </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
+
+
+                <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
+                    android:id="@+id/ll_one"
+                    android:layout_width="wrap_content"
+                    android:layout_height="24dp"
+                    android:layout_marginStart="12dp"
+                    android:layout_marginTop="22dp"
+                    android:layout_marginEnd="10dp"
+                    android:gravity="center_vertical"
+                    android:paddingStart="12dp"
+                    android:paddingEnd="11dp"
+                    app:qmui_backgroundColor="#CC000000"
+                    app:qmui_borderColor="@color/translucent"
+                    app:qmui_radius="12dp">
+
+                    <ImageView
+                        android:layout_width="12dp"
+                        android:layout_height="12dp"
+                        android:layout_marginEnd="6dp"
+                        android:src="@drawable/ct_time_ing" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textColor="#FFF488"
+                        android:text="热卖中"
+                        android:textSize="10sp" />
+
+                </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
+
+
+                <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
+                    android:id="@+id/ll_two"
+                    android:layout_width="wrap_content"
+                    android:layout_height="24dp"
+                    android:layout_marginStart="12dp"
+                    android:layout_marginTop="22dp"
+                    android:layout_marginEnd="10dp"
+                    android:gravity="center_vertical"
+                    android:paddingStart="12dp"
+                    android:paddingEnd="11dp"
+                    app:qmui_backgroundColor="#CC000000"
+                    app:qmui_borderColor="@color/translucent"
+                    app:qmui_radius="12dp">
+
+                    <ImageView
+                        android:layout_width="12dp"
+                        android:layout_height="12dp"
+                        android:layout_marginEnd="6dp"
+                        android:src="@drawable/ct_time" />
+
+                    <TextView
+                        android:id="@+id/tv_state"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textColor="#62FFF0"
+                        android:textSize="10sp" />
+
+                </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
+
+                <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
+                    android:id="@+id/ll_three"
+                    android:layout_width="wrap_content"
+                    android:layout_height="24dp"
+                    android:layout_marginStart="12dp"
+                    android:layout_marginTop="22dp"
+                    android:layout_marginEnd="10dp"
+                    android:gravity="center_vertical"
+                    android:paddingStart="12dp"
+                    android:paddingEnd="11dp"
+                    app:qmui_backgroundColor="#CC000000"
+                    app:qmui_borderColor="@color/translucent"
+                    app:qmui_radius="12dp">
+
+                    <ImageView
+                        android:layout_width="12dp"
+                        android:layout_height="12dp"
+                        android:layout_marginEnd="6dp"
+                        android:src="@drawable/ct_time_stop" />
+
+                    <TextView
+                        android:text="已售罄"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textColor="#999999"
+                        android:textSize="10sp" />
+
+                </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
+
+
+            </FrameLayout>
+
+        </com.qmuiteam.qmui.layout.QMUILinearLayout>
+
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="14dp" />
+
+    </LinearLayout>
+</layout>

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

@@ -0,0 +1,300 @@
+<?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"
+    android:layout_width="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
+    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_weight="1"
+                    android:layout_height="wrap_content"
+                    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>
+
+            <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_corner_radius="16dp"
+                    app:qmui_border_color="@color/translucent"
+                    />
+                <androidx.appcompat.widget.AppCompatImageView
+                    android:id="@+id/img_cover_gif"
+                    android:layout_width="100dp"
+                    android:layout_height="100dp"
+                    android:scaleType="centerCrop"
+                    android:visibility="gone"
+                    android:adjustViewBounds="true"
+                    android:src="@drawable/bg_need_error"
+                    />
+
+                <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="#F14351"
+                            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="#F14351"
+                            android:textSize="20sp" />
+
+                        <View
+                            android:layout_width="0dp"
+                            android:layout_height="match_parent"
+                            android:layout_weight="1" />
+
+                        <LinearLayout
+                            android:id="@+id/ll_one"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:orientation="horizontal">
+
+
+                            <TextView
+
+                                android:layout_width="25dp"
+                                android:layout_height="25dp"
+                                android:gravity="center"
+                                android:text="-"
+                                android:textColor="#666666"
+                                android:textSize="18sp" />
+
+                            <TextView
+                                android:layout_width="40dp"
+                                android:layout_height="20dp"
+                                android:background="#E5E5E5"
+                                android:gravity="center"
+                                android:inputType="number"
+                                android:paddingStart="@dimen/dp_2"
+                                android:text="1"
+                                android:textColor="#666666"
+                                android:textSize="13sp" />
+
+                            <TextView
+
+                                android:layout_width="25dp"
+                                android:layout_height="25dp"
+                                android:gravity="center"
+                                android:text="+"
+                                android:textColor="#666666"
+                                android:textSize="18sp" />
+                        </LinearLayout>
+
+
+                        <LinearLayout
+                            android:id="@+id/ll_two"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:orientation="horizontal">
+
+
+                            <TextView
+                                android:id="@+id/tv_reduce"
+                                android:layout_width="25dp"
+                                android:layout_height="25dp"
+                                android:gravity="center"
+                                android:text="-"
+                                android:textColor="#666666"
+                                android:textSize="18sp" />
+
+                            <EditText
+                                android:id="@+id/et"
+                                android:layout_width="40dp"
+                                android:layout_height="20dp"
+                                android:background="#E5E5E5"
+                                android:gravity="center"
+                                android:inputType="number"
+                                android:paddingStart="@dimen/dp_2"
+                                android:text="1"
+                                android:textColor="#666666"
+                                android:textSize="13sp" />
+
+                            <TextView
+                                android:id="@+id/tv_add"
+                                android:layout_width="25dp"
+                                android:layout_height="25dp"
+                                android:gravity="center"
+                                android:text="+"
+                                android:textColor="#666666"
+                                android:textSize="18sp" />
+                        </LinearLayout>
+
+
+
+                    </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_wallet"
+                android:layout_width="match_parent"
+                android:layout_height="48dp"
+                android:gravity="center"
+                android:layout_marginTop="20dp"
+                android:orientation="horizontal"
+                android:paddingStart="20dp"
+                android:paddingEnd="21dp"
+                android:background="@drawable/bg_pop_pay_on"
+                >
+
+                <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:textSize="10sp"
+                android:textColor="#999999"
+                android:text="支付说明"
+                android:layout_marginTop="14dp"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"/>
+            <TextView
+                android:textSize="10sp"
+                android:textColor="#999999"
+                android:text="@string/pay_tips"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"/>
+
+            <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_order_list.xml

@@ -129,6 +129,7 @@
                           android:layout_height="wrap_content">
 
                           <TextView
+                              android:id="@+id/tv_tips_one"
                               android:textSize="10sp"
                               android:textColor="@color/text_title"
                               android:textStyle="bold"
@@ -145,6 +146,16 @@
                               android:layout_height="wrap_content"/>
 
                           <TextView
+                              android:id="@+id/tv_tips_two"
+                              android:textSize="10sp"
+                              android:textColor="@color/text_title"
+                              android:textStyle="bold"
+                              android:text="积分"
+                              android:layout_width="wrap_content"
+                              android:layout_height="wrap_content"/>
+
+
+                          <TextView
                               android:text="@{`X`+item.num}"
                               android:textColor="#888888"
                               android:textSize="12sp"
@@ -201,14 +212,10 @@
                     android:textColor="@color/text_title"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"/>
-                <TextView
-                    android:text="¥"
-                    android:textColor="@color/text_title"
-                    android:textSize="10sp"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"/>
+
 
                 <TextView
+                    android:id="@+id/tv_z_money"
                     android:text="@{`￥`+item.payPrice}"
                     android:textColor="@color/text_title"
                     android:hint="1000"

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

@@ -43,6 +43,7 @@
             android:orientation="horizontal">
 
             <TextView
+                android:id="@+id/tv_money_tips"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="¥"
@@ -57,6 +58,7 @@
                 android:textColor="#222222"
                 android:textSize="30sp" />
 
+
         </LinearLayout>
 
         <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout

build.gradle

@@ -10,8 +10,8 @@ buildscript {
     ext.coroutines = '1.3.4'
 
     ext.application_id = "com.zswc.creativity"
-    ext.application_version_code = 4
-    ext.application_version_name = "1.0.3"
+    ext.application_version_code = 5
+    ext.application_version_name = "1.0.4"
     ext.support_version = "29.0.2"
     ext.min_sdk_version = 23
     ext.target_sdk_version = 30