Merge branch 'master' of http://39.98.153.250:9080/bowintek/EmploymentSite

h5app/src/views/pages/company/edit.vue

@@ -26,64 +26,64 @@
       <form autocomplete="off">
         <ion-list>
           <ion-item>
-            <ion-input label="企业名称" label-placement="stacked" :clear-input="true" placeholder="请填写企业名称">
+            <ion-input label="企业名称" label-placement="stacked" :clear-input="true" >
             </ion-input>
           </ion-item>
           <ion-item>
             <ion-input label="统一信用代码" label-placement="stacked" :clear-input="true"
-                       placeholder="请填写统一信用代码">
+                       >
             </ion-input>
           </ion-item>
           <ion-item>
-            <ion-input label="所属驿站" label-placement="stacked" :clear-input="true" placeholder="请填写所属驿站">
+            <ion-input label="所属驿站" label-placement="stacked" :clear-input="true" >
             </ion-input>
           </ion-item>
           <ion-item>
-            <ion-input label="所属县区" label-placement="stacked" :clear-input="true" placeholder="请填写所属县区">
+            <ion-input label="所属县区" label-placement="stacked" :clear-input="true" >
             </ion-input>
           </ion-item>
           <ion-item>
-            <ion-input label="所属街道" label-placement="stacked" :clear-input="true" placeholder="请填写所属街道">
+            <ion-input label="所属街道" label-placement="stacked" :clear-input="true" >
             </ion-input>
           </ion-item>
           <ion-item>
-            <ion-input label="企业办公地址" label-placement="stacked" :clear-input="true" placeholder="请填写企业办公地址">
+            <ion-input label="企业办公地址" label-placement="stacked" :clear-input="true" >
             </ion-input>
           </ion-item>
           <ion-item>
-            <ion-input label="用工情况" label-placement="stacked" :clear-input="true" placeholder="请填写用工情况">
+            <ion-input label="用工情况" label-placement="stacked" :clear-input="true" >
             </ion-input>
           </ion-item>
           <ion-item>
-            <ion-input label="企业规模" label-placement="stacked" :clear-input="true" placeholder="请填写企业规模">
+            <ion-input label="企业规模" label-placement="stacked" :clear-input="true" >
             </ion-input>
           </ion-item>
           <ion-item>
-            <ion-input label="企业归类" label-placement="stacked" :clear-input="true" placeholder="请填写企业归类">
+            <ion-input label="企业归类" label-placement="stacked" :clear-input="true" >
             </ion-input>
           </ion-item>
           <ion-item>
-            <ion-input label="企业联系人" label-placement="stacked" :clear-input="true" placeholder="请填写企业联系人">
+            <ion-input label="企业联系人" label-placement="stacked" :clear-input="true" >
             </ion-input>
           </ion-item>
           <ion-item>
-            <ion-input label="企业联系电话" label-placement="stacked" :clear-input="true" placeholder="请填写企业联系电话">
+            <ion-input label="企业联系电话" label-placement="stacked" :clear-input="true" >
             </ion-input>
           </ion-item>
           <ion-item>
-            <ion-input label="企业邮箱" label-placement="stacked" :clear-input="true" placeholder="请填写企业邮箱">
+            <ion-input label="企业邮箱" label-placement="stacked" :clear-input="true" >
             </ion-input>
           </ion-item>
           <ion-item>
-            <ion-input label="法人代表" label-placement="stacked" :clear-input="true" placeholder="请填写法人代表">
+            <ion-input label="法人代表" label-placement="stacked" :clear-input="true" >
             </ion-input>
           </ion-item>
           <ion-item>
-            <ion-input label="营业执照有效期" label-placement="stacked" :clear-input="true" placeholder="请填写营业执照有效期">
+            <ion-input label="营业执照有效期" label-placement="stacked" :clear-input="true" >
             </ion-input>
           </ion-item>
           <ion-item>
-            <ion-input label="企业状态" label-placement="stacked" :clear-input="true" placeholder="请填写企业状态">
+            <ion-input label="企业状态" label-placement="stacked" :clear-input="true" >
             </ion-input>
           </ion-item>
         </ion-list>

h5app/src/views/pages/company/list.vue

@@ -13,8 +13,8 @@
     </ion-header>
     <ion-content>
       <ion-item style="margin: 10px 0;">
