新增统计

compontents/tarbar/tarbar.js

@@ -37,42 +37,42 @@ Component({
       }
       if(index == 0) {
         wx.redirectTo({
-          url: '../my/my?ind=0'
+          url: '../my/my?ind=0&type=noTV'
         })
       }
       if(index == 1) {
         wx.redirectTo({
-          url: '../mistakes/mistakes?ind=1'
+          url: '../mistakes/mistakes?ind=1&type=noTV'
         })
       }
       if(index == 2) {
         wx.redirectTo({
-          url: '../language/language?ind=2'
+          url: '../language/language?ind=2&type=noTV'
         })
       }
       if(index == 3) {
         wx.redirectTo({
-          url: '../mathematics/mathematics?ind=3'
+          url: '../mathematics/mathematics?ind=3&type=noTV'
         })
       }
       if(index == 4) {
         wx.redirectTo({
-          url: '../chinese/chinese?ind=4'
+          url: '../chinese/chinese?ind=4&type=noTV'
         })
       }
       if(index == 5) {
         wx.redirectTo({
-          url: '../english/english?ind=5'
+          url: '../english/english?ind=5&type=noTV'
         })
       }
       if(index == 6) {
         wx.redirectTo({
-          url: '../science/science?ind=6'
+          url: '../science/science?ind=6&type=noTV'
         })
       }                        
       if(index == 7) {
         wx.redirectTo({
-          url: '../art/art?ind=7'
+          url: '../art/art?ind=7&type=noTV'
         })
       }
     }
