更新

miniprogram/pages/address/index.ts

@@ -266,7 +266,7 @@ Page({
       backParams: {
         receiveAddress: addressInfo?.id || '',
         receiveAddressInfo: {
-          addressDetail: addressInfo?.id ? addressInfo.provinceName + addressInfo.cityName + addressInfo.regionName + addressInfo.detailAddress : '',
+          addressDetail: addressInfo?.id ? (addressInfo.provinceName || '') + (addressInfo.cityName || '') + (addressInfo.regionName || '') + addressInfo.detailAddress : '',
           name: addressInfo?.name,
           phoneNumber: addressInfo?.phoneNumber
         }

miniprogram/pages/index/index.ts

@@ -908,6 +908,13 @@ Page({
   },
   /** 确定选择学校 */
   onSubmitSchool() {
+    if(this.data.tempChangeSchoolAreaId === this.data.schoolAreaId) {
+      this.setData({
+        showSchool: false
+      })
+      return
+    }
+
     const detail = this.data.schoolAreaList.find((item: any) => item.value === this.data.tempChangeSchoolAreaId)
     const detailIndex = this.data.schoolAreaList.findIndex((item: any) => item.value === this.data.tempChangeSchoolAreaId)
     // console.log(detail, detailIndex, this.data.tempChangeSchoolAreaId)

miniprogram/pages/orders/order-detail.ts

@@ -563,7 +563,7 @@ Page({
       this.setData({
         receiveAddress: data.data, // 选择的地址信息
         receiveAddressInfo: {
-          addressDetail: addressForm.provinceName + addressForm.cityName + addressForm.regionName + addressForm.detailAddress,
+          addressDetail: (addressForm.provinceName || '') + (addressForm.cityName || '') + (addressForm.regionName || '') + addressForm.detailAddress,
           name: addressForm.name,
           phoneNumber: addressForm.phoneNumber
         }