Browse Source

fix:冲突修改

jiayubo 3 days ago
parent
commit
7c857e9264

+ 2 - 1
pages_home/components/volunteerData/adresss.vue

@@ -124,6 +124,7 @@ function handleChane(addressId, item) {
     cityCode,
     districtCode,
     provinceCode,
+    detailAddress
   } = item
 
   const params = `address=${encodeURIComponent(
@@ -140,7 +141,7 @@ function handleChane(addressId, item) {
     cityCode
   )}&districtCode=${encodeURIComponent(
     districtCode
-  )}&provinceCode=${encodeURIComponent(provinceCode)}`
+  )}&provinceCode=${encodeURIComponent(provinceCode)}&detailAddress=${encodeURIComponent(detailAddress)}`
 
   // 使用拼接的查询参数进行页面跳转
   uni.navigateTo({

+ 57 - 54
pages_home/pages/selectAddress/edit.vue

@@ -1,57 +1,59 @@
 <template>
-	<view>
-		<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-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>
-				<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>
-				<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-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>
-			<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'">
-						{{modelForm.provinceName ? modelForm.provinceName:'省'}} /
-						{{modelForm.cityName ? modelForm.cityName:'市'}} /
-						{{modelForm.districtName ? modelForm.districtName:'区'}}
-					</view>
-				</pickerAddress>
-				<template #right>
-					<up-icon name="map" size="22" @click="onCityWx"></up-icon>
-				</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-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>
-		<view class="Wrapper-Btn">
-			<up-button @click="handleQux" type="error" :plain="true" :hairline="true" text="取消"
-				:customStyle="hadlClickEdit"></up-button>
-			<up-button type="error" @click="handleSubmit" text="编辑" :customStyle="hadlClickEdit" />
-		</view>
-	</view>
+  <view>
+    <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-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>
+        <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>
+        <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-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>
+      <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'">
+            {{modelForm.provinceName ? modelForm.provinceName:'省'}} /
+            {{modelForm.cityName ? modelForm.cityName:'市'}} /
+            {{modelForm.districtName ? modelForm.districtName:'区'}}
+          </view>
+        </pickerAddress>
+        <template #right>
+          <up-icon name="map" size="22" @click="onCityWx"></up-icon>
+        </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-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>
+    <view class="Wrapper-Btn">
+      <up-button @click="handleQux" type="error" :plain="true" :hairline="true" text="取消"
+        :customStyle="hadlClickEdit"></up-button>
+      <up-button type="error" @click="handleSubmit" text="编辑" :customStyle="hadlClickEdit" />
+    </view>
+  </view>
 </template>
 
 <script setup>
@@ -83,7 +85,8 @@
 			options.label = decodeURIComponent(decodeURIComponent(options.label || ''));
 			options.provinceName = decodeURIComponent(decodeURIComponent(options.provinceName || ''));
 			options.name = decodeURIComponent(decodeURIComponent(options.name || ''));
-			options.address = decodeURIComponent(decodeURIComponent(options.address || ''));
+      options.address = decodeURIComponent(decodeURIComponent(options.address || ''));
+      options.detailAddress = decodeURIComponent(decodeURIComponent(options.detailAddress || ''));
 			modelForm.value = {
 				...modelForm.value,
 				...options,

+ 57 - 54
pages_mine/pages/selectAddress/edit.vue

@@ -1,57 +1,59 @@
 <template>
-	<view>
-		<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-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>
-				<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>
-				<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-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>
-			<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'">
-						{{modelForm.provinceName ? modelForm.provinceName:'省'}} /
-						{{modelForm.cityName ? modelForm.cityName:'市'}} /
-						{{modelForm.districtName ? modelForm.districtName:'区'}}
-					</view>
-				</pickerAddress>
-				<template #right>
-					<up-icon name="map" size="22" @click="onCityWx"></up-icon>
-				</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-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>
-		<view class="Wrapper-Btn">
-			<up-button @click="handleQux" type="error" :plain="true" :hairline="true" text="取消"
-				:customStyle="hadlClickEdit"></up-button>
-			<up-button type="error" @click="handleSubmit" text="编辑" :customStyle="hadlClickEdit" />
-		</view>
-	</view>
+  <view>
+    <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-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>
+        <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>
+        <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-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>
+      <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'">
+            {{modelForm.provinceName ? modelForm.provinceName:'省'}} /
+            {{modelForm.cityName ? modelForm.cityName:'市'}} /
+            {{modelForm.districtName ? modelForm.districtName:'区'}}
+          </view>
+        </pickerAddress>
+        <template #right>
+          <up-icon name="map" size="22" @click="onCityWx"></up-icon>
+        </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-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>
+    <view class="Wrapper-Btn">
+      <up-button @click="handleQux" type="error" :plain="true" :hairline="true" text="取消"
+        :customStyle="hadlClickEdit"></up-button>
+      <up-button type="error" @click="handleSubmit" text="编辑" :customStyle="hadlClickEdit" />
+    </view>
+  </view>
 </template>
 
 <script setup>
@@ -83,7 +85,8 @@
 			options.label = decodeURIComponent(decodeURIComponent(options.label || ''));
 			options.provinceName = decodeURIComponent(decodeURIComponent(options.provinceName || ''));
 			options.name = decodeURIComponent(decodeURIComponent(options.name || ''));
-			options.address = decodeURIComponent(decodeURIComponent(options.address || ''));
+      options.address = decodeURIComponent(decodeURIComponent(options.address || ''));
+      options.detailAddress = decodeURIComponent(decodeURIComponent(options.detailAddress || ''));
 			modelForm.value = {
 				...modelForm.value,
 				...options,

+ 2 - 1
pages_mine/pages/selectAddress/index.vue

@@ -85,6 +85,7 @@ const hadlClickTo = (item) => {
     cityCode,
     districtCode,
     provinceCode,
+    detailAddress,
   } = item
 
   const params = `address=${encodeURIComponent(
@@ -101,7 +102,7 @@ const hadlClickTo = (item) => {
     cityCode
   )}&districtCode=${encodeURIComponent(
     districtCode
-  )}&provinceCode=${encodeURIComponent(provinceCode)}`
+    )}&provinceCode=${encodeURIComponent(provinceCode)}&detailAddress=${encodeURIComponent(detailAddress)}`
 
   // 使用拼接的查询参数进行页面跳转
   uni.navigateTo({