Merge branch 'master' of http://git.zonelife.cn:3000/zhangtao/city-gather

src/subPack-djk/commonTab/components/index.vue

@@ -50,15 +50,15 @@ function handleBottom() {
           </view>
           <view class="ml164rpx">
             <view v-for="its in item.goodsList" :key="its.id" class="mt14rpx flex items-center justify-between" @click="router.push({ name: 'djk-goods', params: { id: `${its.id}`, type: '0' } })">
-              <view class="text-28rpx text-#FF4D3A font-semibold">
+              <view class="w-180rpx flex-shrink-0 text-28rpx text-#FF4D3A font-semibold">
                 <text class="text-20rpx">
                   ￥
                 </text> {{ its.price }}
               </view>
-              <view class="w-300rpx truncate text-24rpx">
+              <view class="w-200rpx flex-shrink-0 truncate text-24rpx">
                 {{ its.goodsName }}
               </view>
-              <view class="text-24rpx text-gray">
+              <view class="flex-shrink-0 text-24rpx text-gray">
                 已售 {{ its.sales }}
               </view>
             </view>

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">