bug修复

496_dongfengqichen/pages/everyday/everyday.js

@@ -206,12 +206,17 @@ Page({
       if(res.code==200){
         this.data.picturlList[this.data.picturlCurrent]['awardState'] = -1;
         this.setData({
-          getReward:res.data
+          getReward:res.data,
+          picturlList: this.data.picturlList
         })
         if (res.data.needAddress != 0 && !this.data.isAddress){
           this.setData({
             tipWindow: 2
           })
+        } else if (res.data.needAddress == 0){
+          this.setData({
+            tipWindow: 1
+          })
         }
       }else{
         wx.showToast({
@@ -303,5 +308,10 @@ Page({
       })
       app.submitUserMsg(e.detail.userInfo.avatarUrl, e.detail.userInfo.nickName);
     }
+  },
+  closeWindow:function(){//
+    this.setData({
+      tipWindow:0
+    })
   }
 })

496_dongfengqichen/pages/everyday/everyday.wxml

@@ -60,7 +60,7 @@
   </view>
   <view class="mask" wx:if="{{maskShow}}">
     <view class="taskBox" wx:if="{{taskShow}}">
-      <text wx:if="{{!isSign}}" class="closeBtn" style="right:-35rpx;top:-50rpx;" bindtap="hiddenTask"></text>
+    <image wx:if="{{!isSign}}" class="gameRuleClose" bindtap="hiddenTask" style="top:-40rpx;right:-40rpx;" src="{{imgUrl+'/star/closebtn.png'}}"></image>
       <view class="title">今日任务</view>
       <view class="contentBox">
         <view class="name" wx:if="{{!isSign}}">{{taskName}}</view>

496_dongfengqichen/pages/myCenter/myCenter.wxss

@@ -319,15 +319,15 @@ view{
 }
 .ranksType1{
   color: #FE820C;
-  border: 1rpx solid #FE820C;
+  border: 2rpx solid #FE820C;
 }
 .ranksType2{
   color: black;
-  border: 1rpx solid #658DE9;
+  border: 2rpx solid #658DE9;
 }
 .ranksType3{
   color: black;
-  border: 1rpx solid black;
+  border: 2rpx solid black;
 }
 .userMsg{
   padding-top: 108rpx;
@@ -433,7 +433,7 @@ view{
   width: 100%;
 }
 .selectSiteGroup{
-  border: 1rpx solid #B4B4B4;
+  border: 2rpx solid #B4B4B4;
   margin: 0 auto;
   width:652rpx;
   height:65rpx;

496_dongfengqichen/pages/scout/register/register.js

@@ -24,6 +24,7 @@ Page({
     maskShow: false,
     mydata:[],//我的数据
     isbtn:true,//防重复点击
+    vCodeImg:null
   },
   /**
    * 切换车主非车主
@@ -281,7 +282,11 @@ Page({
           el: 'canvas',
           width: windowScale*205,
           height: windowScale*51,
-          createCodeImg: ""
+          createCodeImg: "",
+          callUrl:{
+            that:this,
+            obj:this.changeVode
+          }
         });
       }
     })
@@ -324,6 +329,11 @@ Page({
       }
     }, this);
   },
+  changeVode:function(e){
+    this.setData({
+      vCodeImg: e.tempFilePath
+    })
+  },
   /**
    * 刷新验证码
    */

496_dongfengqichen/pages/scout/register/register.wxml

@@ -12,13 +12,14 @@
         <input name="VIN" placeholder="请输入车牌号/VIN号" placeholder-style="font-size:23rpx;" />
         <input name="code" placeholder="请输入验证码" placeholder-style="font-size:23rpx;" style="padding-right:300rpx;" />
         <view class="VcodeBox">
-          <view class="VcodeGroup">
-          <canvas class="canvasSty" canvas-id="canvas" bindtap="vCodeRefresh"></canvas>
-          </view>
+          <!-- <view class="VcodeGroup"> -->
+          <image bindtap="vCodeRefresh" class="VcodeImg" src="{{vCodeImg}}"></image>
+          <canvas class="canvasSty" canvas-id="canvas"></canvas>
+          <!-- </view> -->
         </view>
         <view class="tipTxt">VIN示意图</view>
         <image class="license" src="{{imgUrl+'/star/scout/register/card.png'}}"></image>
-        <button class="submitBtn" style="padding:0;" formType="submit">提交</button>
+        <button class="submitBtn" style="padding:0;margin:20rpx auto 0;min-height:0;" formType="submit">提交</button>
         <view class="reminder">温馨提示：您填写的信息将同步至东风启辰服务号，以便改善我们的产品，更好的为您提供优质的服务。</view>
       </view>
     </form>

496_dongfengqichen/pages/scout/register/register.wxss

@@ -33,6 +33,8 @@
 }
 .Vehicle{
   position: relative;
+  width: 100%;
+  height: 100%;
 }
 .Vehicle>input{
   width: 675rpx;
@@ -66,6 +68,7 @@
 .Vehicle>.submitBtn{
   width: 675rpx;
   height: 70rpx;
+  line-height: 70rpx;
   background-color: #2a558d;
   color: #ffffff;
   font-size: 28rpx;
@@ -258,7 +261,15 @@ image.arrowDown{
   width:205rpx;
   height:51rpx;
   position:absolute;
-  left:0;top:0;
-  text-align: center;
+  left:2000px;
+  top:0;
   z-index:9999;
+  opacity: 0;
+}
+.VcodeImg{
+  width:205rpx;
+  height:51rpx;
+  position:absolute;
+  left:0;
+  top:0;
 }

496_dongfengqichen/utils/mcaptcha.js

@@ -48,7 +48,22 @@ module.exports = class Mcaptcha {
       this.ctx.arc(this.randomNum(0, this.options.width), this.randomNum(0, this.options.height), 1, 0, 2 * Math.PI);
       this.ctx.fill();
     }
-    this.ctx.draw();
+    this.ctx.draw(false, setTimeout(() => {
+      // this.ctx.vCodeImg
+      wx.canvasToTempFilePath({
+        width: this.options.width,
+        height: this.options.height,
+        canvasId: this.options.el,
+        success: res => {
+          var callUrl = this.options.callUrl;
+          if (callUrl) {
+            if (callUrl.that && callUrl.obj) {
+              callUrl['obj'].call(callUrl.that,res);
+            }
+          }
+        }
+      })
+    }),200);
   }
   validate(code) {
     var code = code.toLowerCase();