diff --git a/.env.development b/.env.development
index ea2d98b..0f1a9d0 100644
--- a/.env.development
+++ b/.env.development
@@ -1,4 +1,4 @@
-# VUE_APP_HOST=https://test-temple.wdx-tc.com/
-VUE_APP_HOST=https://demo.6bsq.com/
+VUE_APP_HOST=https://test-temple.wdx-tc.com/
+# VUE_APP_HOST=https://demo.6bsq.com/
NODE_ENV = development
VUE_APP_TMAP_KEY=ZFGBZ-76ICF-BG5JY-NH4HX-MQOOJ-VJB4E
\ No newline at end of file
diff --git a/src/api/index.js b/src/api/index.js
index 9da8392..9aa7246 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -161,7 +161,11 @@ const getStationTemplate = template_id => service.get(`/api/temple-template-shar
// 平台首页
const getPlatformHome = agent_id => service.get(`/api/home?agent_id=${agent_id}`)
+// 查询是否登录
+const hasLogin = () => service.get('/api/has-login');
+
export {
+ hasLogin,
getHotWords,
getMonkAppellation,
postMobileCode,
@@ -206,5 +210,5 @@ export {
getCustomerList,
getCertList,
getStationTemplate,
- getPlatformHome
+ getPlatformHome,
}
diff --git a/src/api/service.js b/src/api/service.js
index 10a08d3..8b79c53 100644
--- a/src/api/service.js
+++ b/src/api/service.js
@@ -2,6 +2,7 @@ import axios from 'axios';
import { Toast } from 'vant';
import qs from 'qs'
import router from '../router';
+import utils from '../util'
const baseURL = process.env.NODE_ENV === 'development' ? '/' : process.env.VUE_APP_HOST
@@ -13,10 +14,13 @@ const instance = axios.create({
"Accept": "*",
"Content-Type": "application/x-www-form-urlencoded"
},
-
})
instance.interceptors.request.use(request => {
+ const { query } = router.currentRoute;
+ if(query.no_login){
+ request.url = utils.addExternalParamsToQuery(request.url, 'no_login', 1)
+ }
if(request.url.includes('upload')){
return request
}
diff --git a/src/common/wechat-web.js b/src/common/wechat-web.js
index d4b05d4..c5f85ec 100644
--- a/src/common/wechat-web.js
+++ b/src/common/wechat-web.js
@@ -1,4 +1,5 @@
let wechatInstance;
+import util from "@/util";
function signToWechat(config, shareConfig) {
if (!wx) {
@@ -27,7 +28,7 @@ function signToWechat(config, shareConfig) {
wx.onMenuShareAppMessage({
title: shareConfig.title,
desc: shareConfig.desc,
- link: shareConfig.link,
+ link: util.addExternalParamsToQuery(shareConfig.link, 'no_login', 1),
imgUrl: shareConfig.imgUrl,
complete: res => {
shareConfig.callback && shareConfig.callback({
@@ -40,7 +41,7 @@ function signToWechat(config, shareConfig) {
// // 分享朋友圈
wx.onMenuShareTimeline({
title: shareConfig.title,
- link: shareConfig.link,
+ link: util.addExternalParamsToQuery(shareConfig.link, 'no_login', 1),
imgUrl: shareConfig.imgUrl,
complete: res => {
shareConfig.callback && shareConfig.callback({
diff --git a/src/pages/get-user-phone/index.vue b/src/pages/get-user-phone/index.vue
index cdddcce..29af8fb 100644
--- a/src/pages/get-user-phone/index.vue
+++ b/src/pages/get-user-phone/index.vue
@@ -98,11 +98,11 @@ export default {
}
const res = await postMobileCode(mobile, validCode.join(''))
if(res){
- this.$toast.success('验证成功')
+ this.$toast.success('登记成功，请继续后续操作')
this.$delay(500);
- // this.$router.back();
this.$bus.$emit('updateMobile')
- this.$router.replace({ name: 'user-home'})
+ this.$router.back();
+ // this.$router.replace({ name: 'user-home'})
}
},
onSendCode(){
diff --git a/src/pages/goods-light-detail/index.vue b/src/pages/goods-light-detail/index.vue
index f165279..7d108d1 100644
--- a/src/pages/goods-light-detail/index.vue
+++ b/src/pages/goods-light-detail/index.vue
@@ -42,7 +42,7 @@
-
+
@@ -101,7 +101,7 @@