diff --git a/app.js b/app.js index b698d4a..814a59e 100644 --- a/app.js +++ b/app.js @@ -32,7 +32,23 @@ App({ if (that.callback) { //这个函数名字和你定义的一样即可 that.callback() //执行定义的回调函数 } - + let openid = res.data.openid; + if(openid==null){ + wx.showModal({ + title: '温馨提示', + content: '您还未绑定通知,\n无法接收微信公众号提醒!', + cancelText:'不用了', + confirmText:'去绑定', + success(res) { + if (res.confirm) { + wx.navigateTo({ + url: '/pages/bindwxtz/index', + }) + } else if (res.cancel) { + } + } + }) + } //获取是否是安全员 wx.request({ url: that.globalData.serverUrl + 'api/user?a=checkaqy', @@ -91,10 +107,10 @@ App({ }, globalData: { userInfo: null, - //serverUrl: 'https://safeyun.ctcshe.com/', - serverUrl: 'http://127.0.0.1:8000/', + serverUrl: 'https://safeyun.ctcshe.com/', + //serverUrl: 'http://127.0.0.1:8000/', //serverUrl: 'http://192.168.0.102:8000/', - //serverUrl:'http://10.7.100.250:8000/', + //serverUrl:'http://10.0.11.195:8000/', isaqy: 0, timepass:null //定时器 }, diff --git a/app.json b/app.json index 88cc953..29c6a39 100644 --- a/app.json +++ b/app.json @@ -69,7 +69,8 @@ "pages/chart/report", "pages/risktask/detail", "pages/riskact/index2", - "pages/area/detail" + "pages/area/detail", + "pages/bindwxtz/index" ], "window": { "backgroundTextStyle": "light", diff --git a/pages/bindwxtz/index.js b/pages/bindwxtz/index.js new file mode 100644 index 0000000..f4309b9 --- /dev/null +++ b/pages/bindwxtz/index.js @@ -0,0 +1,66 @@ +// pages/bindwxtz/index.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function () { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function () { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function () { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function () { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function () { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function () { + + } +}) \ No newline at end of file diff --git a/pages/bindwxtz/index.json b/pages/bindwxtz/index.json new file mode 100644 index 0000000..fb31c55 --- /dev/null +++ b/pages/bindwxtz/index.json @@ -0,0 +1,4 @@ +{ + "usingComponents": {}, + "navigationBarTitleText": "绑定微信通知" +} \ No newline at end of file diff --git a/pages/bindwxtz/index.wxml b/pages/bindwxtz/index.wxml new file mode 100644 index 0000000..6928312 --- /dev/null +++ b/pages/bindwxtz/index.wxml @@ -0,0 +1,2 @@ + + diff --git a/pages/bindwxtz/index.wxss b/pages/bindwxtz/index.wxss new file mode 100644 index 0000000..18c3854 --- /dev/null +++ b/pages/bindwxtz/index.wxss @@ -0,0 +1 @@ +/* pages/bindwxtz/index.wxss */ \ No newline at end of file diff --git a/pages/examtest/note.js b/pages/examtest/note.js index 88454cd..d6b9974 100644 --- a/pages/examtest/note.js +++ b/pages/examtest/note.js @@ -38,20 +38,22 @@ Page({ if (ksdata.starttime != null) { let st = new Date(ksdata.starttime) if(new Date() et) { - this.setData({ - testdisable: true - }) + ksdata['testdisable'] = true + ksdata['msg'] = '考试时间已过!' } } - this.setData(res.data) + if (ksdata.ison == 1) { + ksdata['testdisable'] = true + ksdata['msg'] = '您已考过!' + } + this.setData(ksdata) } } }); diff --git a/pages/examtest/note.wxml b/pages/examtest/note.wxml index d12485f..f5bc72b 100644 --- a/pages/examtest/note.wxml +++ b/pages/examtest/note.wxml @@ -24,5 +24,6 @@ + {{msg}} \ No newline at end of file diff --git a/pages/inspect/add.wxml b/pages/inspect/add.wxml index 1986ea6..fae5d25 100644 --- a/pages/inspect/add.wxml +++ b/pages/inspect/add.wxml @@ -34,7 +34,7 @@ -