Merge branch 'master' of https://gitee.com/he2802/saas_applet

pages/shopping/shoppingCart.vue

@@ -352,6 +352,12 @@ export default {
 		},
 		checkboxGroupChange(e) {
 			this.checkboxList = e;
+			if(this.checkboxList.length==this.list.length){
+				this.allChecked = true;
+			}else{
+				this.allChecked = false;
+			}
+			console.log(this.checkboxList)
 		},
 		countPrice(list) {},
 		checkboxChange1(e) {

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/confirm_pay.vue

@@ -14,11 +14,17 @@
 							<view class="txt_left">应付金额</view>
 							<view class="txt_right_price">¥ {{item.standPrice}}</view>
 						</view>
-						<u-line color="#D6D6DB"/>
+						<u-line color="#D6D6DB" />
+					</view>
+					<view style="padding:10rpx 30rpx;" >
+						<view class="list_item">
+							<view class="txt_left">应付总金额</view>
+							<view class="txt_right_price">¥ {{totalPrice}}</view>
+						</view>
 					</view>
 				</view>
 				<view class="box3">
-					<view class="title2">支付信息</view>
+					<view class="title2">支付方式</view>
 					<u-line color="#D6D6DB" />
 					<view style="padding:20rpx 30rpx;">
 						<u-radio-group v-model="value" @change="radioGroupChange">
@@ -63,6 +69,7 @@ export default {
 			value:'wepay',
 			btnNo:false,
 			isBK:'',
+			totalPrice:0
 		};
 	},
 	onPullDownRefresh(){
@@ -72,6 +79,9 @@ export default {
 		 console.log(self.shoppingCartList,6)
 		 let list = self.shoppingCartList
 		 this.isBK = option.isBK
+		 for(let i=0;i<list.length;i++){
+			 this.totalPrice+=Number(list[i].standPrice)
+		 }
 		 console.log(this.isBK == '1')
 	},
 	onShow() {

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>