From f9d49455368b557eb10915d7cc56c4b5e17d338b Mon Sep 17 00:00:00 2001
From: yiming <m13691596795@163.com>
Date: 星期二, 13 八月 2024 15:34:11 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
.env.product | 4 ++--
src/books/artAndDance/view/components/index.vue | 2 +-
src/components/paint/index.vue | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.env.product b/.env.product
index 3958a74..307f663 100644
--- a/.env.product
+++ b/.env.product
@@ -1,6 +1,6 @@
VUE_APP_ENV = 'product'
VUE_APP_API_URL = "https://jsek.bnuic.com"
VUE_APP_RESOURCE_CTX = 'https://jsek.bnuic.com/books/resource/'
-VUE_APP_PUBLIC_PATH = 'https://jsek.bnuic.com/books/book/english'
+VUE_APP_PUBLIC_PATH = 'https://jsek.bnuic.com/books/book/artAndDrama'
VUE_APP_BOOK_LIST = "childHealth/lifeCare/sportsAndHealth/embedded/english/artAndDance/artAndDrama/mathBook"
-VUE_APP_BOOK_ID = 'english'
\ No newline at end of file
+VUE_APP_BOOK_ID = 'artAndDrama'
\ No newline at end of file
diff --git a/src/books/artAndDance/view/components/index.vue b/src/books/artAndDance/view/components/index.vue
index 9942c6b..7bf5d1c 100644
--- a/src/books/artAndDance/view/components/index.vue
+++ b/src/books/artAndDance/view/components/index.vue
@@ -191,7 +191,7 @@
// 娴嬭瘯椤甸潰璺宠浆
// setTimeout(() => {
- // this.gotoPage(6, 29);
+ // this.gotoPage(6, 30);
// setTimeout(() => {
// this.renderSign("Highlight", {
// id: "2ACA9359",
diff --git a/src/components/paint/index.vue b/src/components/paint/index.vue
index a073674..e10c782 100644
--- a/src/components/paint/index.vue
+++ b/src/components/paint/index.vue
@@ -1,6 +1,6 @@
<template>
<div class="paint">
- <canvas width="400" height="600" id="canvas"></canvas>
+ <canvas width="600" height="800" id="canvas"></canvas>
<!-- 鎿嶄綔鎸夐挳 -->
<ul class="paint-btn">
<li class="btn-box">
--
Gitblit v1.9.1