build

miniprogram/pages/buyerInformation/index.ts

@@ -478,6 +478,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)
@@ -651,7 +658,8 @@ Page({
           icon: 'none'
         })
 
-        prevPage?.setData({ backParams: { userBeneficiaryId: data.data.id, name: params.name, phone: params.phone, schoolInfo:  params.provinceName || '' + params.cityName || '' + params.regionName || '' + params.schoolAreaName + params.currentGradeClassTxt } });
+        prevPage?.setData({ backParams: { userBeneficiaryId: data.data.id, name: params.name, phone: params.phone, schoolInfo:  (params.provinceName || '') + (params.cityName || '') + (params.regionName || '') + params.schoolAreaName + params.currentGradeClassTxt } });
+
       } else {
         const { data } = await api_userBeneficiarySave({
           "phone": params.phone,

miniprogram/pages/index/index.less

@@ -458,6 +458,7 @@ page {
       font-size: 28rpx;
       color: #131415;
       line-height: 48rpx;
+      text-align: justify;
     }
 
     .content2 {

miniprogram/pages/orders/order-detail.ts

@@ -642,7 +642,7 @@ Page({
         })
 
         this.setData({
-          'receiveAddressInfo.addressDetail': addressForm.provinceName + addressForm.cityName + addressForm.regionName + addressForm.detailAddress,
+          'receiveAddressInfo.addressDetail': (addressForm.provinceName || '') + (addressForm.cityName || '') + (addressForm.regionName || '') + addressForm.detailAddress,
           'receiveAddressInfo.name': addressForm.name,
           'receiveAddressInfo.phoneNumber': addressForm.phoneNumber
         })