diff --git a/common/http/config.ts b/common/http/config.ts index f615bcf..0cbc559 100644 --- a/common/http/config.ts +++ b/common/http/config.ts @@ -1,8 +1,8 @@ export default { //正式接口 - base_scm:'http://192.168.1.222:7002', - base_auth:'http://192.168.1.2:7000',//登录 + base_scm:'http://goodsilk.org:7002', + base_auth:'https://cloud.goodsilk.cn/auth',//登录 base_mes:'http://120.26.196.222:8981',//面料 base_process:'http://120.26.196.222:8981',//工艺 diff --git a/common/http/interface.ts b/common/http/interface.ts index 36347c6..b9896c0 100644 --- a/common/http/interface.ts +++ b/common/http/interface.ts @@ -66,6 +66,10 @@ function httpRequest(url : string, method : any, data = {}, headerCustom = {}) { icon:'error', title:'暂无权限!' }) + }else if(res.data.code === 7778){ + resolve(res.data); + }else if(res.data.code === 7777){ + resolve(res.data); }else{ uni.showToast({ icon:'error', diff --git a/manifest.json b/manifest.json index 3860c29..48f51d1 100644 --- a/manifest.json +++ b/manifest.json @@ -1,7 +1,7 @@ { "name" : "ckqt", - "appid" : "", - "description" : "", + "appid" : "__UNI__331DF1E", + "description" : "自用管理系统", "versionName" : "1.0.0", "versionCode" : "100", "transformPx" : false, @@ -68,5 +68,12 @@ "uniStatistics" : { "enable" : false }, - "vueVersion" : "3" + "vueVersion" : "3", + "h5" : { + "router" : { + "mode" : "hash", + "base" : "/" + } + }, + "locale" : "zh-Hans" } diff --git a/pages.json b/pages.json index 693f7a3..144774f 100644 --- a/pages.json +++ b/pages.json @@ -102,28 +102,6 @@ } } }, - { - "path": "pages/lecher/l-flaws", - "style": { - "navigationStyle": "custom", - "enablePullDownRefresh": false, - "disableScroll": true, - "app-plus": { - "bounce": "none" - } - } - }, - { - "path": "pages/lecher/l-quality", - "style": { - "navigationStyle": "custom", - "enablePullDownRefresh": false, - "disableScroll": true, - "app-plus": { - "bounce": "none" - } - } - }, { "path" : "pages/whiteEmbryo/w-scanCode", "style" : diff --git a/pages/index/index.vue b/pages/index/index.vue index ef45b68..0e1a7f7 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -1,6 +1,6 @@