diff --git a/App.vue b/App.vue index 0f919b5d..7c6698c3 100644 --- a/App.vue +++ b/App.vue @@ -60,5 +60,8 @@ img { --warn-color:#F69627; --font-button-color:#fff; --font-button-size:24rpx; + --font-button-size-p:28rpx; + /* tab图标 */ + --tab-url:url('https://vespa.qxmier.com/image/tabline.png'); } \ No newline at end of file diff --git a/component/newTable.vue b/component/newTable.vue index 0cb1b761..ec549e58 100644 --- a/component/newTable.vue +++ b/component/newTable.vue @@ -14,10 +14,6 @@ @click="toggleSort" > 时间 - 累计流水 获得补贴 @@ -33,7 +29,7 @@ {{ item.total_transaction }} {{ item.subsidy_amount }} - {{ item.status_str }} + {{ item.status_str }} @@ -202,13 +198,12 @@ export default { } .status-0 { - color: #FF9900; + color: #999; } .status-1 { - color: #19be6b; + color: var(--subss-color); } - .status-2 { color: #FA3534; } diff --git a/component/tab.vue b/component/tab.vue index df8e82f1..49dc796d 100644 --- a/component/tab.vue +++ b/component/tab.vue @@ -155,7 +155,7 @@ transform: translateX(-50%); width: 80%; height: 16rpx; - background-image: url('@/static/image/propMall/tabline.png'); + background-image: var(--tab-url); background-repeat: no-repeat; background-size: 100% 100%; border-radius: 1px; diff --git a/pages/feedback/feedback.vue b/pages/feedback/feedback.vue index bc9bd474..0585cb51 100644 --- a/pages/feedback/feedback.vue +++ b/pages/feedback/feedback.vue @@ -50,7 +50,9 @@ {{item.updatetime}} - + @@ -66,7 +68,7 @@ - @@ -93,7 +95,7 @@ data() { return { logo, - icon:Icon, + icon: Icon, footerList: [{ title: '意见反馈', icon: 'mail-open' @@ -154,9 +156,9 @@ this.dataList = [] this.getUserFeedList() } - setTimeout(()=> { + setTimeout(() => { this.footerIndex = index - },500) + }, 500) }, async getUserFeedList() { await http.get('/api/Suggest/my_suggest', { @@ -255,16 +257,23 @@ width: 100vw; min-height: 100vh; background-color: #F8F8F8; - .text-content-image{ + + .text-content-image { width: calc(100% - 260rpx); position: relative; - display: inline-flex;flex-wrap: wrap;align-content: space-between; + display: inline-flex; + flex-wrap: wrap; + align-content: space-between; } - .text-content{ + + .text-content { width: 100%; position: relative; - display: inline-flex;flex-wrap: wrap;align-content: space-between; + display: inline-flex; + flex-wrap: wrap; + align-content: space-between; } + .footer { width: 100%; height: 98rpx; @@ -287,7 +296,7 @@ } .active { - color: #0DFFB9 + color: var(--primary-color); } } @@ -321,16 +330,19 @@ border-radius: 22rpx; margin-bottom: 24rpx; width: calc(100% - 48rpx); - .box-top-line{ + + .box-top-line { width: 100%; display: inline-flex; justify-content: flex-start; position: relative; } + .new-box-image { width: 240rpx; height: 184rpx; border-radius: 12rpx; + img { border-radius: 12rpx; } @@ -361,7 +373,9 @@ .confirm-button { width: 600rpx; height: 84rpx; - background: #0DFFB9; + background: var(--primary-color); + font-size: var(--font-button-size); + color: var(--font-button-color); border-radius: 106rpx; display: inline-flex; justify-content: center; diff --git a/pages/feedback/problemDetail.vue b/pages/feedback/problemDetail.vue index 109015bb..901e5c2e 100644 --- a/pages/feedback/problemDetail.vue +++ b/pages/feedback/problemDetail.vue @@ -80,7 +80,6 @@ \ No newline at end of file diff --git a/pages/union/memberList.vue b/pages/union/memberList.vue index 0fd50452..1048b43a 100644 --- a/pages/union/memberList.vue +++ b/pages/union/memberList.vue @@ -12,7 +12,7 @@ - + {{item.nickname}} diff --git a/pages/union/subsidy.vue b/pages/union/subsidy.vue index 84d01171..782194f4 100644 --- a/pages/union/subsidy.vue +++ b/pages/union/subsidy.vue @@ -18,7 +18,6 @@ {{data.name}} - {{data.status_str}} diff --git a/pages/union/unionMembers.vue b/pages/union/unionMembers.vue index 8ea7ba06..2e46c95a 100644 --- a/pages/union/unionMembers.vue +++ b/pages/union/unionMembers.vue @@ -301,8 +301,8 @@ } .confirm-button { - background: #0DFFB9; - color: #333; + background: var(--primary-color); + color: var(--font-button-color); } } diff --git a/static/image/swipers.png b/static/image/swipers.png new file mode 100644 index 00000000..d2b3144b Binary files /dev/null and b/static/image/swipers.png differ diff --git a/until/config.js b/until/config.js index d69f1725..05ed7300 100644 --- a/until/config.js +++ b/until/config.js @@ -2,12 +2,17 @@ //api 请求路径 本地 // http://chat.qxmier.com // http://vschat.qxmier.com -const BASE_URL="http://chat.qxmier.com"; +const BASE_URL="http://vschat.qxmier.com"; const PRIMARY_BGURL = "https://vespa.qxmier.com/image/fy_bg.jpg"; +// 工会管理员 +const PRIMARY_BLYURL = "https://vespa.qxmier.com/image/fy_gly.png"; //IM app_key const IM_APP_TOKEN="67962a777e2b13bc6a4bde3ccd389d1e"; +const BASR_COLOR = '#6C49E4'; export default { BASE_URL, IM_APP_TOKEN, - PRIMARY_BGURL + PRIMARY_BGURL, + PRIMARY_BLYURL, + BASR_COLOR } \ No newline at end of file diff --git a/until/request.js b/until/request.js index 3575d463..a3e63ea5 100644 --- a/until/request.js +++ b/until/request.js @@ -1,9 +1,9 @@ // src/utils/http.js import axios from 'axios'; - +// const {BASE_URL} from "@/until/config.js"; // 创建axios实例 const http = axios.create({ - baseURL: 'https://chat.qxmier.com', // API的基础路径 + baseURL: "http://vschat.qxmier.com", // API的基础路径 timeout: 5000 // 请求超时时间 });