fix:冲突修改

pages_home/components/setupUserCopy/Add.vue

@@ -1,98 +1,41 @@
 <template>
   <view>
-    <up-form
-      labelPosition="left"
-      :model="modelForm"
-      :rules="rulesForm"
-      ref="formRef"
-    >
+    <up-form labelPosition="left" :model="modelForm" :rules="rulesForm" ref="formRef">
       <up-form-item label="姓名" prop="name" borderBottom labelWidth="70">
-        <up-input
-          v-model="modelForm.name"
-          border="none"
-          placeholder="请输入姓名"
-        ></up-input>
+        <up-input v-model="modelForm.name" border="none" placeholder="请输入姓名"></up-input>
       </up-form-item>
-      <up-form-item
-        label="性别"
-        prop="sex"
-        borderBottom
-        @click="() => (sexFlag = true)"
-        labelWidth="70"
-      >
-        <up-input
-          v-model="displaySex"
-          disabled
-          disabledColor="#ffffff"
-          placeholder="请选择性别"
-          border="none"
-        ></up-input>
+      <up-form-item label="性别" prop="sex" borderBottom @click="() => (sexFlag = true)" labelWidth="70">
+        <up-input v-model="displaySex" disabled disabledColor="#ffffff" placeholder="请选择性别" border="none"></up-input>
         <template #right>
           <up-icon name="arrow-right"></up-icon>
         </template>
       </up-form-item>
-      <up-form-item
-        label="关系"
-        prop="label"
-        borderBottom
-        @click="() => (labelFlag = true)"
-        labelWidth="70"
-      >
-        <up-input
-          v-model="modelForm.label"
-          disabled
-          disabledColor="#ffffff"
-          placeholder="请选择关系"
-          border="none"
-        ></up-input>
+      <up-form-item label="关系" prop="label" borderBottom @click="() => (labelFlag = true)" labelWidth="70">
+        <up-input v-model="modelForm.label" disabled disabledColor="#ffffff" placeholder="请选择关系"
+          border="none"></up-input>
         <template #right>
           <up-icon name="arrow-right"></up-icon>
         </template>
       </up-form-item>
       <up-form-item label="年龄" prop="age" borderBottom labelWidth="70">
-        <up-input
-          v-model="modelForm.age"
-          border="none"
-          placeholder="请输入年龄"
-        ></up-input>
+        <up-input v-model="modelForm.age" border="none" placeholder="请输入年龄"></up-input>
       </up-form-item>
-      <up-form-item
-        label="手机号"
-        prop="telephone"
-        borderBottom
-        labelWidth="70"
-      >
-        <up-input
-          v-model="modelForm.telephone"
-          border="none"
-          placeholder="请输入手机号"
-        ></up-input>
+      <up-form-item label="手机号" prop="telephone" borderBottom labelWidth="70">
+        <up-input v-model="modelForm.telephone" border="none" placeholder="请输入手机号"></up-input>
       </up-form-item>
-      <up-form-item
-        label="地区"
-        prop="area"
-        borderBottom
-        @click="() => (addressShow = true)"
-        labelWidth="70"
-      >
-        <pickerAddress
-          @change="addressChange"
-          :selectValue="[
+      <up-form-item label="地区" prop="area" borderBottom @click="() => (addressShow = true)" labelWidth="70">
+        <pickerAddress @change="addressChange" :selectValue="[
             modelForm.provinceInd,
             modelForm.cityInd,
             modelForm.districtInd,
-          ]"
-        >
-          <view
-            class="inp"
-            :class="
+          ]">
+          <view class="inp" :class="
               modelForm.provinceName &&
               modelForm.cityName &&
               modelForm.districtName
                 ? ''
                 : 'address-inp'
-            "
-          >
+            ">
             {{ modelForm.provinceName ? modelForm.provinceName : '省' }} /
             {{ modelForm.cityName ? modelForm.cityName : '市' }} /
             {{ modelForm.districtName ? modelForm.districtName : '区' }}
@@ -103,25 +46,16 @@
         </template>
       </up-form-item>
       <up-form-item label="地址" prop="address" borderBottom labelWidth="70">
-        <up-input
-          v-model="modelForm.address"
-          border="none"
-          placeholder="请输入地址"
-        ></up-input>
+        <up-input v-model="modelForm.address" border="none" placeholder="请输入地址"></up-input>
+      </up-form-item>
+      <up-form-item label="地址" prop="detailAddress" borderBottom labelWidth="70">
+        <up-input v-model="modelForm.detailAddress" border="none" placeholder="请输入地址"></up-input>
       </up-form-item>
     </up-form>
-    <up-action-sheet
-      :show="sexFlag"
-      :actions="sexOptions"
-      @select="sexSelect"
-      @close="sexFlag = false"
-    ></up-action-sheet>
-    <up-action-sheet
-      :show="labelFlag"
-      :actions="relaTionsHip"
-      @select="sexSelectsHip"
-      @close="labelFlag = false"
-    ></up-action-sheet>
+    <up-action-sheet :show="sexFlag" :actions="sexOptions" @select="sexSelect"
+      @close="sexFlag = false"></up-action-sheet>
+    <up-action-sheet :show="labelFlag" :actions="relaTionsHip" @select="sexSelectsHip"
+      @close="labelFlag = false"></up-action-sheet>
   </view>
 </template>
 
