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

common/httpList/order.js

@@ -39,5 +39,12 @@ export default {
 			method: 'post',
 			data: data
 		})
+	},
+	refundSmallOrder(data) {
+		return myRequest({
+			url: '/order/refund',
+			method: 'post',
+			data: data
+		})
 	}
 }

components/course/courseChapter.vue

@@ -18,7 +18,11 @@
 							<view class="eTag">{{itemM.doType==1?'练习':'考试'}}</view>
 							<view style="margin-left: 15rpx;">{{itemM.name}}</view>
 						</view>
-						<view v-if="itemM.learning==1" class="tagGreen">已做完</view>
+						<view v-if="isRebuild||itemM.rebuild>0" class="tagRe">待重修</view>
+						<view v-else>
+							<view v-if="itemM.learning==1" class="tagGreen">已做完</view>
+						</view>
+						
 					</view>
 				</view>
 			</view>
@@ -172,6 +176,16 @@ export default {
 </script>
 
 <style scoped>
+
+	.tagRe{
+		width: 80rpx;
+		height: 28rpx;
+		background: #FF3B30;
+		border-radius: 8rpx;
+		font-size: 20rpx;
+		color: #FFFFFF;
+		text-align: center;
+	}
 	.tagGreen{
 		width: 80rpx;
 		height: 28rpx;

pages2/exam/exam_appointment.vue

@@ -188,18 +188,19 @@ export default {
 		isShowFun(times) {
 			var timestamp = parseInt(new Date().getTime() / 1000);
 			var newDataAge = parseInt(new Date(new Date().toLocaleDateString()).getTime() / 1000);
-			if (times.applyEndTime < timestamp) {
+			if (times.applyEndTime <= timestamp) {
 				return false;
 			} else {
 				if (times.beforeStatus === 1) {
 					return false;
-				} else if (times.examStatus !== 0) {
+				} else
+				 if (times.examStatus !== 0) {
 					return false;
-				} else if (times.applySiteExamTime < times.newDataAge) {
-					return false;
-				} else if (times.applySiteExamTime > times.newDataAge) {
+				} else if (times.applySiteExamTime < newDataAge) {
 					return true;
-				} else if (times.applySiteExamTime == times.newDataAge) {
+				} else if (times.applySiteExamTime > newDataAge) {
+					return false;
+				} else if (times.applySiteExamTime == newDataAge) {
 					var hours = new Date().getHours();
 					var mins = new Date().getMinutes();
 					var arrays = times.applySiteStartTime.split('-').map(Number);
@@ -230,6 +231,7 @@ export default {
 			this.details_show = false;
 		},
 		submit() {
+			return
 			var bols = this.isShowFun(this.activeList)
 			if(!bols){
 				uni.showToast({

pages2/order/index.vue

@@ -13,14 +13,19 @@
 					</view>
 					<u-line color="#D6D6DB" />
 					<view
-						style="display: flex;justify-content: space-between;padding: 25rpx 0;border-bottom: 1rpx solid #eee;"
+						style="padding: 25rpx 0;border-bottom: 1rpx solid #eee;"
 						v-for="(items, indexs) in item.orderGoodsList"
 						:key="indexs" @click="goCourse(items,item.orderStatus)"
 					>
-						<image :src="$method.splitImgHost(items.coverUrl)" style="height: 134rpx;width: 278rpx;border-radius: 16rpx;flex-shrink: 0;"></image>
-						<view style="margin-left: 20rpx;flex:1;display: flex;flex-direction: column;">
-							<view style="color: #333333;font-size: 30rpx;font-weight: bold;flex:1">{{ items.goodsName }}</view>
-							<view class="priceTag">¥ {{ items.goodsRealPrice }}</view>
+						<view style="display: flex;justify-content: space-between;">
+							<image :src="$method.splitImgHost(items.coverUrl)" style="height: 134rpx;width: 278rpx;border-radius: 16rpx;flex-shrink: 0;"></image>
+							<view style="margin-left: 20rpx;flex:1;display: flex;flex-direction: column;">
+								<view style="color: #333333;font-size: 30rpx;font-weight: bold;flex:1">{{ items.goodsName }}</view>
+								<view class="priceTag">¥ {{ items.goodsRealPrice }}</view>
+							</view>
+						</view>
+						<view style="display: flex;flex-direction: row-reverse;padding: 10rpx 0;">
+							<view class="btn2" v-if="item.orderFrom === 2&&(item.orderStatus === 1 || item.orderStatus === 2)&&(items.goodsType == '1' || items.goodsType == '2')" @click.stop="refund(item.orderSn,items.goodsId)">退款</view>
 						</view>
 					</view>
 					<view style="height: 80rpx;display: flex;justify-content: space-between;align-items: center;">
@@ -31,8 +36,7 @@
 						</view>
 						<view style="display: flex;align-items: center;">
 							<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="btn2" v-if="item.orderStatus === -1 || item.orderStatus === -2" @click="againBuy(item)">重新购买</view> --> 
 							<view class="btn1" v-if="item.orderStatus === -1 || item.orderStatus === -2" @click="delOrder(item)">删除订单</view>
 							<view class="btn1" @click="closeOrder(item)" v-if="item.orderStatus === 0">取消订单</view>
 						</view>
@@ -96,6 +100,18 @@ export default {
 		this.getFY();
 	},
 	methods: {
+		refund(orderSn,goodsId){
+			let self = this
+			this.$api.refundSmallOrder({orderSn:orderSn,goodsId:goodsId}).then(res => {
+				if(res.data.code==200){
+					uni.showModal({
+						title: "提示",
+						content: res.data.msg,
+						showCancel: false
+					})
+				}
+			});
+		},
 		/**
 		 * 跳转课程
 		 */