1

miniprogram/pages/buyerInformation/index.less

@@ -105,10 +105,13 @@
     font-size: 36rpx;
     background: linear-gradient(90deg, #544F4A 0%, #302F2B 100%);
     box-shadow: 0rpx 14rpx 14rpx 0rpx rgba(0, 0, 0, 0.18);
-    border-radius: 30rpx;
+    border-radius: 40rpx;
     border: 8rpx solid #FFFFFF;
     box-sizing: border-box;
   }
+  button[disabled] {
+    color: #FEFFCA !important;
+  }
 }
 
 .van-picker__toolbar,
@@ -148,7 +151,7 @@ toolbar-confirm {
   }
 
   .van-search {
-    margin: 40rpx 26rpx 26rpx !important;
+    margin: 30rpx 26rpx 26rpx !important;
     padding: 0 !important;
     height: 70rpx !important;
     background: #F6F6F6 !important;

miniprogram/pages/buyerInformation/index.ts

@@ -707,11 +707,11 @@ Page({
         schoolAreaId: params.schoolAreaId,
         defaultStatus: false
       }
-      const userBeneficiary = {
-        name: params.name,
-        phoneNumber: params.phone,
-        schoolInfo: (params.provinceName || '') + (params.cityName || '') + (params.regionName || '') + params.schoolAreaName + params.currentGradeTxt + params.currentClassTxt
-      }
+      // const userBeneficiary = {
+      //   name: params.name,
+      //   phoneNumber: params.phone,
+      //   schoolInfo: (params.provinceName || '') + (params.cityName || '') + (params.regionName || '') + params.schoolAreaName + params.currentGradeTxt + params.currentClassTxt
+      // }
       this.setData({
         buyerLoading: true
       })
@@ -724,32 +724,37 @@ Page({
           id: params.userBeneficiaryId,
           ...objs
         })
-        // wx.showToast({
-        //   title: '保存成功',
-        //   icon: 'none'
-        // })
+        wx.showToast({
+          title: '保存成功',
+          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.currentGradeTxt + params.currentClassTxt } });
       } else {
         const { data } = await api_userBeneficiarySave({
           ...objs
         })
 
-        // wx.showToast({
-        //   title: '保存成功',
-        //   icon: 'none'
-        // })
+        wx.showToast({
+          title: '保存成功',
+          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.currentGradeTxt + params.currentClassTxt } });
       }
-
       this.onSetCatch(params)
-      wx.navigateBack()
+      setTimeout(() => {
+        wx.navigateBack()
+        this.setData({
+          buyerLoading: false
+        })
+      }, 1000);
     } catch {
       //
+      this.setData({
+        buyerLoading: false
+      })
     }
 
-    this.setData({
-      buyerLoading: false
-    })
+
   },
   /** 设置缓存 */
   onSetCatch(params: any) {

miniprogram/pages/buyerInformation/index.wxml

@@ -36,7 +36,7 @@
   </scroll-view>
 
   <view class="btnGroup">
-    <button type="primary" bind:tap="onSubmit">
+    <button type="primary" disabled="{{ buyerLoading }}" bind:tap="onSubmit">
       确认
     </button>
   </view>
@@ -59,7 +59,7 @@
         <view slot="action" class="searchBtn" bind:tap="onSearch">搜索</view>
       </van-search>
     </view>
-    <van-picker id="schoolArea" loading="{{ schoolLoading }}" wx:if="{{ !showSchoolAfterLeave && schoolAreaList.length > 0 }}" columns="{{ schoolAreaList }}" bind:change="onChangeSchool" visible-item-count="4" 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 }}">

miniprogram/pages/select-goods/index.less

@@ -104,6 +104,7 @@
       .stuff {
         font-size: 32rpx;
         padding: 0 4rpx;
+        line-height: 1.2;
       }
 
       .priceZ {
@@ -373,7 +374,7 @@
 
           .priceZ {
             font-size: 44rpx;
-            line-height: 1.1;
+            line-height: 1;
           }
 
           .priceF {
@@ -456,7 +457,7 @@
 }
 
 .popupBottom {
-  box-shadow: 0rpx 4rpx 8rpx 0rpx rgba(0, 0, 0, 0.5);
+  box-shadow: 0rpx 4rpx 8rpx 0rpx rgba(0, 0, 0, 0.25);
   padding: 24rpx 24rpx 50rpx;
   position: relative;
   top: 1;