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

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

@ -4,6 +4,14 @@
"^tn-(.*)": "@/tuniao-ui/components/tn-$1/tn-$1.vue" "^tn-(.*)": "@/tuniao-ui/components/tn-$1/tn-$1.vue"
}, },
"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages "pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
{
"path": "pages/index/index",
"style": {
"navigationBarTitleText": "斯耀短剧",
"enablePullDownRefresh": true,
"navigationStyle": "custom"
}
},
{ {
"path": "pages/task/index", "path": "pages/task/index",
"style": { "style": {
@ -13,15 +21,6 @@
} }
}, },
{
"path": "pages/index/index",
"style": {
"navigationBarTitleText": "斯耀短剧",
"enablePullDownRefresh": true,
"navigationStyle": "custom"
}
},
{ {
"path": "pages/task/prizeList", "path": "pages/task/prizeList",
"style": { "style": {
@ -747,39 +746,34 @@
}, },
{ {
"path": "blogger/blogger", "path": "blogger/blogger",
"style" : "style": {
{
"navigationBarTitleText": "", "navigationBarTitleText": "",
"navigationStyle": "custom" "navigationStyle": "custom"
} }
}, },
{ {
"path": "blogger/details", "path": "blogger/details",
"style" : "style": {
{
"navigationBarTitleText": "", "navigationBarTitleText": "",
"navigationStyle": "custom" "navigationStyle": "custom"
} }
}, },
{ {
"path": "topic/topic", "path": "topic/topic",
"style" : "style": {
{
"navigationBarTitleText": "话题" "navigationBarTitleText": "话题"
} }
}, },
{ {
"path": "topic/reserve", "path": "topic/reserve",
"style" : "style": {
{
"navigationBarTitleText": "", "navigationBarTitleText": "",
"navigationStyle": "custom" "navigationStyle": "custom"
} }
}, },
{ {
"path": "tools/tools", "path": "tools/tools",
"style" : "style": {
{
"navigationBarTitleText": "", "navigationBarTitleText": "",
"navigationStyle": "custom" "navigationStyle": "custom"
} }
@ -802,7 +796,18 @@
"backgroundColor": "#FFFFFF", "backgroundColor": "#FFFFFF",
"borderStyle": "black", "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", "pagePath": "pages/task/index",
"iconPath": "static/tabbar/task@2x.png", "iconPath": "static/tabbar/task@2x.png",
@ -810,37 +815,17 @@
"text": "任务" "text": "任务"
}, },
{ {
"pagePath": "pages/video/video", "pagePath": "pages/chasingDrama/chasingDrama",
"iconPath": "static/tabbar/index@2x.png", "iconPath": "static/tabbar/zhuiju.png",
"selectedIconPath": "static/tabbar/index_@2x.png", "selectedIconPath": "static/tabbar/zhuiju_.png",
"text": "刷剧" "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": { //模式配置，仅开发期间生效 "condition": { //模式配置，仅开发期间生效

85
pages.json
View File

@ -4,14 +4,6 @@
"^tn-(.*)": "@/tuniao-ui/components/tn-$1/tn-$1.vue" "^tn-(.*)": "@/tuniao-ui/components/tn-$1/tn-$1.vue"
}, },
"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages "pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
{
"path": "pages/index/index",
"style": {
"navigationBarTitleText": "斯耀短剧",
"enablePullDownRefresh": true,
"navigationStyle": "custom"
}
},
{ {
"path": "pages/task/index", "path": "pages/task/index",
"style": { "style": {
@ -21,6 +13,15 @@
} }
}, },
{
"path": "pages/index/index",
"style": {
"navigationBarTitleText": "斯耀短剧",
"enablePullDownRefresh": true,
"navigationStyle": "custom"
}
},
{ {
"path": "pages/task/prizeList", "path": "pages/task/prizeList",
"style": { "style": {
@ -746,34 +747,39 @@
}, },
{ {
"path" : "blogger/blogger", "path" : "blogger/blogger",
"style": { "style" :
{
"navigationBarTitleText" : "", "navigationBarTitleText" : "",
"navigationStyle": "custom" "navigationStyle": "custom"
} }
}, },
{ {
"path" : "blogger/details", "path" : "blogger/details",
"style": { "style" :
{
"navigationBarTitleText" : "", "navigationBarTitleText" : "",
"navigationStyle": "custom" "navigationStyle": "custom"
} }
}, },
{ {
"path" : "topic/topic", "path" : "topic/topic",
"style": { "style" :
{
"navigationBarTitleText" : "话题" "navigationBarTitleText" : "话题"
} }
}, },
{ {
"path" : "topic/reserve", "path" : "topic/reserve",
"style": { "style" :
{
"navigationBarTitleText" : "", "navigationBarTitleText" : "",
"navigationStyle": "custom" "navigationStyle": "custom"
} }
}, },
{ {
"path" : "tools/tools", "path" : "tools/tools",
"style": { "style" :
{
"navigationBarTitleText" : "", "navigationBarTitleText" : "",
"navigationStyle": "custom" "navigationStyle": "custom"
} }
@ -796,18 +802,7 @@
"backgroundColor": "#FFFFFF", "backgroundColor": "#FFFFFF",
"borderStyle": "black", "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", "pagePath": "pages/task/index",
"iconPath": "static/tabbar/task@2x.png", "iconPath": "static/tabbar/task@2x.png",
@ -815,17 +810,37 @@
"text": "任务" "text": "任务"
}, },
{ {
"pagePath": "pages/chasingDrama/chasingDrama", "pagePath": "pages/video/video",
"iconPath": "static/tabbar/zhuiju.png", "iconPath": "static/tabbar/index@2x.png",
"selectedIconPath": "static/tabbar/zhuiju_.png", "selectedIconPath": "static/tabbar/index_@2x.png",
"text": "追剧" "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": { //模式配置，仅开发期间生效 "condition": { //模式配置，仅开发期间生效

2
uview-ui/README.md
View File

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