diff --git a/app.js b/app.js
index a523115..3284830 100644
--- a/app.js
+++ b/app.js
@@ -1,6 +1,24 @@
// app.js
App({
onLaunch: function (options) {
+
+ const { statusBarHeight, platform, windowHeight }=wx.getSystemInfoSync()
+ const { top, height } = wx.getMenuButtonBoundingClientRect()
+ // 状态栏高度
+ wx.setStorageSync('statusBarHeight', statusBarHeight)
+ // 屏幕高度
+ wx.setStorageSync('windowHeight', windowHeight)
+ // 胶囊按钮高度 一般是32 如果获取不到就使用32
+ wx.setStorageSync('menuButtonHeight', height ? height : 32)
+ // 判断胶囊按钮信息是否成功获取
+ if (top && top !== 0 && height && height !== 0) {
+ const navigationBarHeight = (top - statusBarHeight) * 2 + height
+ // 导航栏高度
+ wx.setStorageSync('navigationBarHeight', navigationBarHeight)
+ } else {
+ wx.setStorageSync('navigationBarHeight', platform === 'android' ? 48 : 40)
+ }
+
//获取设备顶部窗口的高度（不同设备窗口高度不一样，根据这个来设置自定义导航栏的高度）
//这个最初我是在组件中获取，但是出现了一个问题，当第一次进入小程序时导航栏会把
//页面内容盖住一部分,当打开调试重新进入时就没有问题，这个问题弄得我是莫名其妙
diff --git a/app.json b/app.json
index 1b1102c..0f5caa1 100644
--- a/app.json
+++ b/app.json
@@ -1,80 +1,88 @@
{
- "pages": [
- "pages/index/index",
- "pages/message/message",
- "pages/life/life",
- "pages/serve/serve",
- "pages/mine/mine",
- "pages/register/register"
- ],
- "subPackages": [
- {
- "root": "subpages/OCRCard",
- "name": "OCRCard",
- "pages": [
- "pages/index/index",
- "pages/confirm/confirm"
- ]
- },
- {
- "root":"subpages/mine",
- "name":"mine",
- "pages":[
- "editUser/editUser",
- "checkInRecord/checkInRecord"
- ]
- }
- ],
- "window": {
- "navigationBarTextStyle": "black",
- "navigationBarTitleText": "Weixin",
- "navigationBarBackgroundColor": "#ffffff"
- },
- "tabBar": {
- "custom": true,
- "color": "#333333",
- "selectedColor": "#08b3b3",
- "backgroundColor": "#ffffff",
- "list": [
- {
- "text":"首页",
- "pagePath": "pages/index/index",
- "iconPath": "images/icon/home.png"
- },
- {
- "text":"消息",
- "pagePath": "pages/message/message",
- "iconPath": "images/icon/home.png"
- },{
- "text":"服务",
- "pagePath": "pages/serve/serve",
- "iconPath": "images/icon/home.png"
- },
- {
- "text":"生活圈",
- "pagePath": "pages/life/life",
- "iconPath": "images/icon/home.png"
- },
- {
- "text":"我的",
- "pagePath": "pages/mine/mine",
- "iconPath": "images/icon/home.png"
- }
- ]
- },
- "permission": {
- "scope.userLocation": {
- "desc": "将获取您的位置信息"
+ "pages": [
+ "pages/index/index",
+ "pages/message/message",
+ "pages/life/life",
+ "pages/serve/serve",
+ "pages/mine/mine",
+ "pages/register/register"
+ ],
+ "subPackages": [
+ {
+ "root": "subpages/OCRCard",
+ "name": "OCRCard",
+ "pages": [
+ "pages/index/index",
+ "pages/confirm/confirm"
+ ]
+ },
+ {
+ "root": "subpages/mine",
+ "name": "mine",
+ "pages": [
+ "editUser/editUser",
+ "checkInRecord/checkInRecord"
+ ]
+ },
+ {
+ "root": "subpages/index",
+ "name": "index",
+ "pages": [
+ "renewalApplication/renewalApplication"
+ ]
+ }
+ ],
+ "window": {
+ "navigationBarTextStyle": "black",
+ "navigationBarTitleText": "Weixin",
+ "navigationBarBackgroundColor": "#ffffff"
+ },
+ "tabBar": {
+ "custom": true,
+ "color": "#333333",
+ "selectedColor": "#08b3b3",
+ "backgroundColor": "#ffffff",
+ "list": [
+ {
+ "text": "首页",
+ "pagePath": "pages/index/index",
+ "iconPath": "images/icon/home.png"
+ },
+ {
+ "text": "消息",
+ "pagePath": "pages/message/message",
+ "iconPath": "images/icon/home.png"
+ },
+ {
+ "text": "服务",
+ "pagePath": "pages/serve/serve",
+ "iconPath": "images/icon/home.png"
+ },
+ {
+ "text": "生活圈",
+ "pagePath": "pages/life/life",
+ "iconPath": "images/icon/home.png"
+ },
+ {
+ "text": "我的",
+ "pagePath": "pages/mine/mine",
+ "iconPath": "images/icon/home.png"
+ }
+ ]
+ },
+ "permission": {
+ "scope.userLocation": {
+ "desc": "将获取您的位置信息"
+ }
+ },
+ "requiredPrivateInfos": [
+ "getLocation",
+ "chooseLocation"
+ ],
+ "plugins": {
+ "ocr-plugin": {
+ "version": "3.1.3",
+ "provider": "wx4418e3e031e551be"
+ }
}
- },
- "requiredPrivateInfos": [
- "getLocation",
- "chooseLocation"
- ],
- "plugins": {
- "ocr-plugin": {
- "version": "3.1.3",
- "provider": "wx4418e3e031e551be"
- }
- }
}
\ No newline at end of file
diff --git a/components/navigationBar/navigationBar.js b/components/navigationBar/navigationBar.js
new file mode 100644
index 0000000..6e867dc
--- /dev/null
+++ b/components/navigationBar/navigationBar.js
@@ -0,0 +1,55 @@
+// components/navigationBar.js
+Component({
+
+ /**
+ * 组件的属性列表
+ */
+ properties: {
+ title:{
+ type: String,
+ value: '续期提醒'
+ },
+ backgroundImage:{
+ type: String,
+ value: ''
+ },
+ isSowArrow:{
+ type: Boolean,
+ value: false
+ },
+ isShowBg:{
+ type: Boolean,
+ value: false
+ },
+ height:{
+ type:String,
+ value:''
+ }
+ },
+
+ /**
+ * 组件的初始数据
+ */
+ data: {
+ // 状态栏高度
+ statusBarHeight: wx.getStorageSync('statusBarHeight') + 'px',
+ // 导航栏高度
+ navigationBarHeight: wx.getStorageSync('navigationBarHeight') + 'px',
+ // 胶囊按钮高度
+ menuButtonHeight: wx.getStorageSync('menuButtonHeight') + 'px',
+ // 导航栏和状态栏高度
+ navigationBarAndStatusBarHeight: wx.getStorageSync('statusBarHeight') + wx.getStorageSync('navigationBarHeight') + 'px'
+
+ },
+
+ /**
+ * 组件的方法列表
+ */
+ methods: {
+ handleGoToBack(){
+ wx.navigateBack({
+ delta: 1
+ })
+ }
+ }
+})
\ No newline at end of file
diff --git a/components/navigationBar/navigationBar.json b/components/navigationBar/navigationBar.json
new file mode 100644
index 0000000..7e37c03
--- /dev/null
+++ b/components/navigationBar/navigationBar.json
@@ -0,0 +1,4 @@
+{
+ "component": true,
+ "usingComponents": {}
+}
\ No newline at end of file
diff --git a/components/navigationBar/navigationBar.wxml b/components/navigationBar/navigationBar.wxml
new file mode 100644
index 0000000..4f4b6a6
--- /dev/null
+++ b/components/navigationBar/navigationBar.wxml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
+
+
+
+
+ {{title}}
+
+
+
+
+
+
\ No newline at end of file
diff --git a/components/navigationBar/navigationBar.wxss b/components/navigationBar/navigationBar.wxss
new file mode 100644
index 0000000..76fbeba
--- /dev/null
+++ b/components/navigationBar/navigationBar.wxss
@@ -0,0 +1,58 @@
+/* components/navigationBar.wxss */
+
+.navigation-container {
+ position: fixed;
+ width: 100%;
+ z-index: 99;
+ top: 0;
+ left: 0;
+}
+
+.navigation-bar {
+ position: relative;
+ display: flex;
+ flex-direction: row;
+ align-items: center;
+}
+
+.navigation-buttons {
+ display: flex;
+ align-items: center;
+ margin-left: 10px;
+ border: 1px solid rgba(0, 0, 0, 0.05);
+ box-sizing: border-box;
+ border-radius: 15px;
+ background-color: transparent;
+}
+
+.nav-img {
+ height: 22px;
+ margin-left: 28rpx;
+ width: 22px;
+}
+
+.navigation-title {
+ position: absolute;
+ left: 104rpx;
+ right: 104rpx;
+ text-align: center;
+ font-size: 16px;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+}
+.arrow-content{
+ position: absolute;
+ left: 40rpx;
+ z-index: 999;
+ display: flex;
+ align-items: center;
+ }
+.arrow {
+ width: 18rpx;
+ height: 18rpx;
+ border: 5rpx solid #101010;
+ border-right-color: transparent;
+ border-bottom-color: transparent;
+ transform: rotate(-45deg);
+}
\ No newline at end of file
diff --git a/images/bg.png b/images/bg.png
new file mode 100644
index 0000000..5e3c030
Binary files /dev/null and b/images/bg.png differ
diff --git a/images/mine/md-restore.png b/images/mine/md-restore.png
new file mode 100644
index 0000000..dcf824e
Binary files /dev/null and b/images/mine/md-restore.png differ
diff --git a/pages/index/index.js b/pages/index/index.js
index 27eb212..c1e5277 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -1,97 +1,90 @@
// pages/index/index.js
const app = getApp()
Page({
-
- /**
- * 页面的初始数据
- */
- data: {
- indicatorDots: true,
- autoplay: true,
- interval: 3000,
- duration: 1000,
- imgUrls: [
- '/images/banner/banner1.png',
- '/images/banner/banner1.png',
- '/images/banner/banner1.png',
- ],
- navList:[
- {
- name:'政策资讯'
- },{
- name:'入住办理'
- },{
- name:'退房确认'
- },{
- name:'续期申请'
- },{
- name:'续期合同'
- },{
- name:'报修'
- },{
- name:'报事'
- },{
- name:'生活圈'
- },
- ],
- searchValue:''
- },
-
- /**
- * 生命周期函数--监听页面加载
- */
- onLoad(options) {
- this.setData({
- statusHeight: app.globalData.deviceInfo.statusHeight,
- });
- },
-
- /**
- * 生命周期函数--监听页面初次渲染完成
- */
- onReady() {
-
- },
-
- /**
- * 生命周期函数--监听页面显示
- */
- onShow() {
-
- },
-
- /**
- * 生命周期函数--监听页面隐藏
- */
- onHide() {
-
- },
-
- /**
- * 生命周期函数--监听页面卸载
- */
- onUnload() {
-
- },
-
- /**
- * 页面相关事件处理函数--监听用户下拉动作
- */
- onPullDownRefresh() {
-
- },
-
- /**
- * 页面上拉触底事件的处理函数
- */
- onReachBottom() {
-
- },
-
- /**
- * 用户点击右上角分享
- */
- onShareAppMessage() {
-
- }
-})
\ No newline at end of file
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ indicatorDots: true,
+ autoplay: true,
+ interval: 3000,
+ duration: 1000,
+ imgUrls: [
+ "/images/banner/banner1.png",
+ "/images/banner/banner1.png",
+ "/images/banner/banner1.png",
+ ],
+ navList: [
+ {
+ name: "政策资讯",
+ },
+ {
+ name: "入住办理",
+ },
+ {
+ name: "退房确认",
+ },
+ {
+ name: "续期申请",
+ url: "/subpages/index/renewalApplication/renewalApplication",
+ },
+ {
+ name: "续期合同",
+ },
+ {
+ name: "报修",
+ },
+ {
+ name: "报事",
+ },
+ {
+ name: "生活圈",
+ },
+ ],
+ searchValue: "",
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad(options) {
+ this.setData({
+ statusHeight: app.globalData.deviceInfo.statusHeight,
+ });
+ },
+
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady() {},
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow() {},
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide() {},
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload() {},
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh() {},
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom() {},
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage() {},
+});
\ No newline at end of file
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 5be5d13..aa9c225 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -15,7 +15,8 @@
青岛人彩棉租住房申请条件的先骨干说明
-
+
{{item.name}}
diff --git a/project.private.config.json b/project.private.config.json
index 02d1ef0..7c7125f 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -14,6 +14,13 @@
"condition": {
"miniprogram": {
"list": [
+ {
+ "name": "subpages/index/renewalApplication/renewalApplication",
+ "pathName": "subpages/index/renewalApplication/renewalApplication",
+ "query": "",
+ "launchMode": "default",
+ "scene": null
+ },
{
"name": "subpages/mine/editUser/editUser",
"pathName": "subpages/mine/editUser/editUser",
diff --git a/subpages/index/renewalApplication/renewalApplication.js b/subpages/index/renewalApplication/renewalApplication.js
new file mode 100644
index 0000000..5f06b59
--- /dev/null
+++ b/subpages/index/renewalApplication/renewalApplication.js
@@ -0,0 +1,73 @@
+// subpages/index/renewalApplication/renewalApplication.js
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+
+
+ },
+
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad(options) {
+
+ },
+ // 跳转首页
+ submit() {
+ wx.navigateBack({
+ delta: 1
+ })
+ },
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload() {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh() {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom() {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage() {
+
+ }
+})
\ No newline at end of file
diff --git a/subpages/index/renewalApplication/renewalApplication.json b/subpages/index/renewalApplication/renewalApplication.json
new file mode 100644
index 0000000..3fdc810
--- /dev/null
+++ b/subpages/index/renewalApplication/renewalApplication.json
@@ -0,0 +1,10 @@
+{
+
+ "navigationStyle": "custom",
+ "usingComponents": {
+ "navigationBar": "/components/navigationBar/navigationBar",
+ "van-image": "@vant/weapp/image/index",
+ "van-button": "@vant/weapp/button/index"
+
+ }
+}
\ No newline at end of file
diff --git a/subpages/index/renewalApplication/renewalApplication.wxml b/subpages/index/renewalApplication/renewalApplication.wxml
new file mode 100644
index 0000000..bb630f7
--- /dev/null
+++ b/subpages/index/renewalApplication/renewalApplication.wxml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+ 温馨提示：
+ 您需要登陆“爱山东”APP搜索“青岛人才”，
+ 进入青岛免租金住房系统进行续期申请。
+
+
+
+ 我知道了
+
+
\ No newline at end of file
diff --git a/subpages/index/renewalApplication/renewalApplication.wxss b/subpages/index/renewalApplication/renewalApplication.wxss
new file mode 100644
index 0000000..8d78c2a
--- /dev/null
+++ b/subpages/index/renewalApplication/renewalApplication.wxss
@@ -0,0 +1,51 @@
+/* subpages/index/renewalApplication/renewalApplication.wxss */
+page{
+ background: #f8f8f8;
+
+}
+.cont {
+ position: relative;
+ background: #f8f8f8;
+ padding: 36rpx;
+ height: 87vh;
+}
+
+.tip-cont {
+ position: absolute;
+ width: 678rpx;
+ height: 624rpx;
+ display: flex;
+ align-items: center;
+ flex-direction: column;
+ z-index: 999;
+ background-color: #fff;
+ border-radius: 10rpx;
+ top: 214rpx;
+
+
+}
+
+.cusImage {
+ margin-top: 90rpx;
+}
+
+.txt {
+ margin-top: 100rpx;
+ padding: 0 32rpx;
+}
+
+.des {
+ margin-top: 38rpx;
+ line-height: 46rpx;
+ font-size: 32rpx;
+
+}
+
+
+.btn {
+ position: absolute;
+ top: 390px;
+ max-width: 440rpx;
+ width: calc(100% - 10rpx);
+ height: 80rpx;
+}
\ No newline at end of file