bug修复，功能优化

496_dongfengqichen/pages/address/address.wxss

@@ -28,7 +28,7 @@ view{
   position: relative;
   width:697rpx;
   min-height:62rpx;
-  border: 1rpx solid #B1B1B1;
+  border: 2rpx solid #B1B1B1;
   border-radius: 15rpx;
   display: flex;
   align-items: center;

496_dongfengqichen/pages/coupon/coupon.js

@@ -9,6 +9,7 @@ Page({
     imgUrl: app.globalData.urlStatic,//图片路径
     friendOpenid:null,//朋友的openid
     countNum:0,
+    pageShow:false,//是否显示页面
   },
 
   /**
@@ -18,6 +19,8 @@ Page({
     app.globalData.nowPage = 2;
     if (options.friendOpenid) {
       this.data.friendOpenid = options.friendOpenid;
+      wx.setStorageSync("friendOpenid", options.friendOpenid);
+      app.globalData.friendOpenid = options.friendOpenid;
     }
     if (app.globalData.openid) {
       this.getOrderInfo();
@@ -87,9 +90,10 @@ Page({
             url: '/pages/index/index',
           })
         }else{
+          this.setData({
+            pageShow:true
+          })
           this.getTotalOrder();
-          wx.setStorageSync("friendOpenid", this.data.friendOpenid);
-          app.globalData.friendOpenid = this.data.friendOpenid;
         }
       }
     },this)

496_dongfengqichen/pages/coupon/coupon.wxml

@@ -1,5 +1,5 @@
 <!--pages/coupon/coupon.wxml-->
-<view class="all">
+<view class="all" wx:if="{{pageShow}}">
   <view class="main">
     <image class="couponBg" src="{{imgUrl+'/images/couponBg.png'}}"></image>
     <view class="prizeFrame">

496_dongfengqichen/pages/everyday/everyday.js

@@ -22,7 +22,8 @@ Page({
     isAddress:false,//是否有地址
     getReward:null,
     tipWindow:0,
-    hiddenFriendFrame:false,
+    hiddenFriendFrame: false,
+    userData: null,
   },
   /**
    * 关闭任务窗
@@ -39,6 +40,7 @@ Page({
   signIn() {
     app.wxRequest(app.globalData.urlRoot +"task/signToday",{},res=>{
       if (res.code == 200) {
+        this.getTaskProgress();
         this.getShareId();
         this.setData({
           maskShow: false,
@@ -89,6 +91,11 @@ Page({
    */
   onLoad: function (options) {
     app.globalData.nowPage = 2;
+    if (app.globalData.userInfoData) {
+      this.setData({
+        userData: app.globalData.userInfoData
+      })
+    }
     if (options.shareId) {
       this.data.isFriendShare = options.shareId;
     }
@@ -195,23 +202,16 @@ Page({
     }, this);
   },
   getTaskAward:function(){//领取购车券
-    wx.wxRequest(app.globalData.urlRoot + "task/getTaskAward", { awardGiveId: this.data.picturlList[this.data.picturlCurrent]['awardGiveId']},res=>{
+    app.wxRequest(app.globalData.urlRoot + "award/getTaskAward", { awardGiveId: this.data.picturlList[this.data.picturlCurrent]['awardGiveId']},res=>{
       if(res.code==200){
+        this.data.picturlList[this.data.picturlCurrent]['awardState'] = -1;
         this.setData({
           getReward:res.data
         })
-        if (res.data.needAddress && this.data.isAddress) {
-          this.setData({
-            tipWindow:2
-          })
-        } else if (res.data.needAddress==0){
+        if (res.data.needAddress != 0 && !this.data.isAddress){
           this.setData({
             tipWindow: 2
           })
-        } else if (res.data.needAddress && !this.data.isAddress){
-          this.setData({
-            tipWindow: 1
-          })
         }
       }else{
         wx.showToast({
@@ -221,11 +221,6 @@ Page({
       }
     },this);
   },
-  receive:function(){
-    wx.redirectTo({
-      url: '/pages/myCenter/myCenter'
-    })
-  },
   userRegister: function () {
     wx.navigateTo({
       url: '/pages/address/address',
@@ -300,5 +295,13 @@ Page({
     this.setData({
       hiddenFriendFrame:false
     })
+  },
+  getUserWxMsg: function (e) {
+    if (e.detail.errMsg == "getUserInfo:ok") {
+      this.setData({
+        userData: e.detail.userInfo
+      })
+      app.submitUserMsg(e.detail.userInfo.avatarUrl, e.detail.userInfo.nickName);
+    }
   }
 })

496_dongfengqichen/pages/everyday/everyday.wxml

@@ -66,7 +66,9 @@
         <view class="name" wx:if="{{!isSign}}">{{taskName}}</view>
         <image class="taskImg" src="{{taskImgUrl}}" wx:if="{{!isSign}}"></image>
         <view class="signBtnGroup">
-          <view class="btn" wx:if="{{isSign}}" bindtap="signIn">签到解锁</view>
+          <view class="btn" wx:if="{{isSign}}" bindtap="signIn">签到解锁
+          <button wx:if="{{!userData}}" class="getUserMsgBtn" open-type="getUserInfo" lang="zh_CN" bindgetuserinfo="getUserWxMsg" style="width:100%;height:100%;min-height:0;"></button>
+          </view>
         </view>
         <view class="btn" wx:if="{{!isSign}}">分享再获取一张碎片
           <button open-type="share" class="shareBtn" style="width:100%;height:100%;margin:0;padding:0;min-height:0;"></button>
@@ -84,21 +86,21 @@
 </view>
 <view class="successPop" wx:if="{{tipWindow}}">
   <view class="successGroup">
-    <image class="gameRuleClose2" bindtap="closeWindow" style="top:-31rpx;right:-29rpx;" src="{{imgUrl+'/images/gameRuleClose.png'}}"></image>
+    <image class="gameRuleClose" bindtap="closeWindow" style="top:-31rpx;right:-29rpx;" src="{{imgUrl+'/star/closebtn.png'}}"></image>
     <image class="successIcon" src="{{imgUrl+'/images/successIcon.png'}}"></image>
     <view class="titleGroup"></view>
     <view class="successTip">幸运满格，大奖到手</view>
     <image class="prizePic" src="{{getReward.awardPicUrl}}" mode="aspectFit"></image>
     <view class="prizeName">{{getReward.awardName}}</view>
-    <view class="startRegister" wx:if="{{tipWindow==1}}" bindtap="receive">立即领取</view>
-    <view class="startRegister" wx:if="{{tipWindow==2}}" bindtap="userRegister">立即注册</view>
+    <!-- <view class="startRegister" wx:if="{{tipWindow==1}}" bindtap="receive">立即领取</view> -->
+    <view class="startRegister" wx:if="{{tipWindow==2}}" bindtap="userRegister">立即领取</view>
   </view>
 </view>
 <view class="successPop" wx:if="{{hiddenFriendFrame}}">
   <view class="friendTip">
     <text class="closeBtn" style="right:-40rpx;top:-40rpx;" bindtap="hiddenFriendTip"></text>
     <view class="friendTipTitle">恭喜您</view>
-    <view class="tipText">您已经成功为 {{useShareData.nickName}} 获得了</view>
+    <view class="tipText">您已经成功为 {{useShareData.nickName?useShareData.nickName:""}} 获得了</view>
     <view class="tipText">一片{{useShareData.taskName}}碎片</view>
     <view class="tipText">集齐4片即可获得一份</view>
     <view class="tipText">启辰星购车红包</view>

496_dongfengqichen/pages/everyday/everyday.wxss

@@ -142,7 +142,7 @@
   height: 100%;
   line-height: 49rpx;
   text-align: center;
-  border: 1rpx solid #345489;
+  border: 2rpx solid #345489;
   box-sizing: border-box;
   font-size: 21rpx;
   color: #333333;
@@ -482,4 +482,12 @@
   color:rgba(255,255,255,1);
   line-height: 63rpx;
   border-radius: 20rpx;
+}
+.getUserMsgBtn{
+  position: absolute;
+  top: 0;
+  left: 0;
+  padding: 0;
+  margin: 0;
+  opacity: 0;
 }

496_dongfengqichen/pages/luckyStar/luckyStar.wxml

@@ -35,7 +35,7 @@
     <view class="gameRuleDesc" wx:if="{{ruleShow}}">
       <view class="ruleGroup">
         <image class="gameRuleIcon" src="{{imgUrl+'/images/gameRuleDesc.png'}}"></image>
-        <image class="gameRuleClose" wx:if="{{ruleCloseShow}}" bindtap="closeRule" src="{{imgUrl+'/images/gameRuleClose.png'}}"></image>
+        <image class="gameRuleClose" wx:if="{{ruleCloseShow}}" bindtap="closeRule" src="{{imgUrl+'/star/closebtn.png'}}"></image>
         <view class="gameStrat" bindtap="gameStart">开始游戏<button wx:if="{{!userData}}" style="min-height:0;width: 277rpx;height: 50rpx;" bindgetuserinfo="getUserWxMsg" class="getUserMsgBtn" open-type="getUserInfo" lang="zh_CN"></button></view>
       </view>
     </view>
@@ -43,7 +43,7 @@
     </view>
     <view class="successPop" wx:if="{{pizeTip}}">
       <view class="successGroup" wx:if="{{pizeTip==1}}">
-        <image class="gameRuleClose" bindtap="closeWindow" style="top:-31rpx;right:-29rpx;" src="{{imgUrl+'/images/gameRuleClose.png'}}"></image>
+        <image class="gameRuleClose" bindtap="closeWindow" style="top:-31rpx;right:-29rpx;" src="{{imgUrl+'/star/closebtn.png'}}"></image>
         <image class="successIcon" src="{{imgUrl+'/images/successIcon.png'}}"></image>
         <view class="titleGroup"></view>
         <view class="successTip">幸运满格，大奖到手</view>
@@ -55,7 +55,7 @@
         <view class="startRegister" wx:if="{{(!isAddress && endGameData.needAddress!=0)}}" bindtap="userRegister">立即领取</view>
       </view>
       <view class="successGroup" wx:if="{{pizeTip==2 || pizeTip==3}}">
-        <image class="gameRuleClose" bindtap="closeWindow" style="top:-31rpx;right:-29rpx;" src="{{imgUrl+'/images/gameRuleClose.png'}}"></image>
+        <image class="gameRuleClose" bindtap="closeWindow" style="top:-31rpx;right:-29rpx;" src="{{imgUrl+'/star/closebtn.png'}}"></image>
         <image class="successIcon" src="{{imgUrl+'/images/failIcon.png'}}"></image>
         <view class="titleGroup"></view>
         <view class="failText" style="margin-top:113rpx;">运气就差一点点</view>

496_dongfengqichen/pages/luckyStar/luckyStar.wxss

@@ -66,10 +66,10 @@ view{
 }
 .gameRuleClose{
   position: absolute;
-  top: 0rpx;
+  top: -10rpx;
   right: -10rpx;
-  width: 31rpx;
-  height: 29rpx;
+  height: 40rpx;
+  width: 40rpx;
 }
 .gameStrat{
   width:277rpx;

496_dongfengqichen/pages/myCenter/myCenter.wxss

@@ -178,7 +178,7 @@ view{
   overflow: hidden;
 }
 .taskLine{
-  height:15rpx;
+  height:13rpx;
   width:0;
   background-color: #345486;
   border-radius: 20rpx;
@@ -424,7 +424,7 @@ view{
   display: flex;
   align-items: center;
   justify-content: space-between;
-  border: 1rpx solid #B4B4B4;
+  border: 2rpx solid #B4B4B4;
   position: relative;
   overflow: hidden;
 }

496_dongfengqichen/pages/poster/poster.js

@@ -9,7 +9,7 @@ Page({
     imgUrl: app.globalData.urlStatic,//图片路径
     canvasContron:null,//canvas
     posterBg:[],//海报背景
-    qrCodeUrl:"https://www.jiyou-tech.com/2020/496_qichen/static/images/testQrCode.png",//二维码图片
+    qrCodeUrl:"",//二维码图片
     userHead: app.globalData.userInfoData ? app.globalData.userInfoData.avatarUrl : null,//用户头像
     rankNum: '0000',//缓存数字
     windowScale:0,//屏幕缩放比

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

@@ -274,12 +274,17 @@ Page({
    * 生命周期函数--监听页面初次渲染完成
    */
   onReady: function() {
-    this.mcaptcha = new Mcaptcha({
-      el: 'canvas',
-      width: 80,
-      height: 35,
-      createCodeImg: ""
-    });
+    wx.getSystemInfo({
+      success: option => {
+        var windowScale = option.windowWidth / 750;
+        this.mcaptcha = new Mcaptcha({
+          el: 'canvas',
+          width: windowScale*205,
+          height: windowScale*51,
+          createCodeImg: ""
+        });
+      }
+    })
     app.wxRequest(app.globalData.urlRoot + "userInfo/getJobList", {}, res => {
       console.log(res)
       if (res.code == 200) {
@@ -331,7 +336,7 @@ Page({
    */
   onShow: function() {
     this.setData({isbtn: true})
-    this.getshow();
+    // this.getshow();
   },
   getshow(){
     app.wxRequest(app.globalData.urlRoot + "userInfo/getCertificationNoCarInfo", {}, res => {

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

@@ -12,11 +12,13 @@
         <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">
-          <canvas style="width:205rpx;height:51rpx;position:absolute;left:20rpx;bottom:0rpx;text-align: center;z-index:9999;" canvas-id="canvas" bindtap="vCodeRefresh"></canvas>
+          <view class="VcodeGroup">
+          <canvas class="canvasSty" canvas-id="canvas" bindtap="vCodeRefresh"></canvas>
+          </view>
         </view>
         <view class="tipTxt">VIN示意图</view>
         <image class="license" src="{{imgUrl+'/star/scout/register/card.png'}}"></image>
-        <button class="submitBtn" formType="submit">提交</button>
+        <button class="submitBtn" style="padding:0;" formType="submit">提交</button>
         <view class="reminder">温馨提示：您填写的信息将同步至东风启辰服务号，以便改善我们的产品，更好的为您提供优质的服务。</view>
       </view>
     </form>

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

@@ -1,8 +1,7 @@
 /* pages/scout/register/register.wxss */
 .registerContainer{
   width: 100%;
-  height: calc(100% - 168rpx);
-  margin-top: 168rpx;
+  /* height: calc(100% - 168rpx); */
   overflow-y: scroll;
 }
 .tabsBox{
@@ -12,6 +11,7 @@
   margin: 0 auto;
   border-radius: 10rpx;
   box-sizing: border-box;
+  margin-top: 168rpx;
 }
 .tabsBox>.item{
   width: 50%;
@@ -248,4 +248,17 @@ image.arrowDown{
 
 /* .closeBtn::before {
   content: "\2716";
-} */
+} */
+.VcodeGroup{
+  position: relative;
+  width: 100%;
+  height: 100%;
+}
+.canvasSty{
+  width:205rpx;
+  height:51rpx;
+  position:absolute;
+  left:0;top:0;
+  text-align: center;
+  z-index:9999;
+}

496_dongfengqichen/pages/scout/scout.js

@@ -85,6 +85,7 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+    app.globalData.nowPage = 2;
 
   },
 

496_dongfengqichen/pages/star/star.js

@@ -170,17 +170,12 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-    console.log(app.globalData.userMobile)
     if(app.globalData.userMobile==null){
       this.setData({phonebol: true})
     }else{
       this.setData({phonebol: false})
     }
     this.setData({isbtn: true})
-    
-    // wx.navigateTo({
-    //   url: '../scout/register/register'
-    // })
   },
 
   /**