diff --git a/.env b/.env index f53bd29e3..c433749a1 100644 --- a/.env +++ b/.env @@ -1,16 +1,16 @@ APP_BASE_URL=https://demo-ecshopx.ishopex.cn/api/h5app/wxapp APP_WEBSOCKET=wss://demo-ecshopx.ishopex.cn/ws -APP_COMPANY_ID=38 -APP_PLATFORM=standard +APP_COMPANY_ID=5 +APP_PLATFORM=platform APP_CUSTOM_SERVER=https://ecshopx-h5.ex-sandbox.com/ APP_HOME_PAGE=/pages/index APP_TRACK=youshu APP_YOUSHU_TOKEN=bi281e87ab2424481a -APP_ID=wx1e25e45145b70faa -APP_MAP_KEY=PSPBZ-KQ5CW-CSGRF-ON2S4-K2HQJ-XEBQG +APP_ID=wxf7abee400d50e0d0 +APP_MAP_KEY=1ccc1ebc947719886f0cd766d70241fe APP_MAP_NAME=oneX新零售门店定位 APP_IMAGE_CDN=https://b-img-cdn.yuanyuanke.cn/ecshopx-vshop -APP_DIANWU_URL=https://demo-ecshopx-dianwu.shopex123.com +APP_DIANWU_URL= APP_MERCHANT_URL= APP_ADAPAY= diff --git a/src/ext.json b/src/ext.json index 2fdef7437..16871ea04 100644 --- a/src/ext.json +++ b/src/ext.json @@ -1,9 +1,9 @@ { "extEnable": true, - "extAppid": "wx1e25e45145b70faa", + "extAppid": "wxf7abee400d50e0d0", "ext": { - "company_id": "38", - "appid": "wx1e25e45145b70faa", + "company_id": "5", + "appid": "wxf7abee400d50e0d0", "wxa_name": "通用小程序", "ali_isvid":"" }, diff --git a/src/pages/custom/custom-page.js b/src/pages/custom/custom-page.js index 11d088760..957f23357 100644 --- a/src/pages/custom/custom-page.js +++ b/src/pages/custom/custom-page.js @@ -98,8 +98,11 @@ function CustomPage(props) { draft.selectType = 'addcart' }) } catch (e) { - showToast(e.message) - Taro.hideLoading() + Taro.hideLoading({ + success: () => { + showToast(e.message) + } + }) } } diff --git a/src/pages/index.js b/src/pages/index.js index 2a6f08151..4e5caff74 100644 --- a/src/pages/index.js +++ b/src/pages/index.js @@ -248,8 +248,11 @@ function Home() { draft.selectType = 'addcart' }) } catch (e) { - showToast(e.message) - Taro.hideLoading() + Taro.hideLoading({ + success: () => { + showToast(e.message) + } + }) } } diff --git a/src/subpages/ecshopx/navigation-ibs.js b/src/subpages/ecshopx/navigation-ibs.js index 1fc1b9603..599a54d52 100644 --- a/src/subpages/ecshopx/navigation-ibs.js +++ b/src/subpages/ecshopx/navigation-ibs.js @@ -187,8 +187,11 @@ function NavigationIbs() { draft.selectType = 'addcart' }) } catch (e) { - showToast(e.message) - Taro.hideLoading() + Taro.hideLoading({ + success: () => { + showToast(e.message) + } + }) } } diff --git a/src/subpages/purchase/index.js b/src/subpages/purchase/index.js index 003d306bb..069eed92e 100644 --- a/src/subpages/purchase/index.js +++ b/src/subpages/purchase/index.js @@ -227,8 +227,11 @@ function Home() { draft.selectType = 'addcart' }) } catch (e) { - showToast(e.message) - Taro.hideLoading() + Taro.hideLoading({ + success: () => { + showToast(e.message) + } + }) } } diff --git a/src/subpages/store/index.js b/src/subpages/store/index.js index 8fd4486eb..26263641d 100644 --- a/src/subpages/store/index.js +++ b/src/subpages/store/index.js @@ -294,8 +294,11 @@ function StoreIndex() { draft.selectType = 'addcart' }) } catch (e) { - showToast(e.message) - Taro.hideLoading() + Taro.hideLoading({ + success: () => { + showToast(e.message) + } + }) } }