Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss_wx_app

package-basic-data/pages/activity/activity.js

@@ -343,8 +343,7 @@ Page({
                 util.showToast('请选择一个授权或功能包');
                 return false
             }
-            // 判断数量是否超出续约授权
-            console.log(currentUserCount.wxNum - summaryInfo.wxMaxNum);
+            // 判断数量是否超出续约授权 
             if (currentUserCount.wxNum > summaryInfo.wxMaxNum && summaryInfo.reCountFlag
                 && currentUserCount.wxNum > 1 && currentUserCount.wxNum - summaryInfo.wxMaxNum > 1) {
                 let staffInfo = [{ wxMaxNum: Number(this.data.wxMaxNum), title: '当前授权', wxTitle: '手机授权', code: 'current', userTitle: '当前用户' }, { wxMaxNum: this.data.buyUser ? summaryInfo.wxMaxNum : summaryInfo.wxMaxNum + 1, title: '续费授权', wxTitle: '手机授权', code: 'renew' }]
@@ -621,8 +620,7 @@ Page({
     /**
      * 生命周期函数--监听页面加载
      */
-    onLoad(options) {
-        console.log(options, "onLoad");
+    onLoad(options) { 
         // 升级
         if (options && options.upgrade) {
             wx.setNavigationBarTitle({

package-basic-data/pages/activity/renew/renew.js

@@ -343,8 +343,7 @@ Page({
                 util.showToast('请选择一个授权或功能包');
                 return false
             }
-            // 判断数量是否超出续约授权
-            console.log(currentUserCount.wxNum - summaryInfo.wxMaxNum);
+            // 判断数量是否超出续约授权 
             if (currentUserCount.wxNum > summaryInfo.wxMaxNum && summaryInfo.reCountFlag
                 && currentUserCount.wxNum > 1 && currentUserCount.wxNum - summaryInfo.wxMaxNum > 1) {
                 let staffInfo = [{ wxMaxNum: Number(this.data.wxMaxNum), title: '当前授权', wxTitle: '手机授权', code: 'current', userTitle: '当前用户' }, { wxMaxNum: this.data.buyUser ? summaryInfo.wxMaxNum : summaryInfo.wxMaxNum + 1, title: '续费授权', wxTitle: '手机授权', code: 'renew' }]
@@ -621,8 +620,7 @@ Page({
     /**
      * 生命周期函数--监听页面加载
      */
-    onLoad(options) {
-        console.log(options, "onLoad");
+    onLoad(options) { 
         // 升级
         if (options && options.upgrade) {
             wx.setNavigationBarTitle({

package-basic-data/pages/customer-reception/add/add.js

@@ -77,6 +77,7 @@ Page({
       success (res){
         if(res.subscriptionsSetting && res.subscriptionsSetting.mainSwitch){
           if(!(res.subscriptionsSetting['z3REuwft6NLPxVW8s5HN1UgWjFstWjD0QfCXNLTa0LA'] && res.subscriptionsSetting['z3REuwft6NLPxVW8s5HN1UgWjFstWjD0QfCXNLTa0LA'] !== "accept")){
+            // 以下内容需要绑定点击事件 目前方法无法调用 周一讨论
             wx.requestSubscribeMessage({
               tmplIds: tmplIds,
               success (res) {

pages/home-page/home-page.js

@@ -639,8 +639,7 @@ Page({
     if (options.scene) {
       // var scene = options.scene
       var openid = decodeURIComponent(options.scene)
-      // let openid = scene.s
-      // console.log("homepage---", openid;
+      // let openid = scene.s 
       // 邀请员工的确认
       wx.navigateTo({
         url: '/package-basic-data/pages/staff/detail/detail',