From 9aa5406769837108cd77c99356c9b84e579dbac4 Mon Sep 17 00:00:00 2001
From: wanganmao <525987762@qq.com>
Date: Tue, 29 Nov 2022 20:09:18 +0800
Subject: [PATCH 1/8] =?UTF-8?q?fix:=20bug=20=E9=9C=87=E5=93=A5=E6=9B=BF?=
 =?UTF-8?q?=E6=8D=A2=E7=94=9F=E4=BA=A7=E7=8E=AF=E5=A2=83=E5=9F=9F=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.prod | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.env.prod b/.env.prod
index ff8db3e9..e8147e53 100644
--- a/.env.prod
+++ b/.env.prod
@@ -2,13 +2,13 @@ NODE_ENV = 'production'
 VUE_APP_CURRENTMODE = 'prod'
 
 VUE_APP_BASEOSS = 'https://cxp-pubcos.yili.com/prod-yls'
-VUE_APP_BASEURL = 'https://ylst-api.xapi.digitalyili.com/'
+VUE_APP_BASEURL = 'https://yls-api.xapi.digitalyili.com/'
 
 VUE_APP_DELiVERY_BASEURL='https://ylsdist-net.x.digitalyili.com/'
 VUE_APP_MESSAGE_CENTER ='http://gtech-gateway.cxpin.digitalyili.com/apigtech/message-send-center/';
 
 VUE_APP_LOGIN = 'https://yip.digitalyili.com//login'
-VUE_APP_SOCKETURL = 'wss://ylst-api.xapi.digitalyili.com/survey_sync'
+VUE_APP_SOCKETURL = 'wss://yls-api.xapi.digitalyili.com/survey_sync'
 VUE_APP_JSONPURL = 'https://iam.digitalyili.com/idp/restful/getIDPToken'
 
 VUE_APP_YQRURL = 'https://ocp.digitalyili.com'

From 0ca8d55c6541b95011b3e8b24d904881e278b109 Mon Sep 17 00:00:00 2001
From: wanganmao <525987762@qq.com>
Date: Tue, 29 Nov 2022 20:18:22 +0800
Subject: [PATCH 2/8] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.prod | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.env.prod b/.env.prod
index e8147e53..017e003e 100644
--- a/.env.prod
+++ b/.env.prod
@@ -2,13 +2,13 @@ NODE_ENV = 'production'
 VUE_APP_CURRENTMODE = 'prod'
 
 VUE_APP_BASEOSS = 'https://cxp-pubcos.yili.com/prod-yls'
-VUE_APP_BASEURL = 'https://yls-api.xapi.digitalyili.com/'
+VUE_APP_BASEURL = 'https://yls.xapi.digitalyili.com/'
 
 VUE_APP_DELiVERY_BASEURL='https://ylsdist-net.x.digitalyili.com/'
 VUE_APP_MESSAGE_CENTER ='http://gtech-gateway.cxpin.digitalyili.com/apigtech/message-send-center/';
 
 VUE_APP_LOGIN = 'https://yip.digitalyili.com//login'
-VUE_APP_SOCKETURL = 'wss://yls-api.xapi.digitalyili.com/survey_sync'
+VUE_APP_SOCKETURL = 'wss://yls.xapi.digitalyili.com/survey_sync'
 VUE_APP_JSONPURL = 'https://iam.digitalyili.com/idp/restful/getIDPToken'
 
 VUE_APP_YQRURL = 'https://ocp.digitalyili.com'

