Merge remote-tracking branch 'origin/master'

jiangping

2025-02-18 754f0eea0b16985a4dc8e8448e1bde7a8aec6f26

 h5/pages/driver/taskDetail.vue

@@ -98,11 +98,11 @@
         </view> -->

         <view v-if="param.status == 1" class="signIn_wrap" @click="handleSignIn">

            <image :src="

            param.getDistance < signDistance

            (param.getDistance || param.getDistance == 0) && param.getDistance < signDistance

              ? require('@/static/driver/btn_qiandao@2x.png')

              : require('@/static/driver/btn_qiandao_fail@2x.png')

          " class="img" mode="widthFix"></image>

            <view class="handle">{{ param.getDistance > signDistance ? '无法签到' : '签到' }}</view>

            <view class="handle">{{ !param.getDistance || param.getDistance > signDistance ? '无法签到' : '签到' }}</view>

            <view class="time">{{nowTime}}</view>

         </view>

      </view>

@@ -182,10 +182,10 @@
               status: '0'

            },

            jobId: '',

            // lat: '',

            // lnt: '',

            lat: '31.783205',

            lnt: '117.262635',

            lat: '',

            lnt: '',

            // lat: '31.783205',

            // lnt: '117.262635',

            nowTime: '',

            wmsInfo: {},

            signDistance: uni.getStorageSync('driverGuide').signDistance,

@@ -226,15 +226,17 @@
               lnt,

               jobId

            } = this

            if (param.getDistance > signDistance) return

            if (!param.getDistance || param.getDistance > signDistance) return

            driverSignInTask({

               jobId,

               lat,

               lnt,

               signType: 0

            }).then(res => {

               this.showToast('签到成功')

               this.getDetail()

            }).then(res => {
               if (res && res.code == 200) {
                  this.showToast('签到成功')
                  this.getDetail()
               }

            })

         },

         getDetail() {

@@ -292,7 +294,8 @@
                  console.log('---', res);

                  this.getDetail()

               },

               fail: (err) => {

               fail: (err) => {
                  this.getDetail()

                  this.showToast('获取定位失败', err)

               }

            })