水上游fix

app.js

@@ -21,7 +21,7 @@ App({
       unique_key: "wechatxcx"
     }).then(res => {
       let data = JSON.parse(res.data);
-      data.isTest = data.isTest182? true : false;
+      data.isTest = data.isTest183? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件

pages/list/night/index.js

@@ -43,7 +43,8 @@ Page({
     let list = this.data.list;
     if(list.length>=this.data.total) return;
     commonApi._post("product/get_product_by_tag",{
-      tag_id:this.data.type,
+    //   tag_id:this.data.type,
+      tag_id: 632,
       offset:list.length,
       limit:10,
       title:this.data.keywords

project.private.config.json

@@ -6,6 +6,13 @@
   "condition": {
     "miniprogram": {
       "list": [
+        {
+          "name": "pages/pbService/web/index",
+          "pathName": "pages/pbService/web/index",
+          "query": "weburl=https://test.m.cloud.sz-trip.com/culturalTravelHelp",
+          "launchMode": "default",
+          "scene": null
+        },
         {
           "name": "pages/pbService/web/index",
           "pathName": "pages/pbService/web/index",

subPackages/transferPage/transferPage.js

@@ -12,10 +12,13 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
+      console.log(options)
     this.setData({
         back: false
     })
     if (options.action = 'otherMiniProgram') {
+        // let path = decodeURIComponent(options.path)
+        // console.log(path)
         this.goOtherMiniProgrogram(options)
     } else {
         wx.navigateBack()
@@ -28,14 +31,15 @@ Page({
         // appId: 'wx114d514f39cb1fed',
         // path: "pages/entry/index",
         appId: data.appId,
-        path: data.path,
+        path:  decodeURIComponent(data.path),
         shortLink: data.shortLink,
         success: () =>{
             this.setData({
                 back: true
             })
         },
-        fail: ()=>{
+        fail: (e)=>{
+            console.log(e)
             wx.navigateBack()
         }
     })

utils/https.js

@@ -319,10 +319,25 @@ const set_logininfo = r => {
 }
 
 let canToLogin = true
+let appData = getApp()
 const checkLogin = () => {
   // 判断是否已经授权过
   let page = getCurrentPages();
-  if (page[page.length - 1].route != 'pages/login/index' && canToLogin) {
+
+    // 审核不强制登录
+    if (!appData) {
+        console.log("获取app")
+        appData = getApp()
+    }
+    console.log(appData,page)
+    if(appData.globalData.configJson.isTest) {
+        if (page[page.length - 1].route != 'pages/user/user') {
+            return
+        }
+    }
+
+
+  if ('pages/login/index' && canToLogin) {
       canToLogin = false
     wx.navigateTo({
       url: '/pages/login/index',