diff --git a/app.wxss b/app.wxss
index 1e24db7..25425de 100644
--- a/app.wxss
+++ b/app.wxss
@@ -5,7 +5,7 @@
.page-container {
display: flex;
flex-direction: column;
- padding: 15px;
+ padding: 30rpx;
}
::-webkit-scrollbar {
@@ -28,7 +28,40 @@
}
/***End***/
+.custom-checkbox {
+ font-size: 14px;
+ margin-left: 14px;
+ border-radius: 50%;
+}
+.custom-wx-checkbox .wx-checkbox-input.wx-checkbox-input-checked {
+ color: #fff !important;
+ background-color: var(--primary-color);
+ border: 1px solid var(--primary-color);
+ border-radius: 50%;
+}
+
+.custom-wx-checkbox .wx-checkbox-input {
+ -webkit-appearance: none;
+ appearance: none;
+ outline: 0;
+ text-indent: 0;
+ width: 32rpx;
+ height: 32rpx;
+ border-radius: 50%;
+ background-color: transparent;
+ position: relative;
+ border: 1rpx solid var(--primary-color);
+ box-sizing: border-box;
+ text-align: center;
+}
+
+/*钩大小*/
+.custom-wx-checkbox .wx-checkbox-input.wx-checkbox-input-checked:before {
+ font-size: 32rpx;
+ text-align: center;
+ border-radius: 50%;
+}
.mt-10 {
@@ -71,6 +104,28 @@
width: 100%;
}
+.bottom-fixed-footer {
+ position: fixed;
+ bottom: 0rpx;
+ left: 0rpx;
+ background-color: var(--white-color);
+ display: flex;
+ flex-direction: column;
+ padding: var(--page-padding) var(--page-padding) 50rpx;
+ width: 100%;
+ box-sizing: border-box;
+}
+
+.bottom-btn-green {
+ background-color: var(--btn-green-color);
+ color: white;
+ font-size: 16px;
+ height: 70rpx;
+ line-height: 70rpx;
+ border-radius: 5px;
+ text-align: center;
+}
+
.ml-10 {
margin-left: 10rpx;
}
diff --git a/main-app.js b/main-app.js
index 50683d8..3cfacc1 100644
--- a/main-app.js
+++ b/main-app.js
@@ -1,12 +1,15 @@
// app.js
import {
+ appUrl,
imgAssets
} from './net/http'
App({
globalData: {
imgAssetsUrl: imgAssets,
localAssets: "/static/images",
- slideBtns: []
+ slideBtns: [],
+ appTitle: 'AI喵著',
+ appUrl: appUrl
},
onLaunch() {
this.globalData.slideBtns = [{
diff --git a/net/http.js b/net/http.js
index 0eea9b5..a7ed72b 100644
--- a/net/http.js
+++ b/net/http.js
@@ -5,7 +5,8 @@ import {
uploadImgUrl,
previewUrl,
copyrightUrl,
- imgAssets
+ imgAssets,
+ appUrl
} from '../net/mainUrl'
/**
@@ -82,5 +83,6 @@ export {
uploadImgUrl,
previewUrl,
copyrightUrl,
- imgAssets
+ imgAssets,
+ appUrl
}
\ No newline at end of file
diff --git a/net/mainUrl.js b/net/mainUrl.js
index ccc2c14..a8fe72e 100644
--- a/net/mainUrl.js
+++ b/net/mainUrl.js
@@ -5,6 +5,7 @@ const copyrightUrl = 'https://www.aimzhu.com/copyright';
const uploadImgUrl = copyrightUrl + '/api/file/v2/upload-image'
const previewUrl = copyrightUrl + '/route/file/v2/download/true/'
const imgAssets = 'https://www.aimzhu.com/miniapp-assets'
+const appUrl = 'https://www.aimzhu.com'
export {
operatorUrl,
@@ -12,5 +13,6 @@ export {
uploadImgUrl,
previewUrl,
copyrightUrl,
- imgAssets
+ imgAssets,
+ appUrl
}
\ No newline at end of file
diff --git a/pages/copyright/createBuy/createBuy.js b/pages/copyright/createBuy/createBuy.js
index e723261..b32940b 100644
--- a/pages/copyright/createBuy/createBuy.js
+++ b/pages/copyright/createBuy/createBuy.js
@@ -7,7 +7,8 @@ Page({
*/
data: {
imgAssets: app.globalData.imgAssetsUrl,
- localImgAssets:app.globalData.localAssets,
+ localImgAssets: app.globalData.localAssets,
+ appUrl: app.globalData.appUrl,
urgent: 0,
projTypes: [], //全托管,写材料 type= ALL type =MATERIAL
allPrice: 0,
diff --git a/pages/copyright/createBuy/createBuy.wxml b/pages/copyright/createBuy/createBuy.wxml
index 0f4780e..aaf11a3 100644
--- a/pages/copyright/createBuy/createBuy.wxml
+++ b/pages/copyright/createBuy/createBuy.wxml
@@ -145,7 +145,7 @@
免费试用请使用电脑端登录
- https://www.aimzhu.com
+ {{appUrl}}
diff --git a/pages/copyright/createBuy/createBuy.wxss b/pages/copyright/createBuy/createBuy.wxss
index 7f57259..b9125f2 100644
--- a/pages/copyright/createBuy/createBuy.wxss
+++ b/pages/copyright/createBuy/createBuy.wxss
@@ -1,41 +1,12 @@
-
-
-.custom-wx-checkbox .wx-checkbox-input.wx-checkbox-input-checked {
- color: #fff !important;
- background-color: #FFA900;
- border: 1px solid #FFA900;
-}
-
-.custom-wx-checkbox .wx-checkbox-input {
- -webkit-appearance: none;
- appearance: none;
- margin-bottom: 3px;
- outline: 0;
- text-indent: 0;
- width: 40rpx;
- height: 40rpx;
- background-color: transparent;
- position: relative;
- border: 1rpx solid #FFA900;
- box-sizing: border-box;
- text-align: center;
-}
-
-/*钩大小*/
-.custom-wx-checkbox .wx-checkbox-input.wx-checkbox-input-checked:before {
- font-size: 36rpx;
- text-align: center;
-}
-
.buy-container {
display: flex;
flex-direction: column;
- padding: 15px;
+ padding: 30rpx;
}
.buy-title {
height: 100rpx;
- background-color: blanchedalmond;
+ background-color: var(--primary-color-active);
}
.buy-all-container {
@@ -50,8 +21,7 @@
flex-direction: column;
border-radius: 20rpx;
background-color: white;
- /* box-shadow: 0rpx 0rpx 10rpx 10rpx #e9e8e88f; */
- box-shadow: 0px 2px 6px 0px rgba(0, 0, 0, 0.08);
+ box-shadow: 0px 2px 6px 0px var(--divider-color);
}
.buy-all-title {
@@ -63,30 +33,34 @@
.buy-all-txt {
font-size: 20px;
- color: black;
+ color: var(--text-color);
}
.txt-title {
font-size: 38rpx;
- color: #000000;
+ color: var(--text-color);
font-weight: bold;
}
.buy-all-txt .money {
margin-left: 20rpx;
font-size: 16px;
- color: #532A00;
+ color: var(--text-brown-color);
font-weight: 500;
}
.buy-all-btn {
padding: 5rpx 35rpx;
border-radius: 10rpx;
- background-color: #FFA900;
+ background-color: var(--primary-color);
color: white;
font-size: 28rpx;
}
+.buy-all-btn:active {
+ background-color: var(--primary-color-active);
+}
+
.buy-desc-box {
display: flex;
flex-direction: column;
@@ -94,11 +68,11 @@
}
.buy-desc-txt {
- color: #3b3b3b;
+ color: var(--text-color);
}
.buy-desc-title {
- color: #3b3b3b;
+ color: var(--text-color);
}
.buy-desc-item {
@@ -165,8 +139,8 @@
/* 使用 ::before 伪元素显示计数器值并设置圆形背景 */
.list-item::before {
content: counter(my-counter);
- background-color: #F4CE98;
- color: black;
+ background-color: var(--primary-color-active);
+ color: var(--black-color);
border-radius: 50%;
width: 18px;
height: 18px;
@@ -183,14 +157,14 @@
.box-bottom-options {
justify-content: center;
- background-color: #FCF3E5;
+ background-color: var(--primary-color-active);
padding: 20rpx;
border-bottom-left-radius: 10px;
border-bottom-right-radius: 10px;
}
.box-bottom-options .txt {
- color: #532A00;
+ color: var(--text-brown-color);
padding-left: 10rpx;
font-weight: 400;
line-height: 24px;
@@ -221,13 +195,13 @@
}
.hint-content {
- color: #532A00;
+ color: var(--text-brown-color);
font-size: 14px;
font-weight: 500;
}
.hint-link {
- color: #0a86fa;
+ color: var(--text-blue-color);
text-align: center;
font-size: 12px;
}
\ No newline at end of file
diff --git a/pages/copyright/createProjectInfo/createProjectInfo.wxss b/pages/copyright/createProjectInfo/createProjectInfo.wxss
index aecd33f..abf2e05 100644
--- a/pages/copyright/createProjectInfo/createProjectInfo.wxss
+++ b/pages/copyright/createProjectInfo/createProjectInfo.wxss
@@ -1,35 +1,3 @@
-.custom-checkbox {
- font-size: 14px;
- margin-left: 14px;
-}
-
-.custom-wx-checkbox .wx-checkbox-input.wx-checkbox-input-checked {
- color: #fff !important;
- background-color: var(--primary-color);
- border: 1px solid var(--primary-color);
-}
-
-.custom-wx-checkbox .wx-checkbox-input {
- -webkit-appearance: none;
- appearance: none;
- margin-bottom: 3px;
- outline: 0;
- text-indent: 0;
- width: 32rpx;
- height: 32rpx;
- background-color: transparent;
- position: relative;
- border: 1rpx solid var(--primary-color);
- box-sizing: border-box;
- text-align: center;
-}
-
-/*钩大小*/
-.custom-wx-checkbox .wx-checkbox-input.wx-checkbox-input-checked:before {
- font-size: 32rpx;
- text-align: center;
-}
-
.create-container {
display: flex;
flex-direction: column;
diff --git a/pages/copyright/publicPay/publicPay.wxml b/pages/copyright/publicPay/publicPay.wxml
index 295f65b..e01f511 100644
--- a/pages/copyright/publicPay/publicPay.wxml
+++ b/pages/copyright/publicPay/publicPay.wxml
@@ -11,21 +11,21 @@
付款方信息
-
+
公司名称
-
+
开户银行
-
+
银行账号
-
+
打款时间
diff --git a/pages/copyright/publicPay/publicPay.wxss b/pages/copyright/publicPay/publicPay.wxss
index 2173770..173fdcc 100644
--- a/pages/copyright/publicPay/publicPay.wxss
+++ b/pages/copyright/publicPay/publicPay.wxss
@@ -2,7 +2,6 @@
display: flex;
flex-direction: column;
justify-content: center;
- align-items: flex-start;
background-color: var(--white-color);
margin-top: 10px;
border-radius: 5px;
@@ -22,22 +21,15 @@
.item {
display: flex;
flex-direction: row;
- justify-content: center;
- align-items: flex-start;
padding: 6px 20px;
- width: 85vw;
-}
-
-.center {
align-items: center;
}
+
.red {
color: var(--red-color);
}
-/* .item:nth-last-of-type(n+1){
-} */
.title {
flex: 0.3;
@@ -47,7 +39,7 @@
.content {
flex: 0.7;
- font-size: 14px;
+ font-size: 28rpx;
}
.time-picker-box {
@@ -136,10 +128,9 @@
background-color: var(--bg-gray-color);
border: 1px solid var(--divider-color);
border-radius: 2rpx;
- padding: 3px 8px;
+ padding: 6rpx 14rpx;
text-align: left;
font-size: 12px;
-
}
.item-v {
diff --git a/pages/index/index.js b/pages/index/index.js
index c29969e..2bbc843 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -20,6 +20,7 @@ Page({
data: {
imgAssets: app.globalData.imgAssetsUrl,
localAssets: app.globalData.localAssets,
+ appTitle: app.globalData.appTitle,
statusBarHeight: statusBarHeight,
navBarHeight: navBarHeight,
totalHeight: navBarHeight, // 导航栏总高度
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index db0c59b..dfb6643 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -3,7 +3,7 @@
- AI喵著
+ {{appTitle}}
diff --git a/pages/login/login.wxss b/pages/login/login.wxss
index 5a3d893..241bf07 100644
--- a/pages/login/login.wxss
+++ b/pages/login/login.wxss
@@ -1,33 +1,5 @@
/* pages/login/login.wxss */
-.custom-wx-checkbox .wx-checkbox-input.wx-checkbox-input-checked {
- color: #fff !important;
- background-color: var(--primary-color);
- border: 1px solid var(--primary-color);
-}
-
-.custom-wx-checkbox .wx-checkbox-input {
- -webkit-appearance: none;
- appearance: none;
- outline: 0;
- text-indent: 0;
- width: 32rpx;
- height: 32rpx;
- border-radius: 20rpx;
- background-color: transparent;
- position: relative;
- border: 1rpx solid var(--primary-color);
- box-sizing: border-box;
- text-align: center;
-}
-
-/*钩大小*/
-.custom-wx-checkbox .wx-checkbox-input.wx-checkbox-input-checked:before {
- font-size: 36rpx;
- text-align: center;
-}
-
-
.login {
width: 100vw;
height: 100vh;
diff --git a/pages/mainPage/mainPage.js b/pages/mainPage/mainPage.js
index 2922b98..1c15f9d 100644
--- a/pages/mainPage/mainPage.js
+++ b/pages/mainPage/mainPage.js
@@ -11,7 +11,8 @@ Page({
data: {
statusBarHeight: statusBarHeight,
imgAssets: app.globalData.imgAssetsUrl,
- localImgAssets:app.globalData.localAssets,
+ localImgAssets: app.globalData.localAssets,
+ appTitle: app.globalData.appTitle,
recommendList: [{
id: '1',
content: '生成真实系统 | 可下载安装包'
@@ -44,7 +45,7 @@ Page({
ProApi.doGetMainProCount()
.then(res => {
this.setData({
- recommendDesc: `AI喵著网累计辅助编写资料 ${res.data[0]} 万套,通过平台代办下发证书 ${res.data[1]} 万件`
+ recommendDesc: `${this.data.appTitle}网累计辅助编写资料 ${res.data[0]} 万套,通过平台代办下发证书 ${res.data[1]} 万件`
})
})
.catch(err => {
diff --git a/pages/mine/mineAccount/invoiceOrder/invoiceOrder.wxss b/pages/mine/mineAccount/invoiceOrder/invoiceOrder.wxss
index c6795bc..6c26de2 100644
--- a/pages/mine/mineAccount/invoiceOrder/invoiceOrder.wxss
+++ b/pages/mine/mineAccount/invoiceOrder/invoiceOrder.wxss
@@ -124,38 +124,6 @@
margin-right: 10rpx;
}
-.custom-checkbox {
- font-size: 14px;
- margin-left: 14px;
-}
-
-.custom-wx-checkbox .wx-checkbox-input.wx-checkbox-input-checked {
- color: #fff !important;
- background-color: var(--primary-color);
- border: 1px solid var(--primary-color);
-}
-
-.custom-wx-checkbox .wx-checkbox-input {
- -webkit-appearance: none;
- appearance: none;
- margin-bottom: 3px;
- outline: 0;
- text-indent: 0;
- width: 32rpx;
- height: 32rpx;
- border-radius: 16rpx;
- background-color: transparent;
- position: relative;
- border: 1rpx solid var(--primary-color);
- box-sizing: border-box;
- text-align: center;
-}
-
-/*钩大小*/
-.custom-wx-checkbox .wx-checkbox-input.wx-checkbox-input-checked:before {
- font-size: 32rpx;
- text-align: center;
-}
.pay-public {
background-image: url('data:image/svg+xml;charset=utf-8;base64,PHN2ZyB0PSIxNzQ1ODExODY1NDk3IiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjI4ODY4IiB3aWR0aD0iMTYiIGhlaWdodD0iMTYiPjxwYXRoIGQ9Ik0xMjggMGg3NjhhMTI4IDEyOCAwIDAgMSAxMjggMTI4djc2OGExMjggMTI4IDAgMCAxLTEyOCAxMjhIMTI4YTEyOCAxMjggMCAwIDEtMTI4LTEyOFYxMjhhMTI4IDEyOCAwIDAgMSAxMjgtMTI4eiBtMjYzLjA0IDI0OC45NmMtMzcuNzYgMTE5LjA0LTk1LjM2IDIxNS4wNC0xNzIuMTYgMjg3LjM2bDQ4IDQxLjZjNzQuODgtNzAuNCAxMzUuMDQtMTcyLjggMTgwLjQ4LTMwNi41NmwtNTYuMzItMjIuNHogbTI0MC42NCAzMzkuMmwtNTQuNCAxOC41NmMyMy4wNCAzNC41NiA0NC44IDcyLjk2IDY1LjkyIDExNS4yLTg0LjQ4IDEyLjgtMTcyLjggMjIuNC0yNjMuNjggMjguOCA1Mi40OC03Mi4zMiAxMDQuOTYtMTYyLjU2IDE1Ni4xNi0yNzAuNzJsLTU5LjUyLTIwLjQ4Yy04MS45MiAxODEuMTItMTQ1LjI4IDI3OS4wNC0xOTAuNzIgMjkzLjc2bDEwLjg4IDU4Ljg4YzEzNi45Ni04Ljk2IDI2MC40OC0yMS43NiAzNzEuODQtMzguNCA4Ljk2IDE5LjIgMTcuMjggMzkuNjggMjYuMjQgNjAuMTZsNTYuOTYtMjUuNmExMzUxLjA0IDEzNTEuMDQgMCAwIDAtMTE5LjY4LTIyMC4xNnpNNjIwLjggMjQzLjg0bC01MS44NCAyOS40NGMzNi40OCAxMjQuOCAxMDEuMTIgMjI2LjU2IDE5My45MiAzMDUuOTJsNDMuNTItNDkuOTJjLTg4LjMyLTczLjYtMTQ5Ljc2LTE2OC45Ni0xODUuNi0yODUuNDR6IiBmaWxsPSIjRkY5NDNFIiBwLWlkPSIyODg2OSI+PC9wYXRoPjwvc3ZnPg==');
diff --git a/pages/mine/mineIndex/mine.js b/pages/mine/mineIndex/mine.js
index 1676e8e..c523ee4 100644
--- a/pages/mine/mineIndex/mine.js
+++ b/pages/mine/mineIndex/mine.js
@@ -21,6 +21,8 @@ Page({
*/
data: {
localAssets: app.globalData.localAssets,
+ imgAssets:app.globalData.imgAssetsUrl,
+ appTitle: app.globalData.appTitle,
statusBarHeight: statusBarHeight,
navBarHeight: navBarHeight,
totalHeight: navBarHeight, // 导航栏总高度
diff --git a/pages/mine/mineIndex/mine.wxml b/pages/mine/mineIndex/mine.wxml
index b775a01..b7fbe83 100644
--- a/pages/mine/mineIndex/mine.wxml
+++ b/pages/mine/mineIndex/mine.wxml
@@ -1,9 +1,9 @@
-
+
- AI喵著
+ {{appTitle}}
diff --git a/static/style/common.wxss b/static/style/common.wxss
index b7d5e66..411392c 100644
--- a/static/style/common.wxss
+++ b/static/style/common.wxss
@@ -19,6 +19,7 @@ page {
--text-brown-color: #42210B;
--text-gray-hint-color: #9A9A9A;
--text-gray-desc-color: #5c5c5c;
+ --text-blue-color: #3270FF;
/* 背景棕色 */
--bg-brown-color: #42210B;
--bg-gray-color: #FAFAFA;
@@ -50,6 +51,7 @@ page {
--green-color-light: #4EAF7979;
--gray-color-light: #eeeeee;
--divider-color: #F0F0F0;
+ --page-padding: 30rpx;
background: linear-gradient(to bottom, var(--bg-top-color), var(--bg-bottom-color));
background-size: 100% 100vh;
background-repeat: no-repeat;