Merge remote-tracking branch 'origin/master'

moduleMain/src/main/java/com/zxbw/modulemain/activity/CardDetailActivity.kt

@@ -248,6 +248,7 @@ class CardDetailActivity : BaseActivity(), CardDetailContract.View {
     private fun showResultLoading(isPaySuc: Boolean) {
         if (isPaySuc) {
             mLoading?.setResult(true, "支付成功", 1000)
+            finish()
         } else {
             mLoading?.setResult(false, "支付失败", 1000)
         }

moduleMain/src/main/java/com/zxbw/modulemain/activity/SkillShopActivity.kt

@@ -169,7 +169,6 @@ class SkillShopActivity : BaseActivity(), CardDetailContract.View {
     }
 
     fun updateAddreeInfo(result: AddressEntity?) {
-        Log.e("MXL", "更新地址信息")
         if (result == null) {
             id_rl_hava_address?.visibility = View.GONE
             id_rl_no_address?.visibility = View.VISIBLE
@@ -357,6 +356,7 @@ class SkillShopActivity : BaseActivity(), CardDetailContract.View {
     private fun showResultLoading(isPaySuc: Boolean) {
         if (isPaySuc) {
             mLoading?.setResult(true, "支付成功", 1000)
+            finish()
         } else {
             mLoading?.setResult(false, "支付失败", 1000)
         }

moduleMain/src/main/java/com/zxbw/modulemain/activity/ToPaySkillGoodsActivity.kt

@@ -246,6 +246,7 @@ class ToPaySkillGoodsActivity : BaseActivity(), CardDetailContract.View {
     private fun showResultLoading(isPaySuc: Boolean) {
         if (isPaySuc) {
             mLoading?.setResult(true, "支付成功", 1000)
+            finish()
         } else {
             mLoading?.setResult(false, "支付失败", 1000)
         }

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

@@ -82,7 +82,7 @@ class FlashSaleAdapter : BaseRecyclerAdapter<SkillGoodsEntity, FlashSaleAdapter.
 //            mContext?.startActivity(intent)
 //        }
         holder.id_ll_item?.setOnClickListener {
-            if (TextUtils.equals(bean.status, "1") || TextUtils.equals(bean.status, "2")) {
+            if (TextUtils.equals(bean.skillStatus, "1") || TextUtils.equals(bean.skillStatus, "2")) {
                 listener.onItemClick(it, position, bean)
             }