From e460ae7a12afe6c76703eced34832ddbfbe61e2c Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Tue, 24 Sep 2024 18:41:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
App.vue | 1 +
api/api.js | 92 +++++++++++--
api/http.js | 2 +-
components/config/PrivacyAgreementPoup.vue | 4 +-
components/tourGuide/locations.vue | 2 +-
mixins/list.js | 50 +++++++
pages/index/index.vue | 6 +-
pages_order/auth/wxLogin.vue | 6 +-
pages_order/components/address/addressList.vue | 10 +-
pages_order/components/address/redactAddress.vue | 34 ++---
pages_order/components/list/cardList.vue | 10 +-
.../components/submit/StudyAndPathDetailSubmit.vue | 75 ++++++----
pages_order/mine/address.vue | 42 +++---
pages_order/mine/subscribe.vue | 61 +++++---
pages_order/order/orderSubscribe.vue | 80 +++++++++--
pages_order/service/StudyAndPathDetail.vue | 51 +++++--
pages_order/service/StudyFurther.vue | 29 +++-
pages_order/service/applyRelic.vue | 11 +-
pages_order/service/articleDetail.vue | 20 ++-
pages_order/service/carefree.vue | 23 ++--
pages_order/service/experience.vue | 34 +++--
pages_order/service/following.vue | 15 +-
pages_order/service/heritagePath.vue | 70 +++++++---
pages_order/service/reservationDetail.vue | 2 +-
pages_order/static/service/carefree/1.png | Bin 0 -> 6313 bytes
pages_order/static/service/carefree/2.png | Bin 0 -> 2248 bytes
pages_order/static/service/carefree/3.png | Bin 0 -> 5104 bytes
pages_order/static/service/carefree/4.png | Bin 0 -> 4490 bytes
store/store.js | 16 +++
utils/utils.js | 153 +++++++--------------
30 files changed, 611 insertions(+), 288 deletions(-)
create mode 100644 mixins/list.js
create mode 100644 pages_order/static/service/carefree/1.png
create mode 100644 pages_order/static/service/carefree/2.png
create mode 100644 pages_order/static/service/carefree/3.png
create mode 100644 pages_order/static/service/carefree/4.png
diff --git a/App.vue b/App.vue
index 89033e2..c6e0043 100644
--- a/App.vue
+++ b/App.vue
@@ -4,6 +4,7 @@
},
onShow: function() {
this.$store.commit('initConfig')
+ this.$store.commit('getBanner')
},
onHide: function() {
}
diff --git a/api/api.js b/api/api.js
index 4c9b2f5..5e9798c 100644
--- a/api/api.js
+++ b/api/api.js
@@ -94,30 +94,106 @@ const config = {
method: 'GET',
showLoading: true,
},
+ // areaId: 0-瓷都镇区 1-湖田片区 2-高岭片区 3-瑶里片区 4-蛟潭片区; categoryTyep: 0-景点 1-美食店铺 2-民宿 3-厕所
+ querySpotList: {
+ url: '/info/querySpotList',
+ method: 'GET',
+ showLoading: true,
+ },
+ // 获取视频列表
+ queryVedioById: {
+ url: '/info/queryVedioById',
+ method: 'GET',
+ showLoading: true,
+ },
+
+
+
+
+ // amusement 游玩项目相关接口
+
+
+ // 获取非遗体验列表
+ queryExperienceList: {
+ url: '/amusement/queryExperienceList',
+ method: 'GET',
+ showLoading: true,
+ },
+ // 获取非遗体验详情
+ queryExperienceById: {
+ url: '/amusement/queryExperienceById',
+ method: 'GET',
+ showLoading: true,
+ },
+ // 获取路径定制、我要研学列表
+ queryAmusementList: {
+ url: '/amusement/queryAmusementList',
+ method: 'GET',
+ showLoading: true,
+ },
+ // 获取路径定制、我要研学详情
+ queryAmusementById: {
+ url: '/amusement/queryAmusementById',
+ method: 'GET',
+ showLoading: true,
+ },
+
+
+
+
+ // 修改地址
+ updateAddress: {
+ url: '/user/updateAddress',
+ method: 'POST',
+ showLoading: true,
+ },
+ // 查询地址
+ queryAddress: {
+ url: '/user/queryAddress',
+ method: 'GET',
+ showLoading: true,
+ },
+ // 删除地址
+ deleteAddress: {
+ url: '/user/deleteAddress',
+ method: 'DELETE',
+ showLoading: true,
+ },
+ // 添加地址
+ addAddress: {
+ url: '/user/addAddress',
+ method: 'POST',
+ showLoading: true,
+ },
// 根据角色Id获取角色信息详情
queryRoleInfoById: {
- url: '/info/queryRoleInfoById',
+ url: '/user/queryRoleInfoById',
method: 'GET',
showLoading: true,
},
// 根据角色类型获取角色信息列表-讲解员-达人-摄影师
queryRoleInfoList: {
- url: '/info/queryRoleInfoList',
+ url: '/user/queryRoleInfoList',
method: 'GET',
showLoading: true,
},
- // 根据景区id获取该景区下的地点列表:景点-厕所-美食店铺-民宿
- querySpotList: {
- url: '/info/querySpotList',
+
+
+
+
+ // 查询预约时间段
+ queryOrderTime: {
+ url: '/order/queryOrderTime',
method: 'GET',
showLoading: true,
},
- // 获取视频列表
- queryVedioById: {
- url: '/info/queryVedioById',
+ // 查询订单列表
+ queryOrderList: {
+ url: '/order/queryOrderList',
method: 'GET',
showLoading: true,
},
+
}
diff --git a/api/http.js b/api/http.js
index bf3878d..5333dc2 100644
--- a/api/http.js
+++ b/api/http.js
@@ -16,7 +16,7 @@ function http(uri, data, callback, method = 'GET', showLoading, title) {
method: method,
header: {
'X-Access-Token': uni.getStorageSync('token'),
- 'Content-Type' : method == 'POST' ? 'application/x-www-form-urlencoded' : 'application/json'
+ 'Content-Type' : method != ' GET' ? 'application/x-www-form-urlencoded' : 'application/json'
},
success: (res) => {
diff --git a/components/config/PrivacyAgreementPoup.vue b/components/config/PrivacyAgreementPoup.vue
index 6eda2c6..c8d90a1 100644
--- a/components/config/PrivacyAgreementPoup.vue
+++ b/components/config/PrivacyAgreementPoup.vue
@@ -10,7 +10,7 @@
- 欢迎来到酒店布草!我们根据最新的法律法规、监管政策要求，更新了《用户协议》和《隐私政策》,请您认真阅读。
+ 欢迎来到遗产里的景徳镇!我们根据最新的法律法规、监管政策要求，更新了《用户协议》和《隐私政策》,请您认真阅读。
@@ -18,7 +18,7 @@
- 同意《酒店布草隐私政策》
+ 同意《隐私政策》
以及《用户协议》
diff --git a/components/tourGuide/locations.vue b/components/tourGuide/locations.vue
index e150643..f9cedcb 100644
--- a/components/tourGuide/locations.vue
+++ b/components/tourGuide/locations.vue
@@ -78,7 +78,7 @@
diff --git a/pages_order/components/submit/StudyAndPathDetailSubmit.vue b/pages_order/components/submit/StudyAndPathDetailSubmit.vue
index 3008780..4c63d40 100644
--- a/pages_order/components/submit/StudyAndPathDetailSubmit.vue
+++ b/pages_order/components/submit/StudyAndPathDetailSubmit.vue
@@ -1,37 +1,63 @@
+
+
+
-
-
- 客服
-
+
-
-
-
-
- 收藏
-
+ @click=""
+ v-if="article">
+
-
-
- 分享
-
+ @click="$emit('share')"
+ v-if="!article">
+
{
+ // let data = {
+ // name: addressDetail.name,
+ // phone: addressDetail.phone,
+ // address: addressDetail.address,
+ // addressDetail: addressDetail.addressDetail,
+ // defaultId: addressDetail.defaultId || '0',
+ // latitude: addressDetail.latitude,
+ // longitude: addressDetail.longitude
+ // }
+
+ // if (addressDetail.id) {
+ // data.id = addressDetail.id
+ // }
+
+ this.$api(addressDetail.id ? 'updateAddress' : 'addAddress', addressDetail, res => {
if (res.code == 200) {
this.$refs.addressPopup.close()
this.getAddressList()
@@ -115,8 +115,8 @@
content: '确认删除此地址?删除后数据不可恢复',
success(e) {
if(e.confirm){
- self.$api('addressDelete', {
- id
+ self.$api('deleteAddress', {
+ AddressId : id
}, res => {
if (res.code == 200) {
uni.showToast({
@@ -135,13 +135,13 @@
addBtn() {
this.title = '新增地址'
this.$refs.addressPopup.open({ //初始化数据
- name: '',
- phone: '',
+ userName: '',
+ userPhone: '',
+ area: '',
address: '',
- addressDetail: '',
defaultId: '',
latitude: '',
- longitude: ''
+ longitude: '',
})
},
}
diff --git a/pages_order/mine/subscribe.vue b/pages_order/mine/subscribe.vue
index d0232f4..b909475 100644
--- a/pages_order/mine/subscribe.vue
+++ b/pages_order/mine/subscribe.vue
@@ -8,21 +8,32 @@
lineColor="#B12026"
lineHeight="8rpx"
lineWidth="50rpx"
- :scrollable="false"
@click="clickTabs">
-
+
-
主题
- ￥199.0
+ ￥{{ item.orderPrice }}
+
+
+
+
+
+
+ 日期
+
+
+ {{ item.orderDate }}
@@ -33,7 +44,7 @@
时间
- 2024-04-21
+ {{ item.orderTime }}
@@ -44,7 +55,7 @@
电话
- 15423451221
+ {{ item.orderPhone }}
@@ -60,30 +71,48 @@
diff --git a/pages_order/service/applyRelic.vue b/pages_order/service/applyRelic.vue
index ceb216f..5da5fd5 100644
--- a/pages_order/service/applyRelic.vue
+++ b/pages_order/service/applyRelic.vue
@@ -3,7 +3,11 @@
-
+
@@ -54,6 +58,7 @@
@@ -56,12 +88,6 @@