From c88e0dfac4b69544028d57cf70f415af9f7b6fe0 Mon Sep 17 00:00:00 2001 From: itgaojian163 Date: Tue, 29 Apr 2025 17:38:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E5=8F=96=E9=A2=9C=E8=89=B2=E5=8F=98?= =?UTF-8?q?=E9=87=8F,=E9=A6=96=E9=A1=B5,=E7=99=BB=E5=BD=95=E9=A1=B5,?= =?UTF-8?q?=E6=88=91=E7=9A=84=E9=A1=B5=E9=9D=A2=E9=A2=9C=E8=89=B2=E5=8F=98?= =?UTF-8?q?=E9=87=8F=E4=BF=AE=E6=94=B9,url=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.js | 34 +-- app.wxss | 18 +- .../container-loading/container-loading.wxss | 4 +- components/down-progress/down-progress.wxss | 8 +- components/tabbar/custom-tabbar.js | 3 +- components/tabbar/custom-tabbar.wxml | 2 +- components/tabbar/custom-tabbar.wxss | 1 + net/api/projectApi.js | 2 +- net/http.js | 23 +- net/mainUrl.js | 16 ++ pages/index/index.js | 12 +- pages/index/index.wxml | 11 +- pages/index/index.wxss | 78 ++++--- pages/login/login.js | 2 + pages/login/login.wxml | 2 +- pages/login/login.wxss | 25 ++- pages/mainPage/mainPage.js | 4 +- pages/mainPage/mainPage.wxml | 207 +++++++++--------- pages/mainPage/mainPage.wxss | 72 +++--- .../minePayRecord/minePayRecord.js | 2 +- pages/mine/mineIndex/mine.js | 12 +- pages/mine/mineIndex/mine.wxml | 2 +- pages/mine/mineIndex/mine.wxss | 23 +- static/style/common.wxss | 36 +++ 24 files changed, 320 insertions(+), 279 deletions(-) create mode 100644 net/mainUrl.js create mode 100644 static/style/common.wxss diff --git a/app.js b/app.js index 61ed34c..fb9fe3d 100644 --- a/app.js +++ b/app.js @@ -1,10 +1,14 @@ // app.js +import { + imgAssets +} from './net/http' App({ globalData: { - userInfo: null, - isAdPopupVisible: false + imgAssetsUrl: imgAssets, + localAssets: "/static/images" }, onLaunch() { + //自定义字体 // wx.loadFontFace({ // family: 'PingFang-regular', // global: true, @@ -34,29 +38,5 @@ App({ // }) // } // } - // this.initSse() - }, - // initSse() { - // const req = wx.request({ - // url: copyrightUrl + '/api/sse/connect', - // method: 'GET', - // enableChunked: true, - // header: { - // 'Cache-Control': 'no-cache', - // 'Accept': 'text/event-stream' - // }, - // success: (res) => { - // console.log('SSE 连接成功', res); - // }, - // fail: (err) => { - // console.error('SSE 连接失败', err); - // } - // }) - // const listener = data => { - // // data为返回的数据,可以在此对数据进行处理 - // console.log(data) - // } - // // 监听服务端返回的数据 - // req.onChunkReceived(listener) - // } + } }) \ No newline at end of file diff --git a/app.wxss b/app.wxss index 7504e84..b4fd5fc 100644 --- a/app.wxss +++ b/app.wxss @@ -1,11 +1,6 @@ /**自定义CheckBox**/ @import "/static/style/icon.wxss"; - -page { - background: linear-gradient(to bottom, #F0F0F0, #FFFFFF); - background-size: 100% 100vh; - background-repeat: no-repeat; -} +@import "/static/style/common.wxss"; .page-container { display: flex; @@ -24,7 +19,6 @@ page { display: flex; align-items: center; background-color: transparent; - /* box-shadow: 0 2rpx 4rpx rgba(0, 0, 0, 0.05); */ } /* 标题 */ @@ -55,13 +49,13 @@ page { .star::after { content: "*"; - color: red; + color: var(--red-color); margin-left: 6rpx; } .gray-star::after { content: '*'; - color: #525252; + color: var(--text-color); margin-left: 6rpx; } @@ -147,14 +141,14 @@ page { margin-top: 5rpx; width: 90%; height: 3rpx; - background-color: #F0F0F0; + background-color: var(--divider-color); align-self: center; } .divider-h { width: 1px; height: 10px; - background-color: #e7e4e4; + background-color: var(--divider-color); padding: 0px 1px; margin-left: 10px; align-self: center; @@ -162,7 +156,7 @@ page { .divider-v-100 { height: 1rpx; - background-color: #F0F0F0; + background-color: var(--divider-color); width: 100%; } diff --git a/components/container-loading/container-loading.wxss b/components/container-loading/container-loading.wxss index 1ea2e9a..02889b7 100644 --- a/components/container-loading/container-loading.wxss +++ b/components/container-loading/container-loading.wxss @@ -62,8 +62,8 @@ 100% { transform: scale(1.2) translateY(-25px) rotateX(45deg); - background: #FE9944; - box-shadow: 0 25px 40px #FE9944; + background: var(--primary-color); + box-shadow: 0 25px 40px var(--primary-color); } } diff --git a/components/down-progress/down-progress.wxss b/components/down-progress/down-progress.wxss index 6b159d6..cbb1baf 100644 --- a/components/down-progress/down-progress.wxss +++ b/components/down-progress/down-progress.wxss @@ -24,7 +24,7 @@ .progress { margin-top: 10px; - color: #FE9944; + color: var(--primary-color); } .hint-text { @@ -38,7 +38,7 @@ width: 48px; height: 48px; animation: satellite 3s infinite linear; - border: 1px solid #FE9944; + border: 1px solid var(--primary-color); border-radius: 100%; } @@ -51,8 +51,8 @@ height: 12px; content: ""; border-radius: 100%; - background-color: #FE9944; - box-shadow: 0 0 10px #FE9944; + background-color: var(--primary-color); + box-shadow: 0 0 10px var(--primary-color); } .loading:after { diff --git a/components/tabbar/custom-tabbar.js b/components/tabbar/custom-tabbar.js index f116dff..ee62083 100644 --- a/components/tabbar/custom-tabbar.js +++ b/components/tabbar/custom-tabbar.js @@ -28,10 +28,9 @@ Component({ }, methods: { switchTab(e) { - console.log('点击了') const index = e.currentTarget.dataset.index; const pagePath = this.data.tabList[index].pagePath; - console.log(index, pagePath) + console.info('tabbar切换', index, pagePath) wx.switchTab({ url: '/' + pagePath }); diff --git a/components/tabbar/custom-tabbar.wxml b/components/tabbar/custom-tabbar.wxml index 480edb9..d71119a 100644 --- a/components/tabbar/custom-tabbar.wxml +++ b/components/tabbar/custom-tabbar.wxml @@ -1,5 +1,5 @@ - + {{item.text}} diff --git a/components/tabbar/custom-tabbar.wxss b/components/tabbar/custom-tabbar.wxss index 0f46d84..61a8c2e 100644 --- a/components/tabbar/custom-tabbar.wxss +++ b/components/tabbar/custom-tabbar.wxss @@ -16,6 +16,7 @@ flex-direction: column; align-items: center; justify-content: center; + flex: 1; } .tabbar-icon { diff --git a/net/api/projectApi.js b/net/api/projectApi.js index c2fce95..46dd463 100644 --- a/net/api/projectApi.js +++ b/net/api/projectApi.js @@ -76,7 +76,7 @@ class ProjectService { //获取使用规则数据 static doGetRuleDate(id) { const path = apiPath.ruleData.replace('{id}', id) - return request(path, "GET", null, null, "online", false) + return request(path, "GET", null, null, "operator", false) } static doGetInvestDetail(data) { return request(apiPath.investDetail, "GET", data) diff --git a/net/http.js b/net/http.js index 2fa0cb9..0eea9b5 100644 --- a/net/http.js +++ b/net/http.js @@ -1,13 +1,13 @@ const Cache = require('../utils/storage'); -// 定义api服务地址 -// const baseUrl = 'https://www.xzszwhy.cn/daqi/app'; -const operatorUrl = 'https://www.aimzhu.com/operator'; -const operatorPlug = 'https://www.aimzhu.com/operator-plugin' -// const operatorPlug = 'http://192.168.0.15:8099/operator-plugin' -// const operatorUrl = 'https://www.aimzhu.com/operator'; -const copyrightUrl = 'https://www.aimzhu.com/copyright'; -const uploadImgUrl = copyrightUrl + '/api/file/v2/upload-image' -const previewUrl = copyrightUrl + '/route/file/v2/download/true/' +import { + operatorUrl, + operatorPlug, + uploadImgUrl, + previewUrl, + copyrightUrl, + imgAssets +} from '../net/mainUrl' + /** * 传入请求参数,返回Promise支持链试调用 * @param url 请求地址 @@ -33,8 +33,6 @@ function request(url, method = "GET", data = {}, params = {}, project = "copyrig baseUrl = operatorUrl } else if (project == 'copyright') { baseUrl = copyrightUrl - } else if (project == 'online') { - baseUrl = 'https://www.aimzhu.com/operator' } else if (project == 'plug') { baseUrl = operatorPlug } @@ -83,5 +81,6 @@ export { request, uploadImgUrl, previewUrl, - copyrightUrl + copyrightUrl, + imgAssets } \ No newline at end of file diff --git a/net/mainUrl.js b/net/mainUrl.js new file mode 100644 index 0000000..ccc2c14 --- /dev/null +++ b/net/mainUrl.js @@ -0,0 +1,16 @@ +// 定义api服务地址 +const operatorUrl = 'https://www.aimzhu.com/operator'; +const operatorPlug = 'https://www.aimzhu.com/operator-plugin' +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' + +export { + operatorUrl, + operatorPlug, + uploadImgUrl, + previewUrl, + copyrightUrl, + imgAssets +} \ No newline at end of file diff --git a/pages/index/index.js b/pages/index/index.js index fb89887..c29969e 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -18,6 +18,8 @@ const screenWidth = screenInfo.screenWidth const windowHeight = screenInfo.windowHeight - navBarHeight - statusBarHeight; //可用内容高度 Page({ data: { + imgAssets: app.globalData.imgAssetsUrl, + localAssets: app.globalData.localAssets, statusBarHeight: statusBarHeight, navBarHeight: navBarHeight, totalHeight: navBarHeight, // 导航栏总高度 @@ -83,20 +85,18 @@ Page({ tabList: [{ "pagePath": "pages/index/index", "text": "首页", - "iconPath": "/static/images/ic_home_normal.png", - "selectedIconPath": "/static/images/ic_home_select.png", + "iconPath": app.globalData.localAssets + "/ic_home_normal.png", + "selectedIconPath": app.globalData.localAssets + "/ic_home_select.png", "selected": true }, { "pagePath": "pages/mine/mineIndex/mine", "text": "我的", - "iconPath": "/static/images/ic_mine_normal.png", - "selectedIconPath": "/static/images/ic_mine_select.png", + "iconPath": app.globalData.localAssets + "/ic_mine_normal.png", + "selectedIconPath": app.globalData.localAssets + "/ic_mine_select.png", "selected": false } ], - color: "#515151", - selectedColor: "#FE9944", }, onLoad(e) { const _self = this diff --git a/pages/index/index.wxml b/pages/index/index.wxml index 8412c28..db0c59b 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -1,8 +1,8 @@ - + - + AI喵著 @@ -77,7 +77,8 @@ {{item.projName}} - {{item.pay.servicePackageId != '' ? '套餐包':'¥'+(item.pay.payment/100)}} + 套餐包 + @@ -99,7 +100,7 @@ - + 资料下载 @@ -161,6 +162,6 @@ - + \ No newline at end of file diff --git a/pages/index/index.wxss b/pages/index/index.wxss index 1d06fd9..9a36fc6 100644 --- a/pages/index/index.wxss +++ b/pages/index/index.wxss @@ -1,5 +1,4 @@ .bg-title { - background-image: url('https://www.aimzhu.com/miniapp-assets/main_bg.png'); background-size: cover; background-repeat: no-repeat; background-position: center; @@ -40,14 +39,15 @@ justify-content: center; align-items: center; flex: 2.5; - background-color: #FFE5BC; - color: #550101; + background-color: var(--btn-primary-color); + color: var(--text-brown-color); border-radius: 10rpx; + font-weight: bold; text-align: center; } .create-btn:active { - background-color: #ffe5bc79; + background-color: var(--btn-primary-color-active); } .buy-btn { @@ -56,7 +56,7 @@ width: 80px; height: 78px; border-radius: 4px; - background-color: rgba(78, 175, 121, 1); + background-color: var(--btn-green-color); color: rgba(255, 255, 255, 1); font-size: 18px; text-align: center; @@ -64,7 +64,7 @@ } .buy-btn:active { - background-color: rgba(78, 175, 121, .3); + background-color: var(--btn-green-color-active); } .notice-box { @@ -120,12 +120,12 @@ width: 16rpx; height: 34rpx; border-radius: 34rpx; - background-color: rgba(255, 169, 0, 1); + background-color: var(--primary-color); } .list-title-txt { line-height: 23px; - color: rgba(16, 16, 16, 1); + color: var(--text-color); font-size: 16px; font-family: TaipeiHei-bold; font-weight: bold; @@ -145,21 +145,21 @@ .btn-select { line-height: 20px; - background-color: rgba(244, 206, 152, 0.18); - color: rgba(233, 157, 66, 1); + background-color: var(--primary-color-light); + color: var(--primary-color); font-size: 14px; text-align: center; padding: 5px; - border: 1px solid rgba(244, 206, 152, 0.18); + border: 1px solid var(--primary-color-light); } .btn-normal { line-height: 20px; - background-color: rgba(255, 255, 255, 1); - color: rgba(16, 16, 16, 1); + background-color: var(--white-color); + color: var(--text-color); font-size: 14px; text-align: center; - border: 1px solid rgba(248, 248, 248, 1); + border: 1px solid var(--divider-color); padding: 5px; } @@ -173,8 +173,8 @@ white-space: nowrap; line-height: 17px; border-radius: 2px; - background-color: rgba(255, 226, 168, 0.57); - color: rgba(93, 57, 0, 1); + background-color: var(--btn-primary-color); + color: var(--text-brown-color); font-size: 12px; text-align: center; padding: 2px 5px; @@ -213,7 +213,7 @@ display: flex; flex-direction: row; justify-content: space-between; - background-color: #F7F7F7; + background-color: var(--gray-bg-color); border-radius: 2px; padding: 5px; align-items: center; @@ -248,23 +248,23 @@ } .status-gray { - background-color: #adadadc0; - color: black; + background-color: var(--gray-color-light); + color: var(--text-color); } .status-green { - background-color: #AFE5C7; - color: black; + background-color: var(--green-color-light); + color: var(--text-color); } .status-yellow { - background-color: #fe9844c0; - color: black; + background-color: var(--primary-color-light); + color: var(--text-color); } .status-red { - background-color: #FF0000C0; - color: white; + background-color: var(--red-color-light); + color: var(--white-color); } .item-content { @@ -298,11 +298,10 @@ } .project-status { - font-size: 12px; + font-size: 24rpx; color: rgba(16, 16, 16, 1); - font-weight: 400; + font-weight: bold; flex: .3; - padding-left: 5px; text-align: center; white-space: nowrap; } @@ -343,44 +342,41 @@ .project-create-time { font-size: 26rpx; - color: #4f4f4f; + color: var(--text-color); } .project-btn { font-size: 24rpx; - background-color: #FE9944; + background-color: var(--primary-color); color: white; padding: 2px 10px; border-radius: 10rpx; } .project-btn:active { - background-color: #fe9844d5; + background-color: var(--primary-color-active); } .project-re-btn { font-size: 12px; - background-color: rgba(255, 0, 0, 0.486); + background-color: var(--red-color); color: white; padding: 2px 5px; border-radius: 5px; } .project-re-btn:active { - background-color: rgba(255, 0, 0, 0.301); + background-color: var(--red-color-light); } .project-btn-no { font-size: 28rpx; - background-color: rgba(239, 239, 239, 1); + background-color: var(--gray-color); color: white; padding: 8rpx 30rpx 8rpx 30rpx; border-radius: 10rpx; } -.project-btn:active { - background-color: #fe994479; -} .marquee-container { width: 100%; @@ -392,7 +388,7 @@ .marquee-text { display: inline-block; animation: marquee 25s linear infinite; - color: rgba(85, 0, 0, 1); + color: var(--text-brown-color); font-size: 24rpx; margin-left: 15px; transform: translateX(100%); @@ -418,7 +414,7 @@ justify-content: space-between; align-items: center; padding: 10px; - background-color: white; + background-color: var(--white-color); border-radius: 5px; height: 80px; } @@ -541,7 +537,7 @@ word-break: break-all; width: 85vw; font-size: 14px; - color: rgba(114, 197, 245, 0.692); + color: var(--blue-color); } .custom-tips { @@ -551,7 +547,7 @@ .hint { font-size: 14px; text-align: center; - color: rgb(248, 185, 50); + color: var(--primary-color); font-weight: bold; } diff --git a/pages/login/login.js b/pages/login/login.js index 28bd06c..fa24562 100644 --- a/pages/login/login.js +++ b/pages/login/login.js @@ -1,12 +1,14 @@ // pages/login/login.js import UserService from '../../net/api/userApi'; const Cache = require('../../utils/storage'); +const app = getApp() Page({ /** * 页面的初始数据 */ data: { + imgAssets: app.globalData.imgAssetsUrl, isChecked: false, hintText: "获取电话号码", openId: '', diff --git a/pages/login/login.wxml b/pages/login/login.wxml index daceefe..9a24595 100644 --- a/pages/login/login.wxml +++ b/pages/login/login.wxml @@ -1,5 +1,5 @@