Merge branch 'dev-v1.1.0' into test

.env.js

 ;(function() {
   let NODE_ENV = 'prod' // dev:开发环境 | test:测试环境 | prod:生产环境
   let ENV_VAR = null
-  let VERSION = 'v1.0.3'
+  let VERSION = 'v1.1.0'
   if (process.env.NODE_ENV === 'development') {
     if (NODE_ENV === 'dev') {
       ENV_VAR = require('./.env.dev.js')

src/pages/learn/answer.vue

@@ -225,15 +225,15 @@ export default {
   },
   onShow() {
     // 从后台进入重新计算倒计时
-    if (this.source === 3 && this.beginTime) {
-      const timestamp = Utils.diffTime(this.beginTime, new Date())
-      this.timestamp = this.currentTime - timestamp
-      this.$u.vuex('beginTime', '')
-    }
+    // if (this.source === 3 && this.beginTime) {
+    //   const timestamp = Utils.diffTime(this.beginTime, new Date())
+    //   this.timestamp = this.currentTime - timestamp
+    //   this.$u.vuex('beginTime', '')
+    // }
   },
   onHide() {
     // 记录进入后台时间
-    if (this.source === 3) this.$u.vuex('beginTime', new Date())
+    // if (this.source === 3) this.$u.vuex('beginTime', new Date())
   },
   onLoad(e) {
     if (e?.experience) this.experience = JSON.parse(e.experience) // 体验资格

src/pages/learn/boundQuestions.vue

@@ -102,7 +102,6 @@ export default {
       getApp().track('scanCode-boundQuestionsPage', trackParams)
 
       wx.scanCode({
-        onlyFromCamera: true,
         success: (res) => {
           console.log(res)
           if (res.result && res.result.length == 14 + 6) {