system-phone 1.4.0 → 3.0.1

package/src/components/ModifyPassWord.vue

@@ -1,180 +1,192 @@
-<template>
-  <div class="app-botton" @click="back()">
-    <span class="glyphicon glyphicon-menu-left">返回</span>
-  </div>
-  <div class="auto">
-    <div class="row app-row">
-      <div class="col-xs-4">
-        <img src="../assets/姓名.png" style="width: 20px;margin-bottom: 5px" alt="">
-        <span class="text-left font">账号</span>
-      </div>
-      <div class="col-xs-8 input-font" >
-        <input type="text" class="search_input input-font" v-model="model.ename"  readonly/>
-      </div>
-    </div>
-    <div class="row app-row">
-      <div class="col-xs-4" style="margin-top: 8px">
-        <img src="../assets/原始密码.png" style="width: 20px;margin-bottom: 5px" alt="">
-        <span class="text-left font">原始密码</span>
-      </div>
-      <div class="col-xs-8">
-        <input type="password" id="oldpassword" class="search_input input-font" v-model="model.oldpassword" placeholder="请输入原始密码"/>
-      </div>
-    </div>
-    <div class="row app-row">
-      <div class="col-xs-4" style="margin-top: 8px">
-        <img src="../assets/密码.png" style="width: 20px;margin-bottom: 5px" >
-        <span class="text-left font">新密码</span>
-      </div>
-      <div class="col-xs-8">
-        <input type="password" id="newpassword1" class="search_input input-font" v-model="model.password" placeholder="请输入新密码"/>
-      </div>
-    </div>
-    <div class="row app-row">
-      <div class="col-xs-4" style="margin-top: 8px">
-        <img src="../assets/密码.png" style="width: 20px;margin-bottom: 5px" alt="">
-        <span class="text-left font">确认密码</span>
-      </div>
-      <div class="col-xs-8">
-        <input type="password" id="newpassword2" class="search_input input-font" v-model="model.newpassword" placeholder="请重新输入新密码"/>
-      </div>
-    </div>
-    <div class="row app-row">
-      <div class="col-xs-4" style="margin-top: 8px">
-        <img src="../assets/选中.png" style="width: 20px;margin-bottom: 5px" alt="" v-if="showpass"@click="showoff()">
-        <img src="../assets/未选.png" style="width: 20px;margin-bottom: 5px" alt="" v-if="!showpass" @click="showon()">
-        <span class="text-left font">显示密码</span>
-      </div>
-    </div>
-    <div class="row app-row text-center">
-      <button type="button" class="btn btn-lg btn-font btn-color" style="width: 45%;" @click="save()">提交</button>
-    </div>
-  </div>
-</template>
-<script>
-  import Vue from 'vue'
-
-  let asyncCheck = async function(self,url) {
-    try {
-      let that = self
-      let user = {
-        ename: that.model.ename,
-        newpassword:that.model.password,
-        affirmpassword:that.model.newpassword,
-        password : that.model.oldpassword
-      }
-      let res = await Vue.resetpost(`${url}/rs/user/modifypwd`,{data: user },{resolveMsg: null, rejectMsg: null})
-      console.log("手机端验证登陆原始密码")
-      console.log(res.data)
-      if(res.data){
-        that.$showMessage('修改密码成功！')
-        that.$back()
-      }else {
-        that.$showMessage('修改密码失败，请重新输入！')
-        console.log(res.data)
-        return
-      }
-      } catch (error) {
-      if (error.status == 500) {
-        that.$showMessage('网络异常，请检查手机网络！')
-      }else{
-        throw error
-      }
-    }
-  }
-
-  export default {
-    title: '修改密码',
-    data () {
-      return {
-        model: {
-           user: Vue.user.name,
-           userid: Vue.user.id,
-           ename: Vue.user.ename,
-           oldpassword: '',
-           password: '',
-           newpassword:''
-        },
-        showpass:false
-      }
-    },
-    ready () {
-
-    },
-    methods: {
-      back () {
-        let _this = this
-        this.$showMessage('所填写内容将不可恢复！', ['confirm', 'cancel']).then((res) => {
-          if (res === 'confirm') {
-            _this.$back()
-          }
-        })
-      },
-      // showpass(){
-      //   console.log('1')
-      //   document.getElementById("oldpassword").type = "text"
-      // },
-      showon(){
-        this.showpass = true
-        document.getElementById("oldpassword").type = "text"
-        document.getElementById("newpassword1").type = "text"
-        document.getElementById("newpassword2").type = "text"
-      },
-      showoff(){
-        this.showpass = false
-        document.getElementById("oldpassword").type = "password"
-        document.getElementById("newpassword1").type = "password"
-        document.getElementById("newpassword2").type = "password"
-      },
-      save() {
-        // 先对新密码和确认密码是否一致
-        if (this.model.password != this.model.newpassword) {
-          this.$showMessage('两次输入密码不一致！')
-          return
-        }
-        // 检验原始密码是否符合 并修改密码
-        asyncCheck(this, this.$androidUtil.getProxyUrl())
-        }
-    }
-  }
-</script>
-<style>
-  .search_input {
-    border: 0;
-    outline: none;
-  }
-  .app-row {
-    background-color: white;
-    padding: 10px 10px 0 10px;
-    border-bottom: 1px solid rgba(235, 235, 235, 0.5);
-  }
-  .font{
-    font: 15px PingFang-SC-Medium;
-  }
-  .btn-font{
-    font:600 16px PingFang-SC-Bold;
-    color: #499EDF;
-  }
-  .btn-color{
-    background-color: #FFFFFF;
-    border-radius: 10px ;
-    border: 1px solid #499EDF;
-  }
-  .input-font{
-    font: 15px PingFang-SC-Medium;
-    color: #333333;
-  }
-  .app-botton {
-    position:fixed;
-    background: #87b2dd;
-    color: #FFF;
-    padding: 8px;
-    text-align: center;
-    font-size: 1.2em;
-    z-index: 10;
-    opacity:0.5;
-    bottom: 50px;
-    margin-top: -10px;
-    height: 40px;
-  }
-</style>
+<template>
+  <!--<div class="app-botton" @click="back()">-->
+    <!--<span class="glyphicon glyphicon-menu-left">返回</span>-->
+  <!--</div>-->
+  <div class="auto">
+    <div class="row app-row">
+      <div class="col-xs-4">
+        <img src="../assets/姓名.png" style="width: 20px;margin-bottom: 5px" alt="">
+        <span class="text-left font">账号</span>
+      </div>
+      <div class="col-xs-8 input-font">
+        <input type="text" class="search_input input-font" v-model="model.ename"  readonly/>
+      </div>
+    </div>
+    <div class="row app-row">
+      <div class="col-xs-4" style="margin-top: 8px">
+        <img src="../assets/原始密码.png" style="width: 20px;margin-bottom: 5px" alt="">
+        <span class="text-left font">原始密码</span>
+      </div>
+      <div class="col-xs-8">
+        <input type="password" id="oldpassword" class="search_input input-font" v-model="model.oldpassword" placeholder="请输入原始密码"/>
+      </div>
+    </div>
+    <div class="row app-row">
+      <div class="col-xs-4" style="margin-top: 8px">
+        <img src="../assets/密码.png" style="width: 20px;margin-bottom: 5px" >
+        <span class="text-left font">新密码</span>
+      </div>
+      <div class="col-xs-8">
+        <input type="password" id="newpassword1" class="search_input input-font" v-model="model.password" :placeholder="weakPassword?'需要包含大小写字母符号数字':'请输入新密码'"/>
+      </div>
+    </div>
+    <div class="row app-row">
+      <div class="col-xs-4" style="margin-top: 8px">
+        <img src="../assets/密码.png" style="width: 20px;margin-bottom: 5px" alt="">
+        <span class="text-left font">确认密码</span>
+      </div>
+      <div class="col-xs-8">
+        <input type="password" id="newpassword2" class="search_input input-font" v-model="model.newpassword" placeholder="请重新输入新密码"/>
+      </div>
+    </div>
+    <div class="row app-row">
+      <div class="col-xs-4" style="margin-top: 8px">
+        <img src="../assets/选中.png" style="width: 20px;margin-bottom: 5px" alt="" v-if="showpass"@click="showoff()">
+        <img src="../assets/未选.png" style="width: 20px;margin-bottom: 5px" alt="" v-if="!showpass" @click="showon()">
+        <span class="text-left font">显示密码</span>
+      </div>
+    </div>
+    <div class="row app-row text-center">
+      <button type="button" class="btn btn-lg btn-font btn-color" style="width: 45%;" @click="save()">提交</button>
+    </div>
+  </div>
+</template>
+<script>
+  import Vue from 'vue'
+
+  let asyncCheck = async function(self,url) {
+    try {
+      let that = self
+      let user = {
+        ename: that.model.ename,
+        newpassword:that.model.password,
+        affirmpassword:that.model.newpassword,
+        password : that.model.oldpassword
+      }
+      let res = await Vue.resetpost(`${url}/rs/user/modifypwd`,{data: user },{resolveMsg: null, rejectMsg: null})
+      console.log("手机端验证登陆原始密码")
+      console.log(res.data)
+      if(res.data){
+        that.$showMessage('修改密码成功！')
+        if(that.sourse == 'login'){
+          that.$emit('success',that.model.password)
+          return
+        }
+        that.$back()
+      }else {
+        that.$showMessage('修改密码失败，请重新输入！')
+        console.log(res.data)
+        return
+      }
+      } catch (error) {
+      if (error.status == 500) {
+        that.$showMessage('网络异常，请检查手机网络！')
+      }else{
+        throw error
+      }
+    }
+  }
+
+  export default {
+    title: '修改密码',
+    data () {
+      return {
+        model: {
+           user: Vue.user.name,
+           userid: Vue.user.id,
+           ename: Vue.user.ename,
+           oldpassword: '',
+           password: '',
+           newpassword:''
+        },
+        showpass:false
+      }
+    },
+    props: {
+      sourse:'',
+      weakPassword:false
+    },
+    ready () {
+
+    },
+    methods: {
+      back () {
+        let _this = this
+        this.$showMessage('所填写内容将不可恢复！', ['confirm', 'cancel']).then((res) => {
+          if (res === 'confirm') {
+            _this.$back()
+          }
+        })
+      },
+      // showpass(){
+      //   console.log('1')
+      //   document.getElementById("oldpassword").type = "text"
+      // },
+      showon(){
+        this.showpass = true
+        document.getElementById("oldpassword").type = "text"
+        document.getElementById("newpassword1").type = "text"
+        document.getElementById("newpassword2").type = "text"
+      },
+      showoff(){
+        this.showpass = false
+        document.getElementById("oldpassword").type = "password"
+        document.getElementById("newpassword1").type = "password"
+        document.getElementById("newpassword2").type = "password"
+      },
+      save() {
+        // 先对新密码和确认密码是否一致
+        if (this.model.password != this.model.newpassword) {
+          this.$showMessage('两次输入密码不一致！')
+          return
+        }
+        if(this.weakPassword && this.model.password && !(/^(?:(?=.*[a-zA-Z])(?=.*[0-9])(?=.*[^A-Za-z0-9])).*$/.test(this.model.password))){
+          this.$showMessage('新密码必须包含大小写字母、数字、符号！')
+          return
+        }
+        // 检验原始密码是否符合 并修改密码
+        asyncCheck(this, this.$androidUtil.getProxyUrl())
+        }
+    }
+  }
+</script>
+<style>
+  .search_input {
+    border: 0;
+    outline: none;
+  }
+  .app-row {
+    background-color: white;
+    padding: 10px 10px 0 10px;
+    border-bottom: 1px solid rgba(235, 235, 235, 0.5);
+  }
+  .font{
+    font: 15px PingFang-SC-Medium;
+  }
+  .btn-font{
+    font:600 16px PingFang-SC-Bold;
+    color: #499EDF;
+  }
+  .btn-color{
+    background-color: #FFFFFF;
+    border-radius: 10px ;
+    border: 1px solid #499EDF;
+  }
+  .input-font{
+    font: 15px PingFang-SC-Medium;
+    color: #333333;
+  }
+  .app-botton {
+    position:fixed;
+    background: #87b2dd;
+    color: #FFF;
+    padding: 8px;
+    text-align: center;
+    font-size: 1.2em;
+    z-index: 10;
+    opacity:0.5;
+    bottom: 50px;
+    margin-top: -10px;
+    height: 40px;
+  }
+</style>

