添加优惠券在管理中心的点击事件

CommonLib/Common/src/main/java/com/yidian/common/XRouterPathConstants.kt

@@ -85,12 +85,12 @@ class XRouterPathConstants {
     const val COMMON_PROBLEM = "/wallet/CommonProblemActivity"
 
     // 商品 —— 发布优惠券
-    const val publishCouponsActivity = "/commodity/PublishCouponsActivity"
+    const val PUBLISH_COUPONS_ACTIVITY = "/commodity/PublishCouponsActivity"
 
     // 商品 —— 优惠券选择类目
-    const val chooseCategoryActivity = "/commodity/ChooseCategoryActivity"
+    const val CHOOSE_CATEGORY_ACTIVITY = "/commodity/ChooseCategoryActivity"
 
     // 商品 —— 商品管理
-    const val commodityManagement = "/commodity/CommodityManagement"
+    const val COMMODITY_MANAGEMENT = "/commodity/CommodityManagement"
   }
 }

Components/commodity/src/main/java/com/yidian/shenghuoquan/commodity/app/ClassMapUtil.kt

@@ -12,9 +12,9 @@ import com.yidian.shenghuoquan.commodity.ui.coupon.CommodityManagementActivity
 object ClassMapUtil {
 
   val xPageNodeMap = mapOf(
-    XRouterPathConstants.Companion.publishCouponsActivity to PublishCouponsActivity::class.java,// 发布优惠券
-    XRouterPathConstants.Companion.chooseCategoryActivity to ChooseCategoryActivity::class.java,// 优惠券选择类目
-    XRouterPathConstants.Companion.commodityManagement to CommodityManagementActivity::class.java, // 商品管理
+    XRouterPathConstants.Companion.PUBLISH_COUPONS_ACTIVITY to PublishCouponsActivity::class.java,// 发布优惠券
+    XRouterPathConstants.Companion.CHOOSE_CATEGORY_ACTIVITY to ChooseCategoryActivity::class.java,// 优惠券选择类目
+    XRouterPathConstants.Companion.COMMODITY_MANAGEMENT to CommodityManagementActivity::class.java, // 商品管理
   )
 
 }

Components/commodity/src/main/java/com/yidian/shenghuoquan/commodity/service/SelectCategoryService.kt

