xiaoe_mp_npm 1.0.43 → 1.0.44-ham2

package/src/Task/TaskPopup/component/TaskType/index.wxml

@@ -1,62 +1,62 @@
-<view>
-  <van-collapse
-    style="border-radius: 10px;"
-    value="{{ activeNames }}"
-    bind:change="onChange"
-    custom-class="collapse"
-    class="vanCollapse"
-  >
-    <van-collapse-item
-      name="{{1}}"
-      is-link="{{false}}"
-      clickable="true"
-      custom-class="content-item"
-      content-class="content"
-    >
-      <view slot="title">
-        <view class="task-item">
-          <image class="type-img" src="{{typeItem.icon}}" />
-          <view class="type-header">
-            <view class="type-title">{{typeItem.title}}</view>
-            <view class="type-reward" wx:if="{{ isCombination }}">
-              <view wx:if="{{ isCombination }}">{{ combinationTitle }}</view>
-              <view wx:else>完成以下所有任务将获得</view>
-
-              <view  class="reward" wx:if="{{ showRewards }}">
-                <image class="reward-img" src="{{ rewardIcon }}" />
-                <view class="reward-text">{{ rewardText }}</view>
-              </view>
-            </view>
-          </view>
-        </view>
-      </view>
-
-      <view slot="right-icon" class="icon">
-        <van-icon
-          wx:if="{{activeNames.length}}"
-          name="arrow-up"
-          class="van-icon van-icon-arrow van-cell__right-icon"
-          color="#999999"
-        />
-        <van-icon wx:else name="arrow-down" class="van-icon van-icon-arrow van-cell__right-icon" color="#999999" />
-      </view>
-        
-      <view class="taskItems">
-        <task-item
-          wx:for="{{detailList}}"
-          wx:for-item="item"
-          wx:for-index="index"
-          wx:key="{{ item.id }}"
-          taskItem="{{item}}"
-          bind:btnClick="btnClick"
-          viewingInProgress="{{viewingInProgress}}"
-          teamId="{{teamId}}"
-          taskIdx="{{ index }}"
-          taskLength="{{ detailList.length }}"
-          isInOrder="{{ isInOrder }}"
-        />
-      </view>
-      
-    </van-collapse-item>
-  </van-collapse>
-</view>
+<view>
+  <van-collapse
+    style="border-radius: 10px;"
+    value="{{ activeNames }}"
+    bind:change="onChange"
+    custom-class="collapse"
+    class="vanCollapse"
+  >
+    <van-collapse-item
+      name="{{1}}"
+      is-link="{{false}}"
+      clickable="true"
+      custom-class="content-item"
+      content-class="content"
+    >
+      <view slot="title">
+        <view class="task-item">
+          <image class="type-img" src="{{typeItem.icon}}" />
+          <view class="type-header">
+            <view class="type-title">{{typeItem.title}}</view>
+            <view class="type-reward" wx:if="{{ isCombination }}">
+              <view wx:if="{{ isCombination }}">{{ combinationTitle }}</view>
+              <view wx:else>完成以下所有任务将获得</view>
+
+              <view  class="reward" wx:if="{{ showRewards }}">
+                <image class="reward-img" src="{{ rewardIcon }}" />
+                <view class="reward-text">{{ rewardText }}</view>
+              </view>
+            </view>
+          </view>
+        </view>
+      </view>
+
+      <view slot="right-icon" class="icon">
+        <van-icon
+          wx:if="{{activeNames.length}}"
+          name="arrow-up"
+          class="van-icon van-icon-arrow van-cell__right-icon"
+          color="#999999"
+        />
+        <van-icon wx:else name="arrow-down" class="van-icon van-icon-arrow van-cell__right-icon" color="#999999" />
+      </view>
+        
+      <view class="taskItems">
+        <task-item
+          wx:for="{{detailList}}"
+          wx:for-item="item"
+          wx:for-index="index"
+          wx:key="{{ item.id }}"
+          taskItem="{{item}}"
+          bind:btnClick="btnClick"
+          viewingInProgress="{{viewingInProgress}}"
+          teamId="{{teamId}}"
+          taskIdx="{{ index }}"
+          taskLength="{{ detailList.length }}"
+          isInOrder="{{ isInOrder }}"
+        />
+      </view>
+      
+    </van-collapse-item>
+  </van-collapse>
+</view>

