From 22b17e78c09a371f3a65079e0d7d6ccd8fdf17ca Mon Sep 17 00:00:00 2001 From: liangkun Date: Mon, 19 Apr 2021 11:37:57 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=85=AC=E6=96=87=E6=8E=A5=E6=94=B6?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E5=8E=BB=E6=8E=89=E9=BB=98=E8=AE=A4=E6=97=A5?= =?UTF-8?q?=E6=9C=9F=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/Sys_ReceiveFile/IndexGWJS.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/IndexGWJS.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/IndexGWJS.js index aa5c2827d..4eae20700 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/IndexGWJS.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/IndexGWJS.js @@ -35,8 +35,6 @@ var bootstrap = function ($, learun) { yxShow: false, preyShow: false, yShow: false, - // 默认 - dfvalue: '1', selectfn: function (begin, end) { startTime = begin; endTime = end; From dc4d8d1a8c38b8506f6d89c530fe5543b4e2df90 Mon Sep 17 00:00:00 2001 From: liangkun Date: Mon, 19 Apr 2021 18:23:26 +0800 Subject: [PATCH 2/2] =?UTF-8?q?app2.0=E8=B0=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + .../LearunApp-2.2.0/config.js | 10 +++++----- .../LearunApp-2.2.0/pages.json | 12 +++++++++++- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 8a18751f3..a85ec7573 100644 --- a/.gitignore +++ b/.gitignore @@ -79,3 +79,4 @@ Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js /Learun.Framework.Ultimate V7/Learun.Application.Mobile/platforms/android/assets/www /Learun.Framework.Ultimate V7/Learun.Application.Mobile/www.7z /Learun.Framework.Ultimate V7/Learun.Application.WebApi/bin.7z +/Learun.Framework.Ultimate V7/LearunApp-2.2.0/.hbuilderx/launch.json diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js index 9618b5275..d9fbce92a 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js @@ -6,15 +6,15 @@ export default { // 是否允许用户注册 "enableSignUp": true, //请求数据的接口地址；可以配置多个，开发环境下登录页会出现选择菜单供您选择 - "apiHost": [ - "https://wx.qjkjedu.com/learun/adms" - ], // "apiHost": [ - // "http://192.168.2.202:8083/learun/adms" + // "https://wx.qjkjedu.com/learun/adms" // ], // "apiHost": [ - // "http://localhost:8088/learun/adms" + // "http://192.168.2.202:8083/learun/adms" // ], + "apiHost": [ + "http://localhost:31173/learun/adms" + ], // 开发环境下自动填充登录账号密码，与接口地址一一对应，只在开发环境下显示 "devAccount": [ { username: "system", password: "123456" } diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json index 4b65384fe..c9a5eb6a2 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json @@ -282,5 +282,15 @@ "tki-qrcode": "@/components/tki-qrcode/tki-qrcode.vue", "u-parse": "@/components/u-parse/u-parse.vue" } - } + }, + "condition" : { //模式配置，仅开发期间生效 + "current": 0, //当前激活的模式(list 的索引项) + "list": [ + { + "name": "", //模式名称 + "path": "", //启动页面，必选 + "query": "" //启动参数，在页面的onLoad函数里面得到 + } + ] + } }