@@ -80,7 +80,13 @@ Component({
   ready() {
     let options = util.getUrl();
     const ind = options.ind || util.convertObject(decodeURIComponent(options.scene)).ind || util.convertObject(decodeURIComponent(options.scene)).a;
-    if(ind) {
+    const noTv = options.type || '';
+    // wx.setStorage({
+    //   key: "type",
+    //   data: noTv
+    // })
+    // console.log(wx.getStorageSync('type'))
+    if(ind) { 
       this.setData({ navBtnSelectIdx: ind});
     }
     if (ind <= 2) {

pages/art/art.js

@@ -36,7 +36,8 @@ Page({
     wxObjectives: [],
     canvasHeight: '',
     flag: true,
-    materialData: []
+    materialData: [],
+    loginType: 1
   },
 
   /* 区分答疑和分享 */
@@ -126,6 +127,11 @@ Page({
 
   onLoad: function (options) {
     //this.chat = this.selectComponent("#chat");
+    if(options.type == "noTv") {
+      this.setData({
+        loginType: ""
+      })
+    }
     const columnId = util.column('6').columnId;
     /* 分享 */
     this.distinction(2, columnId, 1, 2, res => {
@@ -193,7 +199,7 @@ Page({
       this.setData({
         flag: !this.data.flag
       })      
-    });
+    }, this.data.loginType);
     
   },
 

pages/chinese/chinese.js

@@ -18,7 +18,8 @@ Page({
     questionsMore: '',
     wxObjectives: [],
     flag: true,
-    materialData: []
+    materialData: [],
+    loginType: 1
   },
 
   /* 区分答疑和分享 */
@@ -76,7 +77,11 @@ Page({
   },
 
   onLoad: function (options) {
-   
+    if(options.type == "noTv") {
+      this.setData({
+        loginType: ""
+      })
+    }
   },
 
   onShow: function () {
@@ -132,7 +137,7 @@ Page({
       this.setData({
         flag: !this.data.flag
       })       
-    });
+    }, this.data.loginType);
   },
   /*获取个人信息弹框*/
   jurisdiction: function () {

pages/english/english.js

@@ -18,7 +18,8 @@ Page({
     questionsMore: '',
     wxObjectives: [],
     flag: true,
-    materialData: []    
+    materialData: [],
+    loginType: 1    
   },
 
   /* 区分答疑和分享 */
@@ -76,7 +77,11 @@ Page({
   },
 
   onLoad: function (options) {
-   
+    if(options.type == "noTv") {
+      this.setData({
+        loginType: ""
+      })
+    } 
   },
 
   onShow: function () {
@@ -133,7 +138,7 @@ Page({
       this.setData({
         flag: !this.data.flag
       })     
-    });
+    }, this.data.loginType);
   },
   /*获取个人信息弹框*/
   jurisdiction: function () {

pages/index/index.wxml

@@ -1,7 +1,7 @@
 <!--index.wxml-->
 <view class="subject">
   <view class="schedule">
-    <navigator url="/pages/my/my">
+    <navigator url="/pages/my/my?ind=0&type=noTV">
       <image src="../image/xiaoxue.png"></image>
     </navigator>
   </view>

pages/language/language.js

@@ -18,7 +18,8 @@ Page({
     questionsMore: '',
     wxObjectives: [],
     flag: true,
-    materialData: []        
+    materialData: [],
+    loginType: 1        
   },
 
   /* 区分答疑和分享 */
@@ -75,7 +76,11 @@ Page({
     })
   },
   onLoad: function (options) {
-   
+    if(options.type == "noTv") {
+      this.setData({
+        loginType: ""
+      })
+    } 
   },
 
   onShow: function () {
@@ -130,7 +135,7 @@ Page({
       this.setData({
         flag: !this.data.flag
       })   
-    });
+    }, this.data.loginType);
   },
   /*获取个人信息弹框*/
   jurisdiction: function () {

pages/mathematics/mathematics.js

@@ -18,7 +18,8 @@ Page({
     questionsMore: '',
     wxObjectives: [],
     flag: true,
-    materialData: []
+    materialData: [],
+    loginType: 1
   },
 
   /* 区分答疑和分享 */
@@ -68,7 +69,11 @@ Page({
   },
 
   onLoad: function (options) {
-    
+    if(options.type == "noTv") {
+      this.setData({
+        loginType: ""
+      })
+    } 
   },
   /*点击定位*/
   location: function (e) {
@@ -133,7 +138,7 @@ Page({
       this.setData({
         flag: !this.data.flag
       })        
-    });
+    }, this.data.loginType);
   },
   /*获取个人信息弹框*/
   jurisdiction: function () {

pages/mistakes/mistakes.js

@@ -19,6 +19,7 @@ Page({
     errorData: {},
     errImgW: [],
     errImgH: [],
+    loginType: 1
   },
 
   particulars: function ({ currentTarget }) {
@@ -35,6 +36,21 @@ Page({
       this.setData({
         flags: this.data.flags,
       })
+      let contentId = this.data.mistakesData[index].questions.id;
+      let grade = this.data.mistakesData[index].userQuestionResult.grade;
+      login.getOpenidSessionKey(res => {
+        APIClient.getStatisticsOpt({
+          uid: res.data.data.uid
+        },{
+          contentId,
+          grade,
+          type: 'WRONG_QUESTION'
+        }).success(res => {
+          console.log('成功')
+        })
+      }, (error) => {
+        console.log(error)   
+      }); 
     }
   },
 
@@ -117,7 +133,7 @@ Page({
       this.setData({
         flag: !this.data.flag
       })     
-    });    
+    }, this.data.loginType);    
   },
 
   closeDialog: function () {
@@ -130,6 +146,11 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+    if(options.type == "noTv") {
+      this.setData({
+        loginType: ""
+      })
+    } 
     const qid = util.convertObject(decodeURIComponent(options.scene)).i || '';
     console.log('qid:' + qid);
     if(qid) {

pages/my/my.js

@@ -23,7 +23,8 @@ Page({
     productionData: {},
     num2: 0,
     productionMore: '',
-    canvasHeight: ''
+    canvasHeight: '',
+    loginType: 1
   },
   
   lower: function (e) {
@@ -62,6 +63,13 @@ Page({
     this.setGrade.showPopup()
   },
   onLoad: function (options) {
+    console.log(options.type, options.type == "noTV" )
+    if(options.type == "noTV") {
+      this.setData({
+        loginType: ""
+      })
+    } 
+    console.log(this.data.loginType)
     //获取更改年级组件
     this.setGrade = this.selectComponent("#set-grade");
     console.log(this.setGrade)
@@ -117,7 +125,7 @@ Page({
       this.setData({
         flag: !this.data.flag
       })
-    });  
+    }, this.data.loginType);  
     /* 分享 */
     const columnId = util.column('6').columnId;
     this.distinction(2, columnId, 1, 2, res => {

pages/science/science.js

@@ -22,7 +22,8 @@ Page({
     wxObjectives: [],
     canvasHeight: '',
     flag: true,
-    materialData: []   
+    materialData: [],
+    loginType: 1   
   },
   /* 区分答疑和分享 */
   distinction: function(type, columnId, pageNo, pageSize, success) {
@@ -108,6 +109,11 @@ Page({
     })
   },
   onLoad: function (options) {
+    if(options.type == "noTv") {
+      this.setData({
+        loginType: ""
+      })
+    } 
     const columnId = util.column('5').columnId;
     /* 分享 */
     this.distinction(2, columnId, 1, 2, res => {
@@ -177,7 +183,7 @@ Page({
       this.setData({
         flag: !this.data.flag
       })     
-    });
+    }, this.data.loginType);
    
   },
 

pages/transmit/transmit.js

@@ -12,7 +12,8 @@ Page({
     productionData: {},
     favors: '',
     like: false,
-    flag: true 
+    flag: true,
+    loginType: 1
   },
   //跳转详情页
   particulars: function (e) {
@@ -78,6 +79,11 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+    if(options.type == "noTv") {
+      this.setData({
+        loginType: ""
+      })
+    } 
     // wx.showModal({
     //   title: '提示',
     //   content: 'aaa' + JSON.stringify(options),
@@ -114,7 +120,7 @@ Page({
         this.setData({
           flag: !this.data.flag
         })     
-      });      
+      }, this.data.loginType);      
     };
     
   },

utils/APIClient.js

@@ -103,6 +103,11 @@ module.exports = {
 		let url = genAPIUrl('wx/question/wrong');
 		return request.getInstance().url(url).header(header).data(data).method('GET').send();
 	},
+	//记录用户操作
+	getStatisticsOpt (header, data) {
+		let url = genAPIUrl('wx/statistics/opt');
+		return request.getInstance().url(url).header(header).data(data).method('POST').send();
+	},
 	//获取用户答题指数
 	getExponentSchedule(header) {
 		let url = genAPIUrl('wx/question/exponent');

utils/loginSchedule.js

@@ -32,7 +32,7 @@ function wxLogin(successcallback, failcallback) {
 }
 
 // 获取原来的 openid 和 session_key
-function getOpenidSessionKey(successcallback, failcallback) {
+function getOpenidSessionKey(successcallback, failcallback, loginType) {
   if (wx.getStorageSync('user')) {
     successcallback(
       wx.getStorageSync('user'),
@@ -41,13 +41,39 @@ function getOpenidSessionKey(successcallback, failcallback) {
         withShareTicket: true
       })
     );
+    //登陆成功后，统计用户登录时长，暂时使用定时器60秒后调用后台接口，比较耗性能，可以优化。。。。
+    let loginTime = wx.getStorageSync('loginTime') || 0;
+    let fn = () => {
+        let timeNum = setInterval( () => {
+            loginTime++;
+            wx.setStorage({
+                key:"loginTime",
+                data:loginTime
+              })
+            if(loginTime >= 60) {
+                clearInterval(timeNum);
+                //统计后台调用
+                let url = genAPIUrl('wx/statistics/onlineTime');
+                let uid = wx.getStorageSync('user').data.data.uid
+                request.getInstance().url(url).header({
+                    uid,
+                }).method('POST').send().success(res => {
+                   console.log('成功')
+                });
+                loginTime = 0;
+                fn();
+            }
+            //console.log(loginTime)
+        },1000) 
+    }
+    fn();
     return;
   }
     wxLogin(function(res) {
         //console.log('获取sessionKey等内容'+JSON.stringify(res.data));
         let sessionKey = JSON.parse(res.data).session_key;
         let openId = JSON.parse(res.data).openid;
-        getLoginSchedule(sessionKey, openId, successcallback, failcallback, false);
+        getLoginSchedule(sessionKey, openId, successcallback, failcallback, false, loginType);
     },function(res) {
         failcallback(res);
     })    
@@ -76,7 +102,7 @@ function getOpenidSessionKeyTwo(successcallback, failcallback) {
   }
 
 //登录
-function getLoginSchedule(sessionKey, openId, successcallback, failcallback, affirm) {
+function getLoginSchedule(sessionKey, openId, successcallback, failcallback, affirm, loginType) {
     wx.getSetting({
         success: function(res) {
             // 已经授权，可以直接调用 getUserInfo 获取头像昵称
@@ -113,7 +139,8 @@ function getLoginSchedule(sessionKey, openId, successcallback, failcallback, aff
                             sessionKey: sessionKey,
                             iv: res.iv,
                             dist: '1133',
-                            headimgurl: userInfo.avatarUrl
+                            headimgurl: userInfo.avatarUrl,
+                            loginType
                         }          
                         request.getInstance().url(url).data(userData).method('GET').send().success(res => {
                             wx.hideToast()