Merge branch 'lvtz_home' of git.server:wangxuelai/wechatapp.shangjiadao.com into sj-dev-0220

src/pages/clockdetail/newindex.js

@@ -184,6 +184,7 @@ Page({
         o: o || ''
       })
     }
+    console.log(this.data.tid,this.data.cid,'参数')
     app.getCurrentSchoolStudentId({
       source_id: this.data.tid,
       source_type: 8,
@@ -319,7 +320,7 @@ Page({
     console.log('type',type);
     let params = {};
     if(type==3){
-      params = {mode_id: this.data.tid}
+      params = {mode_id: this.data.clock.subject.unlock_mode_id}
     }else{
       params = {subject_id: this.data.tid}
     }

src/pages/morethemeindex/index.js

@@ -1414,8 +1414,10 @@ Page({
     wx.showLoading({
       title: '日签生成中...'
     })
+
+    console.log(this.data.themeSelect,'主题')
     generateCustomerQrcode({
-      scene: `c=${clockDetail[0].id}&t=${this.data.themeSelect.unlock_mode_id}&w=${app.globalData.currentSchoolStudentId}`,
+      scene: `c=${clockDetail[0].id}&t=${this.data.themeSelect.id}&w=${app.globalData.currentSchoolStudentId}`,
       page: `src/pages/clockdetail/newindex`
       // scene: `ctd=${visitor && visitor.id}&t=${this.data.tid}`,
       // page: `src/pages/beforeinvitation/index`