1

46abf8bf · wildfirecode13 · da00b554 · 46abf8bf · 46abf8bf · 46abf8bf
Commit 46abf8bf authored Sep 21, 2020 by wildfirecode13
50 changed files
--- a/.DS_Store
+++ b/.DS_Store
--- a/project/src/canvas/game/output.js
+++ b/project/src/canvas/game/output.js
--- a/project/src/canvas/game/output.js.map
+++ b/project/src/canvas/game/output.js.map
--- a/project/src/canvas/game/released/output.js
+++ b/project/src/canvas/game/released/output.js
--- a/taobao_mini/.DS_Store
+++ b/taobao_mini/.DS_Store
--- a/taobao_mini/client/api.js
+++ b/taobao_mini/client/api.js
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
 const app = getApp();
 const { tbcc, cloudName, cloud, requestType } = app;
 const { utils: { generateAPI }, request: tbccRequest, capi } = tbcc;
-const apicfg_1 = require("./apicfg");
 const request = tbccRequest({
-    cloud,
+  cloud,
-    cloudName,
+  cloudName,
-    requestType
+  requestType
 });
 // api handle 列表
-const apiList = Object.assign(Object.assign({}, capi), apicfg_1.default);
+const apiList = {
+  ...capi,
+  receiveObjectPrize: {
+    handle: 'receiveObjectPrize',
+    method:'get',
+    isShowLoading: false
+  },
+  receiveEnamePrize: {
+    handle: 'receiveEnamePrize',
+    method:'get',
+    isShowLoading: false
+  },
+  getMyPrizeList: {
+    handle: 'getMyPrizeList',
+    method:'get',
+    isShowLoading: false
+  },
+  getActivityBaseInfoById: {
+    handle: 'getActivityBaseInfoById',
+    method:'get',
+    isShowLoading: false
+  },
+  login: {
+    handle: 'login',
+    method:'get',
+    isShowLoading: false
+  }
+};
 // 生成API
 const API = generateAPI(apiList, request);
