diff --git a/.gitignore b/.gitignore index cb1686f..e23bc12 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,14 @@ -/unpackage -.idea \ No newline at end of file +# 默认忽略的文件 +/shelf/ +/workspace.xml +# 基于编辑器的 HTTP 客户端请求 +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml +.idea +package-lock.json +node_modules/ +unpackage/ +.hbuilderx +.vite \ No newline at end of file diff --git a/common/config.js b/common/config.js index 40e9a67..b025d84 100644 --- a/common/config.js +++ b/common/config.js @@ -1,5 +1,6 @@ export default { + baseUrl : 'http://127.0.0.1:8000', // baseUrl: 'https://api.book118.com', - baseUrl:'https://houserent-admin.hhlm1688.com' + // baseUrl:'https://houserent-admin.hhlm1688.com' // baseUrl:'http://h5.xzaiyp.top' } \ No newline at end of file diff --git a/config.js b/config.js index 4522a5a..9f2c73d 100644 --- a/config.js +++ b/config.js @@ -1,15 +1,18 @@ import Vue from 'vue' import utils from './utils/utils.js' import uvUI from '@/uni_modules/uv-ui-tools' -console.info(`uvUI`,uvUI) + Vue.use(uvUI); // 当前环境 -const type = 'prod' +const type = 'local' // 环境配置 const config = { + local : { + baseUrl : 'http://127.0.0.1:8001/employ-api', + }, dev : { baseUrl : 'http://augcl.natapp1.cc/employ-api', }, diff --git a/pages.json b/pages.json index 7f5a9eb..9a98c59 100644 --- a/pages.json +++ b/pages.json @@ -65,7 +65,8 @@ { "path": "category/index", "style": { - "navigationBarTitleText": "分类" + "navigationBarTitleText": "分类", + "enablePullDownRefresh": true } }, { @@ -196,12 +197,14 @@ "iconPath": "static/bar/home.png", "selectedIconPath": "static/bar/home_selected.png", "text": "首页" - }, { - "pagePath": "pages/discover/index", - "iconPath": "static/bar/find.png", - "selectedIconPath": "static/bar/find_selected.png", - "text": "发现" - }, { + }, + // { + // "pagePath": "pages/discover/index", + // "iconPath": "static/bar/find.png", + // "selectedIconPath": "static/bar/find_selected.png", + // "text": "发现" + // }, + { "pagePath": "pages/user/index", "iconPath": "static/bar/user.png", "selectedIconPath": "static/bar/user_selected.png", diff --git a/pages/home/index.vue b/pages/home/index.vue index 81b91ae..f38ccda 100644 --- a/pages/home/index.vue +++ b/pages/home/index.vue @@ -74,13 +74,19 @@ + + + + + +