Bläddra i källkod

🎨 答题插件代码修改接入3和显示细节优化

快乐的梦鱼 2 veckor sedan
förälder
incheckning
75c053eaf5

+ 0 - 5
src/App.vue

@@ -79,11 +79,6 @@ function loadFontFace() {
     family: "HUNdin1451",
     source: 'url("https://mncdn.wenlvti.net/app_static/minnan/fonts/HUN-din1451.woff")',
   });
-  uni.loadFontFace({
-    global: true,
-    family: "iconfont-yunexamine",
-    source: 'url("https://xy.wenlvti.net/app_static/yunexamine/iconfont.woff2")',
-  });
 }
 
 

+ 1 - 1
src/components/display/TextEllipsis.vue

@@ -96,9 +96,9 @@ defineOptions({
     >
       <slot>
         <Text 
+          v-bind="props"
           :ellipsis="true" 
           :lines="currentLines"
-          v-bind="$attrs"
           :text="text"
         />
       </slot>

+ 9 - 3
src/components/feedback/BubbleTip.vue

@@ -2,12 +2,14 @@
   <BubbleBox 
     ref="followBubbleBoxRef"
     v-bind="props"
+    trigger="none"
+    :clickOutSideClose="false"
     @clickOnHolder="emit('contentClick');hideTip()"
   >
     <template #content>
       <FlexRow justify="space-between" align="center">
-        <Text :text="content" v-bind="contentTextProps" :wrap="false" touchable @click="emit('contentClick');hideTip()" />
-        <IconButton v-if="closeButton" v-bind="closeButtonProps" :icon="closeButton" @click="emit('close');hideTip()" />
+        <Text :text="content" v-bind="contentTextProps" :wrap="false" touchable @click="hideTip(true);" />
+        <IconButton v-if="closeButton" v-bind="closeButtonProps" :icon="closeButton" @click="hideTip(false);" />
       </FlexRow>
     </template>
     <slot />
@@ -56,7 +58,11 @@ watch(() => props.show, (newVal) => {
     followBubbleBoxRef.value?.hide();
 });
 
-function hideTip() {
+function hideTip(isContentClick: boolean = false) {
+  if (isContentClick)
+    emit('contentClick');
+  else
+    emit('close');
   emit('update:show', false);
 }
 

+ 4 - 0
src/components/theme/ThemeDefine.ts

@@ -157,6 +157,10 @@ export function useTheme() {
     let keyResolve = getVar(key, key);
     if (keyResolve) {
       key = keyResolve; 
+      if (key.includes('.'))
+        [type, key] = key.split('.');
+      if (isSpecialColor(keyResolve))
+        return keyResolve;
       group = theme.value.colorConfigs[type || 'default'];
       if (!group) 
         group = theme.value.colorConfigs['default'];

+ 1 - 1
src/pages/home/village/games/index.vue

@@ -47,7 +47,7 @@ const gamesLoader = useSimpleDataLoader(async () => {
       id: 1,
       name: '知识竞赛',
       image: 'https://xy.wenlvti.net/app_static/images/home/games/Games1.png',
-      link: 'https://xy.wenlvti.net/app_static/yunexamine#/pages/home/index',
+      link: 'https://xy.wenlvti.net/app_static/yunexamine/index.html#/pages/home/index',
       unlock: true,
     },
     {

+ 2 - 2
src/pages/user/index.vue

@@ -108,12 +108,12 @@ function doLogout() {
 }
 function goStoreList() {
   requireLogin(() => navTo('/pages/article/web/ewebview', {
-    url: 'https://xy.wenlvti.net/app_static/yunexamine#/pages/gift/order'
+    url: 'https://xy.wenlvti.net/app_static/yunexamine/index.html#/pages/gift/order'
   }), '登录后查看我的哦');
 }
 function goStore() {
   requireLogin(() => navTo('/pages/article/web/ewebview', {
-    url: 'https://xy.wenlvti.net/app_static/yunexamine#/pages/gift/index'
+    url: 'https://xy.wenlvti.net/app_static/yunexamine/index.html#/pages/gift/index'
   }), '登录后查看我的哦');
 }