lex-xin 10 månader sedan
förälder
incheckning
6e6218a279

+ 5 - 0
miniprogram/pages/buyerInformation/index.less

@@ -63,10 +63,15 @@
       color: #CCCCCC;
       font-weight: 600;
     }
+
+    .van-field__body, .van-field__control--right {
+      justify-content: flex-end;
+    }
   }
 
   .gender-section {
     display: flex;
+    align-items: flex-end;
 
     .gender-item {
       margin-left: 24rpx;

+ 8 - 9
miniprogram/pages/buyerInformation/index.ts

@@ -724,21 +724,20 @@ 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 } });
       }
 

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

@@ -20,7 +20,7 @@
         </van-field>
         <van-field border="{{ false }}" input-align="right">
           <view class="required" slot="label"><text>*</text>学生性别</view>
-          <view class="gender-section" slot="button">
+          <view class="gender-section" slot="input">
             <view class="gender-item {{ gender === '1' ? 'active' : '' }}" bind:tap="onCheckGender" data-gender="1">男</view>
             <view class="gender-item {{ gender === '0' ? 'active' : '' }}" bind:tap="onCheckGender" data-gender="0">女</view>
           </view>

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

@@ -40,7 +40,10 @@
               <view>
                 <text class="goods-card" wx:if="{{ item.typePeriod }}">{{ item.typePeriod }}</text>
               </view>
-              <view class="goods-num">优惠前 ¥{{ item.originalPrice }}</view>
+
+              <block wx:if="{{ item.originalPrice > item.salePrice }}">
+                <view class="goods-num">优惠前 ¥{{ item.originalPrice }}</view>
+              </block>
             </view>
           </view>
         </view>

+ 10 - 0
miniprogram/pages/orders/order-result.less

@@ -388,6 +388,7 @@ page {
       font-weight: 400;
       font-size: 28rpx;
       color: #131415;
+      display: block;
     }
 
     .address {
@@ -646,6 +647,15 @@ page {
   .users {
     font-size: 32rpx;
     color: #777;
+    display: flex;
+
+    .username{
+      display: inline-block;
+      max-width: 250rpx;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
 
     text {
       color: #131415;

+ 4 - 2
miniprogram/pages/orders/order-result.wxml

@@ -41,7 +41,9 @@
           <view class="goods-desc">
             <view class="goodsInfo">
               <view class="goods-name">{{ item.goodsName }}</view>
-              <view class="goods-price">¥<text>{{item.originalPrice}}</text></view>
+              <block wx:if="{{ item.originalPrice > item.salePrice }}">
+                <view class="goods-price">¥<text>{{item.originalPrice}}</text></view>
+              </block>
             </view>
             <view class="goods-type">
               <view class="goods-card">{{ item.typeName }}</view>
@@ -69,7 +71,7 @@
 
       <view class="buyUsers">
         <view class="users">
-          <text>{{ goodsInfo.beneficiary.name }}</text>{{ goodsInfo.beneficiary.phoneNumber }}
+          <text class="username">{{ goodsInfo.beneficiary.name }}</text>{{ goodsInfo.beneficiary.phoneNumber }}
         </view>
         <view class="detail">{{goodsInfo.beneficiary.schoolInfo}}</view>
 

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

@@ -164,7 +164,7 @@
       padding-top: 12rpx;
 
       .goods-card {
-        background: #FEEDF0;
+        background: #FFF1E0;
         border-radius: 6rpx;
         font-size: 26rpx;
         color: #FE2451;

+ 3 - 1
miniprogram/pages/orders/orders.wxml

@@ -27,7 +27,9 @@
                   <view>
                     <view class="goods-card" wx:if="{{ item.typeName }}">{{item.typeName}}</view>
                   </view>
-                  <view class="goods-num">优惠前 ¥{{ item.originalPrice }}</view>
+                  <block wx:if="{{ item.originalPrice > item.salePrice }}">
+                    <view class="goods-num">优惠前 ¥{{ item.originalPrice }}</view>
+                  </block>
                 </view>
               </view>
             </view>

+ 8 - 4
miniprogram/pages/select-goods/index.wxml

@@ -17,8 +17,10 @@
           <text class="priceZ">{{ selected.integerPart }}</text>
           <text class="priceF">.{{ selected.decimalPart }}</text>
         </view>
-        <text class="line"></text>
-        <text class="discountPrice">优惠前 ¥{{ selected.originalPrice }}</text>
+        <block wx:if="{{ selected.originalPrice > selected.salePrice  }}">
+          <text class="line"></text>
+          <text class="discountPrice">优惠前 ¥{{ selected.originalPrice }}</text>
+        </block>
       </view>
 
       <!-- <image class="img_back" bind:tap="onBack" src="./images/icon-back.png"></image> -->
@@ -64,8 +66,10 @@
                     <text class="priceZ">{{ item.integerPart }}</text>
                     <text class="priceF">.{{ item.decimalPart }}</text>
                   </view>
-                  <text class="line"></text>
-                  <text class="discountPrice"><text>优惠前</text>¥{{ item.originalPrice }}</text>
+                  <block wx:if="{{ item.originalPrice > item.salePrice }}">
+                    <text class="line"></text>
+                    <text class="discountPrice"><text>优惠前</text>¥{{ item.originalPrice }}</text>
+                  </block>
                 </view>
               </view>
             </view>