package/src/components/NavBottom.vue

@@ -1,118 +1,117 @@
-<template>
-  <div class="no-close row android-repair-order">
-    <div :class="[fullpage ? 'menu-hide' : 'col-sm-3 col-xs-3']" >
-      <ul class="nav nav-tabs">
-        <li>
-          <p style="padding-left: 15px; color: white; font-weight: 550">
-            登录人：{{loginInfo.name}}
-          </p>
-          <!--({{loginInfo.id}})-->
-        </li>
-        <li v-for="tab in tabs" @click="tabSelect(tab.link)" :class="{active: tab.link === componentName}">
-          <a href="#" class="tab-befor-img">
-            <img  :src="getImg(tab.icon)" style="height: 30px;width:30px;">
-            {{tab.name}}</a>
-        </li>
-        <li @click="mute()">
-          <a href="#" class="repair-mute-class" >
-            <img  src="../assets/guanbishengyin.png" style="height: 30px;width:30px;border-width:0">关闭声音</a>
-        </li>
-      </ul>
-    </div>
-    <div :class="[fullpage ? 'col-sm-12 col-xs-12' : 'col-sm-9 col-xs-9']" style="overflow: auto;">
-      <!--<route v-ref:route></route>-->
-      <repair-first v-if="componentName === 'repair-first'"></repair-first>
-      <completed-repair v-if="componentName === 'completed-repair'"></completed-repair>
-      <up-load v-if="componentName === 'up-load'"></up-load>
-      <check-page v-if="componentName === 'check-page'"></check-page>
-      <readmeter-home v-if="componentName === 'readmeter-home'"></readmeter-home>
-      <repair-send v-if="componentName === 'repair-send'"></repair-send>
-      <regulator-page v-if="componentName === 'regulator-page'"></regulator-page>
-    </div>
-  </div>
-</template>
-
-<script scoped>
-  import Vue from 'vue'
-  import  * as Util from '../Util'
-  export default {
-    title: '底部导航',
-    data () {
-      return {
-        componentName: 'repair-first',
-        tabs: Util.f.functions,
-        text: '导航组件this',
-        fullpage: false,
-        loginInfo: {}
-      }
-    },
-    ready () {
-      this.loginInfo = Object.assign({}, this.loginInfo, Vue.user)
-      console.log(this.loginInfo, 'loginINfo')
-      // this.$refs.route.init('repair-first')
-    },
-    methods: {
-      // 选择tab
-      tabSelect (name) {
-        this.componentName = name
-        // this.$refs.route.init(name)
-        if (name !== 'text-chat-pane') {
-          this.notified('false')
-        } else {
-          this.notified('true')
-        }
-      },
-      notified (stopped) {
-        console.log('txtServiceStopped invoked$')
-        if (this.$androidUtil.isAndroid) {
-          HostApp.setPreference('txtServiceStopped', stopped)
-          HostApp.setPreference('msgCount', '0')
-        }
-      },
-      mute () {
-        if(navigator.userAgent.match('iPad') || navigator.userAgent.match('iPhone')){
-          window.prompt("mute","")
-        }else{
-          HostApp.mute()
-        }
-      },
-      getImg (param) {
-        return require(`../assets/${param}.png`)
-      }
-    },
-    events: {
-      showFullPage () {
-        this.fullpage = true
-      },
-      hideFullPage () {
-        this.fullpage = false
-      }
-    }
-  }
-</script>
-<style lang="less">
-  .tab-befor-img  {
-    margin: 3px 0;
-    content: '';
-    background-size: 30px;
-    display: inline-block;
-    margin-right: 8px;
-    height: 30px;
-    width: 100%;
-    vertical-align: -35%;
-  }
-  img[src=""],img:not([src]){
-    opacity: 0;
-    border:none;
-    visibility: hidden;
-    max-width: none;
-  }
-  /* .repair-mute-class {
-     &::before {
-       .tab-befor-img("../assets/guanbishengyin.png")
-     }
-   }*/
-  .menu-hide {
-    display: none;
-  }
-</style>
+<template>
+  <div class="no-close row android-repair-order">
+    <div :class="[fullpage ? 'menu-hide' : 'col-sm-3 col-xs-3']" >
+      <ul class="nav nav-tabs">
+        <li>
+          <p style="padding-left: 15px; color: white; font-weight: 550">
+            登录人：{{loginInfo.name}}
+          </p>
+          <!--({{loginInfo.id}})-->
+        </li>
+        <li v-for="tab in tabs" @click="tabSelect(tab.link)" :class="{active: tab.link === componentName}">
+          <a href="#" class="tab-befor-img">
+            <img  :src="getImg(tab.icon)" style="height: 30px;width:30px;">
+            {{tab.name}}</a>
+        </li>
+        <li @click="mute()">
+          <a href="#" class="repair-mute-class" >
+            <img  src="../assets/guanbishengyin.png" style="height: 30px;width:30px;border-width:0">关闭声音</a>
+        </li>
+      </ul>
+    </div>
+    <div :class="[fullpage ? 'col-sm-12 col-xs-12' : 'col-sm-9 col-xs-9']" style="overflow: auto;">
+      <!--<route v-ref:route></route>-->
+      <repair-first v-if="componentName === 'repair-first'"></repair-first>
+      <completed-repair v-if="componentName === 'completed-repair'"></completed-repair>
+      <up-load v-if="componentName === 'up-load'"></up-load>
+      <check-page v-if="componentName === 'check-page'"></check-page>
+      <readmeter-home v-if="componentName === 'readmeter-home'"></readmeter-home>
+      <repair-send v-if="componentName === 'repair-send'"></repair-send>
+    </div>
+  </div>
+</template>
+
+<script scoped>
+  import Vue from 'vue'
+  import  * as Util from '../Util'
+  export default {
+    title: '底部导航',
+    data () {
+      return {
+        componentName: 'repair-first',
+        tabs: Util.f.functions,
+        text: '导航组件this',
+        fullpage: false,
+        loginInfo: {}
+      }
+    },
+    ready () {
+      this.loginInfo = Object.assign({}, this.loginInfo, Vue.user)
+      console.log(this.loginInfo, 'loginINfo')
+      // this.$refs.route.init('repair-first')
+    },
+    methods: {
+      // 选择tab
+      tabSelect (name) {
+        this.componentName = name
+        // this.$refs.route.init(name)
+        if (name !== 'text-chat-pane') {
+          this.notified('false')
+        } else {
+          this.notified('true')
+        }
+      },
+      notified (stopped) {
+        console.log('txtServiceStopped invoked$')
+        if (this.$androidUtil.isAndroid) {
+          HostApp.setPreference('txtServiceStopped', stopped)
+          HostApp.setPreference('msgCount', '0')
+        }
+      },
+      mute () {
+        if(navigator.userAgent.match('iPad') || navigator.userAgent.match('iPhone')){
+          window.prompt("mute","")
+        }else{
+          HostApp.mute()
+        }
+      },
+      getImg (param) {
+        return require(`../assets/${param}.png`)
+      }
+    },
+    events: {
+      showFullPage () {
+        this.fullpage = true
+      },
+      hideFullPage () {
+        this.fullpage = false
+      }
+    }
+  }
+</script>
+<style lang="less">
+  .tab-befor-img  {
+    margin: 3px 0;
+    content: '';
+    background-size: 30px;
+    display: inline-block;
+    margin-right: 8px;
+    height: 30px;
+    width: 100%;
+    vertical-align: -35%;
+  }
+  img[src=""],img:not([src]){
+    opacity: 0;
+    border:none;
+    visibility: hidden;
+    max-width: none;
+  }
+  /* .repair-mute-class {
+     &::before {
+       .tab-befor-img("../assets/guanbishengyin.png")
+     }
+   }*/
+  .menu-hide {
+    display: none;
+  }
+</style>