Explorar o código

对口升学显示必刷题

shmily1213 hai 1 mes
pai
achega
290b753dbc

+ 0 - 1
.eslintrc-auto-import.json

@@ -19,7 +19,6 @@
     "WritableComputedRef": true,
     "acceptHMRUpdate": true,
     "computed": true,
-    "createApp": true,
     "createPinia": true,
     "customRef": true,
     "defineAsyncComponent": true,

+ 1 - 0
.gitignore

@@ -68,3 +68,4 @@ package-lock.json
 *bak
 .vscode
 dist
+.hbuilderx

+ 2 - 2
src/pagesStudy/pages/index/compoentns/index-practice-entry.vue

@@ -28,7 +28,7 @@
             <ie-image :is-oss="true" src="/study-bg13.png" custom-class="absolute bottom-0 left-0 w-full h-full z-0"
               mode="aspectFill" />
           </view>
-          <!-- <view class="bg-gradient-to-r from-[#32B5FD] to-[#79DCFD] flex-1 rounded-15 relative overflow-hidden">
+          <view class="bg-gradient-to-r from-[#32B5FD] to-[#79DCFD] flex-1 rounded-15 relative overflow-hidden">
             <view class="mt-30 p-30 z-1 relative">
               <view class="text-30 text-white font-bold">必刷题</view>
               <view class="mt-8 text-24 text-white">高频考题,一网打尽</view>
@@ -39,7 +39,7 @@
             </view>
             <ie-image :is-oss="true" src="/study-bg13.png" custom-class="absolute bottom-0 left-0 w-full h-full z-0"
               mode="aspectFill" />
-          </view> -->
+          </view>
         </template>
         <template v-else>
           <view class="bg-gradient-to-r from-[#0088FE] to-[#31A0FC] flex-1 rounded-15 relative overflow-hidden">

+ 6 - 0
src/uni_modules/uv-icon/components/uv-icon/uv-icon.vue

@@ -120,6 +120,9 @@
 			},
 			// 判断传入的name属性,是否图片路径,只要带有"/"均认为是图片形式
 			isImg() {
+        if (!this.name) {
+          return false;
+        }
 				const isBase64 = this.name.indexOf('data:') > -1 && this.name.indexOf('base64') > -1;
 				return this.name.indexOf('/') !== -1 || isBase64;
 			},
@@ -132,6 +135,9 @@
 			},
 			// 通过图标名,查找对应的图标
 			icon() {
+        if (!this.name) {
+          return '';
+        }
 				// 如果内置的图标中找不到对应的图标,就直接返回name值,因为用户可能传入的是unicode代码
 				const code = icons['uvicon-' + this.name];
 				// #ifdef APP-NVUE

+ 1 - 1
src/utils/uni-helper.js

@@ -9,7 +9,7 @@ export const confirmAsync = async (msgOrOptions) => {
         const defaultOptions = {
             success: res => {
                 if (res.confirm) resolve()
-                else reject('user cancelled')
+                else reject('用户取消操作')
             }
         }
         const options = Object.assign({}, defaultOptions, inputOptions)