Merge branch 'master' of gitee.com:yoimiya-kokomi/miao-plugin

 Conflicts:

	components/models/Artifact.js

apps/admin.js

@@ -175,7 +175,7 @@ export async function updateMiaoPlugin(e) {
       e.reply("喵喵更新失败！\nError code: " + error.code + "\n" + error.stack + "\n 请稍后重试。");
       return true;
     }
-    e.reply("喵喵更新成功，尝试重新启动Yunzai以应用更新...");
+    e.reply("喵喵更新成功，正在尝试重新启动Yunzai以应用更新...");
     timer && clearTimeout(timer);
     redis.set("miao:restart-msg", JSON.stringify({
       msg: "重启成功，新版喵喵已经生效",

resources/character/artis.html

@@ -12,7 +12,7 @@
 
   {{each artis ds}}
   <div class="item arti">
-    {{if ds.name && ds.main && ds.main[0] && ds.main[0]!="undefined"}}
+    {{if ds && ds.name && ds.main && ds.main[0] && ds.main[0]!="undefined"}}
     <div class="avatar">
       <img src="{{_res_path}}meta/character/{{ds.avatar}}/side.png" onerror="whenError(this)"/>
     </div>

resources/character/detail.html

@@ -119,7 +119,7 @@
 
   {{each artis ds}}
   <div class="item arti">
-    {{if ds.name }}
+    {{if ds && ds.name }}
     <div class="arti-icon">
       <img src="{{_sys_res_path}}/genshin/logo/reliquaries/{{ds.name}}.png"/>
       <span>+{{ds.level}}</span>