简柏林 / thingskit-app · Commits

Commit c7b6f13e5c49b798389ed38cb37564b8bc6b1b60

Authored by 黄 x
2 parents fbdfab01 40c23685

Merge remote-tracking branch 'origin/sqy_dev' 

# Conflicts:
#	publicLoginSubPage/other/code.vue
#	publicLoginSubPage/other/findPassword.vue
#	publicLoginSubPage/other/static/code.scss
#	publicLoginSubPage/public/login.vue
Inline Side-by-side
Showing 7 changed files with 101 additions and 109 deletions
... ... @@ -88,12 +88,12 @@ export default {
88 88 {
89 89 checked: false,
90 90 name: '成功',
91   - type: 'success'
  91 + type: 'SUCCESSFUL'
92 92 },
93 93 {
94 94 checked: false,
95 95 name: '失败',
96   - type: 'fail'
  96 + type: 'FAILED'
97 97 }
98 98 ],
99 99 downOption: {
... ... @@ -181,9 +181,10 @@ export default {
181 181 },
182 182 confirmFilter() {
183 183 const issueStatus = this.issueStatus.find(item => item.checked);
  184 + console.log('--------',this.tbDeviceId)
184 185 this.loadData(1, {
185 186 status: issueStatus.type ? issueStatus.type : undefined,
186   - deviceId: this.deviceId
  187 + tbDeviceId: this.tbDeviceId
187 188 });
188 189 this.show = false;
189 190 },
... ...
... ... @@ -9,19 +9,14 @@
9 9 <view class="circleStyle"></view>
10 10 </view>
11 11 <view class="form-row">
12   - <input class="input" type="number" v-model="phone" placeholder="请输入手机号码"
13   - placeholder-style="font-weight:normal;color:#bbbbbb;"></input>
  12 + <u-input v-model="phone" type="number" placeholder="请输入手机号码" border="bottom"></u-input>
14 13 </view>
15 14 <view class="form-row">
16   - <input class="input" type="number" v-model="vCode" placeholder="请输入验证码"
17   - placeholder-style="font-weight:normal;color:#bbbbbb;"></input>
18   - <view class="getvcode" :class="{forhidden:readonly}" @click="getVcode">{{ codeText }}</view>
19   - </view>
20   - <button class="submit" size="default" @click="onSubmit">
21   - <text class="text">登录</text>
22   - </button>
23   - <view class="u-flex account-style">
24   - <view class="content" @click="openAccountFunc">账号密码登录</view>
  15 + <u-input type="number" v-model="vCode" placeholder="请输入验证码" border="bottom">
  16 + <template slot="suffix" @click="getVcode">
  17 + <view class="getvcode" >{{ codeText }}</view>
  18 + </template>
  19 + </u-input>
25 20 </view>
26 21 <view class="circleStyleBottom"></view>
27 22 </view>
... ...
... ... @@ -7,99 +7,98 @@
7 7 </view>
8 8 <view v-if="!nextStatus" style="margin-top: 40rpx;" class="f__login">
9 9 <view class="loginPhone">
10   - <view class="form-row">
11   - <input class="input" type="number" v-model="phone" placeholder="请输入手机号码"
12   - placeholder-style="font-weight:normal"></input>
13   - </view>
  10 + <view class="form-row"><u-input v-model="phone" type="number" placeholder="请输入手机号码" border="bottom"></u-input></view>
14 11 <view style="height: 25rpx;"></view>
15 12 <view class="form-row">
16   - <input class="input" type="number" v-model="vCode" placeholder="请输入短信验证码"
17   - placeholder-style="font-weight:normal"></input>
18   - <view class="getvcode" :class="{forhidden:readonly}" @click="getVcode">{{ codeText }}</view>
  13 + <u-input type="number" v-model="vCode" placeholder="请输入短信验证码" border="bottom">
  14 + <template slot="suffix" @click="getVcode">
  15 + <view class="getvcode">{{ codeText }}</view>
  16 + </template>
  17 + </u-input>
19 18 </view>
20   - <button class="submit" size="default" @click="onNextSubmit">
21   - <text style="color:#fff">下一步</text>
22   - </button>
  19 + <button class="submit" size="default" @click="onNextSubmit"><text style="color:#fff">下一步</text></button>
23 20 </view>
24 21 </view>
25 22 <view v-else style="margin-top: 40rpx;" class="f__login">
26 23 <view class="loginPhone">
27   - <view style="margin-top:50rpx" class="form-row u-flex">
28   - <view class="v-input"><input type="text" v-model="password" maxlength="32" placeholder="请设置6-20位新的登录密码" :password="!showPasswordF" /></view>
29   - <view class="v-password"><u-icon size="25" @click="showPasswordModeF" :name="showPasswordF ? 'eye-fill' : 'eye-off'"></u-icon></view>
30   - <u-icon></u-icon>
  24 + <view class="form-row u-flex">
  25 + <u-input v-model="password" :password="showPasswordF" placeholder="请设置6-20位新的登录密码" border="bottom">
  26 + <template slot="suffix" @click="showPasswordModeF">
  27 + <view style="padding:20rpx"><u-icon :name="showPasswordF ? '/static/eye-hide.png' : '/static/eye.png'"></u-icon></view>
  28 + </template>
  29 + </u-input>
31 30 </view>
32   - <view style="margin-top:70rpx" class="form-row u-flex">
33   - <view class="v-input"><input type="text" v-model="rePassword" maxlength="32" placeholder="请再次输入新的登录密码" :password="!showPasswordS" /></view>
34   - <view class="v-password"><u-icon size="25" @click="showPasswordModeS" :name="showPasswordS ? 'eye-fill' : 'eye-off'"></u-icon></view>
35   - <u-icon></u-icon>
  31 + <view class="form-row u-flex">
  32 + <u-input v-model="rePassword" :password="showPasswordS" placeholder="请再次输入新的登录密码" border="bottom">
  33 + <template slot="suffix" @click="showPasswordModeS">
  34 + <view style="padding:20rpx"><u-icon :name="showPasswordS ? '/static/eye-hide.png' : '/static/eye.png'"></u-icon></view>
  35 + </template>
  36 + </u-input>
36 37 </view>
37   - <button class="submit" size="default" @click="onSubmit">
38   - <text style="color:#fff">确定</text>
39   - </button>
  38 + <button class="submit" size="default" @click="onSubmit"><text style="color:#fff">确定</text></button>
40 39 </view>
41 40 </view>
42 41 </view>
43 42 </template>
44 43
45 44 <script>
46   - var clear;
47   - export default {
48   - data() {
49   - return {
50   - readonly: false,
51   - codeText: '发送验证码',
52   - phone: '', //号码
53   - vCode: '', //验证码
54   - nextStatus: false,
55   - password:'',
56   - rePassword:'',
57   - showPasswordF: false,
58   - showPasswordS: false,
59   - }
60   - },
61   - methods: {
62   - //验证码按钮文字状态
63   - getCodeState() {
64   - const _this = this;
65   - this.readonly = true;
66   - this.codeText = '60S后重新获取';
67   - var s = 60;
68   - clear = setInterval(() => {
69   - s--;
70   - _this.codeText = s + 'S后重新获取';
71   - if (s <= 0) {
72   - clearInterval(clear);
73   - _this.codeText = '发送验证码';
74   - _this.readonly = false;
75   - }
76   - }, 1000);
77   - },
78   - //获取验证码
79   - getVcode() {
80   - if (this.readonly) {
81   - uni.showToast({
82   - title: '验证码已发送~',
83   - icon: 'none'
84   - });
85   - return;
86   - }
87   - if (this.phone == '') {
88   - uni.showToast({
89   - title: '请输入手机号~',
90   - icon: 'none'
91   - });
92   - return;
93   - }
94   - const phoneRegular = /^1\d{10}$/;
95   - if (!phoneRegular.test(this.phone)) {
96   - uni.showToast({
97   - title: '手机号格式不正确~',
98   - icon: 'none'
99   - });
100   - return;
  45 +var clear;
  46 +export default {
  47 + data() {
  48 + return {
  49 + readonly: false,
  50 + codeText: '发送验证码',
  51 + phone: '', //号码
  52 + vCode: '', //验证码
  53 + nextStatus: false,
  54 + password: '',
  55 + rePassword: '',
  56 + showPasswordF: true,
  57 + showPasswordS: true
  58 + };
  59 + },
  60 + methods: {
  61 + //验证码按钮文字状态
  62 + getCodeState() {
  63 + const _this = this;
  64 + this.readonly = true;
  65 + this.codeText = '60s后重新获取';
  66 + var s = 60;
  67 + clear = setInterval(() => {
  68 + s--;
  69 + _this.codeText = s + 's后重新获取';
  70 + if (s <= 0) {
  71 + clearInterval(clear);
  72 + _this.codeText = '发送验证码';
  73 + _this.readonly = false;
101 74 }
102   - let httpData = {}
  75 + }, 1000);
  76 + },
  77 + //获取验证码
  78 + getVcode() {
  79 + if (this.readonly) {
  80 + uni.showToast({
  81 + title: '验证码已发送~',
  82 + icon: 'none'
  83 + });
  84 + return;
  85 + }
  86 + if (this.phone == '') {
  87 + uni.showToast({
  88 + title: '请输入手机号~',
  89 + icon: 'none'
  90 + });
  91 + return;
  92 + }
  93 + const phoneRegular = /^1\d{10}$/;
  94 + if (!phoneRegular.test(this.phone)) {
  95 + uni.showToast({
  96 + title: '手机号格式不正确~',
  97 + icon: 'none'
  98 + });
  99 + return;
  100 + }
  101 + let httpData = {};
103 102 // 获取验证码接口
104 103 uni.$u.http.post(`/yt/noauth/resetCode/${this.phone}` ).then(res => {
105 104 this.getCodeState(); //开始倒计时
... ... @@ -166,7 +165,7 @@
166 165 icon: 'none'
167 166 }).then(res=>{
168 167 uni.reLaunch({
169   - url: '/publicLoginSubPage/public/login'
  168 + url: '/pages/personal/personal'
170 169 });
171 170 /**
172 171 * 有些时候不起作用
... ...
... ... @@ -24,7 +24,7 @@
24 24 }
25 25 .form-row {
26 26 position: relative;
27   - border-bottom: 1rpx solid #e8e8e8;
  27 + // border-bottom: 1rpx solid #e8e8e8;
28 28 margin-top: 30rpx;
29 29 .input {
30 30 font-size: 34rpx;
... ... @@ -36,6 +36,7 @@
36 36 padding: 0;
37 37 font-weight: bold;
38 38 }
  39 +
39 40 .getvcode {
40 41 font-family: PingFangSC-Regular, PingFang SC;
41 42 font-weight: 400;
... ... @@ -51,11 +52,9 @@
51 52 transform: translateY(-50%);
52 53 right: 0;
53 54 z-index: 11;
54   -
55   - &.forhidden {
56   - }
57 55 }
58 56 }
  57 +
59 58 .submit {
60 59 margin-top: 60rpx;
61 60 width: 100%;
... ...
... ... @@ -25,7 +25,6 @@
25 25 .loginPhone {
26 26 .form-row {
27 27 position: relative;
28   - border-bottom: 1px solid #e5e5e5;
29 28 justify-content: space-between;
30 29 .v-input {
31 30 width: 620rpx;
... ...
... ... @@ -9,19 +9,17 @@
9 9 <view class="hello-welcome login-text-muted">欢迎来到ThingsKit!</view>
10 10 </view>
11 11 </view>
  12 +
12 13 <view class="f__login">
13 14 <view class="loginPhone">
14   - <view class="form-row u-flex">
15   - <view class="v-input"><input type="text" v-model="loginForm.username" maxlength="32" placeholder="请输入登录账号" /></view>
16   - <u-icon></u-icon>
17   - </view>
18   - <view class="form-row u-flex">
19   - <view class="v-input"><input type="text" v-model="loginForm.password" maxlength="32" placeholder="请输入登录密码" :password="!showPassword" /></view>
20   - <view class="v-password" style="padding: 30rpx" @click="showPasswordMode">
21   - <u-icon color="#9a9a9a" :name="showPassword ? '/static/eye.png' : '/static/eye-hide.png'"></u-icon>
22   - </view>
  15 + <view class="form-row u-flex"><u-input v-model="loginForm.username" type="text" placeholder="请输入登录账号" border="bottom" /></view>
23 16
24   - <u-icon></u-icon>
  17 + <view class="form-row u-flex">
  18 + <u-input v-model="loginForm.password" :password="showPassword" placeholder="请输入登录密码" border="bottom">
  19 + <template slot="suffix" @click="showPasswordMode">
  20 + <view style="padding:20rpx"><u-icon :name="showPassword ? '/static/eye-hide.png' : '/static/eye.png'"></u-icon></view>
  21 + </template>
  22 + </u-input>
25 23 </view>
26 24
27 25 <button class="submit" size="default" @click="onSubmitFunc"><text class="text">登录</text></button>
... ... @@ -212,7 +210,8 @@ export default {
212 210
213 211 token: true, //token用于判断是否登录
214 212
215   - isThirdLogin: false
  213 + isThirdLogin: false,
  214 + isThirdLoginAndNoDind:false
216 215 };
217 216
218 217 if (userInfo.token) {
... ...
... ... @@ -38,7 +38,7 @@
38 38 .form-row {
39 39 position: relative;
40 40 justify-content: space-between;
41   - margin-top: 60rpx;
  41 + // margin-top: 60rpx;
42 42 .v-input {
43 43 width: 690rpx;
44 44 border-bottom: 1px solid #e5e5e5;
... ...