diff --git a/config.js b/config.js index a01cd0b..3833042 100644 --- a/config.js +++ b/config.js @@ -1,7 +1,7 @@ // 应用全局配置 module.exports = { - baseUrl: 'https://hb.jzce.com', - // baseUrl: 'http://188.188.3.232:48080', + // baseUrl: 'https://hb.jzce.com', + baseUrl: 'http://188.188.3.232:48080', baseApi: '/admin-api', // 应用信息 appInfo: { diff --git a/main.js b/main.js index 44030e7..10b2df1 100644 --- a/main.js +++ b/main.js @@ -8,13 +8,10 @@ import * as util from '@/utils/ruoyi.js' import * as roles from '@/utils/permission.js' // 引入uView import uView from '@/uni_modules/uview-ui' -// import mpShare from '@/uni_modules/uview-ui/libs/mixin/mpShare.js' -// Vue.mixin(mpShare) +import mpShare from '@/uni_modules/uview-ui/libs/mixin/mpShare.js' +Vue.mixin(mpShare) // 挂载全局对象 Vue.use(plugins).use(uView) -let mpShare = require('@/uni_modules/uview-ui/libs/mixin/mpShare.js'); -Vue.mixin(mpShare) - Vue.config.productionTip = false diff --git a/pages.json b/pages.json index 381d294..a9aa325 100644 --- a/pages.json +++ b/pages.json @@ -6,8 +6,7 @@ "navigationStyle": "custom", "usingComponents": { "van-dropdown-menu": "/wxcomponents/vant/dropdown-menu/index", - "van-dropdown-item": "/wxcomponents/vant/dropdown-item/index", - "ec-canvas": "/wxcomponents/ec-canvas/ec-canvas" + "van-dropdown-item": "/wxcomponents/vant/dropdown-item/index" } } }, @@ -60,8 +59,9 @@ "easycom": { "autoscan": true, "custom": { - "^cs-(.*)": "@/components/cs-$1/index.vue", // 匹配components目录内的vue文件 - "^s-(.*)": "@/uni_modules/s-components/s-$1/index.vue" // 匹配components目录内的vue文件 + "^cs-(.*)": "@/components/cs-$1/index.vue", + "^s-(.*)": "@/uni_modules/s-components/s-$1/index.vue", + "^u-(.*)": "@/uni_modules/uview-ui/components/u-$1/u-$1.vue" } }, "subPackages": [{ diff --git a/pages/index.vue b/pages/index.vue index 3d4b1d4..0378d4f 100644 --- a/pages/index.vue +++ b/pages/index.vue @@ -1,6 +1,6 @@