diff --git a/pages/index/center.vue b/pages/index/center.vue
index b0b4312..f79d901 100644
--- a/pages/index/center.vue
+++ b/pages/index/center.vue
@@ -18,7 +18,10 @@
{{ userInfo.nickName || '' }}
- {{ `ID:${userInfo.id}` }}
+
+ {{ `ID:${userInfo.id}` }}
+
+
{{ `手机号:${userInfo.phone}` }}
@@ -246,6 +249,8 @@
.light {
font-size: 24rpx;
+ justify-content: flex-start;
+ column-gap: 8rpx;
}
}
diff --git a/pages_order/article/index.vue b/pages_order/article/index.vue
index 197dbc3..5f16843 100644
--- a/pages_order/article/index.vue
+++ b/pages_order/article/index.vue
@@ -2,10 +2,10 @@
-
+
-
+
@@ -14,16 +14,20 @@
export default {
data() {
return {
- details: {},
+ title: '',
+ content: '',
}
},
- onLoad({ api, id, idKey }) {
- this.getData(api, id, idKey)
+ onLoad({ api, id, idKey, contentKey }) {
+ this.getData(api, id, idKey, contentKey)
},
methods: {
- async getData(api, id, idKey) {
+ async getData(api, id, idKey, contentKey) {
try {
- this.details = await this.$fetch(api, { [idKey]: id })
+ const result = await this.$fetch(api, { [idKey]: id })
+
+ this.title = result.title
+ this.content = result[contentKey]
} catch (err) {
console.log('err', err)
}
diff --git a/pages_order/article/search.vue b/pages_order/article/search.vue
index 0eb89ee..a3077c6 100644
--- a/pages_order/article/search.vue
+++ b/pages_order/article/search.vue
@@ -81,6 +81,7 @@
jumpToDetail(id) {
let api
let idKey
+ let contentKey = 'details'
switch(this.mixinsListApi) {
case 'queryNewsList':
@@ -94,13 +95,14 @@
case 'queryJournalList':
api = 'queryJournalById',
idKey = 'journalId'
+ contentKey = 'content'
break
default:
break
}
uni.navigateTo({
- url: `/pages_order/article/index?api=${api}&id=${id}&idKey=${idKey}`
+ url: `/pages_order/article/index?api=${api}&id=${id}&idKey=${idKey}&contentKey=${contentKey}`
})
},
},
diff --git a/pages_order/auth/roleChoose.vue b/pages_order/auth/roleChoose.vue
index 18b8aa1..ea95532 100644
--- a/pages_order/auth/roleChoose.vue
+++ b/pages_order/auth/roleChoose.vue
@@ -6,7 +6,13 @@
-
+
@@ -48,7 +54,14 @@
},
async onConfirm() {
try {
+ const {
+ nickName,
+ phone,
+ } = this.userInfo
+
const params = {
+ nickName,
+ phone,
role: this.role
}
diff --git a/pages_order/auth/wxUserInfo.vue b/pages_order/auth/wxUserInfo.vue
index b8cd948..9dcf6c2 100644
--- a/pages_order/auth/wxUserInfo.vue
+++ b/pages_order/auth/wxUserInfo.vue
@@ -184,7 +184,6 @@
uni.reLaunch({
url:'/pages/index/index'
})
- this.$store.commit('getUserInfo')
}, 800)
}
diff --git a/pages_order/components/agreementModal.vue b/pages_order/components/agreementModal.vue
index 82c5541..e9b11f0 100644
--- a/pages_order/components/agreementModal.vue
+++ b/pages_order/components/agreementModal.vue
@@ -68,6 +68,8 @@ export default {
.content {
padding: 8rpx 32rpx 40rpx 32rpx;
+ max-height: 70vh;
+ overflow-y: scroll;
font-size: 28rpx;
font-family: PingFang SC;
font-weight: 400;
diff --git a/store/store.js b/store/store.js
index acb20a7..8a445fc 100644
--- a/store/store.js
+++ b/store/store.js
@@ -6,6 +6,24 @@ Vue.use(Vuex); //vue的插件机制
import api from '@/api/api.js'
import fetch from '@/api/fetch.js'
+const setUserInfo = (state, data) => {
+ const userInfo = data
+
+ switch (userInfo.role) {
+ case '0':
+ userInfo.roleDesc = '家长'
+ break
+ case '1':
+ userInfo.roleDesc = '学生'
+ break
+ default:
+ break
+ }
+
+ state.userInfo = userInfo
+
+}
+
//Vuex.Store 构造器选项
const store = new Vuex.Store({
state: {
@@ -86,7 +104,11 @@ const store = new Vuex.Store({
uni.navigateTo({
url: '/pages_order/auth/wxUserInfo'
})
- }else{
+ } else if (!state.userInfo.role) {
+ uni.navigateTo({
+ url: '/pages_order/auth/roleChoose'
+ })
+ } else {
uni.navigateBack(-1)
}
})
@@ -97,21 +119,8 @@ const store = new Vuex.Store({
getUserInfo(state){
api('getInfo', res => {
if(res.code == 200){
- const result = res.result
-
- switch (result.role) {
- case '0':
- result.roleDesc = '家长'
- break
- case '1':
- result.roleDesc = '学生'
- break
- default:
- break
- }
-
- state.userInfo = result
-
+ setUserInfo(state, res.result)
+
if (!state.userInfo.role) {
uni.navigateTo({
url: '/pages_order/auth/roleChoose'