From 080daa887599640b4f849c3dff1bf9f6ee4d9d2d Mon Sep 17 00:00:00 2001
From: wam <525987762@qq.com>
Date: Thu, 1 Dec 2022 16:52:57 +0800
Subject: [PATCH 3/8] =?UTF-8?q?fix:=20bug=20=E6=BB=9A=E5=8A=A8=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/planetDesign/Design/questions/matrix/Matrix.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/planetDesign/Design/questions/matrix/Matrix.vue b/src/views/planetDesign/Design/questions/matrix/Matrix.vue
index 0450d504..47f561c1 100644
--- a/src/views/planetDesign/Design/questions/matrix/Matrix.vue
+++ b/src/views/planetDesign/Design/questions/matrix/Matrix.vue
@@ -442,6 +442,7 @@ export default {
 <style lang="scss" scoped>
 .matrix {
   padding: 15px 0;
+  overflow: auto;
   .table {
     tr {
       font-size: 14px;

From 1e570292999071f27ceb4bdf7b7308ed6b2727b2 Mon Sep 17 00:00:00 2001
From: wam <525987762@qq.com>
Date: Thu, 1 Dec 2022 22:01:59 +0800
Subject: [PATCH 4/8] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=83=AD=E5=93=A5?=
 =?UTF-8?q?=E8=AF=B4=E7=9A=84=E5=AF=B9=E9=BD=90=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Answer/questions/components/viewer.utils.scss | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/Answer/questions/components/viewer.utils.scss b/src/views/Answer/questions/components/viewer.utils.scss
index 35be237e..c5b7d7d3 100644
--- a/src/views/Answer/questions/components/viewer.utils.scss
+++ b/src/views/Answer/questions/components/viewer.utils.scss
@@ -42,13 +42,13 @@
 .pc .pageNext::before{
   content: "下一页";
   padding-right: 10px;
-  line-height: 52px;
+  line-height: 50px;
   vertical-align: top;
 }
 .pc .pagePre::after{
   content: "上一页";
   padding-left: 10px;
-  line-height: 52px;
+  line-height: 50px;
   vertical-align: top;
 }
 
@@ -174,14 +174,14 @@
 .mobile .pageNext::before{
   content: "下一页";
   padding-right: 10px;
-  line-height: 42px;
+  line-height: 43px;
   vertical-align: top;
 }
 
 .mobile .pagePre::after{
   content: "上一页";
   padding-left: 10px;
-  line-height: 42px;
+  line-height: 43px;
   vertical-align: top;
 }
 

From d504eb24d50358eca799d2d1bc1d07ebb7e6fc19 Mon Sep 17 00:00:00 2001
From: wam <525987762@qq.com>
Date: Thu, 1 Dec 2022 23:27:53 +0800
Subject: [PATCH 5/8] =?UTF-8?q?fix:=20bug=20=E5=9B=BE=E6=96=87=E8=AF=B4?=
 =?UTF-8?q?=E6=98=8E=E5=AE=9A=E6=97=B6=E5=99=A8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Answer/questions/components/AnswerViewer.vue | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/views/Answer/questions/components/AnswerViewer.vue b/src/views/Answer/questions/components/AnswerViewer.vue
index ac1b5a1a..e0ebcab9 100644
--- a/src/views/Answer/questions/components/AnswerViewer.vue
+++ b/src/views/Answer/questions/components/AnswerViewer.vue
@@ -195,10 +195,13 @@ export default defineComponent({
           }
         }
       },
+
+      showTimeTimeoutId: 0,
     };
   },
   beforeUnmount() {
     this.pager.clear();
+    if(this.showTimeTimeoutId) clearTimeout(this.showTimeTimeoutId);
   },
   async mounted() {
 
@@ -220,7 +223,10 @@ export default defineComponent({
     this.shopData = buildShopDataDemo(this.scene);
     
     if(this.config.is_show_time && this.config.show_time){
-      setTimeout(() => this.$emit("next"), this.config.show_time * 1000)
+      this.showTimeTimeoutId = setTimeout(() => {
+        this.showTimeTimeoutId = 0;
+        this.$emit("next");
+      }, this.config.show_time * 1000)
     }
 
     if(this.config.is_three_dimensions) {

From fa9c31b548b7d8b5a270a785e8972ccfa19301fe Mon Sep 17 00:00:00 2001
From: wam <525987762@qq.com>
Date: Sat, 3 Dec 2022 22:12:10 +0800
Subject: [PATCH 6/8] =?UTF-8?q?fix:=203D=E9=97=AE=E5=8D=B7=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BDloading?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Answer/questions/components/SceneGuidance.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/Answer/questions/components/SceneGuidance.vue b/src/views/Answer/questions/components/SceneGuidance.vue
index a07db2c2..93201982 100644
--- a/src/views/Answer/questions/components/SceneGuidance.vue
+++ b/src/views/Answer/questions/components/SceneGuidance.vue
@@ -129,6 +129,7 @@ export default {
   width: 100vw;
   height: 100vh;
   z-index: 9999;
+  background-color: #FFFFFF;
   user-select: none;
   .step{
     width: 100%;

From 383047a9f165a9ed6472aab19990e742d6fa5896 Mon Sep 17 00:00:00 2001
From: wanganmao <525987762@qq.com>
Date: Mon, 5 Dec 2022 09:48:43 +0800
Subject: [PATCH 7/8] =?UTF-8?q?fix:=20bug=20=E3=80=90=E7=9F=A9=E9=98=B5?=
 =?UTF-8?q?=E3=80=91=E5=88=A0=E9=99=A4=E8=A1=8C=E6=A0=87=E7=AD=BE/?=
 =?UTF-8?q?=E5=88=97=E6=A0=87=E7=AD=BE=E7=9A=84=E5=88=A0=E9=99=A4=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=EF=BC=8C=E6=82=AC=E6=B5=AE=E9=A2=9C=E8=89=B2=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=EF=BC=8C=E5=BA=94=E4=B8=BA=E7=BB=BF=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/planetDesign/Design/questions/matrix/Matrix.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/planetDesign/Design/questions/matrix/Matrix.vue b/src/views/planetDesign/Design/questions/matrix/Matrix.vue
index 60298f08..a5987dda 100644
--- a/src/views/planetDesign/Design/questions/matrix/Matrix.vue
+++ b/src/views/planetDesign/Design/questions/matrix/Matrix.vue
@@ -507,7 +507,7 @@ export default {
 .iconfont {
   cursor: pointer;
   &:hover {
-    color: #1c6fff;
+    color: #70b936;
   }
 }
 </style>

From 0e716183b7cf05fa44a933ddff2463986e74d9b5 Mon Sep 17 00:00:00 2001
From: wanganmao <525987762@qq.com>
Date: Mon, 5 Dec 2022 10:04:05 +0800
Subject: [PATCH 8/8] =?UTF-8?q?fix:=20=E3=80=90=E5=88=9B=E4=BD=9C=E4=B8=AD?=
 =?UTF-8?q?=E5=BF=83=E3=80=91=E4=BC=98=E5=8C=96=20=E7=83=AD=E5=8C=BA?=
 =?UTF-8?q?=E9=A2=98=E6=88=AA=E5=9B=BE=E5=91=BD=E5=90=8D=20=E6=8C=89?=
 =?UTF-8?q?=E7=85=A7=E5=9C=BA=E6=99=AF=E5=90=8D=E7=A7=B0=E8=B4=A7=E6=9E=B6?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=88=B3=E7=9A=84=E5=BD=A2=E5=BC=8F=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E5=95=86=E5=93=81=E6=88=AA=E5=9B=BE=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Design/components/config/Config3D.vue             | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/views/planetDesign/Design/components/config/Config3D.vue b/src/views/planetDesign/Design/components/config/Config3D.vue
index a651a251..4b368299 100644
--- a/src/views/planetDesign/Design/components/config/Config3D.vue
+++ b/src/views/planetDesign/Design/components/config/Config3D.vue
@@ -430,10 +430,17 @@ export default {
     async handleOkGlbViewer() {
 
       var blob = await this.$refs.viewer.snapshot();
-
-      console.log(blob);
       
       const data = await common.cosUpload(blob, blob.name, "", () => {});
+
+      // 商品截图名称优化项
+      try{
+        data.name = `${this.scene?.name}_${this.shelf?.name}_${new Date().getTime()}.png`;
+      }
+      catch(e) {
+        console.warn(e);
+      }
+
       this.glbViewer.data = {
         url: data.url,
         title: data.name,