Merge remote-tracking branch 'origin/master'

jiangping

2025-03-31 5eb2c5d2396f1a3764dcc029185f139a427ba18f

 h5/pages/appointmentDetails/appointmentDetails.vue

@@ -85,12 +85,8 @@
        <view class="box_list_item_val">{{ info.carNos }}</view>
      </view>
    </view>
   <view class="footer">
      <u-button
      text="取消预约"
      size="mini"
      v-if="[0,1,2,5].includes(info.status)"
      @click="cancelShow = true" />
   <view class="padding_wrap">
      <view class="btn" v-if="[0,1,2,5].includes(info.status)" @click="cancelShow = true">取消预约</view>
   </view>
    <u-popup :show="show" mode="center" @close="close">
      <view class="qrocde">
@@ -110,7 +106,7 @@

<script>
import wxcode from 'uniapp-qrcode'
import { getVisitedDetail } from '@/api'
import { getVisitedDetail, visitsSelfCancel } from '@/api'

export default {
  data() {
@@ -156,7 +152,9 @@
  methods: {
   // 取消预约
   cancel() {
      visitsCancel(this.id).then(res => {
      const member = uni.getStorageSync('member');
      visitsSelfCancel(this.id, member.id).then(res => {
         this.cancelShow = false
         this.getDetail(this.id)
      })
   },
@@ -194,15 +192,27 @@
<style lang="scss" scoped>
.box {
  width: 100%;
  .footer {
     position: fixed;
     left: 0;
     bottom: 0;
     width: 100%;
     height: 100rpx;
     text-align: right;
     background-color: #ffffff;
     padding-bottom: calc(30rpx + env(safe-area-inset-bottom));
  .padding_wrap {
     position: fixed;
     z-index: 999;
     padding: 0 30rpx 64rpx;
     bottom: 0;
     left: 0;
     width: 100%;
     display: flex;
     justify-content: space-between;
  
     .btn {
        height: 96rpx;
        line-height: 96rpx;
        text-align: center;
        width: 100%;
        font-size: 36rpx;
        color: #333333;
        background: #ffffff;
        border-radius: 48rpx;
        border: 1rpx solid #999999;
     }
  }
  .qrocde {
    width: 300rpx;