diff --git a/common/config.js b/common/config.js
index 8b0f80d..73a8e9c 100644
--- a/common/config.js
+++ b/common/config.js
@@ -1,10 +1,10 @@
// const ROOTPATH1 = "https://dj-api.hnsiyao.cn/sqx_fast/"; //
// const ROOTPATH = "https://dj-api.hnsiyao.cn/sqx_fast/"; //后台服务域名
-// const ROOTPATH2 = "https://dj-api.hnsiyao.cn"; //后台服务域名
+// const ROOTPATH2 = "https://dj-h5.hnsiyao.cn"; //后台服务域名
const ROOTPATH1 = "https://video.hnsiyao.cn/sqx_fast/"; //
const ROOTPATH = "https://video.hnsiyao.cn/sqx_fast/"; //后台服务域名
-const ROOTPATH2 = "https://video.hnsiyao.cn"; //后台服务域名
+const ROOTPATH2 = "https://video-h5.hnsiyao.cn"; //后台服务域名
module.exports = {
APIHOST: ROOTPATH,
diff --git a/pages.json b/pages.json
index e355832..304031a 100644
--- a/pages.json
+++ b/pages.json
@@ -12,6 +12,15 @@
}
},
+ {
+ "path": "pages/task/index",
+ "style": {
+ "navigationBarTitleText": "任务",
+ "enablePullDownRefresh": true,
+ "navigationStyle": "custom"
+
+ }
+ },
{
"path": "pages/me/erweimaRegister",
"style": {
@@ -617,6 +626,12 @@
"selectedIconPath": "static/tabbar/learn_@2x.png",
"text": "推荐"
},
+ {
+ "pagePath": "pages/task/index",
+ "iconPath": "static/tabbar/task@2x.png",
+ "selectedIconPath": "static/tabbar/task_@2x.png",
+ "text": "任务"
+ },
{
"pagePath": "pages/chasingDrama/chasingDrama",
"iconPath": "static/tabbar/zhuiju.png",
diff --git a/pages/index/index.vue b/pages/index/index.vue
index f70c0c3..d9b2855 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -175,6 +175,9 @@
+
@@ -230,6 +233,7 @@
phbVideoList: [], //排行榜视频
newVideList: [], //最新热播
videoInfo: [],
+ draw: Math.floor((Math.random() * 12) + 1),
};
},
onShareAppMessage(res) {
@@ -713,7 +717,7 @@
});
},
// 跳转公告链接
- goMsg(e) {
+ goMsg(url) {
if (url.indexOf('/pages/') !== -1 || url.indexOf('/me/') !== -1) {
uni.navigateTo({
url
diff --git a/pages/task/index.vue b/pages/task/index.vue
new file mode 100644
index 0000000..e37cc96
--- /dev/null
+++ b/pages/task/index.vue
@@ -0,0 +1,198 @@
+
+
+
+
+
+
+
+
+
+ 新人好礼送不停
+
+
+
+
+
+
+
+ {{ item.title}}
+
+ {{ item.rewardDetail }}
+
+ {{ item.detail }}
+
+
+ {{ item.buttonTitle }}
+ {{ item.buttonTitle }}
+ {{ item.buttonTitle }}
+ 查看奖品列表
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/static/images/draw/draw_1.png b/static/images/draw/draw_1.png
new file mode 100644
index 0000000..ff27735
Binary files /dev/null and b/static/images/draw/draw_1.png differ
diff --git a/static/images/draw/draw_10.png b/static/images/draw/draw_10.png
new file mode 100644
index 0000000..1cbc81f
Binary files /dev/null and b/static/images/draw/draw_10.png differ
diff --git a/static/images/draw/draw_11.png b/static/images/draw/draw_11.png
new file mode 100644
index 0000000..c03a3e6
Binary files /dev/null and b/static/images/draw/draw_11.png differ
diff --git a/static/images/draw/draw_12.png b/static/images/draw/draw_12.png
new file mode 100644
index 0000000..17f7515
Binary files /dev/null and b/static/images/draw/draw_12.png differ
diff --git a/static/images/draw/draw_2.png b/static/images/draw/draw_2.png
new file mode 100644
index 0000000..abbaa39
Binary files /dev/null and b/static/images/draw/draw_2.png differ
diff --git a/static/images/draw/draw_3.png b/static/images/draw/draw_3.png
new file mode 100644
index 0000000..198c052
Binary files /dev/null and b/static/images/draw/draw_3.png differ
diff --git a/static/images/draw/draw_4.png b/static/images/draw/draw_4.png
new file mode 100644
index 0000000..b07f99e
Binary files /dev/null and b/static/images/draw/draw_4.png differ
diff --git a/static/images/draw/draw_5.png b/static/images/draw/draw_5.png
new file mode 100644
index 0000000..fd62134
Binary files /dev/null and b/static/images/draw/draw_5.png differ
diff --git a/static/images/draw/draw_6.png b/static/images/draw/draw_6.png
new file mode 100644
index 0000000..628fbe3
Binary files /dev/null and b/static/images/draw/draw_6.png differ
diff --git a/static/images/draw/draw_7.png b/static/images/draw/draw_7.png
new file mode 100644
index 0000000..7aabb55
Binary files /dev/null and b/static/images/draw/draw_7.png differ
diff --git a/static/images/draw/draw_8.png b/static/images/draw/draw_8.png
new file mode 100644
index 0000000..6f0d6c4
Binary files /dev/null and b/static/images/draw/draw_8.png differ
diff --git a/static/images/draw/draw_9.png b/static/images/draw/draw_9.png
new file mode 100644
index 0000000..4588acf
Binary files /dev/null and b/static/images/draw/draw_9.png differ
diff --git a/static/tabbar/learn@2x.png b/static/tabbar/learn@2x.png
index 13d999f..befb06b 100644
Binary files a/static/tabbar/learn@2x.png and b/static/tabbar/learn@2x.png differ
diff --git a/static/tabbar/learn_@2x.png b/static/tabbar/learn_@2x.png
index 763dfec..9e20845 100644
Binary files a/static/tabbar/learn_@2x.png and b/static/tabbar/learn_@2x.png differ
diff --git a/static/tabbar/task@2x.png b/static/tabbar/task@2x.png
new file mode 100644
index 0000000..13d999f
Binary files /dev/null and b/static/tabbar/task@2x.png differ
diff --git a/static/tabbar/task_@2x.png b/static/tabbar/task_@2x.png
new file mode 100644
index 0000000..763dfec
Binary files /dev/null and b/static/tabbar/task_@2x.png differ