回退 'Pull Request !505 : 【修复】el-input、el-select、el-date-picker宽度；el-radio的label属性兼容下个版本；优化iframe布局'

src/views/mall/trade/afterSale/index.vue

@@ -81,7 +81,7 @@
         <el-date-picker
           v-model="queryParams.createTime"
           :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-280px"
+          class="!w-260px"
           end-placeholder="自定义时间"
           start-placeholder="自定义时间"
           type="daterange"

src/views/mall/trade/brokerage/user/BrokerageOrderListDialog.vue

@@ -12,8 +12,8 @@
         <el-form-item label="用户类型" prop="level">
           <el-radio-group v-model="queryParams.level" @change="handleQuery">
             <el-radio-button checked>全部</el-radio-button>
-            <el-radio-button value="1">一级推广人</el-radio-button>
-            <el-radio-button value="2">二级推广人</el-radio-button>
+            <el-radio-button label="1">一级推广人</el-radio-button>
+            <el-radio-button label="2">二级推广人</el-radio-button>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="状态" prop="status">

src/views/mall/trade/brokerage/user/BrokerageUserListDialog.vue

@@ -12,8 +12,8 @@
         <el-form-item label="用户类型" prop="level">
           <el-radio-group v-model="queryParams.level" @change="handleQuery">
             <el-radio-button checked>全部</el-radio-button>
-            <el-radio-button value="1">一级推广人</el-radio-button>
-            <el-radio-button value="2">二级推广人</el-radio-button>
+            <el-radio-button label="1">一级推广人</el-radio-button>
+            <el-radio-button label="2">二级推广人</el-radio-button>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="绑定时间" prop="bindUserTime">

src/views/mall/trade/config/index.vue

@@ -82,7 +82,7 @@
               <el-radio
                 v-for="dict in getIntDictOptions(DICT_TYPE.BROKERAGE_ENABLED_CONDITION)"
                 :key="dict.value"
-                :value="dict.value"
+                :label="dict.value"
               >
                 {{ dict.label }}
               </el-radio>
@@ -99,7 +99,7 @@
               <el-radio
                 v-for="dict in getIntDictOptions(DICT_TYPE.BROKERAGE_BIND_MODE)"
                 :key="dict.value"
-                :value="dict.value"
+                :label="dict.value"
               >
                 {{ dict.label }}
               </el-radio>

src/views/mall/trade/delivery/express/ExpressForm.vue

@@ -25,7 +25,7 @@
           <el-radio
             v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
             :key="dict.value"
-            :value="dict.value"
+            :label="dict.value"
           >
             {{ dict.label }}
           </el-radio>

src/views/mall/trade/delivery/expressTemplate/ExpressTemplateForm.vue

@@ -15,7 +15,7 @@
           <el-radio
             v-for="dict in getIntDictOptions(DICT_TYPE.EXPRESS_CHARGE_MODE)"
             :key="dict.value"
-            :value="dict.value"
+            :label="dict.value"
           >
             {{ dict.label }}
           </el-radio>

src/views/mall/trade/delivery/pickUpStore/PickUpStoreForm.vue

@@ -20,7 +20,7 @@
               <el-radio
                 v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
                 :key="dict.value"
-                :value="dict.value"
+                :label="dict.value"
               >
                 {{ dict.label }}
               </el-radio>
@@ -106,8 +106,14 @@
       <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
       <el-button @click="dialogVisible = false">取 消</el-button>
     </template>
-    <el-dialog v-model="mapDialogVisible" title="获取经纬度" append-to-body>
-      <IFrame class="h-609px" :src="tencentLbsUrl" />
+    <el-dialog
+      v-model="mapDialogVisible"
+      title="获取经纬度"
+      append-to-body
+      width="500px"
+      class="mapBox"
+    >
+      <iframe id="mapPage" width="100%" height="100%" frameborder="0" :src="tencentLbsUrl"></iframe>
     </el-dialog>
   </Dialog>
 </template>
@@ -260,3 +266,8 @@ onMounted(async () => {
   await initTencentLbsMap()
 })
 </script>
+<style lang="scss">
+.mapBox .el-dialog__body {
+  height: 640px !important;
+}
+</style>

src/views/mall/trade/order/form/OrderDeliveryForm.vue

@@ -3,8 +3,8 @@
     <el-form ref="formRef" v-loading="formLoading" :model="formData" label-width="80px">
       <el-form-item label="发货方式">
         <el-radio-group v-model="expressType">
-          <el-radio border value="express">快递物流</el-radio>
-          <el-radio border value="none">无需发货</el-radio>
+          <el-radio border label="express">快递物流</el-radio>
+          <el-radio border label="none">无需发货</el-radio>
         </el-radio-group>
       </el-form-item>
       <template v-if="expressType === 'express'">