@@ -11,7 +11,6 @@ import com.yidian.xpage.XPageManager
 import com.yidian.yac.core.zap.ZapService
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
-import org.json.JSONArray
 import org.json.JSONObject
 
 /**
@@ -37,11 +36,11 @@ class SelectCategoryService : ZapService() {
   private fun gotoSelectCategory(params: JSONObject) {
     val lastSelectCategory = params.optJSONObject("selectedCategory")
     if (lastSelectCategory == null) {
-      XPageManager.push(XRouterPathConstants.chooseCategoryActivity, null)
+      XPageManager.push(XRouterPathConstants.CHOOSE_CATEGORY_ACTIVITY, null)
     } else {
       val map = HashMap<String, Any?>()
       map[ChooseCategoryActivity.lastSelectCategoryKey] = lastSelectCategory
-      XPageManager.push(XRouterPathConstants.chooseCategoryActivity, map)
+      XPageManager.push(XRouterPathConstants.CHOOSE_CATEGORY_ACTIVITY, map)
     }
   }
 

Components/commodity/src/main/java/com/yidian/shenghuoquan/commodity/ui/coupon/ChooseCategoryActivity.kt

@@ -34,7 +34,7 @@ class ChooseCategoryActivity : BaseMvvmActivity<CommodityActivityChooseCategoryB
   override val vm: ChooseCategoryViewModel by viewModels()
 
   override fun getXPageName(): String {
-    return XRouterPathConstants.chooseCategoryActivity
+    return XRouterPathConstants.CHOOSE_CATEGORY_ACTIVITY
   }
 
   override fun initView() {

Components/commodity/src/main/java/com/yidian/shenghuoquan/commodity/ui/coupon/CommodityManagementActivity.kt

@@ -54,11 +54,11 @@ class CommodityManagementActivity : BaseMvvmActivity<CommodityActivityCommodityM
     //发布商品
     binding.tvCommodityPublish.setOnClickListener {
       // 跳转商品发布页面 新发布商品不传id
-      XPageManager.push(XRouterPathConstants.publishCouponsActivity, hashMapOf(Pair(EXTRA_COMMODITY_ID, "")))
+      XPageManager.push(XRouterPathConstants.PUBLISH_COUPONS_ACTIVITY, hashMapOf(Pair(EXTRA_COMMODITY_ID, "")))
     }
   }
 
   override fun getXPageName(): String {
-    return XRouterPathConstants.commodityManagement
+    return XRouterPathConstants.COMMODITY_MANAGEMENT
   }
 }

Components/commodity/src/main/java/com/yidian/shenghuoquan/commodity/ui/coupon/PublishCouponsActivity.kt

@@ -29,7 +29,7 @@ class PublishCouponsActivity : BaseMvvmActivity<CommodityActivityPublishCouponsB
   override val vm: PublishCouponsViewModel by viewModels()
 
   override fun getXPageName(): String {
-    return XRouterPathConstants.publishCouponsActivity
+    return XRouterPathConstants.PUBLISH_COUPONS_ACTIVITY
   }
 
   override fun initView() {
@@ -50,7 +50,9 @@ class PublishCouponsActivity : BaseMvvmActivity<CommodityActivityPublishCouponsB
     } else {
       "xbrid_coupon_publish?life_account_id=$lifeAccountId"
     }
-    webView.loadUrl(webUrl)
+//    webView.loadUrl(webUrl)
+    webView.loadUrl("http://10.60.102.66:8080")
+//    webView.loadUrl("https://www.baidu.com")
     webView.webChromeClient = object : WebChromeClient() {
       override fun onProgressChanged(view: WebView?, newProgress: Int) {
         super.onProgressChanged(view, newProgress)

Components/commodity/src/main/java/com/yidian/shenghuoquan/commodity/ui/coupon/viewmodel/CommodityListItemViewModel.kt

@@ -58,7 +58,7 @@ class CommodityListItemViewModel : BaseViewModel(), ICommodityOperationCallback
    */
   fun commodityEdit(item: Goods) {
     // 跳转商品发布页面 传入商品id
-    XPageManager.push(XRouterPathConstants.publishCouponsActivity, hashMapOf(Pair(EXTRA_COMMODITY_ID, item.goodsSpuId)))
+    XPageManager.push(XRouterPathConstants.PUBLISH_COUPONS_ACTIVITY, hashMapOf(Pair(EXTRA_COMMODITY_ID, item.goodsSpuId)))
   }
 
   /**

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/center/MerchantCenterActivity.kt

@@ -185,7 +185,7 @@ class MerchantCenterActivity : BaseActivity<ActivityMerchantCenterBinding>(),
    */
   private fun generateFunctionPageMap(data: List<GetConfigListBean.Item>) {
     // 我要发布-优惠券
-    functionPageMap[data[0].functions[0].function_id] = null
+    functionPageMap[data[0].functions[0].function_id] = XRouterPathConstants.PUBLISH_COUPONS_ACTIVITY
     // 我要发布-招聘
     functionPageMap[data[0].functions[1].function_id] = null
     // 管理服务-权限管理
@@ -193,7 +193,7 @@ class MerchantCenterActivity : BaseActivity<ActivityMerchantCenterBinding>(),
     // 管理服务-人员管理
     functionPageMap[data[1].functions[1].function_id] = XRouterPathConstants.PERSONAL_MY_STAFF
     // 其他服务-优惠券管理
-    functionPageMap[data[2].functions[0].function_id] = null
+    functionPageMap[data[2].functions[0].function_id] = XRouterPathConstants.COMMODITY_MANAGEMENT
     // 其他服务-职位管理
     functionPageMap[data[2].functions[1].function_id] = null
     // 其他服务-门店管理