-        <ion-input style="border: 1px solid #f2f2f5;border-radius: 4px;--padding-start: 10px;height: 35px;"></ion-input>
-        <ion-button slot="end" style="height: 33px;width: 70px;margin-left: 10px;--box-shadow: none;">搜索</ion-button>
+        <ion-input style="border: 1px solid #f2f2f5;border-radius: 14px;--padding-start: 10px;height: 35px;"></ion-input>
+        <ion-button slot="end" style="height: 33px;width: 70px;margin-left: 10px;--box-shadow: none;--border-radius: 14px;">搜索</ion-button>
       </ion-item>
       <ion-list class="list-content">
         <ion-item v-for="(record,key) in dataList" :key="key"  detail>

h5app/src/views/pages/jobuser/edit.vue

@@ -24,109 +24,109 @@
       <form autocomplete="off">
         <ion-list>
           <ion-item>
-            <ion-input label="姓名" label-placement="stacked" :clear-input="true" placeholder="请填写姓名">
+            <ion-input label="姓名" label-placement="stacked" :clear-input="true" >
             </ion-input>
           </ion-item>
           <ion-item>
             <ion-input label="公民身份号码" label-placement="stacked" :clear-input="true"
-                       placeholder="请填写公民身份号码">
+                       >
             </ion-input>
           </ion-item>
           <ion-item>
-            <ion-input label="性别" label-placement="stacked" :clear-input="true" placeholder="请填写性别">
+            <ion-input label="性别" label-placement="stacked" :clear-input="true" >
             </ion-input>
           </ion-item>
           <ion-item>
-            <ion-input label="民族" label-placement="stacked" :clear-input="true" placeholder="请填写民族">
+            <ion-input label="民族" label-placement="stacked" :clear-input="true" >
             </ion-input>
           </ion-item>
           <ion-item>
-            <ion-input label="政治面貌" label-placement="stacked" :clear-input="true" placeholder="请填写政治面貌">
+            <ion-input label="政治面貌" label-placement="stacked" :clear-input="true" >
             </ion-input>
           </ion-item>
           <ion-item>
-            <ion-input label="出生地" label-placement="stacked" :clear-input="true" placeholder="请填写出生地">
+            <ion-input label="出生地" label-placement="stacked" :clear-input="true" >
             </ion-input>
           </ion-item>
           <ion-item>
-            <ion-input label="出生日期" label-placement="stacked" :clear-input="true" placeholder="请填写出生日期">
+            <ion-input label="出生日期" label-placement="stacked" :clear-input="true" >
             </ion-input>
           </ion-item>
           <ion-item>
-            <ion-input label="户口性质" label-placement="stacked" :clear-input="true" placeholder="请填写户口性质">
+            <ion-input label="户口性质" label-placement="stacked" :clear-input="true" >
             </ion-input>
           </ion-item>
           <ion-item>
-            <ion-input label="文化程度" label-placement="stacked" :clear-input="true" placeholder="请填写文化程度">
+            <ion-input label="文化程度" label-placement="stacked" :clear-input="true" >
             </ion-input>
           </ion-item>
           <ion-item>
-            <ion-input label="健康状况" label-placement="stacked" :clear-input="true" placeholder="请填写健康状况">
+            <ion-input label="健康状况" label-placement="stacked" :clear-input="true" >
             </ion-input>
           </ion-item>
           <ion-item>
-            <ion-input label="血型" label-placement="stacked" :clear-input="true" placeholder="请填写血型">
+            <ion-input label="血型" label-placement="stacked" :clear-input="true" >
             </ion-input>
           </ion-item>
           <ion-item>
-            <ion-input label="身高" label-placement="stacked" :clear-input="true" placeholder="请填写身高">
+            <ion-input label="身高" label-placement="stacked" :clear-input="true" >
             </ion-input>
           </ion-item>
           <ion-item>
-            <ion-input label="视力" label-placement="stacked" :clear-input="true" placeholder="请填写视力">
+            <ion-input label="视力" label-placement="stacked" :clear-input="true" >
             </ion-input>
           </ion-item>
           <ion-item>
-            <ion-input label="体重" label-placement="stacked" :clear-input="true" placeholder="请填写体重">
+            <ion-input label="体重" label-placement="stacked" :clear-input="true" >
             </ion-input>
           </ion-item>
           <ion-item>
-            <ion-input label="婚姻状况" label-placement="stacked" :clear-input="true" placeholder="请填写婚姻状况">
+            <ion-input label="婚姻状况" label-placement="stacked" :clear-input="true" >
             </ion-input>
           </ion-item>
           <ion-item>
