diff --git a/App.vue b/App.vue
index e7c4f42..89033e2 100644
--- a/App.vue
+++ b/App.vue
@@ -3,7 +3,7 @@
onLaunch: function() {
},
onShow: function() {
- // this.$store.commit('initConfig')
+ this.$store.commit('initConfig')
},
onHide: function() {
}
diff --git a/api/api.js b/api/api.js
index cd9f84d..7ecc3f1 100644
--- a/api/api.js
+++ b/api/api.js
@@ -17,7 +17,7 @@ const config = {
// 微信登录接口
wxLogin: {
url: '/login/login',
- method: 'POST',
+ method: 'GET',
limit: 500,
showLoading: true,
},
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 6ea1305..7fc18be 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -17,9 +17,6 @@
search-icon-size="40rpx"
v-model="keyword">
-
-
-
diff --git a/pages_order/components/list/cardList.vue b/pages_order/components/list/cardList.vue
index 27142e3..a9e408f 100644
--- a/pages_order/components/list/cardList.vue
+++ b/pages_order/components/list/cardList.vue
@@ -65,7 +65,7 @@
this.queryParams.pageNo = 1
this.$api('queryRoleInfoList', {
...this.queryParams,
- roleId : parseInt(this.type),
+ roleId : this.type,
}, res => {
uni.stopPullDownRefresh()
if(res.code == 200){
diff --git a/pages_order/mine/volunteer.vue b/pages_order/mine/volunteer.vue
index 4d0467f..dd1ca34 100644
--- a/pages_order/mine/volunteer.vue
+++ b/pages_order/mine/volunteer.vue
@@ -76,7 +76,6 @@
height: 500rpx;
flex-direction: column;
justify-content: space-around;
-
}
}
}
diff --git a/pages_order/service/StudyFurther.vue b/pages_order/service/StudyFurther.vue
index 82e2f3e..3360110 100644
--- a/pages_order/service/StudyFurther.vue
+++ b/pages_order/service/StudyFurther.vue
@@ -17,7 +17,7 @@
diff --git a/pages_order/service/applyRelic.vue b/pages_order/service/applyRelic.vue
index da081b8..ceb216f 100644
--- a/pages_order/service/applyRelic.vue
+++ b/pages_order/service/applyRelic.vue
@@ -102,7 +102,7 @@
},
toUrl(item){
console.log(item);
- this.$utils.navigateTo(`/pages_order/service/articleDetail?id=${item.id}`)
+ this.$utils.navigateTo(`/pages_order/service/articleDetail?id=${item.id}&type=1`)
},
selectMiddle(e){
console.log(e);
diff --git a/pages_order/service/articleDetail.vue b/pages_order/service/articleDetail.vue
index 89f9d9e..e2b837e 100644
--- a/pages_order/service/articleDetail.vue
+++ b/pages_order/service/articleDetail.vue
@@ -1,7 +1,7 @@
-
+
-
+
@@ -10,8 +10,10 @@
export default {
data() {
return {
+ titles: ['文化遗产', '申遗历程', '非遗体验'],
detail : {},
id : 0,
+ type : 0,
}
},
onLoad(args) {
diff --git a/pages_order/service/experience.vue b/pages_order/service/experience.vue
index 98923d1..0f5bf2a 100644
--- a/pages_order/service/experience.vue
+++ b/pages_order/service/experience.vue
@@ -5,7 +5,9 @@
-
+
@@ -32,7 +34,10 @@
}
},
methods: {
-
+ toUrl(item){
+ console.log(item);
+ this.$utils.navigateTo(`/pages_order/service/articleDetail?id=${item.id}&type=2`)
+ },
}
}
@@ -53,7 +58,7 @@
margin-left: 3%;
margin-top: 20rpx;
background-color: #fff;
- box-shadow: 0px 0px 3px 0px #000;
+ box-shadow: 0px 0px 10rpx 0rpx #00000022;
border-radius: 12rpx;
.experience-box-img {
diff --git a/pages_order/service/heritagePath.vue b/pages_order/service/heritagePath.vue
index 7fc78cb..e8a94e2 100644
--- a/pages_order/service/heritagePath.vue
+++ b/pages_order/service/heritagePath.vue
@@ -9,7 +9,9 @@
路径定制
推荐路径
-
+
@@ -120,6 +122,7 @@
image {
height: 100%;
width: 100%;
+ border-radius: 20rpx;
}
}
diff --git a/pages_order/service/reservationDetail.vue b/pages_order/service/reservationDetail.vue
index 3e5c13c..88a7f25 100644
--- a/pages_order/service/reservationDetail.vue
+++ b/pages_order/service/reservationDetail.vue
@@ -96,7 +96,7 @@
- 讲解现场
+ {{ video_list_titles[type] }}
@@ -115,6 +115,7 @@
data() {
return {
titles: ['遗产讲述', '达人同游', '我要跟拍'],
+ video_list_titles: ['讲解现场', '同游现场', '跟拍现场'],
type: 0,
id : 0,
detail : {},
diff --git a/pages_order/service/tellList.vue b/pages_order/service/tellList.vue
index 8cc4d32..021cfbc 100644
--- a/pages_order/service/tellList.vue
+++ b/pages_order/service/tellList.vue
@@ -27,11 +27,11 @@
},
onLoad(args) {
this.type = args.type || 0
- console.log(this.type);
},
onShow() {
- this.$refs.cardList.getList()
- console.log(this.type);
+ this.$nextTick(() => {
+ this.$refs.cardList.getList()
+ })
},
onPullDownRefresh(){
this.$refs.cardList.getList()
diff --git a/static/image/home/title.png b/static/image/home/title.png
deleted file mode 100644
index b6c2a73..0000000
Binary files a/static/image/home/title.png and /dev/null differ