浏览代码

Merge branch 'master' into dev_1.0.5

# Conflicts:
#	src/view/components/font-amount.vue
A\An 2 年之前
父节点
当前提交
f03cf51155
共有 3 个文件被更改,包括 4 次插入3 次删除
  1. 1 1
      src/http/configAPI.js
  2. 1 1
      src/manifest.json
  3. 2 1
      src/view/components/font-amount.vue

+ 1 - 1
src/http/configAPI.js

@@ -1,4 +1,4 @@
-export const appVersionCode = 4
+export const appVersionCode = 5
 
 const api = {
 	production: 'https://api.denetme.net',

+ 1 - 1
src/manifest.json

@@ -2,7 +2,7 @@
     "manifest_version": 3,
     "name": "DeNet",
     "description": "Growing more twitter followers with Denet",
-    "version": "1.0.4",
+    "version": "1.0.5",
     "background": {
         "service_worker": "/js/background.js"
     },

+ 2 - 1
src/view/components/font-amount.vue

@@ -30,7 +30,8 @@ watch(props, () => {
     setFontSize()
 })
 function setFontSize(){
-    let _num = parseInt(props.width / props.amount.length);
+    let amount = getBit(props.amount);
+    let _num = parseInt(props.width / amount.length);
     amount_font_size.value = _num < props.fontSize ? _num : props.fontSize;
 }