From 0176171970ba0e73ac4de176db2157a944d56f39 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Thu, 8 Aug 2019 22:00:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=B9=E8=AE=AD=E6=89=AB=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                  |  4 ++--
 pages/index/index.wxml  |  3 ++-
 pages/inspect/add.wxml  |  5 ++---
 pages/train/qrcode.js   | 40 ++++++++++++++++++++++------------------
 pages/train/qrcode.wxml |  6 +++---
 5 files changed, 31 insertions(+), 27 deletions(-)

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 @@
       </view>
     </view>
   </view>
-</view>
\ No newline at end of file
+</view>
+<ad unit-id="adunit-cd6a8fdc3f72f822"></ad>
\ 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 @@
 <view class="weui-cells__title">检查项目</view>
 <view class="weui-cells weui-cells_after-title">
   <block wx:for="{{steps}}" wx:key="unique">
-  <view class="weui-cell">
-        <view class="weui-media-box__title">{{item.step}}-</view>
-        <view class="weui-media-box__desc" style="color:red">{{item.result}}-</view>
+  <view class="weui-article__p " style="marigin:5px">
+        <view class="weui-media-box__desc" style="color:black">{{item.step}}-<span style="color:red">{{item.result}}</span></view>
         <view class="weui-media-box__desc" style="color:green">{{item.hazard}}</view>
   </view>
   </block>
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 @@
     <view class="page__title">签到二维码</view>
     <view class="page__desc">请在培训开始前展示给参加人员扫码</view>
   </view>
-  <view class="qrcode">
-    <canvas canvas-id="qdQrcode" style="width:200px;height:200px"></canvas>
-    </view>
+  <view style="text-align:center">
+    <image src="{{checkqr}}" style="width:200px;height:200px;"></image>
+  </view>
   <view class="page__bd" style="margin:5px">
     <view class="weui-cells weui-cells_after-title">
       <view class="weui-cell weui-cell_access">