Merge branch 'igirl-web' of gitlab.gongsibao.com:jiangyong/zhichan into igirl-web

igirl-web/app/base/db/cache/wxcomponentverifyticketCache.js

@@ -13,9 +13,12 @@ class WxcomponentverifyticketCache extends CacheBase{
      this.wxopenplatformconfig = settings.wxopenplatformconfig;
      this.wxopenplatformconfig = settings.wxopenplatformconfig;
    }
    }
    async cacheComponentVerifyTicket(value){
    async cacheComponentVerifyTicket(value){
+    console.log("cacheComponentVerifyTicket:value---------------"+value);
         var key=this.prefix+this.wxopenplatformconfig.appid;
         var key=this.prefix+this.wxopenplatformconfig.appid;
+        console.log("cacheComponentVerifyTicket:key---------------"+key);
         if(value){
         if(value){
             var beforevalue = await this.redisClient.get(key);
             var beforevalue = await this.redisClient.get(key);
+            console.log("cacheComponentVerifyTicket:beforevalue---------------"+beforevalue);
             if(beforevalue!=value){
             if(beforevalue!=value){
               await this.redisClient.set(key,value);
               await this.redisClient.set(key,value);
             }
             }

igirl-web/app/base/wxop/impl/empowerWxop.js

@@ -154,7 +154,9 @@ class EmpowerWxop extends WxopBase{
           content: JSON.stringify(result) ,
           content: JSON.stringify(result) ,
           clientIp: ""
           clientIp: ""
         });
         });
+        console.log("receiveEmpowerMsg:---------------"+result);
         if(result){
         if(result){
+          console.log("receiveEmpowerMsg:---------------"+result.ComponentVerifyTicket);
           result=result.xml;
           result=result.xml;
           if(result.InfoType=="component_verify_ticket"){//推送component_verify_ticket协议
           if(result.InfoType=="component_verify_ticket"){//推送component_verify_ticket协议
             await this.cacheManager["WxcomponentverifyticketCache"].cacheComponentVerifyTicket(result.ComponentVerifyTicket);
             await this.cacheManager["WxcomponentverifyticketCache"].cacheComponentVerifyTicket(result.ComponentVerifyTicket);

igirl-web/app/front/vues/pages/recommen/recommen.js

@@ -443,6 +443,8 @@
         console.log(this.recommendationsArr,12312312321);
         console.log(this.recommendationsArr,12312312321);
       })*/
       })*/
       axios.post('http://106.13.228.212:8011/policy_report', {
       axios.post('http://106.13.228.212:8011/policy_report', {
+        "currentpage": size || 1,
+          "pagesize":15,
         "companyname": this.zctext
         "companyname": this.zctext
       }).then(d => {
       }).then(d => {
         console.log(d);
         console.log(d);