tijiao

pages/bookShop/orderLCont.vue

@@ -373,7 +373,18 @@
                   >苹果支付</span
                 >
                 <span style="color: #666" v-if="orderContet.paymentMethod == 4"
-                  >天医币支付</span
+                  >
+                  
+                  <template v-if="orderContet.orderType == 'point'&&orderContet.bookBuyConfigEntity.realMoney>0">
+天医币支付<text v-if="orderContet.jfDeduction>0">&nbsp;+ 积分抵扣</text>
+                  </template>
+                  <template v-else-if="orderContet.realMoney">
+                    天医币支付 <text v-if="orderContet.jfDeduction>0">&nbsp;+ 积分抵扣</text>
+                  </template>
+                 <template v-else-if="orderContet.jfDeduction>0">
+积分抵扣
+                 </template>
+                  </span
                 ></text
               >
             </view>

pages/mine/vip/index.vue

@@ -35,7 +35,7 @@
 				</view>
 				<view class="vip_price" v-if="item.yanqiList&&item.yanqiList.length>0">
 					<text class="font_bold">延期价格：</text>
-					<text class="vip_price_v" v-for="(item_yq, index_yq) in item.yanqiList" :key="index_yq" @click="openorderModal(item_yq,1)">
+					<text class="vip_price_v" v-for="(item_yq, index_yq) in item.yanqiList" :key="index_yq" @click="openorderModal({state:item.state,...item_yq},1)">
 						{{item_yq.year}}年<text>{{item_yq.rebateFee}}</text>元
 					</text>
 				</view>
@@ -118,6 +118,7 @@ export default{
 		},
 		//点击购买
 		openorderModal(item,type) {
+		console.log('item at line 120:', item)
 			if(this.$platform=='ios'){
 				return false
 			}

pages/mine/vip/order.vue

@@ -723,6 +723,7 @@ export default {
       this.dataInfo.lastFee = item.rebateFee;
       this.dataInfo.id = item.id;
       if (this.initData.user && this.initData.user.jf) {
+		this.jfNumber=0
         var totalMoney = this.dataInfo.lastFee;
         if (this.initData.user.jf >= totalMoney) {
           const integerPart = Math.floor(totalMoney);
@@ -731,6 +732,7 @@ export default {
         } else {
           this.jfNumberMax = this.initData.user.jf; // 设置 jfNumberMax
         }
+
       }
       this.$forceUpdate();
     },