fix 购物车

pages2/bank/my_question.vue

@@ -12,12 +12,14 @@
 						<image src="/static/icon/wk_icon2.png" class="wk_icon"></image>
 						学习有效期：<text class="content"> {{$method.timestampToTime(item.studyStartTime)}} - {{$method.timestampToTime(item.studyEndTime)}} </text>
 					</view>
+					
 				</view>
 			<!-- </navigator> -->
 				<view class="bottomBox">
+					<view style="color: #999999;font-size: 24rpx;">刷题进度：{{item.doNum}}/{{item.totalNum}}</view>
 					<view class="box_progress">
 						<view style="width: 60%;">
-							<u-line-progress :show-percent="false" active-color="#007AFF" :percent="item.doNum/item.totalNum"></u-line-progress>
+							<u-line-progress :show-percent="false" active-color="#007AFF" :percent="(item.doNum/item.totalNum)*100"></u-line-progress>
 						</view>
 						<view>
 							<!-- <navigator  hover-class="none" :url="'/pages2/bank/question_detail?id='+item.goodsId"> -->

pages2/order/index.vue

@@ -30,7 +30,7 @@
 							<text style="color:#ff2d55;font-size: 30rpx;font-weight: bold;">￥{{ item.payPrice }}</text>
 						</view>
 						<view style="display: flex;align-items: center;">
-							<view class="btn2" v-if="item.orderStatus === 0" @click="resumeOrder(item)">继续支付</view>
+							<view class="btn2" v-if="item.orderStatus === 0&&item.orderFrom === 2" @click="resumeOrder(item)">继续支付</view>
 							<!-- <view class="btn2" v-if="item.orderStatus === -1 || item.orderStatus === -2" @click="againBuy(item)">重新购买</view> -->
 							<view class="btn2" v-if="item.orderStatus === 1 || item.orderStatus === 2">退款</view>
 							<view class="btn1" v-if="item.orderStatus === -1 || item.orderStatus === -2" @click="delOrder(item)">删除订单</view>