This commit is contained in:
unknown 2025-11-07 20:10:53 +08:00
parent 6e4ac3b6f9
commit 2a299f7342
6 changed files with 208 additions and 17 deletions

View File

@ -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);

View File

@ -8,8 +8,15 @@
"enablePullDownRefresh": true,
"navigationStyle":"custom"
}
}
},
{
"path": "pages/index/location",
"style":
{
"navigationBarTitleText": "城市",
"enablePullDownRefresh": false
}
}
,{
"path" : "pages/mine/mine",
"style" :

View File

@ -13,7 +13,7 @@
<view class="menuLine" v-show="menuNum == 2"></view>
</view>
</view>
<view class="cityBox flex-center">
<view class="cityBox flex-center" @click="linkCity">
{{cityText||'选择城市'}}
</view>
</view>
@ -176,7 +176,7 @@
<view @click.stop="updateTime(item.id)" v-show="item.status==2" class="userBtn2 flex-center">
修改预约
</view>
<view @click.stop="signIn(item.id)" v-show="item.status==2" class="userBtn flex-center">
<view @click.stop="signIn2(item.id)" v-show="item.status==2" class="userBtn flex-center">
上门签到
</view>
<view v-show="item.status==7" class="userBtn flex-center" @click.stop="selectTime(item.id)">
@ -289,10 +289,11 @@
</u-popup>
<u-popup :show="pop3Show" @open="open" mode="center" :round="30">
<view class="popBoxThree">
<view class="popThreeText1">上门服务条款</view>
<view class="popThreeText1">{{open_door_title}}</view>
<view class="popThreeLine"></view>
<view class="popThreeText2">
预约方式
<view class="popThreeText2" v-html="open_door_content">
<!-- // {{open_door_content}} -->
<!-- 预约方式
通过小程序提交家电信息品牌/型号/使用年限/现状描述
选择上门时间建议工作日9:00-17:00
上门评估
@ -323,11 +324,11 @@
服务承诺
工作人员持证上岗规范操作
专业工具搬运造成损失按市价赔偿
服务投诉24小时内响应客服电话400-xxx-xxxx
服务投诉24小时内响应客服电话400-xxx-xxxx -->
</view>
<view class="flex-center" style="margin-top: 17rpx;">
<view class="popThreeBtn1">不同意</view>
<view class="popThreeBtn2">同意</view>
<view class="popThreeBtn1" @click="pop3Show = false">不同意</view>
<view class="popThreeBtn2" @click="signIn(orderId)">同意</view>
</view>
</view>
</u-popup>
@ -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

66
pages/index/location.vue Normal file
View File

@ -0,0 +1,66 @@
<template>
<view class="">
<!-- <view :style="{height:statusBarHeight+'px'}" style="width: 100%;"></view>
<view style="" @click="oncity">
<button type="primary">点击选择地区</button>
{{region}}
</view>
<popup-layer ref="popupRef" :direction="'right'">
<view style="width:750upx;height: 100%;">
<citySelect @back_city="back_city"></citySelect>
</view>
</popup-layer> -->
<view style="width:750upx;height: 100%;">
<citySelect @back_city="back_city"></citySelect>
</view>
</view>
</template>
<script>
import citySelect from '@/components/linzq-citySelect/linzq-citySelect.vue';
// import popupLayer from '@/components/popup-layer/popup-layer.vue';
export default {
components: {
citySelect
// popupLayer
},
computed: {},
data() {
return {
statusBarHeight: this.statusBarHeight, //main.js
region: '请选择...', //
}
},
created() {},
mounted() {
// this.$refs.popupRef.close();
},
methods: {
oncity() {
var that = this
this.$refs.popupRef.show();
},
back_city(e) {
if(e){
// this.selectedCity = e.cityName;
uni.setStorageSync('city',e.cityName+'市')
}
uni.navigateBack({
delta: 1
})
// if (e !== 'no') {
// this.region = e.cityName
// this.$refs.popupRef.close();
// } else {
// this.$refs.popupRef.close();
// }
}
}
};
</script>
<style scoped>
.height {
height: var(--status-bar-height);
}
</style>

View File

@ -25,14 +25,14 @@
<input type="nickname" class="weui-input" v-model="nickname" :disabled="disabled" name="nickname" placeholder="请输入昵称" @blur="getnicheng" ></input>
</view> -->
</view>
<view class='hs-list flex-between'>
<!-- <view class='hs-list flex-between'>
<view class='hs-list-hd' style="width: 80px;">手机号</view>
<view class='hs-list-na flex-center'>
{{userinfo.mobile}}
<u-icon name="arrow-right" color="#282F38" size="14" style="margin-left: 19rpx;"></u-icon>
</view>
</view>
</view> -->
<view class='hs-list flex-between' @click="linkDetail('about')">
<view class='hs-list-hd' style="width: 80px;">关于我们</view>

View File

@ -231,7 +231,7 @@
<view class="tipBox">请先与客户确认上门服务时间哦~</view>
<view class="buttonEdit flex-center" @click="pop4Show = true" v-if="orderInfo.status == 2">改派</view>
<button class='btn flex-center' v-if="orderInfo.status == 1 || orderInfo.status == 2" @click="cancelOrder()">取消订单</button>
<view class="buttonType2 flex-center" @click.stop="signIn()" v-if="orderInfo.status == 2">上门签到</view>
<view class="buttonType2 flex-center" @click.stop="signIn2()" v-if="orderInfo.status == 2">上门签到</view>
<view class="buttonType2 flex-center" v-if="orderInfo.status == 3" @click="toPay(orderInfo)">去付款</view>
</view>
<u-popup :show="pop4Show" @close="pop4Show = false" mode="center" :round="30">
@ -256,6 +256,18 @@
<view class="popOneBtn flex-center" @click="signInShow = false">好的</view>
</view>
</u-popup>
<u-popup :show="pop3Show" mode="center" :round="30">
<view class="popBoxThree">
<view class="popThreeText1">{{open_door_title}}</view>
<view class="popThreeLine"></view>
<view class="popThreeText2" v-html="open_door_content">
</view>
<view class="flex-center" style="margin-top: 17rpx;">
<view class="popThreeBtn1" @click="pop3Show = false">不同意</view>
<view class="popThreeBtn2" @click="signIn(orderId)">同意</view>
</view>
</view>
</u-popup>
<appointTime ref="timeRef" @checkTime="checkTime"></appointTime>
</view>
</template>
@ -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;
}
}
</style>