jwyu 1 年之前
父節點
當前提交
c5548773ff

+ 1 - 1
package.json

@@ -14,7 +14,7 @@
     "@vueuse/core": "^9.13.0",
     "ali-oss": "^6.17.1",
     "axios": "^1.3.4",
-    "highcharts": "^10.3.3",
+    "highcharts": "^9.3.2",
     "himalaya": "^1.1.0",
     "js-base64": "^3.7.5",
     "js-md5": "^0.7.3",

+ 1 - 1
src/router/ppt.js

@@ -13,7 +13,7 @@ export const pptRoutes=[
         meta: { 
             title: "智能PPT",
             hasBackHome:true,
-            keepAlive:true
+            keepAlive:false
         },
     },
     {

+ 1 - 1
src/router/pptEn.js

@@ -13,7 +13,7 @@
         meta: { 
             title: "智能PPT",
             hasBackHome:true,
-            keepAlive:true
+            keepAlive:false
         },
     },
     {

+ 2 - 4
src/views/Login.vue

@@ -111,10 +111,8 @@ const onSubmit = (values) => {
 }
 
 .mobile-bot-text{
-    position: fixed;
-    left: 50%;
-    transform: translateX(-50%);
-    bottom: 90px;
+    margin-top: 200px;
+    text-align: center;
     color: #999;
 }
 .pad-img{

+ 5 - 0
src/views/ppt/Detail.vue

@@ -59,6 +59,7 @@ const {
     handleShowPPTCopy,
     handlePPTDel,
     handlePPTCopy,
+    handlePPTCopyBeforeClose
 
 }=useClassify()
 
@@ -224,6 +225,7 @@ function handleDownLoadFile(){
         show-cancel-button
         confirmButtonText="保存"
         @confirm="handlePPTCopy"
+        :before-close="handlePPTCopyBeforeClose"
     >
         <div class="ppt-copy-wrap">
             <span>选择目录</span>
@@ -268,6 +270,9 @@ function handleDownLoadFile(){
     </van-popup>
 </template>
 
+<style lang="scss">
+@import "./style/common.scss";
+</style>
 <style lang="scss" scoped>
 .ppt-detail-page{
     width: 100%;

+ 1 - 1
src/views/ppt/components/PadPPTIndexWrap.vue

@@ -213,7 +213,7 @@ function goMobileSearch(){
                     @click="goPPTDetail(item)"
                 >
                     <div class="van-ellipsis title">{{item.Title}}</div>
-                    <img class="bg-img" :src="item.BackgroundImg" alt="">
+                    <img class="bg-img" src="/pptImg/pptcover_bg1.jpg" alt="">
                     <div class="time">创建时间:{{item.PptCreateTime}}</div>
                 </li>
                 <li class="empty-item"></li>

+ 14 - 1
src/views/ppt/hooks/useClassify.js

@@ -177,12 +177,24 @@ export function useClassify(){
             GroupId:PPTOptState.copySelectData.GroupId
         }).then(res=>{
             if(res.Ret===200){
-                showToast('复制成功');
+                setTimeout(() => {
+                    showToast('复制成功');
+                }, 100);
+                
                 getPPTClassifyData()
                 PPTOptState.showCopy=false
             }
         })
     }
+    // 关闭复制ppt选择目录弹窗钩子函数
+    const handlePPTCopyBeforeClose=(action)=>{
+        console.log(action);
+        if(action==='confirm'&&!PPTOptState.copySelectData.GroupId){
+            return false
+        }else{
+            return true
+        }
+    }
 
 
     // 跳转ppt详情
@@ -221,6 +233,7 @@ export function useClassify(){
         handlePPTShare,
         handleShowPPTCopy,
         handlePPTCopy,
+        handlePPTCopyBeforeClose,
 
         goPPTDetail
     }

+ 2 - 1
src/views/ppt/hooks/usePPTPublish.js

@@ -634,10 +634,11 @@ async function pageToPPT(){
 function handlePublishPPT(url){
 	apiPPTPublish({
 		PptId:Number(pptId),
-        PptxUrl:url
+    PptxUrl:url
 	}).then(res=>{
 		if(res.Ret===200){
 			showToast('发布成功')
+      location.reload();
 		}
 	})
 }

+ 1 - 1
src/views/ppt/template/Cover.vue

@@ -47,7 +47,7 @@ const lang = ref(window.location.pathname.startsWith("/ppten") ? "en" : "zh");
 </template>
 
 <style lang="scss" scoped>
-@import "../style/common.scss";
+// @import "../style/common.scss";
 .ppt-cover-page {
   position: relative;
   overflow: hidden;

+ 1 - 1
src/views/ppt/template/Footer.vue

@@ -15,7 +15,7 @@ const props=defineProps({
 </template>
 
 <style lang="scss" scoped>
-@import '../style/common.scss';
+// @import '../style/common.scss';
 .ppt-last-page{
     overflow: hidden;
     img{

+ 1 - 1
src/views/ppt/template/FormatEight.vue

@@ -46,7 +46,7 @@ const lang=ref(window.location.pathname.startsWith('/ppten')?'en':'zh')
 
 
 <style scoped lang="scss">
-@import '../style/common.scss';
+// @import '../style/common.scss';
 .ppt-content-box{
 	.top-box{
 		width: 100%;

+ 1 - 1
src/views/ppt/template/FormatFive.vue

@@ -58,7 +58,7 @@ const lang=ref(window.location.pathname.startsWith('/ppten')?'en':'zh')
 
 
 <style scoped lang="scss">
-@import '../style/common.scss';
+// @import '../style/common.scss';
 .ppt-content-box{
 	.container{
 		display: flex;

+ 1 - 1
src/views/ppt/template/FormatFour.vue

@@ -58,7 +58,7 @@ const lang=ref(window.location.pathname.startsWith('/ppten')?'en':'zh')
 
 
 <style scoped lang="scss">
-@import '../style/common.scss';
+// @import '../style/common.scss';
 .ppt-content-box{
 	.container{
 		display: flex;

+ 1 - 1
src/views/ppt/template/FormatNine.vue

@@ -54,7 +54,7 @@ const lang=ref(window.location.pathname.startsWith('/ppten')?'en':'zh')
 
 
 <style scoped lang="scss">
-@import '../style/common.scss';
+// @import '../style/common.scss';
 .ppt-content-box{
 	.top-box{
 		width: 100%;

+ 1 - 1
src/views/ppt/template/FormatOne.vue

@@ -38,6 +38,6 @@ const lang=ref(window.location.pathname.startsWith('/ppten')?'en':'zh')
 
 
 <style lang="scss" scoped>
-@import '../style/common.scss';
+// @import '../style/common.scss';
 
 </style>

+ 1 - 1
src/views/ppt/template/FormatSeven.vue

@@ -46,7 +46,7 @@ const lang=ref(window.location.pathname.startsWith('/ppten')?'en':'zh')
 
 
 <style scoped lang="scss">
-@import '../style/common.scss';
+// @import '../style/common.scss';
 .ppt-content-box{
 	.container{
 		display: flex;

+ 1 - 1
src/views/ppt/template/FormatSix.vue

@@ -35,5 +35,5 @@ const props=defineProps({
 
 
 <style scoped lang="scss">
-@import '../style/common.scss';
+// @import '../style/common.scss';
 </style>

+ 1 - 1
src/views/ppt/template/FormatThree.vue

@@ -51,7 +51,7 @@ const props=defineProps({
 
 
 <style scoped lang="scss">
-@import '../style/common.scss';
+// @import '../style/common.scss';
 .ppt-content-box{
 	.container{
 		display: flex;

+ 1 - 1
src/views/ppt/template/FormatTwo.vue

@@ -42,7 +42,7 @@ const props=defineProps({
 </template>
 
 <style lang="scss" scoped>
-@import '../style/common.scss';
+// @import '../style/common.scss';
 .ppt-content-box{
 	.container{
 		display: flex;