diff --git a/pages.json b/pages.json index a00cd52..472667a 100644 --- a/pages.json +++ b/pages.json @@ -170,6 +170,14 @@ "enablePullDownRefresh" : false, "navigationStyle": "custom" } + }, + { + "path" : "knowledgeInfo/knowledgeInfo", + "style" : + { + "navigationBarTitleText" : "", + "enablePullDownRefresh" : false + } }] }], "globalStyle": { diff --git a/pages/knowledge/knowledge.vue b/pages/knowledge/knowledge.vue index 0624125..b001d3b 100644 --- a/pages/knowledge/knowledge.vue +++ b/pages/knowledge/knowledge.vue @@ -1,26 +1,20 @@ @@ -30,17 +24,49 @@ data() { return { page: "", + queryObj:{ + pageNum:1, + pageSize:10 + }, + total:0, + isloading:false, + //数据列表 + knowledgeList:[] }; }, onShow() { this.page= "know" }, - - methods: { - + onLoad() { + this.getContentList(); }, - components: {tabbar} - + methods:{ + async getContentList() { + this.isloading = true + const { + data: res + } = await uni.$http.post('/small/library/listApp',this.queryObj) + this.isloading = false + + res.rows.forEach(item=>{ + item.uploadPath = uni.$http.baseUrl +item.uploadPath + }) + this.knowledgeList =[...this.knowledgeList,...res.rows] + this.total = res.total + }, + navClickHandler(item) { + uni.navigateTo({ + url: '/subpkg/knowledgeInfo/knowledgeInfo?guid='+item.guid + }) + } + }, + onReachBottom(){ + if(this.queryObj.pageNum * this.queryObj.pageSize >= this.total) return uni.$showMsg('已展示所有内容') + if(this.isloading) return + this.queryObj.pageNum++ + this.getContentList() + }, + components: {tabbar}, } diff --git a/subpkg/complete/complete.vue b/subpkg/complete/complete.vue index 3b7a84c..7c46ff5 100644 --- a/subpkg/complete/complete.vue +++ b/subpkg/complete/complete.vue @@ -6,7 +6,7 @@ - + 恭喜完成本次演练！ @@ -52,7 +52,7 @@ - + 关闭 恭喜你获得1枚成就勋章！ @@ -77,7 +77,6 @@ return { "questionFreId":"59088ceb55644b03b8d0c7d48d2f7d39", "roleId":"5f96b1baae1a47fbb17215a5dc46f5ce", - "sceneId": "", questionList: [], recordList: [], "ask":"", @@ -111,7 +110,7 @@ this.showMedal = false this.showLayer = false clearTimeout(this.timer) - }, 1000) + }, 5000) //this.roleId = options.roleId //this.questionFreId = options.questionFreId this.getQuestionList() @@ -150,15 +149,6 @@ //uni.$showMsg('数据请求成功！') }, - async editUserMedal() { - const { - data: res - } = await uni.$http.post('/small/wechat/editUserMedal',{medal:this.sceneId}) - if (!res.success) return uni.$showMsg() - // this.recordList = res.data - - //uni.$showMsg('数据请求成功！') - }, backIndex(){ uni.switchTab({ url:'/pages/index/index' @@ -203,7 +193,7 @@ z-index: 999; width: 100%; height: 100%; - background-color: rgba(0, 0, 0, .35); + background-color: rgba(0, 0, 0, .5); } .popup-layer, .popup-share { //display: none; @@ -251,11 +241,6 @@ } } - .mainwrap3 { - top: 56rpx; - overflow-y: auto; - } - .title { margin: 50rpx 0; color: #333; @@ -293,12 +278,12 @@ } .answer-content { //display: none; - position: relative; + position: absolute; z-index: 100; margin: 2% 3%; padding: 2%; width: 90%; - min-height: 400rpx; + height: 400rpx; background: #fff; border: 1px solid #18c569; border-radius: 10px; @@ -333,19 +318,19 @@ } view { color: #666; - line-height: 1.5; + line-height: 1.75; } } .question-record { - margin: 3% 3% 5%; + margin: 6% 3% 10%; width: 94%; - height: 25%; + height: 45%; overflow: hidden; label { - font-size: 32rpx; - font-weight: bold; - line-height: 2; + font-size: 32rpx; + font-weight: bold; + line-height: 2; } .list { width: 100%; diff --git a/subpkg/message/message.vue b/subpkg/message/message.vue index 02c599c..79460c9 100644 --- a/subpkg/message/message.vue +++ b/subpkg/message/message.vue @@ -31,7 +31,6 @@ }, navClickHandler(item) { - console.log(item) uni.navigateTo({ url: '/subpkg/messageInfo/messageInfo?guid='+item.guid }) diff --git a/subpkg/role/role.vue b/subpkg/role/role.vue index 499d1e0..a8a5ecc 100644 --- a/subpkg/role/role.vue +++ b/subpkg/role/role.vue @@ -1,22 +1,22 @@