xiaoe_mp_npm 1.0.21 → 1.0.22-store2

package/miniprogram_dist/LiveGoodsList/index.less

@@ -1,53 +1,53 @@
-
-.box {
-  margin: 0 1.6vmin;
-}
-
-.title {
-  margin: 0;
-  padding: 4.27vmin 2.13vmin 2.13vmin;
-  color: rgba(69, 90, 100, 0.6);
-  font-weight: normal;
-  font-size: 2.4vmin;
-  line-height: 2.67vmin;
-  text-align: center;
-}
-
-.btn {
-  display: block;
-  width: 100%;
-  margin: 1.33vmin 0;
-  background-color: #fff;
-}
-.page-main{
-  height: 100%;
-}
-  .goods-list{
-    box-sizing: border-box;
-    min-height: 40vmin;
-    display: flex;
-    flex-direction: column;
-    height: 100%;
-    .finished-text{
-      display: flex;
-      justify-content: center;
-      color: #999;
-      font-size: 3.73vmin;
-      padding-bottom: 2.67vmin;
-    }
-    .no-data{
-      display: flex;
-      flex-direction: column;
-      align-items: center;
-      padding-top: 10.67vmin;
-      .no-data-png{
-        width: 23.47vmin;
-        height: 23.47vmin;
-      }
-      .no-data-text{
-        color: #999999;
-        font-size: 3.73vmin;
-        margin-top: 4.27vmin;
-      }
-    }
-}
+
+.box {
+  margin: 0 1.6vmin;
+}
+
+.title {
+  margin: 0;
+  padding: 4.27vmin 2.13vmin 2.13vmin;
+  color: rgba(69, 90, 100, 0.6);
+  font-weight: normal;
+  font-size: 2.4vmin;
+  line-height: 2.67vmin;
+  text-align: center;
+}
+
+.btn {
+  display: block;
+  width: 100%;
+  margin: 1.33vmin 0;
+  background-color: #fff;
+}
+.page-main{
+  height: 100%;
+}
+  .goods-list{
+    box-sizing: border-box;
+    min-height: 40vmin;
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+    .finished-text{
+      display: flex;
+      justify-content: center;
+      color: #999;
+      font-size: 3.73vmin;
+      padding-bottom: 2.67vmin;
+    }
+    .no-data{
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      padding-top: 10.67vmin;
+      .no-data-png{
+        width: 23.47vmin;
+        height: 23.47vmin;
+      }
+      .no-data-text{
+        color: #999999;
+        font-size: 3.73vmin;
+        margin-top: 4.27vmin;
+      }
+    }
+}

package/miniprogram_dist/LiveGoodsList/index.scss

