lex-xin 4 months ago
parent
commit
c3267cfc9a

+ 7 - 7
miniprogram/pages/buyerInformation/index.ts

@@ -424,10 +424,10 @@ Page({
     this.setData({
     this.setData({
       provinceCode: selectedOptions[0].code,
       provinceCode: selectedOptions[0].code,
       cityCode: selectedOptions[1].code,
       cityCode: selectedOptions[1].code,
-      regionCode: selectedOptions[2]?.code,
-      provinceName: selectedOptions[0].name,
-      cityName: selectedOptions[1].name,
-      regionName: selectedOptions[2]?.name,
+      regionCode: selectedOptions[2]?.code || null,
+      provinceName: selectedOptions[0].name || '',
+      cityName: selectedOptions[1].name || '',
+      regionName: selectedOptions[2]?.name || '',
       showArea: false,
       showArea: false,
 
 
       searchName: '',
       searchName: '',
@@ -579,11 +579,11 @@ Page({
   messageName(value: string) {
   messageName(value: string) {
     const nameReg = /^[\u4E00-\u9FA5]+$/
     const nameReg = /^[\u4E00-\u9FA5]+$/
     if (!value) {
     if (!value) {
-      return '请填写享用者姓名';
+      return '请填写学生姓名';
     } else if (!nameReg.test(value)) {
     } else if (!nameReg.test(value)) {
-      return '享用者姓名必须为中文';
+      return '学生姓名必须为中文';
     } else if (value.length < 2 || value.length > 14) {
     } else if (value.length < 2 || value.length > 14) {
-      return '享用者姓名必须为2~14个字';
+      return '学生姓名必须为2~14个字';
     } else {
     } else {
       return ''
       return ''
     }
     }

+ 4 - 0
miniprogram/pages/orders/order-detail.less

@@ -281,6 +281,8 @@ page {
     font-size: 30rpx;
     font-size: 30rpx;
     color: #000000;
     color: #000000;
     line-height: 42rpx;
     line-height: 42rpx;
+    word-break: break-all;
+      word-wrap: break-word;
   }
   }
 
 
   .address-user {
   .address-user {
@@ -347,6 +349,8 @@ page {
       flex: 1;
       flex: 1;
       text-align: right;
       text-align: right;
       color: #777777;
       color: #777777;
+      word-break: break-all;
+      word-wrap: break-word;
     }
     }
   }
   }
 }
 }

+ 1 - 1
miniprogram/pages/orders/order-detail.ts

@@ -548,7 +548,7 @@ Page({
     this.setData({
     this.setData({
       provinceCode: selectedOptions[0].code,
       provinceCode: selectedOptions[0].code,
       cityCode: selectedOptions[1].code,
       cityCode: selectedOptions[1].code,
-      regionCode: selectedOptions[2]?.code,
+      regionCode: selectedOptions[2]?.code || null,
       provinceName: selectedOptions[0].name || '',
       provinceName: selectedOptions[0].name || '',
       cityName: selectedOptions[1].name || '',
       cityName: selectedOptions[1].name || '',
       regionName: selectedOptions[2]?.name || '',
       regionName: selectedOptions[2]?.name || '',

+ 5 - 1
miniprogram/pages/orders/order-result.less

@@ -724,6 +724,8 @@ page {
     font-size: 30rpx;
     font-size: 30rpx;
     color: #000000;
     color: #000000;
     line-height: 42rpx;
     line-height: 42rpx;
+    word-break: break-all;
+    word-wrap: break-word;
   }
   }
 
 
   .address-user {
   .address-user {
@@ -780,7 +782,9 @@ page {
     .right-value {
     .right-value {
       flex: 1;
       flex: 1;
       text-align: right;
       text-align: right;
+      word-break: break-all;
+      word-wrap: break-word;
       color: #777777;
       color: #777777;
     }
     }
   }
   }
-}
+}