diff --git a/me/task/index.vue b/me/task/index.vue
deleted file mode 100644
index 4dca8f0..0000000
--- a/me/task/index.vue
+++ /dev/null
@@ -1,198 +0,0 @@
-
-
-
-
-
-
-
-
-
- 新人好礼送不停
-
-
-
-
-
-
-
- {{ item.title}}
-
- {{ item.rewardDetail }}
-
- {{ item.detail }}
-
-
- {{ item.buttonTitle }}
- {{ item.buttonTitle }}
- {{ item.buttonTitle }}
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 304031a..1aff6fb 100644
--- a/pages.json
+++ b/pages.json
@@ -270,12 +270,6 @@
"style": {
"navigationBarTitleText": "消息中心"
}
- }, {
- "path": "task/index",
- "style": {
- "navigationBarTitleText": "任务中心",
- "navigationStyle": "custom"
- }
},
{
"path": "course/index",
diff --git a/pages/login/appEq.vue b/pages/login/appEq.vue
index 54da9c7..3239957 100644
--- a/pages/login/appEq.vue
+++ b/pages/login/appEq.vue
@@ -43,12 +43,7 @@
this.show_share = false;
},
taobaoLogin() {
- uni.setClipboardData({
- data: this.relationId,
- success: r => {
- // this.$queue.showToast('邀请码复制成功');
- }
- });
+
var u = navigator.userAgent;
if (u.indexOf('Android') > -1 || u.indexOf('Adr') > -1) {
this.$Request.get('/app/common/type/49').then(res => {
@@ -69,6 +64,7 @@
} else {
this.show_share = true;
}
+
} else {
// #ifndef H5
plus.runtime.openURL(res.data.value, function(res) {
@@ -76,6 +72,12 @@
});
// #endif
// #ifdef H5
+ uni.setClipboardData({
+ data: res.data.value,
+ success: r => {
+ // this.$queue.showToast('邀请码复制成功');
+ }
+ });
window.location.href = res.data.value;
// #endif
}
@@ -108,6 +110,12 @@
});
// #endif
// #ifdef H5
+ uni.setClipboardData({
+ data: res.data.value,
+ success: r => {
+ // this.$queue.showToast('邀请码复制成功');
+ }
+ });
window.location.href = res.data.value;
// #endif
}
diff --git a/pages/me/index.vue b/pages/me/index.vue
index 39e449b..f32622b 100644
--- a/pages/me/index.vue
+++ b/pages/me/index.vue
@@ -53,7 +53,7 @@
我的积分
-->
-
+
{{userInfo.amount || '0.00'}}
@@ -163,7 +163,7 @@
+ @click="goNav('/pages/task/index','tabbar')">
@@ -554,15 +554,20 @@
// #endif
}
},
- goNav(e,options) {
+ goNav(e,type) {
+ console.log(e)
let token = uni.getStorageSync('token')
if (token) {
- if (options&&options.amount) {
- e = `${e}?amount=${options.amount}`
+ if (type == 'tabbar') {
+ uni.switchTab({
+ url: e
+ })
+ } else {
+ uni.navigateTo({
+ url: e
+ })
}
- uni.navigateTo({
- url: e
- })
+
} else {
uni.navigateTo({
url: "/pages/login/login"
diff --git a/pages/task/index.vue b/pages/task/index.vue
index e37cc96..99928d1 100644
--- a/pages/task/index.vue
+++ b/pages/task/index.vue
@@ -15,17 +15,17 @@
- {{ item.title}}
-
+ {{ item.title}}
+
{{ item.rewardDetail }}
{{ item.detail }}
- {{ item.buttonTitle }}
- {{ item.buttonTitle }}
- {{ item.buttonTitle }}
- 查看奖品列表
+ {{ item.buttonTitle }}
+ {{ item.buttonTitle }}
+
+
@@ -48,22 +48,22 @@
},
cellList: [
{
- title: '分享奖励', type: 1, url: '/me/invite/index', icon: '../../static/images/me/task_icon3.png', tip: '奖励888金币', subhead: '分享好友即可获得', btnText:'立即分享'
+ title: '分享奖励', type: 1, url: '/me/invite/index', rewardImg: '../../static/images/me/task_icon3.png', rewardDetail: '奖励888金币', detail: '分享好友即可获得', buttonTitle:'立即分享'
},
{
- title: '每日签到奖励', type: 2, url: '/pages/index/index', icon: '../../static/images/me/task_icon3.png', tip: '奖励8898金币', subhead: '每日付款满3笔即可获得', btnText:'立即看剧'
+ title: '每日签到奖励', type: 2, url: '/pages/index/index', rewardImg: '../../static/images/me/task_icon3.png', rewardDetail: '奖励8898金币', detail: '每日付款满3笔即可获得', buttonTitle:'立即看剧'
},
{
- title: '每周打卡奖励', type: 3, url: '/me/invite/index', icon: '', tip: '', subhead: '签到满7天即可获得丰富好礼', btnText:'剩余23次'
+ title: '每周打卡奖励', type: 3, url: '/me/invite/index', rewardImg: '', rewardDetail: '', detail: '签到满7天即可获得丰富好礼', buttonTitle:'剩余23次'
},
{
- title: '每月打卡奖励1', type: 4, url: '/me/invite/index', icon: '', tip: '', subhead: '当月签到满21天获得丰富好礼', btnText:'剩余233次'
+ title: '每月打卡奖励1', type: 4, url: '/me/invite/index', rewardImg: '', rewardDetail: '', detail: '当月签到满21天获得丰富好礼', buttonTitle:'剩余233次'
},
{
- title: '每月打卡奖励2', type: 5, url: '/me/invite/index', icon: '../../static/images/me/task_icon4.png', tip: '奖励金币', subhead: '当月签到满21天即可免费领取', btnText:'立即领取'
+ title: '每月打卡奖励2', type: 5, url: '/me/invite/index', rewardImg: '../../static/images/me/task_icon4.png', rewardDetail: '奖励金币', detail: '当月签到满21天即可免费领取', buttonTitle:'立即领取'
},
{
- title: '观看视频奖励', type: 6, url: '/me/invite/index', icon: '../../static/images/me/task_icon3.png', tip: '奖励金币', subhead: '观看完整视频即可获得奖励', btnText:'观看视频'
+ title: '观看视频奖励', type: 6, url: '/me/invite/index', rewardImg: '../../static/images/me/task_icon3.png', rewardDetail: '奖励金币', detail: '观看完整视频即可获得奖励', buttonTitle:'观看视频'
},
]
}
@@ -75,14 +75,21 @@
//
goNav( item ) {
console.log(url)
- if ( type == 2) {
+ // jumpType (integer, optional): 跳转类型 1 内部路径 2 外部路径 ,
+ // type (integer, optional): 任务类型 1 普通任务 2 打卡任务 9 其它 ,
+ // buttonUrl
+
+ if ( item.jumpType == 1) {
+ uni.navigateTo({
+ url: item.buttonUrl
+ })
+
+ } else if( item.jumpType == 3) {
uni.switchTab({
url: item.buttonUrl
})
} else {
- uni.navigateTo({
- url: item.buttonUrl
- })
+
}
},
@@ -146,6 +153,9 @@
align-items: center;
margin-bottom: 12rpx;
color: #333;
+ .title{
+ flex-shrink: 0;
+ }
.cell_icon{
width: 34rpx!important;
height: 34rpx!important;
@@ -163,6 +173,8 @@
.cell_right{
flex-direction: column;
align-items: center;
+ flex-shrink: 0;
+ margin-left: 20rpx;
.btn{
width: 148rpx;
height: 56rpx;