From 2a299f73427490ec037dd8b5379467be40e739df Mon Sep 17 00:00:00 2001
From: unknown <573515615@qq.com>
Date: Fri, 7 Nov 2025 20:10:53 +0800
Subject: [PATCH] 'youhua'
---
config/api.js | 2 +-
pages.json | 11 ++++-
pages/index/index.vue | 52 ++++++++++++++++++-----
pages/index/location.vue | 66 +++++++++++++++++++++++++++++
pages/mine/edituser.vue | 4 +-
pages/order/detail.vue | 90 +++++++++++++++++++++++++++++++++++++++-
6 files changed, 208 insertions(+), 17 deletions(-)
create mode 100644 pages/index/location.vue
diff --git a/config/api.js b/config/api.js
index 11c139e..21907cf 100644
--- a/config/api.js
+++ b/config/api.js
@@ -194,4 +194,4 @@ export const createPayment = (data, callback) => post('api/recover/person/create
export const reassignOrder = (data, callback) => post('api/recover/order/reassignOrder', data, callback);
export const smsCode = (data, callback) => post('api/recover/person/send', data, callback);
export const hallnotice = (data, callback) => post('api/recover/person/hallnotice', data, callback);
-export const indexInfo = (data, callback) => post('api/recover/config/index', data, callback);
+export const indexInfo = (data, callback) => get('api/recover/config/index', data, callback);
diff --git a/pages.json b/pages.json
index 67c120b..3fdefbb 100644
--- a/pages.json
+++ b/pages.json
@@ -8,8 +8,15 @@
"enablePullDownRefresh": true,
"navigationStyle":"custom"
}
- }
-
+ },
+ {
+ "path": "pages/index/location",
+ "style":
+ {
+ "navigationBarTitleText": "城市",
+ "enablePullDownRefresh": false
+ }
+ }
,{
"path" : "pages/mine/mine",
"style" :
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 6cd0f53..c58989d 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -13,7 +13,7 @@
-
+
{{cityText||'选择城市'}}
@@ -176,7 +176,7 @@
修改预约
-
+
上门签到
@@ -289,10 +289,11 @@
- 上门服务条款
+ {{open_door_title}}
-
- 预约方式
+
+
+
- 不同意
- 同意
+ 不同意
+ 同意
@@ -458,7 +459,7 @@
orderId: '',
statusToast: '',
showCity: false,
- cityText: '',
+ cityText: '南京市',
longitude: '',
latitude: '',
page1: 1,
@@ -471,7 +472,9 @@
distanceText: {
name: '1km',
value: 1
- }
+ },
+ open_door_title: '',
+ open_door_content: ''
}
},
components: {
@@ -506,6 +509,7 @@
fail: () => {},
});
this.initFun()
+ this.backCity()
// this.getdata()
// this.config()
// this.qiangdanlist()
@@ -530,6 +534,7 @@
// })
// this.recycleOrderList()
this.getdata()
+ this.indexInfo()
// this.getquestion()
// this.recycleOrderList()
// this.qiangdanlist()
@@ -572,6 +577,28 @@
}
},
methods: {
+ indexInfo(){
+ var _this = this;
+ this.$api.indexInfo({
+ group: 'basic'
+ },res=>{
+ if(res.code == '1'){
+ _this.open_door_title = res.data.find((item)=>item.name=='open_door_title').value
+ _this.open_door_content = res.data.find((item)=>item.name=='open_door_content').value
+ }else{
+
+ }
+ })
+ },
+ linkCity(){
+ uni.navigateTo({
+ url:'/pages/index/location'
+ })
+ },
+ backCity(res){
+ this.cityText = uni.getStorageSync('city') || '南京市'
+ // this.showCity = false
+ },
openMap(res){
console.log(res)
util.openMap(res.accept_address,res.latitude,res.longitude)
@@ -706,8 +733,13 @@
}
})
},
+ signIn2(id){
+ this.orderId = id
+ this.pop3Show = true
+ },
signIn(id){
let _this = this;
+ this.pop3Show = false
let data = {
status: 3,
order_id: id
diff --git a/pages/index/location.vue b/pages/index/location.vue
new file mode 100644
index 0000000..695bf11
--- /dev/null
+++ b/pages/index/location.vue
@@ -0,0 +1,66 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/mine/edituser.vue b/pages/mine/edituser.vue
index 80a0496..6c6c53e 100644
--- a/pages/mine/edituser.vue
+++ b/pages/mine/edituser.vue
@@ -25,14 +25,14 @@
-->
-
+
关于我们
diff --git a/pages/order/detail.vue b/pages/order/detail.vue
index a33c645..136b6d9 100644
--- a/pages/order/detail.vue
+++ b/pages/order/detail.vue
@@ -231,7 +231,7 @@
请先与客户确认上门服务时间哦~
改派
- 上门签到
+ 上门签到
去付款
@@ -256,6 +256,18 @@
好的
+
+
+ {{open_door_title}}
+
+
+
+
+ 不同意
+ 同意
+
+
+
@@ -271,7 +283,10 @@ export default {
order_person_time: '',
pop4Show: false,
notesText: '',
- signInShow: false
+ signInShow: false,
+ pop3Show:false,
+ open_door_title: '',
+ open_door_content: ''
};
},
onShow() {
@@ -280,19 +295,38 @@ export default {
onLoad(e) {
this.order_id = e.id;
this.getOrderDetail();
+ this.indexInfo()
},
components: {
appointTime
},
methods: {
+ indexInfo(){
+ var _this = this;
+ this.$api.indexInfo({
+ group: 'basic'
+ },res=>{
+ if(res.code == '1'){
+ _this.open_door_title = res.data.find((item)=>item.name=='open_door_title').value
+ _this.open_door_content = res.data.find((item)=>item.name=='open_door_content').value
+ }else{
+
+ }
+ })
+ },
toPay(item){
uni.setStorageSync('orderDetail', item);
uni.navigateTo({
url:'/pages/order/pay?id=' + item.id
})
},
+ signIn2(){
+ // this.orderId = id
+ this.pop3Show = true
+ },
signIn(){
let _this = this;
+ this.pop3Show = false
let data = {
status: 3,
order_id: this.order_id
@@ -980,4 +1014,56 @@ export default {
margin-top: 72rpx;
}
}
+ .popBoxThree{
+ width: 620rpx;
+ height: 900rpx;
+ background: linear-gradient(0deg, #FFFFFF 0%, #FFF6F1 100%);
+ border-radius: 30rpx;
+ border: 2px solid #FFFFFF;
+ .popThreeText1{
+ font-weight: bold;
+ font-size: 36rpx;
+ color: #000000;
+ text-align: center;
+ margin-top: 46rpx;
+ }
+ .popThreeLine{
+ width: 40rpx;
+ height: 9rpx;
+ background: #FF907A;
+ margin: 17rpx auto;
+ }
+ .popThreeText2{
+ width: 530rpx;
+ height: 616rpx;
+ font-weight: 400;
+ font-size: 28rpx;
+ color: #000000;
+ overflow: auto;
+ margin: 22rpx auto
+ }
+ .popThreeBtn1{
+ width: 260rpx;
+ height: 80rpx;
+ line-height: 80rpx;
+ background: #F6F6F6;
+ border-radius: 40rpx;
+ font-weight: 500;
+ font-size: 28rpx;
+ color: #333333;
+ text-align: center;
+ }
+ .popThreeBtn2{
+ width: 260rpx;
+ height: 80rpx;
+ line-height: 80rpx;
+ background: #FB7D06;
+ border-radius: 40rpx;
+ font-weight: 500;
+ font-size: 28rpx;
+ color: #fff;
+ text-align: center;
+ margin-left: 20rpx;
+ }
+ }