From f6769f754b9df35a0811b74d86a895c7ccc23470 Mon Sep 17 00:00:00 2001
From: zhangjing <zhangjing@uztech.com>
Date: Wed, 2 Aug 2023 16:45:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=93=E9=AA=8C=E5=AE=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/mall/coupon/coupon.wxml |  4 ++--
 pages/recruit/index.js        |  6 +++---
 pages/recruit/index.wxml      | 11 +++++++----
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/pages/mall/coupon/coupon.wxml b/pages/mall/coupon/coupon.wxml
index 42c2fe1..ecfc69d 100644
--- a/pages/mall/coupon/coupon.wxml
+++ b/pages/mall/coupon/coupon.wxml
@@ -3,12 +3,12 @@
         <view class="orderTab-item {{couponType == 1 ? 'active' : ''}}" bindtap="tabClick" data-type="1">
             <text>1瓶</text>
         </view>
-        <view class="orderTab-item {{couponType == 2 ? 'active' : ''}}" bindtap="tabClick" data-type="2">
+        <!-- <view class="orderTab-item {{couponType == 2 ? 'active' : ''}}" bindtap="tabClick" data-type="2">
             <text>2瓶</text>
         </view>
         <view class="orderTab-item {{couponType == 3 ? 'active' : ''}}" bindtap="tabClick" data-type="3">
             <text>3瓶</text>
-        </view>
+        </view> -->
     </view>
     <view class="orderState">
         <view class="orderState-item {{couponStatus == 1 ? 'active' : ''}}" bindtap="stateClick" data-status="1">
diff --git a/pages/recruit/index.js b/pages/recruit/index.js
index 3b8bcf1..0956ec0 100644
--- a/pages/recruit/index.js
+++ b/pages/recruit/index.js
@@ -95,8 +95,8 @@ Page({
             this.setData({
                 recruitData: res.data
             })
-            // 0可以申请  1需要面检测  5签收-查看物流  6打卡  7第二次面  8完成
-            if(res.data.can.status == 6 || res.data.can.status == 7 || res.data.can.status == 8) {
+            // 0可以申请  1需要面检测  5签收-查看物流  6打卡  7第二次面  8去兑换产品  9完成
+            if(res.data.can.status == 6 || res.data.can.status == 7 || res.data.can.status == 9) {
                 // 显示打卡数据
                 this.setData({
                     type : 'clockIn'
@@ -109,7 +109,7 @@ Page({
                 this.dailyInfo();
             }
 
-            if(res.data.can.status == 8) {
+            if(res.data.can.status == 8 || res.data.can.status == 9) {
                 // 获取两次报告对比
                 this.skinInfo();
             }
diff --git a/pages/recruit/index.wxml b/pages/recruit/index.wxml
index a3fbdf1..c92b79b 100644
--- a/pages/recruit/index.wxml
+++ b/pages/recruit/index.wxml
@@ -58,9 +58,9 @@
                 <view class="recruit-btn">
                     <block wx:if="{{recruitData.is_show_button}}">
                         <image wx:if="{{recruitData.can.status == 3}}" class="recruit-btn-img {{recruitData.can.is_return != 0 ? 'active' : ''}}" src="https://cdn.shuiganying.com/images/2023/07/07/327b691cd8129d8945790fd2e7c34497.png" mode="widthFix"></image>
-                        <image wx:else class="recruit-btn-img {{recruitData.can.status == 2 || recruitData.can.status == 4 || recruitData.can.status == 8 || recruitData.can.status == 90 || recruitData.can.status == 91  || recruitData.can.status == 92 ? 'active' : ''}}" src="https://cdn.shuiganying.com/images/2023/07/07/327b691cd8129d8945790fd2e7c34497.png" mode="widthFix"></image>
-                        <!-- 0可以申请  1需要面检测  2待审核  3驳回  4待发货  5签收-查看物流  6打卡  7第二次面  8 完成  90  未开始   91已结束  92活动关闭 -->
-                        <view class="recruit-btn-text" wx:if="{{recruitData.can.status == 2 || recruitData.can.status == 4 || recruitData.can.status == 8 || recruitData.can.status == 90 || recruitData.can.status == 91  || recruitData.can.status == 92 ? 'active' : ''}}">{{recruitData.can.text}}</view>
+                        <image wx:else class="recruit-btn-img {{recruitData.can.status == 2 || recruitData.can.status == 4 || recruitData.can.status == 8 || recruitData.can.status == 9 || recruitData.can.status == 90 || recruitData.can.status == 91  || recruitData.can.status == 92 ? 'active' : ''}}" src="https://cdn.shuiganying.com/images/2023/07/07/327b691cd8129d8945790fd2e7c34497.png" mode="widthFix"></image>
+                        <!-- 0可以申请  1需要面检测  2待审核  3驳回  4待发货  5签收-查看物流  6打卡  7第二次面  8兑换产品 9完成  90  未开始   91已结束  92活动关闭 -->
+                        <view class="recruit-btn-text" wx:if="{{recruitData.can.status == 2 || recruitData.can.status == 4 || recruitData.can.status == 8 || recruitData.can.status == 9 || recruitData.can.status == 90 || recruitData.can.status == 91  || recruitData.can.status == 92 ? 'active' : ''}}">{{recruitData.can.text}}</view>
                         <view class="recruit-btn-text" wx:elif="{{recruitData.can.status == 3}}">
                             <view bindtap="editGo" wx:if="{{recruitData.can.is_return == 0}}">{{recruitData.can.text}}，重新编辑报名</view>
                             <view wx:else>{{recruitData.can.text}}</view>
@@ -166,6 +166,9 @@
                             <block wx:elif="{{recruitData.can.status == 7}}">
                                 <view class="total-btn" bindtap="tapSecond">二次面检</view>
                             </block>
+                            <block wx:elif="{{recruitData.can.status == 8}}">
+                                <navigator class="total-btn" hover-class="none" url="/pages/recruit/exchange/exchange">兑换产品</navigator>
+                            </block>
                             <block wx:else>
                                 <view class="total-btn active">已完成</view>
                             </block>
@@ -174,7 +177,7 @@
                 </view>
             </view>
             <!-- 对比 -->
-            <view class="ratio" wx:if="{{recruitData.can.status == 8}}">
+            <view class="ratio" wx:if="{{recruitData.can.status == 8 || recruitData.can.status == 9}}">
                 <view class="ratio-title">
                     <image src="https://cdn.shuiganying.com/images/2023/07/11/ba562256d9a11e2881c9d4627e5f083c.png" mode="widthFix"></image>
                 </view>