Merge remote-tracking branch 'origin/master' into zzx

src/subPack-djk/confirmOrder/index.vue

@@ -122,7 +122,7 @@ async function handlePay() {
           {{ phoneFormat(String(phone)) }}
         </view>
         <view v-else>
-          <input v-model="phone" type="number" :maxlength="11" @blur="isEdit = false">
+          <input v-model="phone" type="number" :maxlength="11" :focus="isEdit" @blur="isEdit = false">
         </view>
         <view v-if="!isEdit" class="flex items-center" @click="isEdit = true">
           <view class="mr5rpx">

src/subPack-djk/welfare/index.vue

@@ -136,7 +136,7 @@ async function handelSubmit() {
               {{ phone?.replace(/^(\d{3})\d{4}(\d{4})$/, '$1****$2') }}
             </view>
             <view v-else>
-              <input v-model="phone" type="number" :maxlength="11" @blur="isEdit = false">
+              <input v-model="phone" type="number" :maxlength="11" :focus="isEdit" @blur="isEdit = false">
             </view>
             <view v-if="!isEdit" class="flex items-center" @click="isEdit = true">
               <view class="mr5rpx">