diff --git a/miniprogram/mathPages/assets/animal-number/animal-number-1.png b/miniprogram/mathPages/shared/assets/animal-number/animal-number-1.png similarity index 100% rename from miniprogram/mathPages/assets/animal-number/animal-number-1.png rename to miniprogram/mathPages/shared/assets/animal-number/animal-number-1.png diff --git a/miniprogram/mathPages/assets/animal-number/animal-number-10.png b/miniprogram/mathPages/shared/assets/animal-number/animal-number-10.png similarity index 100% rename from miniprogram/mathPages/assets/animal-number/animal-number-10.png rename to miniprogram/mathPages/shared/assets/animal-number/animal-number-10.png diff --git a/miniprogram/mathPages/assets/animal-number/animal-number-2.png b/miniprogram/mathPages/shared/assets/animal-number/animal-number-2.png similarity index 100% rename from miniprogram/mathPages/assets/animal-number/animal-number-2.png rename to miniprogram/mathPages/shared/assets/animal-number/animal-number-2.png diff --git a/miniprogram/mathPages/assets/animal-number/animal-number-3.png b/miniprogram/mathPages/shared/assets/animal-number/animal-number-3.png similarity index 100% rename from miniprogram/mathPages/assets/animal-number/animal-number-3.png rename to miniprogram/mathPages/shared/assets/animal-number/animal-number-3.png diff --git a/miniprogram/mathPages/assets/animal-number/animal-number-4.png b/miniprogram/mathPages/shared/assets/animal-number/animal-number-4.png similarity index 100% rename from miniprogram/mathPages/assets/animal-number/animal-number-4.png rename to miniprogram/mathPages/shared/assets/animal-number/animal-number-4.png diff --git a/miniprogram/mathPages/assets/animal-number/animal-number-5.png b/miniprogram/mathPages/shared/assets/animal-number/animal-number-5.png similarity index 100% rename from miniprogram/mathPages/assets/animal-number/animal-number-5.png rename to miniprogram/mathPages/shared/assets/animal-number/animal-number-5.png diff --git a/miniprogram/mathPages/assets/animal-number/animal-number-6.png b/miniprogram/mathPages/shared/assets/animal-number/animal-number-6.png similarity index 100% rename from miniprogram/mathPages/assets/animal-number/animal-number-6.png rename to miniprogram/mathPages/shared/assets/animal-number/animal-number-6.png diff --git a/miniprogram/mathPages/assets/animal-number/animal-number-7.png b/miniprogram/mathPages/shared/assets/animal-number/animal-number-7.png similarity index 100% rename from miniprogram/mathPages/assets/animal-number/animal-number-7.png rename to miniprogram/mathPages/shared/assets/animal-number/animal-number-7.png diff --git a/miniprogram/mathPages/assets/animal-number/animal-number-8.png b/miniprogram/mathPages/shared/assets/animal-number/animal-number-8.png similarity index 100% rename from miniprogram/mathPages/assets/animal-number/animal-number-8.png rename to miniprogram/mathPages/shared/assets/animal-number/animal-number-8.png diff --git a/miniprogram/mathPages/assets/animal-number/animal-number-9.png b/miniprogram/mathPages/shared/assets/animal-number/animal-number-9.png similarity index 100% rename from miniprogram/mathPages/assets/animal-number/animal-number-9.png rename to miniprogram/mathPages/shared/assets/animal-number/animal-number-9.png diff --git a/miniprogram/mathPages/assets/finger/finger-1.png b/miniprogram/mathPages/shared/assets/finger/finger-1.png similarity index 100% rename from miniprogram/mathPages/assets/finger/finger-1.png rename to miniprogram/mathPages/shared/assets/finger/finger-1.png diff --git a/miniprogram/mathPages/assets/finger/finger-10.png b/miniprogram/mathPages/shared/assets/finger/finger-10.png similarity index 100% rename from miniprogram/mathPages/assets/finger/finger-10.png rename to miniprogram/mathPages/shared/assets/finger/finger-10.png diff --git a/miniprogram/mathPages/assets/finger/finger-2.png b/miniprogram/mathPages/shared/assets/finger/finger-2.png similarity index 100% rename from miniprogram/mathPages/assets/finger/finger-2.png rename to miniprogram/mathPages/shared/assets/finger/finger-2.png diff --git a/miniprogram/mathPages/assets/finger/finger-3.png b/miniprogram/mathPages/shared/assets/finger/finger-3.png similarity index 100% rename from miniprogram/mathPages/assets/finger/finger-3.png rename to miniprogram/mathPages/shared/assets/finger/finger-3.png diff --git a/miniprogram/mathPages/assets/finger/finger-4.png b/miniprogram/mathPages/shared/assets/finger/finger-4.png similarity index 100% rename from miniprogram/mathPages/assets/finger/finger-4.png rename to miniprogram/mathPages/shared/assets/finger/finger-4.png diff --git a/miniprogram/mathPages/assets/finger/finger-5.png b/miniprogram/mathPages/shared/assets/finger/finger-5.png similarity index 100% rename from miniprogram/mathPages/assets/finger/finger-5.png rename to miniprogram/mathPages/shared/assets/finger/finger-5.png diff --git a/miniprogram/mathPages/assets/finger/finger-6.png b/miniprogram/mathPages/shared/assets/finger/finger-6.png similarity index 100% rename from miniprogram/mathPages/assets/finger/finger-6.png rename to miniprogram/mathPages/shared/assets/finger/finger-6.png diff --git a/miniprogram/mathPages/assets/finger/finger-7.png b/miniprogram/mathPages/shared/assets/finger/finger-7.png similarity index 100% rename from miniprogram/mathPages/assets/finger/finger-7.png rename to miniprogram/mathPages/shared/assets/finger/finger-7.png diff --git a/miniprogram/mathPages/assets/finger/finger-8.png b/miniprogram/mathPages/shared/assets/finger/finger-8.png similarity index 100% rename from miniprogram/mathPages/assets/finger/finger-8.png rename to miniprogram/mathPages/shared/assets/finger/finger-8.png diff --git a/miniprogram/mathPages/assets/finger/finger-9.png b/miniprogram/mathPages/shared/assets/finger/finger-9.png similarity index 100% rename from miniprogram/mathPages/assets/finger/finger-9.png rename to miniprogram/mathPages/shared/assets/finger/finger-9.png diff --git a/miniprogram/mathPages/assets/fruits/1.png b/miniprogram/mathPages/shared/assets/fruits/1.png similarity index 100% rename from miniprogram/mathPages/assets/fruits/1.png rename to miniprogram/mathPages/shared/assets/fruits/1.png diff --git a/miniprogram/mathPages/assets/fruits/10.png b/miniprogram/mathPages/shared/assets/fruits/10.png similarity index 100% rename from miniprogram/mathPages/assets/fruits/10.png rename to miniprogram/mathPages/shared/assets/fruits/10.png diff --git a/miniprogram/mathPages/assets/fruits/11.png b/miniprogram/mathPages/shared/assets/fruits/11.png similarity index 100% rename from miniprogram/mathPages/assets/fruits/11.png rename to miniprogram/mathPages/shared/assets/fruits/11.png diff --git a/miniprogram/mathPages/assets/fruits/12.png b/miniprogram/mathPages/shared/assets/fruits/12.png similarity index 100% rename from miniprogram/mathPages/assets/fruits/12.png rename to miniprogram/mathPages/shared/assets/fruits/12.png diff --git a/miniprogram/mathPages/assets/fruits/13.png b/miniprogram/mathPages/shared/assets/fruits/13.png similarity index 100% rename from miniprogram/mathPages/assets/fruits/13.png rename to miniprogram/mathPages/shared/assets/fruits/13.png diff --git a/miniprogram/mathPages/assets/fruits/14.png b/miniprogram/mathPages/shared/assets/fruits/14.png similarity index 100% rename from miniprogram/mathPages/assets/fruits/14.png rename to miniprogram/mathPages/shared/assets/fruits/14.png diff --git a/miniprogram/mathPages/assets/fruits/15.png b/miniprogram/mathPages/shared/assets/fruits/15.png similarity index 100% rename from miniprogram/mathPages/assets/fruits/15.png rename to miniprogram/mathPages/shared/assets/fruits/15.png diff --git a/miniprogram/mathPages/assets/fruits/16.png b/miniprogram/mathPages/shared/assets/fruits/16.png similarity index 100% rename from miniprogram/mathPages/assets/fruits/16.png rename to miniprogram/mathPages/shared/assets/fruits/16.png diff --git a/miniprogram/mathPages/assets/fruits/17.png b/miniprogram/mathPages/shared/assets/fruits/17.png similarity index 100% rename from miniprogram/mathPages/assets/fruits/17.png rename to miniprogram/mathPages/shared/assets/fruits/17.png diff --git a/miniprogram/mathPages/assets/fruits/18.png b/miniprogram/mathPages/shared/assets/fruits/18.png similarity index 100% rename from miniprogram/mathPages/assets/fruits/18.png rename to miniprogram/mathPages/shared/assets/fruits/18.png diff --git a/miniprogram/mathPages/assets/fruits/19.png b/miniprogram/mathPages/shared/assets/fruits/19.png similarity index 100% rename from miniprogram/mathPages/assets/fruits/19.png rename to miniprogram/mathPages/shared/assets/fruits/19.png diff --git a/miniprogram/mathPages/assets/fruits/2.png b/miniprogram/mathPages/shared/assets/fruits/2.png similarity index 100% rename from miniprogram/mathPages/assets/fruits/2.png rename to miniprogram/mathPages/shared/assets/fruits/2.png diff --git a/miniprogram/mathPages/assets/fruits/20.png b/miniprogram/mathPages/shared/assets/fruits/20.png similarity index 100% rename from miniprogram/mathPages/assets/fruits/20.png rename to miniprogram/mathPages/shared/assets/fruits/20.png diff --git a/miniprogram/mathPages/assets/fruits/21.png b/miniprogram/mathPages/shared/assets/fruits/21.png similarity index 100% rename from miniprogram/mathPages/assets/fruits/21.png rename to miniprogram/mathPages/shared/assets/fruits/21.png diff --git a/miniprogram/mathPages/assets/fruits/22.png b/miniprogram/mathPages/shared/assets/fruits/22.png similarity index 100% rename from miniprogram/mathPages/assets/fruits/22.png rename to miniprogram/mathPages/shared/assets/fruits/22.png diff --git a/miniprogram/mathPages/assets/fruits/3.png b/miniprogram/mathPages/shared/assets/fruits/3.png similarity index 100% rename from miniprogram/mathPages/assets/fruits/3.png rename to miniprogram/mathPages/shared/assets/fruits/3.png diff --git a/miniprogram/mathPages/assets/fruits/4.png b/miniprogram/mathPages/shared/assets/fruits/4.png similarity index 100% rename from miniprogram/mathPages/assets/fruits/4.png rename to miniprogram/mathPages/shared/assets/fruits/4.png diff --git a/miniprogram/mathPages/assets/fruits/5.png b/miniprogram/mathPages/shared/assets/fruits/5.png similarity index 100% rename from miniprogram/mathPages/assets/fruits/5.png rename to miniprogram/mathPages/shared/assets/fruits/5.png diff --git a/miniprogram/mathPages/assets/fruits/6.png b/miniprogram/mathPages/shared/assets/fruits/6.png similarity index 100% rename from miniprogram/mathPages/assets/fruits/6.png rename to miniprogram/mathPages/shared/assets/fruits/6.png diff --git a/miniprogram/mathPages/assets/fruits/7.png b/miniprogram/mathPages/shared/assets/fruits/7.png similarity index 100% rename from miniprogram/mathPages/assets/fruits/7.png rename to miniprogram/mathPages/shared/assets/fruits/7.png diff --git a/miniprogram/mathPages/assets/fruits/8.png b/miniprogram/mathPages/shared/assets/fruits/8.png similarity index 100% rename from miniprogram/mathPages/assets/fruits/8.png rename to miniprogram/mathPages/shared/assets/fruits/8.png diff --git a/miniprogram/mathPages/assets/fruits/9.png b/miniprogram/mathPages/shared/assets/fruits/9.png similarity index 100% rename from miniprogram/mathPages/assets/fruits/9.png rename to miniprogram/mathPages/shared/assets/fruits/9.png diff --git a/miniprogram/mathPages/assets/twelve-animals/1.png b/miniprogram/mathPages/shared/assets/twelve-animals/1.png similarity index 100% rename from miniprogram/mathPages/assets/twelve-animals/1.png rename to miniprogram/mathPages/shared/assets/twelve-animals/1.png diff --git a/miniprogram/mathPages/assets/twelve-animals/10.png b/miniprogram/mathPages/shared/assets/twelve-animals/10.png similarity index 100% rename from miniprogram/mathPages/assets/twelve-animals/10.png rename to miniprogram/mathPages/shared/assets/twelve-animals/10.png diff --git a/miniprogram/mathPages/assets/twelve-animals/11.png b/miniprogram/mathPages/shared/assets/twelve-animals/11.png similarity index 100% rename from miniprogram/mathPages/assets/twelve-animals/11.png rename to miniprogram/mathPages/shared/assets/twelve-animals/11.png diff --git a/miniprogram/mathPages/assets/twelve-animals/12.png b/miniprogram/mathPages/shared/assets/twelve-animals/12.png similarity index 100% rename from miniprogram/mathPages/assets/twelve-animals/12.png rename to miniprogram/mathPages/shared/assets/twelve-animals/12.png diff --git a/miniprogram/mathPages/assets/twelve-animals/2.png b/miniprogram/mathPages/shared/assets/twelve-animals/2.png similarity index 100% rename from miniprogram/mathPages/assets/twelve-animals/2.png rename to miniprogram/mathPages/shared/assets/twelve-animals/2.png diff --git a/miniprogram/mathPages/assets/twelve-animals/3.png b/miniprogram/mathPages/shared/assets/twelve-animals/3.png similarity index 100% rename from miniprogram/mathPages/assets/twelve-animals/3.png rename to miniprogram/mathPages/shared/assets/twelve-animals/3.png diff --git a/miniprogram/mathPages/assets/twelve-animals/4.png b/miniprogram/mathPages/shared/assets/twelve-animals/4.png similarity index 100% rename from miniprogram/mathPages/assets/twelve-animals/4.png rename to miniprogram/mathPages/shared/assets/twelve-animals/4.png diff --git a/miniprogram/mathPages/assets/twelve-animals/5.png b/miniprogram/mathPages/shared/assets/twelve-animals/5.png similarity index 100% rename from miniprogram/mathPages/assets/twelve-animals/5.png rename to miniprogram/mathPages/shared/assets/twelve-animals/5.png diff --git a/miniprogram/mathPages/assets/twelve-animals/6.png b/miniprogram/mathPages/shared/assets/twelve-animals/6.png similarity index 100% rename from miniprogram/mathPages/assets/twelve-animals/6.png rename to miniprogram/mathPages/shared/assets/twelve-animals/6.png diff --git a/miniprogram/mathPages/assets/twelve-animals/7.png b/miniprogram/mathPages/shared/assets/twelve-animals/7.png similarity index 100% rename from miniprogram/mathPages/assets/twelve-animals/7.png rename to miniprogram/mathPages/shared/assets/twelve-animals/7.png diff --git a/miniprogram/mathPages/assets/twelve-animals/8.png b/miniprogram/mathPages/shared/assets/twelve-animals/8.png similarity index 100% rename from miniprogram/mathPages/assets/twelve-animals/8.png rename to miniprogram/mathPages/shared/assets/twelve-animals/8.png diff --git a/miniprogram/mathPages/assets/twelve-animals/9.png b/miniprogram/mathPages/shared/assets/twelve-animals/9.png similarity index 100% rename from miniprogram/mathPages/assets/twelve-animals/9.png rename to miniprogram/mathPages/shared/assets/twelve-animals/9.png diff --git a/miniprogram/mathPages/shared/service/additionDraw.ts b/miniprogram/mathPages/shared/service/additionDraw.ts index c90d73e..cdfbc1d 100644 --- a/miniprogram/mathPages/shared/service/additionDraw.ts +++ b/miniprogram/mathPages/shared/service/additionDraw.ts @@ -150,7 +150,7 @@ class AdditionDraw extends BaseDrawService { // 加载图片 let image: any = null; try { - const imagePath = `/mathPages/assets/${config.folder}/${imageConfigItem.imageIndex}.png`; + const imagePath = `/mathPages/shared/assets/${config.folder}/${imageConfigItem.imageIndex}.png`; image = await getImage(canvas, imagePath); } catch (error) { console.error('图片加载失败:', error); diff --git a/miniprogram/mathPages/shared/service/compareDraw.ts b/miniprogram/mathPages/shared/service/compareDraw.ts index 0044501..ab58ac5 100644 --- a/miniprogram/mathPages/shared/service/compareDraw.ts +++ b/miniprogram/mathPages/shared/service/compareDraw.ts @@ -303,7 +303,7 @@ class CompareDraw extends BaseDrawService { // 加载图片 let boxImage: any = null; try { - const imagePath = `/mathPages/assets/${folder}/${imageIndex}.png`; + const imagePath = `/mathPages/shared/assets/${folder}/${imageIndex}.png`; boxImage = await getImage(canvas, imagePath); } catch (error) { console.error(`加载${folder}/${imageIndex}图片失败:`, error); diff --git a/miniprogram/mathPages/shared/service/countMatchDraw.ts b/miniprogram/mathPages/shared/service/countMatchDraw.ts index c80ac11..69f026c 100644 --- a/miniprogram/mathPages/shared/service/countMatchDraw.ts +++ b/miniprogram/mathPages/shared/service/countMatchDraw.ts @@ -207,7 +207,7 @@ class CountMatchDraw extends BaseDrawService { // 加载当前框使用的图片(只加载一次,用于计算高度和绘制) let boxImage: any = null; try { - const imagePath = `/mathPages/assets/${config.folder}/${boxImageIndex}.png`; + const imagePath = `/mathPages/shared/assets/${config.folder}/${boxImageIndex}.png`; boxImage = await getImage(canvas, imagePath); } catch (error) { console.error( diff --git a/miniprogram/mathPages/shared/service/countingSelectDraw.ts b/miniprogram/mathPages/shared/service/countingSelectDraw.ts index 2eccea0..f4ecfc8 100644 --- a/miniprogram/mathPages/shared/service/countingSelectDraw.ts +++ b/miniprogram/mathPages/shared/service/countingSelectDraw.ts @@ -304,7 +304,7 @@ class CountingSelectDraw extends BaseDrawService { // 加载图片 let boxImage: any = null; try { - const imagePath = `/mathPages/assets/${config.folder}/${imageIndex}.png`; + const imagePath = `/mathPages/shared/assets/${config.folder}/${imageIndex}.png`; boxImage = await getImage(canvas, imagePath); } catch (error) { console.error(`加载${config.folder}/${imageIndex}图片失败:`, error); diff --git a/miniprogram/mathPages/shared/service/numberDecomposeDraw.ts b/miniprogram/mathPages/shared/service/numberDecomposeDraw.ts index b3f33c3..1e715d6 100644 --- a/miniprogram/mathPages/shared/service/numberDecomposeDraw.ts +++ b/miniprogram/mathPages/shared/service/numberDecomposeDraw.ts @@ -487,7 +487,7 @@ class NumberDecomposeDraw extends BaseDrawService { // 加载图片 let boxImage: any = null; try { - const imagePath = `/mathPages/assets/${config.folder}/${imageIndex}.png`; + const imagePath = `/mathPages/shared/assets/${config.folder}/${imageIndex}.png`; boxImage = await getImage(canvas, imagePath); } catch (error) { console.error(`加载${config.folder}/${imageIndex}图片失败:`, error); diff --git a/miniprogram/mathPages/shared/service/numberPreviewDraw.ts b/miniprogram/mathPages/shared/service/numberPreviewDraw.ts index ec39752..d7ba6b6 100644 --- a/miniprogram/mathPages/shared/service/numberPreviewDraw.ts +++ b/miniprogram/mathPages/shared/service/numberPreviewDraw.ts @@ -52,7 +52,7 @@ export async function drawNumberPreview({ // 加载并绘制 animal-number 图片 try { - const animalImagePath = `/mathPages/assets/animal-number/animal-number-${selectedNumber}.png`; + const animalImagePath = `/mathPages/shared/assets/animal-number/animal-number-${selectedNumber}.png`; const animalImage = await getImage(canvas, animalImagePath); ctx.drawImage( animalImage, @@ -79,7 +79,7 @@ export async function drawNumberPreview({ ctx.strokeRect(boxX, fingerBoxY, boxWidth, boxHeight); try { - const fingerImagePath = `/mathPages/assets/finger/finger-${selectedNumber}.png`; + const fingerImagePath = `/mathPages/shared/assets/finger/finger-${selectedNumber}.png`; const fingerImage = await getImage(canvas, fingerImagePath); // 计算图片在框内的位置(居中显示) const imagePadding = 10;