wy/wuhu-torn-helper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
Liwanyi 2023-06-15 15:41:05 +08:00
parent d30e4f0d96
commit 207bea46ca
5 changed files with 336 additions and 240 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CHANGELOG.md
View File

@ -5,6 +5,15 @@
# CHANGE # CHANGE
## 1.0.2
2023年06月15日
### 修改
- 错误修复
- 菜单样式修改
## 1.0.1 ## 1.0.1
2023年06月14日 2023年06月14日

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "wuhu-torn-helper", "name": "wuhu-torn-helper",
"version": "1.0.1", "version": "1.0.2",
"description": "芜湖助手", "description": "芜湖助手",
"scripts": { "scripts": {
"release": "cross-env NODE_ENV=production rollup -c && node build.mjs", "release": "cross-env NODE_ENV=production rollup -c && node build.mjs",

12
release.min.user.js
View File

File diff suppressed because one or more lines are too long

31
src/vue/CompanyWithdraw.vue
View File

@ -35,8 +35,10 @@ const deposit = async (amount: number, action: 'deposit' | 'withdraw' = 'deposit
throw new Error('数额不能小于1'); throw new Error('数额不能小于1');
} }
let response: string;
try { try {
await fetch(window.addRFC("https://www.torn.com/companies.php?step=funds"), { response = await (await fetch(window.addRFC("https://www.torn.com/companies.php?step=funds"), {
"headers": { "headers": {
"accept": "*/*", "accept": "*/*",
"content-type": "application/x-www-form-urlencoded; charset=UTF-8", "content-type": "application/x-www-form-urlencoded; charset=UTF-8",
@ -52,14 +54,35 @@ const deposit = async (amount: number, action: 'deposit' | 'withdraw' = 'deposit
"method": "POST", "method": "POST",
"mode": "cors", "mode": "cors",
"credentials": "include" "credentials": "include"
}); })).text();
} catch (e) { } catch (e) {
ElMessage.error('请求出错 ' + e.message); ElMessage.error('请求出错 ' + e.message);
logger.error(e.stack); logger.error(e.stack);
throw e; throw e;
} }
let error: string, text: string;
try {
let json = JSON.parse(response);
error = json.error;
text = json.text;
} catch (e) {
}
if (error) {
ElMessage.error('$' + toThousands(amount) + ' 存取请求失败 ' + text);
logger.error('存取请求失败 ' + text);
throw new Error('存取请求失败 ' + text);
} else {
ElMessage.success('$' + toThousands(amount) + ' 存取请求完成'); ElMessage.success('$' + toThousands(amount) + ' 存取请求完成');
}
if (action === 'deposit') {
inputWithdrawMoney.value = '';
} else {
inputMoney.value = '';
}
updateCompany().then();
updateCash().then();
}; };
onMounted(() => { onMounted(() => {
@ -83,7 +106,7 @@ onMounted(() => {
<el-button @click="async () => inputWithdrawMoney = toThousands(await updateCash())">$</el-button> <el-button @click="async () => inputWithdrawMoney = toThousands(await updateCash())">$</el-button>
</template> </template>
<template #append> <template #append>
<el-button @click="deposit(Number(inputWithdrawMoney.replaceAll(',', '')), 'withdraw')">取出</el-button> <el-button @click="deposit(Number(inputWithdrawMoney.replaceAll(',', '')))">存入</el-button>
</template> </template>
</el-input> </el-input>
</el-form-item> </el-form-item>
@ -97,7 +120,7 @@ onMounted(() => {
<el-button @click="async () => inputMoney = toThousands(await updateCompany())">$</el-button> <el-button @click="async () => inputMoney = toThousands(await updateCompany())">$</el-button>
</template> </template>
<template #append> <template #append>
<el-button @click="deposit(Number(inputMoney.replaceAll(',', '')))">存入</el-button> <el-button @click="deposit(Number(inputMoney.replaceAll(',', '')), 'withdraw')">取出</el-button>
</template> </template>
</el-input> </el-input>
</el-form-item> </el-form-item>

198
src/vue/FloatMenu.vue
View File

@ -1,79 +1,133 @@
<template> <template>
<el-config-provider :size="'default'" :z-index="1000000"> <el-config-provider :size="'default'" :z-index="1000000">
<el-dropdown <!-- <el-dropdown-->
:hide-on-click="false" <!-- :hide-on-click="false"-->
:max-height="(documentHeight * 0.8 | 0) + 'px'" size="small" style="z-index: 1000000;user-select: none" <!-- :max-height="(documentHeight * 0.8 | 0) + 'px'" size="small" style="z-index: 1000000;user-select: none"-->
trigger="click" <!-- trigger="click"-->
> <!-- >-->
<el-button circle class="wh-menu-button"> <el-button circle class="wh-menu-button" @click="expanded=!expanded">
<el-icon> <el-icon>
<MoonNight/> <MoonNight/>
</el-icon> </el-icon>
</el-button> </el-button>
<template #dropdown> <!-- <template #dropdown>-->
<el-dropdown-menu> <!-- <el-dropdown-menu>-->
<el-dropdown-item>芜湖助手</el-dropdown-item> <!-- <el-dropdown-item>芜湖助手</el-dropdown-item>-->
<el-dropdown-item divided> <!-- <el-dropdown-item divided>-->
<el-dropdown placement="bottom-end" size="small" style="width: 100%" trigger="click"> <!-- <el-dropdown placement="bottom-end" size="small" style="width: 100%" trigger="click">-->
<el-button link size="small" style="width: 100%;text-align: left;">💪 快速锻炼 ></el-button> <!-- <el-button link size="small" style="width: 100%;text-align: left;">💪 快速锻炼 ></el-button>-->
<template #dropdown> <!-- <template #dropdown>-->
<el-dropdown-item @click="quickGymTrain.doTrain(BATTLE_STAT.STR)">力量 <!-- <el-dropdown-item @click="quickGymTrain.doTrain(BATTLE_STAT.STR)">力量-->
</el-dropdown-item> <!-- </el-dropdown-item>-->
<el-dropdown-item @click="quickGymTrain.doTrain(BATTLE_STAT.DEF)">防御 <!-- <el-dropdown-item @click="quickGymTrain.doTrain(BATTLE_STAT.DEF)">防御-->
</el-dropdown-item> <!-- </el-dropdown-item>-->
<el-dropdown-item @click="quickGymTrain.doTrain(BATTLE_STAT.SPD)">速度 <!-- <el-dropdown-item @click="quickGymTrain.doTrain(BATTLE_STAT.SPD)">速度-->
</el-dropdown-item> <!-- </el-dropdown-item>-->
<el-dropdown-item @click="quickGymTrain.doTrain(BATTLE_STAT.DEX)">闪避 <!-- <el-dropdown-item @click="quickGymTrain.doTrain(BATTLE_STAT.DEX)">闪避-->
</el-dropdown-item> <!-- </el-dropdown-item>-->
</template> <!-- </template>-->
</el-dropdown> <!-- </el-dropdown>-->
</el-dropdown-item> <!-- </el-dropdown-item>-->
<el-dropdown-item> <!-- <el-dropdown-item>-->
<el-dropdown placement="bottom-end" size="small" style="width: 100%" trigger="click"> <!-- <el-dropdown placement="bottom-end" size="small" style="width: 100%" trigger="click">-->
<el-button link size="small" style="width: 100%;text-align: left;">✈️ 一键起飞 ></el-button> <!-- <el-button link size="small" style="width: 100%;text-align: left;">✈️ 一键起飞 ></el-button>-->
<template #dropdown> <!-- <template #dropdown>-->
<template v-for="travel in travelData"> <!-- <template v-for="travel in travelData">-->
<el-dropdown-item> <!-- <el-dropdown-item>-->
<el-dropdown placement="bottom-end" size="small" style="width: 100%" <!-- <el-dropdown placement="bottom-end" size="small" style="width: 100%"-->
trigger="click"> <!-- trigger="click">-->
<div style="width: 100%">{{ travel.cName }} ></div> <!-- <div style="width: 100%">{{ travel.cName }} ></div>-->
<template #dropdown> <!-- <template #dropdown>-->
<el-dropdown-item @click="travelConfirm(travel.index, 0)"> <!-- <el-dropdown-item @click="travelConfirm(travel.index, 0)">-->
普通飞机 <!-- 普通飞机-->
</el-dropdown-item> <!-- </el-dropdown-item>-->
<el-dropdown-item @click="travelConfirm(travel.index, 1)"> <!-- <el-dropdown-item @click="travelConfirm(travel.index, 1)">-->
PI飞机 <!-- PI飞机-->
</el-dropdown-item> <!-- </el-dropdown-item>-->
<el-dropdown-item @click="travelConfirm(travel.index, 2)"> <!-- <el-dropdown-item @click="travelConfirm(travel.index, 2)">-->
股票飞机 <!-- 股票飞机-->
</el-dropdown-item> <!-- </el-dropdown-item>-->
<el-dropdown-item @click="travelConfirm(travel.index, 3)"> <!-- <el-dropdown-item @click="travelConfirm(travel.index, 3)">-->
商务飞机(机票或内衣店) <!-- 商务飞机(机票或内衣店)-->
</el-dropdown-item> <!-- </el-dropdown-item>-->
</template> <!-- </template>-->
</el-dropdown> <!-- </el-dropdown>-->
</el-dropdown-item> <!-- </el-dropdown-item>-->
</template> <!-- </template>-->
</template> <!-- </template>-->
</el-dropdown> <!-- </el-dropdown>-->
</el-dropdown-item> <!-- </el-dropdown-item>-->
<template v-for="(item, i) in menuItemList"> <!-- <template v-for="(item, i) in menuItemList">-->
<el-dropdown-item v-if="i === 0" divided @click="menuClick(item)"> <!-- <el-dropdown-item v-if="i === 0" divided @click="menuClick(item)">-->
{{ item.title }} <!-- {{ item.title }}-->
</el-dropdown-item> <!-- </el-dropdown-item>-->
<el-dropdown-item v-else @click="menuClick(item)"> <!-- <el-dropdown-item v-else @click="menuClick(item)">-->
{{ item.title }} <!-- {{ item.title }}-->
</el-dropdown-item> <!-- </el-dropdown-item>-->
</template> <!-- </template>-->
<el-dropdown-item @click="bazaarControl.method()">🫵 关闭店铺(双击开启) <!-- <el-dropdown-item @click="bazaarControl.method()">🫵 关闭店铺(双击开启)-->
</el-dropdown-item> <!-- </el-dropdown-item>-->
</el-dropdown-menu> <!-- </el-dropdown-menu>-->
</template> <!-- </template>-->
</el-dropdown> <!-- </el-dropdown>-->
<el-dialog v-model="drawer" :destroy-on-close="true" :fullscreen="isMobilePhone" :lock-scroll="true" <el-dialog v-model="drawer" :destroy-on-close="true" :fullscreen="isMobilePhone" :lock-scroll="true"
:title="drawerTitle" width="65%"> :title="drawerTitle" width="65%">
<component :is="drawerContent"/> <component :is="drawerContent"/>
</el-dialog> </el-dialog>
<el-drawer
v-model="expanded"
:size="isMobilePhone?'85%':'30%'"
direction="rtl"
>
<template #header>
<p>便捷菜单</p>
<el-button link>芜湖助手 v{{ globVars.version.startsWith('$') ? '-1' : globVars.version }}</el-button>
</template>
<el-menu
:unique-opened="true"
class="el-menu-vertical-demo"
>
<el-sub-menu index="1">
<template #title>
<el-icon>✈️</el-icon>
<span>起飞</span>
</template>
<el-sub-menu v-for="(item, i) in travelData" :index="'1-'+(i+1)">
<template #title>{{ item.cName }}</template>
<el-menu-item :index="'1-'+(i+1)+'1'" @click="travelConfirm(item.index, 0)">
普通飞机
</el-menu-item>
<el-menu-item :index="'1-'+(i+1)+'2'" @click="travelConfirm(item.index, 1)">
PI飞机
</el-menu-item>
<el-menu-item :index="'1-'+(i+1)+'3'" @click="travelConfirm(item.index, 2)">
股票飞机
</el-menu-item>
<el-menu-item :index="'1-'+(i+1)+'4'" @click="travelConfirm(item.index, 3)">
商务飞机(机票或内衣店)
</el-menu-item>
</el-sub-menu>
</el-sub-menu>
<el-sub-menu index="2">
<template #title>
<el-icon>💪</el-icon>
<span>锻炼</span>
</template>
<el-menu-item @click="quickGymTrain.doTrain(BATTLE_STAT.STR)">力量
</el-menu-item>
<el-menu-item @click="quickGymTrain.doTrain(BATTLE_STAT.DEF)">防御
</el-menu-item>
<el-menu-item @click="quickGymTrain.doTrain(BATTLE_STAT.SPD)">速度
</el-menu-item>
<el-menu-item @click="quickGymTrain.doTrain(BATTLE_STAT.DEX)">闪避
</el-menu-item>
</el-sub-menu>
<el-menu-item v-for="(item,i) in menuItemList" :index="(3+i).toString()" @click="menuClick(item)">
<el-icon>{{ item.title.slice(0, 2) }}</el-icon>
<span>{{ item.title.slice(2, item.title.length) }}</span>
</el-menu-item>
</el-menu>
</el-drawer>
</el-config-provider> </el-config-provider>
</template> </template>
@ -96,6 +150,7 @@ import PTMarketView from "./PTMarketView.vue";
import QuickCrime from "./QuickCrime.vue"; import QuickCrime from "./QuickCrime.vue";
import VirusProgramming from "./VirusProgramming.vue"; import VirusProgramming from "./VirusProgramming.vue";
import CompanyWithdraw from "./CompanyWithdraw.vue"; import CompanyWithdraw from "./CompanyWithdraw.vue";
import globVars from "../ts/globVars";
const logger = inject(LoggerKey); const logger = inject(LoggerKey);
const quickGymTrain = inject(QuickGymTrainKey); const quickGymTrain = inject(QuickGymTrainKey);
@ -205,16 +260,25 @@ const menuItemList = [
title: '💰 公司存钱', title: '💰 公司存钱',
template: CompanyWithdraw, template: CompanyWithdraw,
}, },
{
title: '🫵 关闭店铺(双击开启)',
template: () => bazaarControl.method(),
},
{ {
title: '⚙️ 插件配置', title: '⚙️ 插件配置',
template: Config, template: Config,
}, },
// {
// title: 'test',
// template: () => expanded.value = !expanded.value,
// },
]; ];
const drawer = ref(false); const drawer = ref(false);
const drawerTitle = ref(''); const drawerTitle = ref('');
const drawerContent = shallowRef(null); const drawerContent = shallowRef(null);
const isMobilePhone = ref(false); const isMobilePhone = ref(false);
const documentHeight = ref(0); const documentHeight = ref(0);
const expanded = ref(false);
// fast travel // fast travel
const travelData = [ const travelData = [
@ -318,7 +382,7 @@ const bazaarControl = {
}; };
onMounted(() => { onMounted(() => {
if (document.documentElement.scrollWidth < 800) { if (document.documentElement.scrollWidth < 600) {
isMobilePhone.value = true; isMobilePhone.value = true;
} }
documentHeight.value = document.documentElement.scrollHeight; documentHeight.value = document.documentElement.scrollHeight;