diff --git a/commons/base.css b/commons/base.css
index e285206..aefcaf5 100644
--- a/commons/base.css
+++ b/commons/base.css
@@ -33,6 +33,11 @@
.width46{width: 46%;}
.width45{width: 45%;}
.width33{width: 33%;}
+.width30{width: 30%;}
+.width29{width: 29%;}
+.width28{width: 28%;}
+.width27{width: 27%;}
+.width26{width: 26%;}
.width25{width: 25%;}
.posAll{position: fixed;top: 0;left: 0;right: 0;bottom: 0;background-color: rgba(0,0,0,.45);z-index: 12;}
@@ -314,6 +319,10 @@ button:after{content: none!important;}
.pad-s36{padding-top: 36rpx;}
.pad-s40{padding-top: 40rpx;}
.pad-s50{padding-top: 50rpx;}
+.pad-s120{padding-top: 120rpx;}
+.pad-s140{padding-top: 140rpx;}
+.pad-s160{padding-top: 160rpx;}
+.pad-s180{padding-top: 180rpx;}
/* 下---内边距 */
.pad-x10{padding-bottom: 10rpx;}
.pad-x20{padding-bottom: 20rpx;}
diff --git a/commons/flying-monkey.css b/commons/flying-monkey.css
index 9a190cd..a852679 100644
--- a/commons/flying-monkey.css
+++ b/commons/flying-monkey.css
@@ -220,4 +220,58 @@ uni-radio .uni-radio-input {border: 1rpx solid #444444;}
color: #FFFFFF;
margin-top: 40rpx;
}
+/* 个人信息页面 */
+.gender-box {margin-right: 80rpx;color: #333333;}
+.gender-box view{
+ position: relative;
+ width: 20rpx;
+ height: 20rpx;
+ border: 4rpx solid #818181;
+ border-radius: 100%;
+ margin-right: 10rpx;
+}
+.gender-box view::before {
+ position: absolute;
+ left: 50%;
+ top: 50%;
+ transform: translate(-50%,-50%);
+ content: '';
+ display: block;
+ width: 14rpx;
+ height: 14rpx;
+ background-color: #818181;
+ border-radius: 100%;
+}
+.gender-active view{
+ border: 4rpx solid #d81e06!important;
+}
+.gender-active view::before {
+ background-color: #d81e06!important;
+}
+.person-btn {
+ margin: 0 40rpx;
+ height: 88rpx;
+ line-height: 88rpx;
+ text-align: center;
+ border-radius: 88rpx;
+ background-color: #03affb;
+ color: #FFFFFF;
+ margin-top: 40rpx;
+}
+/* 电子证件 */
+.electronic-head{
+ background-color: #03affb;
+ padding-top: 80rpx;
+}
+/* 服务范围 */
+.service-range-status {
+ background-color: #cdcdcd;
+ color: #333333;
+ padding: 6rpx 20rpx;
+ border-radius: 6rpx;
+}
+.service-range-activeStatus {
+ background-color: #03affb;
+ color: #FFFFFF;
+}
\ No newline at end of file
diff --git a/components/status-nav.vue b/components/status-nav.vue
index c79fcd2..f9fa4de 100644
--- a/components/status-nav.vue
+++ b/components/status-nav.vue
@@ -180,7 +180,7 @@
.return-box i {font-size: 56rpx;}
.tab-title{
width: 100%;
- font-size: 38rpx;
+ font-size: 32rpx;
display: flex;
}
.tab-title .title-box{margin-top: -4rpx;}
diff --git a/main.js b/main.js
index ae02d11..b5ab92e 100644
--- a/main.js
+++ b/main.js
@@ -4,8 +4,11 @@ import App from './App';
import nothingPage from './components/nothing/nothing-page.vue';//引入无内容组件
Vue.component('nothing-page',nothingPage);//全局注册无内容组件
-import footTabOne from './components/foot-tabs/foot-tab-one.vue';//引入容器组件
-Vue.component('foot-tab',footTabOne);//全局注册容器组件
+import statusNav from './components/status-nav.vue';//引入头部状态栏与导航栏组件
+Vue.component('status-nav',statusNav);//全局注册头部状态栏与导航栏组件
+
+import containerSubgroupTwo from './components/containers/container-subgroup-two.vue';//引入头部状态栏与导航栏组件
+Vue.component('container-subgroup',containerSubgroupTwo);//全局注册头部状态栏与导航栏组件
import share from './jsFile/share.js';// 全局注册分享事件
Vue.mixin(share);
diff --git a/pages.json b/pages.json
index 33655ee..799b7bc 100644
--- a/pages.json
+++ b/pages.json
@@ -32,8 +32,8 @@
}, {
"path": "pages/tabbar/my/my",
"style": {
- "navigationBarTitleText": "个人中心",
- "navigationStyle": "custom" //禁用原生导航栏，微信小程序可用
+ "navigationBarTitleText": "个人中心"
+
}
}, {
"path": "pages/login/agreement",
@@ -176,6 +176,12 @@
"globalStyle": {
"navigationBarTextStyle": "black",
"navigationBarBackgroundColor": "#FFFFFF", //导航栏背景色
- "backgroundColor": "#FFFFFF" //窗口背景色
+ "backgroundColor": "#FFFFFF" ,//窗口背景色
+ "navigationStyle": "custom" ,//禁用原生导航栏，微信小程序可用
+ "app-plus": {
+ "titleNView": false, //禁用原生导航栏，APP和H5可用
+ "bounce": "none",
+ "scrollIndicator": "none"
+ }
}
}
diff --git a/pages/tabbar/feedback/feedback.vue b/pages/tabbar/feedback/feedback.vue
index 5ae9174..fb333a1 100644
--- a/pages/tabbar/feedback/feedback.vue
+++ b/pages/tabbar/feedback/feedback.vue
@@ -6,7 +6,12 @@
diff --git a/pagesB/service-range/service-range.vue b/pagesB/service-range/service-range.vue
index 8183fd0..1b08052 100644
--- a/pagesB/service-range/service-range.vue
+++ b/pagesB/service-range/service-range.vue
@@ -1,6 +1,49 @@
-
+
+
+
+
+ 人员状态 *
+
+ {{item}}
+
+
+
+ 工作时段 *
+
+ {{item}}
+
+
+
+ 地 区 *
+
+ 湖南省株洲市芦淞区
+
+
+
+
+ 详细地址 *
+
+
+
+
+
+ 服务范围 *
+
+
+ {{item}}
+
+
+
+
+
+ {{remarkText.length}}/50
+
+
+
+
+ 提交保存
@@ -8,11 +51,30 @@
export default {
data() {
return {
-
+ personnelStatus:['工作状态','休息状态'],
+ statusNum:0,
+ workingHours:['不限','白天','晚上'],
+ hoursNum:0,
+ serviceRange:['30KM','80KM','1500KM','其他','其他','其他','其他'],
+ rangeNum:0,
+ remarkText:''
}
},
methods: {
-
+ // 人员状态选择
+ chooseStatus(index,num){
+ switch (num){
+ case 0:
+ this.statusNum = index;
+ break;
+ case 1:
+ this.hoursNum = index;
+ break;
+ case 2:
+ this.rangeNum = index;
+ break;
+ }
+ },
}
}
diff --git a/static/deleteImg/flying-img06.png b/static/deleteImg/flying-img06.png
new file mode 100644
index 0000000..1b81aa7
Binary files /dev/null and b/static/deleteImg/flying-img06.png differ
diff --git a/static/public/icon-electronic-logo.png b/static/public/icon-electronic-logo.png
new file mode 100644
index 0000000..a0e7ab1
Binary files /dev/null and b/static/public/icon-electronic-logo.png differ
diff --git a/static/public/icon-personInfo-upload.png b/static/public/icon-personInfo-upload.png
new file mode 100644
index 0000000..92f3433
Binary files /dev/null and b/static/public/icon-personInfo-upload.png differ