Merge remote-tracking branch 'origin/dev-stage2-20191125' into dev-stage2-20191125

pages/activityPage.vue

@@ -1058,8 +1058,6 @@
             // setCookie('headToken', userToken);
             cookies.set('token', userToken);
             cookies.set('headToken', userToken);
-
-            this.setJQ(itemData, userToken);
           });
         } else {
           const paramList = setEventByModuleCode(
@@ -1072,78 +1070,6 @@
           });
         }
       },
-      //鉴权 自己调用token 是否认证
-      setJQ(itemData, token) {
-        this.itemData = itemData;
-        this.getUserInfo2(itemData, token);
-      },
-      // 兼容Andriod新版本
-      getUserInfo2(itemData, token) {
-        this.$rocNative
-          .getUserInfo()
-          .then(params => {
-            this.token = params.userToken;
-            // setCookie('headToken', params.userToken)
-            cookies.set('headToken', params.userToken);
-            // this.prbateFun(this.itemData, this.token);
-            getRole({token: this.token}).then(res => {
-              if (res.code == '000000') {
-                if (res.data.role == 4) {
-                  if (res.data.flag == 1) {
-                    this.setJQ2(itemData, token);
-                  } else {
-                    this.$rocNative.showNativeToast({
-                      message: '请加入机构，再尝试访问！'
-                    });
-                  }
-                } else if (res.data.role == 2) {
-                  this.$rocNative.showNativeToast({
-                    message: '仅限认证用户浏览 '
-                  });
-                } else if (res.data.role == 3) {
-                  this.$rocNative.showNativeToast({
-                    message: '仅限认证且加入机构的用户浏'
-                  });
-                }
-              } else {
-                this.$rocNative.showNativeToast({
-                  message: res.message
-                });
-              }
-            });
-          });
-      },
-      setJQ2(itemData, token) {
-        let _this = this,
-          para = {
-            token: this.token,
-            setEntry: 'headers'
-          };
-        sayHello(para).then(res => {
-          if (res.code == '000000') {
-            _this.nonce_str = res.data.nonce_str;
-            itemData.paramList.push({
-              id: 598,
-              key: 'nonce_str',
-              seqNo: 3,
-              type: 4,
-              value: res.data.nonce_str
-            });
-            let paramList = setEventByModuleCode(
-              itemData,
-              token
-            );
-            this.$rocNative.dispatchEventByModuleCode({
-              modeCode: itemData.code,
-              jsonString: paramList
-            });
-          } else {
-            this.$rocNative.showNativeToast({
-              message: res.message
-            });
-          }
-        });
-      },
       getHeaderHeight(val){
         this.padTop = val;
       },