he2802 3 жил өмнө
parent
commit
b9e68ce1b5

+ 0 - 1
common/signature.js

@@ -77,7 +77,6 @@ class Handwriting {
 	}
 	// 笔迹移动
 	uploadScaleMove(event) {
-		console.log('move');
 		let e = event.mp
 		if (e.type != 'touchmove') return false;
 		if (e.cancelable) {

+ 2 - 2
pages2/bank/question_report.vue

@@ -131,7 +131,7 @@ export default {
 							context1.fillText(`满分${this.reportdata.totalScore}`, caculateX * 90, caculateX * 130, caculateX * 180);
 							context1.arc(caculateX * 90, caculateX * 90, caculateX * 80, 0, (this.reportdata.performance / this.reportdata.totalScore) * 2 * Math.PI, false);
 							context1.stroke();
-							context1.draw(true);
+							context1.draw();
 						}
 						
 						if(this.reportdata.examTime) {
@@ -154,7 +154,7 @@ export default {
 							context2.fillText(`限时${this.reportdata.examTime}'`, caculateX * 90, caculateX * 130, caculateX * 180);
 							context2.arc(caculateX * 90, caculateX * 90, caculateX * 80, 0, (this.reportdata.doTime / this.reportdata.examTime) * 2 * Math.PI, false);
 							context2.stroke();
-							context2.draw(true);
+							context2.draw();
 						}
 						
 						

+ 12 - 1
pages2/order/index.vue

@@ -15,7 +15,7 @@
 					<view
 						style="display: flex;justify-content: space-between;padding: 25rpx 0;border-bottom: 1rpx solid #eee;"
 						v-for="(items, indexs) in item.orderGoodsList"
-						:key="indexs"
+						: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;">
@@ -95,6 +95,17 @@ export default {
 		this.getFY();
 	},
 	methods: {
+		/**
+		 * 跳转课程
+		 */
+		goCourse(item,orderStatus) {
+			if(orderStatus == 1 || orderStatus == 2) {
+				
+				uni.navigateTo({
+					url:'/pages2/wd/course?id='+item.goodsId
+				})
+			}
+		},
 		resumeOrder(item){
 			let data = {orderSn:item.orderSn}
 			this.$api.resumeSmallOrder(data).then(res => {