diff --git a/index.html b/index.html index 2a07d1e..78bb7e2 100644 --- a/index.html +++ b/index.html @@ -8,42 +8,58 @@ Wails App -
- - - -
- -
- - +
+ + + + + + + + + +
+ +
+ + +
+ +
+ +
+
    +
  • + 小德 +
  • +
  • +
    您好呀,有什么需要帮助的吗?
    +
  • + +
- -
- -
-
    -
  • - AI小红帽 -
  • -
  • -
    您好呀,有什么需要帮助的吗?
    -
  • -
-
- + - - -
- - - + + + + + + + + diff --git a/main.js b/main.js index bf8ef2e..11216a2 100644 --- a/main.js +++ b/main.js @@ -1,7 +1,6 @@ -import { onchangeSize,initDate,setScrollPosition,addBackItemText,addItemImg,addAvdi,addredHot,addBackItemAction } from "./util.js"; +import { onchangeSize,initDate,setScrollPosition,addBackItemText,addItemImg,addAvdi,addItemSmallImg,addItemBigImg,addredHot,addBackItemAction,addWrapper,addClickItemImg } from "./util.js"; import { btnStatus,recorder,getWebSocketUrl,connectWebSocket } from "./recorder.js" - import { createAlova } from 'alova'; import adapterFetch from 'alova/fetch'; @@ -19,11 +18,13 @@ window.onload = () => { window.addEventListener("resize",onchangeSize); initDate(); //初始化时间 setScrollPosition(); //自动滚动到底部 + document.addEventListener("click",()=>{ + window.playOver(); + }); } - let addMy = () => { - window. woNode = document.createElement("li"); + window.woNode = document.createElement("li"); window.woNode.className = "right" window.woNode.innerHTML=""; document.getElementById("cont").appendChild(window.woNode); @@ -35,10 +36,8 @@ let addMy = () => { window.woVoice.appendChild(window.cli); } - - - window.audioStart = () => { + window.stopTTS(); //开始识别 if (btnStatus === "UNDEFINED" || btnStatus === "CLOSED") { connectWebSocket(); @@ -47,6 +46,20 @@ window.audioStart = () => { addMy(); //添加我气泡 setScrollPosition(); } + + // addBackItemText("思考中...","ing",false) + // setScrollPosition(); + // let res = { + // code:200, + // data: { + // "type": "member", + // "value": { + // "text":"德基美术馆", + // "content":[{"logo":"/assets/act.png"},{"logo":"/assets/act1.png"},{"logo":"/assets/act2.png"},{"logo":"/assets/act3.png"}] + // } + // } + // } + // callBack(res); } function delMy(){ @@ -62,20 +75,36 @@ function delMy(){ //接收模型回复处理内容 function callBack(str){ document.getElementById("ing").remove(); - // let obj = JSON.parse(str); + console.log(str); let obj = str; - addredHot(); if(obj.code == 200){ + if(obj.data.value){ + addredHot(); + } switch(obj.data.type){ case "shopList" : - obj.data.value.forEach((item, index)=>{ - addBackItemAction(item); - }); + if(typeof obj.data.value.length == "number"){ + obj.data.value.forEach((item, index)=>{ + addBackItemAction(item); + }); + }else{ + addBackItemText(obj.data.value.text || "为您推荐以下店铺"); + obj.data.value.content.forEach((item, index)=>{ + addBackItemAction(item); + }); + } break; case "activity" : - obj.data.value.forEach((item, index)=>{ - addBackItemAction(item); - }); + if(typeof obj.data.value.length == "number"){ + obj.data.value.forEach((item, index)=>{ + addBackItemAction(item); + }); + }else{ + addBackItemText(obj.data.value.text || "为您推荐以下活动"); + obj.data.value.content.forEach((item, index)=>{ + addBackItemAction(item); + }); + } break; case "shop" : try{ @@ -102,15 +131,51 @@ function callBack(str){ case "weather" : addBackItemText(`${obj.data.value.city}今天天气${obj.data.value.dayweather},最高温度${obj.data.value.daytemp_float}`); break; + case "member" : //会员等级 + addBackItemText(obj.data.value.text); + if(obj.data.value.content && obj.data.value.content.length>0){ + let div = addWrapper(); + obj.data.value.content.forEach((item, index)=>{ + addClickItemImg(div, item.logo, 200, 200, null); + }); + } + break; + case "qrcode" : //二维码 + addBackItemText(obj.data.value.text); + if(obj.data.value.content && obj.data.value.content.length>0){ + addItemSmallImg(obj.data.value.content[0].logo); + } + break; + case "coupon" : //优惠券 + addBackItemText(obj.data.value.text); + if(obj.data.value.content && obj.data.value.content.length>0){ + let div = addWrapper(); + obj.data.value.content.forEach((item)=>{ + addClickItemImg(div, item.logo, 165, 120, window.clickCoupon); + }); + } + break; + case "video" : //视频 + addBackItemText(obj.data.value.text); + if(obj.data.value.content && obj.data.value.content.length>0){ + addItemBigImg(obj.data.value.content[0].logo, window.clickVideo); + } + break; default : addBackItemText(obj.data.value); break; } - } - addAvdi(); + setScrollPosition(); } +//点击优惠券弹窗 +window.clickCoupon = function(event){ + console.log(event); +} +window.clickVideo = function(event){ + console.log(event); +} let getAiData = async (msg) => { const response = await alovaInstance.Post('http://dify.123.1000my.com:59222/v1/workflows/run', { @@ -138,20 +203,15 @@ let getAiData = async (msg) => { function callAiModel(msg){ console.log(msg) // 调用模型 - addBackItemText("思考中...","ing") + addBackItemText("思考中...","ing",false) setScrollPosition(); - // 调用容器方法获得返回 - // 模拟回复 - // callBack('{"code":200,"data":{"type":"shopList","value":[{"name":"夏日精选活动","intro":"夏日精选活动夏日精选活动夏日精选活动夏日精选活动夏日精选活动","logo":"./assets/act.png"},{"name":"夏日精选活动","intro":"夏日精选活动夏日精选活动夏日精选活动夏日精选活动夏日精选活动","shopNum":"L101","logo":"./assets/act.png"}]}}'); // 调用api - getAiData(msg) - + getAiData(msg); } //停止识别后动作 window.audioStop = () => { console.log("audioStop") - console.log(btnStatus) //停止识别 if (btnStatus === "CONNECTING" || btnStatus === "OPEN") { // 结束录音 @@ -163,8 +223,26 @@ window.audioStop = () => { // 调用模型 callAiModel(window.cli.innerText) } - - } - - +//语音播放完成 +window.playOver=()=>{ + document.getElementById("bgVideo").style.display = ""; + document.getElementById("hVideo").style.display = "none"; + document.getElementById("aVideo").style.display = "none"; + window.hello(); +} +window.timer=-1; +window.hello=()=>{ + clearTimeout(window.timer); + window.timer = setTimeout(()=>{ + clearTimeout(window.timer); + window.isHello=true; + window.startTTS("您好呀,我是德基广场数字客服小德,请问有什么需要帮助的吗?"); + },60000); +} +window.isHello=true; +window.changeVideo=()=>{ + document.getElementById("bgVideo").style.display = "none"; + document.getElementById("hVideo").style.display = window.isHello ? "" : "none"; + document.getElementById("aVideo").style.display = !window.isHello ? "" : "none"; +} diff --git a/node_modules/.bin/vite b/node_modules/.bin/vite index 1e9e736..a6b17f0 100644 --- a/node_modules/.bin/vite +++ b/node_modules/.bin/vite @@ -10,9 +10,9 @@ case `uname` in esac if [ -z "$NODE_PATH" ]; then - export NODE_PATH="/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/vite@5.4.19/node_modules/vite/bin/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/vite@5.4.19/node_modules/vite/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/vite@5.4.19/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/node_modules" + export NODE_PATH="/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/vite@5.4.19/node_modules/vite/bin/node_modules:/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/vite@5.4.19/node_modules/vite/node_modules:/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/vite@5.4.19/node_modules:/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/node_modules" else - export NODE_PATH="/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/vite@5.4.19/node_modules/vite/bin/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/vite@5.4.19/node_modules/vite/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/vite@5.4.19/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/node_modules:$NODE_PATH" + export NODE_PATH="/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/vite@5.4.19/node_modules/vite/bin/node_modules:/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/vite@5.4.19/node_modules/vite/node_modules:/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/vite@5.4.19/node_modules:/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/node_modules:$NODE_PATH" fi if [ -x "$basedir/node" ]; then exec "$basedir/node" "$basedir/../vite/bin/vite.js" "$@" diff --git a/node_modules/.bin/vite.ps1 b/node_modules/.bin/vite.ps1 index de70195..5340a39 100644 --- a/node_modules/.bin/vite.ps1 +++ b/node_modules/.bin/vite.ps1 @@ -4,14 +4,14 @@ $basedir=Split-Path $MyInvocation.MyCommand.Definition -Parent $exe="" $pathsep=":" $env_node_path=$env:NODE_PATH -$new_node_path="F:\htmlWork\TestCode\frontend\node_modules\.pnpm\vite@5.4.19\node_modules\vite\bin\node_modules;F:\htmlWork\TestCode\frontend\node_modules\.pnpm\vite@5.4.19\node_modules\vite\node_modules;F:\htmlWork\TestCode\frontend\node_modules\.pnpm\vite@5.4.19\node_modules;F:\htmlWork\TestCode\frontend\node_modules\.pnpm\node_modules" +$new_node_path="F:\htmlWork\项目\德基demo\deji_demo\node_modules\.pnpm\vite@5.4.19\node_modules\vite\bin\node_modules;F:\htmlWork\项目\德基demo\deji_demo\node_modules\.pnpm\vite@5.4.19\node_modules\vite\node_modules;F:\htmlWork\项目\德基demo\deji_demo\node_modules\.pnpm\vite@5.4.19\node_modules;F:\htmlWork\项目\德基demo\deji_demo\node_modules\.pnpm\node_modules" if ($PSVersionTable.PSVersion -lt "6.0" -or $IsWindows) { # Fix case when both the Windows and Linux builds of Node # are installed in the same directory $exe=".exe" $pathsep=";" } else { - $new_node_path="/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/vite@5.4.19/node_modules/vite/bin/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/vite@5.4.19/node_modules/vite/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/vite@5.4.19/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/node_modules" + $new_node_path="/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/vite@5.4.19/node_modules/vite/bin/node_modules:/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/vite@5.4.19/node_modules/vite/node_modules:/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/vite@5.4.19/node_modules:/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/node_modules" } if ([string]::IsNullOrEmpty($env_node_path)) { $env:NODE_PATH=$new_node_path diff --git a/node_modules/.pnpm-workspace-state.json b/node_modules/.pnpm-workspace-state.json index 336776a..da765f4 100644 --- a/node_modules/.pnpm-workspace-state.json +++ b/node_modules/.pnpm-workspace-state.json @@ -1,5 +1,5 @@ { - "lastValidatedTimestamp": 1747032412126, + "lastValidatedTimestamp": 1747389434647, "projects": {}, "pnpmfileExists": false, "settings": { diff --git a/node_modules/.pnpm/esbuild@0.21.5/node_modules/esbuild/node_modules/.bin/esbuild b/node_modules/.pnpm/esbuild@0.21.5/node_modules/esbuild/node_modules/.bin/esbuild index 9cc915e..906754c 100644 --- a/node_modules/.pnpm/esbuild@0.21.5/node_modules/esbuild/node_modules/.bin/esbuild +++ b/node_modules/.pnpm/esbuild@0.21.5/node_modules/esbuild/node_modules/.bin/esbuild @@ -9,11 +9,6 @@ case `uname` in ;; esac -if [ -z "$NODE_PATH" ]; then - export NODE_PATH="/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/esbuild@0.21.5/node_modules/esbuild/bin/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/esbuild@0.21.5/node_modules/esbuild/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/esbuild@0.21.5/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/node_modules" -else - export NODE_PATH="/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/esbuild@0.21.5/node_modules/esbuild/bin/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/esbuild@0.21.5/node_modules/esbuild/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/esbuild@0.21.5/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/node_modules:$NODE_PATH" -fi if [ -x "$basedir/node" ]; then exec "$basedir/node" "$basedir/../../bin/esbuild" "$@" else diff --git a/node_modules/.pnpm/esbuild@0.21.5/node_modules/esbuild/node_modules/.bin/esbuild.ps1 b/node_modules/.pnpm/esbuild@0.21.5/node_modules/esbuild/node_modules/.bin/esbuild.ps1 index 47baadb..b6d3c89 100644 --- a/node_modules/.pnpm/esbuild@0.21.5/node_modules/esbuild/node_modules/.bin/esbuild.ps1 +++ b/node_modules/.pnpm/esbuild@0.21.5/node_modules/esbuild/node_modules/.bin/esbuild.ps1 @@ -2,23 +2,11 @@ $basedir=Split-Path $MyInvocation.MyCommand.Definition -Parent $exe="" -$pathsep=":" -$env_node_path=$env:NODE_PATH -$new_node_path="F:\htmlWork\TestCode\frontend\node_modules\.pnpm\esbuild@0.21.5\node_modules\esbuild\bin\node_modules;F:\htmlWork\TestCode\frontend\node_modules\.pnpm\esbuild@0.21.5\node_modules\esbuild\node_modules;F:\htmlWork\TestCode\frontend\node_modules\.pnpm\esbuild@0.21.5\node_modules;F:\htmlWork\TestCode\frontend\node_modules\.pnpm\node_modules" if ($PSVersionTable.PSVersion -lt "6.0" -or $IsWindows) { # Fix case when both the Windows and Linux builds of Node # are installed in the same directory $exe=".exe" - $pathsep=";" -} else { - $new_node_path="/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/esbuild@0.21.5/node_modules/esbuild/bin/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/esbuild@0.21.5/node_modules/esbuild/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/esbuild@0.21.5/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/node_modules" -} -if ([string]::IsNullOrEmpty($env_node_path)) { - $env:NODE_PATH=$new_node_path -} else { - $env:NODE_PATH="$new_node_path$pathsep$env_node_path" } - $ret=0 if (Test-Path "$basedir/node$exe") { # Support pipeline input @@ -37,5 +25,4 @@ if (Test-Path "$basedir/node$exe") { } $ret=$LASTEXITCODE } -$env:NODE_PATH=$env_node_path exit $ret diff --git a/node_modules/.pnpm/nanoid@3.3.11/node_modules/nanoid/node_modules/.bin/nanoid b/node_modules/.pnpm/nanoid@3.3.11/node_modules/nanoid/node_modules/.bin/nanoid deleted file mode 100644 index d84aa32..0000000 --- a/node_modules/.pnpm/nanoid@3.3.11/node_modules/nanoid/node_modules/.bin/nanoid +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh -basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") - -case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) - if command -v cygpath > /dev/null 2>&1; then - basedir=`cygpath -w "$basedir"` - fi - ;; -esac - -if [ -z "$NODE_PATH" ]; then - export NODE_PATH="/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/nanoid@3.3.11/node_modules/nanoid/bin/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/nanoid@3.3.11/node_modules/nanoid/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/nanoid@3.3.11/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/node_modules" -else - export NODE_PATH="/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/nanoid@3.3.11/node_modules/nanoid/bin/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/nanoid@3.3.11/node_modules/nanoid/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/nanoid@3.3.11/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/node_modules:$NODE_PATH" -fi -if [ -x "$basedir/node" ]; then - exec "$basedir/node" "$basedir/../../bin/nanoid.cjs" "$@" -else - exec node "$basedir/../../bin/nanoid.cjs" "$@" -fi diff --git a/node_modules/.pnpm/nanoid@3.3.11/node_modules/nanoid/node_modules/.bin/nanoid.ps1 b/node_modules/.pnpm/nanoid@3.3.11/node_modules/nanoid/node_modules/.bin/nanoid.ps1 deleted file mode 100644 index 4f527b6..0000000 --- a/node_modules/.pnpm/nanoid@3.3.11/node_modules/nanoid/node_modules/.bin/nanoid.ps1 +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/bin/env pwsh -$basedir=Split-Path $MyInvocation.MyCommand.Definition -Parent - -$exe="" -$pathsep=":" -$env_node_path=$env:NODE_PATH -$new_node_path="F:\htmlWork\TestCode\frontend\node_modules\.pnpm\nanoid@3.3.11\node_modules\nanoid\bin\node_modules;F:\htmlWork\TestCode\frontend\node_modules\.pnpm\nanoid@3.3.11\node_modules\nanoid\node_modules;F:\htmlWork\TestCode\frontend\node_modules\.pnpm\nanoid@3.3.11\node_modules;F:\htmlWork\TestCode\frontend\node_modules\.pnpm\node_modules" -if ($PSVersionTable.PSVersion -lt "6.0" -or $IsWindows) { - # Fix case when both the Windows and Linux builds of Node - # are installed in the same directory - $exe=".exe" - $pathsep=";" -} else { - $new_node_path="/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/nanoid@3.3.11/node_modules/nanoid/bin/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/nanoid@3.3.11/node_modules/nanoid/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/nanoid@3.3.11/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/node_modules" -} -if ([string]::IsNullOrEmpty($env_node_path)) { - $env:NODE_PATH=$new_node_path -} else { - $env:NODE_PATH="$new_node_path$pathsep$env_node_path" -} - -$ret=0 -if (Test-Path "$basedir/node$exe") { - # Support pipeline input - if ($MyInvocation.ExpectingInput) { - $input | & "$basedir/node$exe" "$basedir/../../bin/nanoid.cjs" $args - } else { - & "$basedir/node$exe" "$basedir/../../bin/nanoid.cjs" $args - } - $ret=$LASTEXITCODE -} else { - # Support pipeline input - if ($MyInvocation.ExpectingInput) { - $input | & "node$exe" "$basedir/../../bin/nanoid.cjs" $args - } else { - & "node$exe" "$basedir/../../bin/nanoid.cjs" $args - } - $ret=$LASTEXITCODE -} -$env:NODE_PATH=$env_node_path -exit $ret diff --git a/node_modules/.pnpm/node_modules/.bin/esbuild b/node_modules/.pnpm/node_modules/.bin/esbuild index 542f246..2483c2c 100644 --- a/node_modules/.pnpm/node_modules/.bin/esbuild +++ b/node_modules/.pnpm/node_modules/.bin/esbuild @@ -10,9 +10,9 @@ case `uname` in esac if [ -z "$NODE_PATH" ]; then - export NODE_PATH="/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/esbuild@0.21.5/node_modules/esbuild/bin/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/esbuild@0.21.5/node_modules/esbuild/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/esbuild@0.21.5/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/node_modules" + export NODE_PATH="/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/esbuild@0.21.5/node_modules/esbuild/bin/node_modules:/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/esbuild@0.21.5/node_modules/esbuild/node_modules:/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/esbuild@0.21.5/node_modules:/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/node_modules" else - export NODE_PATH="/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/esbuild@0.21.5/node_modules/esbuild/bin/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/esbuild@0.21.5/node_modules/esbuild/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/esbuild@0.21.5/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/node_modules:$NODE_PATH" + export NODE_PATH="/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/esbuild@0.21.5/node_modules/esbuild/bin/node_modules:/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/esbuild@0.21.5/node_modules/esbuild/node_modules:/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/esbuild@0.21.5/node_modules:/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/node_modules:$NODE_PATH" fi if [ -x "$basedir/node" ]; then exec "$basedir/node" "$basedir/../esbuild/bin/esbuild" "$@" diff --git a/node_modules/.pnpm/node_modules/.bin/esbuild.ps1 b/node_modules/.pnpm/node_modules/.bin/esbuild.ps1 index abe067a..4058a92 100644 --- a/node_modules/.pnpm/node_modules/.bin/esbuild.ps1 +++ b/node_modules/.pnpm/node_modules/.bin/esbuild.ps1 @@ -4,14 +4,14 @@ $basedir=Split-Path $MyInvocation.MyCommand.Definition -Parent $exe="" $pathsep=":" $env_node_path=$env:NODE_PATH -$new_node_path="F:\htmlWork\TestCode\frontend\node_modules\.pnpm\esbuild@0.21.5\node_modules\esbuild\bin\node_modules;F:\htmlWork\TestCode\frontend\node_modules\.pnpm\esbuild@0.21.5\node_modules\esbuild\node_modules;F:\htmlWork\TestCode\frontend\node_modules\.pnpm\esbuild@0.21.5\node_modules;F:\htmlWork\TestCode\frontend\node_modules\.pnpm\node_modules" +$new_node_path="F:\htmlWork\项目\德基demo\deji_demo\node_modules\.pnpm\esbuild@0.21.5\node_modules\esbuild\bin\node_modules;F:\htmlWork\项目\德基demo\deji_demo\node_modules\.pnpm\esbuild@0.21.5\node_modules\esbuild\node_modules;F:\htmlWork\项目\德基demo\deji_demo\node_modules\.pnpm\esbuild@0.21.5\node_modules;F:\htmlWork\项目\德基demo\deji_demo\node_modules\.pnpm\node_modules" if ($PSVersionTable.PSVersion -lt "6.0" -or $IsWindows) { # Fix case when both the Windows and Linux builds of Node # are installed in the same directory $exe=".exe" $pathsep=";" } else { - $new_node_path="/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/esbuild@0.21.5/node_modules/esbuild/bin/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/esbuild@0.21.5/node_modules/esbuild/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/esbuild@0.21.5/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/node_modules" + $new_node_path="/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/esbuild@0.21.5/node_modules/esbuild/bin/node_modules:/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/esbuild@0.21.5/node_modules/esbuild/node_modules:/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/esbuild@0.21.5/node_modules:/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/node_modules" } if ([string]::IsNullOrEmpty($env_node_path)) { $env:NODE_PATH=$new_node_path diff --git a/node_modules/.pnpm/node_modules/.bin/nanoid b/node_modules/.pnpm/node_modules/.bin/nanoid index f63d683..c9473fa 100644 --- a/node_modules/.pnpm/node_modules/.bin/nanoid +++ b/node_modules/.pnpm/node_modules/.bin/nanoid @@ -10,9 +10,9 @@ case `uname` in esac if [ -z "$NODE_PATH" ]; then - export NODE_PATH="/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/nanoid@3.3.11/node_modules/nanoid/bin/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/nanoid@3.3.11/node_modules/nanoid/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/nanoid@3.3.11/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/node_modules" + export NODE_PATH="/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/nanoid@3.3.11/node_modules/nanoid/bin/node_modules:/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/nanoid@3.3.11/node_modules/nanoid/node_modules:/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/nanoid@3.3.11/node_modules:/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/node_modules" else - export NODE_PATH="/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/nanoid@3.3.11/node_modules/nanoid/bin/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/nanoid@3.3.11/node_modules/nanoid/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/nanoid@3.3.11/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/node_modules:$NODE_PATH" + export NODE_PATH="/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/nanoid@3.3.11/node_modules/nanoid/bin/node_modules:/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/nanoid@3.3.11/node_modules/nanoid/node_modules:/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/nanoid@3.3.11/node_modules:/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/node_modules:$NODE_PATH" fi if [ -x "$basedir/node" ]; then exec "$basedir/node" "$basedir/../nanoid/bin/nanoid.cjs" "$@" diff --git a/node_modules/.pnpm/node_modules/.bin/nanoid.ps1 b/node_modules/.pnpm/node_modules/.bin/nanoid.ps1 index d88b929..ae64c8c 100644 --- a/node_modules/.pnpm/node_modules/.bin/nanoid.ps1 +++ b/node_modules/.pnpm/node_modules/.bin/nanoid.ps1 @@ -4,14 +4,14 @@ $basedir=Split-Path $MyInvocation.MyCommand.Definition -Parent $exe="" $pathsep=":" $env_node_path=$env:NODE_PATH -$new_node_path="F:\htmlWork\TestCode\frontend\node_modules\.pnpm\nanoid@3.3.11\node_modules\nanoid\bin\node_modules;F:\htmlWork\TestCode\frontend\node_modules\.pnpm\nanoid@3.3.11\node_modules\nanoid\node_modules;F:\htmlWork\TestCode\frontend\node_modules\.pnpm\nanoid@3.3.11\node_modules;F:\htmlWork\TestCode\frontend\node_modules\.pnpm\node_modules" +$new_node_path="F:\htmlWork\项目\德基demo\deji_demo\node_modules\.pnpm\nanoid@3.3.11\node_modules\nanoid\bin\node_modules;F:\htmlWork\项目\德基demo\deji_demo\node_modules\.pnpm\nanoid@3.3.11\node_modules\nanoid\node_modules;F:\htmlWork\项目\德基demo\deji_demo\node_modules\.pnpm\nanoid@3.3.11\node_modules;F:\htmlWork\项目\德基demo\deji_demo\node_modules\.pnpm\node_modules" if ($PSVersionTable.PSVersion -lt "6.0" -or $IsWindows) { # Fix case when both the Windows and Linux builds of Node # are installed in the same directory $exe=".exe" $pathsep=";" } else { - $new_node_path="/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/nanoid@3.3.11/node_modules/nanoid/bin/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/nanoid@3.3.11/node_modules/nanoid/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/nanoid@3.3.11/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/node_modules" + $new_node_path="/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/nanoid@3.3.11/node_modules/nanoid/bin/node_modules:/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/nanoid@3.3.11/node_modules/nanoid/node_modules:/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/nanoid@3.3.11/node_modules:/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/node_modules" } if ([string]::IsNullOrEmpty($env_node_path)) { $env:NODE_PATH=$new_node_path diff --git a/node_modules/.pnpm/node_modules/.bin/rollup b/node_modules/.pnpm/node_modules/.bin/rollup index a9add21..24e9852 100644 --- a/node_modules/.pnpm/node_modules/.bin/rollup +++ b/node_modules/.pnpm/node_modules/.bin/rollup @@ -10,9 +10,9 @@ case `uname` in esac if [ -z "$NODE_PATH" ]; then - export NODE_PATH="/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/rollup@4.40.2/node_modules/rollup/dist/bin/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/rollup@4.40.2/node_modules/rollup/dist/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/rollup@4.40.2/node_modules/rollup/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/rollup@4.40.2/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/node_modules" + export NODE_PATH="/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/rollup@4.40.2/node_modules/rollup/dist/bin/node_modules:/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/rollup@4.40.2/node_modules/rollup/dist/node_modules:/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/rollup@4.40.2/node_modules/rollup/node_modules:/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/rollup@4.40.2/node_modules:/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/node_modules" else - export NODE_PATH="/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/rollup@4.40.2/node_modules/rollup/dist/bin/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/rollup@4.40.2/node_modules/rollup/dist/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/rollup@4.40.2/node_modules/rollup/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/rollup@4.40.2/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/node_modules:$NODE_PATH" + export NODE_PATH="/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/rollup@4.40.2/node_modules/rollup/dist/bin/node_modules:/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/rollup@4.40.2/node_modules/rollup/dist/node_modules:/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/rollup@4.40.2/node_modules/rollup/node_modules:/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/rollup@4.40.2/node_modules:/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/node_modules:$NODE_PATH" fi if [ -x "$basedir/node" ]; then exec "$basedir/node" "$basedir/../rollup/dist/bin/rollup" "$@" diff --git a/node_modules/.pnpm/node_modules/.bin/rollup.ps1 b/node_modules/.pnpm/node_modules/.bin/rollup.ps1 index 6f7a09b..e50b9c3 100644 --- a/node_modules/.pnpm/node_modules/.bin/rollup.ps1 +++ b/node_modules/.pnpm/node_modules/.bin/rollup.ps1 @@ -4,14 +4,14 @@ $basedir=Split-Path $MyInvocation.MyCommand.Definition -Parent $exe="" $pathsep=":" $env_node_path=$env:NODE_PATH -$new_node_path="F:\htmlWork\TestCode\frontend\node_modules\.pnpm\rollup@4.40.2\node_modules\rollup\dist\bin\node_modules;F:\htmlWork\TestCode\frontend\node_modules\.pnpm\rollup@4.40.2\node_modules\rollup\dist\node_modules;F:\htmlWork\TestCode\frontend\node_modules\.pnpm\rollup@4.40.2\node_modules\rollup\node_modules;F:\htmlWork\TestCode\frontend\node_modules\.pnpm\rollup@4.40.2\node_modules;F:\htmlWork\TestCode\frontend\node_modules\.pnpm\node_modules" +$new_node_path="F:\htmlWork\项目\德基demo\deji_demo\node_modules\.pnpm\rollup@4.40.2\node_modules\rollup\dist\bin\node_modules;F:\htmlWork\项目\德基demo\deji_demo\node_modules\.pnpm\rollup@4.40.2\node_modules\rollup\dist\node_modules;F:\htmlWork\项目\德基demo\deji_demo\node_modules\.pnpm\rollup@4.40.2\node_modules\rollup\node_modules;F:\htmlWork\项目\德基demo\deji_demo\node_modules\.pnpm\rollup@4.40.2\node_modules;F:\htmlWork\项目\德基demo\deji_demo\node_modules\.pnpm\node_modules" if ($PSVersionTable.PSVersion -lt "6.0" -or $IsWindows) { # Fix case when both the Windows and Linux builds of Node # are installed in the same directory $exe=".exe" $pathsep=";" } else { - $new_node_path="/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/rollup@4.40.2/node_modules/rollup/dist/bin/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/rollup@4.40.2/node_modules/rollup/dist/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/rollup@4.40.2/node_modules/rollup/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/rollup@4.40.2/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/node_modules" + $new_node_path="/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/rollup@4.40.2/node_modules/rollup/dist/bin/node_modules:/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/rollup@4.40.2/node_modules/rollup/dist/node_modules:/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/rollup@4.40.2/node_modules/rollup/node_modules:/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/rollup@4.40.2/node_modules:/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/node_modules" } if ([string]::IsNullOrEmpty($env_node_path)) { $env:NODE_PATH=$new_node_path diff --git a/node_modules/.pnpm/postcss@8.5.3/node_modules/postcss/node_modules/.bin/nanoid b/node_modules/.pnpm/postcss@8.5.3/node_modules/postcss/node_modules/.bin/nanoid index 36c2a2d..161c28a 100644 --- a/node_modules/.pnpm/postcss@8.5.3/node_modules/postcss/node_modules/.bin/nanoid +++ b/node_modules/.pnpm/postcss@8.5.3/node_modules/postcss/node_modules/.bin/nanoid @@ -10,9 +10,9 @@ case `uname` in esac if [ -z "$NODE_PATH" ]; then - export NODE_PATH="/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/nanoid@3.3.11/node_modules/nanoid/bin/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/nanoid@3.3.11/node_modules/nanoid/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/nanoid@3.3.11/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/node_modules" + export NODE_PATH="/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/nanoid@3.3.11/node_modules/nanoid/bin/node_modules:/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/nanoid@3.3.11/node_modules/nanoid/node_modules:/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/nanoid@3.3.11/node_modules:/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/node_modules" else - export NODE_PATH="/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/nanoid@3.3.11/node_modules/nanoid/bin/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/nanoid@3.3.11/node_modules/nanoid/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/nanoid@3.3.11/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/node_modules:$NODE_PATH" + export NODE_PATH="/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/nanoid@3.3.11/node_modules/nanoid/bin/node_modules:/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/nanoid@3.3.11/node_modules/nanoid/node_modules:/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/nanoid@3.3.11/node_modules:/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/node_modules:$NODE_PATH" fi if [ -x "$basedir/node" ]; then exec "$basedir/node" "$basedir/../../../../../nanoid@3.3.11/node_modules/nanoid/bin/nanoid.cjs" "$@" diff --git a/node_modules/.pnpm/postcss@8.5.3/node_modules/postcss/node_modules/.bin/nanoid.ps1 b/node_modules/.pnpm/postcss@8.5.3/node_modules/postcss/node_modules/.bin/nanoid.ps1 index 6bd7c65..bd11e83 100644 --- a/node_modules/.pnpm/postcss@8.5.3/node_modules/postcss/node_modules/.bin/nanoid.ps1 +++ b/node_modules/.pnpm/postcss@8.5.3/node_modules/postcss/node_modules/.bin/nanoid.ps1 @@ -4,14 +4,14 @@ $basedir=Split-Path $MyInvocation.MyCommand.Definition -Parent $exe="" $pathsep=":" $env_node_path=$env:NODE_PATH -$new_node_path="F:\htmlWork\TestCode\frontend\node_modules\.pnpm\nanoid@3.3.11\node_modules\nanoid\bin\node_modules;F:\htmlWork\TestCode\frontend\node_modules\.pnpm\nanoid@3.3.11\node_modules\nanoid\node_modules;F:\htmlWork\TestCode\frontend\node_modules\.pnpm\nanoid@3.3.11\node_modules;F:\htmlWork\TestCode\frontend\node_modules\.pnpm\node_modules" +$new_node_path="F:\htmlWork\项目\德基demo\deji_demo\node_modules\.pnpm\nanoid@3.3.11\node_modules\nanoid\bin\node_modules;F:\htmlWork\项目\德基demo\deji_demo\node_modules\.pnpm\nanoid@3.3.11\node_modules\nanoid\node_modules;F:\htmlWork\项目\德基demo\deji_demo\node_modules\.pnpm\nanoid@3.3.11\node_modules;F:\htmlWork\项目\德基demo\deji_demo\node_modules\.pnpm\node_modules" if ($PSVersionTable.PSVersion -lt "6.0" -or $IsWindows) { # Fix case when both the Windows and Linux builds of Node # are installed in the same directory $exe=".exe" $pathsep=";" } else { - $new_node_path="/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/nanoid@3.3.11/node_modules/nanoid/bin/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/nanoid@3.3.11/node_modules/nanoid/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/nanoid@3.3.11/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/node_modules" + $new_node_path="/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/nanoid@3.3.11/node_modules/nanoid/bin/node_modules:/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/nanoid@3.3.11/node_modules/nanoid/node_modules:/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/nanoid@3.3.11/node_modules:/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/node_modules" } if ([string]::IsNullOrEmpty($env_node_path)) { $env:NODE_PATH=$new_node_path diff --git a/node_modules/.pnpm/rollup@4.40.2/node_modules/rollup/node_modules/.bin/rollup b/node_modules/.pnpm/rollup@4.40.2/node_modules/rollup/node_modules/.bin/rollup deleted file mode 100644 index 23dc738..0000000 --- a/node_modules/.pnpm/rollup@4.40.2/node_modules/rollup/node_modules/.bin/rollup +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh -basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") - -case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) - if command -v cygpath > /dev/null 2>&1; then - basedir=`cygpath -w "$basedir"` - fi - ;; -esac - -if [ -z "$NODE_PATH" ]; then - export NODE_PATH="/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/rollup@4.40.2/node_modules/rollup/dist/bin/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/rollup@4.40.2/node_modules/rollup/dist/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/rollup@4.40.2/node_modules/rollup/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/rollup@4.40.2/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/node_modules" -else - export NODE_PATH="/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/rollup@4.40.2/node_modules/rollup/dist/bin/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/rollup@4.40.2/node_modules/rollup/dist/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/rollup@4.40.2/node_modules/rollup/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/rollup@4.40.2/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/node_modules:$NODE_PATH" -fi -if [ -x "$basedir/node" ]; then - exec "$basedir/node" "$basedir/../../dist/bin/rollup" "$@" -else - exec node "$basedir/../../dist/bin/rollup" "$@" -fi diff --git a/node_modules/.pnpm/rollup@4.40.2/node_modules/rollup/node_modules/.bin/rollup.ps1 b/node_modules/.pnpm/rollup@4.40.2/node_modules/rollup/node_modules/.bin/rollup.ps1 deleted file mode 100644 index d5570fe..0000000 --- a/node_modules/.pnpm/rollup@4.40.2/node_modules/rollup/node_modules/.bin/rollup.ps1 +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/bin/env pwsh -$basedir=Split-Path $MyInvocation.MyCommand.Definition -Parent - -$exe="" -$pathsep=":" -$env_node_path=$env:NODE_PATH -$new_node_path="F:\htmlWork\TestCode\frontend\node_modules\.pnpm\rollup@4.40.2\node_modules\rollup\dist\bin\node_modules;F:\htmlWork\TestCode\frontend\node_modules\.pnpm\rollup@4.40.2\node_modules\rollup\dist\node_modules;F:\htmlWork\TestCode\frontend\node_modules\.pnpm\rollup@4.40.2\node_modules\rollup\node_modules;F:\htmlWork\TestCode\frontend\node_modules\.pnpm\rollup@4.40.2\node_modules;F:\htmlWork\TestCode\frontend\node_modules\.pnpm\node_modules" -if ($PSVersionTable.PSVersion -lt "6.0" -or $IsWindows) { - # Fix case when both the Windows and Linux builds of Node - # are installed in the same directory - $exe=".exe" - $pathsep=";" -} else { - $new_node_path="/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/rollup@4.40.2/node_modules/rollup/dist/bin/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/rollup@4.40.2/node_modules/rollup/dist/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/rollup@4.40.2/node_modules/rollup/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/rollup@4.40.2/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/node_modules" -} -if ([string]::IsNullOrEmpty($env_node_path)) { - $env:NODE_PATH=$new_node_path -} else { - $env:NODE_PATH="$new_node_path$pathsep$env_node_path" -} - -$ret=0 -if (Test-Path "$basedir/node$exe") { - # Support pipeline input - if ($MyInvocation.ExpectingInput) { - $input | & "$basedir/node$exe" "$basedir/../../dist/bin/rollup" $args - } else { - & "$basedir/node$exe" "$basedir/../../dist/bin/rollup" $args - } - $ret=$LASTEXITCODE -} else { - # Support pipeline input - if ($MyInvocation.ExpectingInput) { - $input | & "node$exe" "$basedir/../../dist/bin/rollup" $args - } else { - & "node$exe" "$basedir/../../dist/bin/rollup" $args - } - $ret=$LASTEXITCODE -} -$env:NODE_PATH=$env_node_path -exit $ret diff --git a/node_modules/.pnpm/vite@5.4.19/node_modules/vite/node_modules/.bin/esbuild b/node_modules/.pnpm/vite@5.4.19/node_modules/vite/node_modules/.bin/esbuild index 6395b11..3136cdd 100644 --- a/node_modules/.pnpm/vite@5.4.19/node_modules/vite/node_modules/.bin/esbuild +++ b/node_modules/.pnpm/vite@5.4.19/node_modules/vite/node_modules/.bin/esbuild @@ -10,9 +10,9 @@ case `uname` in esac if [ -z "$NODE_PATH" ]; then - export NODE_PATH="/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/esbuild@0.21.5/node_modules/esbuild/bin/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/esbuild@0.21.5/node_modules/esbuild/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/esbuild@0.21.5/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/node_modules" + export NODE_PATH="/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/esbuild@0.21.5/node_modules/esbuild/bin/node_modules:/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/esbuild@0.21.5/node_modules/esbuild/node_modules:/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/esbuild@0.21.5/node_modules:/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/node_modules" else - export NODE_PATH="/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/esbuild@0.21.5/node_modules/esbuild/bin/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/esbuild@0.21.5/node_modules/esbuild/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/esbuild@0.21.5/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/node_modules:$NODE_PATH" + export NODE_PATH="/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/esbuild@0.21.5/node_modules/esbuild/bin/node_modules:/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/esbuild@0.21.5/node_modules/esbuild/node_modules:/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/esbuild@0.21.5/node_modules:/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/node_modules:$NODE_PATH" fi if [ -x "$basedir/node" ]; then exec "$basedir/node" "$basedir/../../../../../esbuild@0.21.5/node_modules/esbuild/bin/esbuild" "$@" diff --git a/node_modules/.pnpm/vite@5.4.19/node_modules/vite/node_modules/.bin/esbuild.ps1 b/node_modules/.pnpm/vite@5.4.19/node_modules/vite/node_modules/.bin/esbuild.ps1 index 1e5c943..a3e436b 100644 --- a/node_modules/.pnpm/vite@5.4.19/node_modules/vite/node_modules/.bin/esbuild.ps1 +++ b/node_modules/.pnpm/vite@5.4.19/node_modules/vite/node_modules/.bin/esbuild.ps1 @@ -4,14 +4,14 @@ $basedir=Split-Path $MyInvocation.MyCommand.Definition -Parent $exe="" $pathsep=":" $env_node_path=$env:NODE_PATH -$new_node_path="F:\htmlWork\TestCode\frontend\node_modules\.pnpm\esbuild@0.21.5\node_modules\esbuild\bin\node_modules;F:\htmlWork\TestCode\frontend\node_modules\.pnpm\esbuild@0.21.5\node_modules\esbuild\node_modules;F:\htmlWork\TestCode\frontend\node_modules\.pnpm\esbuild@0.21.5\node_modules;F:\htmlWork\TestCode\frontend\node_modules\.pnpm\node_modules" +$new_node_path="F:\htmlWork\项目\德基demo\deji_demo\node_modules\.pnpm\esbuild@0.21.5\node_modules\esbuild\bin\node_modules;F:\htmlWork\项目\德基demo\deji_demo\node_modules\.pnpm\esbuild@0.21.5\node_modules\esbuild\node_modules;F:\htmlWork\项目\德基demo\deji_demo\node_modules\.pnpm\esbuild@0.21.5\node_modules;F:\htmlWork\项目\德基demo\deji_demo\node_modules\.pnpm\node_modules" if ($PSVersionTable.PSVersion -lt "6.0" -or $IsWindows) { # Fix case when both the Windows and Linux builds of Node # are installed in the same directory $exe=".exe" $pathsep=";" } else { - $new_node_path="/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/esbuild@0.21.5/node_modules/esbuild/bin/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/esbuild@0.21.5/node_modules/esbuild/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/esbuild@0.21.5/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/node_modules" + $new_node_path="/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/esbuild@0.21.5/node_modules/esbuild/bin/node_modules:/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/esbuild@0.21.5/node_modules/esbuild/node_modules:/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/esbuild@0.21.5/node_modules:/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/node_modules" } if ([string]::IsNullOrEmpty($env_node_path)) { $env:NODE_PATH=$new_node_path diff --git a/node_modules/.pnpm/vite@5.4.19/node_modules/vite/node_modules/.bin/rollup b/node_modules/.pnpm/vite@5.4.19/node_modules/vite/node_modules/.bin/rollup index 65b6d16..d500695 100644 --- a/node_modules/.pnpm/vite@5.4.19/node_modules/vite/node_modules/.bin/rollup +++ b/node_modules/.pnpm/vite@5.4.19/node_modules/vite/node_modules/.bin/rollup @@ -10,9 +10,9 @@ case `uname` in esac if [ -z "$NODE_PATH" ]; then - export NODE_PATH="/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/rollup@4.40.2/node_modules/rollup/dist/bin/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/rollup@4.40.2/node_modules/rollup/dist/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/rollup@4.40.2/node_modules/rollup/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/rollup@4.40.2/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/node_modules" + export NODE_PATH="/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/rollup@4.40.2/node_modules/rollup/dist/bin/node_modules:/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/rollup@4.40.2/node_modules/rollup/dist/node_modules:/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/rollup@4.40.2/node_modules/rollup/node_modules:/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/rollup@4.40.2/node_modules:/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/node_modules" else - export NODE_PATH="/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/rollup@4.40.2/node_modules/rollup/dist/bin/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/rollup@4.40.2/node_modules/rollup/dist/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/rollup@4.40.2/node_modules/rollup/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/rollup@4.40.2/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/node_modules:$NODE_PATH" + export NODE_PATH="/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/rollup@4.40.2/node_modules/rollup/dist/bin/node_modules:/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/rollup@4.40.2/node_modules/rollup/dist/node_modules:/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/rollup@4.40.2/node_modules/rollup/node_modules:/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/rollup@4.40.2/node_modules:/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/node_modules:$NODE_PATH" fi if [ -x "$basedir/node" ]; then exec "$basedir/node" "$basedir/../../../../../rollup@4.40.2/node_modules/rollup/dist/bin/rollup" "$@" diff --git a/node_modules/.pnpm/vite@5.4.19/node_modules/vite/node_modules/.bin/rollup.ps1 b/node_modules/.pnpm/vite@5.4.19/node_modules/vite/node_modules/.bin/rollup.ps1 index cecb9ea..89ce915 100644 --- a/node_modules/.pnpm/vite@5.4.19/node_modules/vite/node_modules/.bin/rollup.ps1 +++ b/node_modules/.pnpm/vite@5.4.19/node_modules/vite/node_modules/.bin/rollup.ps1 @@ -4,14 +4,14 @@ $basedir=Split-Path $MyInvocation.MyCommand.Definition -Parent $exe="" $pathsep=":" $env_node_path=$env:NODE_PATH -$new_node_path="F:\htmlWork\TestCode\frontend\node_modules\.pnpm\rollup@4.40.2\node_modules\rollup\dist\bin\node_modules;F:\htmlWork\TestCode\frontend\node_modules\.pnpm\rollup@4.40.2\node_modules\rollup\dist\node_modules;F:\htmlWork\TestCode\frontend\node_modules\.pnpm\rollup@4.40.2\node_modules\rollup\node_modules;F:\htmlWork\TestCode\frontend\node_modules\.pnpm\rollup@4.40.2\node_modules;F:\htmlWork\TestCode\frontend\node_modules\.pnpm\node_modules" +$new_node_path="F:\htmlWork\项目\德基demo\deji_demo\node_modules\.pnpm\rollup@4.40.2\node_modules\rollup\dist\bin\node_modules;F:\htmlWork\项目\德基demo\deji_demo\node_modules\.pnpm\rollup@4.40.2\node_modules\rollup\dist\node_modules;F:\htmlWork\项目\德基demo\deji_demo\node_modules\.pnpm\rollup@4.40.2\node_modules\rollup\node_modules;F:\htmlWork\项目\德基demo\deji_demo\node_modules\.pnpm\rollup@4.40.2\node_modules;F:\htmlWork\项目\德基demo\deji_demo\node_modules\.pnpm\node_modules" if ($PSVersionTable.PSVersion -lt "6.0" -or $IsWindows) { # Fix case when both the Windows and Linux builds of Node # are installed in the same directory $exe=".exe" $pathsep=";" } else { - $new_node_path="/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/rollup@4.40.2/node_modules/rollup/dist/bin/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/rollup@4.40.2/node_modules/rollup/dist/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/rollup@4.40.2/node_modules/rollup/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/rollup@4.40.2/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/node_modules" + $new_node_path="/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/rollup@4.40.2/node_modules/rollup/dist/bin/node_modules:/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/rollup@4.40.2/node_modules/rollup/dist/node_modules:/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/rollup@4.40.2/node_modules/rollup/node_modules:/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/rollup@4.40.2/node_modules:/mnt/f/htmlWork/项目/德基demo/deji_demo/node_modules/.pnpm/node_modules" } if ([string]::IsNullOrEmpty($env_node_path)) { $env:NODE_PATH=$new_node_path diff --git a/node_modules/.pnpm/vite@5.4.19/node_modules/vite/node_modules/.bin/vite b/node_modules/.pnpm/vite@5.4.19/node_modules/vite/node_modules/.bin/vite deleted file mode 100644 index 325d0ea..0000000 --- a/node_modules/.pnpm/vite@5.4.19/node_modules/vite/node_modules/.bin/vite +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh -basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") - -case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) - if command -v cygpath > /dev/null 2>&1; then - basedir=`cygpath -w "$basedir"` - fi - ;; -esac - -if [ -z "$NODE_PATH" ]; then - export NODE_PATH="/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/vite@5.4.19/node_modules/vite/bin/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/vite@5.4.19/node_modules/vite/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/vite@5.4.19/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/node_modules" -else - export NODE_PATH="/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/vite@5.4.19/node_modules/vite/bin/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/vite@5.4.19/node_modules/vite/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/vite@5.4.19/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/node_modules:$NODE_PATH" -fi -if [ -x "$basedir/node" ]; then - exec "$basedir/node" "$basedir/../../bin/vite.js" "$@" -else - exec node "$basedir/../../bin/vite.js" "$@" -fi diff --git a/node_modules/.pnpm/vite@5.4.19/node_modules/vite/node_modules/.bin/vite.ps1 b/node_modules/.pnpm/vite@5.4.19/node_modules/vite/node_modules/.bin/vite.ps1 deleted file mode 100644 index efca3c8..0000000 --- a/node_modules/.pnpm/vite@5.4.19/node_modules/vite/node_modules/.bin/vite.ps1 +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/bin/env pwsh -$basedir=Split-Path $MyInvocation.MyCommand.Definition -Parent - -$exe="" -$pathsep=":" -$env_node_path=$env:NODE_PATH -$new_node_path="F:\htmlWork\TestCode\frontend\node_modules\.pnpm\vite@5.4.19\node_modules\vite\bin\node_modules;F:\htmlWork\TestCode\frontend\node_modules\.pnpm\vite@5.4.19\node_modules\vite\node_modules;F:\htmlWork\TestCode\frontend\node_modules\.pnpm\vite@5.4.19\node_modules;F:\htmlWork\TestCode\frontend\node_modules\.pnpm\node_modules" -if ($PSVersionTable.PSVersion -lt "6.0" -or $IsWindows) { - # Fix case when both the Windows and Linux builds of Node - # are installed in the same directory - $exe=".exe" - $pathsep=";" -} else { - $new_node_path="/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/vite@5.4.19/node_modules/vite/bin/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/vite@5.4.19/node_modules/vite/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/vite@5.4.19/node_modules:/mnt/f/htmlWork/TestCode/frontend/node_modules/.pnpm/node_modules" -} -if ([string]::IsNullOrEmpty($env_node_path)) { - $env:NODE_PATH=$new_node_path -} else { - $env:NODE_PATH="$new_node_path$pathsep$env_node_path" -} - -$ret=0 -if (Test-Path "$basedir/node$exe") { - # Support pipeline input - if ($MyInvocation.ExpectingInput) { - $input | & "$basedir/node$exe" "$basedir/../../bin/vite.js" $args - } else { - & "$basedir/node$exe" "$basedir/../../bin/vite.js" $args - } - $ret=$LASTEXITCODE -} else { - # Support pipeline input - if ($MyInvocation.ExpectingInput) { - $input | & "node$exe" "$basedir/../../bin/vite.js" $args - } else { - & "node$exe" "$basedir/../../bin/vite.js" $args - } - $ret=$LASTEXITCODE -} -$env:NODE_PATH=$env_node_path -exit $ret diff --git a/node_modules/.vite/deps/_metadata.json b/node_modules/.vite/deps/_metadata.json index 304b460..c305ee1 100644 --- a/node_modules/.vite/deps/_metadata.json +++ b/node_modules/.vite/deps/_metadata.json @@ -1,19 +1,19 @@ { - "hash": "1c38b8e7", - "configHash": "0659056a", - "lockfileHash": "fab50faa", - "browserHash": "63609ea8", + "hash": "485d122e", + "configHash": "43e901b6", + "lockfileHash": "f947d8ed", + "browserHash": "5b5ada51", "optimized": { "alova": { "src": "../../.pnpm/alova@3.2.10/node_modules/alova/dist/alova.esm.js", "file": "alova.js", - "fileHash": "d8f234d1", + "fileHash": "77abfd02", "needsInterop": false }, "alova/fetch": { "src": "../../.pnpm/alova@3.2.10/node_modules/alova/dist/adapter/fetch.esm.js", "file": "alova_fetch.js", - "fileHash": "68a68d14", + "fileHash": "0666df04", "needsInterop": false } }, diff --git a/package-lock.json b/package-lock.json index edb2d71..9e8a0eb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7,11 +7,138 @@ "": { "name": "frontend", "version": "0.0.0", + "dependencies": { + "@better-scroll/core": "^2.5.1", + "alova": "^3.2.10", + "better-scroll": "^2.5.1" + }, "devDependencies": { "@wailsio/runtime": "latest", "vite": "^5.0.0" } }, + "node_modules/@alova/shared": { + "version": "1.1.2", + "resolved": "https://registry.npmmirror.com/@alova/shared/-/shared-1.1.2.tgz", + "integrity": "sha512-8q/gMHFpzm7XYcaUlsyTCMDRRhFnewwheTeObMjPl1+bFdr+wZuBEHEPYIyd8tyzLwfrqpBeonaMN2tlngM8EA==" + }, + "node_modules/@better-scroll/core": { + "version": "2.5.1", + "resolved": "https://registry.npmmirror.com/@better-scroll/core/-/core-2.5.1.tgz", + "integrity": "sha512-koKOuYA55dQ04FJRIVUpMGDr1hbCfWmfX0MGp1hKagkQSWSRpwblqACiwtggVauoj9aaJRJZ9hDsTM4weaavlg==", + "dependencies": { + "@better-scroll/shared-utils": "^2.5.1" + } + }, + "node_modules/@better-scroll/indicators": { + "version": "2.5.1", + "resolved": "https://registry.npmmirror.com/@better-scroll/indicators/-/indicators-2.5.1.tgz", + "integrity": "sha512-Hk+Y00pR6fTsu6C9HGg1yYZtsu1gAcTgcs4C9aM5h6fQANX/T2YIYrOSjZmdL+js2PTcXJWZS8VM4Xjoi1PbfQ==", + "dependencies": { + "@better-scroll/core": "^2.5.1" + } + }, + "node_modules/@better-scroll/infinity": { + "version": "2.5.1", + "resolved": "https://registry.npmmirror.com/@better-scroll/infinity/-/infinity-2.5.1.tgz", + "integrity": "sha512-GKHrrasIh0KlGzhASHDo5hEEBJcDFpP4XaZGPH9Ey8+QBH6/O1ykAXS2ixkVAOTkBrv+KgFXoCUr4oN1xWeM+g==", + "dependencies": { + "@better-scroll/core": "^2.5.1" + } + }, + "node_modules/@better-scroll/mouse-wheel": { + "version": "2.5.1", + "resolved": "https://registry.npmmirror.com/@better-scroll/mouse-wheel/-/mouse-wheel-2.5.1.tgz", + "integrity": "sha512-DGnrirRMY6zMM7xwgx09D/cA9A//3J1/uDkq8iBVEyE5p0sEr/keQpjEfFHGkBRa505BnbBwdbN6f5lugEDSPw==", + "dependencies": { + "@better-scroll/core": "^2.5.1" + } + }, + "node_modules/@better-scroll/movable": { + "version": "2.5.1", + "resolved": "https://registry.npmmirror.com/@better-scroll/movable/-/movable-2.5.1.tgz", + "integrity": "sha512-8bLPRY15bbK4K5+tjrtdaKsFFKmJx72wRdg+xz3xQGFcTD940HFkJiORSOcz8Ufue7eOJfcmreQJBw6XY+TqTw==", + "dependencies": { + "@better-scroll/core": "^2.5.1" + } + }, + "node_modules/@better-scroll/nested-scroll": { + "version": "2.5.1", + "resolved": "https://registry.npmmirror.com/@better-scroll/nested-scroll/-/nested-scroll-2.5.1.tgz", + "integrity": "sha512-3cRsARxf9tq1VWBq7YAaET0xGAmgY1ERMmnXDo2gHFrmsJoNOionlpAeHdZvKQp2jG7JrzJ1O27nGCXf40gnkw==", + "dependencies": { + "@better-scroll/core": "^2.5.1" + } + }, + "node_modules/@better-scroll/observe-dom": { + "version": "2.5.1", + "resolved": "https://registry.npmmirror.com/@better-scroll/observe-dom/-/observe-dom-2.5.1.tgz", + "integrity": "sha512-TCMGFLRfpXBPIwtUV/efliUmfmrhSNI7NXdSyjdWjsLOS7dh3eFkmcom5ERVWMaXVELSmujGXLqobT+dT0C/jg==", + "dependencies": { + "@better-scroll/core": "^2.5.1" + } + }, + "node_modules/@better-scroll/observe-image": { + "version": "2.5.1", + "resolved": "https://registry.npmmirror.com/@better-scroll/observe-image/-/observe-image-2.5.1.tgz", + "integrity": "sha512-0Lhfj83o8EESwOxr8bfStCzNOokTm3KB7JeyMS8u/xl+3tyTuls9889cyAukYk4Yly1cS49pCGfj2P8YOiwtUg==", + "dependencies": { + "@better-scroll/core": "^2.5.1" + } + }, + "node_modules/@better-scroll/pull-down": { + "version": "2.5.1", + "resolved": "https://registry.npmmirror.com/@better-scroll/pull-down/-/pull-down-2.5.1.tgz", + "integrity": "sha512-Y6XcGu2NlevPg3k9VBRRFvpmfoTA+rO96JGdog2qKHclIPNXnsVwsIHtZfAm9weE/f9UuC4BnB+VUFRlucfupg==", + "dependencies": { + "@better-scroll/core": "^2.5.1" + } + }, + "node_modules/@better-scroll/pull-up": { + "version": "2.5.1", + "resolved": "https://registry.npmmirror.com/@better-scroll/pull-up/-/pull-up-2.5.1.tgz", + "integrity": "sha512-1hu3xSMxdB8T391KffpNZ7g93lMwZEHjfb1F1Y4KvIkciDt8nXqkGpqrZF+YwR+EJTgYcWqUO8kgmI6XXu7Pkg==", + "dependencies": { + "@better-scroll/core": "^2.5.1" + } + }, + "node_modules/@better-scroll/scroll-bar": { + "version": "2.5.1", + "resolved": "https://registry.npmmirror.com/@better-scroll/scroll-bar/-/scroll-bar-2.5.1.tgz", + "integrity": "sha512-i6r60pWG/ztkFK2j5Gj54I0LJb2jGh5TWJNQBoW0gUkp28B+0JvBFTwZn9tF7beZCBorKR7Hvvu4O9A1TJy94Q==", + "dependencies": { + "@better-scroll/core": "^2.5.1" + } + }, + "node_modules/@better-scroll/shared-utils": { + "version": "2.5.1", + "resolved": "https://registry.npmmirror.com/@better-scroll/shared-utils/-/shared-utils-2.5.1.tgz", + "integrity": "sha512-AplkfSjXVYP9LZiD6JsKgmgQJ/mG4uuLmBuwLz8W5OsYc7AYTfN8kw6GqZ5OwCGoXkVhBGyd8NeC4xwYItp0aw==" + }, + "node_modules/@better-scroll/slide": { + "version": "2.5.1", + "resolved": "https://registry.npmmirror.com/@better-scroll/slide/-/slide-2.5.1.tgz", + "integrity": "sha512-aDOrfsmjAcz6DXN7mDX3tPieAn195R43Yn9e3waI19TIEok/mQlI1a/kb5quqWOoxkiaZQ8xe3vx5ZTj9C+F6Q==", + "dependencies": { + "@better-scroll/core": "^2.5.1" + } + }, + "node_modules/@better-scroll/wheel": { + "version": "2.5.1", + "resolved": "https://registry.npmmirror.com/@better-scroll/wheel/-/wheel-2.5.1.tgz", + "integrity": "sha512-fYLcEvkh88Z/2L+P5/+SGMunuc+HzAjGOiORIa/x21qb/knO2RFH4A/V1Rt3OIW4QluWzuFnU6jJRPlsQVZ4fg==", + "dependencies": { + "@better-scroll/core": "^2.5.1" + } + }, + "node_modules/@better-scroll/zoom": { + "version": "2.5.1", + "resolved": "https://registry.npmmirror.com/@better-scroll/zoom/-/zoom-2.5.1.tgz", + "integrity": "sha512-aGvFY5ooeZWS4RcxQLD+pGLpQHQxpPy0sMZV3yadcd2QK53PK9gS4Dp+BYfRv8lZ4/P2LoNEhr6Wq1DN6+uPlA==", + "dependencies": { + "@better-scroll/core": "^2.5.1" + } + }, "node_modules/@esbuild/aix-ppc64": { "version": "0.21.5", "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz", @@ -652,6 +779,39 @@ "integrity": "sha512-ENLu8rn1griL1gFHJqkq1i+BVxrrA0JPJHYneUJYuf/s54kjuQViW0RKDEe/WTDo56ABpfykrd/T8OYpPUyXUw==", "dev": true }, + "node_modules/alova": { + "version": "3.2.11", + "resolved": "https://registry.npmmirror.com/alova/-/alova-3.2.11.tgz", + "integrity": "sha512-e1vqJJYOcuq6SOQvO4DddjGsDEuEWm5/uQ1W6ruhrj23OkHQzXWhdXPLmVUWsi9KYt8vyIKuEEqo2FvCitpQwQ==", + "dependencies": { + "@alova/shared": "1.1.2", + "rate-limiter-flexible": "^5.0.3" + }, + "engines": { + "node": ">= 18.0.0" + } + }, + "node_modules/better-scroll": { + "version": "2.5.1", + "resolved": "https://registry.npmmirror.com/better-scroll/-/better-scroll-2.5.1.tgz", + "integrity": "sha512-OiF3cQroRfTzf+CRQH2z1G52ZAlNHINI6lCAvDmyFu0o0nRuTaV9F+fmBGIU2BL5p5IplUQ4E7sYa1TLfZarzQ==", + "dependencies": { + "@better-scroll/core": "^2.5.1", + "@better-scroll/indicators": "^2.5.1", + "@better-scroll/infinity": "^2.5.1", + "@better-scroll/mouse-wheel": "^2.5.1", + "@better-scroll/movable": "^2.5.1", + "@better-scroll/nested-scroll": "^2.5.1", + "@better-scroll/observe-dom": "^2.5.1", + "@better-scroll/observe-image": "^2.5.1", + "@better-scroll/pull-down": "^2.5.1", + "@better-scroll/pull-up": "^2.5.1", + "@better-scroll/scroll-bar": "^2.5.1", + "@better-scroll/slide": "^2.5.1", + "@better-scroll/wheel": "^2.5.1", + "@better-scroll/zoom": "^2.5.1" + } + }, "node_modules/esbuild": { "version": "0.21.5", "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.21.5.tgz", @@ -756,6 +916,11 @@ "node": "^10 || ^12 || >=14" } }, + "node_modules/rate-limiter-flexible": { + "version": "5.0.5", + "resolved": "https://registry.npmmirror.com/rate-limiter-flexible/-/rate-limiter-flexible-5.0.5.tgz", + "integrity": "sha512-+/dSQfo+3FYwYygUs/V2BBdwGa9nFtakDwKt4l0bnvNB53TNT++QSFewwHX9qXrZJuMe9j+TUaU21lm5ARgqdQ==" + }, "node_modules/rollup": { "version": "4.40.1", "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.40.1.tgz", diff --git a/package.json b/package.json index 67e0a6c..c85f369 100644 --- a/package.json +++ b/package.json @@ -16,4 +16,4 @@ "dependencies": { "alova": "^3.2.10" } -} \ No newline at end of file +} diff --git a/public/assets/bg.mp4 b/public/assets/bg.mp4 index c250922..0c32e15 100644 Binary files a/public/assets/bg.mp4 and b/public/assets/bg.mp4 differ diff --git a/public/style.css b/public/style.css index d06c401..99735d1 100644 --- a/public/style.css +++ b/public/style.css @@ -7,6 +7,7 @@ padding: 0; margin: 0; font-family: 'MyFont'; + overflow: hidden; } ul { @@ -91,4 +92,18 @@ li.right div { .muice { animation: myAnimation 1s infinite; /* 设置动画为2秒钟的时间,并无限循环 */ +} +.scroll-img { + margin-right: 12px; + border-radius: 4px; +} +.scroll-wrapper { + white-space: nowrap; + overflow:auto; +} +.scroll-container { + width: 535px; +} +.scroll-wrapper::-webkit-scrollbar { + display: none; } \ No newline at end of file diff --git a/recorder.js b/recorder.js index 87d8697..e2f6277 100644 --- a/recorder.js +++ b/recorder.js @@ -1,8 +1,6 @@ -import {setScrollPosition} from "./util.js" +import {setScrollPosition, config} from "./util.js" + -const APPID = "5c2055f8"; -const API_SECRET = "2bc7168506a38cf1a7a52fb3ba63d873"; -const API_KEY = "2d1e9e5604d66089bda42ff4797201c1"; let btnStatus = "UNDEFINED"; // "UNDEFINED" "CONNECTING" "OPEN" "CLOSING" "CLOSED" @@ -22,8 +20,8 @@ function getWebSocketUrl() { // 请求地址根据语种不同变化 var url = "wss://iat-api.xfyun.cn/v2/iat"; var host = "iat-api.xfyun.cn"; - var apiKey = API_KEY; - var apiSecret = API_SECRET; + var apiKey = config.API_KEY; + var apiSecret = config.API_SECRET; var date = new Date().toGMTString(); var algorithm = "hmac-sha256"; var headers = "host date request-line"; @@ -116,7 +114,7 @@ function connectWebSocket() { }); var params = { common: { - app_id: APPID, + app_id: config.APPID, }, business: { language: "zh_cn", diff --git a/util.js b/util.js index 2fa45d8..4e24fc2 100644 --- a/util.js +++ b/util.js @@ -49,8 +49,8 @@ function onchangeSize(){ document.getElementById("txtBg").style.height = window.innerHeight/(1920/1312)+"px"; document.getElementById("txtBg").style.right = scaleW/(1080/36)+"px"; document.getElementById("txtBg").style.bottom = window.innerHeight/(1920/250)+"px"; - document.getElementById("startBnt").style.bottom = window.innerHeight/(1920/140)+"px"; - document.getElementById("stopBnt").style.bottom = window.innerHeight/(1920/135)+"px"; + document.getElementById("startBnt").style.bottom = window.innerHeight/(1920/130)+"px"; + document.getElementById("stopBnt").style.bottom = window.innerHeight/(1920/125)+"px"; } //设置滚动条位置 @@ -82,7 +82,7 @@ function addAvdi(){ function addredHot(){ let aili = document.createElement("li"); aili.className = "left" - aili.innerHTML="AI小红帽"; + aili.innerHTML="小德"; document.getElementById("cont").appendChild(aili); } //活动 @@ -103,7 +103,7 @@ function addBackItemAction(obj){
`; } //文本 -function addBackItemText(msg, idName=""){ +function addBackItemText(msg, idName="", isTTS=true){ let li = document.createElement("li"); li.id = idName li.className = "left" @@ -117,15 +117,61 @@ function addBackItemText(msg, idName=""){ }else{ div.innerText = msg.name || "我在持续学习中..."; } + if(isTTS){ + window.isHello = false; + startTTS(div.innerText); + } } //单图片 function addItemImg(imgUrl){ let li_img = document.createElement("li"); li_img.className = "left" document.getElementById("cont").appendChild(li_img); - let w = (scaleW/(1080/540)); + let w = (scaleW/(1080/535)); + li_img.innerHTML = ``; +} +//单图片 +function addItemSmallImg(imgUrl){ + let li_img = document.createElement("li"); + li_img.className = "left" + document.getElementById("cont").appendChild(li_img); + let w = (scaleW/(1080/200)); li_img.innerHTML = ``; } +function addItemBigImg(imgUrl,clickFun){ + let li_img = document.createElement("img"); + document.getElementById("cont").appendChild(li_img); + let w = (scaleW/(1080/535)); + li_img.style.width = w+"px"; + li_img.src = imgUrl; + li_img.width = w; + if(clickFun){ + li_img.addEventListener("click", clickFun); + } +} + + +function addClickItemImg(div,url,width,height,clickFun){ + let img = document.createElement("img"); + img.className = "scroll-img"; + img.width = width; + img.height = height; + img.src = url; + if(clickFun){ + img.addEventListener("click", clickFun); + } + div.appendChild(img); +} + +function addWrapper(){ + let li = document.createElement("li"); + document.getElementById("cont").appendChild(li); + li.className = "scroll-container"; + let wrapper = document.createElement("div"); + wrapper.className="scroll-wrapper"; + li.appendChild(wrapper); + return wrapper; +} function requestNoJM (params) { let xmlhttp = new XMLHttpRequest(); @@ -154,9 +200,14 @@ function requestNoJM (params) { xmlhttp.send(); } +var config = { + "APPID":"5c2055f8", + "API_SECRET":"2bc7168506a38cf1a7a52fb3ba63d873", + "API_KEY":"2d1e9e5604d66089bda42ff4797201c1" + } -export {initDate,onchangeSize,setScrollPosition,addBackItemText,addItemImg,addAvdi,addredHot,addBackItemAction} +export {initDate,onchangeSize,setScrollPosition,addBackItemText,addItemImg,addWrapper,addClickItemImg,addAvdi,addItemSmallImg,addItemBigImg,addredHot,addBackItemAction, config} // // requestNoJM({ // url: 'https://saas.1000my.com/Api/System/Login?key='+param,