-            <ion-input label="省份" label-placement="stacked" :clear-input="true" placeholder="请填写省份">
+            <ion-input label="省份" label-placement="stacked" :clear-input="true" >
             </ion-input>
           </ion-item>
           <ion-item>
-            <ion-input label="市/县" label-placement="stacked" :clear-input="true" placeholder="请填写市/县">
+            <ion-input label="市/县" label-placement="stacked" :clear-input="true" >
             </ion-input>
           </ion-item>
           <ion-item>
-            <ion-input label="镇/街" label-placement="stacked" :clear-input="true" placeholder="请填写镇/街">
+            <ion-input label="镇/街" label-placement="stacked" :clear-input="true" >
             </ion-input>
           </ion-item>
           <ion-item>
-            <ion-input label="联系人" label-placement="stacked" :clear-input="true" placeholder="请填写联系人">
+            <ion-input label="联系人" label-placement="stacked" :clear-input="true" >
             </ion-input>
           </ion-item>
           <ion-item>
-            <ion-input label="联系电话" label-placement="stacked" :clear-input="true" placeholder="请填写联系电话">
+            <ion-input label="联系电话" label-placement="stacked" :clear-input="true" >
             </ion-input>
           </ion-item>
           <ion-item>
-            <ion-input label="地址" label-placement="stacked" :clear-input="true" placeholder="请填写地址">
+            <ion-input label="地址" label-placement="stacked" :clear-input="true" >
             </ion-input>
           </ion-item>
           <ion-item>
-            <ion-input label="家庭住址" label-placement="stacked" :clear-input="true" placeholder="请填写家庭住址">
+            <ion-input label="家庭住址" label-placement="stacked" :clear-input="true" >
             </ion-input>
           </ion-item>
           <ion-item>
-            <ion-input label="电子邮箱" label-placement="stacked" :clear-input="true" placeholder="请填写电子邮箱">
+            <ion-input label="电子邮箱" label-placement="stacked" :clear-input="true" >
             </ion-input>
           </ion-item>
           <ion-item>
-            <ion-input label="兴趣爱好" label-placement="stacked" :clear-input="true" placeholder="请填写兴趣爱好">
+            <ion-input label="兴趣爱好" label-placement="stacked" :clear-input="true" >
             </ion-input>
           </ion-item>
           <ion-item>
-            <ion-input label="就业状态" label-placement="stacked" :clear-input="true" placeholder="请填写就业状态">
+            <ion-input label="就业状态" label-placement="stacked" :clear-input="true" >
             </ion-input>
           </ion-item>
           <ion-item>
             <ion-input label="重点人员类别" label-placement="stacked" :clear-input="true"
-                       placeholder="请填写重点人员类别">
+                       >
             </ion-input>
           </ion-item>
         </ion-list>

h5app/src/views/pages/jobuser/list.vue

@@ -13,8 +13,8 @@
     </ion-header>
     <ion-content>
       <ion-item style="margin: 10px 0;">
-        <ion-input style="border: 1px solid #f2f2f5;border-radius: 4px;--padding-start: 10px;height: 35px;"></ion-input>
-        <ion-button slot="end" style="height: 33px;width: 70px;margin-left: 10px;--box-shadow: none;">搜索</ion-button>
+        <ion-input style="border: 1px solid #f2f2f5;border-radius: 14px;--padding-start: 10px;height: 35px;"></ion-input>
+        <ion-button slot="end" style="height: 33px;width: 70px;margin-left: 10px;--box-shadow: none;--border-radius: 14px;">搜索</ion-button>
       </ion-item>
       <ion-list  class="list-content">
         <ion-item v-for="(record,key) in dataList" :key="key"  detail>

h5app/src/views/pages/post/recommend.vue

@@ -13,9 +13,9 @@
     </ion-header>
     <ion-content>
       <ion-item style="margin: 10px 0;">
-        <ion-input style="border: 1px solid #f2f2f5;border-radius: 4px;--padding-start: 10px;height: 35px;"
-                   placeholder="人员姓名"></ion-input>
-        <ion-button slot="end" style="height: 33px;width: 70px;margin-left: 10px;--box-shadow: none;">查询</ion-button>
+        <ion-input style="border: 1px solid #f2f2f5;border-radius: 14px;--padding-start: 10px;height: 35px;"
+                   ></ion-input>
+        <ion-button slot="end" style="height: 33px;width: 70px;margin-left: 10px;--box-shadow: none;--border-radius: 14px;">查询</ion-button>
       </ion-item>
       <ion-item>
         <ion-grid>