xiaoe_mp_npm 1.1.21 → 1.1.22-test02

package/miniprogram_dist/Task/TaskPopup/component/TaskItem/index.wxml

@@ -1,145 +1,145 @@
-<wxs src="./index.wxs" module="filter" />
-
-<view
-  class="item-box {{lineClass?'line-class':''}} {{listType === 'error' && itemIndex === 0?'bg-change':''}} {{isRadius?'radius':''}} {{isMb?'mb':''}} {{ listType !== 'task' ? 'itemBoxPadding': ''}}"
->
-  <view class="wrapper">
-    <!-- 组合顺序任务 标识 -->
-    <view wx:if="{{ isInOrder }}" class="order-container">
-      <view class="circle-wrap circle-wrap-box">
-        <image
-          wx:if="{{ taskItem.progress === 0 }}"
-          src="https://commonresource-1252524126.cdn.xiaoeknow.com/image/m0yxkrry057l.png"
-        />
-        <image
-          wx:elif="{{ taskItem.progress === 1}}"
-          src="https://commonresource-1252524126.cdn.xiaoeknow.com/image/m0yxkrrp0gf9.png"
-        />
-        <image wx:else src="https://commonresource-1252524126.cdn.xiaoeknow.com/image/m0yxkrrx0amt.png" />
-      </view>
-      <view
-        wx:if="{{ taskIdx !== taskLength - 1 }}"
-        class="line-wrap {{ taskIdx === 0 ? 'line-h' : ''  }} {{ taskItem.progress === 2  ? 'line-bg': '' }}"
-      ></view>
-    </view>
-
-    <!-- 左侧任务详情 -->
-    <view class="left {{ taskIdx === taskLength - 1 ? 'un-bottom' : ''  }}">
-      <!-- 任务标题 && 奖励 -->
-      <view class="first">
-        <!-- 标题 -->
-        <view class="title" wx:if="{{listType === 'task' || listType === 'error'}}">{{ taskTitle }}</view>
-        <view class="title" wx:if="{{listType === 'reward'}}">
-          {{ rewardText }}
-          <member-integral-multiplier-bar
-              wx:if="{{ taskItem.reward_type == 1 }}"
-              levelMembershipSetting="{{ taskItem.point_extend }}"
-              hasMarginLeft="{{ true }}"
-          />
-        </view>
-
-        <!-- 奖励内容 -->
-        <view class="reward" wx:if="{{isShowReward}}">
-          <image class="reward-img" src="{{rewardIcon}}" />
-          <view class="reward-text">
-            {{ rewardText }}
-            <member-integral-multiplier-bar
-                wx:if="{{ taskItem.reward_type == 1 }}"
-                levelMembershipSetting="{{ taskItem.point_extend }}"
-                hasMarginLeft="{{ true }}"
-                needUseCurrentUser="{{ taskItem.join_state != 2 }}"
-                originalPoints="{{ taskItem.reward_value }}"
-            />
-          </view>
-        </view>
-      </view>
-
-      <view class="task-desc-box">
-        <view class="task-desc-content">
-          <!-- 任务时间 -->
-          <view class="time" wx:if="{{listType === 'task' || listType === 'error'}}">
-            任务时间：{{taskItem.show_start_at}} 至 {{taskItem.show_end_at}}
-          </view>
-
-          <view class="time" wx:if="{{listType === 'reward'}}">获得方式：{{ taskTitle }}</view>
-
-          <view class="time" wx:if="{{listType === 'reward'}}">获得时间：{{ taskItem.reward_send_at }}</view>
-
-          <!-- 组合顺序任务 待完成任务提示 -->
-          <view class="task-tip" wx:if="{{ isShowCompletePrevious }}">需完成上一个任务后才可解锁</view>
-
-          <!-- 组合任务 子任务需要多次才完成 -->
-          <view class="task-tip" wx:elif="{{ isShowMultipleTask }}">{{ childTaskContent }}</view>
-
-          <!-- 任务完成剩余条件 -->
-          <view class="task-tip" wx:if="{{ residueCondition && listType === 'task'}}">{{residueCondition}}</view>
-
-          <!-- 红包剩余个数提示 -->
-          <view class="task-tip" wx:if="{{redEnvelopeNum && listType === 'task'}}">{{redEnvelopeNum}}</view>
-
-          <!-- 奖励发放异常提示 -->
-          <view class="task-tip" wx:if="{{taskItem.is_show_reward_info}}">奖励发放中，请稍后查看</view>
-          <view
-              class="task-tip"
-              wx:if="{{(listType === 'task' || listType === 'error') && taskItem.reward_state === 3 && taskItem.task_condition !== '10'}}"
-          >
-            {{ rewardErrorDesc }}
-          </view>
-
-          <!-- 答题任务没完成的提示情况处理  -->
-          <view class="task-tip" wx:if="{{showAnswerTaskIntroduce}}">
-            <!-- 完成但不满足条件 -->
-            <text class="warning-text" wx:if="{{!taskItem.qs_is_pass}}">
-              未达到获奖条件：答对 {{taskItem.reward_frequency}} 题
-            </text>
-            <!-- 完成 -->
-            <text wx:else class="finish-text">已达到获奖条件：答对 {{taskItem.reward_frequency}} 题</text>
-            <!-- 查看解析按钮, 只有开启了解析查看才会显示  -->
-            <view wx:if="{{taskItem.is_show_answer === 1}}" class="show-answer" catch:tap="handleAnswerAnalysis">
-              查看解析
-              <image
-                  class="analysis-icon"
-                  src="https://commonresource-1252524126.cdn.xiaoeknow.com/image/lyqwwwi10xtb.svg"
-              />
-            </view>
-          </view>
-
-          <!-- 超时没完成 -->
-          <view class="task-tip" wx:if="{{ isShowTimeOver }}">已超时，未获得奖励</view>
-
-          <!-- 分享任务进度 -->
-          <view class="task-tip" wx:if="{{ isSharingTaskStatus }}">
-            进度: {{ taskItem.task_progress || 0 }} / {{ taskItem.reward_frequency }}
-          </view>
-        </view>
-
-        <view class="task-desc-btn">
-          <!-- 右侧按钮 -->
-          <view class="btn-wrapper {{ taskIdx === taskLength - 1 ? 'un-bottom' : ''  }}">
-            <view wx:if="{{ isShowButton }}">
-              <instant-withdraw
-                  customClass="have_reward"
-                  buttonText="{{ButtonText}}"
-                  unableBtn="{{unableBtn}}"
-                  app_id="{{ taskItem.app_id }}"
-                  alive_id="{{ taskItem.alive_id }}"
-                  red_packet_id="{{ taskItem.reward_value.red_packet_id}}"
-                  user_id="{{ roomInfo.user_id }}"
-                  alive_room_url="{{ roomInfo.alive_room_url }}"
-                  task_id="{{ taskItem.id }}"
-                  bind:success="successWithDraw"
-              ></instant-withdraw>
-            </view>
-            <view
-                wx:else
-                class="btn {{listType === 'reward' && 'reward-btn'}} {{(listType==='task' && (taskItem.join_state === 2 || taskItem.join_state === 3 || taskItem.join_state === 0 || taskItem.state === 2))&&'gray-btn'}} {{getFailStatus && 'orange-btn'}}"
-                catch:tap="btnClick"
-            >
-              {{btnText}}
-            </view>
-          </view>
-        </view>
-      </view>
-    </view>
-  </view>
-</view>
+<wxs src="./index.wxs" module="filter" />
+
+<view
+  class="item-box {{lineClass?'line-class':''}} {{listType === 'error' && itemIndex === 0?'bg-change':''}} {{isRadius?'radius':''}} {{isMb?'mb':''}} {{ listType !== 'task' ? 'itemBoxPadding': ''}}"
+>
+  <view class="wrapper">
+    <!-- 组合顺序任务 标识 -->
+    <view wx:if="{{ isInOrder }}" class="order-container">
+      <view class="circle-wrap circle-wrap-box">
+        <image
+          wx:if="{{ taskItem.progress === 0 }}"
+          src="https://commonresource-1252524126.cdn.xiaoeknow.com/image/m0yxkrry057l.png"
+        />
+        <image
+          wx:elif="{{ taskItem.progress === 1}}"
+          src="https://commonresource-1252524126.cdn.xiaoeknow.com/image/m0yxkrrp0gf9.png"
+        />
+        <image wx:else src="https://commonresource-1252524126.cdn.xiaoeknow.com/image/m0yxkrrx0amt.png" />
+      </view>
+      <view
+        wx:if="{{ taskIdx !== taskLength - 1 }}"
+        class="line-wrap {{ taskIdx === 0 ? 'line-h' : ''  }} {{ taskItem.progress === 2  ? 'line-bg': '' }}"
+      ></view>
+    </view>
+
+    <!-- 左侧任务详情 -->
+    <view class="left {{ taskIdx === taskLength - 1 ? 'un-bottom' : ''  }}">
+      <!-- 任务标题 && 奖励 -->
+      <view class="first">
+        <!-- 标题 -->
+        <view class="title" wx:if="{{listType === 'task' || listType === 'error'}}">{{ taskTitle }}</view>
+        <view class="title" wx:if="{{listType === 'reward'}}">
+          {{ rewardText }}
+          <member-integral-multiplier-bar
+              wx:if="{{ taskItem.reward_type == 1 }}"
+              levelMembershipSetting="{{ taskItem.point_extend }}"
+              hasMarginLeft="{{ true }}"
+          />
+        </view>
+
+        <!-- 奖励内容 -->
+        <view class="reward" wx:if="{{isShowReward}}">
+          <image class="reward-img" src="{{rewardIcon}}" />
+          <view class="reward-text">
+            {{ rewardText }}
+            <member-integral-multiplier-bar
+                wx:if="{{ taskItem.reward_type == 1 }}"
+                levelMembershipSetting="{{ taskItem.point_extend }}"
+                hasMarginLeft="{{ true }}"
+                needUseCurrentUser="{{ taskItem.join_state != 2 }}"
+                originalPoints="{{ taskItem.reward_value }}"
+            />
+          </view>
+        </view>
+      </view>
+
+      <view class="task-desc-box">
+        <view class="task-desc-content">
+          <!-- 任务时间 -->
+          <view class="time" wx:if="{{listType === 'task' || listType === 'error'}}">
+            任务时间：{{taskItem.show_start_at}} 至 {{taskItem.show_end_at}}
+          </view>
+
+          <view class="time" wx:if="{{listType === 'reward'}}">获得方式：{{ taskTitle }}</view>
+
+          <view class="time" wx:if="{{listType === 'reward'}}">获得时间：{{ taskItem.reward_send_at }}</view>
+
+          <!-- 组合顺序任务 待完成任务提示 -->
+          <view class="task-tip" wx:if="{{ isShowCompletePrevious }}">需完成上一个任务后才可解锁</view>
+
+          <!-- 组合任务 子任务需要多次才完成 -->
+          <view class="task-tip" wx:elif="{{ isShowMultipleTask }}">{{ childTaskContent }}</view>
+
+          <!-- 任务完成剩余条件 -->
+          <view class="task-tip" wx:if="{{ residueCondition && listType === 'task'}}">{{residueCondition}}</view>
+
+          <!-- 红包剩余个数提示 -->
+          <view class="task-tip" wx:if="{{redEnvelopeNum && listType === 'task'}}">{{redEnvelopeNum}}</view>
+
+          <!-- 奖励发放异常提示 -->
+          <view class="task-tip" wx:if="{{taskItem.is_show_reward_info}}">奖励发放中，请稍后查看</view>
+          <view
+              class="task-tip"
+              wx:if="{{(listType === 'task' || listType === 'error') && taskItem.reward_state === 3 && taskItem.task_condition !== '10'}}"
+          >
+            {{ rewardErrorDesc }}
+          </view>
+
+          <!-- 答题任务没完成的提示情况处理  -->
+          <view class="task-tip" wx:if="{{showAnswerTaskIntroduce}}">
+            <!-- 完成但不满足条件 -->
+            <text class="warning-text" wx:if="{{!taskItem.qs_is_pass}}">
+              未达到获奖条件：答对 {{taskItem.reward_frequency}} 题
+            </text>
+            <!-- 完成 -->
+            <text wx:else class="finish-text">已达到获奖条件：答对 {{taskItem.reward_frequency}} 题</text>
+            <!-- 查看解析按钮, 只有开启了解析查看才会显示  -->
+            <view wx:if="{{taskItem.is_show_answer === 1}}" class="show-answer" catch:tap="handleAnswerAnalysis">
+              查看解析
+              <image
+                  class="analysis-icon"
+                  src="https://commonresource-1252524126.cdn.xiaoeknow.com/image/lyqwwwi10xtb.svg"
+              />
+            </view>
+          </view>
+
+          <!-- 超时没完成 -->
+          <view class="task-tip" wx:if="{{ isShowTimeOver }}">已超时，未获得奖励</view>
+
+          <!-- 分享任务进度 -->
+          <view class="task-tip" wx:if="{{ isSharingTaskStatus }}">
+            进度: {{ taskItem.task_progress || 0 }} / {{ taskItem.reward_frequency }}
+          </view>
+        </view>
+
+        <view class="task-desc-btn">
+          <!-- 右侧按钮 -->
+          <view class="btn-wrapper {{ taskIdx === taskLength - 1 ? 'un-bottom' : ''  }}">
+            <view wx:if="{{ isShowButton }}">
+              <instant-withdraw
+                  customClass="have_reward"
+                  buttonText="{{ButtonText}}"
+                  unableBtn="{{unableBtn}}"
+                  app_id="{{ taskItem.app_id }}"
+                  alive_id="{{ taskItem.alive_id }}"
+                  red_packet_id="{{ taskItem.reward_value.red_packet_id}}"
+                  user_id="{{ roomInfo.user_id }}"
+                  alive_room_url="{{ roomInfo.alive_room_url }}"
+                  task_id="{{ taskItem.id }}"
+                  bind:success="successWithDraw"
+              ></instant-withdraw>
+            </view>
+            <view
+                wx:else
+                class="btn {{listType === 'reward' && 'reward-btn'}} {{(listType==='task' && (taskItem.join_state === 2 || taskItem.join_state === 3 || taskItem.join_state === 0 || taskItem.state === 2))&&'gray-btn'}} {{getFailStatus && 'orange-btn'}}"
+                catch:tap="btnClick"
+            >
+              {{btnText}}
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
+</view>

package/miniprogram_dist/Task/TaskPopup/component/TaskItem/index.wxs

@@ -1,8 +1,8 @@
-var secondsToMinutes = function(seconds){
-  minutes = Math.floor(seconds / 60);
-  return Math.floor(seconds / 60)
-}
-
-module.exports = {
-  secondsToMinutes: secondsToMinutes,
+var secondsToMinutes = function(seconds){
+  minutes = Math.floor(seconds / 60);
+  return Math.floor(seconds / 60)
+}
+
+module.exports = {
+  secondsToMinutes: secondsToMinutes,
 }