diff --git a/apis/index.js b/apis/index.js index e7f07d3..78da91f 100644 --- a/apis/index.js +++ b/apis/index.js @@ -9,8 +9,8 @@ import router from '../router' // 基础配置 const config = { - apiUrl : 'https://api.gongli.vip/api/', // 正式环境 - // apiUrl: 'http://api.gl.shangkelian.cn/api/', // 测试 + // apiUrl : 'https://api.gongli.vip/api/', // 正式环境 + apiUrl: 'http://api.gl.shangkelian.cn/api/', // 测试 timeout: 60000 } diff --git a/components/missions-goods-item/index.vue b/components/missions-goods-item/index.vue new file mode 100644 index 0000000..857ddba --- /dev/null +++ b/components/missions-goods-item/index.vue @@ -0,0 +1,146 @@ + + + diff --git a/pages/life/life.vue b/pages/life/life.vue index d837a01..9b81ad7 100644 --- a/pages/life/life.vue +++ b/pages/life/life.vue @@ -79,8 +79,8 @@ - - + + 奖励任务 完成任务可获DT积分/奖励 diff --git a/pages/mission/get-goods/get-goods.vue b/pages/mission/get-goods/get-goods.vue index 743ad7c..2192b13 100644 --- a/pages/mission/get-goods/get-goods.vue +++ b/pages/mission/get-goods/get-goods.vue @@ -2,44 +2,87 @@ 已领取商品数量 - {{glz}} + {{glz}} - 账户记录 - - - {{item.remark}} - {{item.created_at}} - {{item.amount}} - + 领取记录 + + + + + + + + + - - + + @@ -62,6 +105,12 @@ font-size: 60rpx; padding-top: 10rpx; color: white; + span{ + font-size:26rpx; + padding-left: 20rpx; + padding-bottom: 10rpx; + font-weight: normal; + } } } // 账户记录 diff --git a/pages/mission/mission.vue b/pages/mission/mission.vue index e6e3d70..ac13932 100644 --- a/pages/mission/mission.vue +++ b/pages/mission/mission.vue @@ -86,8 +86,8 @@ export default { data() { return { - videos: [1, 2, 3, 4], - missions: [1, 2, 3, 4], + videos: [1, 2, 3], + missions: [1, 2, 3], canRotate0: false, canRotate1: false, }; @@ -250,12 +250,12 @@ .rotateChange { animation: fadenum1; - animation-duration: 2s; + animation-duration: 1s; } @keyframes fadenum1 { 100% { - transform: rotate(360deg); + transform: rotate(180deg); } } } @@ -310,7 +310,7 @@ background-color: #e74a45; color: #fff; border-radius: 40rpx; - padding: 10rpx $padding; + padding: 12rpx $padding; font-size: 26rpx; } diff --git a/pages/rank/index.vue b/pages/rank/index.vue index fdc542a..c1f2f85 100644 --- a/pages/rank/index.vue +++ b/pages/rank/index.vue @@ -3,16 +3,12 @@ - 共力家族 周会员邀请 - - + 共力家族 周会员邀请 - + @@ -20,22 +16,10 @@ - - {{ timeData.days > 9 ? timeData.days: '0' + timeData.days }} - 天 - - - {{ timeData.hours > 9 ? timeData.hours : '0' + timeData.hours}}时 - - - {{ timeData.minutes > 9 ? timeData.minutes : '0' + timeData.minutes}}分 - - - {{ timeData.seconds > 9 ? timeData.seconds : '0' + timeData.seconds}}秒 - + {{ timeData.days > 9 ? timeData.days: '0' + timeData.days }} + {{ timeData.hours > 9 ? timeData.hours : '0' + timeData.hours}} + {{ timeData.minutes > 9 ? timeData.minutes : '0' + timeData.minutes}} + {{ timeData.seconds > 9 ? timeData.seconds : '0' + timeData.seconds}} @@ -57,8 +41,7 @@ - + {{index + 1}}