diff --git a/app.js b/app.js
index a75ea24..2036e08 100644
--- a/app.js
+++ b/app.js
@@ -74,8 +74,8 @@ 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/',
isaqy: 0,
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 1b39804..293efcf 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -60,4 +60,5 @@
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/pages/inspect/add.wxml b/pages/inspect/add.wxml
index 8f209f6..ee86cec 100644
--- a/pages/inspect/add.wxml
+++ b/pages/inspect/add.wxml
@@ -16,9 +16,8 @@
检查项目
-
- {{item.step}}-
- {{item.result}}-
+
+ {{item.step}}-{{item.result}}
{{item.hazard}}
diff --git a/pages/train/qrcode.js b/pages/train/qrcode.js
index fea0a1c..21b88be 100644
--- a/pages/train/qrcode.js
+++ b/pages/train/qrcode.js
@@ -1,6 +1,6 @@
// pages/bind/binduser.js
var util = require('../../utils/util.js')
-import drawQrcode from '../../utils/weapp.qrcode.esm.js'
+//import drawQrcode from '../../utils/weapp.qrcode.esm.js'
Page({
/**
@@ -20,23 +20,23 @@ Page({
pxid: pxid
})
this.getPx(pxid)
- let text = 'https://safeyun.ctcshe.com/miniprogram/checktrain?trainid=' + pxid
- console.log(text)
- drawQrcode({
- width: 200,
- height: 200,
- canvasId: 'qdQrcode',
- // ctx: wx.createCanvasContext('myQrcode'),
- text: text,
- // v1.0.0+版本支持在二维码上绘制图片
- // image: {
- // imageResource: '../../images/icon.png',
- // dx: 70,
- // dy: 70,
- // dWidth: 60,
- // dHeight: 60
- // }
- })
+ //let text = 'https://safeyun.ctcshe.com/miniprogram/checktrain?trainid=' + pxid
+ //console.log(text)
+ // drawQrcode({
+ // width: 200,
+ // height: 200,
+ // canvasId: 'qdQrcode',
+ // // ctx: wx.createCanvasContext('myQrcode'),
+ // text: text,
+ // // v1.0.0+版本支持在二维码上绘制图片
+ // // image: {
+ // // imageResource: '../../images/icon.png',
+ // // dx: 70,
+ // // dy: 70,
+ // // dWidth: 60,
+ // // dHeight: 60
+ // // }
+ // })
},
getPx: function (id) {
wx.showLoading({
@@ -53,6 +53,10 @@ Page({
wx.hideLoading();
if (res.statusCode === 200) {
var pxdata = res.data
+ if(pxdata.checkqr!=''||pxdata.qrcode!=null){
+ pxdata.checkqr = getApp().globalData.serverUrl+pxdata.checkqr
+ console.log(pxdata.checkqr)
+ }
if (pxdata.starttime != '') { pxdata.starttime = util.formatTime(new Date(pxdata.starttime)) }
this.setData(pxdata)
diff --git a/pages/train/qrcode.wxml b/pages/train/qrcode.wxml
index 165c158..4d9bedb 100644
--- a/pages/train/qrcode.wxml
+++ b/pages/train/qrcode.wxml
@@ -3,9 +3,9 @@
签到二维码
请在培训开始前展示给参加人员扫码
-
-
-
+
+
+