diff --git a/api/bill.js b/api/bill.js index 93ccef1..730a8a6 100644 --- a/api/bill.js +++ b/api/bill.js @@ -3,3 +3,5 @@ import post, {get} from "@/api/request"; export const listBillReq = (params, getTask) => get('/zhsq/zhsq-tollcenter-record-bill-estate/userList', {params, getTask}) export const makePayReq = data => post('/union-pay/make-pay', data) + +// https://xq-api.ggsxiangan.com/api/zhsq/zhsq-base-village?withFeeItem=true&withPopulation=true \ No newline at end of file diff --git a/components/customTabbar.vue b/components/customTabbar.vue index 792a951..8d3a454 100644 --- a/components/customTabbar.vue +++ b/components/customTabbar.vue @@ -46,6 +46,12 @@ export default { "selectedIconPath": "static/tabbar/service-active.png", "text": "服务" }, + { + "pagePath": "pages/community/index", + "iconPath": "static/tabbar/xiaoqu.png", + "selectedIconPath": "static/tabbar/xiaoqu-active.png", + "text": "小区" + }, { "pagePath": "pages/index/index", "iconPath": "static/tabbar/store.png", @@ -67,7 +73,7 @@ export default { tabClick(val) { console.log('val', val) if (val === 0 && this.current === 0) this.$jump('/pages/index/index') - if (val === 2) { + if (val === 3) { uni.navigateToMiniProgram({ appId: 'wxad2376fd45fb7eca', complete() { diff --git a/manifest.json b/manifest.json index 1d88628..ebfb542 100644 --- a/manifest.json +++ b/manifest.json @@ -50,7 +50,6 @@ "quickapp" : {}, /* 小程序特有相关 */ "mp-weixin" : { - // "appid" : "wxd1adb2bb3c51298c", "appid" : "wx9a7a82430d0bdd6c", "setting" : { "urlCheck" : false, diff --git a/package-lock.json b/package-lock.json index 3f0baf7..47e5601 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4,6 +4,9 @@ "requires": true, "packages": { "": { + "dependencies": { + "dayjs": "^1.11.13" + }, "devDependencies": { "sass": "^1.89.2", "sass-loader": "^16.0.5" @@ -333,6 +336,12 @@ "url": "https://paulmillr.com/funding/" } }, + "node_modules/dayjs": { + "version": "1.11.18", + "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.18.tgz", + "integrity": "sha512-zFBQ7WFRvVRhKcWoUh+ZA1g2HVgUbsZm9sbddh8EC5iv93sui8DVVz1Npvz+r6meo9VKfa8NyLWBsQK1VvIKPA==", + "license": "MIT" + }, "node_modules/detect-libc": { "version": "1.0.3", "resolved": "https://registry.npmmirror.com/detect-libc/-/detect-libc-1.0.3.tgz", @@ -671,6 +680,11 @@ "readdirp": "^4.0.1" } }, + "dayjs": { + "version": "1.11.18", + "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.18.tgz", + "integrity": "sha512-zFBQ7WFRvVRhKcWoUh+ZA1g2HVgUbsZm9sbddh8EC5iv93sui8DVVz1Npvz+r6meo9VKfa8NyLWBsQK1VvIKPA==" + }, "detect-libc": { "version": "1.0.3", "resolved": "https://registry.npmmirror.com/detect-libc/-/detect-libc-1.0.3.tgz", diff --git a/package.json b/package.json index 4f7956c..08d0760 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "devDependencies": { - "sass": "^1.89.2", + "sass": "^1.90.0", "sass-loader": "^16.0.5" }, "dependencies": { diff --git a/pages.json b/pages.json index ad6e050..6927c69 100644 --- a/pages.json +++ b/pages.json @@ -92,6 +92,13 @@ "style": { "navigationBarTitleText": "我的房产" } + }, + { + "path" : "pages/community/index", + "style" : + { + "navigationBarTitleText" : "小区概览" + } } ], "subPackages": [ @@ -272,6 +279,12 @@ "iconPath": "static/service.png", "selectedIconPath": "static/service-active.png" }, + { + "pagePath": "pages/community/index", + "text": "小区", + "iconPath": "static/xiaoqu.png", + "selectedIconPath": "static/xiaoqu-active.png" + }, { "pagePath": "pages/store/index", "text": "商城", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index cd0638c..ee3fd63 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -13,7 +13,7 @@ importers: version: 1.11.13 devDependencies: sass: - specifier: ^1.89.2 + specifier: ^1.90.0 version: 1.90.0 sass-loader: specifier: ^16.0.5