修改订单展示问题

pages/bookShop/orderLCont.vue

@@ -367,6 +367,7 @@
                     </span></text
                   >
                 </template>
+				<template v-if="orderContet.realMoney == 0&&orderContet.jfDeduction==0">￥0</template>
                 <text
                   style="margin: 0 4rpx"
                   v-if="

pages/bookShop/orderList.vue

@@ -300,7 +300,7 @@
                           "
                         >
                           <text style="font-size: 20rpx">￥</text>
-                          {{ item2.product.price ? item2.product.price : "" }}
+                          <text v-if="item2.product.price>=0">{{item2.product.price}}</text>
                         </view>
                       </view>
                       <view class="btns flexbox" style="margin-top: 10rpx">
@@ -368,22 +368,26 @@
                         <text v-if="slotProps.row.orderType == 'point'">
                           {{ slotProps.row.bookBuyConfigEntity.realMoney }}
                         </text>
-                        <text v-if="slotProps.row.realMoney > 0 &&slotProps.row.orderType != 'point'">
+                       <text v-if="slotProps.row.orderType != 'point'">
+                       	<text v-if="slotProps.row.realMoney && slotProps.row.realMoney > 0">
                        	  ￥{{ slotProps.row.realMoney }}
                        	</text>
+                       	<text v-if="slotProps.row.realMoney==0&&slotProps.row.jfDeduction==0">
+                       	  ￥0
+                       	</text>
+                       	
                        	<text
                        	  style="margin: 0 4rpx"
                        	  v-if="
                        	    slotProps.row.realMoney > 0 &&
-                            slotProps.row.jfDeduction > 0  &&slotProps.row.orderType != 'point'
+                       	    slotProps.row.jfDeduction > 0
                        	  "
                        	>
                        	  +
                        	</text>
+                       </text>
 
-                        <text v-if="slotProps.row.jfDeduction > 0  &&slotProps.row.orderType != 'point'"
+                        <text v-if="slotProps.row.jfDeduction > 0">{{ slotProps.row.jfDeduction }} 积分</text>
-                          >{{ slotProps.row.jfDeduction }} 积分</text
-                        >
                       </view>
                     </view>
                   </view>

pages/component/commonComponents/orderSubmit.vue

@@ -406,12 +406,10 @@
           <template slot="leftSlot" slot-scope="slotProps">
             <view class="price_box order_bottom_box">
               <text class="price"
-                >合计:
+                >合计：
-  
+				<text class="total" v-if="actualPayment==0">{{jfNumber}}积分</text>
-                <text class="total">
+                <text class="total" v-else>
-                  <template v-if="actualPayment > 0">
                   ￥{{ Number(actualPayment).toFixed(2) }}
-                  </template>
                   <text
                     style="margin: 0 4rpx"
                     v-if="actualPayment > 0 && jfNumber > 0"

pages/order/index.vue

@@ -309,7 +309,7 @@ export default {
 		},
 		//积分输入
 		handleChangejf(val) {
-		  var value = val;
+		  var value = String(val);
 		  this.$nextTick(() => {
 		    // 1. 只允许数字字符，并去掉小数点后的部分
 		    value = value.replace(/[^0-9.]/g, ""); // 删除非数字和小数点字符
@@ -362,7 +362,6 @@ export default {
 		},
 		//获取总金额
 		getTotalPrice(userInfo) {
-			console.log(userInfo,'22222222222222222')
 			if (userInfo.jf >= this.options.price) {
 				this.jfNumber = this.options.price;
 				this.jfNumberMax = this.options.price;