diff --git a/main.js b/main.js index 5c5c477..f06a0e9 100644 --- a/main.js +++ b/main.js @@ -5,7 +5,7 @@ import { RouterMount } from "@/nxTemp/router"; import store from "@/nxTemp/store"; -import uView from "@/uview-ui"; +// import uView from "@/uview-ui"; import nxTemp from "@/nxTemp"; @@ -14,7 +14,7 @@ async function bootstrap() { //引入路由 Vue.use(router); // 引入全局uView - Vue.use(uView); + // Vue.use(uView); // 加载nxTemp Vue.use(nxTemp); diff --git a/nxTemp/config/requestConfig.js b/nxTemp/config/requestConfig.js index b5f33a7..d6fdd03 100644 --- a/nxTemp/config/requestConfig.js +++ b/nxTemp/config/requestConfig.js @@ -34,7 +34,7 @@ $http.requestStart = function(options) { console.error(options.url,"缺少token,触发重新登录",options); } else { options.header['token'] = token; //header中带上token - options.data['token'] = token; //请求data中带上token + if(!options.data.token)options.data['token'] = token; //请求data中带上token,兼容自带token参数 } } } diff --git a/pages.json b/pages.json index 54f1c82..ed5cd3e 100644 --- a/pages.json +++ b/pages.json @@ -2,7 +2,7 @@ "easycom": { //easycom,按需自动注册组件。原则上可以把所有页面引入组件方法删掉,会自动引入。 "autoscan": true, "custom": { - "^u-(.*)": "@/uview-ui/components/u-$1/u-$1.vue", + // "^u-(.*)": "@/uview-ui/components/u-$1/u-$1.vue", "^uni-(.*)": "@/components/uni-$1/uni-$1.vue", "^nx-(.*)": "@/components/nx-$1/nx-$1.vue" } diff --git a/pages/event/event_list.vue b/pages/event/event_list.vue index d47f779..4f94c9b 100644 --- a/pages/event/event_list.vue +++ b/pages/event/event_list.vue @@ -7,7 +7,7 @@ --> - + @@ -38,25 +38,55 @@ - diff --git a/pages/index/index.vue b/pages/index/index.vue index 36a534d..1c8e84d 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -44,7 +44,7 @@ ...mapState(['userInfo']), ...mapGetters(['hasLogin']), }, - onLoad(parms) { + onLoad(opt) { }, onUnload() { diff --git a/pages/public/404.vue b/pages/public/404.vue index 38b2c2d..73a2477 100644 --- a/pages/public/404.vue +++ b/pages/public/404.vue @@ -1,11 +1,11 @@ diff --git a/static/style/base.scss b/static/style/base.scss index bd4911c..2e8d832 100644 --- a/static/style/base.scss +++ b/static/style/base.scss @@ -8,7 +8,7 @@ @import "static/colorui/main.css"; @import "static/colorui/icon.css"; /*uview-ui css */ -@import "uview-ui/index.scss"; +// @import "uview-ui/index.scss"; page { min-height: 100%; diff --git a/uni.scss b/uni.scss index 9235071..b4bd2c4 100644 --- a/uni.scss +++ b/uni.scss @@ -11,7 +11,7 @@ * * 如果你的项目同样使用了scss预处理,你也可以直接在你的 scss 代码中使用如下变量,同时无需 import 这个文件 */ -@import 'uview-ui/theme.scss'; +// @import 'uview-ui/theme.scss'; /* 颜色变量 */ /* 行为相关颜色 */