Explorar el Código

fix(招聘) 重构页面

xing.li hace 3 años
padre
commit
a158f11dce
Se han modificado 82 ficheros con 248 adiciones y 437 borrados
  1. 79 0
      app.wxss
  2. BIN
      images/icons/add.png
  3. BIN
      images/icons/assess.png
  4. BIN
      images/icons/camera.png
  5. BIN
      images/icons/close.png
  6. BIN
      images/icons/defult-user.png
  7. BIN
      images/icons/depart.png
  8. BIN
      images/icons/hsay.png
  9. BIN
      images/icons/index-active.png
  10. BIN
      images/icons/index.png
  11. BIN
      images/icons/jianjie.png
  12. BIN
      images/icons/jianli.png
  13. BIN
      images/icons/jilu.png
  14. BIN
      images/icons/left.png
  15. BIN
      images/icons/like_no.png
  16. BIN
      images/icons/like_yes.png
  17. BIN
      images/icons/location.png
  18. BIN
      images/icons/next-gray.png
  19. BIN
      images/icons/next.png
  20. BIN
      images/icons/order-active.png
  21. BIN
      images/icons/order.png
  22. BIN
      images/icons/person-active.png
  23. BIN
      images/icons/person.png
  24. BIN
      images/icons/phone.png
  25. BIN
      images/icons/reduce.png
  26. BIN
      images/icons/right.png
  27. BIN
      images/icons/school_no.png
  28. BIN
      images/icons/school_yes.png
  29. BIN
      images/icons/share.png
  30. BIN
      images/icons/shop-icon.png
  31. BIN
      images/icons/shoucang.png
  32. BIN
      images/icons/sociology_no.png
  33. BIN
      images/icons/sociology_yes.png
  34. BIN
      images/icons/tel.png
  35. BIN
      images/icons/user.png
  36. BIN
      images/new/culture.png
  37. BIN
      images/new/depart.png
  38. BIN
      images/new/edit.png
  39. BIN
      images/new/environment.png
  40. BIN
      images/new/head_img.png
  41. BIN
      images/new/index.png
  42. BIN
      images/new/index_active.png
  43. BIN
      images/new/introduce.png
  44. BIN
      images/new/like_no.png
  45. BIN
      images/new/like_yes.png
  46. BIN
      images/new/location.png
  47. BIN
      images/new/logo.png
  48. 0 0
      images/new/no_data.png
  49. BIN
      images/new/person.png
  50. BIN
      images/new/person_active.png
  51. BIN
      images/new/person_center.png
  52. BIN
      images/new/recurit.png
  53. BIN
      images/new/recurit_active.png
  54. BIN
      images/new/right_arrow.png
  55. BIN
      images/new/school.png
  56. BIN
      images/new/school_position.png
  57. BIN
      images/new/school_trip.png
  58. BIN
      images/new/share.png
  59. BIN
      images/new/treatment.png
  60. BIN
      images/new/组 1.png
  61. 4 4
      pages/collection/collection.wxml
  62. 3 62
      pages/collection/collection.wxss
  63. 1 1
      pages/companyProfile/companyProfile.json
  64. 1 23
      pages/companyProfile/companyProfile.wxml
  65. 1 24
      pages/corporateCulture/corporateCulture.wxml
  66. 1 18
      pages/employeeBenefits/employeeBenefits.wxml
  67. 1 1
      pages/index/index.js
  68. 1 1
      pages/record/record.json
  69. 4 4
      pages/record/record.wxml
  70. 9 66
      pages/record/record.wxss
  71. 1 1
      pages/recruitInfo/recruitInfo.js
  72. 1 1
      pages/recruitInfo/recruitInfo.wxss
  73. 1 1
      pages/resume/resume.js
  74. 48 50
      pages/resume/resume.wxml
  75. 12 8
      pages/resume/resume.wxss
  76. 1 1
      pages/school/school.json
  77. 12 6
      pages/school/school.wxml
  78. 32 14
      pages/school/school.wxss
  79. 1 1
      pages/sociology/sociology.json
  80. 32 34
      pages/sociology/sociology.wxml
  81. 1 73
      pages/sociology/sociology.wxss
  82. 1 43
      pages/workEnvironment/workEnvironment.wxml

+ 79 - 0
app.wxss

@@ -1 +1,80 @@
 