@@ -138,6 +72,7 @@ const modelForm = ref({
   label: '',
   age: '',
   telephone: '',
+  detailAddress:'',
 
   provinceName: '', // 省
   provinceCode: '',

pages_mine/components/setupUser/Add.vue

@@ -1,32 +1,11 @@
 <template>
   <view>
-    <up-form
-      labelPosition="left"
-      :model="modelForm"
-      :rules="rulesForm"
-      ref="formRef"
-    >
+    <up-form labelPosition="left" :model="modelForm" :rules="rulesForm" ref="formRef">
       <up-form-item label="姓名" prop="name" borderBottom labelWidth="70">
-        <up-input
-          v-model="modelForm.name"
-          border="none"
-          placeholder="请输入姓名"
-        ></up-input>
+        <up-input v-model="modelForm.name" border="none" placeholder="请输入姓名"></up-input>
       </up-form-item>
-      <up-form-item
-        label="性别"
-        prop="sex"
-        borderBottom
-        @click="() => (sexFlag = true)"
-        labelWidth="70"
-      >
-        <up-input
-          v-model="displaySex"
-          disabled
-          disabledColor="#ffffff"
-          placeholder="请选择性别"
-          border="none"
-        ></up-input>
+      <up-form-item label="性别" prop="sex" borderBottom @click="() => (sexFlag = true)" labelWidth="70">
+        <up-input v-model="displaySex" disabled disabledColor="#ffffff" placeholder="请选择性别" border="none"></up-input>
         <template #right>
           <up-icon name="arrow-right"></up-icon>
         </template>
@@ -50,49 +29,23 @@
         </template>
       </up-form-item> -->
       <up-form-item label="年龄" prop="age" borderBottom labelWidth="70">
-        <up-input
-          v-model="modelForm.age"
-          border="none"
-          placeholder="请输入年龄"
-        ></up-input>
+        <up-input v-model="modelForm.age" border="none" placeholder="请输入年龄"></up-input>
       </up-form-item>
-      <up-form-item
-        label="手机号"
-        prop="telephone"
-        borderBottom
-        labelWidth="70"
-      >
-        <up-input
-          v-model="modelForm.telephone"
-          border="none"
-          placeholder="请输入手机号"
-        ></up-input>
+      <up-form-item label="手机号" prop="telephone" borderBottom labelWidth="70">
+        <up-input v-model="modelForm.telephone" border="none" placeholder="请输入手机号"></up-input>
       </up-form-item>
-      <up-form-item
-        label="地区"
-        prop="area"
-        borderBottom
-        @click="() => (addressShow = true)"
-        labelWidth="70"
-      >
-        <pickerAddress
-          @change="addressChange"
-          :selectValue="[
-            modelForm.provinceInd,
-            modelForm.cityInd,
-            modelForm.districtInd,
-          ]"
-        >
-          <view
-            class="inp"
-            :class="
-              modelForm.provinceName &&
+      <up-form-item label="地区" prop="area" borderBottom @click="() => (addressShow = true)" labelWidth="70">
+        <pickerAddress @change="addressChange" :selectValue="[
+          modelForm.provinceInd,
+          modelForm.cityInd,
+          modelForm.districtInd,
+        ]">
+          <view class="inp" :class="modelForm.provinceName &&
               modelForm.cityName &&
               modelForm.districtName
-                ? ''
-                : 'address-inp'
-            "
-          >
+              ? ''
+              : 'address-inp'
+            ">
             {{ modelForm.provinceName ? modelForm.provinceName : '省' }} /
             {{ modelForm.cityName ? modelForm.cityName : '市' }} /
             {{ modelForm.districtName ? modelForm.districtName : '区' }}
@@ -103,25 +56,16 @@
         </template>
       </up-form-item>
       <up-form-item label="地址" prop="address" borderBottom labelWidth="70">
-        <up-input
-          v-model="modelForm.address"
-          border="none"
-          placeholder="请输入地址"
-        ></up-input>
+        <up-input v-model="modelForm.address" border="none" placeholder="请输入地址"></up-input>
+      </up-form-item>
+      <up-form-item label="门牌号" prop="detailAddress" borderBottom labelWidth="70">
+        <up-input v-model="modelForm.detailAddress" border="none" placeholder="请输入地址"></up-input>
       </up-form-item>
     </up-form>
-    <up-action-sheet
-      :show="sexFlag"
-      :actions="sexOptions"
-      @select="sexSelect"
-      @close="sexFlag = false"
-    ></up-action-sheet>
-    <up-action-sheet
-      :show="labelFlag"
-      :actions="relaTionsHip"
-      @select="sexSelectsHip"
-      @close="labelFlag = false"
-    ></up-action-sheet>
+    <up-action-sheet :show="sexFlag" :actions="sexOptions" @select="sexSelect"
+      @close="sexFlag = false"></up-action-sheet>
+    <up-action-sheet :show="labelFlag" :actions="relaTionsHip" @select="sexSelectsHip"
+      @close="labelFlag = false"></up-action-sheet>
   </view>
 </template>
 
@@ -138,6 +82,7 @@ const modelForm = ref({
   label: '',
   age: '',
   telephone: '',
+  detailAddress:'',
 
   provinceName: '', // 省
   provinceCode: '',
@@ -185,6 +130,12 @@ const rulesForm = ref({
     message: '请填写手机号',
     trigger: ['blur', 'change'],
   },
+  detailAddress: {
+    type: 'string',
+    required: true,
+    message: '请填写门牌号',
+    trigger: ['blur', 'change'],
+  },
 })
 
 let sexFlag = ref(false)
@@ -317,7 +268,7 @@ function getAdcodeByCoordinates(latitude, longitude) {
 // 点击地址图标，选择位置并获取省市区编码
 async function onCityWx() {
   wx.chooseLocation({
-    success: async function (res) {
+    success: async function(res) {
       try {
         console.log('选择的地址:', res);
 
@@ -344,7 +295,7 @@ async function onCityWx() {
         });
       }
     },
-    fail: function (err) {
+    fail: function(err) {
       console.error('选择位置失败:', err);
       uni.showToast({
         title: '获取地址失败',