diff --git a/pages/activeDetail/index.vue b/pages/activeDetail/index.vue
index dd91b96..9e0c2c5 100644
--- a/pages/activeDetail/index.vue
+++ b/pages/activeDetail/index.vue
@@ -1,554 +1,578 @@
-
-
-
-
-
-
-
-
-
-
-
-
- {{activityInfo.title}}
-
- {{'未开始'}}
-
-
- {{'进行中'}}
-
-
- {{'已结束'}}
-
-
-
-
-
-
- 活动类型：{{activityInfo.categoryName || '待确认'}}
-
-
-
-
- 活动地址：{{activityInfo.address || '待定'}}
-
-
-
- {{ activityInfo.openAt }}
-
-
-
-
-
-
-
-
-
-
-
-
-
- 活动详情
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 分享
-
-
-
-
-
-
-
+
+
\ No newline at end of file
diff --git a/pages/chat/index.vue b/pages/chat/index.vue
index 328e9fa..58ac98a 100644
--- a/pages/chat/index.vue
+++ b/pages/chat/index.vue
@@ -1,180 +1,216 @@
-
-
-
-
-
- {{aiHelperTitle}}
-
-
-
-
- {{item.name}}
-
-
- {{item.description}}
- 开始对话>
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+ {{ aiHelperTitle }}
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+ {{ item.description }}
+ 开始对话>
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/mine/index.vue b/pages/mine/index.vue
index 4231e67..12d8fa3 100644
--- a/pages/mine/index.vue
+++ b/pages/mine/index.vue
@@ -157,8 +157,7 @@
{
key: 5,
url: "/static/imgs/service/service_notice.png",
- name: '设置',
- pageUrl: 'serviceNoticeList'
+ name: '设置'
},
{
key: 6,
@@ -560,22 +559,28 @@
},
// 跳转页面
- goPage(item) {
- if (item.key === 6) { // 联系社区的特殊处理
- this.handleContactCommunity();
- return;
- }
-
- if (!this.checkLogin()) {
- this.showEditModal = true;
- return;
- }
-
- if (item.pageUrl) {
- uni.navigateTo({
- url: `/pages/${item.pageUrl}/index`
- });
- }
+ // 跳转页面
+ goPage(item) {
+ if (item.key === 6) { // 联系社区的特殊处理
+ this.handleContactCommunity();
+ return;
+ }
+
+ if (item.key === 5) { // 设置的特殊处理
+ this.handleEditClick(); // 调用编辑用户信息的方法
+ return;
+ }
+
+ if (!this.checkLogin()) {
+ this.showEditModal = true;
+ return;
+ }
+
+ if (item.pageUrl) {
+ uni.navigateTo({
+ url: `/pages/${item.pageUrl}/index`
+ });
+ }
},
// 处理联系社区点击
diff --git a/pages/serviceTickets/index.vue b/pages/serviceTickets/index.vue
index 2dc96f4..be1bc58 100644
--- a/pages/serviceTickets/index.vue
+++ b/pages/serviceTickets/index.vue
@@ -3,16 +3,20 @@
-
+
选择区域
{{ workOrderArea || '请选择' }}
-
-
+
+
@@ -116,17 +120,22 @@
fileList: [],
workOrderCategory: '',
workOrderCategoryID: '',
+ workOrderArea:'',
+ workOrderAreaID:'',
showSelect: false,
+ showTypeSelect:false,
categoryList: [],
workOrderLocation: '',
expectedTime: '',
uploadedImages: [],
uploadedVideos: [],
- videoFormats: ['mp4', 'mov', 'avi', 'wmv', 'mpeg', '3gp', 'flv', 'mkv']
+ videoFormats: ['mp4', 'mov', 'avi', 'wmv', 'mpeg', '3gp', 'flv', 'mkv'],
+ areaList:[],
};
},
mounted() {
this.getOrderList();
+ this.getOrderTypeList();
},
methods: {
handleBack() {
@@ -298,6 +307,7 @@
concatName: this.concatName, // 新增联系人姓名
customerPhone: this.customerPhone, // 新增联系人电话
orderTypeId: this.workOrderCategoryID,
+ orderAreaId:this.workOrderAreaID,
address: this.workOrderLocation,
images: this.uploadedImages,
videos: this.uploadedVideos,
@@ -340,6 +350,8 @@
this.fileList = [];
this.uploadedImages = [];
this.uploadedVideos = [];
+ this.workOrderArea = '';
+ this.workOrderAreaID = '';
},
handleConfirm(e) {
@@ -347,6 +359,12 @@
this.workOrderCategoryID = e.value[0].id;
this.showSelect = false;
},
+
+ handleTypeConfirm(e) {
+ this.workOrderArea = e.value[0].title;
+ this.workOrderAreaID = e.value[0].id;
+ this.showTypeSelect = false;
+ },
handleCancel() {
this.showSelect = false;
@@ -368,6 +386,24 @@
});
}
},
+
+ // 获取工作区域
+ async getOrderTypeList(){
+ try {
+ const res = await get('/api/v1/apps/work-order-area');
+ if (res?.success) {
+ this.areaList = [
+ [...res.data]
+ ]
+ }
+ } catch (err) {
+ console.error('获取工作区域失败:', err);
+ uni.showToast({
+ title: '获取工作区域失败',
+ icon: 'none'
+ });
+ }
+ }
}
};