+
+.info_top,.info_mid,.info_bottom{
+  display: flex;
+  flex-flow: row nowrap;
+  justify-content: space-between;
+ 
+}
+.info_bottom{
+  display: flex;
+  flex-flow: row nowrap;
+  justify-content: left;
+ 
+}
+.info_mid_left{
+  display: flex;
+  flex-flow: row nowrap;
+  justify-content: left;
+  
+}
+.info_bottom_img{
+  width: 35rpx;
+  height: 35rpx;
+}
+.info_top_left{
+  color: #43496a;
+  font-size: 32rpx;
+  font-weight: 600;
+  width: 400rpx;
+  overflow: hidden;
+text-overflow:ellipsis;
+white-space: nowrap;
+}
+.info_top_right{
+  font-size: 32rpx;
+  font-weight: bold;
+  color: #FF8364
+}
+
+.info_mid_left,.info_mid_right{
+  font-size: 20rpx;
+font-weight: 500;
+color: #808080;
+}
+.info_bottom_2{
+  font-size: 28rpx;
+
+  margin-left: 10rpx;
+  font-size: 12px;
+font-weight: 600;
+color: #6C6C6C;
+}
+.input_text{
+  color: #c2c6da;
+  font-size: 28rpx;
+}
+.icon_search{
+  margin-left: 20rpx;
+  
+}
+.icon_clear{
+  margin-right: 20rpx;
+}
+.no_data_par{
+  display: flex;
+  flex-flow: column nowrap;
+  align-items: center;
+  margin-top: 200rpx;
+}
+.no_data_img{
+  height: 240rpx;
+  width: 320rpx;
+}
+.info_mid_left_info{
+  background: #FF8364;border-radius: 6px;padding:1px 10px;color:#fff;margin-right:10rpx
+}
+
+.no_data_text{
+  font-size: 12px;
+}

BIN
images/icons/add.png


BIN
images/icons/assess.png


BIN
images/icons/camera.png


BIN
images/icons/close.png


BIN
images/icons/defult-user.png


BIN
images/icons/depart.png


BIN
images/icons/hsay.png


BIN
images/icons/index-active.png


BIN
images/icons/index.png


BIN
images/icons/jianjie.png


BIN
images/icons/jianli.png


BIN
images/icons/jilu.png


BIN
images/icons/left.png


BIN
images/icons/like_no.png


BIN
images/icons/like_yes.png


BIN
images/icons/location.png


BIN
images/icons/next-gray.png


BIN
images/icons/next.png


BIN
images/icons/order-active.png


BIN
images/icons/order.png


BIN
images/icons/person-active.png


BIN
images/icons/person.png


BIN
images/icons/phone.png


BIN
images/icons/reduce.png


BIN
images/icons/right.png


BIN
images/icons/school_no.png


BIN
images/icons/school_yes.png


BIN
images/icons/share.png


BIN
images/icons/shop-icon.png


BIN
images/icons/shoucang.png


BIN
images/icons/sociology_no.png


BIN
images/icons/sociology_yes.png


BIN
images/icons/tel.png


BIN
images/icons/user.png


BIN
images/new/culture.png


BIN
images/new/depart.png


BIN
images/new/edit.png


BIN
images/new/environment.png


BIN
images/new/head_img.png


BIN
images/new/index.png


BIN
images/new/index_active.png


BIN
images/new/introduce.png


BIN
images/new/like_no.png


BIN
images/new/like_yes.png


BIN
images/new/location.png


BIN
images/new/logo.png


images/icons/no_data.png → images/new/no_data.png


BIN
images/new/person.png


BIN
images/new/person_active.png


BIN
images/new/person_center.png


BIN
images/new/recurit.png


BIN
images/new/recurit_active.png


BIN
images/new/right_arrow.png


BIN
images/new/school.png


BIN
images/new/school_position.png


BIN
images/new/school_trip.png


BIN
images/new/share.png


BIN
images/new/treatment.png


BIN
images/new/组 1.png


+ 4 - 4
pages/collection/collection.wxml

@@ -9,14 +9,14 @@
    </view>
    <view class="info_mid">
      <view class="info_mid_left">
-       <view>{{item.recruitInfo.workArea}}|</view>
-       <view>{{item.recruitInfo.workingHours}}|</view>
-       <view>{{item.recruitInfo.education}}</view>
+       <view  class="info_mid_left_info">{{item.recruitInfo.workArea}}|</view>
+       <view  class="info_mid_left_info">{{item.recruitInfo.workingHours}}|</view>
+       <view  class="info_mid_left_info">{{item.recruitInfo.education}}</view>
      </view>
      <view class="info_mid_right">{{item.recruitInfo.releaseTime}}</view>
    </view>
    <view class="info_bottom">
-     <image src="/images/icons/depart.png" class="info_bottom_img"></image>
+     <image src="/images/new/depart.png" class="info_bottom_img"></image>
      <view class="info_bottom_2">{{item.recruitInfo.demandDepartment}}</view>
    </view>
     </view>

+ 3 - 62
pages/collection/collection.wxss

