积分支付

pages/order-detail/order-detail.wxss

@@ -281,7 +281,7 @@ page {
 }
 
 .prod-item .item-cont .prod-info .prodname {
-  font-size: 28rpx;
+  font-size: 30rpx;
   line-height: 40rpx;
   max-height: 86rpx;
   overflow: hidden;

pages/orderList/orderList.wxss

@@ -200,7 +200,8 @@ padding: 0 24rpx;
 }
 
 .prod-item .item-cont .prod-info .prodname {
-  font-size: 32rpx;
+  font-size: 28rpx;
+  color: #222;
   line-height: 34rpx;
   max-height: 68rpx;
   display: -webkit-box;

pages/submit-order/submit-order.js

@@ -46,6 +46,8 @@ Page({
     shop_weight: 0,
     is_distance:false,
     dvyType:'',//配送方式
+    totalAvailableScore:0,//可用积分
+    totalUsableScore:0,//积分抵扣金额
   },
 
   /**
@@ -186,6 +188,8 @@ Page({
           scorePlaceholder: `使用${res.totalUsableScore}积分抵扣${res.totalScoreAmount}元`,
           shopUseScore: res.shopUseScore, // 店铺积分抵扣比例; 
           isPurePoints: res.actualTotal == 0 ? true : false,
+          totalUsableScore:res.totalUsableScore,
+          totalAvailableScore:res.totalAvailableScore,
         });
         this.getDeliveryAmount()
       },
@@ -240,13 +244,13 @@ Page({
    * 提交订单校验
    */
   toPay: function () {
-    if (this.data.actualTotal < this.data.deliveryAmount_num) {
-      wx.showToast({
-        title: '商品总额需大于起送价~',
-        icon: "none"
-      })
-      return;
-    }
+    // if (this.data.actualTotal < this.data.deliveryAmount_num) {
+    //   wx.showToast({
+    //     title: '商品总额需大于起送价~',
+    //     icon: "none"
+    //   })
+    //   return;
+    // }
     if (!this.data.userAddr) {
       wx.showToast({
         title: '请选择地址',

pages/submit-order/submit-order.wxml

@@ -186,13 +186,21 @@
         </view>
         <!-- 积分 -->
         <view class='item'>
+          <view class='item-tit'>积分({{totalAvailableScore}})：</view>
+          <view class='item-txt price'>
+            <text class='symbol'>-￥</text>
+            <text class='big-num'>{{wxs.parsePrice(totalUsableScore)[0]}}</text>
+            <text class='small-num'>.{{wxs.parsePrice(totalUsableScore)[1]}}</text>
+          </view>
+        </view>
+        <!-- <view class='item'>
           <view class='item-tit'>积分：</view>
           <view class='item-txt price'>
             <text class='symbol'>-￥</text>
             <text class='big-num'>{{wxs.parsePrice(orderReduce)[0]}}</text>
             <text class='small-num'>.{{wxs.parsePrice(orderReduce)[1]}}</text>
           </view>
-        </view>
+        </view> -->
         <!-- 优惠金额 -->
         <!-- <view class='item'>
           <view class='item-tit'>总优惠金额：</view>

pages/submit-order/submit-order.wxss

@@ -300,7 +300,8 @@ radio.item-group .wx-radio-input{
 }
 
 .prod-item .item-cont .prod-info .prodname {
-  font-size: 30rpx;
+  font-size: 28rpx;
+  color: #222;
   line-height: 40rpx;
   max-height: 86rpx;
   overflow: hidden;