diff --git a/icons/60x60 copy.png b/icons/60x60 copy.png
new file mode 100644
index 0000000..7f661ba
Binary files /dev/null and b/icons/60x60 copy.png differ
diff --git a/pages.json b/pages.json
index e1ca664..11f428b 100644
--- a/pages.json
+++ b/pages.json
@@ -435,6 +435,15 @@
"navigationBarTitleText": "直播列表"
}
}
+ ,{
+ "path" : "pages/user/content/content",
+ "style" :
+ {
+ "navigationBarTitleText": "",
+ "enablePullDownRefresh": false
+ }
+
+ }
],
"easycom": {
"autoscan": true,
diff --git a/pages/activity/GroupDetails/index.vue b/pages/activity/GroupDetails/index.vue
index cac09b4..5dbd472 100644
--- a/pages/activity/GroupDetails/index.vue
+++ b/pages/activity/GroupDetails/index.vue
@@ -131,7 +131,7 @@
diff --git a/pages/authorization/index.vue b/pages/authorization/index.vue
index fe4a4db..4592057 100644
--- a/pages/authorization/index.vue
+++ b/pages/authorization/index.vue
@@ -5,30 +5,27 @@
v-if="!token"
class="force-login-wrap"
>
-
-
-
-
- 为了提供更优质的服务，请先登录
+
+
+ YSHOP电商系统
-
+ @tap="toLogin"
+ >其他手机登录
-
+
+
+
+ 我已经阅读并遵守
+ 《用户协议》与
+ 《隐私政策》
+
+
@@ -61,7 +58,8 @@ export default {
return {
authorize: false,
canIUseGetUserProfile: false,
- code: ''
+ code: '',
+ isChecked: false
}
},
computed: {
@@ -88,7 +86,17 @@ export default {
},
methods: {
...mapActions(['changeAuthorization', 'setUserInfo']),
- ...mapMutations(['updateAuthorizationPage']),
+ ...mapMutations(['updateAuthorizationPage']),
+ onChange() {
+ console.log('isChecked;',this.isChecked)
+ this.isChecked = !this.isChecked
+ },
+ goNewsDetail(id,name) {
+ this.$yrouter.push({
+ path: "/pages/shop/news/NewsDetail/index",
+ query: { id: id,name:name }
+ });
+ },
toLogin() {
this.$yrouter.push({
path: '/pages/user/Login/index',
@@ -169,14 +177,26 @@ export default {
uni.login({
provider: provider,
success: async loginRes => {
- console.log("🚀 ~ file: index.vue:171 ~ getLoginCode ~ loginRes:", loginRes)
- this.code = loginRes.code
+ console.log("🚀 ~ file: index.vue:171 ~ getLoginCode ~ loginRes:", loginRes)
+
+ this.code = loginRes.code
+ //console.log('code11:',this.code)
}
})
})
},
// 微信用户手机号登录
- phoneLogin(e) {
+ phoneLogin(e) {
+ console.log('code22:',e)
+ if(!this.isChecked) {
+
+ uni.showToast({
+ title: '请勾选下面协议',
+ icon: 'none',
+ duration: 2000,
+ })
+ return
+ }
console.log('用户微信手机号登录')
if (e.mp.detail.errMsg == 'getPhoneNumber:ok') {
console.log('wxLoginCode', this.code)
@@ -229,7 +249,19 @@ export default {
}
-
diff --git a/static/120x120.png b/static/120x120.png
new file mode 100644
index 0000000..66fe74f
Binary files /dev/null and b/static/120x120.png differ
diff --git a/static/60x60.png b/static/60x60.png
new file mode 100644
index 0000000..7f661ba
Binary files /dev/null and b/static/60x60.png differ
diff --git a/utils/index.js b/utils/index.js
index d8bf521..f831bbd 100644
--- a/utils/index.js
+++ b/utils/index.js
@@ -356,6 +356,7 @@ export const handleGetUserInfo = () => {
store.dispatch('setUserInfo', res.data)
console.log('获取用户信息后跳转回显的页面')
let redirect = cookie.get('redirect').replace(/\ /g, '')
+ console.log('redirect:',redirect)
if (redirect) {
reLaunch({
path: redirect,
@@ -363,11 +364,11 @@ export const handleGetUserInfo = () => {
})
return
}
- back()
- // reLaunch({
- // path: '/pages/home/index',
- // // query
- // })
+ // back()
+ reLaunch({
+ path: '/pages/home/index',
+ // query
+ })
// var pages = getCurrentPages() //获取加载的页面
// var currentPage = pages[pages.length - 1] //获取当前页面的对象
@@ -896,6 +897,7 @@ export const handleLoginFailure = () => {
store.commit('updateAuthorization', false)
let currentPageUrl = getCurrentPageUrl()
+ console.log('store.state.$deviceType:',store.state.$deviceType)
if (store.state.$deviceType == 'weixin') {
// 如果不是授权页面，
if (!store.getters.isAuthorizationPage) {