修改样式

miniprogram/pages/address/address-detail.wxml

@@ -13,7 +13,7 @@
     <van-field value="{{ provinceName ? provinceName + '/' + cityName + (regionName ? '/' + regionName : '' )  : '' }}" placeholder-style="color: #C0C0C0" placeholder="省、市、区" readonly bind:tap="onShowAreaList">
       <view class="required" slot="label">所在地区<text>*</text></view>
     </van-field>
-    <van-field model:value="{{ detailAddress }}" type="textarea" placeholder-style="color: #C0C0C0" placeholder="小区、门牌号等" input-class="textarea" autosize maxlength="100">
+    <van-field model:value="{{ detailAddress }}" type="textarea" placeholder-style="color: #C0C0C0" placeholder="小区、门牌号等" input-class="textarea" autosize="{{ { maxHeight: 80, minHeight: 24 } }}" maxlength="100" >
       <view class="required" slot="label">详细地址<text>*</text></view>
     </van-field>
   </van-cell-group>

miniprogram/pages/buyerInformation/index.less

@@ -82,6 +82,7 @@
       color: rgba(254, 70, 0, 0.5);
       width: 104rpx;
       line-height: 48rpx;
+      height: 48rpx;
       text-align: center;
 
       &.active {

miniprogram/pages/buyerInformation/index.wxml

@@ -28,7 +28,7 @@
         <van-field value="{{ currentGradeTxt }}" input-align="right"  placeholder="请选择年级" is-link readonly bind:tap="onSelectGradeClass" >
           <view class="required" slot="label"><text>*</text>所在年级</view>
         </van-field>
-        <van-field value="{{ currentClassTxt }}" input-align="right" placeholder="请选择班级" is-link readonly bind:tap="onSelectClass" >
+        <van-field border="{{false}}" value="{{ currentClassTxt }}" input-align="right" placeholder="请选择班级" is-link readonly bind:tap="onSelectClass" >
           <view class="required" slot="label"><text>*</text>所在班级</view>
         </van-field>
       </view>

miniprogram/pages/orders/order-detail.less

@@ -140,6 +140,8 @@ page {
       font-weight: 400;
       font-size: 28rpx;
       color: #131415;
+      word-wrap: break-word;
+      word-break: break-all;
     }
 
     .address {
@@ -204,7 +206,8 @@ page {
   .goodsInfo {
     display: flex;
     justify-content: space-between;
-    padding-top: 10rpx;
+    align-items: center;
+    padding-top: 12rpx;
 
     .goods-name {
       flex: 1 auto;
@@ -280,8 +283,8 @@ page {
       color: #AAA;
       line-height: 36rpx;
       // text {
-        // font-weight: bold;
-        // padding-left: 6rpx;
+      // font-weight: bold;
+      // padding-left: 6rpx;
       // }
     }
   }
@@ -448,7 +451,7 @@ page {
     color: #777;
     display: flex;
 
-    .username{
+    .username {
       display: inline-block;
       max-width: 250rpx;
       white-space: nowrap;
@@ -676,7 +679,8 @@ page {
     text {
       padding-left: 6rpx;
       font-weight: bold;
-      & + text {
+
+      &+text {
         padding-left: 4rpx;
       }
     }

miniprogram/pages/orders/order-result.less

@@ -100,7 +100,8 @@ page {
   .goodsInfo {
     display: flex;
     justify-content: space-between;
-    padding-top: 10rpx;
+    align-items: center;
+    padding-top: 12rpx;
 
     .goods-name {
       flex: 1 auto;
@@ -393,6 +394,7 @@ page {
 
   .selected {
     width: 100%;
+
     .users {
       font-weight: 400;
       font-size: 28rpx;
@@ -400,6 +402,7 @@ page {
       display: block;
       // width: 600rpx;
       word-wrap: break-word;
+      word-break: break-all;
     }
 
     .address {
@@ -628,7 +631,7 @@ page {
     color: #777;
     display: flex;
 
-    .username{
+    .username {
       display: inline-block;
       max-width: 250rpx;
       white-space: nowrap;

miniprogram/pages/orders/orders.less

@@ -129,7 +129,8 @@
     .goodsInfo {
       display: flex;
       justify-content: space-between;
-      padding-top: 10rpx;
+      align-items: center;
+      padding-top: 12rpx;
 
       .goods-name {
         flex: 1 auto;

miniprogram/pages/orders/orders.wxml

@@ -13,7 +13,7 @@
         <view class="list-item-group">
           <view class="list-item" wx:for="{{recordList}}" wx:key="index" data-orderno="{{item.orderNo}}" data-wechatstatus="{{item.wechatStatus}}" bind:tap="onDetail">
             <view class="item-top">
-              <view class="item-mid">订单号：{{ item.orderNo }}</view>
+              <view class="item-mid">订单编号：{{ item.orderNo }}</view>
               <text class="{{ item.wechatStatus == 'WAIT_PAY' ? 'red' : item.wechatStatus == 'CLOSED' ? 'cancel' : '' }}">{{ item.statusName }}</text>
             </view>
             <view class="item-content" wx:for="{{item.studentPaymentOrderDetails}}" wx:key="studentIndex">

miniprogram/pages/select-goods/index.ts

@@ -12,6 +12,7 @@ Page({
     backParams: null as any,
     instrumentList: [] as any,
     list: [] as any,
+    submitDisabled: false, // 提交
     isOverSaled: false, // 是否所有商品都没有库存
     smallGoods: {}, // 最小金额商品
     selected: {} as any,
@@ -232,56 +233,59 @@ Page({
       })
       return
     }
-    debounce(function () {
-      if (!that.isLogin()) {
-        return
-      }
-      const params = [] as any
-      const selected = that.data.selected
-      if (selected.id) {
-        params.push({
-          pic: selected.pic,
-          name: selected.name,
-          period: selected.period,
-          num: selected.num,
-          originalPrice: selected.originalPrice,
-          salePrice: selected.salePrice,
-          shopId: selected.shopId,
-          id: selected.id,
-          goodsType: 'ACTIVATION_CODE', // INSTRUMENTS
-        })
-      }
-      const selectedInstrument = that.data.selectedInstrument
-      if (selectedInstrument.id) {
-        params.push({
-          pic: selectedInstrument.pic,
-          name: selectedInstrument.name,
-          period: selectedInstrument?.period,
-          num: selectedInstrument?.num || 0,
-          originalPrice: selectedInstrument.originalPrice,
-          salePrice: selectedInstrument.salePrice,
-          shopId: selectedInstrument.shopId,
-          id: selectedInstrument.id,
-          goodsType: 'INSTRUMENTS', // INSTRUMENTS
-        })
-      }
-
-      let info = JSON.stringify({
-        ...params
-      });
-      info = encodeURIComponent(info);
 
-      console.log(params, "params")
-      wx.navigateTo({
-        url: `../orders/order-detail?orderInfo=${info}&userBeneficiaryId=${that.data.userBeneficiaryId}`,
-        success: () => {
-          that.setData({
-            popupShow: false,
-            currentIndex: 1,
-          })
-        }
+    if (!that.isLogin() || that.data.submitDisabled) {
+      return
+    }
+    that.setData({
+      submitDisabled: true
+    })
+    const params = [] as any
+    const selected = that.data.selected
+    if (selected.id) {
+      params.push({
+        pic: selected.pic,
+        name: selected.name,
+        period: selected.period,
+        num: selected.num,
+        originalPrice: selected.originalPrice,
+        salePrice: selected.salePrice,
+        shopId: selected.shopId,
+        id: selected.id,
+        goodsType: 'ACTIVATION_CODE', // INSTRUMENTS
+      })
+    }
+    const selectedInstrument = that.data.selectedInstrument
+    if (selectedInstrument.id) {
+      params.push({
+        pic: selectedInstrument.pic,
+        name: selectedInstrument.name,
+        period: selectedInstrument?.period,
+        num: selectedInstrument?.num || 0,
+        originalPrice: selectedInstrument.originalPrice,
+        salePrice: selectedInstrument.salePrice,
+        shopId: selectedInstrument.shopId,
+        id: selectedInstrument.id,
+        goodsType: 'INSTRUMENTS', // INSTRUMENTS
       })
-    }, 500)()
+    }
+
+    let info = JSON.stringify({
+      ...params
+    });
+    info = encodeURIComponent(info);
+
+    console.log(params, "params")
+    wx.navigateTo({
+      url: `../orders/order-detail?orderInfo=${info}&userBeneficiaryId=${that.data.userBeneficiaryId}`,
+      success: () => {
+        that.setData({
+          popupShow: false,
+          currentIndex: 1,
+          submitDisabled: false
+        })
+      }
+    })
   },
   /** 添加购买人 */
   onAddBuyer() {

miniprogram/pages/select-goods/index.wxml

@@ -111,7 +111,7 @@
         <text>¥ {{formatSelectGood.showSalePrice}}</text>
       </view>
       <view class="btnGroup">
-        <button type="primary" catch:tap="onSubmit" disabled="{{ isOverSaled }}">
+        <button type="primary" catch:tap="onSubmit" disabled="{{ isOverSaled || submitDisabled }}">
           <view class="btn-prices">
             <text class="text">立即支付</text>
             <text class="stuff">¥</text>