diff --git a/App.vue b/App.vue
index 839c098..0bb195b 100644
--- a/App.vue
+++ b/App.vue
@@ -61,9 +61,8 @@
this.getBannerList(),
this.getPricePreviewList(),
this.getConfigData(),
- this.getQrCode()
]
-
+ this.getQrCode()
await Promise.all(promises)
// 确保进度达到100%
diff --git a/api/model/recyclingDestination.js b/api/model/recyclingDestination.js
new file mode 100644
index 0000000..e7d7615
--- /dev/null
+++ b/api/model/recyclingDestination.js
@@ -0,0 +1,23 @@
+
+const api = {
+ // 获取回收去向
+ getRecyclingDestination: {
+ url: '/recycle-admin/applet/index/getRecyclingDestination',
+ method: 'GET',
+ auth : false,
+ },
+ // 获取回收去向详情
+ getRecyclingDestinationDetail: {
+ url: '/recycle-admin/applet/index/getRecyclingDestinationDetail',
+ method: 'GET',
+ auth : false,
+ },
+ // 联系客服问题相关详情
+ getQuestionListDetail: {
+ url: '/recycle-admin/applet/index/getQuestionListDetail',
+ method: 'GET',
+ auth : false,
+ },
+}
+
+export default api
\ No newline at end of file
diff --git a/compoent/base/kefu.vue b/compoent/base/kefu.vue
new file mode 100644
index 0000000..d109bc1
--- /dev/null
+++ b/compoent/base/kefu.vue
@@ -0,0 +1,63 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/compoent/base/navbar.vue b/compoent/base/navbar.vue
new file mode 100644
index 0000000..34d6fee
--- /dev/null
+++ b/compoent/base/navbar.vue
@@ -0,0 +1,143 @@
+
+
+
+
+
+
+
+
+
+ {{ title }}
+
+
+
+
+
+
+
+
+
+ {{ moreText }}
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/compoent/base/tabbar.vue b/compoent/base/tabbar.vue
new file mode 100644
index 0000000..9c70362
--- /dev/null
+++ b/compoent/base/tabbar.vue
@@ -0,0 +1,134 @@
+
+
+
+
+
+
+
+
+ {{ item.title }}
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/config.js b/config.js
index 081fdcd..eba31b4 100644
--- a/config.js
+++ b/config.js
@@ -2,6 +2,9 @@
const type = 'dev'
const config = {
+ local: {
+ baseUrl: 'http://127.0.0.1',
+ },
dev: {
baseUrl: 'http://h5.xzaiyp.top',
},
diff --git a/pages.json b/pages.json
index f3fffc4..b0a608a 100644
--- a/pages.json
+++ b/pages.json
@@ -31,6 +31,23 @@
}
],
"subPackages": [
+ {
+ "root": "pages/mine",
+ "pages": [
+ {
+ "path": "recyclingDestination",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "questionDetail",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ }
+ ]
+ },
{
"root": "pages/subcomponent",
"pages": [
diff --git a/pages/baoyou-city/baoyou-city.vue b/pages/baoyou-city/baoyou-city.vue
index e883fff..a8aa39a 100644
--- a/pages/baoyou-city/baoyou-city.vue
+++ b/pages/baoyou-city/baoyou-city.vue
@@ -9,7 +9,9 @@
-
+
@@ -65,6 +67,12 @@ export default {
}
});
},
+ computed: {
+ city_banner() {
+ const item = getApp().globalData.configData.find(i => i.keyName === 'city_banner')
+ return item ? item.keyContent : ''
+ }
+ },
methods: {
goBack() {
uni.navigateBack()
diff --git a/pages/component/home.vue b/pages/component/home.vue
index 5ab01c0..8ff9bd7 100644
--- a/pages/component/home.vue
+++ b/pages/component/home.vue
@@ -8,7 +8,7 @@
:interval="3000"
:duration="500"
circular
- style="width: 100%; height: 380rpx;"
+ style="width: 100%; height: 320rpx;"
>
-
+
{{item.title}}
- {{item.desc}}
+ {{item.description}}
@@ -197,22 +200,22 @@ export default {
{
icon: '/static/home/爱心援乡.png',
title: '爱心援乡',
- desc: '精准帮扶贫困群体'
+ description: '精准帮扶贫困群体'
},
{
icon: '/static/home/回塑新源.png',
title: '回塑新源',
- desc: '塑料的第二次成型'
+ description: '塑料的第二次成型'
},
{
icon: '/static/home/织物出海.png',
title: '织物出海',
- desc: '分拣出最高价值'
+ description: '分拣出最高价值'
},
{
icon: '/static/home/碳循再生.png',
title: '碳循再生',
- desc: '减碳从出发生系统'
+ description: '减碳从出发生系统'
}
],
bannerList: [],
@@ -336,6 +339,12 @@ export default {
}
})
},
+ getRecyclingDestination() {
+ this.$api('getRecyclingDestination')
+ .then(res => {
+ this.destinations = res.result
+ })
+ },
goToInspectionReport(item) {
uni.navigateTo({
url: `/pages/subcomponent/inspection-report?id=${item.id}`
@@ -415,6 +424,7 @@ export default {
// 监听全局数据更新
uni.$on('configDataUpdated', this.updateCionData);
this.getPricePreview();
+ this.getRecyclingDestination()
},
}
@@ -435,7 +445,7 @@ export default {
.banner {
width: 100%;
- height: 390rpx;
+ height: 330rpx;
position: relative;
overflow: hidden;
border-radius: 0 0 30rpx 30rpx;
diff --git a/pages/component/my.vue b/pages/component/my.vue
index c309849..0518940 100644
--- a/pages/component/my.vue
+++ b/pages/component/my.vue
@@ -393,8 +393,8 @@ export default {
return getApp().globalData.bannerList || []
},
myBannerImage() {
- const banner = (getApp().globalData.bannerList || []).find(item => item.title === '我的-轮播图');
- return banner ? banner.image : '';
+ const item = getApp().globalData.configData.find(i => i.keyName === 'user_banner')
+ return item ? item.keyContent : ''
},
userTypeText() {
// 0 普通用户, 1 推广达人, 2 推广大使
@@ -452,7 +452,7 @@ export default {
}
.banner {
- height: 400rpx;
+ height: 320rpx;
background: #ff6b35;
position: relative;
overflow: hidden;
diff --git a/pages/component/recycle copy.vue b/pages/component/recycle copy.vue
index 134e98e..b34939a 100644
--- a/pages/component/recycle copy.vue
+++ b/pages/component/recycle copy.vue
@@ -249,7 +249,7 @@