fix: resolve eslint err

rongcloud · Mar 28, 2019 · def32d9 · def32d9
1 parent da0e82c
commit def32d9
Show file tree

Hide file tree

Showing 7 changed files with 338 additions and 49 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -21,7 +21,7 @@ module.exports = {
     "no-multi-spaces": ["error", { "ignoreEOLComments": true }],
     "no-underscore-dangle": "warn",
     "no-control-regex": "warn",
-    "no-use-before-define": "error",
+    "no-use-before-define": "warn",
     "no-restricted-globals": "warn",
     "indent": ["error", 2],
     "max-nested-callbacks": ["error", { "max": 3 }],

diff --git a/src/config.js b/src/config.js
@@ -4,6 +4,8 @@
 
   win.RongSeal.Config = {
     TOKEN_URL: 'https://apiqa.rongcloud.net/user/get_token_new',
+    GET_SMS_CODE_URL: 'http://10.12.8.105:8585/user/send_code_yp',
+    VERIFY_SMS_CODE_URL: 'http://10.12.8.105:8585/user/verify_code_yp_t',
     DOWNLOAD_SHARE_PLUGIN_URL: 'plugin/screenshare-addon.zip',
     APP_ID: 'c9kqb3rdkbb8j',
     NAVI: 'navqa.cn.ronghub.com'

diff --git a/src/css/main.css b/src/css/main.css
@@ -17,6 +17,14 @@ ul, li {
   list-style: none;
 }
 
+input::-webkit-outer-spin-button,
+input::-webkit-inner-spin-button {
+    -webkit-appearance: none;
+}
+input[type="number"]{
+    -moz-appearance: textfield;
+}
+
 .rong-wrap {
   position: absolute;
   top: 0;
@@ -223,7 +231,71 @@ ul, li {
   margin: 3px 45px 3px 5px;
   vertical-align: middle;
 }
+.rong-login .rong-login-roomjoin {
+  display: none;
+}
+.rong-login-telverify .rong-login-sms-tip {
+  color: #fff;
+  font-size: 15px;
+  margin-bottom: -20px;
+}
+.rong-login-telverify .rong-login-telNum  {
+  display: block;
+  margin: 40px 0;
+  padding: 10px 20px;
+  width: 100%;
+  height: 48px;
+  border: 1px #DDDDDD solid;
+  border-radius: 40px;
+  background-color: white;
+  text-align: left;
+  font-size: 15px;
+  color: #777;
+  box-sizing: border-box;
+}
+.rong-login-telverify .rong-login-verifyCode {
+  display: block;
+  float:left;
+  padding: 10px 20px;
+  width: 60%;
+  height: 48px;
+  border: 1px #DDDDDD solid;
+  border-radius: 40px;
+  background-color: white;
+  text-align: left;
+  font-size: 15px;
+  color: #777;
+  box-sizing: border-box;
+}
 
+.rong-login-telverify .rong-login-verifyBtn {
+  float: right;
+  width: 33%;
+  height: 50px;
+  border-radius: 40px;
+  border: 1px #475163 solid;
+  background: #475163;
+  font-size: 15px;
+  color: #FFFFFF;
+  cursor: pointer;
+}
+.rong-login-telverify .rong-btn-verifyLogin {
+  float: left;
+  width: 100%;
+  height: 50px;
+  margin: 30px 0;
+  border-radius: 40px;
+  border: 1px #28d6f6 solid;
+  background: #28d6f6;
+  font-size: 15px;
+  color: #FFFFFF;
+  cursor: pointer;
+}
+.rong-login-telverify .rong-login-verifyTips {
+  text-align: left;
+  padding-left: 20px;
+  color: red;
+}
 .rong-rtc {
   display: none;
   overflow: hidden;

diff --git a/src/index.html b/src/index.html
@@ -22,19 +22,31 @@
     <div class="rong-login-content">
       <img class="rong-login-logo" src="./css/img/logo.png">
       <h3 class="rong-login-title">SealRTC v2.0.0</h3>
-      <input id="roomId" class="rong-login-input" type="text" lang-placeholder="roomId">
-      <input id="userId" class="rong-login-input" type="text" lang-placeholder="userId">
-      <div class="rong-opt-stream">
-        <div class="rong-opt-checkbox">
-          <input type="checkbox" id="isCloseVideo" name="isCloseVideo"><label for="isCloseVideo"></label><span lang-textContent="closeVideo"></span>
+      <div class="rong-login-roomjoin">
+        <input id="roomId" class="rong-login-input" type="text" lang-placeholder="roomId">
+        <input id="userId" class="rong-login-input" type="text" lang-placeholder="userId">
+        <div class="rong-opt-stream">
+          <div class="rong-opt-checkbox">
+            <input type="checkbox" id="isCloseVideo" name="isCloseVideo"><label for="isCloseVideo"></label><span lang-textContent="closeVideo"></span>
+          </div>
+          <!-- <div class="rong-opt-checkbox">
+            <input type="checkbox" id="isCloseAudio" name="isCloseAudio"><label for="isCloseAudio"></label><span lang-textContent="closeAudio"></span>
+          </div> -->
+        </div>
+        <input id="start" class="rong-btn-start" type="button" lang-value="startRTC">
+        <div class="rong-btn-loading">
+          <img src="./css/img/loading.gif"> 加载中...
         </div>
-        <!-- <div class="rong-opt-checkbox">
-          <input type="checkbox" id="isCloseAudio" name="isCloseAudio"><label for="isCloseAudio"></label><span lang-textContent="closeAudio"></span>
-        </div> -->
       </div>
-      <input id="start" class="rong-btn-start" type="button" lang-value="startRTC">
-      <div class="rong-btn-loading">
-        <img src="./css/img/loading.gif"> 加载中...
+      <div class="rong-login-telverify">
+        <p class="rong-login-sms-tip" lang-textContent="phoneTips"></p>
+        <input id="telNumber" class="rong-login-telNum" type="text" lang-placeholder="phoneNumber">
+        <div class="rong-login-codeline">
+          <input id="verifyCode" class="rong-login-verifyCode" type="number" lang-placeholder="verifyCode">
+          <input id="verifyCodeBtn" class="rong-login-verifyBtn" type="button" lang-value="sendVerifyCode">
+        </div>
+        <!-- <p class="rong-login-verifyTips">tips</p> -->
+        <input id="verifyLogin" class="rong-btn-verifyLogin" type="button" lang-value="verifyLogin">
       </div>
     </div>
     <div class="rong-opt-resolution">

diff --git a/src/js/locale/zh.js b/src/js/locale/zh.js
@@ -13,6 +13,10 @@
       userIdEmpty: '用户 ID 不能为空',
       roomIdIllegal: '会议室 ID 只能包含大小写字母、阿拉伯数字、+、=、-、_ 且长度不能超过 64 个字符',
       networkError: '网络已断开',
+      phoneNumberErr: '手机号格式非法',
+      verifyCodeErr: '请输入手机验证码',
+      verifyCodeIncorrect: '验证码错误',
+      verifyCodeExpired: '验证码过期',
 
       getTokenError: '获取 token 失败',
       rtcError: '初始化 RTC 失败',
@@ -33,7 +37,9 @@
     },
     placeholder: {
       roomId: '请输入会议室 ID',
-      userId: '请输入用户 ID'
+      userId: '请输入用户 ID',
+      phoneNumber: '手机号',
+      verifyCode: '手机验证码'
     },
     textContent: {
       closeVideo: '加入时关闭摄像头',
@@ -43,12 +49,15 @@
       screenshareBusy: '正在分享屏幕',
       videoClosed: '摄像头已关闭',
       otherVideoClosed: '对方已关闭摄像头',
-      alertTitle: '提示'
+      alertTitle: '提示',
+      phoneTips: '请输入手机号验证登录，目前只支持中国区',
     },
     value: {
       startRTC: '开始会议',
       cancel: '取消',
-      conform: '确定'
+      conform: '确定',
+      sendVerifyCode: '发送验证码',
+      verifyLogin: '验证登录'
     },
     title: {
       hangup: '挂断',