-exports.default = API;
-//# sourceMappingURL=api.js.map1
+export default API;
\ No newline at end of file
--- a/taobao_mini/client/apicfg.js
+++ b/taobao_mini/client/apicfg.js
-let projectId = window.CFG.projectId || '';
+let projectId = '';
 const apiCfg = {
    getRule:`/projectx/${projectId}/projectRule.query`,

--- a/taobao_mini/client/app.js
+++ b/taobao_mini/client/app.js
-"use strict";
+import cloud from '@tbmp/mp-cloud-sdk';
-Object.defineProperty(exports, "__esModule", { value: true });
+import tbcc from './tbcc-sdk';
-const mp_cloud_sdk_1 = require("@tbmp/mp-cloud-sdk");
-const tbcc_sdk_1 = require("./tbcc-sdk");
+cloud.init({
-mp_cloud_sdk_1.default.init({
+  env: 'online' // 云函数环境 test 测试环境 online 线上环境
-    env: 'test' // 云函数环境 test 测试环境 online 线上环境
 });
 App({
-    requestType: 'cloud',
+  requestType: 'cloud', // yapi，cloud: 云函数
-    cloudName: '',
+  // requestType: 'yapi', // yapi，cloud: 云函数
-    cloud: // 主云函数项目名
+  cloudName: 'floor', // 主云函数项目名 base clientTemplate2C
-    mp_cloud_sdk_1.default,
+  cloud,
-    tbcc: tbcc_sdk_1.default,
+  tbcc,
-    activityId: "",
+  onLaunch(options) {
-    onLaunch(options) {
+    this.handleQuery(options.query || {});
-        this.handleQuery(options.query || {});
+  },
-        console.log('onLauch')
+  onShow(options) {
-    },
+    // 从后台被 scheme 重新打开
-    onShow(options) {
+    console.log('执行了app onshow')
-        // 从后台被 scheme 重新打开
+  },
-    },
+  /**
-    /**
+   * 处理链接参数
-     * 处理链接参数
+   * @param {object} query 小程序链接上的参数
-     * @param {object} query 小程序链接上的参数
+   */
-     */
+  handleQuery(query) {
-    handleQuery(query) {
+    const { activityId } = query;
-        const { activityId } = query;
+    // this.activityId = activityId || '5f505873738989c8b356e284';
-        activityId && (this.activityId = activityId);
+    this.activityId = activityId || '5f5c687685a74964233cd5ff';
-    }
+    // this.activityId = activityId || '5f5759b2114fbb8f6d91245c';//商家创建的测试环境活
+  }
 });
-//# sourceMappingURL=app.js.map
\ No newline at end of file
--- a/taobao_mini/client/app.json
+++ b/taobao_mini/client/app.json
 {
    "pages": [
-        "pages/pageshop/pageshop",
+        "pages/index/index",
-        "pages/pagecanvas/pagecanvas"
+        "pages/pagecanvas/pagecanvas",
+        "pages/pageshop/pageshop"
    ],
    "window": {
        "enableSkia": "true",

--- a/taobao_mini/client/components/commonModal/commonModal.acss
+++ b/taobao_mini/client/components/commonModal/commonModal.acss
+.common-modal {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 20;
+}
+.common-modal__shade {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background-color: rgba(0, 0, 0, 0.75);
+}
+.common-modal__container {
+  position: absolute;
+  width: 500rpx;
+  height: 300rpx;
+  background: #4eafd7;
+  background-size: 100% 100%;
+  left: 50%;
+  top: 50%;
+  margin-left: -250rpx;
+  margin-top: -150rpx;
+  padding: 30rpx;
+}
+.common-modal__bd {
+  font-size: 28rpx;
+  text-align: center;
+  color: #fff;
+  padding: 50rpx 0;
+}
+.common-modal__close {
+  position: absolute;
+  right: -20rpx;
+  top: -80rpx;
+  height: 86rpx;
+  width: 86rpx;
+  background: url('../../assets/modal_close_btn.png') center center no-repeat;
+  background-size: 48rpx 48rpx;
+  z-index: 9;
+}
+.common-modal__confirm-btn {
+  margin: 0 auto;
+  text-align: center;
+  width: 341rpx;
+  height: 77rpx;
+  line-height: 77rpx;
+  background: #FFF;
+  background-size: 100% 100%;
+  font-size: 30rpx;
+  color: #0077a9;
+  font-weight: bold;
+}
--- a/taobao_mini/client/components/commonModal/commonModal.axml
+++ b/taobao_mini/client/components/commonModal/commonModal.axml
+<view class="common-modal">
+	<view class="common-modal__shade modal-animate-fade-in" />
+	<view class="common-modal__container modal-animate-zoom-in">
+		<view class="common-modal__close" onTap="onModalClose" />
+		<view class="common-modal__bd">
+			<text>{{data.content}}</text>
+    </view>
+		<view class="common-modal__ft" a:if="{{data.btnText}}">
+      <view onTap="onModalConfirm" class="common-modal__confirm-btn">{{data.btnText}}</view>
+    </view>
+	</view>
+</view>
--- a/taobao_mini/client/components/commonModal/commonModal.js
+++ b/taobao_mini/client/components/commonModal/commonModal.js
+Component({
+  methods: {
+    onModalClose() {
+      const { onModalClose } = this.props;
+      onModalClose && onModalClose();
+    },
+    onModalConfirm () {
+      const { onModalConfirm } = this.props;
+      onModalConfirm && onModalConfirm();
+    }
+  }
+});
\ No newline at end of file
--- a/taobao_mini/client/components/commonModal/commonModal.json
+++ b/taobao_mini/client/components/commonModal/commonModal.json
+{
+  "component": true
+}
\ No newline at end of file
--- a/taobao_mini/client/components/countDownModal/countDownModal.acss
+++ b/taobao_mini/client/components/countDownModal/countDownModal.acss
+.countdown {
+  position: fixed;
+  width: 144rpx;
+  height: 162rpx;
+  right: 0;
+  top: 600rpx;
+}
+.countdown-box-clock {
+    position: absolute;
+    top: 0;
+    left: 50%;
+    margin-left: -41rpx;
+    width: 82rpx;
+    height: 88rpx;
+    background-size: 100% 100%;
+    z-index: 10;
+}
+.countdown-box-clock__time {
+    position: absolute;
+    top: 5rpx;
+    left: 0;
+    width: 82rpx;
+    height: 88rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+.countdown-box-clock image {
+    width: 100%;
+    height: 100%;
+}
+.countdown-box {
+  position: absolute;
+  width: 130rpx;
+  height: 18rpx;
+  border-radius: 10rpx;
+  border: 1px solid #a6fffe;
+  background: #111192;
+  box-shadow: 0 0 4rpx 1rpx #7fd5ff;
+  top: 25rpx;
+  bottom: 20rpx;
+  left: 0;
+  right: 0;
+  margin: auto;
+  overflow: hidden;
+  z-index: 11;
+}
+@keyframes countdownAnimation {
+  to {
+    transform: translateX(0);
+  }
+}
+.countdown-box .countdown-time {
+  height: 100%;
+  width: 100%;
+  background: linear-gradient(#3996f8, #19dffd);
+}
+.countdown-txt {
+  position: absolute;
+  width: 147rpx;
+  height: 91rpx;
+  bottom: 0rpx;
+  z-index: 1;
+}
+.countdown-txt image {
+    width: 100%;
+    height: 100%;
+}
+.countdown-txt__content {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    line-height: 25rpx;
+    color: #2A2A2A;
+    text-align: center;
+    font-size: 20rpx;
+}
+.countdown-txt .txt:first-child{
+    margin-top: 25rpx;
+}
+.countdown-two {
+  position: absolute;
+  width: 554rpx;
+  height: 104rpx;
+  left: 50%;
+  margin-left: -277rpx;
+  bottom: 70rpx;
+}
+.countdown-two-clock {
+  position: absolute;
+  right: -10rpx;
+  bottom: 10rpx;
+  width: 104rpx;
+  height: 95rpx;
+  z-index: 15;
+}
+.countdown-two-clock image {
+  width: 100%;
+  height: 100%;
+}
+.countdown-two-clock .countdown-box-clock__time {
+  position: absolute;
+  top: 5rpx;
+  left: 0;
+  width: 104rpx;
+  height: 95rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.countdown-two-clock .countdown-box{
+  position: absolute;
+  left: 0;
+  bottom: -20rpx;
+}
+.countdown-two-txt {
+  position: absolute;
+  right: 90rpx;
+  top: 5rpx;
+  width: 323rpx;
+  height: 60rpx;
+  z-index: 14;
+  background: url('//yun.dui88.com/taobaomini/clientCTest/count_bg_02@2x.png');
+  background-size: 100% 100%;
+  color: #2A2A2A;
+  text-align: center;
+  font-size: 20rpx;
+  line-height: 60rpx;
+}
+.countdown-two-txt image {
+  position: absolute;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  z-index: 14;
+}
+.countdown-two__content {
+  position: absolute;
+  left: 0;
+  top: 0;
+  width: 323rpx;
+  height: 60rpx;
+  color: #2A2A2A;
+  text-align: center;
+  font-size: 20rpx;
+}
\ No newline at end of file
--- a/taobao_mini/client/components/countDownModal/countDownModal.axml
+++ b/taobao_mini/client/components/countDownModal/countDownModal.axml
+<view class="countdown" a:if="{{styleType == '01'}}">
+  <view class="countdown-box-clock">
+    <image mode="scaleToFill" src="{{data.clock_bg}}"/>
+    <view class="countdown-box-clock__time" style="{{{'color':data.countTxtColor,'fontSize':data.countTxtSize+'rpx'}}}">{{countTime}}</view>
+  </view>
+  <view class="countdown-box" style="{{{'height':data.progressHeight+'rpx','width':data.progressWidth+'rpx'}}}">
+    <view class="countdown-time" style="transform: translateX({{percent*10 -100}}%);animation: countdownAnimation {{countTime-percent}}s forwards linear;"></view>
+  </view>
+  <view class="countdown-txt">
+    <image mode="scaleToFill" src="{{data.textBg}}"/>
+    <view class="countdown-txt__content">
+      <view class="txt">{{data.text.split('\n')[0]}}</view>
+      <view class="txt">{{data.text.split('\n')[1]}}</view>
+    </view>
+  </view>
+</view>
+<view class="countdown-two" a:else>
+  <view class="countdown-two-clock">
+    <image mode="scaleToFill" src="{{data.clock_bg}}"/>
+    <view class="countdown-box-clock__time" style="{{{'color':data.countTxtColor,'fontSize':42+'rpx'}}}">{{countTime}}</view>
+  </view>
+  <view class="countdown-box" style="{{{'height':55+'rpx','width':490+'rpx'}}}">
+    <view class="countdown-time" style="transform: translateX({{percent*10 -100}}%);animation: countdownAnimation {{countTime-percent}}s forwards linear;"></view>
+  </view>
+  <view class="countdown-two-txt" style="{{{'background':`url(${data.textBg}) no-repeat`,'backgroundSize': '100% 100%'}}}">
+    {{data.text}}
+  </view>
+</view>
--- a/taobao_mini/client/components/countDownModal/countDownModal.js
+++ b/taobao_mini/client/components/countDownModal/countDownModal.js
+/**
+ * data: {
+ *  text: //文案描述
+ *  textBg: //文案背景
+ *  progressWidth: //进度条宽
+ *  progressHeight: //进度条高
+ *  clock_bg: //时钟icon
+ *  countTxt: //时钟文案
+ *  countTxtColor: //时钟文字颜色
+ *  countTxtSize: //时钟文字大小
+ * }
+ *  usePercent: //已执行时长
+ *  countTime: //倒计时长
+ *  styleType: //样式（01——右对齐，02—底部）
+ */
+Component({
+  mixins: [],
+  data: {},
+  props: {
+    percent: 10,
+    usePercent:0,
+    countTime: 10,
+    styleType: '01',//browse_txt_bg count_bg_02
+    data: {
+      text: '浏览商品10s，获得任务奖励',
+      textBg: '//yun.dui88.com/taobaomini/clientCTest/count_bg_02@2x.png',
+      progressWidth:'130',
+      progressHeight:'18',
+      clock_bg: '//yun.dui88.com/taobaomini/clientCTest/clock@2x.png',
+      countTxt: '10',
+      countTxtColor: '#1CA4ED',
+      countTxtSize: '32'
+    }
+  },
+  didMount() { },
+  didUpdate() {},
+  didUnmount() { },
+  methods: {},
+});
--- a/taobao_mini/client/components/countDownModal/countDownModal.json
+++ b/taobao_mini/client/components/countDownModal/countDownModal.json
+{
+  "component": true
+}
\ No newline at end of file
--- a/taobao_mini/client/components/endModal/endModal.acss
+++ b/taobao_mini/client/components/endModal/endModal.acss
+.end-modal-container {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    width: 100%;
+    min-height: 100vh;
+    /* background: url('//yun.dui88.com/taobaomini/clientCTest/end_bg@2x.png') no-repeat; */
+    background-size: 750rpx 1624rpx;
+    overflow: hidden;
+    z-index: 20;
+}
+.end-modal-container-content {
+    position: absolute;
+    width: 750rpx;
+    height: 480rpx;
+    top: 50%;
+    left: 0;
+    margin-top: -240rpx;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    align-items: center;
+}
+.end-modal-container-content__icon {
+    width: 478rpx;
+    height: 340rpx;
+}
+.end-modal-container-content__icon image {
+    width: 100%;
+    height: 100%;
+}
+.end-modal-container-content__desc {
+    font-size: 36rpx;
+    font-family: Source Han Sans CN;
+    font-weight: 400;
+    color: #ADADAD;
+}
\ No newline at end of file
--- a/taobao_mini/client/components/endModal/endModal.axml
+++ b/taobao_mini/client/components/endModal/endModal.axml
+<view class="end-modal-container" style="{{{'background':`url(${data.image.bg}) no-repeat`}}}">
+  <view class="end-modal-container-content">
+    <view class="end-modal-container-content__icon">
+      <image mode="scaleToFill" src="{{data.image.end_icon}}"/>
+    </view>
+    <view class="end-modal-container-content__desc">{{data.text}}</view>
+  </view>
+</view>
\ No newline at end of file
--- a/taobao_mini/client/components/endModal/endModal.js
+++ b/taobao_mini/client/components/endModal/endModal.js
+Component({
+  mixins: [],
+  data: {},
+  props: {
+    data: {
+      image: {
+        bg: '//yun.dui88.com/taobaomini/clientCTest/end_bg@2x.png',
+        end_icon: '//yun.dui88.com/taobaomini/clientCTest/end_icon@2x.png',
+      },
+      text: '活动未开始'
+    }
+  },
+  didMount() {},
+  didUpdate() {},
+  didUnmount() {},
+  methods: {},
+});
--- a/taobao_mini/client/components/endModal/endModal.json
+++ b/taobao_mini/client/components/endModal/endModal.json
+{
+  "component": true
+}
\ No newline at end of file
--- a/taobao_mini/client/components/goodsModal/goodsModal.acss
+++ b/taobao_mini/client/components/goodsModal/goodsModal.acss
+.goods-modal-container {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    width: 100%;
+    min-height: 100vh;
+    /* background: url('//yun.dui88.com/taobaomini/clientCTestgoods_bg@2x.png') no-repeat; */
+    background-size: 750rpx 1624rpx;
+    overflow: hidden;
+    z-index: 20;
+}
+.goods-modal-container__title {
+    width: 750rpx;
+    height: 120rpx;
+    margin: 29rpx 0 11rpx;
+}
+.goods-modal-container__banner {
+    width: 750rpx;
+    height: 400rpx;
+    margin-bottom: 30rpx;
+    background: #E1E1E1;
+}
+.goods-modal-container__content {
+    position: absolute;
+    top: 190rpx;
+    left: 0;
+    bottom: 0;
+    padding-top: 41rpx;
+    padding: 41rpx 25rpx 0;
+    width: 750rpx;
+    /* height: inherit; */
+}
+.goods-modal-container__scroll {
+    height: 100%;
+}
+.goods-modal-container__content-list {
+    width: 100%;
+    display: flex;
+    flex-wrap: wrap;
+}
+.goods-modal-container__content-item {
+    width: 340rpx;
+    height: 510rpx;
+    background: #fff;
+    margin-bottom: 20rpx;
+}
+.goods-modal-container__content-item:nth-child(even) {
+    margin-left: 20rpx;
+}
+.goods-modal-container__content-item__img {
+    width: 340rpx;
+    height: 340rpx;
+    background: #E1E1E1;
+}
+.goods-modal-container__content-item__img image {
+    width: 100%;
+    height: 100%;
+}
+.goods-modal-container__content-item__name {
+    margin: 25rpx 0 31rpx 21rpx;
+    width:310rpx;
+    height:60rpx;
+    font-size:24rpx;
+    font-family:PingFang SC;
+    font-weight:400;
+    color:rgba(24,24,24,1);
+    line-height:30rpx;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -webkit-line-clamp: 2;
+    -webkit-box-orient: vertical;
+}
+.goods-modal-container__content-item__price {
+    padding: 0 31rpx 0 24rpx;
+    display: flex;
+    justify-content: space-between;
+}
+.goods-modal-container__content-item__price-num {
+    font-size:32rpx;
+    font-family:PingFang SC;
+    font-weight:600;
+    color:rgba(255,42,0,1);
+}
+.goods-modal-container__content-item__price-num text {
+    font-size: 24rpx;
+    margin-right: 2rpx;
+}
+.goods-modal-container__content-item__price-collect {
+    width: 118rpx;
+    height: 31rpx;
+    background-size: 100% 100%;
+}
+.goods-modal-container__content-item__price-collect image {
+    width: 100%;
+    height: 100%;
+}
+.goods-modal-container__content-item__price-no-collect {
+    width: 30rpx;
+    height: 30rpx;
+}
+.goods-modal-container__content-item__price-no-collect image {
+    width: 100%;
+    height: 100%;
+}
+.goods-modal-timer {
+    width: 147rpx;
+    height: 223rpx;
+    position: absolute;
+    top: 502rpx;
+    right: 19rpx;
+    background: #eee;
+}
+.goods-modal-timer__clock {
+}
\ No newline at end of file
--- a/taobao_mini/client/components/goodsModal/goodsModal.axml
+++ b/taobao_mini/client/components/goodsModal/goodsModal.axml
+<view class="goods-modal-container" style="{{{'background':`url(${task.image.bg}) no-repeat`}}}">
+  <view a:if="{{task.type == '01'}}" 
+    style="{{{'background':`url(${task.image.title}) no-repeat`,'backgroundSize': '100% 100%'}}}" class="goods-modal-container__title"></view>
+  <view a:else class="goods-modal-container__banner" style="{{{'background':`url(${task.image.banner}) no-repeat`,'backgroundSize': '100% 100%','height':task.bannerHeight+'rpx'}}}"></view>
+  <view class="goods-modal-container__content" style="{{{'top':task.type == '02'?task.bannerHeight+'rpx':'149rpx'}}}">
+    <scroll-view scroll-y="{{true}}" class="goods-modal-container__scroll">
+      <view class="goods-modal-container__content-list">
+        <view class="goods-modal-container__content-item" a:for="{{goodsList}}" a:for-item="item">
+          <view class="goods-modal-container__content-item__img" data-item="{{item}}" onTap="goToGoodsDetail">
+            <image mode="scaleToFill" src="{{item.image}}"/>
+          </view>
+          <view class="goods-modal-container__content-item__name" style="{{{'color':task.color}}}">{{item.name}}</view>
+          <view class="goods-modal-container__content-item__price">
+            <view class="goods-modal-container__content-item__price-num"><text>¥</text>{{item.price}}</view>
+            <view a:if="{{task.taskType == 'collectGoods'}}"
+              data-item="{{item}}"
+              onTap="goToCollectGoods"
+              class="{{item.collected ? 'goods-modal-container__content-item__price-collect' : 'goods-modal-container__content-item__price-no-collect'}}"
+              >
+                <image mode="scaleToFill" src="{{item.collected?task.image.collect:task.image.no_collect}}"/>
+            </view>
+          </view>
+        </view>
+      </view>
+    </scroll-view>
+  </view>
+  <!-- 倒计时 -->
+  <count-down-modal a:if="{{isShowCountdown && task.taskType == 'browseGoods'}}" percent="{{percent}}" usePercent="{{usePercent}}" styleType="{{'01'}}" />
+</view>
\ No newline at end of file
--- a/taobao_mini/client/components/goodsModal/goodsModal.js
+++ b/taobao_mini/client/components/goodsModal/goodsModal.js
+/**
+ * 任务类型（taskType）:collectGoods、orderGoods、browseGoods、exchangeCredits
+ */
+const app = getApp();
+const { tbcc } = app;
+const { openDetail, collectGoods, checkGoodsCollectedStatus } = tbcc.tb;
+Component({
+  mixins: [],
+  timer: null,
+  data: {
+    usePercent: 0, // 已进行的进度条
+    percent: 0,// 进度条
+    isShowCountdown: true, // 是否显示倒计时
+    isFlag: 1
+  },
+  props: {
+    isBackFlag: 0,
+    goodsList: [1,2,3],
+    task: {
+      itemId: '617724147979,617724563528,617300295119,614139753189',
+      taskType: 'browseGoods',
+      type: '02',
+      bannerHeight: 430,
+      image: {
+        bg: '//yun.dui88.com/taobaomini/clientCTest/goods_bg@2x.png',
+        banner: '//yun.dui88.com/taobaomini/clientCTest/goods_banner@2x.png',
+        title: '//yun.dui88.com/taobaomini/clientCTest/goods_title@2x.png',
+        collect: '//yun.dui88.com/taobaomini/clientCTest/goods_collection@2x.png',
+        no_collect: '//yun.dui88.com/taobaomini/clientCTest/collection_no_collect@2x.png',
+        img: '//yun.dui88.com/taobaomini/clientCTest/goods_img@2x.png',
+      },
+      color: '#181818'
+    },
+    onCompleteTask: () => {}
+  },
+  didMount() {
+    const { taskType } = this.props.task
+    this.setData({ isFlag: this.props.isBackFlag })
+    console.log(this.props.goodsList)
+    if(taskType == 'browseGoods') {
+      this.browseGoodsTimes()
+    }
+  },
+  didUpdate(prevProps,prevData) { 
+    if(prevData.isFlag && prevProps.isBackFlag != prevData.isFlag) {
+      console.log(3)
+      if(!this.timer) {
+        this.setData({ usePercent: this.data.percent })
+        this.browseGoodsTimes()
+        console.log(10 - this.usePercent)
+      }
+    }
+  },
+  didUnmount() {
+    clearTimeout(this.timer)
+  },
+  methods: {
+    /**
+     * 跳转商品详情页
+     */
+    async goToGoodsDetail(e) {
+      clearInterval(this.timer)
+      this.setData({
+        percent: this.data.usePercent,
+      })
+      const { itemId } = e.target.dataset.item
+      await openDetail(String(itemId))
+    },
+    /**
+     * 收藏商品
+     */
+    async goToCollectGoods(e) {
+      const { itemId, collected } = e.target.dataset.item
+      const { taskType } = this.props.task
+      if(collected) return;
+      let result = await collectGoods(itemId)
+      if(result) {
+        this.props.onCompleteTask(taskType, itemId)
+      }
+    },
+    /**
+     * 浏览商品倒计时
+     */
+    browseGoodsTimes() {
+      const { taskType } = this.props.task
+      this.timer = setInterval(() => {
+        this.setData({
+          usePercent: this.data.usePercent + 1
+        }, () => {
+          if (this.data.usePercent >= 10) {
+            console.log(this.data.usePercent)
+            this.props.onCompleteTask(taskType)
+            clearInterval(this.timer)
+          }
+        })
+      },1000)
+    }
+  },
+});
--- a/taobao_mini/client/components/goodsModal/goodsModal.json
+++ b/taobao_mini/client/components/goodsModal/goodsModal.json
+{
+  "component": true,
+  "usingComponents": {
+    "count-down-modal": "/components/countDownModal/countDownModal"
+  }
+}
\ No newline at end of file
--- a/taobao_mini/client/components/logisticsModal/logisticsModal.acss
+++ b/taobao_mini/client/components/logisticsModal/logisticsModal.acss
+@keyframes modalAnimation {
+  to {
+    opacity: 1;
+  }
+}
+.logistics-modal-container {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background: rgba(0, 0, 0, 0.7);
+  z-index: 20;
+  opacity: 0;
+  animation: modalAnimation .3s forwards;
+}
+@keyframes containerAnimation {
+  to {
+    transform: scale(1)
+  }
+}
+.logistics-modal-container__content {
+  width: 646rpx;
+  height: 244rpx;
+  padding: 0 46rpx;
+  position: absolute;
+  left: 0;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  margin: auto;
+  display: flex;
+  align-items: center;
+  transform: scale(0);
+  animation: containerAnimation .3s forwards;
+}
+.logistics-modal-container__close {
+  position: absolute;
+  right: -10rpx;
+  top: -70rpx;
+  height: 48rpx;
+  width: 48rpx;
+  background: url("//yun.duiba.com.cn/taobaomini/aupresViva/tc_close.png") no-repeat;
+  background-size: 100% 100%;
+}
+.logistics-modal-container__content-item {
+  border-radius: 10rpx;
+  display: flex;
+}
+.logistics-modal-container__content-left {
+  width: 144rpx;
+  height: 144rpx;
+  background: rgba(244, 244, 244, 1);
+}
+.logistics-modal-container__content-left image {
+  width: 100%;
+  height: 100%;
+}
+.logistics-modal-container__content-right {
+  height: 144rpx;
+  margin-left: 24rpx;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  font-size: 20rpx;
+  color: #959595;
+  flex: 1;
+  overflow: hidden;
+  white-space: nowrap;
+}
+.logistics-modal-container__content-name {
+  font-size: 28rpx;
+  color: rgba(51, 51, 51, 1);
+}
+.logistics-modal-container__content-desc {
+  font-size: 20rpx;
+}
+.logistics-modal-container__content-ids {
+  margin-bottom: 20rpx;
+}
+.logistics-modal-container__content-copy {
+  display: flex;
+  align-items: center;
+  height: 30rpx;
+}
+.logistics-modal-container__content-copy__code {
+  font-size: 20rpx;
+}
+.logistics-modal-container__content-copy__img {
+  width: 20rpx;
+  height: 20rpx;
+  background-size: 100% 100%;
+  margin-left: 20rpx;
+}
\ No newline at end of file
--- a/taobao_mini/client/components/logisticsModal/logisticsModal.axml
+++ b/taobao_mini/client/components/logisticsModal/logisticsModal.axml
+<view class="logistics-modal-container">
+  <view class="logistics-modal-container__content" 
+  style="{{prizeItem.shipStatus == 3 ?`background: url(${task.shipped}) no-repeat;background-size: 100% 100%;`
+  :`background: url(${task.notShipped}) no-repeat;background-size: 100% 100%;`}}">
+    <view class="logistics-modal-container__close" onTap="closeModal"></view>
+    <view class="logistics-modal-container__content-item">
+      <view class="logistics-modal-container__content-left">
+        <image mode="scaleToFill" src="{{prizeItem.image}}"/>
+      </view>
+      <view class="logistics-modal-container__content-right">
+        <view class="logistics-modal-container__content-name">{{prizeItem.name}}</view>
+        <view class="logistics-modal-container__content-copy">
+          <view class="logistics-modal-container__content-copy__code">奖品编码：{{prizeItem._id}}</view>
+          <view class="logistics-modal-container__content-copy__img" onTap="copyPrizeId"></view>
+        </view>
+        <view class="logistics-modal-container__content-desc">{{prizeItem.shipStatus== 3?'发货状态：已发货':'发货状态：未发货'}}</view>
+        <view class="logistics-modal-container__content-desc" a:if="{{prizeItem.shipStatus == 2}}">温馨提示：奖品将在活动结束7天内陆续发出</view>
+        <view class="logistics-modal-container__content-copy" a:else>
+          <view class="logistics-modal-container__content-copy__code">{{'物流单号：'+prizeItem.shipNum}}</view>
+          <view class="logistics-modal-container__content-copy__img" style="{{`background: url(${task.copyIcon}) no-repeat;background-size: 100% 100%;`}}" onTap="copyCode"></view>
+        </view>
+      </view>
+    </view>
+  </view>
+</view>
\ No newline at end of file
--- a/taobao_mini/client/components/logisticsModal/logisticsModal.js
+++ b/taobao_mini/client/components/logisticsModal/logisticsModal.js
+const app = getApp();
+const { tbcc } = app;
+const { commonToast } = tbcc.tb;
+Component({
+  mixins: [],
+  data: {},
+  props: {
+    prizeItem: {},
+    onCloseModal: () => { },
+    task: {
+      shipped: '',
+      notShipped: '',
+    }
+  },
+  didMount() { },
+  didUpdate() { },
+  didUnmount() { },
+  methods: {
+    closeModal() {
+      this.props.onCloseModal()
+    },
+    //复制运单号
+    copyCode() {
+      let { shipNum } = this.props.prizeItem
+      my.setClipboard({
+        text: shipNum + '',
+        success: () => {
+          commonToast('复制成功')
+        }
+      });
+    },
+    copyPrizeId() {
+      let { _id } = this.props.prizeItem
+      my.setClipboard({
+        text: _id + '',
+        success: () => {
+          commonToast('复制成功')
+        }
+      });
+    }
+  },
+});
--- a/taobao_mini/client/components/logisticsModal/logisticsModal.json
+++ b/taobao_mini/client/components/logisticsModal/logisticsModal.json
+{
+  "component": true
+}
\ No newline at end of file
--- a/taobao_mini/client/components/prizeModal/prizeModal.acss
+++ b/taobao_mini/client/components/prizeModal/prizeModal.acss
+.my-prize-page {
+  width: 100vw;
+  height: 100vh;
+  opacity: 1;
+  position: absolute;
+  top: 0;
+  left: 0;
+  overflow: hidden;
+  /* background: url('') no-repeat center top/cover; */
+}
+.my-prize-page .my-prize-wrap {
+  width: 100%;
+  height: 100%;
+  overflow: auto;
+}
+.my-prize-page .my-prize-label {
+  width: 208rpx;
+  height: 36rpx;
+  margin: 140rpx auto 40rpx;
+  background: url('//yun.dui88.com/duiba-components-c-myprizeprize_title.png') no-repeat;
+  background-size: 100% 100%;
+}
+.my-prize-page .my-prize-list {
+  width: 100%;
+  height: auto;
+}
+.my-prize-page .my-prize-empty {
+  text-align: center;
+  color: #fff;
+  margin-top: 30rpx;
+}
+.my-prize-page .my-prize-item {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  padding: 0 28rpx 0 26rpx;
+  margin: 0 auto 24rpx;
+  position: relative;
+  box-sizing: border-box;
+  width: 700rpx;
+  height: 161rpx;
+  background-color: #ffffff;
+  box-shadow: 2rpx 3rpx 18rpx 0 rgba(230, 146, 255, 0.6);
+  border-radius: 10rpx;
+  box-sizing: border-box;
+}
+.my-prize-page .my-prize-item .my-prize-avatar {
+  width: 120rpx;
+  height: 120rpx;
+}
+.my-prize-page .my-prize-item .my-prize-content {
+  flex: 1;
+  min-width: 0;
+  padding: 0 20rpx;
+  display: flex;
+  flex-direction: column;
+  height: 130rpx;
+}
+.my-prize-page .my-prize-item .my-prize-subtitle {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.my-prize-page .my-prize-item .my-prize-copy {
+  width: 20rpx;
+  height: 20rpx;
+  margin-left: 18rpx;
+}
+.my-prize-page .my-prize-item .prize-status {
+  width: 150rpx;
+  height: 41rpx;
+}
+.prize-status>image {
+  width: 100%;
+  height: 100%;
+}
+.my-prize-page .my-prize-item .my-prize-name {
+  width: 100%;
+  font-size: 28rpx;
+  color: #2d2d2d;
+  letter-spacing: -1rpx;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.my-prize-page .my-prize-item .my-prize-tip {
+  margin-top: 8rpx;
+  font-size: 20rpx;
+  line-height: 20rpx;
+  letter-spacing: 0;
+  color: #8a8a8a;
+}
+.my-prize-page .my-prize-item .my-prize-code {
+  width: 290rpx;
+  font-family: PingFangSC-Regular;
+  font-size: 20rpx;
+  color: #8a8a8a;
+  letter-spacing: 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
\ No newline at end of file
--- a/taobao_mini/client/components/prizeModal/prizeModal.axml
+++ b/taobao_mini/client/components/prizeModal/prizeModal.axml
+<view class="my-prize-page" style="{{{'background':`url(${task.image.bg}) no-repeat center top/cover`}}}">
+  <view class="my-prize-wrap">
+    <view class="my-prize-label"></view>
+    <view class="my-prize-list" a:if="{{myPrizeList && myPrizeList.length > 0}}">
+      <view class="my-prize-item" a:for="{{myPrizeList}}">
+        <image class="my-prize-avatar" src="{{item.image}}"/>
+        <view class="my-prize-content">
+          <label class="my-prize-name">{{item.name}}</label>
+          <view class="my-prize-subtitle">
+            <label class="my-prize-code">奖品编码：{{item._id}}</label>
+            <!-- 复制按钮 -->
+            <image class="my-prize-copy" data-text="{{item._id}}" onTap="handleCopyId" src="{{task.image.copyIcon}}" />
+          </view>
+          <view class="my-prize-tip" a:if="{{item.drawStatus === PRIZE_DRAW_STATUS_MAPPRIZE_DRAW_STATUS_MAP.FAILURE}}">{{item.remark}}</view>
+          <view class="my-prize-tip" a:if="{{item.drawStatus === PRIZE_DRAW_STATUS_MAP.REPEAT || (item.drawStatus === PRIZE_DRAW_STATUS_MAP.RECEIVE)}}">请于{{endTime}}前领取</view>
+          <view class="my-prize-tip" a:if="{{item.drawStatus === PRIZE_DRAW_STATUS_MAP.FINISHED }}">奖品已过期失效</view>
+        </view>
+        <view class="prize-status" style="{{task.btnStyle}}">
+          <!-- 未领取 -->
+          <block a:if="{{item.drawStatus===PRIZE_DRAW_STATUS_MAP.RECEIVE}}">
+            <!-- 实物填写地址 -->
+            <image a:if="{{item.type === PRIZE_TYPE_MAP.ENTITY}}" onTap="handleClick" data-item="{{item}}" src="{{task.image.addressBth}}" />
+            <!-- 优惠券立即领取 -->
+            <image  a:else onTap="handleClick" data-item="{{item}}" src="{{task.image.getBth}}" />
+          </block>
+          <!-- 已领取 -->
+          <block a:if="{{item.drawStatus===PRIZE_DRAW_STATUS_MAP.SUCCESS}}">
+            <!-- 实物查看物流 -->
+            <image a:if="{{item.type === PRIZE_TYPE_MAP.ENTITY}}" onTap="handleView" data-item="{{item}}" src="{{task.image.logisticsBth}}" />
+            <!-- 优惠券去使用 -->
+            <image  a:else onTap="handleTouse" data-item="{{item}}" src="{{task.image.useBtn}}" />
+          </block>
+          <!-- 重新领取 -->
+          <image a:if="{{item.drawStatus===PRIZE_DRAW_STATUS_MAP.REPEAT}}" onTap="handleClick" data-item="{{item}}" src="{{task.image.getAgainBtn}}" />
+          <!-- 已失效 -->
+          <image a:if="{{item.drawStatus===PRIZE_DRAW_STATUS_MAP.FINISHED}}" src="{{task.image.invalidBtn}}" />
+          <!-- 领取失败 -->
+          <image a:if="{{item.drawStatus===PRIZE_DRAW_STATUS_MAP.FAILURE}}" src="{{task.image.failBth}}" />
+        </view>
+      </view>
+    </view>
+    <view a:if="{{myPrizeList && myPrizeList.length === 0}}" class="my-prize-empty">暂无奖品</view>
+  </view>
+  <logistics-modal a:if="{{isLogistic}}" prizeItem="{{currentPrize}}" onCloseModal="closeLogisticModal" task="{{task.logisticsImage}}"/>
+</view>
\ No newline at end of file
--- a/taobao_mini/client/components/prizeModal/prizeModal.js
+++ b/taobao_mini/client/components/prizeModal/prizeModal.js
+const app = getApp();
+const { tbcc } = app;
+const { commonToast, navigateToOutside, getUserAddress, setClipboard } = tbcc.tb;
+const { PRIZE_TYPE_MAP, PRIZE_DRAW_STATUS_MAP } = tbcc.constants;
+Component({
+  mixins: [],
+  data: {
+    PRIZE_TYPE_MAP,
+    PRIZE_DRAW_STATUS_MAP,
+    currentPrize: {},
+    isLogistic: false,
+  },
+  props: {
+    myPrizeList: null, //我的奖品
+    endTime: null,//到期时间
+    task: {
+      image: {},
+      logisticsImage: {},
+      btnStyle: {}
+    }
+  },
+  didMount() { },
+  didUpdate() { },
+  didUnmount() { },
+  methods: {
+    //领取奖品
+    handleClick(e) {
+      this.props.onHandleClick(e)
+    },
+    // 复制编码
+    handleCopyId(e) {
+      const { text } = e.target.dataset || {}
+      setClipboard({ text })
+      console.log(text)
+      commonToast('复制成功')
+    },
+    // 去使用
+    handleTouse(e) {
+      const { item } = e.target.dataset;
+      navigateToOutside(item.useUrl)
+    },
+    //查看物流
+    handleView(e) {
+      let { item } = e.target.dataset
+      this.setData({ currentPrize: item, isLogistic: true })
+    },
+    /**
+    * 关闭物流弹窗
+    */
+    closeLogisticModal() {
+      this.setData({ isLogistic: false })
+    },
+  },
+});
--- a/taobao_mini/client/components/prizeModal/prizeModal.json
+++ b/taobao_mini/client/components/prizeModal/prizeModal.json
+{
+  "component": true,
+  "usingComponents": {
+    "logistics-modal": "/components/logisticsModal/logisticsModal"
+  }
+}
\ No newline at end of file
--- a/taobao_mini/client/components/ruleModal/ruleModal.acss
+++ b/taobao_mini/client/components/ruleModal/ruleModal.acss
+.rule-modal {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 20;
+}
+.rule-modal__shade {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background-color: rgba(0, 0, 0, 0.75);
+}
+.rule-modal__container {
+  position: absolute;
+  width: 500rpx;
+  height: 600rpx;
+  background: #4eafd7;
+  background-size: 100% 100%;
+  left: 50%;
+  top: 50%;
+  margin-left: -250rpx;
+  margin-top: -300rpx;
+}
+.rule-modal__bd {
+  position: absolute;
+  top: 40rpx;
+  left: 40rpx;
+  right: 40rpx;
+  bottom: 40rpx;
+  overflow-x: hidden;
+  font-size: 24rpx;
+  color: #fff;
+  line-height: 1.5;
+}
+.rule-modal__close {
+  position: absolute;
+  right: -20rpx;
+  top: -80rpx;
+  height: 86rpx;
+  width: 86rpx;
+  background: url('../../assets/modal_close_btn.png') center center no-repeat;
+  background-size: 48rpx 48rpx;
+  z-index: 9;
+}
--- a/taobao_mini/client/components/ruleModal/ruleModal.axml
+++ b/taobao_mini/client/components/ruleModal/ruleModal.axml
+<view class="rule-modal">
+	<view class="rule-modal__shade modal-animate-fade-in" />
+	<view class="rule-modal__container modal-animate-zoom-in">
+		<view class="rule-modal__close" onTap="onModalClose" />
+		<view class="rule-modal__bd">
+			<slot />
+		</view>
+	</view>
+</view>
--- a/taobao_mini/client/components/ruleModal/ruleModal.js
+++ b/taobao_mini/client/components/ruleModal/ruleModal.js
+Component({
+  methods: {
+    onModalClose() {
+      const { onModalClose } = this.props;
+      onModalClose && onModalClose();
+    }
+  }
+});
\ No newline at end of file
--- a/taobao_mini/client/components/ruleModal/ruleModal.json
+++ b/taobao_mini/client/components/ruleModal/ruleModal.json
+{
+  "component": true
+}
--- a/taobao_mini/client/pages/index/index.acss
+++ b/taobao_mini/client/pages/index/index.acss
+.index-page {
+  min-height: 100vh;
+}
+.index-rule-btn, .index-myprize-btn {
+  position: absolute;
+  top: 30rpx;
+  width: 126rpx;
+  height: 48rpx;
+  line-height: 48rpx;
+  font-size: 22rpx;
+  background: rgba(0, 0, 0, 0.8);
+  color: #FFF;
+  text-align: center;
+  z-index: 5;
+}
+.index-rule-btn {
+  left: 0;
+  border-radius: 0 48rpx 48rpx 0;
+}
+.index-myprize-btn {
+  right: 0;
+  border-radius: 48rpx 0 0 48rpx;
+}
+.index-page__title {
+  font-size: 50rpx;
+  text-align: center;
+  padding: 100rpx 0 50rpx 0;
+}
+.index-page__content {
+  text-align: center;
+  font-size: 30rpx;
+}
+.index-page__tips {
+  padding-top: 40rpx;
+  text-align: center;
+  font-size: 22rpx;
+}
+.index-start-btn {
+  background: #0077a9;
+  color: #FFF;
+  width: 300rpx;
+  height: 80rpx;
+  line-height: 80rpx;
+  text-align: center;
+  border-radius: 10rpx;
+  margin: 100rpx auto 50rpx auto;
+  font-size: 30rpx;
+}
+.index-tbcc-btn {
+  background: #0077a9;
+  color: #FFF;
+  width: 300rpx;
+  height: 80rpx;
+  line-height: 80rpx;
+  text-align: center;
+  border-radius: 10rpx;
+  margin: 0 auto;
+  font-size: 30rpx;
+}
+.index-link-btn {
+  text-align: center;
+  color: #333;
+  font-size: 26rpx;
+}
\ No newline at end of file
--- a/taobao_mini/client/pages/index/index.axml
+++ b/taobao_mini/client/pages/index/index.axml
+<view class="index-page">
+  <view class="index-rule-btn" onTap="showRuleModal">活动规则</view>
+  <navigator open-type="navigate" url="/pages/myprize/myprize" class="index-myprize-btn">我的奖品</navigator>
+  <view class="index-page__title">{{title}}</view>
+  <view class="index-page__content">{{content}}</view>
+  <view class="index-page__tips">AM接口只支持PC端预览，手机淘宝预览需要使用云函数模式</view>
+  <view class="index-start-btn" onTap="doStart">开始</view>
+  <navigator open-type="navigate" url="/pages/tbccDemo/tbccDemo" class="index-tbcc-btn">tbcc demo</navigator>
+</view>
+<rule-modal a:if="{{ruleModalVisible}}" onModalClose="closeRuleModal"><text>{{rule}}</text></rule-modal>
+<common-modal a:if="{{commonModalVisible}}" data="{{commonModalData}}" onModalClose="closeCommonModal" onModalConfirm="confirmCommonModal" />
+<end-modal a:if="{{false}}" />
\ No newline at end of file
--- a/taobao_mini/client/pages/index/index.js
+++ b/taobao_mini/client/pages/index/index.js
+const app = getApp();
+const { tbcc } = app;
+const { SHARE_CONFIG, REDIRECT_URL } = tbcc.constants;
+import API from '../../api';
+const { commonToast, getAuthUserInfo, navigateToOutside } = tbcc.tb;
+Page({
+  data: {
+    title: '',
+    content: '',
+    rule: '',
+    commonModalData: {
+      content: '',
+      btnText: ''
+    },
+    commonModalConfirm: null,
+    commonModalVisible: false,
+    ruleModalVisible: false
+  },
+  onLoad(query) {
+    // 页面加载
+    this.getAuth();
+    console.info(`Page onLoad with query: ${JSON.stringify(query)}`);
+  },
+  init() {
+    console.log('do init')
+  },
+  onReady() {
+    // 页面加载完成
+  },
+  onShow() {
+    // 页面显示
+  },
+  onHide() {
+    // 页面隐藏
+  },
+  onUnload() {
+    // 页面被关闭
+  },
+  onTitleClick() {
+    // 标题被点击
+  },
+  onPullDownRefresh() {
+    // 页面被下拉
+  },
+  onReachBottom() {
+    // 页面被拉到底部
+  },
+  /**
+   * 获取用户授权信息
+   */
+  async getAuth() {
+    const userInfo = await getAuthUserInfo().catch(err => {
+      console.log('未授权成功', err);
+    });
+    if (userInfo) {
+      console.log('userInfo', userInfo);
+      const { nickName, avatar } = userInfo;
+      app.nickName = nickName;
+      app.avatar = avatar;
+      this.login();
+    }
+  },
+  /**
+   * 获取主接口
+   */
+  async getIndex() {
+    const { success, data } = await API.getIndex().catch(res => {
+      commonToast(res && res.message);
+    }) || {};
+    if (success && data) {
+      const { title, content, rule } = data;
+      this.setData({ title, content, rule });
+    }
+  },
+  /**
+   * 登录接口
+   */
+  async login() {
+    const { nickName, avatar } = app;
+    const { success } = await API.login({ userNick:nickName, avatar }).catch(res => {
+      commonToast(res && res.message);
+    }) || {};
+    if (success) {
+      this.init();
+    }
+  },
+  /**
+   * 显示规则弹层
+   */
+  showRuleModal() {
+    this.setData({
+      ruleModalVisible: true
+    });
+  },
+  /**
+   * 通用弹出确认按钮回调
+   */
+  confirmCommonModal() {
+    const { commonModalConfirm } = this.data;
+    commonModalConfirm && commonModalConfirm();
+  },
+  /**
+   * 执行开始
+   */
+  doStart() {
+    this.showCommonModal({
+      content: '活动还未开始\n请稍后',
+      btnText: '我知道了',
+      commonModalVisible: true,
+      confirmCallback: () => {
+        this.closeCommonModal();
+      }
+    });
+  },
+  /**
+   * 显示通用弹层
+   * @param {object} options content: 通用弹层内容 btnText:按钮文案 confirmCallback: 按钮确认回调
+   */
+  showCommonModal({ content, btnText, confirmCallback }) {
+    this.setData({
+      commonModalConfirm: confirmCallback || null,
+      commonModalVisible: true,
+      commonModalData: { content, btnText }
+    });
+  },
+  /**
+   * 跳转到天猫页面
+   */
+  goTmallPage() {
+    navigateToOutside(REDIRECT_URL['tmall']);
+  },
+  /**
+   * 关闭通用弹层
+   */
+  closeCommonModal() {
+    this.setData({
+      commonModalVisible: false
+    });
+  },
+  /**
+   * 关闭活动规则弹层
+   */
+  closeRuleModal() {
+    this.setData({
+      ruleModalVisible: false
+    });
+  },
+  onShareAppMessage() {
+    // 返回自定义分享信息
+    return SHARE_CONFIG;
+  },
+});
--- a/taobao_mini/client/pages/index/index.json
+++ b/taobao_mini/client/pages/index/index.json
+{
+  "usingComponents": {
+    "rule-modal": "/components/ruleModal/ruleModal",
+    "common-modal": "/components/commonModal/commonModal",
+    "end-modal": "/components/endModal/endModal"
+  }
+}
\ No newline at end of file
--- a/taobao_mini/client/pages/myprize/myprize.acss
+++ b/taobao_mini/client/pages/myprize/myprize.acss
--- a/taobao_mini/client/pages/myprize/myprize.axml
+++ b/taobao_mini/client/pages/myprize/myprize.axml
+<view class="my-prize">
+  <prize-modal 
+    myPrizeList="{{myPrizeList}}" 
+    task="{{task}}" 
+    endTime="{{endTime}}" 
+    onHandleClick="handleClick"/>
+</view>
\ No newline at end of file
--- a/taobao_mini/client/pages/myprize/myprize.js
+++ b/taobao_mini/client/pages/myprize/myprize.js
+'use strict';
+import API from "/api";
+const app = getApp();
+const { tbcc } = app;
+const { commonToast, navigateToOutside, getUserAddress, setClipboard } = tbcc.tb;
+const { PRIZE_TYPE_MAP, PRIZE_DRAW_STATUS_MAP } = tbcc.constants;
+let flag = false;
+Page({
+  data: {
+    PRIZE_TYPE_MAP,
+    PRIZE_DRAW_STATUS_MAP,
+    myPrizeList: null, //我的奖品
+    endTime: null,//到期时间
+    task: {
+      image: {
+        bg: '//yun.duiba.com.cn/aurora/assets/e13fab3165d3a6bb4cbe8827e8f0fd41084b0091.png', //背景图
+        copyIcon: '//yun.dui88.com/duiba-components-c-myprizemyprize_copy_code.png', //复制
+        addressBth: '//yun.dui88.com/duiba-components-c-myprizeto_address.png', //填写地址(实物奖品)
+        getBth: '//yun.dui88.com/duiba-components-c-myprizeget_now.png', //立即领取(除实物奖品外)
+        logisticsBth: '//yun.dui88.com/duiba-components-c-myprizelogistics.png', //查看物流
+        useBth: '//yun.dui88.com/duiba-components-c-myprizeto_use.png', //去使用(除实物奖品外)
+        getAgainBtn: '//yun.dui88.com/duiba-components-c-myprizeget_again.png', //重新领取
+        invalidBtn: '//yun.duiba.com.cn/spark/assets/914ba8643c8abb8d710a3126ec312aecf6c4daf0.png', //已失效
+        failBth: '//yun.duiba.com.cn/spark/assets/8267375232058a6d0140270b1594427fb08d6ae3.png', //领取失败
+      },
+      logisticsImage: {
+        shipped: '//yun.dui88.com/duiba-components-c-myprizeprize_shipped.png', // 已发货物理弹窗
+        notShipped: '//yun.dui88.com/duiba-components-c-myprizenotshipped.png', // 待发货物流弹窗
+        copyIcon: '//yun.dui88.com/duiba-components-c-myprizemyprize_copy_code.png', //复制
+      },
+      btnStyle: { // 按钮自定义样式
+        width: '150rpx',
+        height: '41rpx',
+      }
+    }
+  },
+  onShow() {
+    flag = false
+    this.getMyPrize();
+  },
+  // 到期时间
+  getEndTime(prizeList = []) {
+    if (!prizeList || !prizeList.length) return null
+    const endTime = prizeList[0].expiredTime
+    if (!endTime) return null
+    const t1 = new Date(endTime).toLocaleDateString() + '';//获取年月日
+    const t2 = new Date(endTime).getHours() + '';//获取时
+    const t3 = new Date(endTime).getMinutes() + '';//获取分
+    const t4 = new Date(endTime).getMilliseconds() + '';//获取秒
+    console.log(endTime, new Date(endTime + 48 * 60 * 60 * 1000).toLocaleString(), 'endTime');
+    this.setData({
+      endTime: t1 + " " + t2.padStart(2, '0') + ":" + t3.padStart(2, '0') + ":" + t4.padStart(2, '0')
+    })
+  },
+  /**
+ * 获取奖品列表
+ * @param {string} type 是否展示loading
+ */
+  async getMyPrize(type) {
+    const { activityId } = app;
+    if (type != 'noLoading') {
+      my.showLoading();
+    }
+    const { success, data, message } = await API.getMyPrizeList({ activityId }).catch(res => {
+      this.setData({
+        myPrizeList: []
+      })
+    }) || {};
+    if (success && data) {
+      this.setData({
+        myPrizeList: data.list
+      })
+      this.getEndTime(data.list)
+    }
+    if (type != 'noLoading') {
+      my.hideLoading();
+    }
+  },
+  //领取奖品
+  async handleClick(e) {
+    const { item } = e.target.dataset;
+    // 领取权益
+    if (item.type === PRIZE_TYPE_MAP.EQUITY) return this.handleGetEquity(e)
+    // 领取实物
+    if (item.type === PRIZE_TYPE_MAP.ENTITY) return this.handleGetEntity(e)
+    // 领取积分
+    if (item.type === PRIZE_TYPE_MAP.INTEGRATION) return this.handleGetIntergation(e)
+  },
+  // 优惠券
+  async handleGetEquity(e) {
+    if (flag) {
+      return
+    }
+    flag = true;
+    const { activityId } = app;
+    const { item } = e.target.dataset;
+    console.log(item, '领取权益')
+    const { success, data, message } = await API.receiveEnamePrize({ activityId, _id: item._id }).catch(res => {
+      this.getMyPrize('noLoading')
+      commonToast(res && res.message)
+    }) || {};
+    if (success && data) {
+      commonToast('领取成功')
+      this.getMyPrize()
+    }
+    setTimeout(() => {
+      flag = false
+    }, 500)
+  },
+  // 领取实物前询问
+  async handleGetEntity(e) {
+    if (flag) {
+      return
+    }
+    my.showLoading();
+    flag = true;
+    const { activityId } = app;
+    const { item } = e.target.dataset;
+    const userAddress = await getUserAddress({ joinTag: " " })
+    my.hideLoading();
+    if (!userAddress) return
+    const { name, telNumber, provinceName, cityName, cityCode, countyName, detailInfo, streetName } = userAddress || {};
+    const params = {
+      activityId,
+      name,
+      phone: telNumber,
+      detailInfo,
+      cityCode,
+      cityName,
+      provinceName,
+      countyName,
+      streetName,
+      _id: item._id
+    }
+    my.confirm({
+      title: '提示',
+      content: '确认使用该收货地址：' + name + telNumber + userAddress.duibaAddress.address,
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      success: (result) => {
+        console.log(result)
+        const { confirm } = result;
+        if (confirm) {
+          this.receiveObjectPrize(params);
+        }
+      },
+    });
+    flag = false
+  },
+  // 领取实物
+  async receiveObjectPrize(params) {
+    const { success, data, message } = await API.receiveObjectPrize(params) || {}
+    if (success && data) {
+      commonToast('领取成功')
+    } else {
+      commonToast(message)
+    }
+    this.getMyPrize()
+  },
+  // 积分
+  async handleGetIntergation(e) {
+    if (flag) {
+      return
+    }
+    flag = true;
+    // 判断是否为会员
+    await this.getUserInfo()
+    const { isVip, vipLink } = app;
+    if (!isVip) {
+      commonToast('立即加入会员，即可领取奖品', 2000);
+      setTimeout(() => {
+        navigateToOutside(vipLink)
+      }, 1000)
+      flag = false
+      return
+    }
+    const { activityId } = app;
+    const { item } = e.target.dataset;
+    console.log(item, '领取积分')
+    const { success, data, message } = await API.receiveEnamePrize({ activityId, _id: item._id }) || {};
+    if (success && data) {
+      commonToast('领取成功')
+    } else {
+      commonToast(message)
+    }
+    flag = false
+    this.getMyPrize()
+  },
+  //获取用户vip信息
+  async getUserInfo() {
+    const { activityId } = app;
+    const { success, data, message } = await API.getVipInfo({ activityId }) || {};
+    console.log(data, '用户vip信息');
+    if (success && data) {
+      app.isVip = (data && data.isVip) || false;
+      app.vipLink = (data && data.url) || '';
+    } else {
+      commonToast(message)
+    }
+  },
+});
\ No newline at end of file
--- a/taobao_mini/client/pages/myprize/myprize.json
+++ b/taobao_mini/client/pages/myprize/myprize.json
+{
+  "usingComponents": {
+    "prize-modal": "/components/prizeModal/prizeModal"
+  }
+}
\ No newline at end of file
--- a/taobao_mini/client/pages/pagecanvas/output.js
+++ b/taobao_mini/client/pages/pagecanvas/output.js
--- a/taobao_mini/client/pages/tbccDemo/tbccDemo.acss
+++ b/taobao_mini/client/pages/tbccDemo/tbccDemo.acss
+.tbcc-demo-page {
+  text-align: center;
+  padding: 60rpx 20rpx 20rpx;
+}
+.tbcc-demo-page button {
+  margin-bottom: 10rpx;
+}
+.tbcc-demo-page .upload-image {
+  width: 200rpx;
+  height: 200rpx;
+}
+.tbcc-demo-page .input-item {
+  width: 684rpx;
+  height: 80rpx;
+}
+.text-risk-item {
+  margin: 30rpx auto;
+}
+.tbcc-demo__title {
+  padding: 20rpx;
+  font-weight: bold;
+  font-size: 36rpx;
+}
\ No newline at end of file
--- a/taobao_mini/client/pages/tbccDemo/tbccDemo.axml
+++ b/taobao_mini/client/pages/tbccDemo/tbccDemo.axml
+<view class="tbcc-demo-page">
+  <view class="tbcc-demo__title">常用tb方法</view>
+  <button onTap="showCommomToast">弱提示</button>
+  <button onTap="showCommomConfirm">通用确认弹层</button>
+  <button onTap="getAuth">获取用户授权</button>
+  <button onTap="getSystemInfo">获取系统信息</button>
+  <button onTap="getServerTime">获取系统时间</button>
+  <button onTap="favorShop">关注店铺(百草味为例需预览)</button>
+  <button onTap="checkShopFavoredStatus">店铺关注状态(百草味为例需预览)</button>
+  <button onTap="getUserAddress">获取收货地址(需预览)</button>
+  <button onTap="collectGoods">收藏商品(iPad Pro为例)</button>
+  <button onTap="checkGoodsCollectedStatus">商品收藏状态(iPad Pro为例)</button>
+  <button onTap="openDetail">跳转淘宝商品页(iPad Pro为例)</button>
+  <button onTap="navigateToOutside">跳转外部链接(需预览)</button>
+  <button onTap="navigateTo">跳转内部链接(新开窗口)</button>
+  <button onTap="redirectTo">跳转内部链接(不新开窗口)</button>
+  <button onTap="uploadImage">选择上传图片</button>
+  <view a:if="{{uploadImgUrl}}">
+    <image mode="aspectFit" src="{{uploadImgUrl}}" class="upload-image"></image>
+  </view>
+  <button onTap="chattingSendCard">分享到群聊卡片(需预览)</button>
+  <view class="text-risk-item">
+    <input type="text" onInput="bindKeyInput" data-name="riskInput" placeholder="请输入校验文本" class="input-item" />
+    <button onTap="textRiskIdentification">文本风险检测(需预览)</button>
+  </view>
+  <view class="tbcc-demo__title">通用API方法</view>
+  <button onTap="receiveObjectPrize">领取实物奖励</button>
+  <button onTap="receiveEnamePrize">领取权益奖励</button>
+</view>
--- a/taobao_mini/client/pages/tbccDemo/tbccDemo.js
+++ b/taobao_mini/client/pages/tbccDemo/tbccDemo.js
+import API from '../../api';
+const app = getApp();
+const { tbcc } = app;
+const {
+  commonToast,
+  simpleAlert,
+  commonConfirm,
+  getAuthUserInfo,
+  getSystemInfo,
+  getServerTime,
+  favorShop,
+  checkShopFavoredStatus,
+  getUserAddress,
+  collectGoods,
+  checkGoodsCollectedStatus,
+  openDetail,
+  navigateToOutside,
+  navigateTo,
+  redirectTo,
+  uploadImage,
+  chattingSendCard,
+  textRiskIdentification
+} = tbcc.tb;
+const { dateFormatter, versionCompare } = tbcc.utils;
+Page({
+  data: {
+    uploadImgUrl: '',
+    riskInput: ''
+  },
+  onLoad() {},
+  bindKeyInput(e) {
+    const { value } = e.detail;
+    const { name } = e.target.dataset;
+    this.setData({
+      [name]: value,
+    });
+  },
+  /**
+   * toast提示
+   */
+  showCommomToast() {
+    commonToast('tbcc', 3000, () => {
+      console.log('tbcc toast loaded');
+    });
+  },
+  /**
+   * confirm弹窗
+   */
+  showCommomConfirm() {
+    commonConfirm('提示', '内容', () => {
+      commonToast('保存成功');
+    });
+  },
+  /**
+   * 获取用户授权信息
+   */
+  async getAuth() {
+    const userInfo = await getAuthUserInfo().catch(err => {
+      console.log('未授权成功', err);
+    });
+    if (userInfo) {
+      console.log('userInfo', userInfo);
+      const { nickName, avatar } = userInfo;
+      app.nickName = nickName;
+      app.avatar = avatar;
+      simpleAlert(nickName);
+    }
+  },
+  /**
+   * 获取系统信息
+   */
+  async getSystemInfo() {
+    const systemInfo = await getSystemInfo().catch(err => {
+      console.log('获取系统信息失败', err);
+    });
+    if (systemInfo) {
+      console.log('systemInfo', systemInfo);
+      const { version } = systemInfo;
+      const compareVersion = '9.8.0';
+      const isNewVersion = versionCompare(version, compareVersion);
+      simpleAlert('当前版本:' + version + `${isNewVersion ? '为新版本': '为老版本'}`);
+    }
+  },
+  /**
+   * 获取系统时间
+   */
+  async getServerTime() {
+    const severTime = await getServerTime().catch(err => {
+      console.log('获取系统时间失败', err);
+    });
+    simpleAlert('系统时间:' + dateFormatter(severTime, 'yyyy/MM/dd hh:mm:ss'));
+  },
+  /**
+   * 关注店铺
+   */
+  async favorShop() {
+    const sellerId = 628189716; // 百草味sellerId
+    const favorStatus = await favorShop(sellerId).catch(err => {
+      console.log('关注店铺失败', err);
+    });
+    commonToast(favorStatus ? '关注成功' : '关注失败');
+  },
+  /**
+   * 查询店铺关注状态
+   */
+  async checkShopFavoredStatus() {
+    const sellerId = 628189716; // 百草味sellerId
+    const favoredStatus = await checkShopFavoredStatus(sellerId).catch(err => {
+      console.log('查询关注店铺状态失败', err);
+    });
+    simpleAlert(favoredStatus ? '已关注店铺' : '未关注店铺');
+  },
+  /**
+   * 获取用户收货地址
+   */
+  async getUserAddress() {
+    const userAddress = await getUserAddress().catch(err => {
+      commonToast(err.errorMessage);
+    });
+    if (userAddress) {
+      console.log('userAddress', userAddress);
+      const { name, phone, address } = userAddress.duibaAddress;
+      commonConfirm('提示', '确认使用该收货地址：' + name + phone + address, () => {
+        // TODO 保存接口
+        commonToast('保存成功');
+      });
+    }
+  },
+  /**
+   * 收藏商品
+   */
+  async collectGoods() {
+    const itemId = 622499363381; // iPad Pro 为例
+    const collectGoodsStatus = await collectGoods(itemId).catch(err => {
+      console.log('收藏商品失败', err);
+    });
+    commonToast(collectGoodsStatus ? '收藏商品成功' : '收藏商品失败');
+  },
+  /**
+   * 收藏商品
+   */
+  async checkGoodsCollectedStatus() {
+    const itemId = 622499363381; // iPad Pro 为例
+    const goodscollectedStatus = await checkGoodsCollectedStatus(itemId).catch(err => {
+      console.log('查询商品收场状态失败', err);
+    });
+    simpleAlert(goodscollectedStatus ? '商品已收藏' : '商品未收藏');
+  },
+  /**
+   * 跳转到淘宝商品页
+   */
+  async openDetail() {
+    const itemId = '622499363381'; // iPad Pro 为例
+    await openDetail(itemId).catch(err => {
+      console.log('打开淘宝商品页失败', err);
+    });
+  },
+  /**
+   * 跳转到外部链接
+   */
+  navigateToOutside() {
+    const url = 'https://www.tmall.com';
+    navigateToOutside(url);
+  },
+  /**
+   * 跳转到小程序内部链接（新开窗口）
+   */
+  navigateTo() {
+    const url = '/pages/index/index';
+    navigateTo(url);
+  },
+  /**
+   * 跳转到小程序内部链接（不新开窗口）
+   */
+  redirectTo() {
+    const url = '/pages/index/index';
+    redirectTo(url);
+  },
+  /**
+   * 选择上传图片
+   */
+  async uploadImage() {
+    const uploadImageResultUrl = await uploadImage().catch(err => {
+      commonToast(err && (err.errorMessage || '上传图片失败'));
+    });
+    if (uploadImageResultUrl) {
+      this.setData({
+        uploadImgUrl: uploadImageResultUrl
+      });
+    }
+  },
+  /**
+   * 分享到群聊卡片
+   */
+  async chattingSendCard() {
+    // 测试请求参数（格式示例）
+    const requestInfo = {
+      "biz_ext_map": "{\"activityId\":\"028fe748-9413-4df1-ad15-7d21d9ca16c9\",\"shareId\":\"AAGrFC1BALWl0Axwb3svqUyd\"}",
+      "card_template_id": 1588754547060,
+      "group_id": "0_G_2207623078795_1591670473134",
+      "weex_data_json": "{\"url\":\"https://m.duanqu.com?_ariver_appid=3000000005188064&nbsv=0.1.2007151634.12&nbsource=debug&nbsn=DEBUG&_mp_code=tb&query=activityId%3D028fe748-9413-4df1-ad15-7d21d9ca16c9%26groupId%3D0_G_2207623078795_1591670473134%26shareId%3DAAGrFC1BALWl0Axwb3svqUyd\",\"act_title\":\"一起出道赢大奖\",\"share\":\"@pilee0827 多度\",\"picture3\":\"https://yun.duiba.com.cn/upload/ltuwhbf39x.jpg\"}",
+      "message_id": "5f0fcdfeef507182be6c2247",
+      "app_secret": "appSecret",
+      "app_code": "30123678"
+    };
+    const messageResult = await chattingSendCard(requestInfo).catch(err => {
+      commonToast(err && err.errorMessage);
+    });
+    if (messageResult) {
+      const { result: { value, success } } = messageResult;
+      commonToast(value && success ? '分享到群聊成功' : '分享到群聊失败');
+    }
+  },
+  /**
+   * 文本风险校验
+   */
+  async textRiskIdentification() {
+    const { riskInput } = this.data;
+    const success = await textRiskIdentification(riskInput).catch(err => {
+      console.log(err);
+    });
+    simpleAlert(`检测文本"${riskInput}"，校验结果${success ? '通过' : '不通过'}`);
+  },
+  /**
+   * 领取实物奖励
+   */
+  async receiveObjectPrize() {
+    const _id = '123'; // 测试奖品ID
+    const success = await API.fn.receiveObjectPrize({ _id });
+    if (success) {
+      commonToast('保存成功');
+    }
+  },
+  /**
+   * 领取权益奖励
+   */
+  async receiveEnamePrize() {
+    const _id = '123'; // 测试奖品ID
+    const success = await API.fn.receiveEnamePrize({ _id });
+    if (success) {
+      commonToast('领取成功');
+    }
+  }
+});
--- a/taobao_mini/client/pages/tbccDemo/tbccDemo.json
+++ b/taobao_mini/client/pages/tbccDemo/tbccDemo.json
+{}
\ No newline at end of file