diff --git a/api/fetch.js b/api/fetch.js
index 848bd68..87ed77c 100644
--- a/api/fetch.js
+++ b/api/fetch.js
@@ -1,7 +1,7 @@
import api from './api.js'
const fetch = (key, data = {}, transform = true, loadingTitle) => {
- return new Promise(resolve => {
+ return new Promise((resolve, reject) => {
const callback = (res) => {
if (!transform) {
diff --git a/components/serve/serveModuleCard.vue b/components/serve/serveModuleCard.vue
index cb66bc3..362d2c6 100644
--- a/components/serve/serveModuleCard.vue
+++ b/components/serve/serveModuleCard.vue
@@ -1,5 +1,6 @@
+
@@ -7,7 +8,6 @@
-
@@ -34,11 +34,6 @@
list: [],
}
},
- computed: {
- style() {
- return this.isFold ? '' : 'position: absolute; top: 0; left: 0; width: 100%;'
- }
- },
methods: {
async getData() {
try {
@@ -79,13 +74,11 @@
}
.list {
- padding: 90rpx 20rpx 0 12rpx;
+ padding: 0 12rpx;
box-sizing: border-box;
&-item {
- & + & {
- margin-top: 26rpx;
- }
+ margin-top: 26rpx;
}
}
\ No newline at end of file
diff --git a/components/serve/serveModuleView.vue b/components/serve/serveModuleView.vue
index 4a23c58..c7bb726 100644
--- a/components/serve/serveModuleView.vue
+++ b/components/serve/serveModuleView.vue
@@ -1,19 +1,11 @@
-
-
-
-
-
-
-
- {{ data.title }}
-
-
-
-
+
+
+
+
@@ -58,46 +50,35 @@ export default {
\ No newline at end of file
diff --git a/components/serve/serveSecondModuleCard.vue b/components/serve/serveSecondModuleCard.vue
index 97bd416..7aef196 100644
--- a/components/serve/serveSecondModuleCard.vue
+++ b/components/serve/serveSecondModuleCard.vue
@@ -1,12 +1,6 @@
-
-
- {{ data.title }}
-
-
-
-
+
@@ -31,41 +25,20 @@
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 7c23fc6..a8f1382 100644
--- a/pages.json
+++ b/pages.json
@@ -44,8 +44,6 @@
"path": "case/index"
}, {
"path": "case/poster"
- }, {
- "path": "serve/category"
}, {
"path": "serve/search"
}, {
diff --git a/pages/index/case.vue b/pages/index/case.vue
index 93acb8f..3c19f9d 100644
--- a/pages/index/case.vue
+++ b/pages/index/case.vue
@@ -1,7 +1,7 @@
-
+
@@ -157,18 +157,18 @@
.header {
margin-bottom: 32rpx;
- padding-top: calc(var(--status-bar-height) + 40rpx);
+ padding-top: calc(var(--status-bar-height) + 60rpx);
justify-content: space-between;
.title {
font-size: 44rpx;
- font-weight: 600;
+ font-weight: 700;
color: #6851A7;
}
.desc {
- font-size: 18rpx;
- font-weight: 500;
+ font-size: 22rpx;
+ font-weight: 600;
color: #808080;
}
diff --git a/pages/index/center.vue b/pages/index/center.vue
index 0fd8f08..da64018 100644
--- a/pages/index/center.vue
+++ b/pages/index/center.vue
@@ -1,7 +1,7 @@
-
+
@@ -12,14 +12,6 @@
{{ configList.page_center_title }}
{{ configList.page_center_desc }}
-
-
-
-
-
-
-
-
@@ -50,21 +42,11 @@
},
data() {
return {
- bannerList: [],
}
},
onLoad() {
- this.fetchBanner()
},
methods: {
- // 获取轮播图
- async fetchBanner() {
- try {
- this.bannerList = (await this.$fetch('queryBannerList', { type: '3' }))?.records // type:0-首页 1-案例 2-服务 3-其他
- } catch (err) {
-
- }
- },
jumpToDetail(paramCode) {
uni.navigateTo({
url: `/pages_order/center/serve?paramCode=${paramCode}`
@@ -83,18 +65,18 @@
}
.header {
- padding-top: calc(var(--status-bar-height) + 40rpx);
+ padding-top: calc(var(--status-bar-height) + 60rpx);
justify-content: space-between;
.title {
font-size: 44rpx;
- font-weight: 600;
+ font-weight: 700;
color: #6851A7;
}
.desc {
- font-size: 18rpx;
- font-weight: 500;
+ font-size: 22rpx;
+ font-weight: 600;
color: #808080;
}
@@ -162,6 +144,7 @@
}
.list {
+ margin-top: 60rpx;
padding: 0 38rpx;
&-item {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 520da59..c596206 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,7 +1,7 @@
-
+
@@ -129,7 +129,6 @@
uni.navigateTo({
url: '/pages_order/thesis/search?search=' + this.keyword
})
- this.keyword = ''
},
jumpToCategory(categoryOne, categoryTwo, title, api) {
uni.navigateTo({
@@ -149,18 +148,18 @@
}
.header {
- padding-top: calc(var(--status-bar-height) + 40rpx);
+ padding-top: calc(var(--status-bar-height) + 60rpx);
justify-content: space-between;
.title {
font-size: 44rpx;
- font-weight: 600;
+ font-weight: 700;
color: #6851A7;
}
.desc {
- font-size: 18rpx;
- font-weight: 500;
+ font-size: 22rpx;
+ font-weight: 600;
color: #808080;
}
@@ -335,7 +334,7 @@
column-gap: 12rpx;
padding: 8rpx 24rpx 8rpx 26rpx;
font-size: 20rpx;
- font-weight: 400;
+ font-weight: 600;
color: #6851A7;
background: #FFFFFF;
border-radius: 20rpx;
diff --git a/pages/index/serve.vue b/pages/index/serve.vue
index 10c9b65..effdaca 100644
--- a/pages/index/serve.vue
+++ b/pages/index/serve.vue
@@ -1,7 +1,7 @@
-
+
@@ -25,20 +25,6 @@
-
-
-
-
@@ -71,31 +57,18 @@
pid: '0',
},
mixinsListApi: 'queryCategoryServiceModuleList',
- bannerList: [],
firstCategoryList: [],
}
},
onLoad() {
- // this.fetchBanner()
this.getData()
},
methods: {
- // 获取轮播图
- async fetchBanner() {
- try {
- this.bannerList = (await this.$fetch('queryBannerList', { type: '2' }))?.records // type:0-首页 1-案例 2-服务 3-其他
- } catch (err) {
-
- }
- },
search() {
- // todo
- },
- jumpToSecondCategory(pid, title) {
uni.navigateTo({
- url: `/pages_order/serve/category?pid=${pid}&title=${title}`
+ url: `/pages_order/serve/search?search=${this.keyword}`
})
- },
+ },
},
}
@@ -111,18 +84,18 @@
.header {
margin-bottom: 32rpx;
- padding-top: calc(var(--status-bar-height) + 40rpx);
+ padding-top: calc(var(--status-bar-height) + 60rpx);
justify-content: space-between;
.title {
font-size: 44rpx;
- font-weight: 600;
+ font-weight: 700;
color: #6851A7;
}
.desc {
- font-size: 18rpx;
- font-weight: 500;
+ font-size: 22rpx;
+ font-weight: 600;
color: #808080;
}
@@ -221,7 +194,7 @@
}
.list {
- padding: 0 28rpx 0 32rpx;
+ padding: 0 38rpx;
&-item {
& + & {
diff --git a/pages_order/serve/category.vue b/pages_order/serve/category.vue
deleted file mode 100644
index 6082600..0000000
--- a/pages_order/serve/category.vue
+++ /dev/null
@@ -1,80 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pages_order/serve/search.vue b/pages_order/serve/search.vue
index 6516d90..d8b66c7 100644
--- a/pages_order/serve/search.vue
+++ b/pages_order/serve/search.vue
@@ -36,11 +36,19 @@
},
onLoad(arg) {
- const { categoryId, title } = arg
+ const { categoryId, search, title } = arg
- this.title = title
+ if (title) {
+ this.title = title
+ }
+
+ if (categoryId) {
+ this.queryParams.categoryId = categoryId
+ }
- this.queryParams.categoryId = categoryId
+ if (search) {
+ this.queryParams.title = search
+ }
this.getData()
},
diff --git a/pages_order/thesis/search.vue b/pages_order/thesis/search.vue
index 06d1f11..78fcb31 100644
--- a/pages_order/thesis/search.vue
+++ b/pages_order/thesis/search.vue
@@ -2,7 +2,7 @@
-
+
diff --git a/pages_order/thesis/thesisInfoView.vue b/pages_order/thesis/thesisInfoView.vue
index fe4c3c1..e642882 100644
--- a/pages_order/thesis/thesisInfoView.vue
+++ b/pages_order/thesis/thesisInfoView.vue
@@ -7,8 +7,8 @@
{{ data.shortTitle || '' }}
-
-
+
+
{{ item }}
@@ -27,7 +27,12 @@
return {}
}
}
- }
+ },
+ computed: {
+ tags() {
+ return this.data?.tag?.split?.('、') || []
+ }
+ },
}
@@ -65,12 +70,12 @@
row-gap: 8rpx;
&-item {
- padding: 4rpx 8rpx;
+ padding: 4rpx 10rpx;
font-size: 16rpx;
font-weight: 700;
color: #FFFFFF;
background: rgba($color: #6851A7, $alpha: 0.59);
- border-radius: 10rpx;
+ border-radius: 4rpx;
}
}
diff --git a/static/image/bg-index.png b/static/image/bg-index.png
deleted file mode 100644
index 5c5ed1f..0000000
Binary files a/static/image/bg-index.png and /dev/null differ
diff --git a/static/image/bg-serve-1.png b/static/image/bg-serve-1.png
deleted file mode 100644
index d58a0fd..0000000
Binary files a/static/image/bg-serve-1.png and /dev/null differ
diff --git a/static/image/bg-serve-2.png b/static/image/bg-serve-2.png
deleted file mode 100644
index 9e20163..0000000
Binary files a/static/image/bg-serve-2.png and /dev/null differ
diff --git a/static/image/bg-serve.png b/static/image/bg-serve.png
deleted file mode 100644
index e5b1be4..0000000
Binary files a/static/image/bg-serve.png and /dev/null differ