Browse Source

修改问题

lex-xin 4 months ago
parent
commit
083fd9f746

+ 0 - 12
miniprogram/pages/buyerInformation/index.ts

@@ -652,12 +652,6 @@ Page({
           schoolAreaId: params.schoolAreaId,
           schoolAreaId: params.schoolAreaId,
           defaultStatus: false
           defaultStatus: false
         })
         })
-
-        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.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 {
       } else {
@@ -670,12 +664,6 @@ Page({
           "schoolAreaId": params.schoolAreaId,
           "schoolAreaId": params.schoolAreaId,
           defaultStatus: false
           defaultStatus: false
         })
         })
-
-        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.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 } });
       }
       }
 
 

+ 7 - 0
miniprogram/pages/index/index.less

@@ -167,6 +167,10 @@ page {
       font-size: 24rpx;
       font-size: 24rpx;
       color: #6d4718;
       color: #6d4718;
       line-height: 34rpx;
       line-height: 34rpx;
+
+      .originPrice text {
+        text-decoration: line-through
+      }
     }
     }
 
 
     .right-bottom {
     .right-bottom {
@@ -705,6 +709,9 @@ page {
     font-size: 24rpx;
     font-size: 24rpx;
     color: #6d4718;
     color: #6d4718;
     line-height: 34rpx;
     line-height: 34rpx;
+    text {
+      text-decoration: line-through;
+    }
   }
   }
 }
 }
 
 

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

@@ -139,7 +139,7 @@
               <view class="right">
               <view class="right">
                 <view class="right-top">
                 <view class="right-top">
                   <block wx:if="{{ selected.originalPrice > selected.salePrice }}">
                   <block wx:if="{{ selected.originalPrice > selected.salePrice }}">
-                    <view class="originPrice">日常价 ¥{{ selected.originalPrice || '0.00' }}</view>
+                    <view class="originPrice">日常价 <text>¥{{ selected.originalPrice || '0.00' }}</text></view>
                     <text style="padding: 0 6rpx">|</text>
                     <text style="padding: 0 6rpx">|</text>
                   </block>
                   </block>
                   <view class="saleNum">已售10W+</view>
                   <view class="saleNum">已售10W+</view>
@@ -177,7 +177,7 @@
                 <image class="combo-item-img" src="{{ item.pic }}"></image>
                 <image class="combo-item-img" src="{{ item.pic }}"></image>
                 <view class="combo-item-name">{{ item.name }}</view>
                 <view class="combo-item-name">{{ item.name }}</view>
                 <view class="combo-item-price">¥ {{ item.showSalePrice }}</view>
                 <view class="combo-item-price">¥ {{ item.showSalePrice }}</view>
-                <view class="combo-item-origin">日常价 ¥ {{ item.showOriginalPrice }}</view>
+                <view class="combo-item-origin">日常价 <text>¥ {{ item.showOriginalPrice }}</text></view>
               </view>
               </view>
             </view>
             </view>
           </view>
           </view>

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

@@ -101,6 +101,10 @@ page {
     font-size: 24rpx;
     font-size: 24rpx;
     color: #6D4718;
     color: #6D4718;
     line-height: 1;
     line-height: 1;
+
+    text {
+      text-decoration: line-through;
+    }
   }
   }
 
 
   .goods-type {
   .goods-type {

+ 5 - 3
miniprogram/pages/orders/order-detail.ts

@@ -452,6 +452,8 @@ Page({
         that.setData({
         that.setData({
           goodsInfo
           goodsInfo
         })
         })
+
+        that.getOrderDetail()
       }
       }
     })
     })
   },
   },
@@ -494,7 +496,7 @@ Page({
       name: '',
       name: '',
       phoneNumber: '',
       phoneNumber: '',
       detailAddress: '',
       detailAddress: '',
-      cityCode: 0,
+      cityCode: null,
       cityName: "",
       cityName: "",
       provinceCode: 0,
       provinceCode: 0,
       provinceName: "",
       provinceName: "",
@@ -660,8 +662,8 @@ Page({
         })
         })
 
 
         this.setData({
         this.setData({
-          receiveAddress: this.data.receiveAddress || data.data,
-          'receiveAddressInfo.addressDetail': addressForm.provinceName + addressForm.cityName + addressForm.regionName + addressForm.detailAddress,
+          receiveAddress: data.data,
+          'receiveAddressInfo.addressDetail': (addressForm.provinceName || '') + (addressForm.cityName || '') + (addressForm.regionName || '') + addressForm.detailAddress,
           'receiveAddressInfo.name': addressForm.name,
           'receiveAddressInfo.name': addressForm.name,
           'receiveAddressInfo.phoneNumber': addressForm.phoneNumber
           'receiveAddressInfo.phoneNumber': addressForm.phoneNumber
         })
         })

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

@@ -17,7 +17,7 @@
                 <text class="priceZ">{{ item.integerPart }}</text>
                 <text class="priceZ">{{ item.integerPart }}</text>
                 <text class="priceF">.{{ item.decimalPart }}</text>
                 <text class="priceF">.{{ item.decimalPart }}</text>
               </view>
               </view>
-              <view class="origin-price">|日常价 ¥ {{item.originalPrice}}</view>
+              <view class="origin-price">|日常价 <text>¥ {{item.originalPrice}}</text></view>
             </view>
             </view>
           </view>
           </view>
         </view>
         </view>
@@ -143,7 +143,7 @@
       </view>
       </view>
 
 
       <van-cell-group border="{{ false }}" class="cell-group">
       <van-cell-group border="{{ false }}" class="cell-group">
-        <van-field model:value="{{ name }}" placeholder="请输入收货人姓名" input-align="right" >
+        <van-field model:value="{{ name }}" placeholder="请输入收货人姓名" maxlength="50" input-align="right" >
           <view class="required" slot="label"><text>*</text>收货人姓名</view>
           <view class="required" slot="label"><text>*</text>收货人姓名</view>
         </van-field>
         </van-field>
         <van-field model:value="{{ phoneNumber }}" type="number" placeholder="请输入手机号码" input-align="right" maxlength="11" >
         <van-field model:value="{{ phoneNumber }}" type="number" placeholder="请输入手机号码" input-align="right" maxlength="11" >

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

@@ -141,6 +141,9 @@ page {
     font-size: 24rpx;
     font-size: 24rpx;
     color: #6D4718;
     color: #6D4718;
     line-height: 1;
     line-height: 1;
+    text {
+      text-decoration: line-through;
+    }
   }
   }
 
 
   .goods-type {
   .goods-type {

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

@@ -25,7 +25,7 @@
               <text class="priceZ">{{ item.integerPart }}</text>
               <text class="priceZ">{{ item.integerPart }}</text>
               <text class="priceF">.{{ item.decimalPart }}</text>
               <text class="priceF">.{{ item.decimalPart }}</text>
             </view>
             </view>
-            <view class="origin-price">|日常价 ¥ {{item.originalPrice}}</view>
+            <view class="origin-price">|日常价 <text>¥ {{item.originalPrice}}</text></view>
           </view>
           </view>
         </view>
         </view>
       </view>
       </view>