'接口完善'

admin

2020-12-19 84920ada00d69565bef33e7e31bc32b426ec5dc3

'接口完善'

 .kaitian/project-ide.json

New file
@@ -0,0 +1,4 @@
{
  "ignoreWebViewDomainCheck": true,
  "ignoreHttpDomainCheck": true
}

 .tea/entryFiles-development/index$.web.js

@@ -8,36 +8,35 @@
require('../../node_modules/mini-ali-ui/es/am-icon/index?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
require('../../node_modules/mini-ali-ui/es/modal/index?hash=febd4c40992222524e0db12a74760a28f8f9b339');
require('../../node_modules/mini-ali-ui/es/notice/index?hash=5a0c180d5ccf7c9d483dd4817cdab5489824013c');
require('../../node_modules/mini-ali-ui/es/footer/index?hash=5a0c180d5ccf7c9d483dd4817cdab5489824013c');
require('../../node_modules/miniapp-bc-user/es/bc-module/bc-module?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
require('../../node_modules/mini-ali-ui/es/list/index?hash=e1617a0257fb9de746f60d50b03404ad924976c9');
require('../../node_modules/mini-ali-ui/es/list/auto-size-img/index?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
require('../../node_modules/mini-ali-ui/es/list/list-item/index?hash=a5465b8c889360e3f854461d3ac41cf414aec633');
require('../../node_modules/mini-ali-ui/es/badge/index?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
require('../../node_modules/mini-ali-ui/es/mask/index?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
require('../../node_modules/mini-ali-ui/es/popover/index?hash=6d8aebee62dceaacd4af71bcf2a181cfc15220af');
require('../../node_modules/mini-ali-ui/es/popover/popover-item/index?hash=5a0c180d5ccf7c9d483dd4817cdab5489824013c');
require('../../node_modules/mini-ali-ui/es/footer/index?hash=5a0c180d5ccf7c9d483dd4817cdab5489824013c');
require('../../node_modules/mini-ali-ui/es/pagination/index?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
require('../../node_modules/mini-ali-ui/es/grid/index?hash=45fe1418d25fc81c09eccb62e0568b7faa62b362');
require('../../node_modules/circle-statistic-view/index?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
require('../../node_modules/mini-ali-ui/es/mask/index?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
require('../../node_modules/mini-ali-ui/es/popover/index?hash=6d8aebee62dceaacd4af71bcf2a181cfc15220af');
require('../../node_modules/mini-ali-ui/es/popover/popover-item/index?hash=5a0c180d5ccf7c9d483dd4817cdab5489824013c');
require('../../node_modules/mini-ali-ui/es/am-switch/index?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
require('../../node_modules/mini-ali-ui/es/picker-item/index?hash=5a0c180d5ccf7c9d483dd4817cdab5489824013c');
require('../../pages/rewards/rewards?hash=b775c3299edccea71cc1989ff381088e71b0228f');
require('../../pages/rewards/rewards?hash=71c1541ddc410043ed29526930e9297c071a63be');
require('../../pages/goods/goods?hash=65adadcff52b81aaf77252ac60c693ec449caef8');
require('../../pages/mine/mine?hash=c3c7d3e16a646c4450b2732f1bcd56c7f32630ff');
require('../../pages/canvas/canvas?hash=c38b953af6bdab8fe399141b33dd1ad1ceb7ea7f');
require('../../pages/activity-detail/activity-detail?hash=3ff7dd30a3ea0de70909d48b0b8ce5bda62ef62e');
require('../../pages/reward-announcement/reward-announcement?hash=c6818e0a77e4e2f8365cc6ed1a93960827e43474');
require('../../pages/join-statistic/join-statistic?hash=96494a69a77c04a2a41944933b5875740b0d9262');
require('../../pages/assist-process/assist-process?hash=c6818e0a77e4e2f8365cc6ed1a93960827e43474');
require('../../pages/lucky-coupon/lucky-coupon?hash=c6818e0a77e4e2f8365cc6ed1a93960827e43474');
require('../../pages/web/web?hash=c38b953af6bdab8fe399141b33dd1ad1ceb7ea7f');
require('../../pages/advice/advice?hash=c38b953af6bdab8fe399141b33dd1ad1ceb7ea7f');
require('../../pages/activity-detail/activity-detail?hash=3ff7dd30a3ea0de70909d48b0b8ce5bda62ef62e');
require('../../pages/assist-process/assist-process?hash=f1b7dc4ca438ceda80574161c70b1f25cb9fb567');
require('../../pages/lucky-coupon/lucky-coupon?hash=f1b7dc4ca438ceda80574161c70b1f25cb9fb567');
require('../../pages/msg-record/msg-record?hash=59bab5c4a4a4ec930e168925c97c3057ac83fa7d');
require('../../pages/assist-friends/assist-friends?hash=59bab5c4a4a4ec930e168925c97c3057ac83fa7d');
require('../../pages/msg-setting/msg-setting?hash=5f504890acbcf3bad0486fc198ac7448dd406718');
require('../../pages/lucky-record/lucky-record?hash=c6818e0a77e4e2f8365cc6ed1a93960827e43474');
require('../../pages/template/template?hash=c6818e0a77e4e2f8365cc6ed1a93960827e43474');
require('../../pages/scan-record/scan-record?hash=c6818e0a77e4e2f8365cc6ed1a93960827e43474');
require('../../pages/lucky-record/lucky-record?hash=f1b7dc4ca438ceda80574161c70b1f25cb9fb567');
require('../../pages/template/template?hash=f1b7dc4ca438ceda80574161c70b1f25cb9fb567');
require('../../pages/scan-record/scan-record?hash=f1b7dc4ca438ceda80574161c70b1f25cb9fb567');
require('../../pages/sponsor-signup/sponsor-signup?hash=dc20ef8880ff4618d424be68cf5d01d8a2b6ee52');
require('../../pages/advice/advice?hash=c38b953af6bdab8fe399141b33dd1ad1ceb7ea7f');
require('../../pages/scan-record/scan-record?hash=c6818e0a77e4e2f8365cc6ed1a93960827e43474');
require('../../pages/web/web?hash=c38b953af6bdab8fe399141b33dd1ad1ceb7ea7f');
require('../../pages/reward-announcement/reward-announcement?hash=c6818e0a77e4e2f8365cc6ed1a93960827e43474');
require('../../pages/sponsor-activity/sponsor-activity?hash=f1b7dc4ca438ceda80574161c70b1f25cb9fb567');

 .tea/entryFiles-development/index$.worker.js

@@ -39,39 +39,38 @@
require('../../node_modules/mini-ali-ui/es/am-icon/index?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
require('../../node_modules/mini-ali-ui/es/modal/index?hash=febd4c40992222524e0db12a74760a28f8f9b339');
require('../../node_modules/mini-ali-ui/es/notice/index?hash=5a0c180d5ccf7c9d483dd4817cdab5489824013c');
require('../../node_modules/mini-ali-ui/es/footer/index?hash=5a0c180d5ccf7c9d483dd4817cdab5489824013c');
require('../../node_modules/miniapp-bc-user/es/bc-module/bc-module?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
require('../../node_modules/mini-ali-ui/es/list/index?hash=e1617a0257fb9de746f60d50b03404ad924976c9');
require('../../node_modules/mini-ali-ui/es/list/auto-size-img/index?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
require('../../node_modules/mini-ali-ui/es/list/list-item/index?hash=a5465b8c889360e3f854461d3ac41cf414aec633');
require('../../node_modules/mini-ali-ui/es/badge/index?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
require('../../node_modules/mini-ali-ui/es/mask/index?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
require('../../node_modules/mini-ali-ui/es/popover/index?hash=6d8aebee62dceaacd4af71bcf2a181cfc15220af');
require('../../node_modules/mini-ali-ui/es/popover/popover-item/index?hash=5a0c180d5ccf7c9d483dd4817cdab5489824013c');
require('../../node_modules/mini-ali-ui/es/footer/index?hash=5a0c180d5ccf7c9d483dd4817cdab5489824013c');
require('../../node_modules/mini-ali-ui/es/pagination/index?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
require('../../node_modules/mini-ali-ui/es/grid/index?hash=45fe1418d25fc81c09eccb62e0568b7faa62b362');
require('../../node_modules/circle-statistic-view/index?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
require('../../node_modules/mini-ali-ui/es/mask/index?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
require('../../node_modules/mini-ali-ui/es/popover/index?hash=6d8aebee62dceaacd4af71bcf2a181cfc15220af');
require('../../node_modules/mini-ali-ui/es/popover/popover-item/index?hash=5a0c180d5ccf7c9d483dd4817cdab5489824013c');
require('../../node_modules/mini-ali-ui/es/am-switch/index?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
require('../../node_modules/mini-ali-ui/es/picker-item/index?hash=5a0c180d5ccf7c9d483dd4817cdab5489824013c');
require('../../pages/rewards/rewards?hash=b775c3299edccea71cc1989ff381088e71b0228f');
require('../../pages/rewards/rewards?hash=71c1541ddc410043ed29526930e9297c071a63be');
require('../../pages/goods/goods?hash=65adadcff52b81aaf77252ac60c693ec449caef8');
require('../../pages/mine/mine?hash=c3c7d3e16a646c4450b2732f1bcd56c7f32630ff');
require('../../pages/canvas/canvas?hash=c38b953af6bdab8fe399141b33dd1ad1ceb7ea7f');
require('../../pages/activity-detail/activity-detail?hash=3ff7dd30a3ea0de70909d48b0b8ce5bda62ef62e');
require('../../pages/reward-announcement/reward-announcement?hash=c6818e0a77e4e2f8365cc6ed1a93960827e43474');
require('../../pages/join-statistic/join-statistic?hash=96494a69a77c04a2a41944933b5875740b0d9262');
require('../../pages/assist-process/assist-process?hash=c6818e0a77e4e2f8365cc6ed1a93960827e43474');
require('../../pages/lucky-coupon/lucky-coupon?hash=c6818e0a77e4e2f8365cc6ed1a93960827e43474');
require('../../pages/web/web?hash=c38b953af6bdab8fe399141b33dd1ad1ceb7ea7f');
require('../../pages/advice/advice?hash=c38b953af6bdab8fe399141b33dd1ad1ceb7ea7f');
require('../../pages/activity-detail/activity-detail?hash=3ff7dd30a3ea0de70909d48b0b8ce5bda62ef62e');
require('../../pages/assist-process/assist-process?hash=f1b7dc4ca438ceda80574161c70b1f25cb9fb567');
require('../../pages/lucky-coupon/lucky-coupon?hash=f1b7dc4ca438ceda80574161c70b1f25cb9fb567');
require('../../pages/msg-record/msg-record?hash=59bab5c4a4a4ec930e168925c97c3057ac83fa7d');
require('../../pages/assist-friends/assist-friends?hash=59bab5c4a4a4ec930e168925c97c3057ac83fa7d');
require('../../pages/msg-setting/msg-setting?hash=5f504890acbcf3bad0486fc198ac7448dd406718');
require('../../pages/lucky-record/lucky-record?hash=c6818e0a77e4e2f8365cc6ed1a93960827e43474');
require('../../pages/template/template?hash=c6818e0a77e4e2f8365cc6ed1a93960827e43474');
require('../../pages/scan-record/scan-record?hash=c6818e0a77e4e2f8365cc6ed1a93960827e43474');
require('../../pages/lucky-record/lucky-record?hash=f1b7dc4ca438ceda80574161c70b1f25cb9fb567');
require('../../pages/template/template?hash=f1b7dc4ca438ceda80574161c70b1f25cb9fb567');
require('../../pages/scan-record/scan-record?hash=f1b7dc4ca438ceda80574161c70b1f25cb9fb567');
require('../../pages/sponsor-signup/sponsor-signup?hash=dc20ef8880ff4618d424be68cf5d01d8a2b6ee52');
require('../../pages/advice/advice?hash=c38b953af6bdab8fe399141b33dd1ad1ceb7ea7f');
require('../../pages/scan-record/scan-record?hash=c6818e0a77e4e2f8365cc6ed1a93960827e43474');
require('../../pages/web/web?hash=c38b953af6bdab8fe399141b33dd1ad1ceb7ea7f');
require('../../pages/reward-announcement/reward-announcement?hash=c6818e0a77e4e2f8365cc6ed1a93960827e43474');
require('../../pages/sponsor-activity/sponsor-activity?hash=f1b7dc4ca438ceda80574161c70b1f25cb9fb567');
}
self.bootstrapApp ? self.bootstrapApp({ success }) : success();
}

 .tea/entryFiles-production/index$.web.js

@@ -8,36 +8,35 @@
require('../../node_modules/mini-ali-ui/es/am-icon/index?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
require('../../node_modules/mini-ali-ui/es/modal/index?hash=febd4c40992222524e0db12a74760a28f8f9b339');
require('../../node_modules/mini-ali-ui/es/notice/index?hash=5a0c180d5ccf7c9d483dd4817cdab5489824013c');
require('../../node_modules/mini-ali-ui/es/footer/index?hash=5a0c180d5ccf7c9d483dd4817cdab5489824013c');
require('../../node_modules/miniapp-bc-user/es/bc-module/bc-module?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
require('../../node_modules/mini-ali-ui/es/list/index?hash=e1617a0257fb9de746f60d50b03404ad924976c9');
require('../../node_modules/mini-ali-ui/es/list/auto-size-img/index?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
require('../../node_modules/mini-ali-ui/es/list/list-item/index?hash=a5465b8c889360e3f854461d3ac41cf414aec633');
require('../../node_modules/mini-ali-ui/es/badge/index?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
require('../../node_modules/mini-ali-ui/es/mask/index?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
require('../../node_modules/mini-ali-ui/es/popover/index?hash=6d8aebee62dceaacd4af71bcf2a181cfc15220af');
require('../../node_modules/mini-ali-ui/es/popover/popover-item/index?hash=5a0c180d5ccf7c9d483dd4817cdab5489824013c');
require('../../node_modules/mini-ali-ui/es/footer/index?hash=5a0c180d5ccf7c9d483dd4817cdab5489824013c');
require('../../node_modules/mini-ali-ui/es/pagination/index?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
require('../../node_modules/mini-ali-ui/es/grid/index?hash=45fe1418d25fc81c09eccb62e0568b7faa62b362');
require('../../node_modules/circle-statistic-view/index?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
require('../../node_modules/mini-ali-ui/es/mask/index?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
require('../../node_modules/mini-ali-ui/es/popover/index?hash=6d8aebee62dceaacd4af71bcf2a181cfc15220af');
require('../../node_modules/mini-ali-ui/es/popover/popover-item/index?hash=5a0c180d5ccf7c9d483dd4817cdab5489824013c');
require('../../node_modules/mini-ali-ui/es/am-switch/index?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
require('../../node_modules/mini-ali-ui/es/picker-item/index?hash=5a0c180d5ccf7c9d483dd4817cdab5489824013c');
require('../../pages/rewards/rewards?hash=b775c3299edccea71cc1989ff381088e71b0228f');
require('../../pages/rewards/rewards?hash=71c1541ddc410043ed29526930e9297c071a63be');
require('../../pages/goods/goods?hash=65adadcff52b81aaf77252ac60c693ec449caef8');
require('../../pages/mine/mine?hash=c3c7d3e16a646c4450b2732f1bcd56c7f32630ff');
require('../../pages/canvas/canvas?hash=c38b953af6bdab8fe399141b33dd1ad1ceb7ea7f');
require('../../pages/activity-detail/activity-detail?hash=3ff7dd30a3ea0de70909d48b0b8ce5bda62ef62e');
require('../../pages/reward-announcement/reward-announcement?hash=c6818e0a77e4e2f8365cc6ed1a93960827e43474');
require('../../pages/join-statistic/join-statistic?hash=96494a69a77c04a2a41944933b5875740b0d9262');
require('../../pages/advice/advice?hash=c38b953af6bdab8fe399141b33dd1ad1ceb7ea7f');
require('../../pages/activity-detail/activity-detail?hash=3ff7dd30a3ea0de70909d48b0b8ce5bda62ef62e');
require('../../pages/assist-process/assist-process?hash=c6818e0a77e4e2f8365cc6ed1a93960827e43474');
require('../../pages/lucky-coupon/lucky-coupon?hash=c6818e0a77e4e2f8365cc6ed1a93960827e43474');
require('../../pages/web/web?hash=c38b953af6bdab8fe399141b33dd1ad1ceb7ea7f');
require('../../pages/msg-record/msg-record?hash=59bab5c4a4a4ec930e168925c97c3057ac83fa7d');
require('../../pages/assist-friends/assist-friends?hash=59bab5c4a4a4ec930e168925c97c3057ac83fa7d');
require('../../pages/msg-setting/msg-setting?hash=5f504890acbcf3bad0486fc198ac7448dd406718');
require('../../pages/lucky-record/lucky-record?hash=c6818e0a77e4e2f8365cc6ed1a93960827e43474');
require('../../pages/template/template?hash=c6818e0a77e4e2f8365cc6ed1a93960827e43474');
require('../../pages/scan-record/scan-record?hash=c6818e0a77e4e2f8365cc6ed1a93960827e43474');
require('../../pages/lucky-record/lucky-record?hash=f1b7dc4ca438ceda80574161c70b1f25cb9fb567');
require('../../pages/template/template?hash=f1b7dc4ca438ceda80574161c70b1f25cb9fb567');
require('../../pages/scan-record/scan-record?hash=f1b7dc4ca438ceda80574161c70b1f25cb9fb567');
require('../../pages/sponsor-signup/sponsor-signup?hash=dc20ef8880ff4618d424be68cf5d01d8a2b6ee52');
require('../../pages/advice/advice?hash=c38b953af6bdab8fe399141b33dd1ad1ceb7ea7f');
require('../../pages/scan-record/scan-record?hash=c6818e0a77e4e2f8365cc6ed1a93960827e43474');
require('../../pages/web/web?hash=c38b953af6bdab8fe399141b33dd1ad1ceb7ea7f');
require('../../pages/reward-announcement/reward-announcement?hash=c6818e0a77e4e2f8365cc6ed1a93960827e43474');
require('../../pages/sponsor-activity/sponsor-activity?hash=f1b7dc4ca438ceda80574161c70b1f25cb9fb567');

 .tea/entryFiles-production/index$.worker.js

@@ -37,39 +37,38 @@
require('../../node_modules/mini-ali-ui/es/am-icon/index?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
require('../../node_modules/mini-ali-ui/es/modal/index?hash=febd4c40992222524e0db12a74760a28f8f9b339');
require('../../node_modules/mini-ali-ui/es/notice/index?hash=5a0c180d5ccf7c9d483dd4817cdab5489824013c');
require('../../node_modules/mini-ali-ui/es/footer/index?hash=5a0c180d5ccf7c9d483dd4817cdab5489824013c');
require('../../node_modules/miniapp-bc-user/es/bc-module/bc-module?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
require('../../node_modules/mini-ali-ui/es/list/index?hash=e1617a0257fb9de746f60d50b03404ad924976c9');
require('../../node_modules/mini-ali-ui/es/list/auto-size-img/index?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
require('../../node_modules/mini-ali-ui/es/list/list-item/index?hash=a5465b8c889360e3f854461d3ac41cf414aec633');
require('../../node_modules/mini-ali-ui/es/badge/index?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
require('../../node_modules/mini-ali-ui/es/mask/index?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
require('../../node_modules/mini-ali-ui/es/popover/index?hash=6d8aebee62dceaacd4af71bcf2a181cfc15220af');
require('../../node_modules/mini-ali-ui/es/popover/popover-item/index?hash=5a0c180d5ccf7c9d483dd4817cdab5489824013c');
require('../../node_modules/mini-ali-ui/es/footer/index?hash=5a0c180d5ccf7c9d483dd4817cdab5489824013c');
require('../../node_modules/mini-ali-ui/es/pagination/index?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
require('../../node_modules/mini-ali-ui/es/grid/index?hash=45fe1418d25fc81c09eccb62e0568b7faa62b362');
require('../../node_modules/circle-statistic-view/index?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
require('../../node_modules/mini-ali-ui/es/mask/index?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
require('../../node_modules/mini-ali-ui/es/popover/index?hash=6d8aebee62dceaacd4af71bcf2a181cfc15220af');
require('../../node_modules/mini-ali-ui/es/popover/popover-item/index?hash=5a0c180d5ccf7c9d483dd4817cdab5489824013c');
require('../../node_modules/mini-ali-ui/es/am-switch/index?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
require('../../node_modules/mini-ali-ui/es/picker-item/index?hash=5a0c180d5ccf7c9d483dd4817cdab5489824013c');
require('../../pages/rewards/rewards?hash=b775c3299edccea71cc1989ff381088e71b0228f');
require('../../pages/rewards/rewards?hash=71c1541ddc410043ed29526930e9297c071a63be');
require('../../pages/goods/goods?hash=65adadcff52b81aaf77252ac60c693ec449caef8');
require('../../pages/mine/mine?hash=c3c7d3e16a646c4450b2732f1bcd56c7f32630ff');
require('../../pages/canvas/canvas?hash=c38b953af6bdab8fe399141b33dd1ad1ceb7ea7f');
require('../../pages/activity-detail/activity-detail?hash=3ff7dd30a3ea0de70909d48b0b8ce5bda62ef62e');
require('../../pages/reward-announcement/reward-announcement?hash=c6818e0a77e4e2f8365cc6ed1a93960827e43474');
require('../../pages/join-statistic/join-statistic?hash=96494a69a77c04a2a41944933b5875740b0d9262');
require('../../pages/advice/advice?hash=c38b953af6bdab8fe399141b33dd1ad1ceb7ea7f');
require('../../pages/activity-detail/activity-detail?hash=3ff7dd30a3ea0de70909d48b0b8ce5bda62ef62e');
require('../../pages/assist-process/assist-process?hash=c6818e0a77e4e2f8365cc6ed1a93960827e43474');
require('../../pages/lucky-coupon/lucky-coupon?hash=c6818e0a77e4e2f8365cc6ed1a93960827e43474');
require('../../pages/web/web?hash=c38b953af6bdab8fe399141b33dd1ad1ceb7ea7f');
require('../../pages/msg-record/msg-record?hash=59bab5c4a4a4ec930e168925c97c3057ac83fa7d');
require('../../pages/assist-friends/assist-friends?hash=59bab5c4a4a4ec930e168925c97c3057ac83fa7d');
require('../../pages/msg-setting/msg-setting?hash=5f504890acbcf3bad0486fc198ac7448dd406718');
require('../../pages/lucky-record/lucky-record?hash=c6818e0a77e4e2f8365cc6ed1a93960827e43474');
require('../../pages/template/template?hash=c6818e0a77e4e2f8365cc6ed1a93960827e43474');
require('../../pages/scan-record/scan-record?hash=c6818e0a77e4e2f8365cc6ed1a93960827e43474');
require('../../pages/lucky-record/lucky-record?hash=f1b7dc4ca438ceda80574161c70b1f25cb9fb567');
require('../../pages/template/template?hash=f1b7dc4ca438ceda80574161c70b1f25cb9fb567');
require('../../pages/scan-record/scan-record?hash=f1b7dc4ca438ceda80574161c70b1f25cb9fb567');
require('../../pages/sponsor-signup/sponsor-signup?hash=dc20ef8880ff4618d424be68cf5d01d8a2b6ee52');
require('../../pages/advice/advice?hash=c38b953af6bdab8fe399141b33dd1ad1ceb7ea7f');
require('../../pages/scan-record/scan-record?hash=c6818e0a77e4e2f8365cc6ed1a93960827e43474');
require('../../pages/web/web?hash=c38b953af6bdab8fe399141b33dd1ad1ceb7ea7f');
require('../../pages/reward-announcement/reward-announcement?hash=c6818e0a77e4e2f8365cc6ed1a93960827e43474');
require('../../pages/sponsor-activity/sponsor-activity?hash=f1b7dc4ca438ceda80574161c70b1f25cb9fb567');
}
self.bootstrapApp ? self.bootstrapApp({ success }) : success();
}

 app.acss

@@ -3,8 +3,26 @@
  font-family: Microsoft YaHei;
}

/** 字体大小规定 **/

.font-title {
  font-size: 30rpx !important;
}

.font-content {
  font-size: 26rpx !important;
}

.font-sub-content {
  font-size: 24rpx !important;
}

.font-weak {
  font-size: 22rpx !important;
}

/*-------上拉加载------- */

.spinner {
  text-align: center;
  height: 60rpx;
@@ -85,13 +103,12 @@
}

/**------------页脚--------------**/

footer{
  color: white !important;
}


/**---------抽奖活动列表----------**/


.lucky-activity-item {
  margin-left: 20rpx;
@@ -124,36 +141,41 @@
}

.lucky-activity-item .content .sponsor .icon {
  width: 25rpx;
  height: 25rpx;
  width: 24rpx;
  height: 24rpx;
  margin-right: 8rpx;
  margin-top: -1rpx;
}

.lucky-activity-item .content .sponsor .title {
  color: #0080FF;
  font-size: 24rpx;
  margin-left: 8rpx;
}

.lucky-activity-item .content .reward-way {
.lucky-activity-item .content .award {
  display: flex;
  align-items: flex-start !important;
  margin-top: 23rpx;
}

.lucky-activity-item .content .award .award-way {
  width: 28rpx;
  height: 29rpx;
  margin-top: 3rpx;
}

.lucky-activity-item .content .reward-title {
.lucky-activity-item .content .award .award-title {
  color: #333333;
  font-size: 30rpx;
  font-weight: 400;
  margin-left: 10rpx;
  width: 608rpx;
}

.lucky-activity-item .content .open-time {
  font-size: 22rpx;
  color: #999999;
  font-weight: 400;
}

.lucky-activity-item .content .joiner-num {
  font-size: 22rpx;
  color: #AAAAAA;
  font-weight: 400;
  margin-left: 11rpx;
@@ -165,3 +187,22 @@
  border-radius: 27rpx;
  margin-left: -8rpx;
}

.btn-ghost {}

.btn-primary {
  background: #0080FF;
}

.btn-ghost-hover {
  background: #E1E1E1;
  border: 1px solid #3980FE;
  border-radius: 41rpx;
  color: #0080FF;
}

.btn-primary-hover {
  background: #0068CF;
  border-radius: 41rpx;
  border-color: #0068CF;
}

 app.js

@@ -1,13 +1,16 @@
var help = require('./util/help.js');
App({
  themeColor: "#0080FF",
  appKey: '100001',
  appKey: '1000001',
  baseUrl:'http://192.168.3.122:8083',
  onLaunch(options) {
    
    // 第一次打开
    // options.query == {number:1}
    console.info('App onLaunch');
    my.hideFavoriteMenu();
  },
  
  onShow(options) {
    // 从后台被 scheme 重新打开
    // options.query == {number:1}

 app.json

@@ -1,16 +1,17 @@
{
  "useDynamicPlugins": true,
  "usingComponents": {
    "footer": "mini-ali-ui/es/footer/index"
  },
  "pages": [
    "pages/rewards/rewards",
    "pages/goods/goods",
    "pages/mine/mine",
    "pages/canvas/canvas",
    "pages/activity-detail/activity-detail",
    "pages/reward-announcement/reward-announcement",
    "pages/join-statistic/join-statistic",
    "pages/advice/advice",
    "pages/activity-detail/activity-detail",
    "pages/assist-process/assist-process",
    "pages/lucky-coupon/lucky-coupon",
    "pages/web/web",
    "pages/msg-record/msg-record",
    "pages/assist-friends/assist-friends",
    "pages/msg-setting/msg-setting",
@@ -18,8 +19,9 @@
    "pages/template/template",
    "pages/scan-record/scan-record",
    "pages/sponsor-signup/sponsor-signup",
    "pages/advice/advice",
    "pages/scan-record/scan-record"
    "pages/web/web",
    "pages/reward-announcement/reward-announcement",
    "pages/sponsor-activity/sponsor-activity"
  ],
  "window": {
    "defaultTitle": "天天领现金",
@@ -49,10 +51,6 @@
        "activeIcon": "image/mine_highlight.png"
      }
    ]
  },
  "usingComponents": {
    "flex": "mini-ali-ui/es/flex/index",
    "flex-item": "mini-ali-ui/es/flex/flex-item/index"
  },
  "debug": true
}

 image/goods.png

 image/goods_highlight.png

 image/icon/icon_mine_assist_friends.png

 image/icon/icon_mine_lucky_record.png

 image/icon/icon_mine_newer_course.png

 image/icon/icon_mine_scan_history.png

 image/icon/icon_page_result_empty.png

 image/icon/icon_v.png

 image/mine.png

 image/mine_highlight.png

 image/reward.png

 image/reward_highlight.png

 pages/activity-detail/activity-detail.acss

@@ -35,7 +35,7 @@
  font-size: 20rpx;
  position: absolute;
  left: 20rpx;
  line-height: 50rpx;
  line-height: 46rpx;
}

.top .time {
@@ -110,7 +110,7 @@
  height: 30rpx !important;
  position: absolute;
  right: 25rpx;
  top: 25rpx;
  top: 18rpx;
}

.content .award .load-more {
@@ -132,10 +132,8 @@

.content .label {
  box-sizing: border-box;
  font-size: 18rpx;
  font-weight: 400;
  height: 30rpx;
  line-height: 36rpx;
  line-height: 30rpx;
  padding: 0rpx 13rpx;
  border-radius: 4rpx;
  margin-right: 16rpx;
@@ -179,6 +177,14 @@
  position: absolute;
  right: 20rpx;
  top: 60rpx;
  box-sizing: border-box;
  display: flex;
}

.content .ad .action {
  position: absolute;
  right: 20rpx;
  top: 60rpx;
}

.content .join {}
@@ -192,10 +198,11 @@

.content .step {
  display: flex;
  font-size: 0;
}

.content .step image {
  width: 23rpx;
  width: 22rpx;
  height: 22rpx;
  margin-right: 5rpx;
  margin-top: 8rpx;
@@ -206,7 +213,7 @@
  font-weight: 400;
  color: #333333;
  line-height: 39rpx;
  width: 636rpx;
  width: 630rpx;
}

.content .join .beizhu {
@@ -275,6 +282,7 @@
  font-weight: 400;
  margin-top: 20rpx;
  line-height: 34rpx;
  box-sizing: border-box;
}

.content .open .beizhu view {
@@ -333,7 +341,6 @@
.footer {
  display: flex;
  justify-content: space-around;
  font-size: 22rpx;
  font-weight: 400;
  color: #666666;
  margin: 30rpx 0 30rpx 0;
@@ -353,11 +360,12 @@
}

.modal-mianze .body {
  width: 508rpx;
  width: 488rpx;
  background: #FFFFFF;
  border-radius: 16rpx;
  padding: 38rpx;
  box-sizing: border-box;
  margin: 0 auto;
}

.modal-mianze .title {

 pages/activity-detail/activity-detail.axml

@@ -1,75 +1,82 @@
<view>
  <scroll-view scroll-y style="height:100%;"></scroll-view>
  <scroll-view scroll-y a:if="{{activity}}" style="height:100%;">
  <view class="top">
    <view class="banner">
      <swiper indicator-dots="{{false}}" autoplay="true" interval="{{5000}}" circular="{{true}}">
        <swiper-item >
          <image onTap="onBannerClick" mode="aspectFill" src="https://img.zcool.cn/community/013dbb5fc4bb3b11013fdcc7cc7c72.jpg@260w_195h_1c_1e_1o_100sh.jpg"/>
            <image onTap="onBannerClick" mode="aspectFill" src="{{activity.activity.poster}}"/>
        </swiper-item >
      </swiper>
      <!--<popover position="topRight" show="true" showMask="{{false}}"></popover> -->
    </view>
    <view class="info">
      <text class="number">活动期号 NO.12317823</text>
        <view class="number font-weak">
          <text >{{activity.activity.dateNumber}}</text>
        </view>
      <view class="time">
        <text decode="true">剩:&nbsp;</text>
        <view>
             {{leftTime.h}}
             {{leftTime.hh}}
        </view>
        <text decode="true">&nbsp;:&nbsp;</text>
        <view>
            {{leftTime.m}}
            {{leftTime.mm}}
        </view>
        <text decode="true">&nbsp;:&nbsp;</text>
        <view>
              {{leftTime.s}}
              {{leftTime.ss}}
        </view>
      </view>
    </view>
  </view>
  <view class="content">
    <view class="award item">
      <view style="display:flex;margin-bottom:23rpx;">
        <view a:for="{{activity.labels}}" style="color:{{item.color}}; background:{{item.background}}; " class="label">
            {{item.value}}
        <view style="display:flex;margin-bottom:23rpx;width:600rpx;">
          <view a:for="{{activity.labels}}" style="color:{{item.fontColor}}; background:{{item.bgColor}}; " class="label font-weak">
            <text>
            {{item.name}}
            </text>
        </view>
      </view>
      <view class="award-item" a:for-item="award" a:for="{{activity.awardList}}" onTap="onAwardDetailClick">
        <image mode="scaleToFill" src="/image/icon/icon_award_ding.png"/>
        <rich-text class="title" nodes="{{award.htmlJson}}"></rich-text>
        <view class="award-item" a:for-item="award" a:for="{{activity.activity.awardList}}" onTap="onAwardDetailClick" data-item="{{award}}">
          <image mode="scaleToFill" src="{{award.typeIcon}}"/>
          <rich-text class="title font-title" nodes="{{award.htmlJson}}"></rich-text>
      </view>
      <view class="load-more" a:if="{{awardShowMore}}" data-type="award" onTap="showMore">
        <view class="load-more font-weak" a:if="{{awardShowMore}}" data-type="award" onTap="showMore">
        查看更多
        <image src="/image/icon/icon_array_down_fill.png"/>
      </view>
      <image mode="scaleToFill" class="question" src="/image/icon/icon_question.png" onTap="onAwardQuestionClick"/>
    </view>
    <view class="ad item">
      <image mode="scaleToFill" src="/image/portrait-test.jpg"/>
      <view class="ad item" a:if="{{activity.activity.sponsorAd}}">
        <image mode="scaleToFill" src="{{activity.activity.sponsorAd.icon}}"/>
      <view class="content">
        <view style="display:flex;align-items: center;">
          <text class="title" number-of-lines="1" style="margin-right:11rpx;">中国银行中国银行中国银行中国银行</text>
          <view class="label" style="color:#0080FF;background:#D2E9FF;">
            生活号
            <text class="title font-title" number-of-lines="1" style="margin-right:11rpx;">{{activity.activity.sponsorAd.title}}</text>
            <view class="label font-weak" a:if="{{activity.activity.sponsorAd.label}}" style="color:{{activity.activity.sponsorAd.label.fontColor}};background:{{activity.activity.sponsorAd.label.bgColor}};">
            {{activity.activity.sponsorAd.name}}
          </view>
        </view>
        <text class="desc" number-of-lines="2">单个现金红包定额为1.88元，共200个，抽中者可得，将会以转账的形转账中者可得，将会以转账的形转账账中者可得，将会以转账的形转账账</text>
          <text class="desc font-weak" number-of-lines="2">{{activity.activity.sponsorAd.content}}</text>
      </view>
      <button type="ghost" onTap="onAdClick">收藏直播间</button>
        <button type="ghost" a:if="{{false}}" hover-class="btn-ghost-hover" onTap="onAdClick">   {{activity.activity.sponsorAd.jump.showName}}</button>
        <view class="action" style="right:10rpx;" a:if="{{activity.activity.sponsorAd.jump.jumpType=='alipayLife'}}">
          <life-follow sceneId="{{activity.activity.sponsorAd.jump.params.sceneId}}" a:if="{{showFollow}}" checkFollow="{{checkFollow}}" onCheckFollow="checkFollowCb" onClose="closeCb"/>
        </view>
      <view>
      </view>
    </view>
    <view class="join item">
      <view class="title" style="margin-bottom:15rpx;">
        <view class="title font-title" style="margin-bottom:15rpx;">
        参与条件
      </view>
      <view class="step" a:for="{{[{},{}]}}">
        <view class="step font-content" a:for="{{activity.joinCondition.conditionsDesc}}">
        <image mode="scaleToFill" src="/image/icon/icon_right_gray.png"/>
        <text>关注赞助商服务号关注赞助商服务号关注赞助商服务号关注赞助商服务号关注赞助商服务号。</text>
          <text>{{item}}</text>
      </view>
      <view class="beizhu">
        <view class="beizhu font-weak">
        <text number-of-lines="{{joinShowMore?2:100}}" id="beizhu">
          注：系统将会由"支付宝首页-服务提醒"给用户下发是否中奖提醒消息提醒消息提醒消息提醒消息提醒消息提醒消息提醒醒消息提醒醒醒消息提醒消息提醒消息提醒消息提醒消息提醒醒消息提醒醒
          {{activity.joinCondition.marks}}
        </text>
        <view a:if="{{joinShowMore}}" data-type="join" onTap="showMore">
          <text>
@@ -78,43 +85,43 @@
          <image src="/image/icon/icon_array_down_fill.png"/>
        </view>
      </view>
      <view style="display:flex;  justify-content: space-between;margin:40rpx 0;">
        <button type="ghost" onTap="onAssistClick" style="width:238rpx;">
        <view style="display:flex;  justify-content: space-between;margin:60rpx 0 40rpx 0;">
          <button type="ghost" open-type="share" hover-class="btn-ghost-hover" onTap="onAssistClick" style="width:238rpx;">
    好友助力
        </button>
        <button type="primary" onTap="{{activity.joined?'onMyCouponClick':'onFreeLuckyClick'}}" style="width:392rpx;">
          <button type="primary" class="btn-primary" hover-class="btn-primary-hover" onTap="{{activity.joined?'onMyCouponClick':'onFreeLuckyClick'}}" style="width:392rpx;">
    {{activity.joined?'幸运券':'免费抽奖'}}
        </button>
      </view>
    </view>
    <view class="joiner-list item" onTap="onJoinerMoreClick">
      <view style="flex-grow:1;">
        <view class="title">共352123人参与拼手气抽奖</view>
          <view class="title font-title">{{activity.totalJoinNumerDesc}}</view>
        <scroll-view  scroll-x style="display:flex;width:600rpx;">
          <image mode="scaleToFill" a:for="{{[1,2,3,4,5,6,7,8]}}" style=" margin-right:{{index+1==activity.userList.size?'0':'11rpx;'}}" src="/image/portrait-test.jpg"/>
            <image mode="scaleToFill" a:for="{{activity.userList}}" style=" margin-right:{{index+1==activity.userList.size?'0':'11rpx;'}}" src="{{item.portrait}}"/>
        </scroll-view>
      </view>
      <image mode="scaleToFill" src="/image/icon/icon_right_array_input.png" class="input"/>
    </view>
    <view class="assist-process item" onTap="onAssistProcessClick">
      <view style="flex-grow:1;">
        <view class="title">助力进度</view>
        <rich-text nodes="{{assistProcessDesc}}">
          <view class="title font-title">助力进度</view>
          <rich-text class="font-weak" nodes="{{assistProcessDesc}}">
        </rich-text>
      </view>
      <image mode="scaleToFill" src="/image/icon/icon_right_array_input.png" class="input"/>
    </view>
    <view class="open item">
      <view class="title" style="margin-bottom:15rpx;">
        <view class="title  font-title" style="margin-bottom:15rpx;">
        开奖条件
      </view>
      <view class="step" a:for="{{[{},{}]}}">
        <view class="step font-content" a:for="{{activity.openConditions.conditions}}">
        <image mode="scaleToFill" src="/image/icon/icon_right_gray.png"/>
        <text>11月11日18:00自动开奖</text>
          <text>{{item}}</text>
      </view>
      <view class="beizhu">
        <view class="beizhu font-weak">
        <text number-of-lines="{{openShowMore?2:100}}">
          注：系统将会由"支付宝首页-服务提醒"给用户下发是否中奖提醒消息提醒消息提醒消息提醒消息提醒消息提醒消息提醒醒消息提醒醒醒消息提醒消息提醒消息提醒消息提醒消息提醒醒消息提醒醒醒消息提醒消息提醒消息提醒消息提醒消息提醒醒消息提醒醒
          {{activity.openConditions.marks}}
        </text>
        <view a:if="{{openShowMore}}" data-type="open" onTap="showMore">
          <text>
@@ -126,21 +133,21 @@
    </view>
    <view class="award-anouncement item" onTap="onDrawnAnouncementClick">
      <view style="flex-grow:1;">
        <view class="title">中奖公示</view>
        <rich-text nodes="{{drawnAnouncementDesc}}">
          <view class="title  font-title">中奖公示</view>
          <rich-text class="font-weak" nodes="{{drawnAnouncementDesc}}">
        </rich-text>
      </view>
      <image mode="scaleToFill" src="/image/icon/icon_right_array_input.png" class="input"/>
    </view>
    <view class="sponsor-join item" onTap="onSponsorSignUpClick">
      <view style="flex-grow:1;">
        <view class="title">赞助报名</view>
        <rich-text nodes="{{[{name:'div',children:[{type:'text',text:'成为赞助商为用户派送福利'}]}]}}">
          <view class="title  font-title">赞助报名</view>
          <rich-text class="font-weak" nodes="{{[{name:'div',children:[{type:'text',text:'成为赞助商为用户派送福利'}]}]}}">
        </rich-text>
      </view>
      <image mode="scaleToFill" src="/image/icon/icon_right_array_input.png" class="input"/>
    </view>
    <view class="footer">
      <view class="footer font-weak">
      <view onTap="onAdviceClick">意见反馈</view>
      <view class="cut-line"></view>
      <view onTap="mianZe">免责申明</view>
@@ -151,13 +158,14 @@
    </view>
    <view style="height:81rpx;"></view>
  </view>
  <view class="other-activity" onTap="onOtherAcitivtyClick">
    <view a:if="{{activity.sponsorActivityCount>0}}" class="other-activity font-title" onTap="onOtherAcitivtyClick">
    <text>查看赞助商其他活动</text>
    <view>
      <text>共2个</text>
        <text>共{{activity.sponsorActivityCount}}个</text>
      <image mode="scaleToFill" src="/image/icon/icon_array_right_white.png"/>
    </view>
  </view>
  </scroll-view>
  <!--免责声明-->
  <modal class="modal-mianze" onModalClose="closeMianZeModal" show="{{showMianZeModal}}">
    <view class="body">
@@ -170,7 +178,7 @@
我们天天领现金-淘拼团会在法律范围内规范、监督、督促用户遵守相关法律和平台使用规则，营造良好、公平、公正、真实的平台环境，感谢支持。
        </text>
      </view>
      <button type="primary" onTap="closeMianZeModal">
      <button type="primary" class="btn-primary" hover-class="btn-primary-hover" onTap="closeMianZeModal">
我知道了
      </button>
    </view>
@@ -183,15 +191,14 @@
      <image mode="scaleToFill" src="/image/detail_join_coupon.png"/>
      <view class="content">
        <view class="number">
          ×1
          ×{{joinResult.weight}}
        </view>
        <view class="state">
          你已成功参与
        </view>
        <view class="desc">
          <text decode="true">
          活动期号: NO.12317823
          抽奖活动
         {{joinResult.title}}
          </text>
        </view>
      </view>
@@ -202,16 +209,14 @@
    <view class="body">
      <image class="top" mode="scaleToFill" src="/image/detail_assist_success_top.png"/>
      <view class="content">
        <image class="portrait" mode="scaleToFill" src="/image/portrait-test.jpg"/>
        <image class="portrait" mode="scaleToFill" src="{{assistResult.user.portrait}}"/>
        <view class="nick-name">
            昵*****称
            {{assistResult.user.nickName}}
        </view>
        <view class="desc">
          <text decode="true"> 邀请你助力拼手气抽奖</text>
          <text decode="true">   {{assistResult.title}}</text>
        </view>
        <button type="primary" onTap="onFreeLuckyClick">
  我也参与
        </button>
        <button type="primary" class="btn-primary" hover-class="btn-primary-hover" onTap="onFreeLuckyClick">我也参与</button>
      </view>
    </view>
  </modal>

 pages/activity-detail/activity-detail.js

@@ -1,19 +1,24 @@
var help = require('../../util/help.js');
var api = require('../../util/api.js');
import parse from 'mini-html-parser2';
var $this;
var leftTimeInterval;
Page({
  data: {
    leftTime: {//剩余时间
      h: "00",
      m: "00",
      s: "00"
      hh: "00",
      mm: "00",
      ss: "00"
    },

    leftTimeMS: 0,
    checkFollow: false,
    showFollow: false,
    //免责弹框
    showMianZeModal: false,
    //参与抽奖成功弹框
    showCouponModal: false,
    //助力成功弹框
    showAssistModal: true,
    showAssistModal: false,
    //奖项查看更多
    awardShowMore: true,
    //参与条件查看更多
@@ -29,53 +34,112 @@
    //中奖公示
    drawnAnouncementDesc: [],


  },

  onShareAppMessage() {
    return {
      title: '分享 View 组件',
      desc: 'View 组件很通用',
      path: 'pages/activity-detail/activity-detail',
    };
    console.log('onShareAppMessage');
    var shareData = $this.data.activity.shareInfo;
    return shareData;
  },
  onLoad() {
  onLoad(query) {
    $this = this;
    console.log(query);
    help.setPageNavBar("抽奖详情");
    var that=this;
    $this.setData({
      joinInfo: query.joinInfo
    });

    var activity = {
      joined: false,
      awardList: [{
    api.getActivityDetail({
      id: query.id,
      success: function (res) {
        if (res.code != 0) {
          my.showToast({
            content: res.msg
          });
          return;
        }

      }, {}, {}],
      labels: [{ background: "#E0FFD2", color: "#008B10", value: "进行中" }, { background: "#FFF5D2", color: "#FF8A00", value: "押金预付" }, { background: "#FFE2E6", color: "#F53D59", value: "礼金核实" }]
    };
        var data = res.data;
        //是否显示奖项的查看更多
        $this.setData({
          awardShowMore: data.activity.awardList.length > 3
        });

        var leftTime = help.getLeftTime(data.activity.leftTime);
        $this.setData({
          leftTime: leftTime,
          leftTimeMS: data.activity.leftTime
        })


        clearInterval(leftTimeInterval);
        leftTimeInterval = setInterval(function () {
          if ($this.data.leftTimeMS <= 0) {
            clearInterval();
            return;
          }

          var leftTime = help.getLeftTime($this.data.leftTimeMS);
          $this.setData({
            leftTime: leftTime,
            leftTimeMS: $this.data.leftTimeMS - 1000
          })
        }, 1000);

    //封装奖项的富文本
    this.loadRichTextNode(help.getAwardHtml({}), function (nodes) {
      for (var i = 0; i < activity.awardList.length; i++) {
        activity.awardList[i].htmlJson = nodes;
      }
      that.setData({
        activity: activity
      });
    });
    //封装助力进度的富文本
    this.loadRichTextNode(help.getAssistProcessHtml(1), function (nodes) {
        for (var i = 0; i < data.activity.awardList.length; i++) {
          $this.loadRichTextNode(help.getAwardHtml({
            content: data.activity.awardList[i].title,
            moreType: 'icon',
            link: data.activity.awardList[i].link
          }), function (nodes) {
            data.activity.awardList[i].htmlJson = nodes;

      that.setData({
          });
        }


        $this.setData({
          activity: data
        });

        setTimeout(() => {
          $this.requestAssist();
        }, 100);

        //封装助力进度的富文本
        $this.loadRichTextNode(help.getAssistProcessHtml(1), function (nodes) {

          $this.setData({
        assistProcessDesc: nodes
      });
    });

    //封装中奖公示的富文本
    this.loadRichTextNode(help.getDowanAnouncementHtml("2020.02.02 02:02"), function (nodes) {
        $this.loadRichTextNode(help.getDowanAnouncementHtml("2020.02.02 02:02"), function (nodes) {

      that.setData({
          $this.setData({
        drawnAnouncementDesc: nodes
      });
    });

      },
      showLoading: true,
    })


  },

  onUnload() {
    //结束定时器
    clearInterval(leftTimeInterval);
  },

  onReady() {
    var item = my.createSelectorQuery()
      .select('#beizhu');
    console.log(item);



@@ -90,12 +154,7 @@
    });
  },

  onReady() {

    var item = my.createSelectorQuery()
      .select('#beizhu');
    console.log(item);
  },
  closeMianZeModal() {
    this.setData({
      showMianZeModal: false
@@ -144,15 +203,20 @@

  //奖品疑问点击
  onAwardQuestionClick() {
    my.showToast({
      content: '奖品疑问'
    my.navigateTo({
      url: '/pages/web/web?url=' + this.data.activity.helpLink
    });
  },
  //查看奖品详情
  onAwardDetailClick() {
    my.showToast({
      content: '奖品详情'
  onAwardDetailClick(event) {
    var award = help.getEventParam(event, 'item');
    if (award && award.link) {
      my.navigateTo({
        url: '/pages/web/web?url=' + award.link
    });
    }
    //测试
    this.showFollowView();
  },

  //广告点击
@@ -162,31 +226,55 @@
    });
  },

  //好友助力
  onAssistClick() {
    my.showToast({
      content: '好友助力'
  //展示关注组件
  showFollowView() {
    console.log("触发关注状态")
    this.setData({
      checkFollow: true,
      showFollow: true
    });

    // setTimeout(() => {
    //   this.setData({
    //     checkFollow: false,
    //     showFollow: true
    //   });

    // });

  },
  //关注回调
  checkFollowCb(e) {
    // e.detail对象里会有followed字段，可以用来判断关注状态
    console.log("是否关注：" + e.detail.followed);
    this.setData({
      checkFollow: false,
      showFollow: false,
    });

    //展示组件
    setTimeout(() => {
      this.setData({
        showFollow: true,
      });
    });

  },
  //关注面板关闭
  closeCb(e) {
    console.log("是否关注:" + e.detail.followed);
  },
  //免费抽奖
  onFreeLuckyClick() {
    //关闭助力弹框
    this.closeAssistModal();

    this.setData({
      activity: {
        joined: true
      }
    });
    this.setData({
      showCouponModal: true
    });
    this.requestJoin();
  },

  //我的幸运券
  onMyCouponClick() {
    my.navigateTo({
      url: '/pages/lucky-coupon/lucky-coupon'
      url: '/pages/lucky-coupon/lucky-coupon?activityId='+$this.data.activity.activity.id
    });
  },
  //更多参与者
@@ -246,9 +334,50 @@
  },
  //赞助商的其他活动
  onOtherAcitivtyClick() {
    my.showToast({
      content: '赞助商的其他活动'
    my.navigateTo({
      url: '/pages/sponsor-activity/sponsor-activity?sponsorId=' + this.data.activity.sponsor.id + '&activityId=' + this.data.activity.id
    });
  },
  //参与抽奖
  requestJoin() {
    api.joinLucky({
      activityId: this.data.activity.activity.id,
      showLoading: true,
      success: function (res) {
        if (res.code == 0) {
          var activity = $this.data.activity;
          activity.joined = true;
          $this.setData({
            joinResult: res.data,
            showCouponModal: true,
            activity: activity
          });

        } else {
          my.showToast({
            content: res.msg
          });
        }
      }
    })
  },
  requestAssist() {
    if (!$this.data.joinInfo)
      return;
    api.assist({
      activityId: $this.data.activity.id,
      joinInfo: $this.data.joinInfo,
      success: (res) => {
        if (res.code == 0) {
          var invite = res.data.invite;
          $this.setData({
            assistResult: invite,
            showAssistModal: true
          });
        }
      },
    });

  }



 pages/advice/advice.axml

@@ -1,6 +1,6 @@
<view>
  <view class="body">
    <textarea maxlength="150" placeholder="你的意见很宝贵，感谢你的任何想法。"></textarea>
    <button type="primary" onTap="onClick">确认反馈</button>
    <button type="primary" class="btn-primary"  hover-class="btn-primary-hover" onTap="onClick">确认反馈</button>
  </view>
</view>

 pages/assist-friends/assist-friends.acss

@@ -1,15 +1,12 @@
@import "../common.acss";


.main-content {
  background: #FFFFFF;
  height: 97vh;
  width: 94vw;
  position: absolute;
  top: 0;
  border-radius: 16rpx;
  margin-left: 3vw;
  margin-top: 1vh;
  height: auto;
}

.nav {
@@ -42,3 +39,8 @@
  font-weight: 400;
  color: #666666;
}

scroll-view{
  padding-top: 0;
  padding-bottom: 0;
}

 pages/assist-friends/assist-friends.axml

@@ -24,8 +24,6 @@
      </view>
      <!-- 上拉加载 -->
    <include src="../loading_view.axml" />
      

    </scroll-view>
  </view>
</view>

 pages/assist-process/assist-process.acss

@@ -1,6 +1,5 @@
@import "../common.acss";
.top {
  height: 15vh;
  height: 13vh;
  background: #0080FF;
  padding-top: 1vh;
}
@@ -25,13 +24,17 @@
.content {
  padding: 20rpx;
  position: absolute;
  height: 83vh;
  max-height: 83vh;
  width: 670rpx;
  background: #FFFFFF;
  border-radius: 16rpx;
  margin-left: 20rpx;
  margin-top: -5vh;
  z-index: 100;
}

.content scroll-view {
  max-height: 78vh;
}

.content .title {
@@ -65,6 +68,11 @@

.content .column1 text {
  font-size: 28rpx;
  width: 226rpx;
}

.content .title .column2 {
  font-size: 28rpx;
}

.content .column2 {

 pages/assist-process/assist-process.axml

@@ -17,7 +17,10 @@
      <flex class="item" direction="row" align="center" wrap="nowrap" a:for="{{friendsList}}">
        <flex class="column1" direction="row" wrap="wrap">
          <image mode="scaleToFill" src="/image/portrait-test.jpg"/>
          <text number-of-lines="1">text</text>
          <view>
               <text number-of-lines="1">获得幸运券hellow 你好请问</text>
          </view>
       
        </flex>
        <text class="column2">助力成功\n且参与抽奖</text>
        <text class="column3">+ 12张</text>

 pages/assist-process/assist-process.js

@@ -1,7 +1,7 @@
var help = require('../../util/help.js');
Page({
  data: {
    friendsList: [{}, {}, {}],
    friendsList: [{}, {}, {},{}, {}],
    showLoading: true
  },


 pages/assist-process/assist-process.json

@@ -1,6 +1,7 @@
  {"usingComponents": {
    "flex": "mini-ali-ui/es/flex/index",
    "flex-item": "mini-ali-ui/es/flex/flex-item/index",
    "modal": "mini-ali-ui/es/modal/index"
    "modal": "mini-ali-ui/es/modal/index",
    "footer": "mini-ali-ui/es/footer/index"
  }
}

 pages/footer.axml

 pages/join-statistic/join-statistic.acss

@@ -1,4 +1,3 @@
@import "../common.acss";
.top {
  background: #0080FF;
  height: 190rpx;
@@ -27,6 +26,7 @@
  line-height: 102rpx;
  font-size: 34rpx;
  border-radius: 16rpx 16rpx 0rpx 0rpx;
  margin-bottom: -1px;
}

.body {
@@ -43,7 +43,11 @@
  border-radius: 0rpx 0rpx 16rpx 16rpx;
  font-size: 28rpx;
  color: #000000;
  height: 85%;
  max-height: 85%;
}

.body .content-rank scroll-view {
  max-height: 80vh;
}

.body .content-rank .notify {
@@ -151,7 +155,11 @@
  border-radius: 0rpx 0rpx 16rpx 16rpx;
  font-size: 28rpx;
  color: #000000;
  height: 85%;
  max-height: 85%;
}

.content-joiner scroll-view {
   max-height: 80vh;
}

.content-joiner .title {
@@ -188,7 +196,6 @@
  margin-right: 15rpx;
}


.statistic-modal .model-content {
  width: 516rpx;
  height: 484rpx;
@@ -204,5 +211,6 @@
  justify-content: center;
  align-items: center;
  height: 80rpx;
  line-height: 80rpx;
  margin-top: 20rpx;
}

 pages/join-statistic/join-statistic.axml

@@ -43,7 +43,7 @@
        <view class="placeholder">共12834参与</view>
        <view class="placeholder">你是第1002参与</view>
      </flex>
      <scroll-view scroll-y style="height:92%;">
      <scroll-view scroll-y style="height:100%;">
        <flex class="joiner-list" direction="row" wrap="wrap">
          <image style="margin-right:{{(index+1)%10!=0?'4rpx;':'0;'}} margin-top:{{(index+1)>10?'4rpx;':'0;'}}" mode="scaleToFill" src="/image/portrait-test.jpg" a:for="{{joinerList}}"/>
        </flex>
@@ -61,8 +61,10 @@
      <text class="title">当前中奖概率高于平均值</text>
      <view class="number">
        <image src="/image/icon/icon_percent_up.png"/>
        <view>
        <text class="percent">10.05倍</text>
      </view>
      </view>
      <view style="display:flex;  justify-content: center;  margin-bottom: 30rpx;">
        <circle-statistic-view percent="50" width="184rpx" height="184rpx"></circle-statistic-view>
      </view>

 pages/join-statistic/join-statistic.js

@@ -4,7 +4,7 @@
    showStatistic: true,
    currentType: 1,
    showLoading: true,
    rankList: [{ rank: 1 }, { rank: 3 }, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}],
    rankList: [{ rank: 1 }, { rank: 3 }, {}, {}, {}],
    joinerList: [{}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}],
    joinerHasMore: true
  },
@@ -28,6 +28,5 @@
    this.setData({
      showStatistic: false
    });

  }
});

 pages/jquery/jquery.js

File was deleted

 pages/lucky-coupon/lucky-coupon.acss

@@ -1,6 +1,5 @@
@import "../common.acss";
.top {
  height: 15vh;
  height: 13vh;
  background: #0080FF;
}

@@ -20,7 +19,7 @@
.content {
  padding: 20rpx;
  position: absolute;
  height: 83vh;
  max-height: 85vh;
  width: 670rpx;
  background: #FFFFFF;
  border-radius: 16rpx;

 pages/lucky-coupon/lucky-coupon.axml

@@ -13,15 +13,16 @@
      <view class="number">幸运券</view>
      <view class="time">获得时间</view>
    </flex>
    <scroll-view scroll-y="">
      <flex class="item {{index%2==0?'even':'odd'}}" direction="row" align="center" wrap="nowrap" a:for="{{couponList}}">
        <text class="source" number-of-lines="1">自己擦浴12</text>
        <text class="number">x10张</text>
        <text class="time">2020.02.02 12:00</text>
    <import src="../template/template.axml"/>
    <scroll-view scroll-y="" a:if="{{!showEmptyDefault&&list.length>0}}">
      <flex class="item {{index%2==0?'even':'odd'}}" direction="row" align="center" wrap="nowrap" a:for="{{list}}">
        <text class="source" number-of-lines="1">{{item.title}}</text>
        <text class="number">x{{item.count}}张</text>
        <text class="time">{{item.time}}</text>
      </flex>

   <include src="../loading_view.axml" />

      <template is="page-footer" data="{{showFooter}}"/>
    </scroll-view>
    <template a:if="{{showEmptyDefault}}" is="page-result-empty" data="{{title:'亲，暂无数据哦'}}"/>
  </view>
</view>

 pages/lucky-coupon/lucky-coupon.js

@@ -1,13 +1,117 @@
var help = require('../../util/help.js');
var api = require('../../util/api.js');
var $this;
Page({
  data: {
    showLoading:true,
    couponList: [
      {}, {}, {}
    ]
    /* 列表数据开始 */
    list: [],
    showLoading: false,
    page: 1,
    total: 0,
    showEmptyDefault: false,
    isRequesting: false,//是否正在请求中
    showFooter: false,
    /* 列表数据结束 */

  },
  onLoad() {
  onLoad(query) {
    console.log(query)
    $this = this;
    var activityId = query.activityId;
    $this.data.activityId = activityId;
    help.setPageNavBar("幸运券");
    $this.requestCouponList(1, true);
  },

  onPullDownRefresh() {
    console.log('onPullDownRefresh', new Date());
    my.showToast({
      content: "下拉刷新触发"
    });
    this.requestCouponList(1);
  },
  //请求活动
  requestCouponList(page, first) {
    $this.setData({
      page: page,
      isRequesting: true,
      showEmptyDefault: false
    });
    api.getLuckyCouponList({
      activityId: $this.data.activityId,
      page: page,
      showLoading: first,
      success: function (res) {
        console.log(res)
        if (res.code == 0) {
          var list = res.data.data;
          //设置列表数据
          if (list != null && list.length > 0) {
            var totalList = $this.data.list.concat(list);
            if (page == 1) {
              totalList = list;
            }
            $this.setData({
              total: res.data.count,
              list: totalList,
              showFooter: totalList.length >= res.data.count
            })
          }
          //设置空列表默认显示
          if (page == 1 && (list == null || list.length == 0)) {
            $this.setData({
              showEmptyDefault: true
            })
          }
        } else {
          my.showToast({
            content: res.msg
          });
        }
      },
      fail: function () {
        //请求失败需要将页码减1
        if ($this.data.page > 1) {
          $this.setData({
            page: $this.data.page - 1
          });
        }
      },
      complete: function () {
        my.stopPullDownRefresh();
        setTimeout(() => {
          $this.setData({
            isRequesting: false,
            showLoading: false
          });
        }, 1000);

      }
    });

  },
  //下拉刷新
  onPullDownRefresh() {
    this.requestCouponList(1, false);
  },
  //到达底部
  async scrollMytrip() {
    if (this.data.isRequesting)
      return;
    try {
      console.log('scrollMytrip:');
      const { page, list, } = this.data;
      // 判断是否还有数据需要加载
      if (list.length < this.data.total) {
        //开启加载
        this.setData({ showLoading: true });
        const newPage = page + 1;
        $this.requestCouponList(newPage);
      }
    } catch (e) {
      this.setData({ showLoading: false });
      console.log('scrollMytrip执行异常:', e);
    }
  },
});


 pages/lucky-coupon/lucky-coupon.json

@@ -2,6 +2,7 @@
  "usingComponents": {
    "flex": "mini-ali-ui/es/flex/index",
    "flex-item": "mini-ali-ui/es/flex/flex-item/index",
    "modal": "mini-ali-ui/es/modal/index"
    "modal": "mini-ali-ui/es/modal/index",
    "footer": "mini-ali-ui/es/footer/index"
  }
}

 pages/lucky-record/lucky-record.acss

@@ -1,4 +1,3 @@
@import "../common.acss";
.notice {
  background: #FFF5B1;
  color: #666666;
@@ -42,6 +41,12 @@
.item .poster {
  width: 100%;
  height: 354rpx;
  overflow: hidden;
}

.item .poster image {
  width: 100%;
  height: 100%;
  border-top-left-radius: 20rpx;
  filter: blur(5rpx);
  border-top-right-radius: 20rpx;
@@ -132,13 +137,21 @@
  margin-left: -8rpx;
}

.container{
  padding-top: 90rpx;
}

.nav {
  padding-left: 40rpx;
  padding-right: 40rpx;
  height: 90rpx;
  width: 100%;
  background: #0080FF;
  color: #FFFFFF;
  padding-bottom: 5rpx;
  position: fixed;
  top:0;
  z-index: 100;
}

.nav text {
@@ -161,3 +174,4 @@
.nav .active .nav-bar{
  background: #FFFFFF;
}


 pages/lucky-record/lucky-record.axml

@@ -11,25 +11,34 @@
      <text>未中奖</text>
      <view class="nav-bar"></view></view>
  </flex>
  <scroll-view style="height: 100vh;" 
        scroll-y onScrollToLower="scrollMytrip" enable-back-to-top="true">
    <view a:for="{{list}}" class="item">
      <image mode="aspectFill" class="poster" src="/image/test.jpg"></image>
  <view class="container" >
    <scroll-view a:if="{{!showEmptyDefault&&list.length>0}}" scroll-y onScrollToLower="scrollMytrip" enable-back-to-top="true">
      <view a:for="{{list}}" class="item lucky-activity-item">
        <view class="poster">
          <image mode="aspectFill" src="{{item.activity.poster}}"></image>
        </view>
      <view class="poster_front">
      </view>
      <flex class="desc" direction="column" wrap="wrap" align="center" justify="center">
        <view class="title">本活动，暂未开奖！</view>
        <view class="sub-title">（活动期号 NO.12317823）</view>
        <flex justify="center" align="center">
          <image style="width:28rpx;height:28rpx;margin-right:9rpx;" src="/image/icon/icon_award_fen.png"/>
          <text class="award" number-of-lines="1"> 奖品一：大额现金红包100×10份</text>
          <view class="title">{{item.stateInfo.title}}</view>
          <view class="sub-title">{{item.stateInfo.subTitle}}</view>
          <view a:if="{{item.stateInfo.drawnInfo}}">
            <flex justify="center" align="center" a:if="{{item.stateInfo.drawnInfo.award}}">
              <image style="width:28rpx;height:28rpx;margin-right:9rpx;" src="{{item.stateInfo.drawnInfo.award.typeIcon}}"/>
              <text class="award" number-of-lines="1">{{item.stateInfo.drawnInfo.award.title}}</text>
        </flex>
            <view class="sub-title">{{item.stateInfo.drawnInfo.subTitle}}</view>
          </view>
      </flex>
      <import src="../template/template.axml"/>
      <template is="activityItemBottom" data="{{item}}"/>
    </view>
    <include src="../loading_view.axml" />
      <template is="page-footer" data="{{showFooter}}"/>
  </scroll-view>
    <import src="../template/template.axml"/>
    <template a:if="{{showEmptyDefault}}" is="page-result-empty" data="{{title:'亲，暂无数据哦'}}"/>
  </view>
  <modal show="{{false}}" onModalClose="onCloseDialog" class="dialog" advice="{{true}}">
    <view>
      <image class="title" mode="scaleToFill" src="/image/reward_dialog_title.png"/>

 pages/lucky-record/lucky-record.js

@@ -1,28 +1,101 @@
var help = require('../../util/help.js');
var api = require('../../util/api.js');
var $this;
Page({
  data: {
    list: [1, 2, 3, 4, 5, 6, 7, 8, 10],
    /* 列表数据开始 */
    list: [],
    showLoading: false,
    page: 1,
    total: 15,
    total: 0,
    showEmptyDefault: false,
    isRequesting: false,//是否正在请求中
    showFooter: false,
    /* 列表数据结束 */

    type: 1
  },
  onLoad() {
    // my.hideFavoriteMenu();
    my.setNavigationBar({
      title: "抽奖记录",
      backgroundColor: "#0080FF",
      borderBottomColor: "#0080FF"
    });
    help.setPageNavBar("抽奖记录");
    $this = this;
    $this.requestActivity(1, true);
  },

  onPullDownRefresh() {
    console.log('onPullDownRefresh', new Date());
    my.showToast({
      content: "下拉刷新触发"
    });

    this.getActivityList(1);
    this.requestActivity(1);
  },
  //请求活动
  requestActivity(page, first) {
    $this.setData({
      page: page,
      isRequesting: true,
      showEmptyDefault:false
    });
    api.getLuckyRecord({
      page: page,
      type: $this.data.type,
      showLoading: first,
      success: function (res) {
        console.log(res)
        if (res.code == 0) {
          var list = res.data.data;
          //设置列表数据
          if (list != null && list.length > 0) {
            var totalList = $this.data.list.concat(list);
            if (page == 1) {
              totalList = list;
            }
            $this.setData({
              total: res.data.count,
              list: totalList,
              showFooter: totalList.length >= res.data.count
            })
          }
          //设置空列表默认显示
          if (page == 1 && (list == null || list.length == 0)) {
            $this.setData({
              showEmptyDefault: true
            })
          }
        } else {
          my.showToast({
            content: res.msg
          });
        }
      },
      fail: function () {
        //请求失败需要将页码减1
        if ($this.data.page > 1) {
          $this.setData({
            page: $this.data.page - 1
          });
        }
      },
      complete: function () {
        my.stopPullDownRefresh();
        setTimeout(() => {
          $this.setData({
            isRequesting: false,
            showLoading: false
          });
        }, 1000);

      }
    });

  },
  //下拉刷新
  onPullDownRefresh() {
    this.requestActivity(1, false);
  },
  //到达底部
  async scrollMytrip() {
    if (this.data.isRequesting)
      return;
    try {
      console.log('scrollMytrip:');
      const { page, list, } = this.data;
@@ -31,26 +104,19 @@
        //开启加载
        this.setData({ showLoading: true });
        const newPage = page + 1;
        this.getActivityList(newPage);
        $this.requestActivity(newPage);
      }
    } catch (e) {
      this.setData({ show: false });
      this.setData({ showLoading: false });
      console.log('scrollMytrip执行异常:', e);
    }
  },
  //获取列表
  getActivityList(page = 1) {
    setTimeout(function () {
      my.stopPullDownRefresh({
        complete(res) {
          console.log(res, new Date())
        }
  clickItem(event) {
    var item = help.getEventParam(event, 'item');
    console.log(item.activity.id);
    my.navigateTo({
      url: '/pages/activity-detail/activity-detail?id=' + item.activity.id
      });
      my.showToast({
        content: "请求数据:" + page
      });

    }, 5000);
  },
  showDialog() {

@@ -75,9 +141,11 @@
      return;
    }
    this.setData({
      type: newType
      type: newType,
      list:[],
      total:0
    });

    this.requestActivity(1, true);
  }



 pages/lucky-record/lucky-record.json

@@ -3,6 +3,7 @@
  "usingComponents": {
    "flex": "mini-ali-ui/es/flex/index",
    "flex-item": "mini-ali-ui/es/flex/flex-item/index",
    "modal": "mini-ali-ui/es/modal/index"
    "modal": "mini-ali-ui/es/modal/index",
    "footer": "mini-ali-ui/es/footer/index"
  }
}

 pages/mine/mine.acss

@@ -79,4 +79,5 @@

badge {
  z-index: 10;
  font-size: 20rpx;
}

 pages/mine/mine.axml

@@ -1,15 +1,15 @@
<view enable-back-to-top="true">
  <flex class="user" align="center" a:if="{{logined}}">
    <image mode="scaleToFill" class="portrait" src="/image/portrait-test.jpg"/>
    <image mode="scaleToFill" class="portrait" src="{{user.portrait}}"/>
    <view style="width:480rpx;margin-right:10rpx;margin-left:31rpx;">
      <text class="nick-name" number-of-lines="1">
      吃个大西瓜吃个大西瓜吃个大西瓜吃个大西瓜吃个大西瓜
      {{user.nickName}}
      </text>
      <text class="uid">
      ID：412165
      ID：{{user.id}}
      </text>
    </view>
    <button type="ghost" class="logout">
    <button type="ghost" hover-class="btn-ghost-hover" class="logout" onTap="onCloseLogoutShow">
    退出
    </button>
  </flex>
@@ -24,19 +24,19 @@
    <list-item thumb="/image/icon/icon_mine_lucky_record.png" thumbSize="50rpx" arrow="{{true}}" data-key="luckRecord" onClick="onItemClick">
        抽奖记录
    </list-item>
    <list-item thumb="/image/icon/icon_mine_assist_friends.png" arrow="{{true}}" thumbSize="45rpx" data-key="friends" onClick="onItemClick">
    <list-item thumb="/image/icon/icon_mine_assist_friends.png" arrow="{{true}}" thumbSize="50rpx" data-key="friends" onClick="onItemClick">
        助力好友
    </list-item>
    <view style="height:22rpx;"></view>
    <list-item thumb="/image/icon/icon_mine_msg.png" arrow="{{true}}" thumbSize="48rpx" data-key="msg" onClick="onItemClick">
        消息记录
      <badge slot="extra" text="{{'99+'}}" dot="{{false}}" />
      <badge className="badge" slot="extra" text="{{'99+'}}" dot="{{false}}" />
    </list-item>
    <view style="height:22rpx;"></view>
    <list-item thumb="/image/icon/icon_mine_scan_history.png" arrow="{{true}}" thumbSize="51rpx" data-key="scanHistory" onClick="onItemClick">
    <list-item thumb="/image/icon/icon_mine_scan_history.png" arrow="{{true}}" thumbSize="53rpx" data-key="scanHistory" onClick="onItemClick">
        浏览足迹
    </list-item>
    <list-item thumb="/image/icon/icon_mine_newer_course.png" arrow="{{true}}" thumbSize="43rpx" data-key="newerCourse" onClick="onItemClick">
    <list-item thumb="/image/icon/icon_mine_newer_course.png" arrow="{{true}}" thumbSize="47rpx" data-key="newerCourse" onClick="onItemClick">
        新手教程
    </list-item>
    <list-item thumb="/image/icon/icon_mine_question.png" arrow="{{true}}" thumbSize="48rpx" data-key="question" onClick="onItemClick">
@@ -49,16 +49,16 @@
    确定要退出登录吗？
      </view>
      <view class="content">
    退出登录后将无法及时查看到抽奖进度、中奖状态、领取奖品等状态更新和提醒
    退出登录后将hello及时查看到抽奖进度、中奖状态、领取奖品等状态更新和提醒
      </view>
      <view style="display:flex;justify-content:space-between">
        <button type="ghost" onTap="onLogout">
        <button type="ghost"  hover-class="btn-ghost-hover" onTap="onLogout">
      确定退出
        </button>
        <button type="primary" onTap="onCloseLogout">
        <button type="primary"  class="btn-primary"  hover-class="btn-primary-hover" onTap="onCloseLogout">
      考虑一下
        </button>
      </view>
    </view>
  </modal>
  <view>
  </view>

 pages/mine/mine.js

@@ -1,8 +1,8 @@
var help = require('../../util/help.js');
var http = require('../../util/http.js');
var api = require('../../util/api.js');
Page({
  data: {
    showLogout: true
    showLogout: false
  },

  //导航栏点击过来的
@@ -30,7 +30,15 @@
    });


    http.postApi('http://www.baidu.com', {}, function (res) { }, function (e) { }, null, true);
    let userData = my.getStorageSync({ key: 'user' });
    var user = userData.data;
    console.log(user)
    if (user != null) {
      this.setData({
        logined: true,
        user: user
      });
    }

  },

@@ -41,13 +49,32 @@
      },
      success: (res) => {
        let userInfo = JSON.parse(res.response).response // 以下方的报文格式解析两层 response
        console.log(JSON.stringify(userInfo));
        if (userInfo.code == '10000') {//成功
          my.showToast({
            content: JSON.stringify(userInfo)
          });
          console.log(JSON.stringify(userInfo))
          help.rsa(JSON.stringify(userInfo), function (res) {
            api.uploadUserInfo({
              userInfo: res,
              showLoading: true,
              success: function (res) {
                if (res.code == 0) {
          that.setData({
            logined: true
                    logined: true,
                    user: res.data
                  });

                  //保存用户信息
                  my.setStorage({
                    key: 'user',
                    data: res.data
                  });

                } else {
                  my.showToast({
                    content: res.msg
                  })
                }
              }
            })
          });
        } else {
          my.showToast({
@@ -85,7 +112,6 @@
      case 'question':
        path = '/pages/web/web?title=测试&url=http://www.baidu.com';
        break;

    }
    my.navigateTo({
      url: path
@@ -98,7 +124,16 @@
    });
  },
  onLogout() {
    this.setData({
      user: null,
      logined: false
    });
    this.onCloseLogout();
  },
  onCloseLogoutShow() {
    this.setData({
      showLogout: true
    });
  }



 pages/msg-record/msg-record.acss

@@ -1,4 +1,3 @@
@import "../common.acss";
.msg-nav {
  background: #0080FF;
  height: 90rpx;

 pages/reward-announcement/reward-announcement.acss

@@ -28,9 +28,13 @@
  width: 656rpx;
  background: #FFFFFF;
  border-radius: 16rpx;
  height: 79vh;
  max-height: 79vh;
  padding: 3vh 30rpx;
  box-sizing: content-box;
}

.body .content scroll-view{
  max-height: 79vh;
}

.award {
@@ -41,13 +45,15 @@
  height: 28rpx;
  width: 28rpx;
  margin-left: 7rpx;
  margin-right: 17rpx;
}

.award-name {
  font-size: 30rpx;
  font-weight: 400;
  color: #000000;
  line-height: 60rpx;
  line-height: 39rpx;
  width: 600rpx;
}

.user-list {

 pages/reward-announcement/reward-announcement.axml

@@ -5,7 +5,7 @@
    </view>
    <view style="font-size:22rpx;">
更新于2020.11.18 12:00
    </view>>
    </view>
  </view>
  <view class="body">
    <view>

 pages/reward-announcement/reward-announcement.js

@@ -1,7 +1,15 @@
var help = require('../../util/help.js');
import parse from 'mini-html-parser2';
Page({
  data: {
    awardList: [
    awardList: []
  },
  onLoad() {
    help.setPageNavBar("中奖公示");

    var that=this;

    var awardList =  [
      {
        userList: [{ portrait: '/image/portrait-test.jpg' }, { portrait: '/image/portrait-test.jpg' }, { portrait: '/image/portrait-test.jpg' }, { portrait: '/image/portrait-test.jpg' },{ portrait: '/image/portrait-test.jpg' },{ portrait: '/image/portrait-test.jpg' },{ portrait: '/image/portrait-test.jpg' },{ portrait: '/image/portrait-test.jpg' },{ portrait: '/image/portrait-test.jpg' },{ portrait: '/image/portrait-test.jpg' },{ portrait: '/image/portrait-test.jpg' },{ portrait: '/image/portrait-test.jpg' },{ portrait: '/image/portrait-test.jpg' },{ portrait: '/image/portrait-test.jpg' },{ portrait: '/image/portrait-test.jpg' }, { portrait: '/image/portrait-test.jpg' }, { portrait: '/image/portrait-test.jpg' }, { portrait: '/image/portrait-test.jpg' },{ portrait: '/image/portrait-test.jpg' },{ portrait: '/image/portrait-test.jpg' },{ portrait: '/image/portrait-test.jpg' },{ portrait: '/image/portrait-test.jpg' },{ portrait: '/image/portrait-test.jpg' },{ portrait: '/image/portrait-test.jpg' },{ portrait: '/image/portrait-test.jpg' },{ portrait: '/image/portrait-test.jpg' },{ portrait: '/image/portrait-test.jpg' },{ portrait: '/image/portrait-test.jpg' }]

@@ -13,9 +21,27 @@
          userList: [{ portrait: '/image/portrait-test.jpg' }, { portrait: '/image/portrait-test.jpg' }, { portrait: '/image/portrait-test.jpg' }, { portrait: '/image/portrait-test.jpg' },{ portrait: '/image/portrait-test.jpg' },{ portrait: '/image/portrait-test.jpg' },{ portrait: '/image/portrait-test.jpg' },{ portrait: '/image/portrait-test.jpg' },{ portrait: '/image/portrait-test.jpg' },{ portrait: '/image/portrait-test.jpg' },{ portrait: '/image/portrait-test.jpg' },{ portrait: '/image/portrait-test.jpg' },{ portrait: '/image/portrait-test.jpg' },{ portrait: '/image/portrait-test.jpg' },{ portrait: '/image/portrait-test.jpg' }, { portrait: '/image/portrait-test.jpg' }, { portrait: '/image/portrait-test.jpg' }, { portrait: '/image/portrait-test.jpg' },{ portrait: '/image/portrait-test.jpg' },{ portrait: '/image/portrait-test.jpg' },{ portrait: '/image/portrait-test.jpg' },{ portrait: '/image/portrait-test.jpg' },{ portrait: '/image/portrait-test.jpg' },{ portrait: '/image/portrait-test.jpg' },{ portrait: '/image/portrait-test.jpg' },{ portrait: '/image/portrait-test.jpg' },{ portrait: '/image/portrait-test.jpg' },{ portrait: '/image/portrait-test.jpg' }]

      }
    ]
    ];


    //封装奖项的富文本
    this.loadRichTextNode(help.getAwardHtml({}), function (nodes) {
      for (var i = 0; i <awardList.length; i++) {
       awardList[i].awardName = nodes;
      }
      that.setData({
        awardList: awardList
      });
    });
  },
  onLoad() {
    help.setPageNavBar("中奖公示");

  loadRichTextNode(html, callback) {
    parse(html, (err, nodes) => {
      console.log(nodes);
      if (!err) {
        callback(nodes);
      }
    });
  },

});

 pages/rewards/rewards.acss

@@ -1,4 +1,3 @@
@import "../common.acss";
 .notice {
  /* padding-left: 19rpx;
  padding-right: 19rpx; */
@@ -68,7 +67,7 @@
  height: 624rpx;
  background: #5294E5;
  border-radius: 16rpx;
  padding: 31rpx 60rpx;
  padding: 31rpx 50rpx;
  box-sizing: border-box;
}

@@ -79,24 +78,24 @@
}

.dialog-outdate .btn {
  width: 312rpx;
  height: 54rpx;
  line-height: 54rpx;
  width: 368rpx;
  height: 82rpx;
  line-height: 82rpx;
  background: #FFEE7E;
  border-radius: 27rpx;
  border-radius: 41rpx;
  color: #0080FF;
  font-size: 24rpx;
  font-size: 30rpx;
  margin: 0 auto;
  margin-top: 29rpx;
}

.dialog-outdate .reward {
  font-size: 30rpx;
  margin-top: 18rpx;
  margin-top: 5rpx;
  display: flex;
  line-height: 39rpx;
  box-sizing: border-box;
  padding-left: 30rpx;
  padding-left: 10rpx;
}

.dialog-outdate .reward image {
@@ -107,5 +106,5 @@
}

.dialog-outdate .reward text {
  width: 275rpx;
  width: 374rpx;
}

 pages/rewards/rewards.axml

@@ -1,5 +1,5 @@
<view class="dyt-list" style="position: relative;">
  <scroll-view style="height: 100vh;" 
  <scroll-view a:if="{{!showEmptyDefault&&list.length>0}}" style="height: 100vh;" 
        scroll-y onScrollToLower="scrollMytrip" enable-back-to-top="true">
    <notice class="notice" marqueeProps="{{loop:true}}" enableMarquee="{{true}}" show="{{showNotice}}" mode="{{noticeMode}}" onClick="onNoticeClick">
    无限循环滚动的通告栏展示情况。文字不够继续添加文字凑数。
@@ -7,8 +7,11 @@
    <import src="../template/template.axml"/>
    <template is="commonActivityListItem" a:for="{{list}}" data="{{item}}"/>
    <include src="../loading_view.axml" />
    <template is="page-footer" data="{{showFooter}}"/>
  </scroll-view>
  <modal show="{{false}}" onModalClose="onCloseDialog" class="dialog" advice="{{true}}">
  <import src="../template/template.axml"/>
  <template a:if="{{showEmptyDefault}}" is="page-result-empty" data="{{title:'亲，暂无数据哦'}}"/>
  <modal show="{{showDrawnModal}}" zIndex="100" onModalClose="onCloseDialog1" class="dialog" advice="{{true}}">
    <view >
      <image class="title" mode="scaleToFill" src="/image/reward_dialog_title.png"/>
      <view class="content">
@@ -16,7 +19,7 @@
        活动期号：NO.12378947
        </view>
        <image class="icon" src="/image/reward_dialog_icon.png"/>
        <view style="font-size:30rpx;margin-top:31rpx;">
        <view style="font-size:30rpx;margin-top:10rpx;">
        大额现金红包100
        </view>
        <view class="btn" onTap="onRecieveAward">
@@ -28,7 +31,7 @@
      </view>
    </view>
  </modal>
  <modal show="{{false}}" onModalClose="onCloseDialog" class="dialog-outdate" advice="{{true}}">
  <modal show="{{showOutDateModal}}" zIndex="100" onModalClose="onCloseDialog2" class="dialog-outdate" advice="{{true}}">
    <view >
      <image class="title" mode="scaleToFill" src="/image/reward_outdate_dialog_title.png"/>
      <view class="content">
@@ -43,7 +46,7 @@
        <view class="btn" onTap="onDetail">
                查看详情
        </view>
        <view style="font-size:24rpx;margin-top:32rpx;line-height:28rpx;">
        <view style="font-size:18rpx;margin-top:40rpx;line-height:28rpx;">
               注：中奖日起7天内未领取奖品，将会把对应奖品原路退回赞助商，切记中奖后按时领取奖品。
        </view>
      </view>

 pages/rewards/rewards.js

@@ -1,25 +1,101 @@
var help = require('../../util/help.js');
var api = require('../../util/api.js');
var $this;
Page({
  data: {
    list: [{id:13213}, 2, 3, 4, 5, 6, 7, 8, 10],
    /* 列表数据开始 */
    list: [],
    showLoading: false,
    page: 1,
    total: 15,
    total: 0,
    showEmptyDefault: false,
    isRequesting: false,//是否正在请求中
    showFooter: false,
    /* 列表数据结束 */


    //中奖弹框
    showDrawnModal: false,
    //过期未领弹框
    showOutDateModal: false,

    showNotice: true,
    noticeMode: 'closable',//closable
  },
  onLoad() { },
  onPullDownRefresh() {
    console.log('onPullDownRefresh', new Date());
  onLoad() {
    help.setPageNavBar("天天领现金");
    $this = this;
    $this.requestActivity(1, true);
  },
  //请求活动
  requestActivity(page, first) {
    $this.setData({
      page: page,
      isRequesting: true,
      showEmptyDefault:false
    });
    api.getRecommendActivity({
      data: {
        page: page
      },
      showLoading: first,
      success: function (res) {
        console.log(res)
        if (res.code == 0) {
          var list = res.data.data;
          //设置列表数据
          if (list != null && list.length > 0) {
            var totalList = $this.data.list.concat(list);
            if (page == 1) {
              totalList = list;
            }
            $this.setData({
              total: res.data.count,
              list: totalList,
              showFooter: totalList.length >= res.data.count
            })
          }
          //设置空列表默认显示
          if (page == 1 && (list == null || list.length == 0)) {
            $this.setData({
              showEmptyDefault: true
            })
          }
        } else {
    my.showToast({
      content: "下拉刷新触发"
            content: res.msg
          });
        }
      },
      fail: function () {
        //请求失败需要将页码减1
        if ($this.data.page > 1) {
          $this.setData({
            page: $this.data.page - 1
          });
        }
      },
      complete: function () {
        my.stopPullDownRefresh();
        setTimeout(() => {
          $this.setData({
            isRequesting: false,
            showLoading: false
          });
        }, 1000);

      }
    });

    this.getActivityList(1);


  },
  //下拉刷新
  onPullDownRefresh() {
    this.requestActivity(1, false);
  },
  //到达底部
  async scrollMytrip() {
    if (this.data.isRequesting)
      return;
    try {
      console.log('scrollMytrip:');
      const { page, list, } = this.data;
@@ -28,36 +104,37 @@
        //开启加载
        this.setData({ showLoading: true });
        const newPage = page + 1;
        this.getActivityList(newPage);
        $this.requestActivity(newPage);
      }
    } catch (e) {
      this.setData({ show: false });
      this.setData({ showLoading: false });
      console.log('scrollMytrip执行异常:', e);
    }
  },
  //获取列表
  getActivityList(page = 1) {
    setTimeout(function () {
      my.stopPullDownRefresh({
        complete(res) {
          console.log(res, new Date())
        }
  clickItem(event) {
    var item = help.getEventParam(event, 'item');
    console.log(item.activity.id);
    my.navigateTo({
      url: '/pages/activity-detail/activity-detail?id=' + item.activity.id
      });
      my.showToast({
        content: "请求数据:" + page
      });

    }, 5000);
  },
  showDialog() {


  },
  onCloseDialog() {
    my.showToast({
      content: "关闭弹框"
  onCloseDialog1() {

    this.setData({
      showDrawnModal: false

    });


  },
  onCloseDialog2(event) {
    this.setData({
      showOutDateModal: false
    });
  },
  onRecieveAward() {
    my.showToast({
@@ -77,14 +154,6 @@
      });
    }


  },
  clickItem(event) {
    var item = help.getEventParam(event, 'item');
    console.log(item.id);
    my.navigateTo({
      url: '/pages/activity-detail/activity-detail?id='+item.id
    });
  }



 pages/rewards/rewards.json

@@ -4,6 +4,7 @@
    "flex": "mini-ali-ui/es/flex/index",
    "flex-item": "mini-ali-ui/es/flex/flex-item/index",
    "modal": "mini-ali-ui/es/modal/index",
    "notice": "mini-ali-ui/es/notice/index"
    "notice": "mini-ali-ui/es/notice/index",
    "footer": "mini-ali-ui/es/footer/index"
  }
}

 pages/scan-record/scan-record.axml

@@ -1,8 +1,11 @@
<view class="dyt-list" style="position: relative;">
  <scroll-view style="height: 100vh;" 
  <scroll-view a:if="{{!showEmptyDefault&&list.length>0}}" style="height: 100vh;" 
        scroll-y onScrollToLower="scrollMytrip" enable-back-to-top="true">
    <import src="../template/template.axml"/>
    <template is="commonActivityListItem" a:for="{{list}}" data="{{item}}"/>
    <include src="../loading_view.axml" />
    <template is="page-footer" data="{{showFooter}}"/>
  </scroll-view>
   <import src="../template/template.axml"/>
  <template a:if="{{showEmptyDefault}}" is="page-result-empty" data="{{title:'亲，暂无数据哦'}}"/>
</view>

 pages/scan-record/scan-record.js

@@ -1,25 +1,97 @@
var help = require('../../util/help.js');
var api = require('../../util/api.js');
var $this;
Page({
  data: {
    list: [{ id: 13213 }, 2, 3, 4, 5, 6, 7, 8, 10],
    /* 列表数据开始 */
    list: [],
    showLoading: false,
    page: 1,
    total: 15
    total: 0,
    showEmptyDefault: false,
    isRequesting: false,//是否正在请求中
    showFooter: false,
    /* 列表数据结束 */
  },
  onLoad() {
    help.setPageNavBar("浏览足迹");
    $this = this;
    $this.requestActivity(1, true);
  },
  onPullDownRefresh() {
    console.log('onPullDownRefresh', new Date());
    my.showToast({
      content: "下拉刷新触发"
    });
    this.requestActivity(1);
  },
  //请求活动
  requestActivity(page, first) {
    $this.setData({
      page: page,
      isRequesting: true,
      showEmptyDefault:false
    });
    api.getScanActivityRecord({
      page: page,
      showLoading: first,
      success: function (res) {
        console.log(res)
        if (res.code == 0) {
          var list =res.data.data;
          //设置列表数据
          if (list != null && list.length > 0) {
            var totalList = $this.data.list.concat(list);
            if (page == 1) {
              totalList = list;
            }
            $this.setData({
              total: res.data.count,
              list: totalList,
              showFooter: totalList.length >= res.data.count
            })
          }
          //设置空列表默认显示
          if (page == 1 && (list == null || list.length == 0)) {
            $this.setData({
              showEmptyDefault: true
            })
          }
        } else {
          my.showToast({
            content: res.msg
          });
        }
      },
      fail: function () {
        //请求失败需要将页码减1
        if ($this.data.page > 1) {
          $this.setData({
            page: $this.data.page - 1
          });
        }
      },
      complete: function () {
        my.stopPullDownRefresh();
        setTimeout(() => {
          $this.setData({
            isRequesting: false,
            showLoading: false
          });
        }, 1000);

    this.getActivityList(1);

      }
    });

  },
  //下拉刷新
  onPullDownRefresh() {
    this.requestActivity(1, false);
  },
  //到达底部
  async scrollMytrip() {
    if (this.data.isRequesting)
      return;
    try {
      console.log('scrollMytrip:');
      const { page, list, } = this.data;
@@ -28,32 +100,18 @@
        //开启加载
        this.setData({ showLoading: true });
        const newPage = page + 1;
        this.getActivityList(newPage);
        $this.requestActivity(newPage);
      }
    } catch (e) {
      this.setData({ show: false });
      this.setData({ showLoading: false });
      console.log('scrollMytrip执行异常:', e);
    }
  },
  //获取列表
  getActivityList(page = 1) {
    setTimeout(function () {
      my.stopPullDownRefresh({
        complete(res) {
          console.log(res, new Date())
        }
      });
      my.showToast({
        content: "请求数据:" + page
      });

    }, 5000);
  },
  clickItem(event) {
    var item = help.getEventParam(event, 'item');
    console.log(item.id);
    console.log(item.activity.id);
    my.navigateTo({
      url: '/pages/activity-detail/activity-detail?id=' + item.id
      url: '/pages/activity-detail/activity-detail?id=' + item.activity.id
    });
  }


 pages/scan-record/scan-record.json

@@ -3,6 +3,7 @@
  "usingComponents": {
    "flex": "mini-ali-ui/es/flex/index",
    "flex-item": "mini-ali-ui/es/flex/flex-item/index",
    "modal": "mini-ali-ui/es/modal/index"
    "modal": "mini-ali-ui/es/modal/index",
    "footer": "mini-ali-ui/es/footer/index"
  }
}

 pages/sponsor-activity/sponsor-activity.acss

 pages/sponsor-activity/sponsor-activity.axml

New file
@@ -0,0 +1,11 @@
<view class="dyt-list" style="position: relative;">
  <scroll-view a:if="{{!showEmptyDefault}}" style="height: 100vh;" 
        scroll-y onScrollToLower="scrollMytrip" enable-back-to-top="true">
    <import src="../template/template.axml"/>
    <template is="commonActivityListItem" a:for="{{list}}" data="{{item}}"/>
    <include src="../loading_view.axml" />
    <template is="page-footer" data="{{showFooter}}"/>
  </scroll-view>
   <import src="../template/template.axml"/>
  <template a:if="{{showEmptyDefault}}" is="page-result-empty" data="{{title:'亲，暂无数据哦'}}"/>
</view>

 pages/sponsor-activity/sponsor-activity.js

New file
@@ -0,0 +1,125 @@
var help = require('../../util/help.js');
var api = require('../../util/api.js');
var $this;
var $sponsorId;
var $activityId;
Page({
  data: {
    /* 列表数据开始 */
    list: [],
    showLoading: false,
    page: 1,
    total: 0,
    showEmptyDefault: false,
    isRequesting: false,//是否正在请求中
    showFooter: false,
    /* 列表数据结束 */
  },
  onLoad(query) {
    help.setPageNavBar("赞助商活动");
    $this = this;
    $sponsorId = query.sponsorId;
    $activityId = query.activityId;
    $this.requestActivity(1, true);
  },
  onPullDownRefresh() {
    console.log('onPullDownRefresh', new Date());
    my.showToast({
      content: "下拉刷新触发"
    });
    this.requestActivity(1);
  },
  //请求活动
  requestActivity(page, first) {
    $this.setData({
      page: page,
      isRequesting: true,
      showEmptyDefault:false
    });
    api.getSponsorActivity({
      page: page,
      sponsorId: $sponsorId,
      activityId: $activityId,
      showLoading: first,
      success: function (res) {
        console.log(res)
        if (res.code == 0) {
          var list = res.data.data;
          //设置列表数据
          if (list != null && list.length > 0) {
            var totalList = $this.data.list.concat(list);
            if (page == 1) {
              totalList = list;
            }
            $this.setData({
              total: res.data.count,
              list: totalList,
              showFooter: totalList.length >= res.data.count
            })
          }
          //设置空列表默认显示
          if (page == 1 && (list == null || list.length == 0)) {
            $this.setData({
              showEmptyDefault: true
            })
          }
        } else {
          my.showToast({
            content: res.msg
          });
        }
      },
      fail: function () {
        //请求失败需要将页码减1
        if ($this.data.page > 1) {
          $this.setData({
            page: $this.data.page - 1
          });
        }
      },
      complete: function () {
        my.stopPullDownRefresh();
        setTimeout(() => {
          $this.setData({
            isRequesting: false,
            showLoading: false
          });
        }, 1000);

      }
    });

  },
  //下拉刷新
  onPullDownRefresh() {
    this.requestActivity(1, false);
  },
  //到达底部
  async scrollMytrip() {
    if (this.data.isRequesting)
      return;
    try {
      console.log('scrollMytrip:');
      const { page, list, } = this.data;
      // 判断是否还有数据需要加载
      if (list.length < this.data.total) {
        //开启加载
        this.setData({ showLoading: true });
        const newPage = page + 1;
        $this.requestActivity(newPage);
      }
    } catch (e) {
      this.setData({ showLoading: false });
      console.log('scrollMytrip执行异常:', e);
    }
  },
  clickItem(event) {
    var item = help.getEventParam(event, 'item');
    console.log(item.activity.id);
    my.navigateTo({
      url: '/pages/activity-detail/activity-detail?id=' + item.activity.id
    });
  }


});

 pages/sponsor-activity/sponsor-activity.json

New file
@@ -0,0 +1,9 @@
{
  "pullRefresh": true,
  "usingComponents": {
    "flex": "mini-ali-ui/es/flex/index",
    "flex-item": "mini-ali-ui/es/flex/flex-item/index",
    "modal": "mini-ali-ui/es/modal/index",
    "footer": "mini-ali-ui/es/footer/index"
  }
}

 pages/sponsor-signup/sponsor-signup.axml

@@ -13,7 +13,7 @@
        <input name="phone" placeholder="请输入" value="{{phone}}" style="text-align:left;" slot="afterTitle"/>
      </list-item>
    </list>
    <button type="primary" formType="submit">
    <button type="primary" class="btn-primary"  hover-class="btn-primary-hover" formType="submit">
  提交信息
    </button>
  </form>

 pages/template/template.axml

@@ -2,50 +2,43 @@
   <view class="content">
        <!--赞助商信息-->
        <flex direction="row" wrap="wrap" class="sponsor">
          <image mode="scaleToFill" src="{{item.activity.sponsorInfo.icon}}" class="icon" />
          <view class="title">{{item.activity.sponsorInfo.sponsors.name}}</view>
      <image mode="scaleToFill" a:if="{{item.activity.sponsor.icon}}" src="{{item.activity.sponsor.icon}}" class="icon" />
      <view class="title font-sub-content">{{item.activity.sponsor.name}}</view>
        </flex>
        <!--奖品列表-->
        <flex a:for="{{item.activity.awardsList}}" a:for-item="award" direction="row" wrap="wrap" style="margin-top:23rpx;">
          <image mode="scaleToFill" class="reward-way" src="{{award.awardWay}}"/>
          <view class="placeholder" class="reward-title ">{{award.awardName}}</view>
    <flex a:for="{{item.activity.awardList}}" a:for-item="award" direction="row" wrap="wrap" class="award">
      <image mode="scaleToFill" class="award-way" src="{{award.typeIcon}}"/>
      <view class="award-title font-title">
        <text>
       {{award.title}}
        </text>
      </view>
        </flex>
        <!--空白区域-->
        <view style="height:39rpx;">
    <view style="height:26rpx;">
        </view>
        <flex direction="row" justify="between">
          <!--开奖时间-->
          <view class="open-time">11月11日 18:00自动开奖</view>
      <view class="open-time font-weak">{{item.openInfoDesc}}</view>
          <!--参与人信息-->
          <view class="placeholder">
      <view >
            <flex direction="row">
              <flex>
                <image mode="scaleToFill" src="/image/portrait-test.jpg" class="portrait"/>
                <image mode="scaleToFill" src="/image/portrait-test.jpg" class="portrait"/>
                <image mode="scaleToFill" src="/image/portrait-test.jpg" class="portrait"/>
            <image mode="scaleToFill" a:for="{{item.userList}}" a:for-item="user" src="{{user.portrait}}" class="portrait"/>
              </flex>
              <view class="joiner-num">352112323人参与拼手气</view>
          <view class="joiner-num font-weak">{{item.totalJoinNumerDesc}}</view>
            </flex>
          </view>
        </flex>
      </view>
  
</template>

<template name="commonActivityListItem">

    <view class="lucky-activity-item" data-item="{{item}}" onTap="clickItem">
      <image mode="aspectFill" class="poster" src="/image/test.jpg"></image>
      <image mode="scaleToFill" src="/image/icon/tag_joined.png" class="joined"/>
    <image mode="aspectFill" class="poster" src="{{item.activity.poster}}"></image>
    <image mode="scaleToFill" src="/image/icon/tag_joined.png" class="joined" a:if="{{item.joined}}"/>
      <template is="activityItemBottom" data="{{item}}"/>
    </view>

</template>





<template name="circleProcess">
   <view class="content">
        <!--赞助商信息-->
@@ -56,7 +49,7 @@
        <!--奖品列表-->
        <flex a:for="{{item.activity.awardsList}}" a:for-item="award" direction="row" wrap="wrap" style="margin-top:23rpx;">
          <image mode="scaleToFill" class="reward-way" src="{{award.awardWay}}"/>
          <view class="placeholder" class="reward-title ">{{award.awardName}}</view>
      <view class="reward-title ">{{award.awardName}}</view>
        </flex>
        <!--空白区域-->
        <view style="height:39rpx;">
@@ -65,7 +58,7 @@
          <!--开奖时间-->
          <view class="open-time">11月11日 18:00自动开奖</view>
          <!--参与人信息-->
          <view class="placeholder">
      <view >
            <flex direction="row">
              <flex>
                <image mode="scaleToFill" src="/image/portrait-test.jpg" class="portrait"/>
@@ -77,5 +70,20 @@
          </view>
        </flex>
      </view>
  
</template>


<template name="page-result-empty">
  <view style="height:100%;  display: flex;flex-direction: column;justify-content: center;align-items: center;">
    <image mode="scaleToFill" style="width:181rpx;height:248rpx;" src="/image/icon/icon_page_result_empty.png"/>
    <view style="font-size: 30rpx;color: #333333;line-height: 39rpx;margin-top:37rpx;">
      <text>{{title}}</text>
    </view>
  </view>
</template>

<template name="page-footer">
 <footer type="end" content="—— 我是底线的 ——" a:if="{{showFooter}}"/>
</template>



 pages/template/template.json

@@ -2,6 +2,7 @@
  "usingComponents": {
    "flex": "mini-ali-ui/es/flex/index",
    "flex-item": "mini-ali-ui/es/flex/flex-item/index",
    "modal": "mini-ali-ui/es/modal/index"
    "modal": "mini-ali-ui/es/modal/index",
    "footer": "mini-ali-ui/es/footer/index"
  }
}

 pages/web/web.js

@@ -1,8 +1,9 @@
var help = require('../../util/help.js');
var http = require('../../util/http.js');

Page({
  data: {
    url: 'https://render.alipay.com/p/s/web-view/index'
    url: 'http://192.168.3.122:8848/DayLucky/test.html'
  },
  onLoad(query) {
    console.log(query.url);
@@ -11,10 +12,32 @@
    //   url: query.url
    // });
    this.webViewContext = my.createWebViewContext('web-view');

  },
  onmessage(e) {
    my.alert({
      content: JSON.stringify(e.detail),
    var $this=this;
    console.log(e);
    switch (e.detail.type) {

      case 'getRequestParams': {
        e.detail.params.sign = http.getSign(e.detail.params);
        $this.webViewContext.postMessage({
          type: e.detail.type,
          content: e.detail.params
    });
        break;
      }

      case 'getToken': {
        http.getToken(function (token) {
          console.log("234243");
          $this.webViewContext.postMessage({
            type: e.detail.type,
            content: token
          });
        });
        break;
      }
    }
  }
});

 util/api.js

New file
@@ -0,0 +1,142 @@
var http = require("./http.js");
var api = {
  commonRequest(url, obj) {

    console.log("请求参数：");
    console.log(obj.data);

    http.postApi(url, obj.data, function (res) {
      if (obj.success)
        obj.success(res.data);
    }, function (res) {
      my.showToast({
        content: '网络请求出错'
      });
      if (obj.fail)
        obj.fail();
    }, function () {
      if (obj.complete)
        obj.complete();
    }, obj.showLoading);
  },

  /**
   * 获取推荐活动
   * @param {*} page 
   * @param {*} success 
   */
  getRecommendActivity(obj) {
    this.commonRequest("/api/client/activity/getRecommendActivity", obj);
  },
  /**
   * 获取活动详情
   * @param {*} obj 
   */
  getActivityDetail(obj) {
    obj.data = { activityId: obj.id };
    this.commonRequest("/api/client/activity/getActivityDetail", obj);
  },
  /**
   * 获取活动浏览足迹
   */
  getScanActivityRecord(obj) {
    obj.data = { page: obj.page };
    this.commonRequest("/api/client/activity/getScanActivityRecord", obj);
  },

  /**
   * 获取赞助商的活动
   * @param {*} obj 
   */
  getSponsorActivity(obj) {
    obj.data = { page: obj.page, sponsorId: obj.sponsorId, activityId: obj.activityId };
    this.commonRequest("/api/client/activity/getSponsorActivity", obj);
  },


  /**
   * 获取抽奖记录
   * @param {*} obj 
   */
  getLuckyRecord(obj) {
    obj.data = { page: obj.page, type: obj.type };
    this.commonRequest("/api/client/activity/join/getJoinRecord", obj);
  },


  /**
   * 参与抽奖
   * @param {*} obj 
   */
  joinLucky(obj) {
    obj.data = { activityId: obj.activityId };
    this.commonRequest("/api/client/activity/join/join", obj);
  },

  /**
   * 上传用户信息
   * @param {*} obj 
   */
  uploadUserInfo(obj) {
    obj.data = { userInfo: obj.userInfo };
    this.commonRequest("/api/client/user/uploadAlipayUserInfo", obj);
  },


  /**
   * 解析助力信息
   * @param {*} obj 
   */
  assist(obj) {
    obj.data = { joinInfo: obj.joinInfo, activityId: obj.obj.activityId };
    this.commonRequest("/api/client/activity/assist/assist", obj);
  },
  /**
   * 获取幸运券列表
   * @param {*} obj 
   */
  getLuckyCouponList(obj) {
    obj.data = { page: obj.page, activityId: obj.activityId };
    this.commonRequest("/api/client/activity/coupon/getCouponList", obj);
  },


  /**
   * 概率排行榜
   * @param {*} obj 
   */
  getRankList(obj) {
    obj.data = { page: obj.page, activityId: obj.activityId };
    this.commonRequest("/api/client/activity/join/getRankList", obj);
  },

  /**
   * 获取中奖概率
   * @param {*} obj 
   */
  getProbability(obj) {
    obj.data = { targetUid: obj.targetUid, activityId: obj.activityId };
    this.commonRequest("/api/client/activity/join/getProbability", obj);
  },

  /**
   * 获取参与者列表
   * @param {*} obj 
   */
  getJoinerList(obj) {
    obj.data = { page: obj.page, activityId: obj.activityId };
    this.commonRequest("/api/client/activity/join/getJoinerList", obj);
  }










};

module.exports = api;

 util/help.js

@@ -17,13 +17,6 @@
  },
  //获取奖项的html代码
  getAwardHtml(params) {
    params = {
      type: 1,
      content: "奖品二：大额现金红包100，免费抽奖拼手气免费抽奖拼手免费抽奖拼手气免费抽奖拼手免费抽奖拼手气免费抽奖拼手",
      moreType: 'icon',//text,icon
      link: ''
    };

    var html = "<div>";
    html += params.content;

@@ -53,6 +46,40 @@
      return "<div>暂未开奖</div>";
    }
    return "<div>已于<span style='color:#FF0000;'>" + openTime + "</span>完成了开奖</div>";
  },
  rsa(content, callback) {
    my.rsa({
      action: 'encrypt',
      text: content,
      // 设置公钥，需替换你自己的公钥
      // key: 'MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCBBxnzCdP9qOQxtWSFl/tqy0r/XCxfuUyghCEJEk2JFCvoZq/1v7zUsUOuiefXk+q3A8j2tZyeIgYCTdBwyk+xshHlHleu3kvKreHE13m7bYmEaaA+sizAIkEkxP7bK8IJ4GvDiOfjZPPoauVpGg6xv21GlQvDXjpNHRNT4OEDAQIDAQAB',
      key: 'MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoC0hjT1HsIhAWyILQGLxkS4fCJbyGqH6xi4c/JTizhQZUnufJeMT2S5S4euLdJvU8lVHS1GIbQOJnnFTs/6UH3JWHztqydq7eAFCIv2i6RJ8pI3k2U8nBTWyb3YraxX7UxUTnZNLUyMujoSKmsk4f2litYFR1bqNvvNdGH5LVzGKSkOAuU6TKvDGscuEJ1ESU+MS6NqB047UbYz2TlElbypLZGlVng7U9B2ZXnu/Rb/Q5a0WW5eHSH+IkTIDXSr97FTkX+9ziRLGWX5YANKguldv9Cm96VC3hDa2rXirMhkRtgJGyYiMVNcfB2y0vBouKy17UY1TYVldtTNXOTwH1wIDAQAB',
      success: (result) => {
        callback(result.text);
      },
      fail(e) {
        my.alert({
          content: JSON.stringify(e),
        });
      },
    });
  },
  getLeftTime(leftTime) {
    leftTime = parseInt(leftTime / 1000);
    const s = leftTime % 60;
    const m = parseInt((leftTime % 3600) / 60);
    const h = parseInt(leftTime / 3600);
    return {
      ss: s < 10 ? '0' + s : s,
      mm: m < 10 ? '0' + m : m,
      hh: h < 10 ? '0' + h : h,
    }
  },
  getUid() {
    let data = my.getStorageSync({
      key: 'uid'
    });
    return data.data;
  }



 util/http.js

@@ -9,20 +9,19 @@
    //判断token是否存在,如果不存在就去获取

    http.getToken(function (token) {

      console.log("获取到token："+token);
      params.sign = http.getSign(params);
      if (showLoading) {
        my.showLoading();
      }
      
      console.log("请求参数:"+JSON.stringify(params));

      my.request({
        url: url,
        url: getApp().baseUrl + url,
        method: 'POST',
        data: params,
        headers: {
          'content-type': 'application/json',  //默认值
          'content-type': 'application/x-www-form-urlencoded',  //默认值
          'token': token
        },
        dataType: 'json',
@@ -53,15 +52,21 @@
  },
  getToken(success) {
    //本地获取token

    var token;
    let res = my.getStorageSync({ key: 'token' });
    console.log("token缓存结果")
    console.log(res)
    if (res != null) {
      token = res.data;
      token = res.data.token;
      const time = res.data.expireTime;
      if (time == null || time < new Date().getTime() - 1000 * 60) {
        token = null;
      }
    }

    if (token != null && token.length > 0) {
      success(token);
      return;
    }


@@ -71,14 +76,53 @@
        //授权码
        const authCode = res.authCode;
        //todo请求token
        success("token");
        token = "token";

        http.requestToken(authCode, function (res) {

          console.log("请求结果")
          console.log(res)
          if (res.code == 0) {
            token = res.data.token;
            success(token);
            //res.data.expireTime 到期时间
        //将token保存到本地
        my.setStorageSync({
          key: 'token',
          data: token
              data: {
                token: token,
                expireTime: res.data.expireTime
              }
            });
          }

        }, null);

      },
        });
      },

  requestToken(authCode, successCallBack, fail) {
    var params = {
      alipayCode: authCode
    };

    params.sign = http.getSign(params);
    my.request({
      url: getApp().baseUrl + "/api/client/user/getToken",
      method: 'POST',
      data: params,
      headers: {
        'content-type': 'application/x-www-form-urlencoded'
      },
      success: function (res) {
        if (successCallBack != null)
          successCallBack(res.data);
      },

      fail: function (res) {
        if (fail != null)
          fail(res);
      }
    });
  },
  getSign(params) {