Merge branch 'dev_video_fix'

pages/user/bindtel/index.js

@@ -110,31 +110,41 @@ Page({
           sendFlag: false,
           codeId: res.data.id
         })
-        // 获取成功之后需要马上改变成倒计时
+      }
-        let time = 59;
+      else {
-        var timer = setInterval(() => {
+          this.changeImgCode()
-          // 倒计时结束需要重置可发送验证码状态和按钮文字
-          if (time < 0) {
-            // 清除定时器
-            clearInterval(timer)
-            this.setData({
-              buttonText: "重新发送",
-              sendFlag: true
-            })
-            return false;
-          }
           this.setData({
-            buttonText: time + "秒后重新发送"
+            picCode: ""
+          })
+          wx.showModal({
+            content: res.msg,
+            showCancel: false,
           })
-          time--;
+
-        }, 1000)
+        // this.setData({
+        //   buttonText: "重新发送",
+        //   sendFlag: true
+        // })
       }
-      else {
+
+      // 获取成功之后需要马上改变成倒计时
+      let time = 59;
+      var timer = setInterval(() => {
+        // 倒计时结束需要重置可发送验证码状态和按钮文字
+        if (time < 0) {
+          // 清除定时器
+          clearInterval(timer)
+          this.setData({
+            buttonText: "重新发送",
+            sendFlag: true
+          })
+          return false;
+        }
         this.setData({
-          buttonText: "重新发送",
+          buttonText: time + "秒后重新发送"
-          sendFlag: true
         })
-      }
+        time--;
+      }, 1000)
       
     })
     // wx.navigateToMiniProgram({

pages/user/bindtel/index.wxml

@@ -8,7 +8,7 @@
     </view>
     <view class="bind-item" wx:if="{{imgCodeInfo}}">
       <view class="bind-item-left">图形验证码</view>
-      <input type="number" bindinput="picCodeInput" class="weui-input" placeholder="请输入图形验证码" />
+      <input type="number" value="{{picCode}}" bindinput="picCodeInput" class="weui-input" placeholder="请输入图形验证码" />
       <image lazy-load bindtap="changeImgCode" class="code-img" src="{{imgCodeInfo.code}}" mode="aspectFill"></image>
       <!-- <input bindinput="telInput" class="weui-input" auto-focus placeholder="请输入手机号" /> -->
     </view>