Commit 7f3711ef authored by shiyl's avatar shiyl

新建、编辑门店成功关闭页面

parent 0ecf26d3
...@@ -35,14 +35,16 @@ class PublishCouponsActivity : BaseMvvmActivity<CommodityActivityPublishCouponsB ...@@ -35,14 +35,16 @@ class PublishCouponsActivity : BaseMvvmActivity<CommodityActivityPublishCouponsB
override fun initView() { override fun initView() {
initTitleBar(binding.include.toolbar, binding.include.tvTitle, "发布优惠券") initTitleBar(binding.include.toolbar, binding.include.tvTitle, "发布优惠券")
val serializableExtra = intent.getSerializableExtra(XRouterPathConstants.ParamsKey) val serializableExtra = intent.getSerializableExtra(XRouterPathConstants.ParamsKey)
serializableExtra?.let { if (serializableExtra == null) {
initWebView()
} else {
val paramsMap = serializableExtra as HashMap<*, *> val paramsMap = serializableExtra as HashMap<*, *>
val couponId = paramsMap[CouponId] as String val couponId = paramsMap[CouponId] as String
initWebView(couponId) initWebView(couponId)
} }
} }
private fun initWebView(couponId: String) { private fun initWebView(couponId: String = "") {
webView = XBridManager.getWebView(this, "testidenfier", binding.couponWebView) webView = XBridManager.getWebView(this, "testidenfier", binding.couponWebView)
val lifeAccountId = Hawk.get(HawkConfig.LifeAccountId, "") val lifeAccountId = Hawk.get(HawkConfig.LifeAccountId, "")
val webUrl = if (couponId.isNotBlank()) { val webUrl = if (couponId.isNotBlank()) {
...@@ -51,7 +53,8 @@ class PublishCouponsActivity : BaseMvvmActivity<CommodityActivityPublishCouponsB ...@@ -51,7 +53,8 @@ class PublishCouponsActivity : BaseMvvmActivity<CommodityActivityPublishCouponsB
"xbrid_coupon_publish?life_account_id=$lifeAccountId" "xbrid_coupon_publish?life_account_id=$lifeAccountId"
} }
// webView.loadUrl(webUrl) // webView.loadUrl(webUrl)
webView.loadUrl("http://10.60.102.66:8080") // webView.loadUrl("http://10.60.102.66:8080")
webView.loadUrl("http://10.60.100.85:8080")
// webView.loadUrl("https://www.baidu.com") // webView.loadUrl("https://www.baidu.com")
webView.webChromeClient = object : WebChromeClient() { webView.webChromeClient = object : WebChromeClient() {
override fun onProgressChanged(view: WebView?, newProgress: Int) { override fun onProgressChanged(view: WebView?, newProgress: Int) {
......
...@@ -86,9 +86,10 @@ class EditStoreActivity : BaseActivity<ActivityStoreEditBinding>(), CommonTopBar ...@@ -86,9 +86,10 @@ class EditStoreActivity : BaseActivity<ActivityStoreEditBinding>(), CommonTopBar
requestParams["latitude"] = store.latitude requestParams["latitude"] = store.latitude
requestParams["longitude"] = store.longitude requestParams["longitude"] = store.longitude
requestParams["address"] = store.title requestParams["address"] = store.title
ApiService.updateStore(requestParams) { ApiService.addStore(requestParams) {
if (it) { if (it) {
Toast.makeText(this@EditStoreActivity, "保存成功", Toast.LENGTH_SHORT).show() Toast.makeText(this@EditStoreActivity, "保存成功", Toast.LENGTH_SHORT).show()
finish()
} }
} }
} }
...@@ -106,6 +107,7 @@ class EditStoreActivity : BaseActivity<ActivityStoreEditBinding>(), CommonTopBar ...@@ -106,6 +107,7 @@ class EditStoreActivity : BaseActivity<ActivityStoreEditBinding>(), CommonTopBar
ApiService.updateStore(requestParams) { ApiService.updateStore(requestParams) {
if (it) { if (it) {
Toast.makeText(this@EditStoreActivity, "保存成功", Toast.LENGTH_SHORT).show() Toast.makeText(this@EditStoreActivity, "保存成功", Toast.LENGTH_SHORT).show()
finish()
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment