Merge branch 'master' of http://116.255.135.38:3000/zhangzl/nsgk_mobile

src/views/onlineHome/workbench.vue

@@ -1,21 +1,22 @@
 <template>
     <div class="app-container">
+      <van-sticky>
       <van-nav-bar
         title="网上家园"
       >
         <template #left>
             <van-icon name="location" color="3A80FB" size="16"/>
-          <p  style="color: #878787;margin-left: 5px">柳沟村</p>
+          <p  style="color: #878787;margin-left: 5px">{{deptName}}</p>
         </template>
         <template #right>
           <van-icon name="wap-nav" color="#000" size="18"/>
         </template>
       </van-nav-bar>
+      </van-sticky>
       <van-swipe class="my-swipe" :autoplay="3000" indicator-color="white" style="width: 96%;margin: 2%;height:120px;border-radius: 6px;">
-        <van-swipe-item>1</van-swipe-item>
-        <van-swipe-item>2</van-swipe-item>
-        <van-swipe-item>3</van-swipe-item>
-        <van-swipe-item>4</van-swipe-item>
+        <van-swipe-item v-for="(image,index) in images" :key="index">
+          <img :src="image" style="width:100%;height: 120px"/>
+        </van-swipe-item>
       </van-swipe>
       <van-row style="margin:2%;width:96%;padding:20px 0;border-radius: 6px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16); min-height: 100px;background: #fff;">
         <van-cell style="border-radius: 6px;">
@@ -357,6 +358,7 @@
 
 <script>
   import onlineHomeIndex from "../onlineHomeIndex";
+  import {getInfo} from "../../api/login";
     export default {
       components: {
         onlineHomeIndex
@@ -365,9 +367,16 @@
       data() {
         return {
           list1: [],
-
+          images:['../../../static/images/onlineHome/tab.jpg'],
+          deptName:"",
         };
       },
+      created() {
+        getInfo().then(response => {
+          this.deptName = response.user.dept.deptName
+        });
+      },
+
     }
 </script>
 
@@ -377,7 +386,6 @@
     font-size: 20px;
     line-height: 144px;
     text-align: center;
-    background-color: #39a9ed;
   }
   >>>.van-grid-item__content{
     padding:0.213333rem;

src/views/onlineHomeLogin.vue

@@ -9,17 +9,15 @@
         <van-form style="margin:50px 0;" v-if="!showMessage">
           <van-field
             v-model="formData.username"
-            name="请输入手机号"
-            placeholder="请输入手机号"
-            :rules="[{ required: true, message: '请填写手机号' }]"
+            placeholder="请输入手机号/账号"
+            :rules="[{ required: true, message:''  }]"
           />
           <van-field
             v-model="formData.password"
             type="password"
-            name="请输入密码"
             style="margin-top: 20px"
             placeholder="请输入密码"
-            :rules="[{ required: true, message: '请填写密码' }]"
+            :rules="[{ required: true, message:''  }]"
           />
           <van-field
             v-model="formData.code"
@@ -43,7 +41,7 @@
             v-model="formData.mobile"
             name="请输入手机号"
             placeholder="请输入手机号"
-            :rules="[{ required: true, message: '请填写用户名' }]"
+            :rules="[{ required: true, message: '' }]"
           />
           <van-field
             v-model="formData.code"
@@ -97,7 +95,6 @@
           </van-field>
           <van-field
             v-model="formData.smsCode"
-            name="请输入验证码"
             style="margin-top: 20px"
             placeholder="请输入验证码"
             :rules="[{ required: true, message: '请填写验证码' }]"
@@ -108,7 +105,7 @@
                 computeTime > 0 ? `(${computeTime}s)已发送` : "获取短信码"
               }}</div>
 
-           
+
             </template>
           </van-field>
           <div style="margin: 50px 16px 16px;">
@@ -190,7 +187,7 @@
   .registerSmsBtn{
     color: rgb(29, 111, 233);
     font-size: 0.34rem;
-   
+
   }
 </style>
 <script>
@@ -374,7 +371,7 @@ export default {
       }
     },
     registerSubmit(){
- 
+
       //注册
       if (this.formData.memberName == "") {
         this.$dialog.alert({
@@ -403,7 +400,7 @@ export default {
         if(res.code == 200){
           registerOn(this.formData).then((res)=>{
             if(res.code == 200){
-              // 
+              //
               this.$dialog.alert({
                   message: '您的初始密码：'+res.password,
               }).then(() => {