xiaoe_mp_npm 1.1.21 → 1.1.22-test02

package/miniprogram_dist/Task/TaskPopup/index.scss

@@ -1,167 +1,167 @@
-$deviceWidth: 750;
-
-@function vmin($rpx) {
-  @return #{$rpx * 100 / $deviceWidth}vmin;
-}
-
-@mixin task-popup {
-  z-index: 500;
-  .decorate{
-    display: flex;
-    justify-content: space-between;
-    position: relative;
-    .close{
-      position: absolute;
-      right: vmin(26);
-      top: vmin(96);
-      width: vmin(64);
-      height: vmin(64);
-      &.hidden{
-        opacity: 0;
-      }
-    }
-    .gift-box{
-      left: vmin(0);
-      top: vmin(-60);
-      width: 100vmin;
-      height: vmin(192);
-      &.hidden{
-        opacity: 0;
-      }
-    }
-  }
-  
-  
-  .task-popup-header{
-    padding: vmin(24) vmin(32);
-    display: flex;
-    align-items: center;
-    justify-content: flex-end;
-    height: vmin(96);
-    box-sizing: border-box;
-    background: url('https://commonresource-1252524126.cdn.xiaoeknow.com/image/ltqz384r04hx.png') no-repeat;
-    background-size: contain;
-    
-    .to-reward{
-      padding: vmin(8) 0 vmin(8) vmin(16);
-      margin-left: vmin(24);
-      font-size: vmin(24);
-      display: flex;
-      color: #701616;
-      align-items: center;
-      image{
-        width: vmin(32);
-        height: vmin(32);
-      }        
-    }
-    .not-reward{
-      opacity: 0.4;
-    }
-    &.full-header{
-      background-image: url('https://commonresource-1252524126.cdn.xiaoeknow.com/image/ltzgkkyr0wfj.png');
-      height: vmin(152);
-      display: block;
-      background-size: contain;
-      .to-reward{
-        margin-top: vmin(64);
-        margin-left: 0;
-        padding-left: 0;
-      }
-    }
-  }
-  .reward-popup-header{
-    background: #FFEFD7;
-    display: flex;
-    padding: vmin(24) vmin(32);
-    align-items: center;
-    justify-content: space-between;
-    height: vmin(96);
-    box-sizing: border-box;
-    border-top-left-radius: vmin(24);
-    border-top-right-radius: vmin(24);
-    color: #701616;
-    &.full-header{
-      border-top-right-radius: 0;
-    }
-    .back{
-      width: vmin(32);
-      height: vmin(32);
-    }
-    .title{
-      font-size: vmin(32);
-    }
-    .reward-close{
-      width: vmin(32);
-      height: vmin(32);
-      &.hidden{
-        opacity: 0;
-      }
-    }
-  }
-
-  .popup-content{
-    box-sizing: border-box;
-    margin-bottom: vmin(32);
-    padding: 0 vmin(32) vmin(32) vmin(32);
-    min-height: 40vmin;
-    height: 100%;
-    background-size: 100% 100%;
-
-
-    .withdraw-tips {
-      background-color: rgb(252, 252, 252);
-      border-radius: vmin(10);
-      height: vmin(50);
-      margin-bottom: vmin(14);
-      display: flex;
-      justify-content: space-between;
-      padding: vmin(10);
-
-      .left {
-        font-size: vmin(28);
-        line-height: vmin(50);
-        margin-left: vmin(14);
-        color: #ff5429;
-        font-weight: 500;
-      }
-
-      .right {
-        font-size: vmin(24);
-        line-height: vmin(50);
-        color: #999999;
-      }
-
-    }
-}
-}
-
-.task-popup {
-  @include task-popup;
-}
-
-// 竖屏pad
-@media screen and (min-width: 768px) and (orientation: portrait) {
-  $deviceWidth: 1536 !global;
-
-  .task-popup {
-    @include task-popup;
-  }
-}
-
-// PC 放大适配
-@media screen and (min-height: 630px) and (orientation: landscape) {
-  $deviceWidth: 1260 !global;
-
-  .task-popup {
-    @include task-popup;
-  }
-}
-
-// 横屏pad
-@media screen and (min-height: 768px) and (orientation: landscape) {
-  $deviceWidth: 1536 !global;
-
-  .task-popup {
-    @include task-popup;
-  }
+$deviceWidth: 750;
+
+@function vmin($rpx) {
+  @return #{$rpx * 100 / $deviceWidth}vmin;
+}
+
+@mixin task-popup {
+  z-index: 500;
+  .decorate{
+    display: flex;
+    justify-content: space-between;
+    position: relative;
+    .close{
+      position: absolute;
+      right: vmin(26);
+      top: vmin(96);
+      width: vmin(64);
+      height: vmin(64);
+      &.hidden{
+        opacity: 0;
+      }
+    }
+    .gift-box{
+      left: vmin(0);
+      top: vmin(-60);
+      width: 100vmin;
+      height: vmin(192);
+      &.hidden{
+        opacity: 0;
+      }
+    }
+  }
+  
+  
+  .task-popup-header{
+    padding: vmin(24) vmin(32);
+    display: flex;
+    align-items: center;
+    justify-content: flex-end;
+    height: vmin(96);
+    box-sizing: border-box;
+    background: url('https://commonresource-1252524126.cdn.xiaoeknow.com/image/ltqz384r04hx.png') no-repeat;
+    background-size: contain;
+    
+    .to-reward{
+      padding: vmin(8) 0 vmin(8) vmin(16);
+      margin-left: vmin(24);
+      font-size: vmin(24);
+      display: flex;
+      color: #701616;
+      align-items: center;
+      image{
+        width: vmin(32);
+        height: vmin(32);
+      }        
+    }
+    .not-reward{
+      opacity: 0.4;
+    }
+    &.full-header{
+      background-image: url('https://commonresource-1252524126.cdn.xiaoeknow.com/image/ltzgkkyr0wfj.png');
+      height: vmin(152);
+      display: block;
+      background-size: contain;
+      .to-reward{
+        margin-top: vmin(64);
+        margin-left: 0;
+        padding-left: 0;
+      }
+    }
+  }
+  .reward-popup-header{
+    background: #FFEFD7;
+    display: flex;
+    padding: vmin(24) vmin(32);
+    align-items: center;
+    justify-content: space-between;
+    height: vmin(96);
+    box-sizing: border-box;
+    border-top-left-radius: vmin(24);
+    border-top-right-radius: vmin(24);
+    color: #701616;
+    &.full-header{
+      border-top-right-radius: 0;
+    }
+    .back{
+      width: vmin(32);
+      height: vmin(32);
+    }
+    .title{
+      font-size: vmin(32);
+    }
+    .reward-close{
+      width: vmin(32);
+      height: vmin(32);
+      &.hidden{
+        opacity: 0;
+      }
+    }
+  }
+
+  .popup-content{
+    box-sizing: border-box;
+    margin-bottom: vmin(32);
+    padding: 0 vmin(32) vmin(32) vmin(32);
+    min-height: 40vmin;
+    height: 100%;
+    background-size: 100% 100%;
+
+
+    .withdraw-tips {
+      background-color: rgb(252, 252, 252);
+      border-radius: vmin(10);
+      height: vmin(50);
+      margin-bottom: vmin(14);
+      display: flex;
+      justify-content: space-between;
+      padding: vmin(10);
+
+      .left {
+        font-size: vmin(28);
+        line-height: vmin(50);
+        margin-left: vmin(14);
+        color: #ff5429;
+        font-weight: 500;
+      }
+
+      .right {
+        font-size: vmin(24);
+        line-height: vmin(50);
+        color: #999999;
+      }
+
+    }
+}
+}
+
+.task-popup {
+  @include task-popup;
+}
+
+// 竖屏pad
+@media screen and (min-width: 768px) and (orientation: portrait) {
+  $deviceWidth: 1536 !global;
+
+  .task-popup {
+    @include task-popup;
+  }
+}
+
+// PC 放大适配
+@media screen and (min-height: 630px) and (orientation: landscape) {
+  $deviceWidth: 1260 !global;
+
+  .task-popup {
+    @include task-popup;
+  }
+}
+
+// 横屏pad
+@media screen and (min-height: 768px) and (orientation: landscape) {
+  $deviceWidth: 1536 !global;
+
+  .task-popup {
+    @include task-popup;
+  }
 }

package/miniprogram_dist/Task/TaskPopup/index.wxml

@@ -1,87 +1,87 @@
-<view class="task-popup">
-  <custom-popup
-    showPopup="{{showPopup}}"
-    popPosition="{{ popPosition }}"
-    customStyle="{{ customStyle+'overflow:visible' }}"
-    zIndex="{{100}}"
-    bind:onClose="closePop"
-    bind:onOverlayClick="closePop"
-    overlay-style="{{ 'background-color: rgba(0, 0, 0, 0.8)' }}"
-    popupHeaderStyle="{{'background:none;'}}{{isFull&&isShowTaskList?'height:20.27vmin':''}}"
-    customBoxStyle="{{'position: absolute;top: -23vmin;left: 0'}}"
-    contentStyle="{{'background:none;'}}"
-  >
-    <view slot="custom">
-      <view class="decorate" wx:if="{{isShowTaskList}}">
-        <image
-          class="gift-box {{!isShowClose?'hidden':''}}"
-          catch:tap="closePop"
-          src="https://commonresource-1252524126.cdn.xiaoeknow.com/image/ltp8c6ta0hqr.png"
-        />
-        <image
-          class="close {{!isShowClose || orientation ==='hor'?'hidden':''}}"
-          catch:tap="closePop"
-          src="https://commonresource-1252524126.cdn.xiaoeknow.com/image/ltpim6f50pg3.png"
-        />
-      </view>
-    </view>
-    <!-- 标题 -->
-    <view slot="header">
-      <!-- 任务列表 -->
-      <view class="task-popup-header {{isFull?'full-header':''}}" wx:if="{{isShowTaskList}}">
-        <view class="to-reward {{!hasRewardRecord?'not-reward':''}}" catch:tap="toReward">
-          <view>查看已获得的奖励</view>
-          <image
-            src="{{!hasRewardRecord?'https://commonresource-1252524126.cdn.xiaoeknow.com/image/ltqy1jr30j0y.png':'https://commonresource-1252524126.cdn.xiaoeknow.com/image/ltqygc7b0sll.png'}}"
-          />
-        </view>
-      </view>
-
-      <!-- 奖励列表 -->
-      <view class="reward-popup-header {{isFull?'full-header':''}}" wx:else>
-        <image
-          class="back"
-          catch:tap="toBack"
-          src="https://commonresource-1252524126.cdn.xiaoeknow.com/image/lujhtux80wc4.png"
-        />
-        <view class="title">查看已获得的奖励</view>
-        <image
-          class="reward-close {{isFull?'hidden':''}}"
-          catch:tap="closePop"
-          src="https://commonresource-1252524126.cdn.xiaoeknow.com/image/ltqynesn0a7n.png"
-        />
-      </view>
-    </view>
-
-    <!-- 内容 -->
-    <view slot="content" class="popup-content" style="{{popupContentBackground}}">
-      <view class="withdraw-tips" wx:if="{{isShowTips && isShowTaskList}}">
-        <text class="left">请24小时内领取红包奖励,超时无法领取</text>
-        <text class="right" bindtap="openRedpacketRewardList">前往查看 ></text>
-      </view>
-
-      <task-list
-        wx:if="{{isShowTaskList}}"
-        taskList="{{taskList}}"
-        errorList="{{errorList}}"
-        viewingInProgress="{{viewingInProgress}}"
-        bind:btnClick="btnClick"
-        bind:onLoad="onLoad"
-        refreshStatus="{{taskListRefreshStatus}}"
-        teamId="{{teamId}}"
-      />
-      <reward-list
-        wx:else
-        rewardList="{{rewardList}}"
-        bind:btnClick="btnClick"
-        bind:onLoad="onLoad"
-        bind:getMoreList="getMoreList"
-        refreshStatus="{{rewardListRefreshStatus}}"
-        teamId="{{teamId}}"
-        isNewChants="{{isNewChants}}"
-        roomInfo="{{roomInfo}}"
-        bind:successWithDraw="closePop"
-      />
-    </view>
-  </custom-popup>
-</view>
+<view class="task-popup">
+  <custom-popup
+    showPopup="{{showPopup}}"
+    popPosition="{{ popPosition }}"
+    customStyle="{{ customStyle+'overflow:visible' }}"
+    zIndex="{{100}}"
+    bind:onClose="closePop"
+    bind:onOverlayClick="closePop"
+    overlay-style="{{ 'background-color: rgba(0, 0, 0, 0.8)' }}"
+    popupHeaderStyle="{{'background:none;'}}{{isFull&&isShowTaskList?'height:20.27vmin':''}}"
+    customBoxStyle="{{'position: absolute;top: -23vmin;left: 0'}}"
+    contentStyle="{{'background:none;'}}"
+  >
+    <view slot="custom">
+      <view class="decorate" wx:if="{{isShowTaskList}}">
+        <image
+          class="gift-box {{!isShowClose?'hidden':''}}"
+          catch:tap="closePop"
+          src="https://commonresource-1252524126.cdn.xiaoeknow.com/image/ltp8c6ta0hqr.png"
+        />
+        <image
+          class="close {{!isShowClose || orientation ==='hor'?'hidden':''}}"
+          catch:tap="closePop"
+          src="https://commonresource-1252524126.cdn.xiaoeknow.com/image/ltpim6f50pg3.png"
+        />
+      </view>
+    </view>
+    <!-- 标题 -->
+    <view slot="header">
+      <!-- 任务列表 -->
+      <view class="task-popup-header {{isFull?'full-header':''}}" wx:if="{{isShowTaskList}}">
+        <view class="to-reward {{!hasRewardRecord?'not-reward':''}}" catch:tap="toReward">
+          <view>查看已获得的奖励</view>
+          <image
+            src="{{!hasRewardRecord?'https://commonresource-1252524126.cdn.xiaoeknow.com/image/ltqy1jr30j0y.png':'https://commonresource-1252524126.cdn.xiaoeknow.com/image/ltqygc7b0sll.png'}}"
+          />
+        </view>
+      </view>
+
+      <!-- 奖励列表 -->
+      <view class="reward-popup-header {{isFull?'full-header':''}}" wx:else>
+        <image
+          class="back"
+          catch:tap="toBack"
+          src="https://commonresource-1252524126.cdn.xiaoeknow.com/image/lujhtux80wc4.png"
+        />
+        <view class="title">查看已获得的奖励</view>
+        <image
+          class="reward-close {{isFull?'hidden':''}}"
+          catch:tap="closePop"
+          src="https://commonresource-1252524126.cdn.xiaoeknow.com/image/ltqynesn0a7n.png"
+        />
+      </view>
+    </view>
+
+    <!-- 内容 -->
+    <view slot="content" class="popup-content" style="{{popupContentBackground}}">
+      <view class="withdraw-tips" wx:if="{{isShowTips && isShowTaskList}}">
+        <text class="left">请24小时内领取红包奖励,超时无法领取</text>
+        <text class="right" bindtap="openRedpacketRewardList">前往查看 ></text>
+      </view>
+
+      <task-list
+        wx:if="{{isShowTaskList}}"
+        taskList="{{taskList}}"
+        errorList="{{errorList}}"
+        viewingInProgress="{{viewingInProgress}}"
+        bind:btnClick="btnClick"
+        bind:onLoad="onLoad"
+        refreshStatus="{{taskListRefreshStatus}}"
+        teamId="{{teamId}}"
+      />
+      <reward-list
+        wx:else
+        rewardList="{{rewardList}}"
+        bind:btnClick="btnClick"
+        bind:onLoad="onLoad"
+        bind:getMoreList="getMoreList"
+        refreshStatus="{{rewardListRefreshStatus}}"
+        teamId="{{teamId}}"
+        isNewChants="{{isNewChants}}"
+        roomInfo="{{roomInfo}}"
+        bind:successWithDraw="closePop"
+      />
+    </view>
+  </custom-popup>
+</view>