Merge branch 'dev_video_fix'

pages/user/bindtel/index.js

@@ -110,6 +110,23 @@ Page({
           sendFlag: false,
           codeId: res.data.id
         })
+      }
+      else {
+          this.changeImgCode()
+          this.setData({
+            picCode: ""
+          })
+          wx.showModal({
+            content: res.msg,
+            showCancel: false,
+          })
+
+        // this.setData({
+        //   buttonText: "重新发送",
+        //   sendFlag: true
+        // })
+      }
+
       // 获取成功之后需要马上改变成倒计时
       let time = 59;
       var timer = setInterval(() => {
@@ -128,13 +145,6 @@ Page({
         })
         time--;
       }, 1000)
-      }
-      else {
-        this.setData({
-          buttonText: "重新发送",
-          sendFlag: true
-        })
-      }
       
     })
     // 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>