Bläddra i källkod

修改样式与问题

lex-xin 5 månader sedan
förälder
incheckning
701d18756a

+ 27 - 11
miniprogram/pages/buyerInformation/index.ts

@@ -238,14 +238,29 @@ Page({
       })
 
       let tempSchoolId = ''
+      let areaIndex = 0
       if (tempList.length > 0) {
-        const first = tempList[0]
-        tempSchoolId = first.value || ''
+        const childIndex = tempList.findIndex((item: any) => this.data.schoolAreaId === item.value)
+        console.log(childIndex, 'childIndex')
+
+        if (childIndex !== -1) {
+          const first = tempList[childIndex]
+          tempSchoolId = first.value || ''
+          areaIndex = childIndex
+        } else {
+          const first = tempList[0]
+          tempSchoolId = first.value || ''
+          areaIndex = 0
+        }
       }
 
       this.setData({
+        schoolAreaIndex: areaIndex,
         schoolAreaList: tempList,
         tempChangeSchoolAreaId: tempSchoolId
+      }, () => {
+        const schoolArea = this.selectComponent('#schoolArea')
+        schoolArea?.setIndexes([areaIndex])
       })
     } catch {
       // 
@@ -326,7 +341,7 @@ Page({
           // 排序班级
           list.classList.sort((a: any, b: any) => a.value - b.value);
           lastGradeList.push(list);
-          
+
         });
         lastGradeList.sort((a: any, b: any) => a.value - b.value);
         gradeClassList = [{
@@ -475,7 +490,7 @@ Page({
       showSchool: true
     })
   },
-  
+
   /** 确定选择学校 */
   onSubmitSchool() {
     if (this.data.tempChangeSchoolAreaId === this.data.schoolAreaId) {
@@ -512,11 +527,12 @@ Page({
     })
   },
   onSearch() {
-    this.setData({
-      schoolAreaIndex: 0
-    }, () => {
-      this.getSchools(this.data.searchName);
-    })
+    // this.setData({
+    //   schoolAreaIndex: 0
+    // }, () => {
+    //   this.getSchools(this.data.searchName);
+    // })
+    this.getSchools(this.data.searchName);
   },
   onSearchChange(e: any) {
     this.setData({
@@ -652,7 +668,7 @@ Page({
           schoolAreaId: params.schoolAreaId,
           defaultStatus: false
         })
-        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({
@@ -664,7 +680,7 @@ Page({
           "schoolAreaId": params.schoolAreaId,
           defaultStatus: false
         })
-        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 } });
       }
 
       this.onSetCatch(params)

+ 1 - 1
miniprogram/pages/buyerInformation/index.wxml

@@ -62,7 +62,7 @@
         <view slot="action" class="searchBtn" bind:tap="onSearch">搜索</view>
       </van-search>
     </view>
-    <van-picker loading="{{ schoolLoading }}" wx:if="{{ !showSchoolAfterLeave && schoolAreaList.length > 0 }}" columns="{{ schoolAreaList }}" bind:change="onChangeSchool" visible-item-count="5" default-index="{{ schoolAreaIndex }}">
+    <van-picker id="schoolArea" loading="{{ schoolLoading }}" wx:if="{{ !showSchoolAfterLeave && schoolAreaList.length > 0 }}" columns="{{ schoolAreaList }}" bind:change="onChangeSchool" visible-item-count="5" default-index="{{ schoolAreaIndex }}">
     </van-picker>
     <view class="empty-box" wx:if="{{ schoolAreaList.length <= 0 }}">
       <view class="empty_loading" wx:if="{{ schoolLoading }}">

+ 1 - 1
miniprogram/pages/download/download.ts

@@ -85,7 +85,7 @@ Page({
     return {
       title: '音乐数字AI',
       path: '/pages/index/index',
-      imageUrl: 'https://oss.dayaedu.com/ktyq/1733309357691.png'
+      imageUrl: 'https://oss.dayaedu.com/ktyq/1739870592907.png'
     }
   },
 })

+ 2 - 2
miniprogram/pages/index/index.ts

@@ -598,14 +598,14 @@ Page({
     return {
       title: "音乐数字AI",
       path: "/pages/index/index",
-      imageUrl: "https://oss.dayaedu.com/ktyq/1733309357691.png",
+      imageUrl: "https://oss.dayaedu.com/ktyq/1739870592907.png",
     };
   },
   onShareTimeline() {
     return {
       title: "音乐数字AI",
       path: "/pages/index/index",
-      imageUrl: "https://oss.dayaedu.com/ktyq/1733309357691.png",
+      imageUrl: "https://oss.dayaedu.com/ktyq/1739870592907.png",
     };
   },
 });

+ 1 - 1
miniprogram/pages/login/login.ts

@@ -135,7 +135,7 @@ Page({
     return {
       title: '音乐数字AI',
       path: '/pages/index/index',
-      imageUrl: 'https://oss.dayaedu.com/ktyq/1733309357691.png'
+      imageUrl: 'https://oss.dayaedu.com/ktyq/1739870592907.png'
     }
   }
 })

+ 13 - 1
miniprogram/pages/orders/order-detail.less

@@ -287,7 +287,8 @@ page {
     color: #000000;
     line-height: 42rpx;
     word-break: break-all;
-      word-wrap: break-word;
+    word-wrap: break-word;
+    max-width: 650rpx;
   }
 
   .address-user {
@@ -295,6 +296,17 @@ page {
     font-size: 28rpx;
     color: #333333;
     line-height: 40rpx;
+    display: flex;
+
+    .username {
+      display: inline-block;
+      word-break: break-all;
+      word-wrap: break-word;
+      max-width: 250rpx;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
 
     text {
       padding-right: 12rpx;

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

@@ -93,10 +93,10 @@ Page({
         }
         infos.name = infos.name ? infos.name + '+' + item.name : item.name
         infos.shopId = item.shopId
-
         const afterPrice: any = formatPrice(item.salePrice)
         infos.goodsList.push({
           ...item,
+          originalPrice: formatPrice(Number(item.originalPrice || 0), 'ALL'),
           ...afterPrice
         })
 
@@ -781,7 +781,7 @@ Page({
     return {
       title: '音乐数字AI',
       path: '/pages/index/index',
-      imageUrl: 'https://oss.dayaedu.com/ktyq/1733309357691.png'
+      imageUrl: 'https://oss.dayaedu.com/ktyq/1739870592907.png'
     }
   }
 })

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

@@ -63,7 +63,7 @@
             {{ receiveAddressInfo.addressDetail }}
           </view>
           <view class="address-user">
-            <text>{{ receiveAddressInfo.name }}</text>
+            <text class="username">{{ receiveAddressInfo.name }}</text>
             <text>{{ receiveAddressInfo.phoneNumber }}</text>
           </view>
         </view>

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

@@ -247,7 +247,7 @@ Page({
     return {
       title: '音乐数字AI',
       path: '/pages/index/index',
-      imageUrl: 'https://oss.dayaedu.com/ktyq/1733309357691.png'
+      imageUrl: 'https://oss.dayaedu.com/ktyq/1739870592907.png'
     }
   },
 })

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

@@ -452,7 +452,7 @@ Page({
     return {
       title: '音乐数字AI',
       path: '/pages/index/index',
-      imageUrl: 'https://oss.dayaedu.com/ktyq/1733309357691.png'
+      imageUrl: 'https://oss.dayaedu.com/ktyq/1739870592907.png'
     }
   },
 })

+ 1 - 1
miniprogram/pages/protocol/register.ts

@@ -99,7 +99,7 @@ Page({
     return {
       title: '音乐数字AI',
       path: '/pages/index/index',
-      imageUrl: 'https://oss.dayaedu.com/ktyq/1733309357691.png'
+      imageUrl: 'https://oss.dayaedu.com/ktyq/1739870592907.png'
     }
   }
 })