czg_team
/
video_app
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ios' of https://e.coding.net/g-cphe0354/duanju/video_app into ios

This commit is contained in:
GaoHao 2024-12-23 16:18:35 +08:00
parent 267d1fcd9b 7b44d1f9fb
commit 5a55632bc0
3 changed files with 112 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

111
pages-ios.json → pages-and.json
View File

@ -4,15 +4,6 @@
"^tn-(.*)": "@/tuniao-ui/components/tn-$1/tn-$1.vue"
},
"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
{
"path": "pages/task/index",
"style": {
"navigationBarTitleText": "任务",
"enablePullDownRefresh": true,
"navigationStyle": "custom"
}
},
{
"path": "pages/index/index",
"style": {
@ -21,13 +12,21 @@
"navigationStyle": "custom"
}
},
{
"path": "pages/task/index",
"style": {
"navigationBarTitleText": "任务",
"enablePullDownRefresh": true,
"navigationStyle": "custom"
}
},
{
"path": "pages/task/prizeList",
"style": {
"navigationBarTitleText": "任务",
"navigationStyle": "custom"
}
},
{
@ -35,7 +34,7 @@
"style": {
"navigationBarTitleText": "任务",
"navigationStyle": "custom"
}
},
{
@ -746,41 +745,36 @@
}
},
{
"path" : "blogger/blogger",
"style" :
{
"navigationBarTitleText" : "",
"path": "blogger/blogger",
"style": {
"navigationBarTitleText": "",
"navigationStyle": "custom"
}
},
{
"path" : "blogger/details",
"style" :
{
"navigationBarTitleText" : "",
"path": "blogger/details",
"style": {
"navigationBarTitleText": "",
"navigationStyle": "custom"
}
},
{
"path" : "topic/topic",
"style" :
{
"navigationBarTitleText" : "话题"
"path": "topic/topic",
"style": {
"navigationBarTitleText": "话题"
}
},
{
"path" : "topic/reserve",
"style" :
{
"navigationBarTitleText" : "",
"path": "topic/reserve",
"style": {
"navigationBarTitleText": "",
"navigationStyle": "custom"
}
},
{
"path" : "tools/tools",
"style" :
{
"navigationBarTitleText" : "",
"path": "tools/tools",
"style": {
"navigationBarTitleText": "",
"navigationStyle": "custom"
}
}
@ -802,7 +796,18 @@
"backgroundColor": "#FFFFFF",
"borderStyle": "black",
"list": [
"list": [{
"pagePath": "pages/index/index",
"iconPath": "static/tabbar/index@2x.png",
"selectedIconPath": "static/tabbar/index_@2x.png",
"text": "小剧场"
},
{
"pagePath": "pages/video/video",
"iconPath": "static/tabbar/learn@2x.png",
"selectedIconPath": "static/tabbar/learn_@2x.png",
"text": "推荐"
},
{
"pagePath": "pages/task/index",
"iconPath": "static/tabbar/task@2x.png",
@ -810,37 +815,17 @@
"text": "任务"
},
{
"pagePath": "pages/video/video",
"iconPath": "static/tabbar/index@2x.png",
"selectedIconPath": "static/tabbar/index_@2x.png",
"text": "刷剧"
"pagePath": "pages/chasingDrama/chasingDrama",
"iconPath": "static/tabbar/zhuiju.png",
"selectedIconPath": "static/tabbar/zhuiju_.png",
"text": "追剧"
},
{
"pagePath": "pages/me/index",
"iconPath": "static/tabbar/me@2x.png",
"selectedIconPath": "static/tabbar/me_@2x.png",
"text": "我的"
}
// ,
// {
// "pagePath": "pages/index/index",
// "iconPath": "static/tabbar/index@2x.png",
// "selectedIconPath": "static/tabbar/index_@2x.png",
// "text": "刷剧"
// }
// {
// "pagePath": "pages/video/video",
// "iconPath": "static/tabbar/learn@2x.png",
// "selectedIconPath": "static/tabbar/learn_@2x.png",
// "text": "推荐"
// },
// {
// "pagePath": "pages/chasingDrama/chasingDrama",
// "iconPath": "static/tabbar/zhuiju.png",
// "selectedIconPath": "static/tabbar/zhuiju_.png",
// "text": "追剧"
// },
// {
// "pagePath": "pages/me/index",
// "iconPath": "static/tabbar/me@2x.png",
// "selectedIconPath": "static/tabbar/me_@2x.png",
// "text": "我的"
// }
]
},
"condition": { //模式配置，仅开发期间生效

111
pages.json
View File

@ -4,6 +4,15 @@
"^tn-(.*)": "@/tuniao-ui/components/tn-$1/tn-$1.vue"
},
"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
{
"path": "pages/task/index",
"style": {
"navigationBarTitleText": "任务",
"enablePullDownRefresh": true,
"navigationStyle": "custom"
}
},
{
"path": "pages/index/index",
"style": {
@ -12,21 +21,13 @@
"navigationStyle": "custom"
}
},
{
"path": "pages/task/index",
"style": {
"navigationBarTitleText": "任务",
"enablePullDownRefresh": true,
"navigationStyle": "custom"
}
},
{
"path": "pages/task/prizeList",
"style": {
"navigationBarTitleText": "任务",
"navigationStyle": "custom"
}
},
{
@ -34,7 +35,7 @@
"style": {
"navigationBarTitleText": "任务",
"navigationStyle": "custom"
}
},
{
@ -745,36 +746,41 @@
}
},
{
"path": "blogger/blogger",
"style": {
"navigationBarTitleText": "",
"path" : "blogger/blogger",
"style" :
{
"navigationBarTitleText" : "",
"navigationStyle": "custom"
}
},
{
"path": "blogger/details",
"style": {
"navigationBarTitleText": "",
"path" : "blogger/details",
"style" :
{
"navigationBarTitleText" : "",
"navigationStyle": "custom"
}
},
{
"path": "topic/topic",
"style": {
"navigationBarTitleText": "话题"
"path" : "topic/topic",
"style" :
{
"navigationBarTitleText" : "话题"
}
},
{
"path": "topic/reserve",
"style": {
"navigationBarTitleText": "",
"path" : "topic/reserve",
"style" :
{
"navigationBarTitleText" : "",
"navigationStyle": "custom"
}
},
{
"path": "tools/tools",
"style": {
"navigationBarTitleText": "",
"path" : "tools/tools",
"style" :
{
"navigationBarTitleText" : "",
"navigationStyle": "custom"
}
}
@ -796,18 +802,7 @@
"backgroundColor": "#FFFFFF",
"borderStyle": "black",
"list": [{
"pagePath": "pages/index/index",
"iconPath": "static/tabbar/index@2x.png",
"selectedIconPath": "static/tabbar/index_@2x.png",
"text": "小剧场"
},
{
"pagePath": "pages/video/video",
"iconPath": "static/tabbar/learn@2x.png",
"selectedIconPath": "static/tabbar/learn_@2x.png",
"text": "推荐"
},
"list": [
{
"pagePath": "pages/task/index",
"iconPath": "static/tabbar/task@2x.png",
@ -815,17 +810,37 @@
"text": "任务"
},
{
"pagePath": "pages/chasingDrama/chasingDrama",
"iconPath": "static/tabbar/zhuiju.png",
"selectedIconPath": "static/tabbar/zhuiju_.png",
"text": "追剧"
},
{
"pagePath": "pages/me/index",
"iconPath": "static/tabbar/me@2x.png",
"selectedIconPath": "static/tabbar/me_@2x.png",
"text": "我的"
"pagePath": "pages/video/video",
"iconPath": "static/tabbar/index@2x.png",
"selectedIconPath": "static/tabbar/index_@2x.png",
"text": "刷剧"
}
// ,
// {
// "pagePath": "pages/index/index",
// "iconPath": "static/tabbar/index@2x.png",
// "selectedIconPath": "static/tabbar/index_@2x.png",
// "text": "刷剧"
// }
// {
// "pagePath": "pages/video/video",
// "iconPath": "static/tabbar/learn@2x.png",
// "selectedIconPath": "static/tabbar/learn_@2x.png",
// "text": "推荐"
// },
// {
// "pagePath": "pages/chasingDrama/chasingDrama",
// "iconPath": "static/tabbar/zhuiju.png",
// "selectedIconPath": "static/tabbar/zhuiju_.png",
// "text": "追剧"
// },
// {
// "pagePath": "pages/me/index",
// "iconPath": "static/tabbar/me@2x.png",
// "selectedIconPath": "static/tabbar/me_@2x.png",
// "text": "我的"
// }
]
},
"condition": { //模式配置，仅开发期间生效

2
uview-ui/README.md
View File

@ -52,7 +52,7 @@ Vue.use(uView);
4. `pages.json`配置easycom规则(按需引入)
```js
// pages.json
// pages-and.json
{
"easycom": {
// npm安装的方式不需要前面的"@/"，下载安装的方式需要"@/"