diff --git a/miniprogram/pages/applyType/settledInApproval/settledInApproval.wxml b/miniprogram/pages/applyType/settledInApproval/settledInApproval.wxml
index c7fe4f4..c3f5c5b 100644
--- a/miniprogram/pages/applyType/settledInApproval/settledInApproval.wxml
+++ b/miniprogram/pages/applyType/settledInApproval/settledInApproval.wxml
@@ -1,4 +1,4 @@
-
+
-
-
-
+
\ No newline at end of file
diff --git a/miniprogram/pages/applyType/settledInApproval/settledInApproval.wxss b/miniprogram/pages/applyType/settledInApproval/settledInApproval.wxss
index c67fde5..3eed228 100644
--- a/miniprogram/pages/applyType/settledInApproval/settledInApproval.wxss
+++ b/miniprogram/pages/applyType/settledInApproval/settledInApproval.wxss
@@ -1,116 +1,120 @@
.page {
- width: 100%;
- height: 100%;
- box-sizing: border-box;
- position: relative;
+ width: 100%;
+ height: 100%;
+ box-sizing: border-box;
+ position: relative;
+}
+
+.containerView.public {
+ background: #f5f5f5;
+ height: auto;
}
.wwBox {
- width: 100%;
- height: 100rpx;
+ width: 100%;
+ height: 100rpx;
}
.ww {
- width: 88% !important;
- height: 100rpx;
- font-size: 28rpx;
- color: white;
- text-align: center;
- line-height: 100rpx !important;
- background: #4C84FF;
- position: absolute !important;
- padding: 0 !important;
- border-radius: 8rpx !important;
- z-index: 5;
- margin: 60rpx 6%;
- margin-left: 6% !important;
+ width: 88% !important;
+ height: 100rpx;
+ font-size: 28rpx;
+ color: white;
+ text-align: center;
+ line-height: 100rpx !important;
+ background: #4C84FF;
+ padding: 0 !important;
+ border-radius: 8rpx !important;
+ z-index: 5;
+ margin: 60rpx 6%;
+ margin-left: 6% !important;
}
picker {
- width: 100%;
- height: 80rpx;
- line-height: 80rpx;
- padding-right: 10rpx;
- padding-top: 4rpx;
- border-bottom: 1rpx solid #EEEEEE;
+ width: 100%;
+ height: 80rpx;
+ line-height: 80rpx;
+ padding-right: 10rpx;
+ padding-top: 4rpx;
+ border-bottom: 1rpx solid #EEEEEE;
}
.picker-txt {
- font-size: 32rpx;
+ font-size: 32rpx;
}
.bshaw {
- padding: 10rpx 40rpx;
+ padding: 10rpx 40rpx;
}
.fontW {
- color: #000;
- display: inline-block;
- /* width: 400rpx; */
- line-height: 50rpx;
+ color: #000;
+ display: inline-block;
+ /* width: 400rpx; */
+ line-height: 50rpx;
}
.fontWs {
- color: #000;
- display: inline-block;
- width: 90%;
- line-height: 50rpx;
- font-weight: 600;
+ color: #000;
+ display: inline-block;
+ width: 90%;
+ line-height: 50rpx;
+ font-weight: 600;
}
input {
- width: 100%;
- margin-top: -2rpx;
- padding-right: 30rpx;
- box-sizing: border-box;
- font-size: 32rpx;
- color: #393939;
- border-bottom: 1rpx solid #EEEEEE;
- height: 80rpx;
- line-height: 80rpx;
+ width: 100%;
+ margin-top: -2rpx;
+ padding-right: 30rpx;
+ box-sizing: border-box;
+ font-size: 32rpx;
+ color: #393939;
+ border-bottom: 1rpx solid #EEEEEE;
+ height: 80rpx;
+ line-height: 80rpx;
}
.inputbox {
- font-size: 32rpx;
- margin-bottom: 40rpx;
- /* display: flex; */
- /* padding: 30rpx 0; */
+ font-size: 32rpx;
+ margin-bottom: 40rpx;
+ /* display: flex; */
+ /* padding: 30rpx 0; */
}
.inputbox:nth-last-child(2) {
- border: none;
+ border: none;
}
textarea {
- height: 200rpx;
- color: #393939;
- font-size: 30rpx;
+ height: 200rpx;
+ color: #393939;
+ font-size: 30rpx;
}
.uploFile {
- width: 140rpx;
- margin-bottom: 30rpx;
- padding: 20rpx 40rpx;
- background: #F7F7F7;
- margin-top: 10rpx;
- color: #4C84FF;
- border-radius: 50rpx;
+ width: 140rpx;
+ margin-bottom: 30rpx;
+ padding: 20rpx 40rpx;
+ background: #F7F7F7;
+ margin-top: 10rpx;
+ color: #4C84FF;
+ border-radius: 50rpx;
}
.del {
- width: 46rpx;
- height: 46rpx;
- overflow: hidden;
- position: absolute;
- right: 34rpx;
- top: 36%;
+ width: 46rpx;
+ height: 46rpx;
+ overflow: hidden;
+ position: absolute;
+ right: 34rpx;
+ top: 36%;
}
.fileBox {
- vertical-align: middle;
- box-sizing: border-box;
- padding: 20rpx 30rpx;
- background: #F8F8F8;
- margin-bottom: 10rpx;
- position: relative;
+ vertical-align: middle;
+ box-sizing: border-box;
+ padding: 20rpx 30rpx;
+ background: #F8F8F8;
+ margin-bottom: 10rpx;
+ position: relative;
}
\ No newline at end of file
diff --git a/miniprogram/pages/my/my.js b/miniprogram/pages/my/my.js
index 45fc149..3b46ec7 100644
--- a/miniprogram/pages/my/my.js
+++ b/miniprogram/pages/my/my.js
@@ -45,7 +45,7 @@ Page({
url: "/pages/myActivities/myActivities",
},
{
- name: "业务申请",
+ name: "入驻管理",
url: "/pages/my/serviceApply/serviceApply"
},
{
diff --git a/miniprogram/pages/my/serviceApply/serviceApply.js b/miniprogram/pages/my/serviceApply/serviceApply.js
index 790f8f2..3be9c9c 100644
--- a/miniprogram/pages/my/serviceApply/serviceApply.js
+++ b/miniprogram/pages/my/serviceApply/serviceApply.js
@@ -1,99 +1,96 @@
let app = getApp()
Page({
- data: {
- IMG_NAME: app.IMG_NAME,
- currentTab: 0,
- loading: false,
- noMore: 0,
- loadingFailed: false,
- pageNo: 1,
- indicatorDots: true,
- autoplay: true,
- interval: 3000,
- duration: 1000,
- type: '1',
- list: [],
- myOrderList: []
- },
+ data: {
+ IMG_NAME: app.IMG_NAME,
+ currentTab: 1,
+ loading: false,
+ noMore: 0,
+ loadingFailed: false,
+ pageNo: 1,
+ indicatorDots: true,
+ autoplay: true,
+ interval: 3000,
+ duration: 1000,
+ type: '1',
+ list: [],
+ myOrderList: []
+ },
- onLoad(e) {
- wx.setNavigationBarTitle({
- title: '业务申请',
- })
- this.getList()
- },
+ onLoad(e) {
+ this.getList()
+ },
- getList() {
- let that = this
- let workCondition = ''
- that.data.repairList = []
- if (that.data.currentTab == 0) {
- workCondition = '/applyPark/getByCurrentUser'
- } else if (that.data.currentTab == 1) {
- workCondition = '/settle/getByCurrentUser'
- } else if (that.data.currentTab == 2) {
- workCondition = '/applyMoveIn/getByCurrentUser'
- }
- app.AjaxRequest('get', {
- 'content-type': 'application/json',
- 'Authorization': 'Bearer ' + app.Getopenid()
- }, workCondition, {}, function (res) {
- if (res.code == 0) {
- that.setData({
- repairList: res.data
+ getList() {
+ let that = this
+ let workCondition = ''
+ that.data.repairList = []
+ if (that.data.currentTab == 0) {
+ workCondition = '/applyPark/getByCurrentUser'
+ } else if (that.data.currentTab == 1) {
+ workCondition = '/settle/getByCurrentUser'
+ } else if (that.data.currentTab == 2) {
+ workCondition = '/applyMoveIn/getByCurrentUser'
+ }
+ app.AjaxRequest('get', {
+ 'content-type': 'application/json',
+ 'Authorization': 'Bearer ' + app.Getopenid()
+ }, workCondition, {}, function (res) {
+ if (res.code == 0) {
+ that.setData({
+ repairList: res.data
+ })
+ }
})
- }
- })
- },
+ },
- bannernav(e) {
- wx.navigateTo({
- url: e.currentTarget.dataset.uri,
- })
- },
+ bannernav(e) {
+ wx.navigateTo({
+ url: e.currentTarget.dataset.uri,
+ })
+ },
- navDetail(e) {
- var data = e.currentTarget.dataset
- wx.navigateTo({
- url: data.url + data.id
- })
- },
+ navDetail(e) {
+ var data = e.currentTarget.dataset
+ wx.navigateTo({
+ url: data.url + data.id
+ })
+ },
- navapply(e) {
- let data = JSON.stringify(e.currentTarget.dataset.objlist)
- wx.navigateTo({
- url: '/pages/enterpriseServices/serviceList/serviceList?data=' + data
- })
- },
+ navapply(e) {
+ let data = JSON.stringify(e.currentTarget.dataset.objlist)
+ wx.navigateTo({
+ url: '/pages/enterpriseServices/serviceList/serviceList?data=' + data
+ })
+ },
- // 滑动加载
- // scrollToLower: function (e) {
- // if (!this.data.loading && !this.data.noMore) {
- // this.setData({
- // loading: true,
- // pageNo: this.data.pageNo + 1
- // })
- // this.getData(true);
- // }
- // },
+ // 滑动加载
+ // scrollToLower: function (e) {
+ // if (!this.data.loading && !this.data.noMore) {
+ // this.setData({
+ // loading: true,
+ // pageNo: this.data.pageNo + 1
+ // })
+ // this.getData(true);
+ // }
+ // },
- // 滑动切换
- swiperTab(e) {
- this.setData({
- currentTab: e.detail.current
- })
- this.getList()
- },
+ // 滑动切换
+ swiperTab(e) {
+ this.setData({
+ currentTab: e.detail.current
+ })
+ this.getList()
+ },
- //点击切换
- clickTab(e) {
- var that = this
- if (this.data.currentTab === e.target.dataset.current) {
- return false;
- } else {
- that.setData({
- currentTab: e.target.dataset.current
- })
+ //点击切换
+ clickTab(e) {
+ var that = this
+ if (this.data.currentTab === e.target.dataset.current) {
+ return false;
+ } else {
+ that.setData({
+ currentTab: e.target.dataset.current
+ })
+ }
}
- }
})
\ No newline at end of file
diff --git a/miniprogram/pages/my/serviceApply/serviceApply.json b/miniprogram/pages/my/serviceApply/serviceApply.json
index 8835af0..1c54bf9 100644
--- a/miniprogram/pages/my/serviceApply/serviceApply.json
+++ b/miniprogram/pages/my/serviceApply/serviceApply.json
@@ -1,3 +1,4 @@
{
- "usingComponents": {}
+ "navigationBarTitleText": "入驻管理",
+ "usingComponents": {}
}
\ No newline at end of file
diff --git a/miniprogram/pages/my/serviceApply/serviceApply.wxml b/miniprogram/pages/my/serviceApply/serviceApply.wxml
index f455682..d8415ff 100644
--- a/miniprogram/pages/my/serviceApply/serviceApply.wxml
+++ b/miniprogram/pages/my/serviceApply/serviceApply.wxml
@@ -1,8 +1,8 @@
- 项目入孵
+
入驻申请
- 厂房申请
+