From 5857fd14f4608ace25724ba6386d72d210e20870 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Thu, 25 Mar 2021 10:27:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop

---
 zq-xcx/project.config.json |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/zq-xcx/project.config.json b/zq-xcx/project.config.json
index ca6dfcb..8b486aa 100644
--- a/zq-xcx/project.config.json
+++ b/zq-xcx/project.config.json
@@ -45,17 +45,10 @@
   "simulatorType": "wechat",
   "simulatorPluginLibVersion": {},
   "condition": {
-    "search": {
-      "list": []
-    },
-    "conversation": {
-      "list": []
-    },
     "plugin": {
       "list": []
     },
     "game": {
-      "currentL": -1,
       "list": []
     },
     "gamePlugin": {
@@ -216,6 +209,12 @@
           "pathName": "pages/shalong/shalongDetail",
           "query": "id=6",
           "scene": null
+        },
+        {
+          "name": "pages/yuyue/showYyInfo",
+          "pathName": "pages/yuyue/showYyInfo",
+          "query": "id=3004",
+          "scene": null
         }
       ]
     }

--
Gitblit v1.9.1