diff --git a/src/components/biz-list/biz-list.vue b/src/components/biz-list/biz-list.vue
new file mode 100644
index 0000000000000000000000000000000000000000..d69741d5651f1ba4e7d1260865452301b4091c57
--- /dev/null
+++ b/src/components/biz-list/biz-list.vue
@@ -0,0 +1,192 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/components/biz-navbar/biz-navbar.vue b/src/components/biz-navbar/biz-navbar.vue
new file mode 100644
index 0000000000000000000000000000000000000000..3b6725289718e0fbdf992c816f621936882e9532
--- /dev/null
+++ b/src/components/biz-navbar/biz-navbar.vue
@@ -0,0 +1,58 @@
+
+
+
+
+
+ {{project_cn}}
+ {{slogan}}
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/components/biz-page/biz-page.vue b/src/components/biz-page/biz-page.vue
new file mode 100644
index 0000000000000000000000000000000000000000..2694bda988b54cf4c6727b172409effc81446b31
--- /dev/null
+++ b/src/components/biz-page/biz-page.vue
@@ -0,0 +1,145 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/components/biz-page/props.js b/src/components/biz-page/props.js
new file mode 100644
index 0000000000000000000000000000000000000000..186e19f3aa3039cefe31474596c2fb392fe0e391
--- /dev/null
+++ b/src/components/biz-page/props.js
@@ -0,0 +1,52 @@
+export default {
+ loading: Boolean,
+ title: {
+ type: String,
+ default: ""
+ },
+ background: {
+ type: String,
+ default: "rgba(0,0,0,0)"
+ },
+ titleColor: {
+ type: String,
+ default: "#000000"
+ },
+ transparent: {
+ type: Number,
+ default: 0
+ },
+ padding: {
+ type: String,
+ default: "0"
+ },
+ autoLoding: Boolean,
+ pageScroll: Boolean,
+ sleep: {
+ type: Number,
+ default: 1000,
+ },
+ navbar: {
+ type: Boolean,
+ default: true
+ },
+ isBack: {
+ type: Boolean,
+ default: false
+ },
+ navbarBackground: {
+ type: String,
+ default: "#FFFFFF"
+ },
+ backgroundImage: {
+ type: String
+ },
+ showBackground: {
+ type: Boolean,
+ default: true
+ },
+ showTransparent: {
+ type: Boolean,
+ default: true
+ },
+}
\ No newline at end of file
diff --git a/src/pages.json b/src/pages.json
index b96356a3da366f96d64a03de079b9117c1048123..bd78567e0b33a272fc35facfd5f8565f2c945f6e 100755
--- a/src/pages.json
+++ b/src/pages.json
@@ -29,7 +29,7 @@
}, {
"path": "pages/mine/mine",
"style": {
- "navigationBarTitleText": "",
+ "navigationBarTitleText": "我的",
"enablePullDownRefresh": false
}
}, {
@@ -41,6 +41,16 @@
}
],
"subPackages": [{
+ "root": "pagesCommon",
+ "pages": [{
+ "path": "download/download",
+ "style": {
+ "navigationBarTitleText": "APP下载",
+ "navigationStyle": "custom",
+ "enablePullDownRefresh": false
+ }
+ }]
+ },{
"root": "pagesMine",
"pages": [{
"path": "setting/setting",
@@ -62,11 +72,18 @@
"navigationStyle": "custom",
"enablePullDownRefresh": false
}
+ },
+ {
+ "path" : "upgrade/upgrade",
+ "style" :
+ {
+ "navigationBarTitleText" : "升级日志"
+ }
}]
}],
"globalStyle": {
"navigationBarTextStyle": "black",
- "navigationBarTitleText": "itriton-warrior",
+ "navigationBarTitleText": "ITRITON-WARRIOR",
"navigationBarBackgroundColor": "#FFFFFF",
"backgroundColor": "#F2F4F5"
},
diff --git a/src/pages/index/components/modules.vue b/src/pages/index/components/modules.vue
new file mode 100644
index 0000000000000000000000000000000000000000..030e1442813541be468cacfbaedd40e1497c74d6
--- /dev/null
+++ b/src/pages/index/components/modules.vue
@@ -0,0 +1,121 @@
+
+
+
+
+ 指南
+ 一马平川
+
+
+
+
+
+
+
+
+ 组件
+ 开箱即用
+
+
+
+
+
+
+
+
+ 工具
+ 百步穿杨
+
+
+
+
+
+
+
+
+ 布局
+ 事半功倍
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 393741f8f331ca0552ae9700c0e1ceb6e25fba28..6c98886a61562c60a394117e1815ea7724685fc9 100755
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -1,13 +1,15 @@
+
+
+
\ No newline at end of file
diff --git a/src/pagesMine/grade/grade.vue b/src/pagesMine/grade/grade.vue
index d8e0a79a69e3e401ba4c47fb5f0c62c8919fb64c..583410d427530e0e55182d8a05525900d9103977 100644
--- a/src/pagesMine/grade/grade.vue
+++ b/src/pagesMine/grade/grade.vue
@@ -58,11 +58,9 @@
会员使用&详细规则
-
- 用户点击立即开通即代表您已阅读并同意自动续费服务;
- 账户将在会员到期前24自动扣缴下月会员费用;
- 如需取消续订,请在当前会员周期前24小时以前,手动取消自动续费功能,具体路径为:我的-会员-充值缴费-取消自动续费;
-
+ 付费会员属于虚拟业务服务,订阅后不支持退款,请确认需求符合后再购买,敬请谅解!付款后系统将自动为您开通相关业务,另外此订阅到期不会自动续费,如果支付遇到问题请
+
+ ,购买之前请先登录,登录便于找回会员账号信息。
@@ -120,6 +118,20 @@
min-height: 100vh;
background: #1B1924;
display: inline-block;
+
+ &-contact {
+ display: inline;
+ padding: 0;
+ font-size: inherit;
+ line-height: inherit;
+ background-color: transparent;
+ color: #FADDBC;
+ text-decoration: underline;
+
+ &::after {
+ border: none;
+ }
+ }
&-line::after {
content: "";
@@ -162,125 +174,6 @@
height: 60rpx;
}
- &-package {
- margin-top: 30rpx;
-
- &-title {
- color: #FADDBC;
- font-size: 30rpx;
- padding-left: 4%;
- position: relative;
- height: 60rpx;
- line-height: 60rpx;
- }
-
- &-list {
- overflow-x: scroll;
- white-space: nowrap;
- margin-left: 4%;
-
- &-item {
- display: inline-block;
- position: relative;
- background: #fefefe;
- border-radius: 20rpx;
- text-align: center;
- padding: 20rpx;
- box-shadow: 0px 0px 12rpx #999999;
- margin-top: 20rpx;
- margin-left: 20rpx;
- min-width: 250rpx;
-
- &-label {
- position: absolute;
- background: #32323B;
- right: 0;
- top: -22rpx;
- height: 44rpx;
- line-height: 44rpx;
- padding: 0rpx 15rpx;
- border-radius: 0px 22rpx 0px 22rpx;
- color: #EDC393;
- font-size: 24rpx;
- }
-
- &-title {
- color: #787369;
- font-size: 30rpx;
- margin-top: 10rpx;
- }
-
- &-price {
- color: #000;
- margin-top: 30rpx;
-
- text {
- font-size: 48rpx;
- font-weight: 500;
- margin-left: -4rpx;
- }
- }
-
- &-line {
- color: #a7a6a7;
- font-size: 26rpx;
- text-decoration: line-through;
- margin-top: -10rpx;
- }
-
- &-btn {
- display: inline-flex;
- height: 44rpx;
- line-height: 44rpx;
- background: #ECDFCB;
- border-radius: 40rpx;
- color: #2F2513;
- font-size: 24rpx;
- padding: 0rpx 20rpx;
- margin-top: 30rpx;
- }
-
- &-time {
- margin-top: 6rpx;
- font-size: 20rpx;
- color: #999;
- }
- }
-
- &-item:first-of-type {
- margin-left: 0rpx;
- }
-
- &-item {
- &--active {
- background: #F5EEE3;
- }
- }
- }
- }
-
- &-rules {
- margin-top: 30rpx;
- color: #FADDBC;
-
- &-title {
- font-size: 30rpx;
- padding-left: 4%;
- position: relative;
- height: 60rpx;
- line-height: 60rpx;
- }
-
- &-content {
- width: 92%;
- font-size: 26rpx;
- margin: auto;
- line-height: 50rpx;
- color: #97999D;
- margin-bottom: 120rpx;
- }
- }
-
&-list {
display: flex;
flex-wrap: wrap;
@@ -324,7 +217,7 @@
border-radius: 20rpx;
text-align: center;
padding: 20rpx;
- box-shadow: 0px 0px 12rpx #999999;
+ box-shadow: 0px 0px 12rpx #d9b589;
margin-top: 20rpx;
margin-left: 20rpx;
min-width: 250rpx;
@@ -337,7 +230,7 @@
height: 44rpx;
line-height: 44rpx;
padding: 0rpx 15rpx;
- border-radius: 0px 22rpx 0px 22rpx;
+ border-radius: 0px 18rpx 0px 18rpx;
color: #EDC393;
font-size: 24rpx;
}
diff --git a/src/pagesMine/setting/setting.vue b/src/pagesMine/setting/setting.vue
index fc821ebe192f168236c130be0e83fa49ced06fd8..e01c94aa36207b99f6c163a70ab8d48bbc8a8fb1 100755
--- a/src/pagesMine/setting/setting.vue
+++ b/src/pagesMine/setting/setting.vue
@@ -8,7 +8,7 @@
{{ $t('settings.logout') }}
-
+
diff --git a/src/pagesMine/upgrade/upgrade.vue b/src/pagesMine/upgrade/upgrade.vue
new file mode 100644
index 0000000000000000000000000000000000000000..c328217f8a57abc2e6d0994f3498ecae7a225c61
--- /dev/null
+++ b/src/pagesMine/upgrade/upgrade.vue
@@ -0,0 +1,137 @@
+
+
+
+
+
+
+
+ •
+ {{version.value}}
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/static/images/banner/banner.jpg b/src/static/images/banner/banner.jpg
index 5e2e54c72917aa9e74b33bfbfe068d6443879d86..0b5c21a151dd3b74bb212ca4de358172dffb045d 100644
Binary files a/src/static/images/banner/banner.jpg and b/src/static/images/banner/banner.jpg differ
diff --git a/src/static/images/common/default_avatar.png b/src/static/images/common/default_avatar.png
new file mode 100755
index 0000000000000000000000000000000000000000..7f5e1609fdca18619ef18292f4df606f7d00a518
Binary files /dev/null and b/src/static/images/common/default_avatar.png differ
diff --git a/src/static/images/mine/default_bg_mine.png b/src/static/images/common/default_bg_mine.png
similarity index 100%
rename from src/static/images/mine/default_bg_mine.png
rename to src/static/images/common/default_bg_mine.png
diff --git a/src/static/images/common/default_empty.png b/src/static/images/common/default_empty.png
new file mode 100644
index 0000000000000000000000000000000000000000..d11d5a28ce126db138188e7c83babd552434d82f
Binary files /dev/null and b/src/static/images/common/default_empty.png differ
diff --git a/src/static/images/common/default_success.png b/src/static/images/common/default_success.png
new file mode 100644
index 0000000000000000000000000000000000000000..59d1f61968ced1dfc46b47cff7ec03c7621f118f
Binary files /dev/null and b/src/static/images/common/default_success.png differ
diff --git a/src/static/images/common/loading.gif b/src/static/images/common/loading.gif
new file mode 100644
index 0000000000000000000000000000000000000000..2b3cf5825adc0693610c37a927fee966a27d1386
Binary files /dev/null and b/src/static/images/common/loading.gif differ
diff --git a/src/static/images/download/bg.png b/src/static/images/download/bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..7fc8dc2cd960e172d3e87ce21a6194f845a46ed6
Binary files /dev/null and b/src/static/images/download/bg.png differ
diff --git a/src/static/images/download/tip.png b/src/static/images/download/tip.png
new file mode 100644
index 0000000000000000000000000000000000000000..ee2dd405400edf44ef5c4cbd24608895d9b042b7
Binary files /dev/null and b/src/static/images/download/tip.png differ
diff --git a/src/static/images/mine/default_avatar.jpeg b/src/static/images/mine/default_avatar.jpeg
deleted file mode 100644
index 588e8bf9e723549313e5ed9cdc2b74b7f0a0653a..0000000000000000000000000000000000000000
Binary files a/src/static/images/mine/default_avatar.jpeg and /dev/null differ
diff --git a/src/static/styles/iconfont.css b/src/static/styles/iconfont.css
index 06fcfe9179be9a2186624eefd884625b9771207b..c5231928e5e4ae56c3a961b85022cc54501d9a05 100644
--- a/src/static/styles/iconfont.css
+++ b/src/static/styles/iconfont.css
@@ -1,3 +1,31 @@
@font-face {
- font-family: "itriton-warrior";
-}
\ No newline at end of file
+ font-family: "itriton"; /* Project id 4698427 */
+ src:
+ url('data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAAAUAAAsAAAAACegAAASyAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHFQGYACDMgqHAIV1ATYCJAMUCwwABCAFhFsHSxuOCMgusG3Yo0CJREoYLblNatLJ809BVHbP9yzuGdEHyJCo3HAmDupUuUCotiME2ymR7KDkKSrxteQbY4AHwF8B341PgvwJ3u8BAAKQ+fuNPs/9jH89/zasVJtQdtjAZgOedV2GndDxgeI9wmv1RHeDG4DvIICXElRD1am3iQdRQ3oyDNIwfPsFrEIZMlCuACEXLSYEFdwKJ+5VgywEFtQsv0vAAu3v5SOlJAQUVvN9SIt+q6vB/bfm7Q4943976EfIPgTYrgALaKBIzfQyKtw6BH8jWgSNlwsHUAPwCrtRqFxHNXgrv/X9/w8gbJvc+5OSxz+ewoA4fKV+QGr4DbwhJjS8WceEwBuZCQVvfPy5I7XyihdIgeQBGcCXbXHB7GAp5GRNqvlnBiKDHgmb3wMWeTiP45nslZm2MP9sC8ArnmBmWMMjczZydqYNR+JvEyKM42/Eb5i9MvQt9mvuDtpHdMBnlMDhuE+FJ/cI3d1tenvb9fW17ykhNrCdD+/padtXxh923L4+hlcdcd+7NVrosJks7dYUZRPDpuWcnnmw7F3LgJqxD0fr4HC/Fw6wqozU/g6/avKB7nHNuJlHkkRu7yOu4+HL2ec8zGg2bZYeAjTZ0Dtv1bZ27wtz/lt3sxoL+83JqvXHeuavnvPq0kyf/txV18lbV5zHZLHDbra2W0y2Al7k2rctOHT55gn3tRvHF+7pcmJPZK7gl2BuYM95HZgho8dTK0bYd9nhcnPLmqlRuUFMxqlVjJPNWi6Srkldx7uKds1rm76ZTyImXIyvzEeVwmV1p00BpW8cmtoScOSn/r2oCvjzxx3/I3+slBYXdLqAlaju68NQwL27+ixI+g9b/XPWEu4kR8y81vOOoKf2GKckDOd7jEvzX45R4VjOTMit0A5EFZLx2EM6ZH51XB58muZBO3gOiDeETLhx1lIASzHvpGL4nmrs2td+JuL0soU7104ayZ8jqKwm+fb8b6rUd73j/JOIM8rzjcHq6HffiXvRrDXVi/e3vZByQagWV9vcfkeXEfYh77sK7q5jWWVaaZnVvPhr4uNCjwuTa9fpjkY/yX7x0P+5z0xabVlpWmUBEwDA/w3qaA3HMb2MkNP+OexvdM7muI3wh+elu0dX+RoSvgYGXmZWmIWe/0Y67uYkIzZ345N1idnTvNgoM1w7mRFeNrqxVdkVbGLK/+CM8iQfeSx2GASXg3cGFJIFNK/+ZjCAFCBZfBQnObioRPJSmJo2H7FtuM54gHxMB5IQZDWgkJ2ARo4DBrlKsiR5THII8pnkpZ3I/XzkE1VtiioYqoaVDVBTRbD0xzANo/UE70Byjb6CvvgqVkTUqPHD6VOmeRJrEUY0+QljrTyDMQlKlBjgmnxehvR6AhVKtKiKTVEzpiyYOlXifmRKFTGAlVAQFTAQ1UB60QBkIFUQMJJkZGhgUM5z1w4QMjXoqVBa+A4OVASJjciB4SAlKUaJcGCtFMfpWINTo6lFZgZjYEhAqqcQDEDq1cmM0GOUABnBb9KCqIIxhQEpwgoLKP7r1S+udErb5IZJy9vXu34/akWJFiNWHMyY4UQf2H+sphoFDenZQGpYaOdVKAQjzAAAAAA=') format('woff2'),
+ url('//at.alicdn.com/t/c/font_4698427_czoz11txgzk.woff?t=1727498164509') format('woff'),
+ url('//at.alicdn.com/t/c/font_4698427_czoz11txgzk.ttf?t=1727498164509') format('truetype');
+}
+
+.itriton {
+ font-family: "itriton" !important;
+ font-size: 16px;
+ font-style: normal;
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale;
+}
+
+.itriton-tool:before {
+ content: "\e648";
+}
+
+.itriton-guide:before {
+ content: "\e667";
+}
+
+.itriton-layout:before {
+ content: "\e604";
+}
+
+.itriton-component:before {
+ content: "\e6b2";
+}
diff --git a/src/utils/config.js b/src/utils/config.js
index 6ef3e9dda17767e86f30e363fc29003527d6bf4d..76fa80185162d9fa8e5ff16395bbaea5bbe66446 100755
--- a/src/utils/config.js
+++ b/src/utils/config.js
@@ -6,7 +6,7 @@ module.exports = {
sub_color: '#2979ff',
pages: {
login: 'pages/authorize/login',
- white_list: ['pages/authorize/login', 'pages/authorize/register', 'pages/authorize/forget'],// 白名单信息列表,白名单无需鉴权
+ white_list: ['pages/authorize/login', 'pages/authorize/register', 'pages/authorize/forget', 'pagesCommon/download/download'],// 白名单信息列表,白名单无需鉴权
},
developer_list: [{
// #ifdef H5
diff --git a/src/utils/images.native.js b/src/utils/images.native.js
index 4426bf3c795065ec111347083010b8867d0f8a9e..79a418f61e40c5a85c0b70545b9e4253d18a1938 100644
--- a/src/utils/images.native.js
+++ b/src/utils/images.native.js
@@ -1,3 +1,8 @@
-export const defaultAvatarImage = `/static/images/mine/default_avatar.jpeg`;
export const defaultBannerImage = `/static/images/banner/banner.jpg`;
-export const defaultMineBgImage = `/static/images/mine/default_bg_mine.png`;
\ No newline at end of file
+export const defaultMineBgImage = `/static/images/mine/default_bg_mine.png`;
+export const defaultEmptyImage = `/static/images/common/default_empty.png`;
+export const defaultAvatarImage = `/static/images/common/default_avatar.png`;
+export const defaultSuccessImage = `/static/images/common/default_success.png`;
+
+export const downloadBgImage = `/static/images/download/bg.png`;
+export const downloadTipImage = `/static/images/download/tip.png`;
\ No newline at end of file