1

package-lock.json

@@ -832,9 +832,9 @@
       }
     },
     "cqk-sy-ui": {
-      "version": "1.2.64",
-      "resolved": "https://registry.npmjs.org/cqk-sy-ui/-/cqk-sy-ui-1.2.64.tgz",
-      "integrity": "sha512-6vZyt9Go7q6dEkiLwU+BF+syjVx1m2eGL3LIS6vtQqlNhw62dJByIdZ/ZPnJJ8+nIqzkQ7dK9fa7sxq7ML1ejg==",
+      "version": "1.2.73",
+      "resolved": "https://registry.npmjs.org/cqk-sy-ui/-/cqk-sy-ui-1.2.73.tgz",
+      "integrity": "sha512-Mb/lU3DkPSGUl0ARFqfBqV1UsSAhQtekiD8r5QBsrFK1CKf/Wwi36V4YnjvWfM94++P4Y72A8o6mQj9DeJEPow==",
       "requires": {
         "axios": "^0.26.1",
         "crypto-js": "^4.1.1",

package.json

@@ -17,7 +17,7 @@
     "@chenfengyuan/vue-countdown": "^2.0.0",
     "axios": "^0.26.1",
     "comlink": "^4.3.1",
-    "cqk-sy-ui": "^1.2.64",
+    "cqk-sy-ui": "^1.2.73",
     "crypto-js": "^4.1.1",
     "dom-to-image": "^2.6.0",
     "element-plus": "^2.1.9",

src/components/HorizontalListWrapper/index.vue

@@ -37,16 +37,22 @@
   </div>
 </template>
 <script lang="ts" setup>
-import { nextTick, onMounted, ref, watch } from "vue";
+import { nextTick, onMounted, Ref, ref, watch } from "vue";
 import Icon from "../Icon/index.vue";
-import { useMutationObserver, useScroll } from "@vueuse/core";
+import {
+  MaybeElement,
+  MaybeElementRef,
+  MaybeRef,
+  useMutationObserver,
+  useScroll,
+} from "@vueuse/core";
 
 const isTightlyConnectedToLeft = ref(false);
 const isTightlyConnectedToRight = ref(false);
-const containerRef = ref<HTMLDivElement | null>(null);
+const containerRef = ref<Element | null>(null);
 
 useMutationObserver(
-  containerRef,
+  containerRef as MaybeElementRef<MaybeElement>,
   () => {
     nextTick(() => {
       setArrowStatus();
@@ -77,7 +83,7 @@ const setArrowStatus = () => {
     10;
 };
 
-const { isScrolling } = useScroll(containerRef);
+const { isScrolling } = useScroll(containerRef as MaybeRef<HTMLElement>);
 
 watch(isScrolling, () => {
   if (isScrolling.value === false) {
@@ -93,7 +99,7 @@ const goToRight = () => {
   if (
     containerRef.value!.scrollWidth -
       (containerRef.value!.scrollLeft + containerRef.value!.clientWidth) <=
-    300
+    (containerRef.value?.clientWidth! / 3) * 2
   )
     emit("toAlmostEnd");
 };

src/views/TemplateManagement/components/EditCategoryDialog/index.vue

@@ -98,7 +98,7 @@
       :oldName="oldName"
       :oldID="oldID"
       @close="renameShow = false"
-      @update=""
+      @update="refetch"
     />
   </syCommonDialog>
 </template>
@@ -107,8 +107,12 @@
 import { showTip } from "@/components/GlobalMount/api";
 import { btns } from "@/config/btns";
 import { $ajax } from "@/service";
-import { syCommonDialog, syScrollBar, GO_URLS } from "cqk-sy-ui";
-import { ElMessage } from "element-plus";
+import {
+  syCommonDialog,
+  syScrollBar,
+  GO_URLS,
+  syMessage as ElMessage,
+} from "cqk-sy-ui";
 import { ref, watch } from "vue";
 import { iFolder } from "../CategoryList/types";
 import Rename from "../Rename/index.vue";

src/views/TemplateManagement/components/Rename/index.vue

@@ -12,8 +12,7 @@
 
 <script lang="ts">
 import { $ajax } from "@/service";
-import { GO_URLS, syDialogInput } from "cqk-sy-ui";
-import { ElMessage } from "element-plus";
+import { GO_URLS, syDialogInput, syMessage as ElMessage } from "cqk-sy-ui";
 import { defineComponent } from "vue";
 export default defineComponent({
   components: {

src/views/TemplateManagement/index.vue

@@ -248,13 +248,26 @@ const {
   },
 });
 
+let focusInTheTagAfterLoad = false;
 watch(categoryList, (nv, ov) => {
-  if (ov.length === 0) {
+  async function findFocus(id: number) {
+    const the = categoryList.value.find((i) => i.id === id);
+    if (!the) {
+      fetchNextPageOfCategory();
+    }
+  }
+  findFocus(focusedCategoryId.value);
+  if (!focusInTheTagAfterLoad) {
     nextTick(() => {
       const els = categoryListRef.value?.getEls()!;
-      const index = els.findIndex((i) => i.id === focusedCategoryId.value);
-      els[index]?.el.scrollIntoView();
-      els[index + 1]?.el.scrollIntoView();
+      let index = els.findIndex((i) => i.id === focusedCategoryId.value);
+      if (index === -1) return;
+      focusInTheTagAfterLoad = true;
+      if (els[index + 1]?.el) {
+        els[index + 1]?.el.scrollIntoView();
+      } else {
+        els[index]?.el.scrollIntoView();
+      }
     });
   }
 });

src/views/Tracing/tracingManagement/components/ProofTable/constants.ts

@@ -11,6 +11,7 @@ export const columns = [
     prop: "",
     label: "创建时间",
     slotName: "date",
+    width: "150px",
   } as iTableColumn,
   {
     prop: "qrcode",

src/views/Tracing/tracingManagement/components/ProofTable/index.vue

@@ -20,12 +20,7 @@
             })
           "
         >
-          <img
-            src="@/assets/img/box.svg"
-            style="margin-right: 4px"
-            alt=""
-            srcset=""
-          />
+          <img src="@/assets/img/box.svg" class="mr-3" alt="" srcset="" />
           <div class="text-ellipsis overflow-hidden">
             {{ slotProps.name }}
             <span v-if="slotProps.increment_num + 1 >= 2"

src/views/userCenter/choosePackage/index.vue

@@ -86,10 +86,7 @@
               2、套餐选购：按需购买套餐，套餐金额越大，单价越低，根据您的上链数量进行选购；
             </p>
             <p>
-              3、为避免账户大量囤积，账户的上链次数使用完才能进行下一次充值；
-            </p>
-            <p>
-              4、充值未完成时请不要切换账户，或者退出，否则可能出现充值不到账的情况；
+              3、充值未完成时请不要切换账户，或者退出，否则可能出现充值不到账的情况；
             </p>
           </div>
           <!-- 订单列表 -->

src/views/userCenter/components/Secutiry/ChangePwdDialog/index.vue

@@ -55,6 +55,7 @@ import { globalState } from "@/store/state";
 import { editPassword, sendSms, sendEmail } from "@/service/Api.service";
 import { ElMessage } from "element-plus";
 import CollectPwd from "../../../../../components/Form/Collect/CollectPwd.vue";
+import md5 from "js-md5";
 const passwordStatus = inject<any>("passwordStatus");
 const props = defineProps<{
   visible: boolean;
@@ -104,7 +105,7 @@ const handleClickConfirm = async () => {
     const res = await editPassword({
       email: globalState.userInfos.email,
       phone: globalState.userInfos.phone,
-      pwd: PwdStatus.value.value,
+      pwd: md5(String(PwdStatus.value.value) + md5(String(PwdStatus.value.value.length))),
       code: codeStatus.value.value,
       code_type: globalState.userInfos.phone !== "" ? 0 : 1,
     });