diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json
index 582561b..ee5be77 100644
--- a/.hbuilderx/launch.json
+++ b/.hbuilderx/launch.json
@@ -10,6 +10,10 @@
{
"launchtype" : "local"
},
+ "mp-weixin" :
+ {
+ "launchtype" : "local"
+ },
"type" : "uniCloud"
}
]
diff --git a/androidPrivacy.json b/androidPrivacy.json
index 6492c45..4608ecb 100644
--- a/androidPrivacy.json
+++ b/androidPrivacy.json
@@ -1,15 +1,15 @@
{
- "version" : "1",
+ "version" : "6",
"prompt" : "template",
"title" : "服务协议和隐私政策",
- "message" : " 请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。
你可阅读《服务协议》和《隐私政策》了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。",
+ "message" : " 请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。
你可阅读《用户协议》和《隐私政策》了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。",
"buttonAccept" : "同意并接受",
"buttonRefuse" : "暂不同意",
"hrefLoader" : "system|default",
"backToExit" : "false",
"second" : {
"title" : "确认提示",
- "message" : " 进入应用前，你需先同意《服务协议》和《隐私政策》，否则将退出应用。",
+ "message" : " 进入应用前，你需先同意《用户协议》和《隐私政策》，否则将退出应用。",
"buttonAccept" : "同意并继续",
"buttonRefuse" : "退出应用"
},
diff --git a/manifest.json b/manifest.json
index e7ba576..e7b8914 100644
--- a/manifest.json
+++ b/manifest.json
@@ -8,7 +8,7 @@
/* 5+App特有相关 */
"app-plus" : {
"usingComponents" : true,
- "nvueStyleCompiler" : "uni-app",
+ "nvueStyleCompiler" : "留学万象",
"compilerVersion" : 3,
"splashscreen" : {
"alwaysShowBeforeRender" : true,
diff --git a/package.json b/package.json
index 396f53a..4db993c 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
{
- "name": "lxwx",
+ "name": "留学万象",
"version": "1.0.0",
"description": "",
"main": "main.js",
diff --git a/pages.json b/pages.json
index 89befdb..a0acce7 100644
--- a/pages.json
+++ b/pages.json
@@ -18,6 +18,7 @@
"style" :
{
"navigationBarTitleText": "",
+ "navigationStyle": "custom",
"enablePullDownRefresh": false
}
@@ -113,7 +114,7 @@
"globalStyle": {
"navigationStyle": "custom",
"navigationBarTextStyle": "black",
- "navigationBarTitleText": "uni-app",
+ "navigationBarTitleText": "留学万象",
"navigationBarBackgroundColor": "#ffffff",
"backgroundColor": "#F3F5F7"
},
diff --git a/pages/detail/detail.vue b/pages/detail/detail.vue
index ff95975..20ffa66 100644
--- a/pages/detail/detail.vue
+++ b/pages/detail/detail.vue
@@ -63,6 +63,7 @@
},
onLoad(option) {
this.id = option.id
+ this.$store.commit('shareHandle',this.$mp.page.route+'?id='+this.$mp.page.options.id)
this.articleDetails()
// H5:
// #ifndef APP-PLUS
@@ -132,10 +133,10 @@
'token':uni.getStorageSync('userInfo').token
},
}).then((res) => {
+ that.$store.commit('shareHandle',this.$mp.page.route+'?id='+this.$mp.page.options.id)
that.$refs.uToast.show({
message:"分享成功"
})
- that.isCollect = true
}).catch((res) =>{
})
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 9f0e3d3..66507f3 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -89,9 +89,15 @@
console.log(res)
that.$store.commit('login',res.userinfo)
uni.setStorageSync('source','phone')
- uni.reLaunch({
- url:'/pages/my/my'
- })
+ if(that.$store.state.share){
+ uni.navigateTo({
+ url:'/'+that.$store.state.share
+ })
+ }else{
+ uni.reLaunch({
+ url:'/pages/my/my'
+ })
+ }
})
}
});
diff --git a/pages/register/register.vue b/pages/register/register.vue
index 66a8f0b..7672f90 100644
--- a/pages/register/register.vue
+++ b/pages/register/register.vue
@@ -110,9 +110,18 @@
console.log(res)
that.$store.commit('login',res.userinfo)
uni.setStorageSync('source','phone')
- uni.reLaunch({
- url:'/pages/my/my'
- })
+ // uni.reLaunch({
+ // url:'/pages/my/my'
+ // })
+ if(that.$store.state.share){
+ uni.navigateTo({
+ url:"/"+that.$store.state.share
+ })
+ }else{
+ uni.reLaunch({
+ url:'/pages/my/my'
+ })
+ }
})
}
});
diff --git a/pages/register/register1.vue b/pages/register/register1.vue
index 8efcb31..bc04f0a 100644
--- a/pages/register/register1.vue
+++ b/pages/register/register1.vue
@@ -63,9 +63,18 @@
// uni.reLaunch({
// url: '/'+currentPage
// });
- uni.reLaunch({
- url:'/pages/my/my'
- })
+ if(this.$store.state.share){
+ uni.navigateTo({
+ url:"/"+this.$store.state.share
+ })
+ }else{
+ uni.reLaunch({
+ url:'/pages/my/my'
+ })
+ }
+ // uni.reLaunch({
+ // url:'/pages/my/my'
+ // })
// uni.setStorageSync('token', res.userinfo)
}).catch((res)=>{
if(res.code==0){
diff --git a/store/index.js b/store/index.js
index a746563..46a470d 100644
--- a/store/index.js
+++ b/store/index.js
@@ -5,7 +5,8 @@ const store = new Vuex.Store({
state: {
hasLogin: false,
userInfo: {},
- source:'phone'
+ source:'phone',
+ share:''
},
mutations: {
login(state, provider) {
@@ -26,6 +27,9 @@ const store = new Vuex.Store({
uni.removeStorage({
key: 'userInfo'
})
+ },
+ shareHandle(state,value){
+ state.share = value;
}
},
actions: {