diff --git a/app.js b/app.js index 1acf519..fea423c 100644 --- a/app.js +++ b/app.js @@ -25,12 +25,12 @@ App({ wx.setStorageSync('userinfo', res.data.userinfo) if(res.data.userinfo.role_name == '游客' && this.globalData.rlogin){ //未注册用户 - wx.reLaunch({ - url: '/pages/login/login', - }) + // wx.reLaunch({ + // url: '/pages/login/login', + // }) } if(this.callBackUserinfo){ - // debugger; + this.callBackUserinfo(res.data.userinfo); } } @@ -95,8 +95,8 @@ App({ session_key:'', userInfo: {}, userinfo: {}, // 服务器传回的消费者信息 - host: 'https://qw.ctc-zc.com/api', - mediahost: 'https://qw.ctc-zc.com', + host: 'https://dppz.ctc.ac.cn/api', + mediahost: 'https://dppz.ctc.ac.cn/', token : '', rlogin:true } diff --git a/app.json b/app.json index de2ac31..2fad41b 100644 --- a/app.json +++ b/app.json @@ -52,20 +52,29 @@ "pages/video/index", "pages/video/play", "pages/protocol/index", - "pages/protocol/Privacy" + "pages/protocol/Privacy", + "pages/my/certificate", + "pages/skill/index", + "pages/skill/detail", + "pages/youpei/company", + "pages/youpei/detail", + "pages/puzhuang/index", + "pages/puzhuang/detail", + "pages/youpei/illustrate", + "pages/puzhuang/typelist" ], "window": { "backgroundTextStyle": "light", "navigationBarBackgroundColor": "#ffffff", - "navigationBarTitleText": "国检集团气味学堂", + "navigationBarTitleText": "地坪铺装工工匠库", "navigationBarTextStyle": "black" }, "tabBar": { "color": "#000000", - "selectedColor": "#438af4", + "selectedColor": "#7bbd52", "borderStyle": "black", "backgroundColor": "#ffffff", - "fontSize":"14px", + "fontSize": "14px", "list": [ { "pagePath": "pages/main/main", @@ -79,6 +88,12 @@ "selectedIconPath": "images/file1.png", "text": "学习资料" }, + { + "pagePath": "pages/material/video", + "iconPath": "images/file.png", + "selectedIconPath": "images/file1.png", + "text": "视频" + }, { "pagePath": "pages/article/index", "iconPath": "images/news.png", @@ -97,10 +112,12 @@ "kbone": true, "weui": true }, - "usingComponents": { "mp-icon": "weui-miniprogram/icon/icon"}, + "usingComponents": { + "mp-icon": "weui-miniprogram/icon/icon" + }, "plugins": { - "tencentvideo": { - "version": "2.1.15", + "player": { + "version": "2.6.1", "provider": "wxa75efa648b60994b" } }, diff --git a/app.wxss b/app.wxss index a0b1cba..bb6ad6a 100644 --- a/app.wxss +++ b/app.wxss @@ -28,20 +28,20 @@ } */ button[type='primary'] { - background-color: #438af4!important; + background-color: #7bbd52!important; } button[disabled][type='primary'] { background-color: #fafafa!important; } /* .weui-cells_radio .weui-check[aria-checked=true]+.weui-icon-checked { - color: #438af4!important; + color: #7bbd52!important; } */ .weui-cells_radio .weui-check[aria-checked=false]+.weui-icon-checked { color: #ffffff!important; } -/* .weui-cells_radio .weui-check[aria-checked=true]+.weui-icon-checked{color:#438af4!important;-webkit-mask-image:url(data:image/svg+xml,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M12%2022C6.477%2022%202%2017.523%202%2012S6.477%202%2012%202s10%204.477%2010%2010-4.477%2010-10%2010zm-1.177-7.86l-2.765-2.767L7%2012.431l3.119%203.121a1%201%200%20001.414%200l5.952-5.95-1.062-1.062-5.6%205.6z%22%2F%3E%3C%2Fsvg%3E)!important;mask-image:url(data:image/svg+xml,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M12%2022C6.477%2022%202%2017.523%202%2012S6.477%202%2012%202s10%204.477%2010%2010-4.477%2010-10%2010zm-1.177-7.86l-2.765-2.767L7%2012.431l3.119%203.121a1%201%200%20001.414%200l5.952-5.95-1.062-1.062-5.6%205.6z%22%2F%3E%3C%2Fsvg%3E)!important} */ -.weui-cells_checkbox .weui-check[aria-checked=true]+.weui-icon-checked{color:#438af4!important;mask-image:url(data:image/svg+xml,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2240%22%20height%3D%2240%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20stroke%3D%22%23000000%22%20strokeWidth%3D%2220%22%20strokeLinecap%3D%22round%22%20strokeLinejoin%3D%22round%22%3E%3Ccircle%20cx%3D%2212%22%20cy%3D%2212%22%20r%3D%2210%22%3E%3C%2Fcircle%3E%3Ccircle%20cx%3D%2212%22%20cy%3D%2212%22%20r%3D%223%22%3E%3C%2Fcircle%3E%3C%2Fsvg%3E)!important;-webkit-mask-image:url(data:image/svg+xml,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2240%22%20height%3D%2240%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20stroke%3D%22%23000000%22%20strokeWidth%3D%2220%22%20strokeLinecap%3D%22round%22%20strokeLinejoin%3D%22round%22%3E%3Ccircle%20cx%3D%2212%22%20cy%3D%2212%22%20r%3D%2210%22%3E%3C%2Fcircle%3E%3Ccircle%20cx%3D%2212%22%20cy%3D%2212%22%20r%3D%223%22%3E%3C%2Fcircle%3E%3C%2Fsvg%3E)!important; +/* .weui-cells_radio .weui-check[aria-checked=true]+.weui-icon-checked{color:#7bbd52!important;-webkit-mask-image:url(data:image/svg+xml,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M12%2022C6.477%2022%202%2017.523%202%2012S6.477%202%2012%202s10%204.477%2010%2010-4.477%2010-10%2010zm-1.177-7.86l-2.765-2.767L7%2012.431l3.119%203.121a1%201%200%20001.414%200l5.952-5.95-1.062-1.062-5.6%205.6z%22%2F%3E%3C%2Fsvg%3E)!important;mask-image:url(data:image/svg+xml,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M12%2022C6.477%2022%202%2017.523%202%2012S6.477%202%2012%202s10%204.477%2010%2010-4.477%2010-10%2010zm-1.177-7.86l-2.765-2.767L7%2012.431l3.119%203.121a1%201%200%20001.414%200l5.952-5.95-1.062-1.062-5.6%205.6z%22%2F%3E%3C%2Fsvg%3E)!important} */ +.weui-cells_checkbox .weui-check[aria-checked=true]+.weui-icon-checked{color:#7bbd52!important;mask-image:url(data:image/svg+xml,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2240%22%20height%3D%2240%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20stroke%3D%22%23000000%22%20strokeWidth%3D%2220%22%20strokeLinecap%3D%22round%22%20strokeLinejoin%3D%22round%22%3E%3Ccircle%20cx%3D%2212%22%20cy%3D%2212%22%20r%3D%2210%22%3E%3C%2Fcircle%3E%3Ccircle%20cx%3D%2212%22%20cy%3D%2212%22%20r%3D%223%22%3E%3C%2Fcircle%3E%3C%2Fsvg%3E)!important;-webkit-mask-image:url(data:image/svg+xml,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2240%22%20height%3D%2240%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20stroke%3D%22%23000000%22%20strokeWidth%3D%2220%22%20strokeLinecap%3D%22round%22%20strokeLinejoin%3D%22round%22%3E%3Ccircle%20cx%3D%2212%22%20cy%3D%2212%22%20r%3D%2210%22%3E%3C%2Fcircle%3E%3Ccircle%20cx%3D%2212%22%20cy%3D%2212%22%20r%3D%223%22%3E%3C%2Fcircle%3E%3C%2Fsvg%3E)!important; } .weui-cells_radio .weui-check[aria-checked=true]+.weui-icon-checked{ - color:#438af4!important;mask-image:url(data:image/svg+xml,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2240%22%20height%3D%2240%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20stroke%3D%22%23000000%22%20strokeWidth%3D%2220%22%20strokeLinecap%3D%22round%22%20strokeLinejoin%3D%22round%22%3E%3Ccircle%20cx%3D%2212%22%20cy%3D%2212%22%20r%3D%2210%22%3E%3C%2Fcircle%3E%3Ccircle%20cx%3D%2212%22%20cy%3D%2212%22%20r%3D%223%22%3E%3C%2Fcircle%3E%3C%2Fsvg%3E)!important;-webkit-mask-image:url(data:image/svg+xml,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2240%22%20height%3D%2240%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20stroke%3D%22%23000000%22%20strokeWidth%3D%2220%22%20strokeLinecap%3D%22round%22%20strokeLinejoin%3D%22round%22%3E%3Ccircle%20cx%3D%2212%22%20cy%3D%2212%22%20r%3D%2210%22%3E%3C%2Fcircle%3E%3Ccircle%20cx%3D%2212%22%20cy%3D%2212%22%20r%3D%223%22%3E%3C%2Fcircle%3E%3C%2Fsvg%3E)!important; + color:#7bbd52!important;mask-image:url(data:image/svg+xml,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2240%22%20height%3D%2240%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20stroke%3D%22%23000000%22%20strokeWidth%3D%2220%22%20strokeLinecap%3D%22round%22%20strokeLinejoin%3D%22round%22%3E%3Ccircle%20cx%3D%2212%22%20cy%3D%2212%22%20r%3D%2210%22%3E%3C%2Fcircle%3E%3Ccircle%20cx%3D%2212%22%20cy%3D%2212%22%20r%3D%223%22%3E%3C%2Fcircle%3E%3C%2Fsvg%3E)!important;-webkit-mask-image:url(data:image/svg+xml,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2240%22%20height%3D%2240%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20stroke%3D%22%23000000%22%20strokeWidth%3D%2220%22%20strokeLinecap%3D%22round%22%20strokeLinejoin%3D%22round%22%3E%3Ccircle%20cx%3D%2212%22%20cy%3D%2212%22%20r%3D%2210%22%3E%3C%2Fcircle%3E%3Ccircle%20cx%3D%2212%22%20cy%3D%2212%22%20r%3D%223%22%3E%3C%2Fcircle%3E%3C%2Fsvg%3E)!important; } \ No newline at end of file diff --git a/images/file.png b/images/file.png index 53a1fbf..3135b3d 100644 Binary files a/images/file.png and b/images/file.png differ diff --git a/images/file1.png b/images/file1.png index f417119..1dd527e 100644 Binary files a/images/file1.png and b/images/file1.png differ diff --git a/images/home.png b/images/home.png index ffa2186..0daf0f7 100644 Binary files a/images/home.png and b/images/home.png differ diff --git a/images/home1.png b/images/home1.png index 28cee39..0596591 100644 Binary files a/images/home1.png and b/images/home1.png differ diff --git a/images/lianxi.png b/images/lianxi.png new file mode 100644 index 0000000..114c725 Binary files /dev/null and b/images/lianxi.png differ diff --git a/images/logoImg.png b/images/logoImg.png index ec30cf1..0ce5b1e 100644 Binary files a/images/logoImg.png and b/images/logoImg.png differ diff --git a/images/logoimage.png b/images/logoimage.png new file mode 100644 index 0000000..9b18d95 Binary files /dev/null and b/images/logoimage.png differ diff --git a/images/news.png b/images/news.png index f11afa2..1566518 100644 Binary files a/images/news.png and b/images/news.png differ diff --git a/images/news1.png b/images/news1.png index 2da0d92..fdbd869 100644 Binary files a/images/news1.png and b/images/news1.png differ diff --git a/images/pingjun.png b/images/pingjun.png index d8366b9..bbcd5e1 100644 Binary files a/images/pingjun.png and b/images/pingjun.png differ diff --git a/images/putype.png b/images/putype.png new file mode 100644 index 0000000..ce3cfa8 Binary files /dev/null and b/images/putype.png differ diff --git a/images/pz1.png b/images/pz1.png new file mode 100644 index 0000000..b75dd79 Binary files /dev/null and b/images/pz1.png differ diff --git a/images/pz2.png b/images/pz2.png new file mode 100644 index 0000000..7b55807 Binary files /dev/null and b/images/pz2.png differ diff --git a/images/pz3.png b/images/pz3.png new file mode 100644 index 0000000..455d575 Binary files /dev/null and b/images/pz3.png differ diff --git a/images/pz4.png b/images/pz4.png new file mode 100644 index 0000000..1200cd6 Binary files /dev/null and b/images/pz4.png differ diff --git a/images/pz5.png b/images/pz5.png new file mode 100644 index 0000000..4a9adac Binary files /dev/null and b/images/pz5.png differ diff --git a/images/pz6.png b/images/pz6.png new file mode 100644 index 0000000..d2c319b Binary files /dev/null and b/images/pz6.png differ diff --git a/images/right.png b/images/right.png new file mode 100644 index 0000000..626c121 Binary files /dev/null and b/images/right.png differ diff --git a/images/right1.png b/images/right1.png new file mode 100644 index 0000000..53c519d Binary files /dev/null and b/images/right1.png differ diff --git a/images/share.png b/images/share.png new file mode 100644 index 0000000..d10ed0b Binary files /dev/null and b/images/share.png differ diff --git a/images/shoucang.png b/images/shoucang.png index b3758c1..a99355b 100644 Binary files a/images/shoucang.png and b/images/shoucang.png differ diff --git a/images/shoucang1.png b/images/shoucang1.png index 7ee7299..a744f6c 100644 Binary files a/images/shoucang1.png and b/images/shoucang1.png differ diff --git a/images/tiku.png b/images/tiku.png index 6de68cd..488d57b 100644 Binary files a/images/tiku.png and b/images/tiku.png differ diff --git a/images/user.png b/images/user.png index 32b2866..904c9b7 100644 Binary files a/images/user.png and b/images/user.png differ diff --git a/images/user1.png b/images/user1.png index f46e148..cc7d47a 100644 Binary files a/images/user1.png and b/images/user1.png differ diff --git a/images/workType.png b/images/workType.png index 83e1ea6..5670054 100644 Binary files a/images/workType.png and b/images/workType.png differ diff --git a/images/youpeilogo.png b/images/youpeilogo.png new file mode 100644 index 0000000..0e44bd0 Binary files /dev/null and b/images/youpeilogo.png differ diff --git a/images/zhengshu.png b/images/zhengshu.png new file mode 100644 index 0000000..73f6ad4 Binary files /dev/null and b/images/zhengshu.png differ diff --git a/pages/admin/login.wxml b/pages/admin/login.wxml index 95451ea..6b0ffad 100644 --- a/pages/admin/login.wxml +++ b/pages/admin/login.wxml @@ -1,7 +1,7 @@ - 中科辐射学堂 + 地坪铺装工 管理员登录 diff --git a/pages/admin/login.wxss b/pages/admin/login.wxss index 4628f97..9814657 100644 --- a/pages/admin/login.wxss +++ b/pages/admin/login.wxss @@ -1,6 +1,6 @@ /* pages/admin/login.wxss */ .page{ - background: linear-gradient(to bottom, #438af4 10%, #438af4 40%, #94c0e6); + background: linear-gradient(to bottom, #7bbd52 10%, #7bbd52 40%, #94c0e6); } .loginText{ color: #ffffff; @@ -19,7 +19,7 @@ background-color: #ffffff!important; border-radius: 50rpx; font-weight: 500; - color: #438af4; + color: #7bbd52; } .loginItem{ margin-bottom: 20rpx; diff --git a/pages/article/detail.js b/pages/article/detail.js index ad83dd9..d187229 100644 --- a/pages/article/detail.js +++ b/pages/article/detail.js @@ -74,6 +74,7 @@ Page({ }) api.request(`/cms/article/${id}/`,'GET').then(res => { // res.data.content = res.data.content.replace(/"media/g, '"'+getApp().globalData.mediahost + '/media').replace(/\ {}, diff --git a/pages/article/detail.wxml b/pages/article/detail.wxml index 03a6179..b385ee6 100644 --- a/pages/article/detail.wxml +++ b/pages/article/detail.wxml @@ -5,7 +5,7 @@ {{title}} 置顶 - {{ifrom}} + {{update_time}} diff --git a/pages/article/index.js b/pages/article/index.js index ceb5d20..0dbe1b8 100644 --- a/pages/article/index.js +++ b/pages/article/index.js @@ -9,10 +9,13 @@ Page({ results: [ // {id:1,title:"开发需求",is_top:true,ifrom:"第一条咨询",update_time:"2022-10-01"} ], + type_: {1:"技能大赛",2:"铺装工匠",3:"培训信息",4:"大赛信息"}, + typeData:[{name:'培训信息',value:3},{name:'大赛信息',value:4}],//{1:"技能大赛",2:"铺装工匠",3:"培训信息",4:"大赛信息"}, count:0, query: { page: 1, - limit: 10 + limit: 10, + type:3 } }, @@ -24,7 +27,15 @@ Page({ wx.stopPullDownRefresh(); that.getList(that.data.query) }, - +//tap切换 +typeChange(e){ + this.setData({ + ['query.type']:e.target.dataset.type, + ['query.page']:1 + }) + this.data.query.type = e.target.dataset.type + this.getList(); +}, /** * 生命周期函数--监听页面初次渲染完成 */ @@ -39,6 +50,7 @@ Page({ }, getList: function () { var that = this + api.request('/cms/article/', 'GET', that.data.query).then(res => { if (that.data.query.page == 1) { that.data.results = res.data.results diff --git a/pages/article/index.wxml b/pages/article/index.wxml index d031610..e6d7afb 100644 --- a/pages/article/index.wxml +++ b/pages/article/index.wxml @@ -1,20 +1,33 @@ - - {{count}}条资讯 - - - - - + + + + + {{count}}条数据 + + + + + + + + + {{item.title}} + + 置顶 - {{item.update_time}} - {{item.ifrom}} + + {{item.update_time}} - + + + diff --git a/pages/article/index.wxss b/pages/article/index.wxss index b0a8c18..27055ff 100644 --- a/pages/article/index.wxss +++ b/pages/article/index.wxss @@ -1,6 +1,34 @@ .head{ color:#fff; - background-color: #438af4; + background-color: #79be53; text-align: center; + height:25px +} +.tabItem{ + height: 100rpx; + line-height: 100rpx; + text-align: center; + position: relative; + background-color: #f6f6f6; +} +.activeType{ + background-color: #ffffff; +} +.activeLine{ + height: 60rpx; + width: 10rpx; + position: absolute; + top: 20rpx; + background-color: #79be53; +} + +.listWrap{ + overflow: hidden; + margin:10px; + background: #ffffff; +} +.listItemWrap{ + position: relative; + padding:20rpx 20rpx 0 20rpx; } \ No newline at end of file diff --git a/pages/articles/detail.js b/pages/articles/detail.js new file mode 100644 index 0000000..d187229 --- /dev/null +++ b/pages/articles/detail.js @@ -0,0 +1,89 @@ +// pages/article/detail.js +const api = require("../../utils/request.js"); +Page({ + + /** + * 页面的初始数据 + */ + data: { + elink_f:'', + domain:getApp().globalData.mediahost + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + this.getDetail(options.id) + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function () { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function () { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function () { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function () { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function () { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function () { + + }, + + getDetail: function (id) { + var that = this + wx.showLoading({ + title: '加载中', + mask:true + }) + api.request(`/cms/article/${id}/`,'GET').then(res => { + // res.data.content = res.data.content.replace(/"media/g, '"'+getApp().globalData.mediahost + '/media').replace(/\ {}, + }) + }).catch(res=>{ + wx.hideLoading({ + complete: (res) => {}, + }) + }) + }, + +}) \ No newline at end of file diff --git a/pages/articles/detail.json b/pages/articles/detail.json new file mode 100644 index 0000000..c77cd44 --- /dev/null +++ b/pages/articles/detail.json @@ -0,0 +1,5 @@ +{ + "usingComponents": { + "mp-html": "/components/mp-html/index" + } +} \ No newline at end of file diff --git a/pages/articles/detail.wxml b/pages/articles/detail.wxml new file mode 100644 index 0000000..b385ee6 --- /dev/null +++ b/pages/articles/detail.wxml @@ -0,0 +1,16 @@ + + + + + {{title}} + + 置顶 + + {{update_time}} + + + + + + + diff --git a/pages/articles/detail.wxss b/pages/articles/detail.wxss new file mode 100644 index 0000000..8f9aaa9 --- /dev/null +++ b/pages/articles/detail.wxss @@ -0,0 +1,23 @@ +/* pages/article/detail.wxss */ +.page__title { + font-size: 18px; +} +.weui-article{ + padding: 0!important; +} +.weui-article__h1{ + padding: 24rpx 24rpx 0rpx 24rpx; + margin-bottom: 0; + background-color: #ffffff; +} +.page__desc{ + margin-top: 0; + padding: 10rpx 24rpx 15rpx 24rpx; + background-color: #ffffff; + margin-bottom: 20rpx; + display: flex; +} +.weui-article__p{ + padding: 24rpx; + background-color: #ffffff; +} \ No newline at end of file diff --git a/pages/articles/index.js b/pages/articles/index.js new file mode 100644 index 0000000..a9625ed --- /dev/null +++ b/pages/articles/index.js @@ -0,0 +1,118 @@ +// pages/lianxi/index.js +const api = require("../../utils/request.js"); +Page({ + + /** + * 页面的初始数据 + */ + data: { + results: [ + // {id:1,title:"开发需求",is_top:true,ifrom:"第一条咨询",update_time:"2022-10-01"} + ], + type_: {1:"技能大赛",2:"铺装工匠",3:"培训信息",4:"大赛信息"}, + typeData:[{name:'培训信息',value:3},{name:'大赛信息',value:4}],//{1:"技能大赛",2:"铺装工匠",3:"培训信息",4:"大赛信息"}, + count:0, + query: { + page: 1, + limit: 10, + type:3 + } + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function () { + var that = this + wx.stopPullDownRefresh(); + that.getList(that.data.query) + }, +//tap切换 +typeChange(e){ + this.setData({ + ['query.type']:e.target.dataset.type, + ['query.page']:1 + }) + this.data.query.type = e.target.dataset.type + this.getList(); +}, + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function () { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function () { + }, + getList: function () { + var that = this + api.request('/cms/article/', 'GET', that.data.query).then(res => { + if (that.data.query.page == 1) { + that.data.results = res.data.results + } else { + that.data.results = that.data.results.concat(res.data.results) + } + for(var i = 0;i + + + + {{count}}条数据 + + + {{item.name}} + + + + + + + + + + + + {{item.title}} + + + + + 置顶 + + {{item.update_time}} + + + + + + + + diff --git a/pages/articles/index.wxss b/pages/articles/index.wxss new file mode 100644 index 0000000..277611e --- /dev/null +++ b/pages/articles/index.wxss @@ -0,0 +1,42 @@ + +.head{ + color:#fff; + background-color: #79be53; + text-align: center; + height:25px +} +.tabItem{ + height: 100rpx; + line-height: 100rpx; + text-align: center; + position: relative; + background-color: #f6f6f6; +} +.activeType{ + background-color: #ffffff; +} +.activeLine{ + height: 60rpx; + width: 10rpx; + position: absolute; + top: 20rpx; + background-color: #79be53; +} +.tabWrap{ + float: left; + height: 100%; + width: 200rpx; + border-right: 1rpx solid #eeeeee; + position: fixed; + background: #ffffff; +} +.listWrap{ + overflow: hidden; + margin-top:0px; + padding-left: 200rpx; + background: #ffffff; +} +.listItemWrap{ + position: relative; + padding:20rpx 20rpx 0 20rpx; +} \ No newline at end of file diff --git a/pages/candidate/detail.js b/pages/candidate/detail.js index 739ee8f..6e426da 100644 --- a/pages/candidate/detail.js +++ b/pages/candidate/detail.js @@ -6,14 +6,13 @@ Page({ * 页面的初始数据 */ data: { - + level:{4:'初级工',3:'中级工',2:'高级工',1:'技师',0:'高级技师'}, }, /** * 生命周期函数--监听页面加载 */ onLoad: function (options) { - debugger; console.log(options) let id = options.id this.getDetail(id) diff --git a/pages/candidate/detail.wxml b/pages/candidate/detail.wxml index 624d01e..28e4293 100644 --- a/pages/candidate/detail.wxml +++ b/pages/candidate/detail.wxml @@ -1,26 +1,46 @@ + - + - - -

- {{candidate.consumer_name}} - {{candidate.number}} -

- - {{candidate.ID_number}} - - - {{candidate.workscope_name}} - - - {{candidate.start_date}}至{{candidate.end_date}} - - + + +

+ {{candidate.consumer_name}} +

+ + + 性别： {{candidate.gender}} + + + 证书编号： {{candidate.number}} + + + 公司： {{candidate.company_name}} + + + 身份证号： {{candidate.ID_number}} + + + 职业工种：地坪铺装工 + + + + 职业方向： {{candidate.workscope_name}} + + + 职业等级： {{ level[candidate.opllevel]}} + + + 发证时间 {{candidate.issue_date}} + + + + diff --git a/pages/candidate/detail.wxss b/pages/candidate/detail.wxss index 1cbb5de..3d694e9 100644 --- a/pages/candidate/detail.wxss +++ b/pages/candidate/detail.wxss @@ -4,4 +4,32 @@ height:200rpx; margin-top: 50rpx; border-radius: 100rpx; +} +.weui-media-box { + border: 1px solid #e5e5e5; + border-radius: 8px; + padding: 16px; + margin: 10px; + background-color: #f9f9f9; + box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1); +} + +.weui-media-box__title { + font-size: 25px; + font-weight: bold; + margin-bottom: 10px; +} + +.weui-media-box__desc { + font-size: 16px; + color: #666; + margin-bottom: 6px; +} + +.text-blue { + color: #79be53; +} + +.text-center { + text-align: center; } \ No newline at end of file diff --git a/pages/candidate/index.js b/pages/candidate/index.js index 8b210da..804cac1 100644 --- a/pages/candidate/index.js +++ b/pages/candidate/index.js @@ -10,9 +10,43 @@ Page({ query: { page: 1, limit: 10 - } + }, + query2: { + page: 1, + limit: 10000 + }, + currentTab: 'tab1' ,// 默认选中 Tab 1 + consumers: [ + ], + searchQuery: '', + level:{4:'初级工',3:'中级工',2:'高级工',1:'技师',0:'高级技师'}, }, + switchTab: function(event) { + const tab = event.currentTarget.dataset.tab; + this.setData({ + currentTab: tab + }); + }, + onSearchInput: function (event) { + const query = event.detail.value.toLowerCase(); + console.log(query) + if(query=="") + { + this.getList2(); + } + + const consumers = this.data.consumers.filter(item => { + return Object.values(item).some(value => + String(value).toLowerCase().includes(query) + ); + }); + this.setData({ consumers }); + + }, + onLoad: function () { + this.getList2(); + }, onShow: function () { this.getList(); @@ -30,6 +64,56 @@ Page({ wx.hideLoading() ) }, + //获证信息统计，查询所有证书 + getList2: function() { + var that = this + wx.showLoading({ + title: '正在加载...', + }) + api.request('/crm/candidate/', 'GET',that.data.query2).then(res => { + if (that.data.query2.page == 1) { + that.data.results = res.data.results + } else { + that.data.results = that.data.results.concat(res.data.results) + } + this.setData({ + consumers:res.data.results, + }) + + }).catch( + wx.hideLoading() + ) + }, + + //获证信息统计点击弹窗展示详细信息 + showModal: function (event) { + const item = event.currentTarget.dataset.item; + console.log(item) + // level:{2:'初级工',1:'中级工',0:'高级工',4:'技师',3:'高级技师'}, + let level = "" + switch(item.opllevel){ + case 0: + level='高级技师'; + break; + case 1: + level='技师'; + break; + case 2: + level='高级工'; + break; + case 3: + level='中级工'; + break; + default: + level='初级工'; + + } + wx.showModal({ + title: '基本信息', + content: `姓名: ${item.consumer_name} \n 性别: ${item.gender}\n 职业方向: 地坪铺装工 \n职业等级: ${level}\n 获证时间: ${item.issue_date}\n 所在企业: ${item.company_name}`, + showCancel: false, + }); + }, bindinput: function(e){ this.setData({ search:e.detail.value @@ -66,14 +150,14 @@ Page({ // }) }else{ wx.showToast({ - title: '请填写正确的证书编号或身份证号', + title: '请填写正确的身份证号', icon: 'none', duration: 1500 }) } }, toDetail: function(e){ - debugger; + var url = e.currentTarget.dataset.url; var id = e.currentTarget.dataset.id; console.log(id) diff --git a/pages/candidate/index.wxml b/pages/candidate/index.wxml index 08fb4fd..6191ea9 100644 --- a/pages/candidate/index.wxml +++ b/pages/candidate/index.wxml @@ -1,12 +1,47 @@ - - - + + + 获证信息统计 + 证书真伪查询 + + + + + + 姓名 + 所在企业 + 职业等级 + 职业方向 + + + + + + + + + + + + + {{item.consumer_name}} + {{item.company_name}} + {{level[item.opllevel]}} + {{item.workscope_name}} + + + + + + + + + 查询 - 证书列表 @@ -20,7 +55,7 @@ - 通过考核 + 查看详情 @@ -28,4 +63,9 @@ 暂无证书信息 + + + + + \ No newline at end of file diff --git a/pages/candidate/index.wxss b/pages/candidate/index.wxss index f8d74e7..be2cb5a 100644 --- a/pages/candidate/index.wxss +++ b/pages/candidate/index.wxss @@ -1,4 +1,7 @@ /* pages/candidate/index.wxss */ +page{ + background: #ffffff; +} .searWrap{ display: flex; /* margin-top: 30rpx; */ @@ -11,10 +14,10 @@ height: 100rpx; line-height: 100rpx; text-align: center; - color: #ffffff; + color: #131212; border-radius: 40rpx; margin-right: 20rpx; - background-color:#438af4 ; + background-color:#faad14 ; } .infoInput{ flex: 4; @@ -37,4 +40,69 @@ padding-left: 30rpx; line-height: 70rpx; font-size: 36rpx; +} + +.container { + padding: 0px; + background-color: #ffffff; +} + +.tab { + display: flex; + color:#ffffff + +} + +.tab-item { + flex: 1; + padding: 10px; + text-align: center; + background-color: #79be53; + cursor: pointer; +} + +.tab-item:hover { + background-color: #01764a; +} + +.tab-content { + margin-top: 20px; + padding: 3px; +} + + + +.search-input { + margin-bottom: 16px; + width: 100%; + height:40px; + border-radius: 10rpx; + color: #131212; + background-color: rgb(243, 241, 241); +} + +.table { + border: 1px solid #ccc; + width: 100%; +} + +.table-header, .table-row { + display: flex; + justify-content: space-between; + padding: 10px; +} + +.table-header { + background-color: #00adca; + color: #f7f8f4; + font-weight: bold; + text-align: center; +} + +.table-row text { + border-bottom: 1px solid #eee; + text-align: center; + white-space: nowrap; /* 不换行 */ + overflow: hidden; /* 隐藏超出部分 */ + text-overflow: ellipsis; /* 省略号 */ } \ No newline at end of file diff --git a/pages/candidate/my.wxss b/pages/candidate/my.wxss index 8402ac9..d35572e 100644 --- a/pages/candidate/my.wxss +++ b/pages/candidate/my.wxss @@ -6,7 +6,7 @@ text-align: center; color: #ffffff; border-radius: 20rpx; - background-color:#438af4 ; + background-color:#7bbd52 ; } .noCertificate{ color: #666666; diff --git a/pages/collect/main.wxml b/pages/collect/main.wxml index ab7d8ca..48fc63a 100644 --- a/pages/collect/main.wxml +++ b/pages/collect/main.wxml @@ -51,7 +51,7 @@ 回答有误! 正确答案是{{tm_current.right}},你的答案是{{tm_current.user_answer}} - 解析: + 解析: {{tm_current.resolution}} 无 diff --git a/pages/collect/main.wxss b/pages/collect/main.wxss index e04f315..256f051 100644 --- a/pages/collect/main.wxss +++ b/pages/collect/main.wxss @@ -2,7 +2,7 @@ width:100%; height:30px; color:#fff; - background-color: #438af4; + background-color: #7bbd52; text-align: center; } .btns{ @@ -22,7 +22,7 @@ } .txlabel{ color:#fff; - background-color: #438af4; + background-color: #7bbd52; border-radius: 2px; font-weight: 500; font-size: 30rpx; diff --git a/pages/cuoti/index.wxml b/pages/cuoti/index.wxml index 82a9ea0..0961456 100644 --- a/pages/cuoti/index.wxml +++ b/pages/cuoti/index.wxml @@ -74,7 +74,7 @@ 回答有误! 正确答案是{{currentTm.right}},你的答案是{{currentTm.user_answer}} - 解析: + 解析: {{tm_current.question.resolution}} 暂无解析 diff --git a/pages/cuoti/index.wxss b/pages/cuoti/index.wxss index 51a488a..83cc3bc 100644 --- a/pages/cuoti/index.wxss +++ b/pages/cuoti/index.wxss @@ -13,7 +13,7 @@ } .txlabel{ color:#fff; - background-color: #438af4; + background-color: #7bbd52; border-radius: 2px; font-weight: 500; font-size: 30rpx; @@ -31,7 +31,7 @@ width: 100%; position: fixed; padding: 15rpx 0; - background-color:#438af4 + background-color:#7bbd52 } .typeBtns{ margin: auto; @@ -48,7 +48,7 @@ border-radius: 6rpx 0 0 6rpx; } .datiBtn{ - color: #438af4; + color: #7bbd52; background: #ffffff; } @@ -70,7 +70,7 @@ } /* .weui-cells_radio .weui-check[aria-checked=true]+.weui-icon-checked { - color: #438af4; + color: #7bbd52; } .weui-cells_radio .weui-check[aria-checked=false]+.weui-icon-checked { color: #ffffff; diff --git a/pages/exam/index.wxss b/pages/exam/index.wxss index 2e51622..7a54307 100644 --- a/pages/exam/index.wxss +++ b/pages/exam/index.wxss @@ -12,7 +12,7 @@ color: #ffffff; border-radius: 40rpx; font-size: 36rpx; - background-color:#438af4 ; + background-color:#7bbd52 ; } diff --git a/pages/exam/total.wxml b/pages/exam/total.wxml index 0f3e551..b20ff68 100644 --- a/pages/exam/total.wxml +++ b/pages/exam/total.wxml @@ -1,7 +1,7 @@ - 考试次数：{{total}}（次） + 模考次数：{{total}}（次） 通过率：{{pass_rate}}（%） 平均分：{{avg_score}} diff --git a/pages/lianxi/index.wxml b/pages/lianxi/index.wxml index 7551426..0c1ce39 100644 --- a/pages/lianxi/index.wxml +++ b/pages/lianxi/index.wxml @@ -2,7 +2,7 @@ 搜题 - {{workscopeName}} + {{workscopeName}} diff --git a/pages/lianxi/index.wxss b/pages/lianxi/index.wxss index 2f3b9f4..e913830 100644 --- a/pages/lianxi/index.wxss +++ b/pages/lianxi/index.wxss @@ -7,7 +7,7 @@ margin-top: 0!important; } .blueBold{ - color:#438af4; + color:#7bbd52; font-weight:bold } .kaishilianxi{ @@ -15,8 +15,8 @@ padding: 6rpx 15rpx; font-size: 28rpx; border-radius: 40rpx; - border: 1rpx solid #438af4; - color: #438af4; + border: 1rpx solid #7bbd52; + color: #7bbd52; position: absolute; top: 50%; right: 10rpx; @@ -25,7 +25,7 @@ .searchBtn{ position: absolute; right: 20rpx; - background: #438af4; + background: #7bbd52; color: #ffffff; font-size: 28rpx; padding: 6rpx 30rpx; diff --git a/pages/lianxi/main.js b/pages/lianxi/main.js index a24d194..f8a5918 100644 --- a/pages/lianxi/main.js +++ b/pages/lianxi/main.js @@ -17,13 +17,13 @@ Page({ page:1, domain:getApp().globalData.mediahost, moShi:'背题模式', - isTest:true, + isTest:true, processCard:false, }, changeM: function () { var that = this; - if(that.data.isTest){ - that.setData({ + if(that.data.isTest){ + that.setData({ isTest:false, }) that.showOptions() @@ -32,23 +32,23 @@ Page({ isTest:true, }) } - // if(that.data.moShi=='看题模式'){ - // that.setData({ - // moShi:'背题模式', - // }) - // that.showOptions() - // }else{ - // that.setData({ - // moShi: '看题模式', - // }) - // } + if(that.data.moShi=='看题模式'){ + that.setData({ + moShi:'背题模式', + }) + that.showOptions() + }else{ + that.setData({ + moShi: '看题模式', + }) + } }, radioChange: function(e) { var that = this that.data.tm_current['user_answer'] = e.detail.value that.data.tms[that.data.tm_index] = that.data.tm_current that.showAnswer() - if (!that.data.isTest && that.data.ydtms.indexOf(that.data.tm_current.id) == -1) { + if (that.data.moShi == '背题模式' && that.data.ydtms.indexOf(that.data.tm_current.id) == -1) { that.data.ydtms.push(that.data.tm_current.id) } }, @@ -56,7 +56,7 @@ Page({ var that = this that.data.tm_current['user_answer'] = e.detail.value that.data.tms[that.data.tm_index] = that.data.tm_current - if (!that.data.isTest && that.data.ydtms.indexOf(that.data.tm_current.id) == -1) { + if (that.data.moShi=='背题模式' && that.data.ydtms.indexOf(that.data.tm_current.id) == -1) { that.data.ydtms.push(that.data.tm_current.id) } }, @@ -106,13 +106,13 @@ Page({ getTms: function() { var that = this var query = { - limit:10, - page:that.data.page, questioncat: that.data.questioncat, ydtms: wx.getStorageSync('cat' + that.data.questioncat.toString()), ydtms_:that.data.ydtms } - api.request('/question/question/exercise/', 'POST', query).then(res => { + console.log(query); + api.request('/question/question/exercise/?limit=10&page='+that.data.page, 'POST', query).then(res => { + console.log(res.data.results); if(res.code>=200){ for (var i = 0; i < res.data.results.length; i++) { if(res.data.results[i].img){ @@ -122,6 +122,7 @@ Page({ that.data.tms = that.data.tms.concat(res.data.results) that.showTm(that.data.tm_index) //展示题目和答案 + console.log(res.data); that.setData({ tmtotal: res.data.count, }) @@ -147,6 +148,7 @@ Page({ onReachBottom: function() { }, + //展示题目和答案 showTm: function(index) { var that = this if(index that.data.tms.length) { that.data.page = that.data.page + 1 + console.log(that.data.page); that.getTms() } else { that.showTm(tm_index) @@ -226,6 +232,7 @@ Page({ }, + //上题 previous: function() { var that = this var tm_index = that.data.tm_index - 1 @@ -234,6 +241,7 @@ Page({ }) that.showTm(tm_index) }, +//展示选项 showOptions: function() { let tm_current = this.data.tm_current let options = [] @@ -258,6 +266,7 @@ Page({ options: options }) }, + //收藏 shoucang: function() { var that = this var tm_current = that.data.tm_current @@ -286,5 +295,6 @@ Page({ }) } - } + }, + }) \ No newline at end of file diff --git a/pages/lianxi/main.wxml b/pages/lianxi/main.wxml index fe8ee37..48d08fc 100644 --- a/pages/lianxi/main.wxml +++ b/pages/lianxi/main.wxml @@ -85,7 +85,7 @@ ，你的答案:{{tm_current.user_answer}} - 解析: + 解析: {{tm_current.question.resolution}} 暂无解析 @@ -102,8 +102,8 @@ - - + + @@ -113,6 +113,5 @@ - ddddddddddddd \ No newline at end of file diff --git a/pages/lianxi/main.wxss b/pages/lianxi/main.wxss index 03fe6a5..a6526e4 100644 --- a/pages/lianxi/main.wxss +++ b/pages/lianxi/main.wxss @@ -14,7 +14,7 @@ } .txlabel{ color:#fff; - background-color:#438af4; + background-color:#7bbd52; border-radius: 2px; padding: 6rpx 16rpx; font-weight: 500; @@ -39,7 +39,7 @@ position: fixed; padding-bottom: 20rpx; padding: 15rpx; - background-color: #438af4; + background-color: #7bbd52; box-sizing: border-box; } .typeBtns{ @@ -57,7 +57,7 @@ border-radius: 6rpx 0 0 6rpx; } .datiBtn{ - color: #438af4; + color: #7bbd52; background: #ffffff; } diff --git a/pages/login/login.wxml b/pages/login/login.wxml index e3a3a63..1be505c 100644 --- a/pages/login/login.wxml +++ b/pages/login/login.wxml @@ -46,5 +46,5 @@ 《隐私政策》 - Copyright © 2020-2022 国检集团 + \ No newline at end of file diff --git a/pages/login/login.wxss b/pages/login/login.wxss index f71c1f2..74af8f7 100644 --- a/pages/login/login.wxss +++ b/pages/login/login.wxss @@ -1,6 +1,6 @@ /**index.wxss**/ page{ - background: #1576bd; + background: #ffffff; } .userinfo { display: flex; @@ -29,13 +29,13 @@ page{ line-height: 100rpx; padding: 0; font-weight: 500; - background-color: #f15806; + background-color: #79bb52; margin-top: 50rpx; } .loginBtn_visit{ - background-color: #ffffff; - color: #666666; - /* border: 1rpx solid #438af4; */ + background-color: #007241; + color: #ffffff; + /* border: 1rpx solid #7bbd52; */ } .logoImg{ display: block; @@ -52,7 +52,7 @@ page{ border: 1rpx solid #cccccc; } .weui-footer{ - color: #ffffff; + color: #79bc54; } .xieyi{ color: #f5b5b5!important; diff --git a/pages/login/registe/registe.js b/pages/login/registe/registe.js index cd16610..09ae99b 100644 --- a/pages/login/registe/registe.js +++ b/pages/login/registe/registe.js @@ -16,6 +16,7 @@ Page({ that.setData({ userinfo: userinfo }) + }, onShow: function () { let that = this; @@ -126,26 +127,33 @@ Page({ tijiao(){ let userinfo = this.data.userinfo; let p = /^[1-9]\d{5}(18|19|20)\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/; - if(p.test(userinfo.ID_number1)){ + console.log(userinfo); if(userinfo.name!==''&&userinfo.name!==null&&userinfo.name!=='未知'){ api.request('/crm/consumer/improve/', 'POST', userinfo).then(res => { wx.setStorageSync('userinfo', userinfo); + app.globalData.userinfo = userinfo; - wx.switchTab({ - url: '/pages/main/main', - }) + wx.showModal({ + title: '您已注册成功', + content: '登陆后请前往【个人中心】-【工作类别】选择所从事工作类别，即可解锁更多功能！', + showCancel: false, + success: () => { + // 可在此跳转到首页或其他页面 + wx.switchTab({ + + url: '/pages/my/index', + }) + } + }) - }else{ + }) + } + else{ wx.showToast({ icon: 'none', title: '请完善信息后提交', }) } - }else{ - wx.showToast({ - icon: 'none', - title: '请输入正确的身份证号', - }) - } + }, }) diff --git a/pages/login/registe/registe.wxml b/pages/login/registe/registe.wxml index 2eb223a..0605483 100644 --- a/pages/login/registe/registe.wxml +++ b/pages/login/registe/registe.wxml @@ -3,9 +3,9 @@ 姓名 - + - + 身份证号 - + 单位名称 - + 职务 - + + --> + 提交 diff --git a/pages/login/registe/registe.wxss b/pages/login/registe/registe.wxss index 5257cb7..6d22f54 100644 --- a/pages/login/registe/registe.wxss +++ b/pages/login/registe/registe.wxss @@ -83,7 +83,7 @@ font-size: 28rpx; text-decoration: underline; } .loginBtn{ - background-color: #438af4!important; + background-color: #7bbd52!important; border-radius: 50rpx; font-weight: 500; } @@ -91,7 +91,7 @@ font-size: 28rpx; background-color: #ffffff!important; border-radius: 50rpx; font-weight: 500; - color: #438af4; + color: #7bbd52; } diff --git a/pages/main/main.js b/pages/main/main.js index b412e2f..61bf522 100644 --- a/pages/main/main.js +++ b/pages/main/main.js @@ -21,9 +21,7 @@ Page({ nowWork:null, userinfo:{}, msgList: [ - { title: "欢迎使用气味培训平台" }, - { title: "培训报名、考证发证请关注新闻咨询" }, - { title: "注册用户有3次自助模考机会" }, + { title: "“地坪铺装工”工种被纳入《中华人民共和国职业分类大典》" }, ] }, imgH: function (e) { @@ -46,11 +44,11 @@ Page({ userinfo: userinfo, search: that.search.bind(that) }) - if(userinfo.role_name == '游客'||(userinfo.name!==''&&userinfo.name!==null&&userinfo.name!=='未知'&&userinfo.name!==undefined)){}else{ - wx.redirectTo({ - url: '/pages/login/registe/registe', - }) - } + if(userinfo.role_name == '游客'||(userinfo.name!==''&&userinfo.name!==null&&userinfo.name!=='未知'&&userinfo.name!==undefined)){}else{ + wx.redirectTo({ + url: '/pages/login/registe/registe', + }) + } }else{ // debugger; app.callBackUserinfo=res=>{ @@ -60,11 +58,11 @@ Page({ userinfo: userinfo, search: that.search.bind(that) }) - if(userinfo.role_name == '游客'||(userinfo.name!==''&&userinfo.name!==null&&userinfo.name!=='未知'&&userinfo.name!==undefined)){}else{ - wx.redirectTo({ + if(userinfo.role_name == '游客'||(userinfo.name!==''&&userinfo.name!==null&&userinfo.name!=='未知'&&userinfo.name!==undefined)){}else{ + wx.redirectTo({ url: '/pages/login/registe/registe', }) - } + } } } } @@ -135,39 +133,35 @@ Page({ } }, - goFile(){ - wx.switchTab({ - url: '/pages/material/index', - }) - }, - //业务介绍 - goIntroduction(){ - api.request('/cms/article/', 'GET', {page: 1,limit: 10}).then(res => { - let results = res.data.results; - let id = null; - for(let i=0;i - - - - - - - 业务介绍 - - - + + + + - 学习资料 + 技能大赛 - + 证书查询 - - - + + + - 参加考试 + 铺装工匠 + + + + + + + 优培企业 - + 题库练习 - - - - 押卷模考 - - + + 自助模考 - + - 错题集 + 我的错题 {{wrongnum}} - + - 收藏集 - - - - - 考试记录 - - - - - 视频课程 + 我的收藏 + 登陆后，即可刷题学习，参与考试 - 立即登录 + 立即登录 - - - - 气味阈值数据库 - - diff --git a/pages/main/main.wxss b/pages/main/main.wxss index b84ff24..2426eed 100644 --- a/pages/main/main.wxss +++ b/pages/main/main.wxss @@ -2,7 +2,7 @@ page{ background: #ffffff; } .page{ - padding: 20rpx 30rpx; + padding: 40rpx 30rpx; } .searchWrap .weui-search-bar__form{ border-radius: 50rpx; @@ -19,15 +19,24 @@ page{ color: #414040; font-size: 28rpx; display: inline-block; - padding-top: 20rpx; + padding-top: 10rpx; + +} +.topItem2{ + width: 25%; + text-align: center; + color: #414040; + font-size: 28rpx; + display: inline-block; + padding-top: 30rpx; } .topItemImg{ width: 80rpx; } .topItemText{ height: 40rpx; - line-height: 40rpx; - margin-bottom: 10rpx; + line-height: 50rpx; + margin-bottom: 30rpx; color: #666666; /* font-weight: 600; */ } @@ -35,8 +44,8 @@ page{ font-weight: 600; } .searchWrap .weui-search-bar{ - /* background-color: #438af4; */ - background-color: #438af4; + /* background-color: #7bbd52; */ + background-color: #7bbd52; } .swiperImgItem{ height: 300rpx; @@ -51,7 +60,7 @@ page{ margin: auto; border-radius: 15rpx; overflow: hidden; - margin-top: 20rpx; + margin-top: 50rpx; } .swiperTextItem{ box-sizing: border-box; @@ -59,26 +68,26 @@ page{ .swiper_item1 { height: 70rpx; line-height: 70rpx; - font-size: 28rpx; - color:red; + font-size: 24rpx; + color:rgb(54, 52, 52); overflow: hidden; text-overflow: ellipsis; white-space: nowrap; - background: #f7f7f7; + background: #f0eded; } .iconWrap{ width: 120rpx; height: 120rpx; border-radius: 70rpx; - background: #49c9e0; + background: #7bbd52; margin: auto; - margin-bottom: 8rpx; + margin-bottom: 10rpx; } .listItemsWrap{ /* width: 96%; */ margin: 10rpx auto; - margin-top: 20rpx; - padding:10rpx 20rpx; + margin-top: 30rpx; + padding:15rpx 20rpx; box-sizing: border-box; border-radius: 20rpx; background: #f7f7f7; @@ -112,7 +121,7 @@ page{ font-weight: 600; } .iconColor{ - color: #438af4!important; + color: #339a03!important; } .btnsWrap{ margin-top: 20rpx; @@ -121,7 +130,7 @@ page{ line-height: 100rpx; border-radius: 10rpx; color: #ffffff; - background-color: #438af4; + background-color: #007a46; } .yuzhiBtn{ width: 100%; diff --git a/pages/material/index.js b/pages/material/index.js index 43c60b9..f9415c2 100644 --- a/pages/material/index.js +++ b/pages/material/index.js @@ -10,12 +10,10 @@ Page({ results: [], infoShow:false, infoItem:{}, - cateData:['标准文件','文献','指南','未分类'], query: { page: 1, limit: 10, type:'文档', - cate:'标准文件' } }, onLoad: function () { @@ -26,31 +24,10 @@ Page({ }, onShow: function () { var that = this - that.getList(that.data.query) - }, - bindKeyInput(e){ - // debugger; - let that = this - console.log(e.detail.value) - that.setData({ - ['query.search']:e.detail.value - }) - that.getList(that.data.query) - }, - searchFile(){ - let that = this; - this.setData({ - ['query.search']:'' - }) - that.getList(that.data.query) - }, - typeChange(e){ - this.setData({ - ['query.cate']:e.target.dataset.type, - ['query.page']:1 - }) - this.getList(); + that.getList() }, + + itemClick(e){ console.log(e.currentTarget.dataset) let dataset = e.currentTarget.dataset; @@ -62,6 +39,7 @@ Page({ getList: function () { var that = this + that.data.query.type="文档" api.request('/cms/material/', 'GET', that.data.query).then(res => { if (that.data.query.page == 1) { that.data.results = res.data.results diff --git a/pages/material/index.wxml b/pages/material/index.wxml index 99f8ba4..3f26347 100644 --- a/pages/material/index.wxml +++ b/pages/material/index.wxml @@ -21,13 +21,9 @@ --> - - - {{item}} - - - - + + + @@ -39,7 +35,9 @@ {{item.name}} {{item.description}} - {{item.down_count}} + + + @@ -53,7 +51,7 @@ 《{{infoItem.name}}》 资料分类{{infoItem.cate}} - 下载次数：{{infoItem.downcount}} + {{infoItem.description}} 下载 diff --git a/pages/material/index.wxss b/pages/material/index.wxss index f809fb1..c2561b8 100644 --- a/pages/material/index.wxss +++ b/pages/material/index.wxss @@ -30,20 +30,13 @@ width: 10rpx; position: absolute; top: 20rpx; - background-color: #438af4; -} -.tabWrap{ - float: left; - height: 100%; - width: 200rpx; - border-right: 1rpx solid #eeeeee; - position: fixed; - background: #ffffff; + background-color: #7bbd52; } + .listWrap{ overflow: hidden; margin-top:0px; - padding-left: 200rpx; + padding-left: 30rpx; background: #ffffff; } .listItemWrap{ diff --git a/pages/material/video.js b/pages/material/video.js index 0687e03..2a63895 100644 --- a/pages/material/video.js +++ b/pages/material/video.js @@ -1,4 +1,4 @@ -// pages/lianxi/index.js + const api = require("../../utils/request"); Page({ @@ -14,17 +14,20 @@ Page({ } }, onLoad: function () { + var that = this that.getList(that.data.query) }, getList: function () { var that = this api.request('/cms/material/', 'GET', that.data.query).then(res => { + console.log(that.data.results) for(var i=0;i考试须知 一、考试详情 - 名称：{{name}} + 名称：{{name}} 答卷时长：{{limit}}分钟 题型说明： @@ -13,7 +13,7 @@ {{panduan_count}}道判断题,每题{{panduan_score}}分 - 多选题漏选每个正确选项得1分,错选0分 + 多选、错选、漏选均不得分 满分{{total_score}}，{{pass_score}}以上通过 二、.答题须知 @@ -25,7 +25,7 @@ - 开始考试 + 开始考试 \ No newline at end of file diff --git a/pages/my/certificate.js b/pages/my/certificate.js new file mode 100644 index 0000000..a8eb2b3 --- /dev/null +++ b/pages/my/certificate.js @@ -0,0 +1,71 @@ +// pages/exam/certificate.js +const api = require("../../utils/request.js"); +Page({ + + /** + * 页面的初始数据 + */ + data: { + title:'加载中...', + list: [{}],//数据列表 + + + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/pages/my/certificate.json b/pages/my/certificate.json new file mode 100644 index 0000000..ba6552c --- /dev/null +++ b/pages/my/certificate.json @@ -0,0 +1,4 @@ +{ + "usingComponents": {}, + "navigationBarTitleText": "联系方式" +} \ No newline at end of file diff --git a/pages/my/certificate.wxml b/pages/my/certificate.wxml new file mode 100644 index 0000000..aab340e --- /dev/null +++ b/pages/my/certificate.wxml @@ -0,0 +1,15 @@ + + + + + + 中国建筑材料联合会地坪产业分会（简称CFA）是由民政部批准，于2007年12月7日正式成立。协会专业从事地坪行业规划及管理、技术交流、品牌推广、培训、施工等级评定、标准编制、工程仲裁、材料检测国际合作等多项业务，是唯一一家专注地坪行业的全国性社会团体。 + + + 秘书处办公室: + 张松松  + 010-51167641，15810958290 + 董雪梅 + 010-51167914，15011363998 + + diff --git a/pages/my/certificate.wxss b/pages/my/certificate.wxss new file mode 100644 index 0000000..572d012 --- /dev/null +++ b/pages/my/certificate.wxss @@ -0,0 +1,61 @@ +/* pages/exam/certificate.wxss */ + +.page-body { + display: flex; + flex: 1; + flex-direction: column; + margin:2px 5px +} +.item { + display: flex; + padding: 20rpx 40rpx; + border-bottom: 1rpx solid #eee; + cursor: pointer; + background-color: #ffffff; +} +.right{ + position: absolute; + right: 20px; + color: #cccccc +} +.item .poster { + width: 128rpx; + height: 128rpx; + margin-right: 20rpx; +} +.item .meta { + flex: 1; +} +.item .meta .title,.item .meta .sub-title { + display: block; + margin-bottom: 15rpx; +} +.item .meta .title { + font-size: 32rpx; +} +.item .meta .sub-title { + font-size: 25rpx; + color: #7bbd52; +} +.item .meta .artists { + font-size: 26rpx; + color: #999; +} +.item .rating { + font-size: 28rpx; + margin-bottom: 15rpx; +} +.tips { + font-size: 28rpx; + text-align: center; + padding: 50rpx; + color: #ccc; +} +.tips image { + width: 40rpx; + height: 40rpx; + margin-right: 20rpx; +} +.tips image,.tips text { + vertical-align: middle; +} \ No newline at end of file diff --git a/pages/my/index.js b/pages/my/index.js index 8dadcbe..f6ec419 100644 --- a/pages/my/index.js +++ b/pages/my/index.js @@ -1,5 +1,6 @@ // pages/my/index.js const api = require("../../utils/request.js"); +const app = getApp() Page({ data: { total:0, @@ -9,6 +10,7 @@ Page({ infoView:false }, onLoad: function (options) { + }, onReady: function () { @@ -21,8 +23,10 @@ Page({ if(userinfo.username){ userinfo.username = userinfo.username.replace(/(\d{3})(\d{4})(\d{4})/,"$1****$3") } + this.setData({ - userinfo: userinfo, + userinfo: getApp().globalData.userinfo, + avatar:app.globalData.mediahost + getApp().globalData.userinfo.avatar }) api.request('/examtest/examtest/fx/', 'GET').then(res => { this.setData(res.data) @@ -57,5 +61,14 @@ Page({ infoView :true }) } - } + }, + + //修改基本信息： + onButtonClick() { + let userinfo = wx.getStorageSync('userinfo'); + wx.navigateTo({ + url: '/pages/login/registe/registe' // 目标页面路径 + }); + + }, }) \ No newline at end of file diff --git a/pages/my/index.wxml b/pages/my/index.wxml index 9de2b55..d67068f 100644 --- a/pages/my/index.wxml +++ b/pages/my/index.wxml @@ -4,8 +4,8 @@ - - + + @@ -33,23 +33,33 @@ 统计分析 + - + + 工作类别 - + {{userinfo.workscope_name}} - 无 + 无 - + 考试统计 + + + + + 联系我们 + + + + + + + + + + + + + + 现浇型运动地坪铺装工 + + + + + + + + + 预制型运动地坪铺装工 + + + + + + + + + 人造草运动地坪铺装工 + + + + + + + + + 整体涂层地坪铺装工 + + + + + + + + + 混凝土一体化地坪铺装工 + + + + + + + + + 预制型工业卷材地坪铺装工 + + + + + + + + + \ No newline at end of file diff --git a/pages/puzhuang/typelist.wxss b/pages/puzhuang/typelist.wxss new file mode 100644 index 0000000..239a90b --- /dev/null +++ b/pages/puzhuang/typelist.wxss @@ -0,0 +1,23 @@ +/* pages/puzhuang/typelist.wxss */ +.page__title { + font-size: 18px; +} +.weui-article{ + padding: 0!important; +} +.weui-article__h1{ + padding: 24rpx 24rpx 0rpx 24rpx; + margin-bottom: 0; + background-color: #ffffff; +} +.page__desc{ + margin-top: 0; + padding: 10rpx 24rpx 15rpx 24rpx; + background-color: #ffffff; + margin-bottom: 20rpx; + display: flex; +} +.weui-article__p{ + padding: 24rpx; + background-color: #ffffff; +} diff --git a/pages/question/detail.wxml b/pages/question/detail.wxml index cce025c..d5ba1a5 100644 --- a/pages/question/detail.wxml +++ b/pages/question/detail.wxml @@ -55,5 +55,5 @@ - 查看答案 + 查看答案 \ No newline at end of file diff --git a/pages/skill/detail.js b/pages/skill/detail.js new file mode 100644 index 0000000..ad83dd9 --- /dev/null +++ b/pages/skill/detail.js @@ -0,0 +1,88 @@ +// pages/article/detail.js +const api = require("../../utils/request.js"); +Page({ + + /** + * 页面的初始数据 + */ + data: { + elink_f:'', + domain:getApp().globalData.mediahost + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + this.getDetail(options.id) + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function () { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function () { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function () { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function () { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function () { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function () { + + }, + + getDetail: function (id) { + var that = this + wx.showLoading({ + title: '加载中', + mask:true + }) + api.request(`/cms/article/${id}/`,'GET').then(res => { + // res.data.content = res.data.content.replace(/"media/g, '"'+getApp().globalData.mediahost + '/media').replace(/\ {}, + }) + }).catch(res=>{ + wx.hideLoading({ + complete: (res) => {}, + }) + }) + }, + +}) \ No newline at end of file diff --git a/pages/skill/detail.json b/pages/skill/detail.json new file mode 100644 index 0000000..c77cd44 --- /dev/null +++ b/pages/skill/detail.json @@ -0,0 +1,5 @@ +{ + "usingComponents": { + "mp-html": "/components/mp-html/index" + } +} \ No newline at end of file diff --git a/pages/skill/detail.wxml b/pages/skill/detail.wxml new file mode 100644 index 0000000..b385ee6 --- /dev/null +++ b/pages/skill/detail.wxml @@ -0,0 +1,16 @@ + + + + + {{title}} + + 置顶 + + {{update_time}} + + + + + + + diff --git a/pages/skill/detail.wxss b/pages/skill/detail.wxss new file mode 100644 index 0000000..8f9aaa9 --- /dev/null +++ b/pages/skill/detail.wxss @@ -0,0 +1,23 @@ +/* pages/article/detail.wxss */ +.page__title { + font-size: 18px; +} +.weui-article{ + padding: 0!important; +} +.weui-article__h1{ + padding: 24rpx 24rpx 0rpx 24rpx; + margin-bottom: 0; + background-color: #ffffff; +} +.page__desc{ + margin-top: 0; + padding: 10rpx 24rpx 15rpx 24rpx; + background-color: #ffffff; + margin-bottom: 20rpx; + display: flex; +} +.weui-article__p{ + padding: 24rpx; + background-color: #ffffff; +} \ No newline at end of file diff --git a/pages/skill/index.js b/pages/skill/index.js new file mode 100644 index 0000000..f99605c --- /dev/null +++ b/pages/skill/index.js @@ -0,0 +1,113 @@ +// pages/lianxi/index.js +const api = require("../../utils/request.js"); +Page({ + + /** + * 页面的初始数据 + */ + data: { + results: [ + // {id:1,title:"开发需求",is_top:true,ifrom:"第一条咨询",update_time:"2022-10-01"} + ], + count:0, + query: { + page: 1, + limit: 10, + search:"" + }, + type_: {1:"技能大赛",2:"铺装工匠",3:"培训信息",4:"大赛信息"}, + + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + + this.data.query.type = options.type //type {1:"技能大赛",2:"铺装工匠",3:"培训信息",4:"大赛信息"} + this.getList(this.data.query) + wx.stopPullDownRefresh(); + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function () { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function () { + }, + getList: function () { + + var that = this + + api.request('/cms/article/', 'GET', that.data.query).then(res => { + if (that.data.query.page == 1) { + that.data.results = res.data.results + } else { + that.data.results = that.data.results.concat(res.data.results) + } + for(var i = 0;i + + + + + + + + {{item.title}} + + + + + {{item.update_time}} + + + + + + + + \ No newline at end of file diff --git a/pages/skill/index.wxss b/pages/skill/index.wxss new file mode 100644 index 0000000..5444a1a --- /dev/null +++ b/pages/skill/index.wxss @@ -0,0 +1,9 @@ + +page{ + background: #ffffff; +} +.head{ + color:#fff; + background-color: #79be53; + text-align: center; +} \ No newline at end of file diff --git a/pages/test/detail.wxml b/pages/test/detail.wxml index 3f8958d..328651f 100644 --- a/pages/test/detail.wxml +++ b/pages/test/detail.wxml @@ -50,7 +50,7 @@ 你未作答 - 解析: + 解析: {{tm_current.question.resolution}} 暂无解析 diff --git a/pages/test/detail.wxss b/pages/test/detail.wxss index d1aff50..f8b1348 100644 --- a/pages/test/detail.wxss +++ b/pages/test/detail.wxss @@ -2,7 +2,7 @@ width:100%; height:30px; color:#fff; - background-color: #438af4; + background-color: #7bbd52; text-align: center; } .btns{ @@ -24,7 +24,7 @@ } .txlabel{ color:#fff; - background-color: #438af4; + background-color: #7bbd52; border-radius: 2px; font-weight: 500; font-size: 30rpx; diff --git a/pages/test/list.wxml b/pages/test/list.wxml index 67ad80d..c501755 100644 --- a/pages/test/list.wxml +++ b/pages/test/list.wxml @@ -12,7 +12,7 @@ {{item.name}} {{item.type}} - {{item.type}} + {{item.type}} - 通过 未通过 @@ -28,7 +28,7 @@ - 答卷详情 + 答卷详情 diff --git a/pages/test/list.wxss b/pages/test/list.wxss index baf04d4..fe14686 100644 --- a/pages/test/list.wxss +++ b/pages/test/list.wxss @@ -23,6 +23,6 @@ margin-right: 20rpx; } .activeBtn{ - color: #438af4; - border-bottom: 4rpx solid #438af4; + color: #7bbd52; + border-bottom: 4rpx solid #7bbd52; } \ No newline at end of file diff --git a/pages/test/result.wxml b/pages/test/result.wxml index 637915f..632d1b6 100644 --- a/pages/test/result.wxml +++ b/pages/test/result.wxml @@ -26,8 +26,8 @@ - 查看答卷详情 - 返回首页 + 查看答卷详情 + 返回首页 diff --git a/pages/test/test.js b/pages/test/test.js index 9e773b4..b908e37 100644 --- a/pages/test/test.js +++ b/pages/test/test.js @@ -149,10 +149,7 @@ Page({ }else{ for(var i=0;i { + //选择工作类别 // that.setData({ // workData:res.data @@ -110,6 +112,7 @@ Page({ }) getApp().globalData.userinfo.workscope = res.data.workscope getApp().globalData.userinfo.workscope_name = res.data.workscope_name + console.log(getApp().globalData.userinfo.workscope_name) wx.navigateBack({ }) }) diff --git a/pages/yati/index.wxml b/pages/yati/index.wxml index 2889133..df232f0 100644 --- a/pages/yati/index.wxml +++ b/pages/yati/index.wxml @@ -13,7 +13,7 @@

{{item.name}}

 - 选择 + 选择 diff --git a/pages/youpei/company.js b/pages/youpei/company.js new file mode 100644 index 0000000..f05a1c1 --- /dev/null +++ b/pages/youpei/company.js @@ -0,0 +1,129 @@ +// pages/youpei/company.js +const app = getApp() +const api = require("../../utils/request.js"); +Page({ + + data: { + query: { + page: 1, + limit: 10, + search:"" + }, + // 数据源 + results: [ + // {id:1,title:"开发需求",is_top:true,ifrom:"第一条咨询",update_time:"2022-10-01"} + ], + + name:"中存大数据科技有限公司" + + }, + + onLoad: function () { + console.log(1) + this.getList(this.data.query) + wx.stopPullDownRefresh(); + }, + + + getList: function () { + // console.log(2) + var that = this + + api.request('/cms/company/', 'GET', that.data.query).then(res => { + if (that.data.query.page == 1) { + that.data.results = res.data.results + } else { + that.data.results = that.data.results.concat(res.data.results) + } + + + that.setData({ + results: that.data.results, + count: res.data.count, + url:app.globalData.mediahost + + }) + + }) + + }, + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function () { + var that = this + that.data.query.page = 1; + that.getList(); + wx.stopPullDownRefresh(); + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + var that = this + if (that.data.count <= that.data.query.page * that.data.query.limit) { + wx.showToast({ + title: '没有更多了', + icon: 'none' + }) + } else { + that.data.query.page = that.data.query.page + 1 + that.getList() + } + + }, + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + }, + //优培企业图片点击 + goartisan(){ + wx.navigateTo({ + url: '/pages/youpei/illustrate', + }) + + }, +}) \ No newline at end of file diff --git a/pages/youpei/company.json b/pages/youpei/company.json new file mode 100644 index 0000000..e98fbf7 --- /dev/null +++ b/pages/youpei/company.json @@ -0,0 +1,4 @@ +{ + "usingComponents": {}, + "navigationBarTitleText": "优培企业" +} \ No newline at end of file diff --git a/pages/youpei/company.wxml b/pages/youpei/company.wxml new file mode 100644 index 0000000..edd7fd6 --- /dev/null +++ b/pages/youpei/company.wxml @@ -0,0 +1,28 @@ + + + + + + + + 铺装工优培企业说明 + + + + + + + + + + {{item.company_name }} + + + + + + + + \ No newline at end of file diff --git a/pages/youpei/company.wxss b/pages/youpei/company.wxss new file mode 100644 index 0000000..c51691e --- /dev/null +++ b/pages/youpei/company.wxss @@ -0,0 +1,11 @@ +/* pages/youpei/company.wxss */ +.head{ + color:#fff; + background-color: #79be53; + text-align: center; +} +.newsList{ + margin-bottom: 10rpx; + box-shadow: 0 0 13rpx 8rpx #f7f7f7; + background: #ffffff; +} \ No newline at end of file diff --git a/pages/youpei/detail.js b/pages/youpei/detail.js new file mode 100644 index 0000000..4e17610 --- /dev/null +++ b/pages/youpei/detail.js @@ -0,0 +1,93 @@ +// pages/youpei/detail.js +const api = require("../../utils/request.js"); +Page({ + + /** + * 页面的初始数据 + */ + data: { + domain:getApp().globalData.mediahost, + companydetail:[ + ], + query: { + page: 1, + limit: 10, + search:"" + }, + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + this.getDetail(options.id) + }, +//优培介绍请求 +getDetail: function (id) { + var that = this + wx.showLoading({ + title: '加载中', + mask:true + }) + api.request(`/cms/company/${id}/`,'GET').then(res => { + + that.setData(res.data) + wx.hideLoading({ + complete: (res) => {}, + }) + }).catch(res=>{ + wx.hideLoading({ + complete: (res) => {}, + }) + }) +}, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/pages/youpei/detail.json b/pages/youpei/detail.json new file mode 100644 index 0000000..1e29a10 --- /dev/null +++ b/pages/youpei/detail.json @@ -0,0 +1,6 @@ +{ + "usingComponents": { + "mp-html": "/components/mp-html/index" + }, + "navigationBarTitleText": "优培企业" +} \ No newline at end of file diff --git a/pages/youpei/detail.wxml b/pages/youpei/detail.wxml new file mode 100644 index 0000000..d5edbd0 --- /dev/null +++ b/pages/youpei/detail.wxml @@ -0,0 +1,11 @@ + + + + +企业简介 + + + + + + \ No newline at end of file diff --git a/pages/youpei/detail.wxss b/pages/youpei/detail.wxss new file mode 100644 index 0000000..9c5c01e --- /dev/null +++ b/pages/youpei/detail.wxss @@ -0,0 +1,16 @@ +/* pages/youpei/detail.wxss */ + +.newsList{ + margin-bottom: 10rpx; + box-shadow: 0 0 13rpx 8rpx #f7f7f7; + background: #ffffff; +} +.companyNote{ + font-size:30px; + letter-spacing: 0.1em; + font-weight:bold; + text-align: center; +} +.remark{ + text-indent:2em;font-size:20px;padding-top: 20px;letter-spacing: 0.1em;line-height: 40px; +} \ No newline at end of file diff --git a/pages/youpei/illustrate.js b/pages/youpei/illustrate.js new file mode 100644 index 0000000..f0df974 --- /dev/null +++ b/pages/youpei/illustrate.js @@ -0,0 +1,89 @@ +// pages/youpei/illustrate.js +const api = require("../../utils/request.js"); +Page({ + + /** + * 页面的初始数据 + */ + data: { + domain:getApp().globalData.mediahost, + remark:"" + + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function () { + this.getDetail() + }, +//优培介绍请求 +getDetail: function () { + var that = this + wx.showLoading({ + title: '加载中', + mask:true + }) + api.request(`/cms/ypdetail/`,'GET').then(res => { + + that.setData(res.data.results[0]) + wx.hideLoading({ + complete: (res) => {}, + }) + }).catch(res=>{ + wx.hideLoading({ + complete: (res) => {}, + }) + }) +}, + + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/pages/youpei/illustrate.json b/pages/youpei/illustrate.json new file mode 100644 index 0000000..33b1c09 --- /dev/null +++ b/pages/youpei/illustrate.json @@ -0,0 +1,6 @@ +{ + "usingComponents": { + "mp-html": "/components/mp-html/index" + }, + "navigationBarTitleText": "铺装工优培企业说明" +} \ No newline at end of file diff --git a/pages/youpei/illustrate.wxml b/pages/youpei/illustrate.wxml new file mode 100644 index 0000000..ea4b2f0 --- /dev/null +++ b/pages/youpei/illustrate.wxml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/pages/youpei/illustrate.wxss b/pages/youpei/illustrate.wxss new file mode 100644 index 0000000..69af9f6 --- /dev/null +++ b/pages/youpei/illustrate.wxss @@ -0,0 +1,15 @@ +/* pages/youpei/illustrate.wxss */ +.newsList{ + margin-bottom: 10rpx; + box-shadow: 0 0 13rpx 8rpx #f7f7f7; + background: #ffffff; +} +.companyNote{ + font-size:30px; + letter-spacing: 0.1em; + font-weight:bold; + text-align: center; +} +.remark{ + text-indent:2em;font-size:20px;padding-top: 20px;letter-spacing: 0.1em;line-height: 40px; +} \ No newline at end of file diff --git a/project.config.json b/project.config.json index 0319d96..7ce62f4 100644 --- a/project.config.json +++ b/project.config.json @@ -45,7 +45,7 @@ }, "compileType": "miniprogram", "libVersion": "2.15.0", - "appid": "wxbdd29c80f7bff68d", + "appid": "wx32d98539b104eb8a", "projectname": "test_mini", "simulatorType": "wechat", "simulatorPluginLibVersion": {}, diff --git a/style/iconfont/iconfont.wxss b/style/iconfont/iconfont.wxss index 28bf13d..1f7328a 100644 --- a/style/iconfont/iconfont.wxss +++ b/style/iconfont/iconfont.wxss @@ -66,7 +66,7 @@ } .icon-a-zuofei3:before { - content: "\ea70"; + content: "\ea04"; } .icon-xinwen09:before { @@ -78,6 +78,6 @@ } .icon-a-kaoshi5:before { - content: "\eb0a"; + content: "\ea78"; }