@@ -1,3 +1,4 @@
+@import "/app.wxss";
 .content{
   background-color: #F2F2F2;
   padding: 20rpx;
@@ -11,72 +12,12 @@ Page {
 
 .info{
   background-color: #fff;
-  width: 710rpx;
+  /* width: 710rpx; */
   height: 160rpx;
   display: flex;
   flex-flow: column nowrap;
   justify-content: space-around;
   border-radius: 10rpx;
   margin-bottom: 20rpx;
-}
-.info_top,.info_mid,.info_bottom{
-  display: flex;
-  flex-flow: row nowrap;
-  justify-content: space-between;
-  padding: 0 15rpx;
-}
-.info_bottom{
-  display: flex;
-  flex-flow: row nowrap;
-  justify-content: left;
-  padding: 0 15rpx;
-}
-.info_mid_left{
-  display: flex;
-  flex-flow: row nowrap;
-  justify-content: left;
-  
-}
-.info_bottom_img{
-  width: 35rpx;
-  height: 35rpx;
-}
-.info_top_left{
-  color: #43496a;
-  font-size: 32rpx;
-}
-.info_top_right{
-  color: #ff7c7c;
-  font-size: 28rpx;
-}
-
-.info_mid_left,.info_mid_right{
-  font-size: 12px;
-  color: #b0b4ca;
-}
-.info_bottom_2{
-  font-size: 28rpx;
-  color: #777d9c;
-  margin-left: 10rpx;
-}
-.input_text{
-  color: #c2c6da;
-  font-size: 28rpx;
-}
-.icon_search{
-  margin-left: 20rpx;
-  
-}
-.icon_clear{
-  margin-right: 20rpx;
-}
-.no_data_par{
-  display: flex;
-  flex-flow: column nowrap;
-  align-items: center;
-  margin-top: 200rpx;
-}
-.no_data_img{
-  height: 240rpx;
-  width: 320rpx;
+  padding: 5px 15px;
 }

+ 1 - 1
pages/companyProfile/companyProfile.json

@@ -2,7 +2,7 @@
   "usingComponents": {},
   "navigationBarBackgroundColor": "#fff",
   "navigationBarTextStyle": "black",
-  "navigationBarTitleText": "公司介",
+  "navigationBarTitleText": "公司介",
   "backgroundColor": "#fff",
   "backgroundTextStyle": "light"
 

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 23
pages/companyProfile/companyProfile.wxml


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 24
pages/corporateCulture/corporateCulture.wxml


+ 1 - 18
pages/employeeBenefits/employeeBenefits.wxml

@@ -1,22 +1,5 @@
 
 
 <view class="content" >
-  <view class="text">
-1、五险一金(试用期开始缴纳)
-
-2、带薪年假及各类年终福利
-
-3、补充元气再奋斗:午餐补贴
-
-4、关爱你从保护你开始:员工意外险(满一年起享有补充医疗商业保险)
-
-5、专属于你的生日福利
-
-6、暖心的节庆福利关爱慰问
-
-7、每月起码一堂专业员工培训
-
-8、发放到微信小程序「沪上阿姨GO」的专属品尝券
-
-</view>
+  <image mode="widthFix" src="https://geek-test-hk.oss-cn-hongkong.aliyuncs.com/test/1.png" style="width:100%"></image>
 </view>

+ 1 - 1
pages/index/index.js

@@ -7,7 +7,7 @@ Page({
   data: {
     background: [
       'https://www.hsayi.com/images/aacc93851bcd1442b1b531a64b88832e.png', 
-      '/images/new/home_page.png'
+      'https://geek-test-hk.oss-cn-hongkong.aliyuncs.com/test/home_page.png'
   ],
     indicatorDots: true,
     vertical: false,

+ 1 - 1
pages/record/record.json

@@ -2,7 +2,7 @@
   "usingComponents": {},
   "navigationBarBackgroundColor": "#fff",
   "navigationBarTextStyle": "black",
-  "navigationBarTitleText": "投递记录",
+  "navigationBarTitleText": "已投简历",
   "backgroundColor": "#fff",
   "backgroundTextStyle": "light"
 

+ 4 - 4
pages/record/record.wxml

@@ -9,14 +9,14 @@
    </view>
    <view class="info_mid">
      <view class="info_mid_left">
-       <view>{{item.recruitInfo.workArea}}|</view>
-       <view>{{item.recruitInfo.workingHours}}|</view>
-       <view>{{item.recruitInfo.education}}</view>
+       <view  class="info_mid_left_info">{{item.recruitInfo.workArea}}</view>
+       <view  class="info_mid_left_info">{{item.recruitInfo.workingHours}}</view>
+       <view  class="info_mid_left_info">{{item.recruitInfo.education}}</view>
      </view>
      <view class="info_mid_right">{{item.recruitInfo.releaseTime}}</view>
    </view>
    <view class="info_bottom">
-     <image src="/images/icons/depart.png" class="info_bottom_img"></image>
+     <image src="/images/new/depart.png" class="info_bottom_img"></image>
      <view class="info_bottom_2">{{item.recruitInfo.demandDepartment}}</view>
    </view>
    <view class="info_bottom_date">

+ 9 - 66
pages/record/record.wxss

@@ -1,3 +1,4 @@
+@import "/app.wxss";
 .content{
   background-color: #F2F2F2;
   padding: 20rpx;
@@ -11,81 +12,23 @@ Page {
 
 .info{
   background-color: #fff;
-  width: 710rpx;
+  /* width: 710rpx; */
   height: 200rpx;
   display: flex;
   flex-flow: column nowrap;
   justify-content: space-around;
   border-radius: 10rpx;
   margin-bottom: 20rpx;
+  padding: 5px 15px;
 }
-.info_top,.info_mid,.info_bottom{
-  display: flex;
-  flex-flow: row nowrap;
-  justify-content: space-between;
-  padding: 0 15rpx;
-}
-.info_bottom{
-  display: flex;
-  flex-flow: row nowrap;
-  justify-content: left;
-  padding: 0 15rpx;
-}
+
+
 .info_bottom_date{
   display: flex;
   flex-flow: row nowrap;
   justify-content: left;
-  padding: 0 15rpx;
-  font-size: 28rpx;
-  color: #777d9c;
+  /* padding: 0 15rpx; */
+  font-size: 24rpx;
+  color: #6C6C6C;
   
-}
-.info_mid_left{
-  display: flex;
-  flex-flow: row nowrap;
-  justify-content: left;
-  
-}
-.info_bottom_img{
-  width: 35rpx;
-  height: 35rpx;
-}
-.info_top_left{
-  color: #43496a;
-  font-size: 32rpx;
-}
-.info_top_right{
-  color: #ff7c7c;
-  font-size: 28rpx;
-}
-
-.info_mid_left,.info_mid_right{
-  font-size: 12px;
-  color: #b0b4ca;
-}
-.info_bottom_2{
-  font-size: 28rpx;
-  color: #777d9c;
-  margin-left: 10rpx;
-}
-.input_text{
-  color: #c2c6da;
-  font-size: 28rpx;
-}
-.icon_search{
-  margin-left: 20rpx;
-  
-}
-.icon_clear{
-  margin-right: 20rpx;
-}
-.no_data_par{
-  display: flex;
-  flex-flow: column nowrap;
-  align-items: center;
-  margin-top: 200rpx;
-}
-.no_data_img{
-  height: 240rpx;
-  width: 320rpx;
-}
+}

+ 1 - 1
pages/recruitInfo/recruitInfo.js

@@ -121,7 +121,7 @@ Page({
       // content: '您可申请2个社招职位,还剩2个,是否继续投递',
       content: '您确认投递此职位吗?',
       confirmText:'确认投递',
-      confirmColor:'#1296db',
+      confirmColor:'#FF8364',
       success (res) {
         if (res.confirm) {
           wx.navigateTo({

+ 1 - 1
pages/recruitInfo/recruitInfo.wxss

@@ -98,7 +98,7 @@ color: #000000;
 }
 .duty_desc{
   font-size: 12px;
-  color: #777d9c;
+  color: #575757;
   line-height: 20px;
   padding: 0rpx 30rpx;
   padding-bottom: 20rpx;

+ 1 - 1
pages/resume/resume.js

@@ -16,7 +16,7 @@ Page({
     moneyArray: ["","1000以下","1000-2000", "2001-4000", "4001-6000","6001-8000","8001-10000","10001-15000","15001-25000","25001-30000","30001-50000","50001以上","面议"],
     nowMoneyArray: ["","1000以下","1000-2000", "2001-4000", "4001-6000","6001-8000","8001-10000","10001-15000","15001-25000","25001-30000","30001-50000","50001以上"],
     type:1,//1保存简历  2保存简历+投递简历)
-    saveTitle:'保存',
+    saveTitle:'保存简历',
     
     name:'',
     emali:'',

+ 48 - 50
pages/resume/resume.wxml

@@ -1,6 +1,6 @@
 
 <view class="content" >
-  <view class="info_title">个人信息</view>
+  <view class="info_title">基本信息</view>
   <view class="info">
     <view class="info_left">
       <view class="info_left_1">*</view>
@@ -8,21 +8,23 @@
     </view>
     <input type="text" class="info_right" maxlength="50" placeholder="请输入姓名" placeholder-class="placeholder" value="{{name}}" bindinput="bindInputName"/>
   </view>
-
   <view class="info">
     <view class="info_left">
       <view class="info_left_1">*</view>
-      <view class="info_left_2">邮箱</view>
+      <view class="info_left_2">性别</view>
     </view>
-    <input type="text" class="info_right" maxlength="50" placeholder="请输入邮箱" placeholder-class="placeholder" value="{{email}}"  bindinput="bindInputEmail"/>
+    <picker class="info_right_picker" value="{{gender}}" range="{{array}}" bindchange="changeSex">
+               {{array[gender]}}
+        </picker>
+        <image class="next-gray" src="../../images/new/right_arrow.png">
+        </image>
   </view>
-
-  <view class="info">
+  <view class="info" >
     <view class="info_left">
-      <view class="info_left_1">*</view>
-      <view class="info_left_2">手机号</view>
+      <view class="info_left_1"></view>
+      <view class="info_left_2">居住地</view>
     </view>
-    <input type="number" class="info_right" maxlength="50" placeholder="请输入手机号" placeholder-class="placeholder" value="{{mobile}}" bindinput="bindInputMobile"/>
+    <input  class="info_right"   placeholder="例:浙江省杭州市萧山区" maxlength="250" placeholder-class="placeholder" value="{{nowAddress}}" bindinput="bindInputNowAddress"/>
   </view>
 
   <view class="info">
@@ -33,37 +35,25 @@
     <picker mode="date"  class="info_right_picker" value="{{birthday}}" start="1970-01-01" end="{{endDate}}" bindchange="changeBirth">
                 {{birthday}}
     </picker>
-    <image class="next-gray" src="../../images/icons/next-gray.png">
+    <image class="next-gray" src="../../images/new/right_arrow.png">
         </image>
   </view>
-
   <view class="info">
     <view class="info_left">
       <view class="info_left_1">*</view>
-      <view class="info_left_2">性别</view>
+      <view class="info_left_2">手机号</view>
     </view>
-    <picker class="info_right_picker" value="{{gender}}" range="{{array}}" bindchange="changeSex">
-               {{array[gender]}}
-        </picker>
-        <image class="next-gray" src="../../images/icons/next-gray.png">
-        </image>
+    <input type="number" class="info_right" maxlength="50" placeholder="请输入手机号" placeholder-class="placeholder" value="{{mobile}}" bindinput="bindInputMobile"/>
   </view>
-
-  <view class="info" >
+  <view class="info">
     <view class="info_left">
-      <view class="info_left_1"></view>
-      <view class="info_left_2">居住地</view>
+      <view class="info_left_1">*</view>
+      <view class="info_left_2">邮箱</view>
     </view>
-    <input  class="info_right"   placeholder="例:浙江省杭州市萧山区" maxlength="250" placeholder-class="placeholder" value="{{nowAddress}}" bindinput="bindInputNowAddress"/>
+    <input type="text" class="info_right" maxlength="50" placeholder="请输入邮箱" placeholder-class="placeholder" value="{{email}}"  bindinput="bindInputEmail"/>
   </view>
 
-  <view class="info" >
-    <view class="info_left">
-      <view class="info_left_1"></view>
-      <view class="info_left_2">户口所在地</view>
-    </view>
-    <input  class="info_right"   placeholder="例:安徽省合肥市蜀山区" maxlength="250" placeholder-class="placeholder" value="{{registeredAddress}}" bindinput="bindInputRegisteredAddress"/>
-  </view>
+ 
 
   <view class="info">
     <view class="info_left">
@@ -73,10 +63,16 @@
     <picker class="info_right_picker" value="{{highestEducation}}"  range="{{educationArray}}" bindchange="changeEducation">
                 {{educationArray[highestEducation]}}
         </picker>
-        <image class="next-gray" src="../../images/icons/next-gray.png">
+        <image class="next-gray" src="../../images/new/right_arrow.png">
         </image>
   </view>
-
+  <view class="info" >
+    <view class="info_left">
+      <view class="info_left_1"></view>
+      <view class="info_left_2">户口所在地</view>
+    </view>
+    <input  class="info_right"   placeholder="例:浙江省杭州市萧山区" maxlength="250" placeholder-class="placeholder" value="{{registeredAddress}}" bindinput="bindInputRegisteredAddress"/>
+  </view>
   <view class="info">
     <view class="info_left">
       <view class="info_left_1"></view>
@@ -85,7 +81,7 @@
     <picker class="info_right_picker" value="{{learningModality}}" range="{{schoolTypeArray}}" bindchange="changeSchoolType">
       <view class="info_right_picker_v">{{schoolTypeArray[learningModality]}}</view>
         </picker>
-        <image class="next-gray" src="../../images/icons/next-gray.png">
+        <image class="next-gray" src="../../images/new/right_arrow.png">
         </image>
   </view>
 
@@ -97,14 +93,28 @@
     <input  class="info_right"   placeholder="请输入民族" placeholder-class="placeholder" maxlength="50"/>
   </view> -->
 
-  <view class="info" >
+  
+<view class="info_title">求职意向</view>
+
+<view class="info" >
     <view class="info_left">
       <view class="info_left_1"></view>
       <view class="info_left_2">当前职业</view>
     </view>
     <input  class="info_right"   placeholder="请输入当前职业" placeholder-class="placeholder" maxlength="50" value="{{takeProfessionally}}"  bindinput="bindInputTakeProfessionally"/>
   </view>
-
+  <view class="info">
+    <view class="info_left">
+      <view class="info_left_1"></view>
+      <view class="info_left_2">现在税前薪资</view>
+    </view>
+    <picker class="info_right_picker" value="{{nowSalary}}" range="{{nowMoneyArray}}" bindchange="changeNowMoney">
+               
+                <view class="info_right_picker_v"> {{nowMoneyArray[nowSalary]}}</view>
+        </picker>
+        <image class="next-gray" src="../../images/new/right_arrow.png">
+        </image>
+  </view>
   <view class="info">
     <view class="info_left">
       <view class="info_left_1"></view>
@@ -114,10 +124,9 @@
                
                 <view class="info_right_picker_v">  {{statusArray[jobStatus]}}</view>
         </picker>
-        <image class="next-gray" src="../../images/icons/next-gray.png">
+        <image class="next-gray" src="../../images/new/right_arrow.png">
         </image>
   </view>
-<view class="info_title">求职意向</view>
   <view class="info" >
     <view class="info_left">
       <view class="info_left_1"></view>
@@ -126,29 +135,18 @@
     <input  class="info_right"   placeholder="请输入期望从事职业" placeholder-class="placeholder" maxlength="50" value="{{hopeProfessionally}}"  bindinput="bindInputHopeProfessionally"/>
   </view>
 
-  <view class="info">
-    <view class="info_left">
-      <view class="info_left_1"></view>
-      <view class="info_left_2">现在税前月薪</view>
-    </view>
-    <picker class="info_right_picker" value="{{nowSalary}}" range="{{nowMoneyArray}}" bindchange="changeNowMoney">
-               
-                <view class="info_right_picker_v"> {{nowMoneyArray[nowSalary]}}</view>
-        </picker>
-        <image class="next-gray" src="../../images/icons/next-gray.png">
-        </image>
-  </view>
+ 
 
   <view class="info">
     <view class="info_left">
       <view class="info_left_1"></view>
-      <view class="info_left_2">期望税前薪</view>
+      <view class="info_left_2">期望税前薪资</view>
     </view>
     <picker class="info_right_picker" value="{{hopeSalary}}" range="{{moneyArray}}" bindchange="changeExpectMoney">
                
                 <view class="info_right_picker_v"> {{moneyArray[hopeSalary]}}</view>
         </picker>
-        <image class="next-gray" src="../../images/icons/next-gray.png">
+        <image class="next-gray" src="../../images/new/right_arrow.png">
         </image>
   </view>
   

+ 12 - 8
pages/resume/resume.wxss

@@ -12,9 +12,11 @@ Page {
   flex-flow: row nowrap;
   justify-content: left;
   align-items: center;
-  height: 100rpx;
-  margin-bottom: 20rpx;
+  height: 80rpx;
+  margin-bottom: 3rpx;
   font-weight: 600;
+  background-color: #fff;
+  padding-left: 20rpx;
 }
 .info{
   display: flex;
@@ -22,17 +24,19 @@ Page {
   justify-content: space-around;
   align-items: center;
   background-color: #fff;
-  height: 100rpx;
+  height: 80rpx;
   border-radius: 10rpx;
-  margin-bottom: 20rpx;
+  margin-bottom: 3rpx;
+  padding-left:20rpx
 }
 .info_left{
   display: flex;
   flex-flow: row nowrap;
-  justify-content: flex-end;
+  justify-content: flex-start;
   align-items: center;
   width: 180rpx;
   height: 60rpx;
+
 }
 .info_left_1{
   color: red;
@@ -69,8 +73,8 @@ Page {
   color: #c2c6da;
 }
 .next-gray{
- width: 30rpx;
- height: 30rpx;
+ width: 8px;
+ height: 14px;
 }
 
 .bottom{
@@ -88,7 +92,7 @@ Page {
   z-index: 999;
 }
 .save{
-  background-color: #1296db;
+  background-color: #FF8364;
   color: #fff;
   width: 710rpx;
   height: 80rpx;

+ 1 - 1
pages/school/school.json

@@ -2,7 +2,7 @@
   "usingComponents": {},
   "navigationBarBackgroundColor": "#fff",
   "navigationBarTextStyle": "black",
-  "navigationBarTitleText": "校招",
+  "navigationBarTitleText": "校招岗位",
   "backgroundColor": "#fff",
   "backgroundTextStyle": "light"
 

+ 12 - 6
pages/school/school.wxml

@@ -3,14 +3,20 @@
 <view class="content" >
     <view class="header">
       <view class="top">
-        <image class="c_img" src="/images/icons/hsay.png"></image>
+        <image class="c_img" src="/images/new/logo.png"></image>
         <view class="top_right">
-          <view class="c_name">沪上阿姨</view>
-          <view class="desc">茶饮连锁品牌</view>
+          <!-- <view class="c_name">沪上阿姨</view>
+          <view class="desc">茶饮连锁品牌</view> -->
+        <view class="search_group">
+          <icon type="search" class="icon_search" color="#c2c6da"></icon>
+          <input type="text" placeholder="请输入您想要的职位" placeholder-class="input_text" bindinput="inputFocus"
+            class="search_input" maxlength="30" value="{{searchinput}}" />
+          <icon type="clear" class="icon_clear" color="#c2c6da" wx:if="{{showClear}}" bindtap="clearInput"></icon>
+        </view>
         </view>
         
       </view>
-      <view class="bottom">
+      <!-- <view class="bottom">
         <view class="search_group">
           <icon type="search" class="icon_search" color="#c2c6da"></icon>
           <input type="text" placeholder="请输入职位" 
@@ -19,7 +25,7 @@
         </view>
         <view bindtap="searchContents" class="search_aa">搜索</view>
        
-      </view>
+      </view> -->
     </view>
     <view class="info" bindtap="goToInfo" data-id="{{item.id}}" wx:for="{{recruitList}}" wx:if="{{recruitList.length>0}}">
       <view class="info_top">
@@ -40,7 +46,7 @@
       </view>
     </view>
     <view class="no_data_par" wx:if="{{recruitList.length==0}}">
-      <image src="/images/icons/no_data.png" class="no_data_img"></image>
+      <image src="/images/new/no_data.png" class="no_data_img"></image>
       <view class="no_data_text">暂无数据</view>
     </view>
 </view>

+ 32 - 14
pages/school/school.wxss

@@ -10,7 +10,7 @@ Page {
 .header{
   background-color: #fff;
   width: 710rpx;
-  height: 300rpx;
+  height: 160rpx;
   display: flex;
   flex-flow: column nowrap;
   justify-content: space-around;
@@ -21,11 +21,12 @@ Page {
   display: flex;
   flex-flow: row nowrap;
   justify-content: left;
-  padding: 20rpx;
+  /* padding: 20rpx; */
 }
 .c_img{
-  height: 120rpx;
-  width: 160rpx;
+  height: 66rpx;
+  width: 66rpx;
+  margin-left: 30rpx;
 }
 .top_right{
   display: flex;
@@ -47,9 +48,9 @@ Page {
   justify-content: space-around;
   border: 2rpx solid #E6E6E6;
   border-radius: 50rpx;
-  height: 60rpx;
+  height: 50rpx;
   align-items: center;
-  width: 550rpx;
+  width: 500rpx;
 }
 .search_aa{
   width: 80rpx;
@@ -72,25 +73,26 @@ Page {
 
 .info{
   background-color: #fff;
-  width: 710rpx;
+  /* width: 710rpx; */
   height: 160rpx;
   display: flex;
   flex-flow: column nowrap;
   justify-content: space-around;
   border-radius: 10rpx;
   margin-bottom: 20rpx;
+  padding: 5px 15px;
 }
 .info_top,.info_mid,.info_bottom{
   display: flex;
   flex-flow: row nowrap;
   justify-content: space-between;
-  padding: 0 15rpx;
+  /* padding: 0 15rpx; */
 }
 .info_bottom{
   display: flex;
   flex-flow: row nowrap;
   justify-content: left;
-  padding: 0 15rpx;
+  /* padding: 0 15rpx; */
 }
 .info_mid_left{
   display: flex;
@@ -105,20 +107,30 @@ Page {
 .info_top_left{
   color: #43496a;
   font-size: 32rpx;
+  font-weight: 600;
+  width: 400rpx;
+  overflow: hidden;
+text-overflow:ellipsis;
+white-space: nowrap;
 }
 .info_top_right{
-  color: #ff7c7c;
-  font-size: 28rpx;
+  font-size: 32rpx;
+  font-weight: bold;
+  color: #FF8364
 }
 
 .info_mid_left,.info_mid_right{
-  font-size: 12px;
-  color: #b0b4ca;
+  font-size: 20rpx;
+font-weight: 500;
+color: #808080;
 }
 .info_bottom_2{
   font-size: 28rpx;
-  color: #777d9c;
+
   margin-left: 10rpx;
+  font-size: 12px;
+font-weight: 600;
+color: #6C6C6C;
 }
 .input_text{
   color: #c2c6da;
@@ -141,3 +153,9 @@ Page {
   height: 240rpx;
   width: 320rpx;
 }
+.info_mid_left_info{
+  background: #FF8364;border-radius: 6px;padding:1px 10px;color:#fff;margin-right:10rpx
+}
+.no_data_text{
+  font-size: 12px;
+}

+ 1 - 1
pages/sociology/sociology.json

@@ -2,7 +2,7 @@
   "usingComponents": {},
   "navigationBarBackgroundColor": "#fff",
   "navigationBarTextStyle": "black",
-  "navigationBarTitleText": "社招",
+  "navigationBarTitleText": "社招岗位",
   "backgroundColor": "#fff",
   "backgroundTextStyle": "light"
 

+ 32 - 34
pages/sociology/sociology.wxml

@@ -1,22 +1,20 @@
-
-
-<view class="content" >
-    <view class="header">
-      <view class="top">
-        <image class="c_img" src="/images/new/logo.png"></image>
-        <view class="top_right">
-          <!-- <view class="c_name">沪上阿姨</view>
+<view class="content">
+  <view class="header">
+    <view class="top">
+      <image class="c_img" src="/images/new/logo.png"></image>
+      <view class="top_right">
+        <!-- <view class="c_name">沪上阿姨</view>
           <view class="desc">茶饮连锁品牌</view> -->
-          <view class="search_group">
+        <view class="search_group">
           <icon type="search" class="icon_search" color="#c2c6da"></icon>
-          <input type="text" placeholder="请输入您想要的职位" 
-          placeholder-class="input_text" bindinput="inputFocus" class="search_input" maxlength="30" value="{{searchinput}}"/>
+          <input type="text" placeholder="请输入您想要的职位" placeholder-class="input_text" bindinput="inputFocus"
+            class="search_input" maxlength="30" value="{{searchinput}}" />
           <icon type="clear" class="icon_clear" color="#c2c6da" wx:if="{{showClear}}" bindtap="clearInput"></icon>
         </view>
-        </view>
-        
       </view>
-      <!-- <view class="bottom">
+
+    </view>
+    <!-- <view class="bottom">
         <view class="search_group">
           <icon type="search" class="icon_search" color="#c2c6da"></icon>
           <input type="text" placeholder="请输入职位" 
@@ -26,27 +24,27 @@
         <view bindtap="searchContents" class="search_aa">搜索</view>
        
       </view> -->
+  </view>
+  <view class="info" bindtap="goToInfo" data-id="{{item.id}}" wx:for="{{recruitList}}" wx:if="{{recruitList.length>0}}">
+    <view class="info_top">
+      <view class="info_top_left">{{item.name}}</view>
+      <view class="info_top_right">{{item.salary}}</view>
     </view>
-    <view class="info" bindtap="goToInfo" data-id="{{item.id}}" wx:for="{{recruitList}}" wx:if="{{recruitList.length>0}}">
-      <view class="info_top">
-        <view class="info_top_left">{{item.name}}</view>
-        <view class="info_top_right">{{item.salary}}</view>
-      </view>
-      <view class="info_mid">
-        <view class="info_mid_left">
-          <view class="info_mid_left_info" >{{item.workArea}}</view>
-          <view class="info_mid_left_info">{{item.workingHours}}</view>
-          <view class="info_mid_left_info">{{item.education}}</view>
-        </view>
-        <view class="info_mid_right">{{item.releaseTime}}</view>
-      </view>
-      <view class="info_bottom">
-        <image src="/images/new/depart.png" class="info_bottom_img"></image>
-        <view class="info_bottom_2">{{item.demandDepartment}}</view>
+    <view class="info_mid">
+      <view class="info_mid_left">
+        <view class="info_mid_left_info">{{item.workArea}}</view>
+        <view class="info_mid_left_info">{{item.workingHours}}</view>
+        <view class="info_mid_left_info">{{item.education}}</view>
       </view>
+      <view class="info_mid_right">{{item.releaseTime}}</view>
     </view>
-    <view class="no_data_par" wx:if="{{recruitList.length==0}}">
-      <image src="/images/icons/no_data.png" class="no_data_img"></image>
-      <view class="no_data_text">暂无数据</view>
+    <view class="info_bottom">
+      <image src="/images/new/depart.png" class="info_bottom_img"></image>
+      <view class="info_bottom_2">{{item.demandDepartment}}</view>
     </view>
-</view>
+  </view>
+  <view class="no_data_par" wx:if="{{recruitList.length==0}}">
+    <image src="/images/icons/no_data.png" class="no_data_img"></image>
+    <view class="no_data_text">暂无数据</view>
+  </view>
+</view>

+ 1 - 73
pages/sociology/sociology.wxss

@@ -1,3 +1,4 @@
+@import "/app.wxss";
 .content{
   background-color: #F2F2F2;
   padding: 20rpx;
@@ -82,77 +83,4 @@ Page {
   margin-bottom: 20rpx;
   padding: 5px 15px;
 }
-.info_top,.info_mid,.info_bottom{
-  display: flex;
-  flex-flow: row nowrap;
-  justify-content: space-between;
-  /* padding: 0 15rpx; */
-}
-.info_bottom{
-  display: flex;
-  flex-flow: row nowrap;
-  justify-content: left;
-  /* padding: 0 15rpx; */
-}
-.info_mid_left{
-  display: flex;
-  flex-flow: row nowrap;
-  justify-content: left;
-  
-}
-.info_bottom_img{
-  width: 35rpx;
-  height: 35rpx;
-}
-.info_top_left{
-  color: #43496a;
-  font-size: 32rpx;
-  font-weight: 600;
-  width: 400rpx;
-  overflow: hidden;
-text-overflow:ellipsis;
-white-space: nowrap;
-}
-.info_top_right{
-  font-size: 32rpx;
-  font-weight: bold;
-  color: #FF8364
-}
-
-.info_mid_left,.info_mid_right{
-  font-size: 20rpx;
-font-weight: 500;
-color: #808080;
-}
-.info_bottom_2{
-  font-size: 28rpx;
 
-  margin-left: 10rpx;
-  font-size: 12px;
-font-weight: 600;
-color: #6C6C6C;
-}
-.input_text{
-  color: #c2c6da;
-  font-size: 28rpx;
-}
-.icon_search{
-  margin-left: 20rpx;
-  
-}
-.icon_clear{
-  margin-right: 20rpx;
-}
-.no_data_par{
-  display: flex;
-  flex-flow: column nowrap;
-  align-items: center;
-  margin-top: 200rpx;
-}
-.no_data_img{
-  height: 240rpx;
-  width: 320rpx;
-}
-.info_mid_left_info{
-  background: #FF8364;border-radius: 6px;padding:1px 10px;color:#fff;margin-right:10rpx
-}

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 43
pages/workEnvironment/workEnvironment.wxml