Merge branch 'master' of http://git.gs-mes.com:8080/chenky/pda_uni_app

YOS-DRVOGPU6U78\Administrator

2023-07-19 72ae3dbb48ddcd16b2311f5346120b178302a5a1

 pages/login/login.vue

@@ -21,8 +21,7 @@
</template>

<script>
   import { userInfo } from 'os'
import {
   import {
      login
   } from '../../api/login'
   export default {
@@ -36,8 +35,8 @@
         }
      },
      onLoad() {
         let user =  uni.getStorageSync('userInfo')
         if( user ) {
         let user = uni.getStorageSync('userInfo')
         if (user) {
            this.userInfo.account = user.code
         }
      },
@@ -60,7 +59,6 @@
               return
            }


            console.log(this.userInfo)
            login(this.userInfo.account, this.userInfo.password).then(response => {
               console.log(response)
@@ -75,17 +73,16 @@
                  username: response.data.FNAME,
                  code: response.data.FCODE,
                  company: response.data.FCOMPANY,
                  factory: response.data.FFACTORY
                  factory: response.data.FFACTORY,
               })
               uni.navigateTo({
                  url: '/pages/index/index'
                  url: '/pages/index/index',
               })
            })
         }
      }
      },
   }
</script>

<style>
   .uni-input {
      height: 28px;