版本1.2.5 新增单独跳转报事页面网格码

5 years ago · 8ad1a03c35
1 changed files with 0 additions and 4 deletions
--- a/epdc-resident-mp-yushan/pages/toRegister/toRegister.js
+++ b/epdc-resident-mp-yushan/pages/toRegister/toRegister.js
@ -21,11 +21,7 @@ Page({
      }
    })
    let that = this 
-<<<<<<< HEAD
    const versionNum = '1.2.5'
-=======
-    const versionNum = '1.2.4'
->>>>>>> 743467732ad0e89a64f1e2e666e7c64845bb659d
    api.getScanSwitch(versionNum).then(function (res) {
      console.log(res.data)
      let state = res.data.scanFlag