diff --git a/api/api.js b/api/api.js
index 7093644..4c66761 100644
--- a/api/api.js
+++ b/api/api.js
@@ -11,11 +11,11 @@ const config = {
// limit : 1000
// },
- // getConfig: {
- // url: '/api/getConfig',
- // method: 'GET',
- // limit: 500
- // },
+ getConfig: {
+ url: '/info/queryConfigList',
+ method: 'GET',
+ limit: 500
+ },
// 微信登录接口
diff --git a/components/list/scenicSpot - 副本.vue b/components/list/scenicSpot - 副本.vue
new file mode 100644
index 0000000..1d0166a
--- /dev/null
+++ b/components/list/scenicSpot - 副本.vue
@@ -0,0 +1,211 @@
+
+
+
+
+
+
+
+
+
+
+ {{ item.spotName }}
+
+
+
+
+ 查看详情
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/components/list/scenicSpot.vue b/components/list/scenicSpot.vue
index 1d0166a..5e78dd3 100644
--- a/components/list/scenicSpot.vue
+++ b/components/list/scenicSpot.vue
@@ -14,18 +14,6 @@
{{ item.spotName }}
-
-
-
- 查看详情
-
-
-
-
-
-
@@ -131,20 +119,18 @@
flex-wrap: wrap;
margin-right: 20rpx;
.video-item {
- background-color: #fff;
position: relative;
- width: calc(50% - 20rpx);
+ width: calc(25% - 20rpx);
margin-left: 20rpx;
margin-top: 20rpx;
.image {
position: relative;
width: 100%;
- height: 420rpx;
overflow: hidden;
image {
width: 100%;
- height: 420rpx;
+ height: 120rpx;
border-radius: 30rpx;
}
@@ -166,10 +152,6 @@
font-size: 30rpx;
display: flex;
justify-content: space-between;
- position: absolute;
- bottom: 0;
- left: 0;
- background-color: #ffffffaa;
width: calc(100% - 40rpx);
padding: 30rpx;
font-weight: 900;
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 3206cca..5d510ae 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -24,7 +24,7 @@
+ :col="5">
+
+
+
+ 无忧服务
+
+
+
+
- 景徳镇的景点
+ 精彩推荐
@@ -118,11 +127,11 @@
title : '我要帮助',
path : '/pages_order/service/help',
},
- {
- icon : '/static/image/home/g8.png',
- title : '无忧服务',
- path : '/pages_order/service/carefree',
- },
+ // {
+ // icon : '/static/image/home/g8.png',
+ // title : '无忧服务',
+ // path : '/pages_order/service/carefree',
+ // },
{
icon : '/static/image/home/g6.png',
title : '申遗新闻',
@@ -142,8 +151,14 @@
],
productList: [],
keyword : '',
+ config_new_image : '',
}
},
+ onLoad() {
+ uni.$on('getConfig', state => {
+ this.config_new_image = state.configList.config_new_image
+ })
+ },
computed : {
},
onPullDownRefresh(){
@@ -227,6 +242,36 @@
}
}
+ .index_box{
+ display: flex;
+ padding: 30rpx;
+ gap: 30rpx;
+ align-items: center;
+ .image{
+ height: 200rpx;
+ width: 450rpx;
+ border-radius: 10rpx;
+ }
+ .index_box_grid{
+ width: 200rpx;
+ height: 200rpx;
+ background-color: $uni-color;
+ border-radius: 10rpx;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+ gap: 16rpx;
+ .text{
+ color: #fff;
+ }
+ .icon{
+ width: 100rpx;
+ height: 100rpx;
+ }
+ }
+ }
+
.video-title{
padding: 20rpx 30rpx;
background-color: $uni-color;
diff --git a/pages_order/service/newsList.vue b/pages_order/service/newsList.vue
index f70d3e8..fb74280 100644
--- a/pages_order/service/newsList.vue
+++ b/pages_order/service/newsList.vue
@@ -10,7 +10,7 @@
keyName="imageContent">
-
+
@@ -89,14 +89,14 @@
},
onLoad(args) {
this.keyword = args.keyword
- this.queryNewsTypeList()
+ this.queryArticleListByType()
},
methods: {
queryArticleListByType(){
let query = {
...this.queryParams,
- categoryId : this.articleType
+ // categoryId : this.articleType
}
if(this.articleType == -1){
diff --git a/static/image/home/g8a.png b/static/image/home/g8a.png
new file mode 100644
index 0000000..0636273
Binary files /dev/null and b/static/image/home/g8a.png differ
diff --git a/store/store.js b/store/store.js
index 62a6cd1..247c5bd 100644
--- a/store/store.js
+++ b/store/store.js
@@ -9,7 +9,7 @@ import Position from '@/utils/position.js'
//Vuex.Store 构造器选项
const store = new Vuex.Store({
state: {
- configList: [], //配置列表
+ configList: {}, //配置列表
position : {//定位信息
latitude : 0,
longitude : 0,
@@ -81,11 +81,17 @@ const store = new Vuex.Store({
mutations: {
// 初始化配置
initConfig(state){
- // api('getConfig', res => {
- // if(res.code == 200){
- // state.configList = res.result
- // }
- // })
+ api('getConfig', res => {
+ if(res.code == 200){
+ res.result.forEach(n => {
+ state.configList[n.paramCode] = n.paramValueText ||
+ n.paramValueTextarea ||
+ n.paramValueImage
+ // state.configList[n.keyName + '_keyValue'] = n.keyValue
+ })
+ uni.$emit('getConfig', state)
+ }
+ })
let config = ['getPrivacyPolicy', 'getUserAgreement']
config.forEach(k => {