bug修复

496_dongfengqichen/app.js

@@ -86,7 +86,8 @@ App({
     kvurlH:0,
     certificationInfo:false,
     getBuyState:null,
-    entered:false
+    entered:false,
+    authenticationStatus:null
   },
   // 获取openId
   getOpenid: function (code) {

496_dongfengqichen/pages/everyday/everyday.wxml

@@ -15,25 +15,25 @@
         <swiper-item>
           <view class="fragmentBox">
             <image class="fragmentComplete" src="{{item.fullPicUrl}}"></image>
-            <image class="fragmentComplete1" wx:if="{{item.childIdArr[0]}}" src="{{imgUrl+'/newImages/maskIcon1.png'}}"></image>
-            <image class="fragmentComplete2" wx:if="{{item.childIdArr[1]}}" src="{{imgUrl+'/newImages/maskIcon1.png'}}"></image>
-            <image class="fragmentComplete3" wx:if="{{item.childIdArr[2]}}" src="{{imgUrl+'/newImages/maskIcon1.png'}}"></image>
-            <image class="fragmentComplete4" wx:if="{{item.childIdArr[3]}}" src="{{imgUrl+'/newImages/maskIcon1.png'}}"></image>
+            <image class="fragmentComplete1" wx:if="{{!item.childIdArr[0]}}" src="{{imgUrl+'/newImages/maskIcon1.png'}}"></image>
+            <image class="fragmentComplete2" wx:if="{{!item.childIdArr[1]}}" src="{{imgUrl+'/newImages/maskIcon2.png'}}"></image>
+            <image class="fragmentComplete3" wx:if="{{!item.childIdArr[2]}}" src="{{imgUrl+'/newImages/maskIcon3.png'}}"></image>
+            <image class="fragmentComplete4" wx:if="{{!item.childIdArr[3]}}" src="{{imgUrl+'/newImages/maskIcon4.png'}}"></image>
             <view class="lockSty lock1">
-              <image wx:if="{{item.childIdArr[0]}}" class="lockIcon" src="{{imgUrl+'/newImages/lockIcon1.png'}}"></image>
-              <image wx:if="{{!item.childIdArr[0]}}" class="lockIcon" src="{{imgUrl+'/newImages/lockIcon2.png'}}"></image>
+              <image wx:if="{{item.childIdArr[0]}}" class="lockIcon" src="{{imgUrl+'/newImages/lockIcon2.png'}}"></image>
+              <image wx:if="{{!item.childIdArr[0]}}" class="lockIcon" src="{{imgUrl+'/newImages/lockIcon1.png'}}"></image>
             </view>
             <view class="lockSty lock2">
-              <image wx:if="{{item.childIdArr[1]}}" class="lockIcon" src="{{imgUrl+'/newImages/lockIcon1.png'}}"></image>
-              <image wx:if="{{!item.childIdArr[1]}}" class="lockIcon" src="{{imgUrl+'/newImages/lockIcon2.png'}}"></image>
+              <image wx:if="{{item.childIdArr[1]}}" class="lockIcon" src="{{imgUrl+'/newImages/lockIcon2.png'}}"></image>
+              <image wx:if="{{!item.childIdArr[1]}}" class="lockIcon" src="{{imgUrl+'/newImages/lockIcon1.png'}}"></image>
             </view>
             <view class="lockSty lock3">
-              <image wx:if="{{item.childIdArr[2]}}" class="lockIcon" src="{{imgUrl+'/newImages/lockIcon3.png'}}"></image>
-              <image wx:if="{{!item.childIdArr[2]}}" class="lockIcon" src="{{imgUrl+'/newImages/lockIcon4.png'}}"></image>
+              <image wx:if="{{item.childIdArr[2]}}" class="lockIcon" src="{{imgUrl+'/newImages/lockIcon4.png'}}"></image>
+              <image wx:if="{{!item.childIdArr[2]}}" class="lockIcon" src="{{imgUrl+'/newImages/lockIcon3.png'}}"></image>
             </view>
             <view class="lockSty lock4">
-              <image wx:if="{{item.childIdArr[3]}}" class="lockIcon" src="{{imgUrl+'/newImages/lockIcon3.png'}}"></image>
-              <image wx:if="{{!item.childIdArr[3]}}" class="lockIcon" src="{{imgUrl+'/newImages/lockIcon4.png'}}"></image>
+              <image wx:if="{{item.childIdArr[3]}}" class="lockIcon" src="{{imgUrl+'/newImages/lockIcon4.png'}}"></image>
+              <image wx:if="{{!item.childIdArr[3]}}" class="lockIcon" src="{{imgUrl+'/newImages/lockIcon3.png'}}"></image>
             </view>
           </view>
         </swiper-item>

496_dongfengqichen/pages/index/index.wxml

@@ -28,7 +28,7 @@
         <image class="indexBottom" src="{{imgUrl+'/images/indexBottom2.png?v=002'}}"></image>
         <view class="lookMore" bindtap="lookMore"></view>
       </view>
-      <view class="indexBottom2"></view>
+      <!-- <view class="indexBottom2"></view> -->
     </view>
     <!-- <view class="msgFrame" wx:if="{{!isRegister}}"> -->
     <view class="msgFrame" wx:if="{{false}}">

496_dongfengqichen/pages/myCenter/myCenter.js

@@ -536,13 +536,7 @@ Page({
     }
   },
   getMyAwardList: function () {//获取获奖记录
-    var recordNow = this.data.recordNow;
-    if (recordNow==1){
-      recordNow=3;
-    } else if (recordNow == 3) {
-      recordNow = 1;
-    }
-    app.wxRequest(app.globalData.urlRoot + "award/getMyAwardList", { awardSource: recordNow},res=>{
+    app.wxRequest(app.globalData.urlRoot + "award/getMyAwardList", { awardSource: this.data.recordNow},res=>{
       if(res.code == 200){
         this.setData({
           recordList:res.data

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

@@ -239,6 +239,9 @@ Page({
             },
             filePath: res.tempFilePaths[i],
             name: "file",
+            formData: {
+              filePath: "static"
+            },
             success: res => {
               if (res.data) {
                 var json = JSON.parse(res.data);

496_dongfengqichen/pages/scout/scout.js

@@ -88,13 +88,13 @@ Page({
       })
     }
   },
-  getCertificationInfo: function () {//查询认证状态
-    app.wxRequest(app.globalData.urlRoot + 'userInfo/getCertificationInfo', {}, res => {
-      if (res.code == 200 && res.data && res.data.agentDetail) {
-        this.data.authenticationStatus = true;
-      }
-    }, this)
-  },
+  // getCertificationInfo: function () {//查询认证状态
+  //   app.wxRequest(app.globalData.urlRoot + 'userInfo/getCertificationInfo', {}, res => {
+  //     if (res.code == 200 && res.data && res.data.agentDetail) {
+  //       this.data.authenticationStatus = true;
+  //     }
+  //   }, this)
+  // },
   /**
    * 生命周期函数--监听页面加载
    */
@@ -113,10 +113,16 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-    if (app.globalData.openid) {
-      this.getCertificationInfo();
-    } else {
-      app.globalData.openidSuccessFuc = this.getCertificationInfo;
+    // if (app.globalData.openid) {
+    //   this.getCertificationInfo();
+    // } else {
+    //   app.globalData.openidSuccessFuc = this.getCertificationInfo;
+    // }
+    if (app.globalData.authenticationStatus && app.globalData.authenticationStatus.agentDetail){
+      this.data.authenticationStatus = true;
+      this.setData({
+        authenticationShow:false
+      })
     }
     app.globalData.certificationState=2;
     this.setData({maskid: app.globalData.certificationState})
@@ -180,6 +186,8 @@ Page({
     })
   },
   enterMsg: function () {//去补充资料
-    console.log("去补充资料");
+    wx.navigateTo({
+      url: '/pages/supplement/supplement',
+    })
   }
 })

496_dongfengqichen/pages/star/star.js

@@ -66,6 +66,7 @@ Page({
   phonebolb:function(_phone){
     app.wxRequest(app.globalData.urlRoot + "userInfo/getCertificationInfo", {}, res => {
       if (res.code == 200) {
+        app.globalData.authenticationStatus = res.data;
         if (!app.globalData.certificationInfo) {
           app.globalData.certificationInfo = true;
           wx.setStorageSync("certificationInfo", true);

496_dongfengqichen/pages/supplement/supplement.js

@@ -31,6 +31,12 @@ Page({
   loadFun:function(){
     this.getJobList();
     this.getUserLocation();
+    var authenticationStatus = app.globalData.authenticationStatus;
+    if (authenticationStatus.realName){
+      this.setData({
+        realname: authenticationStatus.realName
+      })
+    }
   },
   /**
    * 生命周期函数--监听页面初次渲染完成
@@ -96,6 +102,18 @@ Page({
         this.setData({
           jobList:res.data
         })
+        var authenticationStatus = app.globalData.authenticationStatus;
+        if (authenticationStatus.jobId) {
+          for(let i=0;i<res.data.length;i++){
+            if (res.data[i].jobId == authenticationStatus.jobId){
+              this.setData({
+                jobValue: i,
+                jobDetail: res.data[i].jobDetail
+              })
+              break;
+            }
+          }
+        }
       }
     },this)
   },
@@ -124,6 +142,19 @@ Page({
           provinceValue: res.data.nearData.provinceIndex,
           storeValue: res.data.nearData.cityIndex
         })
+        var authenticationStatus = app.globalData.authenticationStatus;
+        if (authenticationStatus.city) {
+          for (let i = 0; i < res.data.list.length; i++) {
+            if (res.data.list[i].province == authenticationStatus.city){
+              this.setData({
+                provinceValue: i,
+                storeArr: this.data.provinceArr[i].children,
+                storeValue: 0
+              })
+              break;
+            }
+          }
+        }
       } else {
         wx.showToast({
           title: res.msg,
@@ -172,6 +203,12 @@ Page({
     }
     app.wxRequest(app.globalData.urlRoot + "certificationInfo/submitCertificationInfoData", data,res=>{
       if (res.code == 200) {
+        app.globalData.authenticationStatus.realName = this.data.realname
+        app.globalData.authenticationStatus.jobId = this.data.jobList[this.data.jobValue].jobId
+        app.globalData.authenticationStatus.jobDetail = this.data.storeArr[this.data.storeValue]['agent_detail']
+        app.globalData.authenticationStatus.city = this.data.provinceArr[this.data.provinceValue]['province']
+        app.globalData.authenticationStatus.agentDetail = this.data.storeArr[this.data.storeValue]['agent_detail']
+
         wx.navigateBack({
           delta: 1,
         })

496_dongfengqichen/pages/supplement/supplement.wxml

@@ -5,7 +5,7 @@
    <view class="msgFrame">
       <view class="inputGroup">
         <view class="inputTitle">姓名</view>
-        <input class="inputSty" bindinput="getRealname" placeholder="请输入姓名"></input>
+        <input class="inputSty" bindinput="getRealname" value="{{realname}}" placeholder="请输入姓名"></input>
       </view>
       <view class="inputGroup">
         <view class="inputTitle">当前城市</view>
@@ -27,7 +27,7 @@
       </view>
       <view class="inputGroup">
         <view class="inputTitle">职业</view>
-        <picker mode='selector' range="{{jobList}}" range-key="jobDetail" bindchange="jobChange">
+        <picker mode='selector' range="{{jobList}}" range-key="jobDetail" bindchange="jobChange" value="{{jobValue}}">
           <view class="inputSty" style="display:flex;align-items: center;justify-content: space-between;">
             <view>职业：{{jobList[jobValue].jobDetail}}</view>
             <image src="{{imgUrl+'/images/selectIcon.png'}}" class="selectIcon"></image>