package/src/Task/TaskPopup/component/TaskType/index.wxss

@@ -1,218 +1,218 @@
-.collapse {
-  margin-bottom: 3.2vmin;
-  border-radius: 2.13333vmin;
-  overflow: hidden;
-}
-.collapse .taskItems {
-  padding-top: 4.26667vmin;
-  padding-bottom: 4.26667vmin;
-}
-.collapse .content {
-  padding: 0;
-}
-.collapse .task-item {
-  display: flex;
-  align-items: center;
-}
-.collapse .task-item .type-img {
-  width: 10.66667vmin;
-  height: 10.66667vmin;
-}
-.collapse .task-item .type-header {
-  display: flex;
-  flex-direction: column;
-  margin-left: 2.13333vmin;
-}
-.collapse .task-item .type-reward {
-  color: #ff5429;
-  font-size: 3.46667vmin;
-}
-.collapse .task-item .type-reward,
-.collapse .task-item .reward {
-  display: flex;
-  align-items: center;
-}
-.collapse .task-item .type-title {
-  font-size: 3.73333vmin;
-  font-weight: 500;
-  color: #333333;
-}
-.collapse .task-item .reward-img {
-  width: 3.2vmin;
-  height: 3.2vmin;
-  margin-left: 1.06667vmin;
-  margin-right: 1.06667vmin;
-}
-.collapse .task-item .reward-text {
-  word-wrap: break-word;
-  word-break: break-all;
-}
-.collapse .icon {
-  display: flex;
-  align-items: center;
-}
-@media screen and (min-width: 768px) and (orientation: portrait) {
-  .collapse {
-    margin-bottom: 1.5625vmin;
-    border-radius: 1.04167vmin;
-    overflow: hidden;
-  }
-  .collapse .taskItems {
-    padding-top: 2.08333vmin;
-    padding-bottom: 2.08333vmin;
-  }
-  .collapse .content {
-    padding: 0;
-  }
-  .collapse .task-item {
-    display: flex;
-    align-items: center;
-  }
-  .collapse .task-item .type-img {
-    width: 5.20833vmin;
-    height: 5.20833vmin;
-  }
-  .collapse .task-item .type-header {
-    display: flex;
-    flex-direction: column;
-    margin-left: 1.04167vmin;
-  }
-  .collapse .task-item .type-reward {
-    color: #ff5429;
-    font-size: 1.69271vmin;
-  }
-  .collapse .task-item .type-reward,
-  .collapse .task-item .reward {
-    display: flex;
-    align-items: center;
-  }
-  .collapse .task-item .type-title {
-    font-size: 1.82292vmin;
-    font-weight: 500;
-    color: #333333;
-  }
-  .collapse .task-item .reward-img {
-    width: 1.5625vmin;
-    height: 1.5625vmin;
-    margin-left: 0.52083vmin;
-    margin-right: 0.52083vmin;
-  }
-  .collapse .task-item .reward-text {
-    word-wrap: break-word;
-    word-break: break-all;
-  }
-  .collapse .icon {
-    display: flex;
-    align-items: center;
-  }
-}
-@media screen and (min-height: 630px) and (orientation: landscape) {
-  .collapse {
-    margin-bottom: 1.90476vmin;
-    border-radius: 1.26984vmin;
-    overflow: hidden;
-  }
-  .collapse .taskItems {
-    padding-top: 2.53968vmin;
-    padding-bottom: 2.53968vmin;
-  }
-  .collapse .content {
-    padding: 0;
-  }
-  .collapse .task-item {
-    display: flex;
-    align-items: center;
-  }
-  .collapse .task-item .type-img {
-    width: 6.34921vmin;
-    height: 6.34921vmin;
-  }
-  .collapse .task-item .type-header {
-    display: flex;
-    flex-direction: column;
-    margin-left: 1.26984vmin;
-  }
-  .collapse .task-item .type-reward {
-    color: #ff5429;
-    font-size: 2.06349vmin;
-  }
-  .collapse .task-item .type-reward,
-  .collapse .task-item .reward {
-    display: flex;
-    align-items: center;
-  }
-  .collapse .task-item .type-title {
-    font-size: 2.22222vmin;
-    font-weight: 500;
-    color: #333333;
-  }
-  .collapse .task-item .reward-img {
-    width: 1.90476vmin;
-    height: 1.90476vmin;
-    margin-left: 0.63492vmin;
-    margin-right: 0.63492vmin;
-  }
-  .collapse .task-item .reward-text {
-    word-wrap: break-word;
-    word-break: break-all;
-  }
-  .collapse .icon {
-    display: flex;
-    align-items: center;
-  }
-}
-@media screen and (min-height: 768px) and (orientation: landscape) {
-  .collapse {
-    margin-bottom: 1.5625vmin;
-    border-radius: 1.04167vmin;
-    overflow: hidden;
-  }
-  .collapse .taskItems {
-    padding-top: 2.08333vmin;
-    padding-bottom: 2.08333vmin;
-  }
-  .collapse .content {
-    padding: 0;
-  }
-  .collapse .task-item {
-    display: flex;
-    align-items: center;
-  }
-  .collapse .task-item .type-img {
-    width: 5.20833vmin;
-    height: 5.20833vmin;
-  }
-  .collapse .task-item .type-header {
-    display: flex;
-    flex-direction: column;
-    margin-left: 1.04167vmin;
-  }
-  .collapse .task-item .type-reward {
-    color: #ff5429;
-    font-size: 1.69271vmin;
-  }
-  .collapse .task-item .type-reward,
-  .collapse .task-item .reward {
-    display: flex;
-    align-items: center;
-  }
-  .collapse .task-item .type-title {
-    font-size: 1.82292vmin;
-    font-weight: 500;
-    color: #333333;
-  }
-  .collapse .task-item .reward-img {
-    width: 1.5625vmin;
-    height: 1.5625vmin;
-    margin-left: 0.52083vmin;
-    margin-right: 0.52083vmin;
-  }
-  .collapse .task-item .reward-text {
-    word-wrap: break-word;
-    word-break: break-all;
-  }
-  .collapse .icon {
-    display: flex;
-    align-items: center;
-  }
-}
+.collapse {
+  margin-bottom: 3.2vmin;
+  border-radius: 2.13333vmin;
+  overflow: hidden;
+}
+.collapse .taskItems {
+  padding-top: 4.26667vmin;
+  padding-bottom: 4.26667vmin;
+}
+.collapse .content {
+  padding: 0;
+}
+.collapse .task-item {
+  display: flex;
+  align-items: center;
+}
+.collapse .task-item .type-img {
+  width: 10.66667vmin;
+  height: 10.66667vmin;
+}
+.collapse .task-item .type-header {
+  display: flex;
+  flex-direction: column;
+  margin-left: 2.13333vmin;
+}
+.collapse .task-item .type-reward {
+  color: #ff5429;
+  font-size: 3.46667vmin;
+}
+.collapse .task-item .type-reward,
+.collapse .task-item .reward {
+  display: flex;
+  align-items: center;
+}
+.collapse .task-item .type-title {
+  font-size: 3.73333vmin;
+  font-weight: 500;
+  color: #333333;
+}
+.collapse .task-item .reward-img {
+  width: 3.2vmin;
+  height: 3.2vmin;
+  margin-left: 1.06667vmin;
+  margin-right: 1.06667vmin;
+}
+.collapse .task-item .reward-text {
+  word-wrap: break-word;
+  word-break: break-all;
+}
+.collapse .icon {
+  display: flex;
+  align-items: center;
+}
+@media screen and (min-width: 768px) and (orientation: portrait) {
+  .collapse {
+    margin-bottom: 1.5625vmin;
+    border-radius: 1.04167vmin;
+    overflow: hidden;
+  }
+  .collapse .taskItems {
+    padding-top: 2.08333vmin;
+    padding-bottom: 2.08333vmin;
+  }
+  .collapse .content {
+    padding: 0;
+  }
+  .collapse .task-item {
+    display: flex;
+    align-items: center;
+  }
+  .collapse .task-item .type-img {
+    width: 5.20833vmin;
+    height: 5.20833vmin;
+  }
+  .collapse .task-item .type-header {
+    display: flex;
+    flex-direction: column;
+    margin-left: 1.04167vmin;
+  }
+  .collapse .task-item .type-reward {
+    color: #ff5429;
+    font-size: 1.69271vmin;
+  }
+  .collapse .task-item .type-reward,
+  .collapse .task-item .reward {
+    display: flex;
+    align-items: center;
+  }
+  .collapse .task-item .type-title {
+    font-size: 1.82292vmin;
+    font-weight: 500;
+    color: #333333;
+  }
+  .collapse .task-item .reward-img {
+    width: 1.5625vmin;
+    height: 1.5625vmin;
+    margin-left: 0.52083vmin;
+    margin-right: 0.52083vmin;
+  }
+  .collapse .task-item .reward-text {
+    word-wrap: break-word;
+    word-break: break-all;
+  }
+  .collapse .icon {
+    display: flex;
+    align-items: center;
+  }
+}
+@media screen and (min-height: 630px) and (orientation: landscape) {
+  .collapse {
+    margin-bottom: 1.90476vmin;
+    border-radius: 1.26984vmin;
+    overflow: hidden;
+  }
+  .collapse .taskItems {
+    padding-top: 2.53968vmin;
+    padding-bottom: 2.53968vmin;
+  }
+  .collapse .content {
+    padding: 0;
+  }
+  .collapse .task-item {
+    display: flex;
+    align-items: center;
+  }
+  .collapse .task-item .type-img {
+    width: 6.34921vmin;
+    height: 6.34921vmin;
+  }
+  .collapse .task-item .type-header {
+    display: flex;
+    flex-direction: column;
+    margin-left: 1.26984vmin;
+  }
+  .collapse .task-item .type-reward {
+    color: #ff5429;
+    font-size: 2.06349vmin;
+  }
+  .collapse .task-item .type-reward,
+  .collapse .task-item .reward {
+    display: flex;
+    align-items: center;
+  }
+  .collapse .task-item .type-title {
+    font-size: 2.22222vmin;
+    font-weight: 500;
+    color: #333333;
+  }
+  .collapse .task-item .reward-img {
+    width: 1.90476vmin;
+    height: 1.90476vmin;
+    margin-left: 0.63492vmin;
+    margin-right: 0.63492vmin;
+  }
+  .collapse .task-item .reward-text {
+    word-wrap: break-word;
+    word-break: break-all;
+  }
+  .collapse .icon {
+    display: flex;
+    align-items: center;
+  }
+}
+@media screen and (min-height: 768px) and (orientation: landscape) {
+  .collapse {
+    margin-bottom: 1.5625vmin;
+    border-radius: 1.04167vmin;
+    overflow: hidden;
+  }
+  .collapse .taskItems {
+    padding-top: 2.08333vmin;
+    padding-bottom: 2.08333vmin;
+  }
+  .collapse .content {
+    padding: 0;
+  }
+  .collapse .task-item {
+    display: flex;
+    align-items: center;
+  }
+  .collapse .task-item .type-img {
+    width: 5.20833vmin;
+    height: 5.20833vmin;
+  }
+  .collapse .task-item .type-header {
+    display: flex;
+    flex-direction: column;
+    margin-left: 1.04167vmin;
+  }
+  .collapse .task-item .type-reward {
+    color: #ff5429;
+    font-size: 1.69271vmin;
+  }
+  .collapse .task-item .type-reward,
+  .collapse .task-item .reward {
+    display: flex;
+    align-items: center;
+  }
+  .collapse .task-item .type-title {
+    font-size: 1.82292vmin;
+    font-weight: 500;
+    color: #333333;
+  }
+  .collapse .task-item .reward-img {
+    width: 1.5625vmin;
+    height: 1.5625vmin;
+    margin-left: 0.52083vmin;
+    margin-right: 0.52083vmin;
+  }
+  .collapse .task-item .reward-text {
+    word-wrap: break-word;
+    word-break: break-all;
+  }
+  .collapse .icon {
+    display: flex;
+    align-items: center;
+  }
+}