diff --git a/pages/bind/binduser.js b/pages/bind/binduser.js
index 298fee5..77e3b71 100644
--- a/pages/bind/binduser.js
+++ b/pages/bind/binduser.js
@@ -7,14 +7,15 @@ Page({
data: {
},
- bindusernameInput: function (e) {
+ usernameChange: function (e) {
this.data.username = e.detail.value
},
- bindpasswordInput: function (e) {
+ passwordChange: function (e) {
this.data.password = e.detail.value
},
denglu: function(){
var that=this
+ console.log(that.data)
wx.request({
url: getApp().globalData.serverUrl + 'bindmp',
header: {
@@ -62,7 +63,7 @@ Page({
* 生命周期函数--监听页面显示
*/
onShow: function () {
-
+ wx.hideHomeButton()
},
/**
@@ -98,5 +99,33 @@ Page({
*/
onShareAppMessage: function () {
+ },
+ intro:function(){
+ let fileurl = getApp().globalData.serverUrl + 'media/安全生产管理系统-国检集团.docx'
+ wx.showLoading({
+ title: '下载中...',
+ })
+ console.log(fileurl)
+ wx.downloadFile({
+ url: fileurl,
+ success(res) {
+ const filePath = res.tempFilePath
+ console.log(filePath)
+ var filetype
+ if (fileurl.indexOf(".docx") != -1) {
+ filetype = 'docx'
+ }
+ wx.openDocument({
+ filePath,
+ fileType: filetype,
+ success(res) {
+ wx.hideLoading()
+ console.log('打开文档成功')
+ }, fail: function (e) {
+ console.log(e)
+ }
+ })
+ }
+ })
}
})
\ No newline at end of file
diff --git a/pages/bind/binduser.wxml b/pages/bind/binduser.wxml
index d602d8b..79a6fb3 100644
--- a/pages/bind/binduser.wxml
+++ b/pages/bind/binduser.wxml
@@ -10,12 +10,12 @@
-
+
-
+
@@ -26,5 +26,6 @@
-
-
\ No newline at end of file
+
+
+
\ No newline at end of file
diff --git a/pages/examtest/index.js b/pages/examtest/index.js
index d777d0e..06448ef 100644
--- a/pages/examtest/index.js
+++ b/pages/examtest/index.js
@@ -198,7 +198,7 @@ Page({
if (res.result.indexOf("examtest") != -1) {
let id = res.result.split('=')[1]
wx.navigateTo({
- url: 'note?examtestid=' + id,
+ url: 'note?id=' + id,
})
} else {
wx.showModal({
diff --git a/pages/examtest/note.js b/pages/examtest/note.js
index 68d19bb..88454cd 100644
--- a/pages/examtest/note.js
+++ b/pages/examtest/note.js
@@ -6,15 +6,28 @@ Page({
* 页面的初始数据
*/
data: {
- testdisable:false
+ testdisable:false,
+ fromWx:false
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
+ var examtestid
+ if (options.id) {
+ examtestid = options.id
+ } else {
+ let q = decodeURIComponent(options.q)
+ if (q) {
+ examtestid = util.getQueryString(q, 'id')
+ this.setData({
+ fromWx: true
+ })
+ }
+ }
wx.request({
- url: getApp().globalData.serverUrl + 'api/examtest?a=detail&id='+options.examtestid,
+ url: getApp().globalData.serverUrl + 'api/examtest?a=detail&id='+examtestid,
header: {
'content-type': 'application/json', // 默认值
'Cookie': wx.getStorageSync("sessionid"),
diff --git a/pages/main/main.js b/pages/main/main.js
index 66664f8..44b1cf6 100644
--- a/pages/main/main.js
+++ b/pages/main/main.js
@@ -26,9 +26,9 @@ Page({
// 采用衔接滑动
circular: true,
// 自动切换时间间隔2s
- interval: 4000,
+ interval: 8000,
// 滑动动画时长0.5s
- duration: 1000,
+ duration: 1500,
// 前边距,可用于露出前一项的一小部分,接受 px 和 rpx 值
previousMargin: 0,
// 后边距,可用于露出后一项的一小部分,接受 px 和 rpx 值
@@ -64,7 +64,8 @@ Page({
onShow: function () {
var that = this
//获取待阅读通知数目
- if (wx.getStorageSync("sessionid")) {
+ //console.log(wx.getStorageSync('sessionid'))
+ if (wx.getStorageSync("sessionid").indexOf('sessionid')!=-1) {
this.getnoread()
this.getyhtodonum()
this.getzytodonum()
diff --git a/pages/notice/notice.wxml b/pages/notice/notice.wxml
index bc67429..7459977 100644
--- a/pages/notice/notice.wxml
+++ b/pages/notice/notice.wxml
@@ -7,7 +7,7 @@
{{item.noticeid__title}}
{{item.noticeid__pubpart__partname}} {{item.noticeid__pubuser__name}}发布
- {{item.noticeid__submittime}}
+ 发布时间:{{item.noticeid__submittime}}
未读
diff --git a/pages/public/public.wxml b/pages/public/public.wxml
index 5e872b7..740ee08 100644
--- a/pages/public/public.wxml
+++ b/pages/public/public.wxml
@@ -7,7 +7,8 @@
{{item.title}}
{{item.pubpart__partname}} {{item.pubuser__name}}发布
- {{item.submittime}}
+ 修改时间:{{item.modifytime}}
+ 发布时间:{{item.submittime}}
阅读量: {{item.reads}}
diff --git a/pages/trouble/addtrouble.js b/pages/trouble/addtrouble.js
index 2a0627c..69b356f 100644
--- a/pages/trouble/addtrouble.js
+++ b/pages/trouble/addtrouble.js
@@ -17,7 +17,7 @@ Page({
yhdjArray: [],
yhdjIndex: null,
jclxArray: [],
- jclxIndex: null,
+ jclxIndex: 0,
troubleid: '',
yhdj: '',
jclx: '',
@@ -352,6 +352,7 @@ Page({
this.data.jclxArray = res.data;
this.setData({
jclxArray: res.data,
+ jclx:res.data[0]//默认检查类型
})
}
}
diff --git a/project.config.json b/project.config.json
index 160d9d6..1d7be73 100644
--- a/project.config.json
+++ b/project.config.json
@@ -8,7 +8,7 @@
"newFeature": true
},
"compileType": "miniprogram",
- "libVersion": "1.9.94",
+ "libVersion": "2.8.3",
"appid": "wx5c39b569f01c27db",
"projectname": "aqyj",
"isGameTourist": false,