Merge branch '1.2.0' of http://gitlab.oytour.com/viitto/pptist into 1.2.0

# Conflicts:
#	src/views/SellTemplate/components/journeyAdsList.vue

src/App.vue

@@ -126,7 +126,7 @@ const sellHistoryTripTemplate = async (sellId:any,LogId:any) => {
       if(!LogId){
         queryMsg = {
           Id: sellId,
-          Status: 1
+          Status: searchData.value.ViewSlideshow==1?1:0
         }
         dataRes = await ConfigService.sellGetTemplateDetails(queryMsg);
       }else{

src/views/SellTemplate/components/journeyAdsList.vue

@@ -271,7 +271,7 @@ import CopyFile from "./CopyFile.vue";
     }
     const viewTemplate = (row:any) => {
         let param = query()
-        const url = `${location.origin}?uid=${param.uid}&sellId=${row.FileId}&ViewSlideshow=1`
+        const url = `${location.origin}?uid=${param.uid}&sellId=${row.FileId}&ViewSlideshow=2`
         window.open(url);
     }
     const handleSelectionChange = (val: []) =>{