system-phone 1.2.21 → 1.2.22-1

package/build.gradle

@@ -10,7 +10,7 @@ buildscript {
 	}
 }
 
-version = '1.2.20'
+version = '1.3.0'
 
 apply plugin: 'java'
 apply plugin: 'docker'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "system-phone",
-  "version": "1.2.21",
+  "version": "1.2.22-1",
   "description": "手机模块 前端组件",
   "author": "何宁社 <524395609@qq.com>",
   "license": "ISC",

package/src/assets/fonttype/fontAndroid.less

@@ -0,0 +1,18 @@
+/* 字体 */
+@font-face {
+  font-family: Pingfhs;
+  src: url("./pingheizhun.ttf");
+}
+@font-face {
+  font-family: Pingfzhs;
+  src: url("./pingheizhong.ttf");
+}
+@font-face {
+  font-family: Pingfzcs;
+  src: url("./pingheicu.ttf");
+}
+@font-face {
+  font-family: Pingfzqs;
+  src: url("./pingheiqian.ttf");
+}
+

package/src/components/LoginApp.vue

@@ -11,8 +11,8 @@
             <button type="button" id="login-button" @click.prevent="confirm()"><strong>登录</strong></button>
           </p>
           <div class="row">
-            <img src="../assets/选中.png" style="width: 20px;margin-bottom: 5px" alt="" v-if="showsave"@click="showoff()">
-            <img src="../assets/未选.png" style="width: 20px;margin-bottom: 5px" alt="" v-if="!showsave" @click="showon()">
+            <img src="../assets/选中.png" style="width: 20px;margin-bottom: 5px" alt="" v-if="showsave == '1'"@click="showoff()">
+            <img src="../assets/未选.png" style="width: 20px;margin-bottom: 5px" alt="" v-if="showsave == '0'" @click="showon()">
             <span class="text-left font">记住密码</span>
             <p></p>
             <span class="devicetext">设备码：{{deviceIemi}}</span>
@@ -72,7 +72,7 @@
         config:{},
         ename: '',
         password: '',
-        showsave:true,
+        showsave:'0',
         deviceIemi:'无法获取该设备码，请联系管理员',
         loginSafe:false,
         margintop: document.documentElement.clientHeight * 0.1
@@ -82,6 +82,10 @@
     ready () {
       if(Vue.android) {
         let userPp1 = this.$androidUtil.getPreference('login_user_cache')
+        let passwordshowsave = this.$androidUtil.getPreference('password_issave')
+        if(passwordshowsave){
+          this.showsave = passwordshowsave
+        }
         if(userPp1){
           console.log(`1返回值是：${userPp1}`)
           userPp1 =  userPp1.replace(/\'/g,'\"')
@@ -102,10 +106,10 @@
       methods: {
       // 记住密码选中/未选中
       showoff(){
-        this.showsave = false
+        this.showsave = '0'
       },
       showon(){
-        this.showsave = true
+        this.showsave = '1'
       },
       async confirm() {
         console.log('Vue.android：' + Vue.android)
@@ -148,6 +152,7 @@
             this.$androidUtil.setPreference('login_user_cache', userStr)
             this.$androidUtil.setPreference('f_repairman_id', Util.f.id)
             this.$androidUtil.setPreference('f_repairman_name', Util.f.name)
+            this.$androidUtil.setPreference('password_issave', this.showsave)
           }
           Vue.$login = {jwt: ret.data.id}
           // 获取参数
@@ -155,9 +160,9 @@
           asyncReady(this,this.$androidUtil.getProxyUrl())
           console.log('获取参数结束')
 
-          // console.log('登陆验证成功时装载业务数据')
-          // asyncLoadData()
-          // console.log('装载业务数据结束')
+          console.log('登陆验证成功时装载业务数据')
+          asyncLoadData()
+          console.log('装载业务数据结束')
 
           this.$goto('nav-bottom')
         }catch (e) {

package/src/components/NavBottomV.vue

@@ -42,7 +42,7 @@
       }
     },
     ready () {
-      this.$refs.route.init('repair-first')
+      // this.$refs.route.init('repair-first')
     },
     methods: {
       imgback(val){

package/src/main.js

@@ -9,7 +9,7 @@ systemphonegrid()
 // systemphone()
 require('./android-bootstrap/less/bootstrap.less')
 require('./expandcssAndroid.less')
-// require('./assets/fonttype/fontAndroid.less')
+require('./assets/fonttype/fontAndroid.less')
 
 Vue.config.silent = true
 Vue.android = false

package/.npmignore

@@ -1,9 +0,0 @@
-.idea/
-.DS_Store
-node_modules/
-dist/static/*.map
-npm-debug.log
-selenium-debug.log
-test/unit/coverage
-test/e2e/reports
-dist/