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/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; 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函数里面得到 + } + ] + } }