Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master

wujianwei

8 小时以前 8b566e42dce1e29c3a43014838ad341a3f971070

 ui/car_wx_app/pages/examine/operate.vue

@@ -20,7 +20,7 @@
          <u--form ref="uForm" :rules="rules" :model="form" labelPosition="left">
            <u-form-item borderBottom label=" " labelWidth="0" prop="address">
              <view class="form-row" @click="getLocation">
                <view class="form-label required">
                <view class="form-label">
                  <view class="label-icon">
                    <u--image :showLoading="true" src="/static/bt.png" width="18" height="18" />
                  </view>
@@ -47,6 +47,14 @@
                  <text>时间</text>
                </view>
                <uni-datetime-picker type="datetime" v-model="form.tripTime" class="flex-1" />
              </view>
            </u-form-item>
            <u-form-item borderBottom label=" " v-if="form.odometer" labelWidth="0" prop="odometer">
              <view class="form-row">
                <view class="form-label">
                  <text>仪表里程</text>
                </view>
                <view class="form-label">{{form.odometer || 0}} KM</view>
              </view>
            </u-form-item>

@@ -223,7 +231,7 @@
const ODOMETER_TYPES = Object.freeze(['3', '5', '7'])

const INITIAL_FORM = Object.freeze({
  address: '', tripTime: '', odometer: 0, tripType: '',
  address: '', tripTime: '', odometer: undefined, tripType: '',
  feeType: '', currency: '', actualFeeAmount: 0,
  iscc: '1', longitude: '', latitude: ''
})
@@ -468,10 +476,10 @@

      if (type !== '1') {
        if (ODOMETER_TYPES.includes(type)) {
          this.form.odometer = this.tmsTripTables[0]?.odometer || 0
          this.form.odometer = this.tmsTripTables[0]?.odometer || undefined
          this.form.iscc = '1'
        } else {
          this.form.odometer = 0
          this.form.odometer = undefined
        }
        this.$nextTick(() => { this.showPopup = true })
      }