@@ -1,93 +1,93 @@
-$deviceWidth: 750;
-@function vmin($rpx) {
-  @return #{$rpx * 100 / $deviceWidth}vmin;
-}
-
-@mixin goods-list-box {
-
-  .goods-list-box-popup {
-    width: vmin(750);
-  }
-  
-  .box {
-    margin: 0 vmin(12);
-  }
-
-  .title {
-    margin: 0;
-    padding: vmin(32) vmin(16) vmin(16);
-    color: rgba(69, 90, 100, 0.6);
-    font-weight: normal;
-    font-size: vmin(18);
-    line-height: vmin(20);
-    text-align: center;
-  }
-
-  .btn {
-    display: block;
-    width: 100%;
-    margin: vmin(10) 0;
-    background-color: #fff;
-  }
-  .page-main {
-    height: 100%;
-  }
-  .goods-list {
-    box-sizing: border-box;
-    min-height: 40vmin;
-    display: flex;
-    flex-direction: column;
-    height: 100%;
-    .finished-text {
-      display: flex;
-      justify-content: center;
-      color: #999;
-      font-size: vmin(28);
-      padding-bottom: vmin(20);
-    }
-    .no-data {
-      display: flex;
-      flex-direction: column;
-      align-items: center;
-      padding-top: vmin(80);
-      .no-data-png {
-        width: vmin(176);
-        height: vmin(176);
-      }
-      .no-data-text {
-        color: #999999;
-        font-size: vmin(28);
-        margin-top: vmin(32);
-      }
-    }
-  }
-}
-
-
-.goods-list-box {
-  @include goods-list-box;
-}
-// 竖屏pad
-@media screen and (min-width: 768px) and (orientation: portrait) {
-  $deviceWidth: 1536 !global;
-
-  .goods-list-box {
-      @include goods-list-box;
-  }
-}
-// PC 放大适配
-@media screen and (min-height: 630px) and (orientation: landscape) {
-  $deviceWidth: 1260 !global;
-
-  .goods-list-box {
-    @include goods-list-box;
-  }
-}
-// 横屏pad
-@media screen and (min-height: 768px) and (orientation: landscape) {
-  $deviceWidth: 1536 !global;
-
-  .goods-list-box {
-      @include goods-list-box;
-  }
+$deviceWidth: 750;
+@function vmin($rpx) {
+  @return #{$rpx * 100 / $deviceWidth}vmin;
+}
+
+@mixin goods-list-box {
+
+  .goods-list-box-popup {
+    width: vmin(750);
+  }
+  
+  .box {
+    margin: 0 vmin(12);
+  }
+
+  .title {
+    margin: 0;
+    padding: vmin(32) vmin(16) vmin(16);
+    color: rgba(69, 90, 100, 0.6);
+    font-weight: normal;
+    font-size: vmin(18);
+    line-height: vmin(20);
+    text-align: center;
+  }
+
+  .btn {
+    display: block;
+    width: 100%;
+    margin: vmin(10) 0;
+    background-color: #fff;
+  }
+  .page-main {
+    height: 100%;
+  }
+  .goods-list {
+    box-sizing: border-box;
+    min-height: 40vmin;
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+    .finished-text {
+      display: flex;
+      justify-content: center;
+      color: #999;
+      font-size: vmin(28);
+      padding-bottom: vmin(20);
+    }
+    .no-data {
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      padding-top: vmin(80);
+      .no-data-png {
+        width: vmin(176);
+        height: vmin(176);
+      }
+      .no-data-text {
+        color: #999999;
+        font-size: vmin(28);
+        margin-top: vmin(32);
+      }
+    }
+  }
+}
+
+
+.goods-list-box {
+  @include goods-list-box;
+}
+// 竖屏pad
+@media screen and (min-width: 768px) and (orientation: portrait) {
+  $deviceWidth: 1536 !global;
+
+  .goods-list-box {
+      @include goods-list-box;
+  }
+}
+// PC 放大适配
+@media screen and (min-height: 630px) and (orientation: landscape) {
+  $deviceWidth: 1260 !global;
+
+  .goods-list-box {
+    @include goods-list-box;
+  }
+}
+// 横屏pad
+@media screen and (min-height: 768px) and (orientation: landscape) {
+  $deviceWidth: 1536 !global;
+
+  .goods-list-box {
+      @include goods-list-box;
+  }
 }

package/miniprogram_dist/Task/TaskBubble/index.js

@@ -9,7 +9,8 @@ const task_title = {
     "6": "完成打赏",
     "7": "完成投票",
     "8": "完成问卷",
-    "9": "完成签到"
+    "9": "完成签到",
+    "10": "完成答题"
   }
 }
 Component({

package/miniprogram_dist/Task/TaskPopup/component/RewardList/index.js

@@ -2,38 +2,40 @@ const computedBehavior = require('miniprogram-computed').behavior
 Component({
   behaviors: [computedBehavior],
   properties: {
-    rewardList:{
-      type:Array,
-      value:()=>{
+    rewardList: {
+      type: Array,
+      value: () => {
         return []
-      }
+      },
+    },
+    refreshStatus: {
+      type: Boolean,
+      value: false,
+    },
+    teamId: {
+      type: String,
+      value: '',
     },
-    refreshStatus:{
-      type:Boolean,
-      value: false
-    }
   },
   data: {
-    activeNames:["1"],
+    activeNames: ['1'],
   },
   lifetimes: {
     // 生命周期函数，可以为函数，或一个在methods段中定义的方法名
-    attached: function () {
-
-    },
-    moved: function () { },
-    detached: function () { },
+    attached: function () {},
+    moved: function () {},
+    detached: function () {},
   },
   methods: {
-    btnClick(e){
-      this.triggerEvent("btnClick",e.detail)
+    btnClick(e) {
+      this.triggerEvent('btnClick', e.detail)
+    },
+    onLoad() {
+      this.triggerEvent('onLoad', 'rewardList')
     },
-    onLoad(){
-      this.triggerEvent("onLoad","rewardList")
+    getMoreList() {
+      this.triggerEvent('getMoreList', 'rewardList')
     },
-    getMoreList(){
-      this.triggerEvent("getMoreList","rewardList")
-    }
   },
   observers: {},
 })

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

@@ -15,5 +15,6 @@
     taskItem="{{item}}"
     bind:btnClick="btnClick"
     isMb="{{true}}"
+    teamId="{{teamId}}"
   />
 </scroll-view>