tanxue 5 дней назад
Родитель
Сommit
81adfc4f5a

+ 67 - 0
common/styles/global/pages.scss

@@ -914,9 +914,76 @@
 // 资料
 .ezy-ziliao-page{
 	width: 100%;height: 100vh;display: flex;flex-direction: column;
+	padding-bottom: 100rpx;box-sizing: border-box;
+	.zl-card-list{width: 100%;display: flex;flex-direction: column;flex: 1;overflow-y: auto;}
+	.jstx-card-box{
+		border-radius: 16rpx;margin: 0 24rpx 32rpx;font-size: 0;
+		box-shadow: 0 0rpx 6rpx rgba(100, 159, 241, 0.3);
+		.jstx-card-img{width: 100%;height: 400rpx;}
+		.jstx-card-title{
+			padding: 32rpx 24rpx 42rpx;text-align: center;
+			font-size: 32rpx;color: #333;@include single-line-ellipsis;
+		}
+	}
 }
 
 // 资料---数学--计算特训题库下载
 .ezy-jstx-ziliao-page{
 	width: 100%;height: 100vh;display: flex;flex-direction: column;
+	.jstx-body{
+		margin-top: 48rpx;position: relative;overflow: unset;padding: 0 24rpx;box-sizing: border-box;
+		height: calc(100vh - 160rpx - var(--status-bar-height));
+		.jstx-body-title{
+			width: 406rpx;height: 77rpx;display: block;overflow-x:auto;
+			position: absolute;left: 50%;transform: translateX(-50%);top: -28rpx;z-index: 3;
+			@include ezy-no-repeat-cover;background-image: url("@/static/images/ziliao/select-dj-img.png");
+		}
+		
+		.jstx-tab-box{
+			width: 100%;height: 64rpx;white-space: nowrap;padding: 0;
+			text-align:center;margin: 90rpx 0 0;overflow-x: auto;
+			.tab-item{
+				height: 64rpx;line-height: 64rpx;margin: 0 18rpx;padding: 0 20rpx;
+				color: #333;font-size: 36rpx;display: inline-block;text-align:center;}
+			.active{color: #0d7ffc;position: relative;}
+			.active::after{
+				content: '';width: 100%;height: 4rpx;background-color: #0d7ffc;
+				position: absolute;bottom: 0;left: 0;border-radius: 4rpx;
+			}
+		}
+		
+		.jstx-card-list{
+			padding: 24rpx 0 0;overflow-y: auto;flex: 1;
+			.ziliao-card-box{
+				display: flex;align-items: center;justify-content: space-between;box-sizing: border-box;
+				background-color: #f3f3f3;padding: 20rpx;margin-bottom: 24rpx;border-radius: 16rpx;
+				.card-img{width: 150rpx;height: 150rpx;flex-shrink: 0;margin-right: 24rpx;}
+				.card-content-box{
+					flex: 1;line-height: 1.6;
+					.ziliao-name{font-size: 32rpx;color: #333;@include single-line-ellipsis;margin-bottom: 10rpx;}
+					.banben-name{font-size: 28rpx;color: #0d7ffc;@include single-line-ellipsis;}
+				}
+				.card-icon{
+					width: 58rpx;height: 62rpx;flex-shrink: 0;
+					@include ezy-no-repeat-cover;background-image: url("@/static/images/ziliao/jstx-pdf.png");
+				}
+			}
+			
+		}
+	}
+}
+
+// 资料下载弹窗
+.sxtk-sc-dialog{
+	.tip-title{color: #343434;font-size: 38rpx;margin-bottom: 24rpx;}
+	.tip-content-box{
+		width: 625rpx;height: 587rpx;padding: 42rpx 48rpx;
+		background-image: url("@/static/images/my/tk-dialog-bj.png");
+		@include ezy-no-repeat-cover;box-sizing: border-box;text-align:center;
+	}
+	.tip-content{
+		display: flex;align-items: center;
+		min-height: 260rpx;text-align: justify;border-bottom: 1px dashed #70cbf4;
+		margin-bottom: 30rpx;color: #666;font-size: 32rpx;padding-bottom: 32rpx;
+		border-bottom: 1px dashed #70cbf4;line-height: 1.8;}
 }

+ 5 - 0
pages/chanpinZiliao/shuxue/jstxInfo.vue

@@ -91,6 +91,7 @@ function cardBtn(bbItem) {
 
 // 弹窗确认	
 function jstxDialogConfirm() {
+	uni.showLoading({ title: '正在生成试题...' });
 	jisuanPdf({
 	  banbenId:data.banbenId,
 	}).then(res1 => {
@@ -112,12 +113,16 @@ function jstxDialogConfirm() {
 		      },
 			  fail: () => {
 			  	uni.showToast({ title: '无法打开文件', icon: 'none' });
+			  },
+			  complete: () => {
+				  uni.hideLoading();
 			  }
 		    });
 		  }
 		});
 	}).catch(err => {
 		uni.showToast({ title: '生成失败,请稍后重试', icon: 'none' });
+		uni.hideLoading();
 	});
 }
 	

+ 6 - 6
unpackage/dist/cache/.vite/deps/_metadata.json

@@ -1,19 +1,19 @@
 {
-  "hash": "64b32842",
-  "configHash": "4326db84",
-  "lockfileHash": "e3b0c442",
-  "browserHash": "969e594e",
+  "hash": "78e2cbc4",
+  "configHash": "cf70751b",
+  "lockfileHash": "7b43968b",
+  "browserHash": "4a933061",
   "optimized": {
     "ts-md5/dist/md5": {
       "src": "../../../../../node_modules/ts-md5/dist/md5.js",
       "file": "ts-md5_dist_md5.js",
-      "fileHash": "97009b77",
+      "fileHash": "6abade9f",
       "needsInterop": true
     },
     "uview-plus": {
       "src": "../../../../../node_modules/uview-plus/index.js",
       "file": "uview-plus.js",
-      "fileHash": "1cb56964",
+      "fileHash": "adbef8d1",
       "needsInterop": false
     }
   },