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

src/services/ConfigService.ts

@@ -157,5 +157,19 @@ class ConfigService{
     static async SetShareAsync(params:{ShareFileId:number,ShareList:{ShareType:number,ShareTargetIds:string,EditType:string}[]}):Promise<HttpResponse>{
         return Api.Post("triptemplate_SetTripShare",params)
     }
+    
+    static async GetShareAsync(FileId:number):Promise<HttpResponse>{
+        let msg = {FileId}
+        return Api.Post("triptemplate_GetTripShareDetails",msg)
+    }
+    
+    static async RemoveShareAsync(ShareId:number):Promise<HttpResponse>{
+        let msg = {ShareId}
+        return Api.Post("triptemplate_RemoveTripShare",msg)
+    }
+
+    static async UpdateShareAsync(params:{ShareId:number,ShareTargetIds:string,EditType:string}):Promise<HttpResponse>{
+        return Api.Post("triptemplate_EditTripShare",params)
+    }
 }
 export default ConfigService;
\ No newline at end of file

src/views/SellTemplate/components/journeyAds.vue

@@ -171,7 +171,7 @@
       </div>
       <el-divider
         class="no-bg q-mt-lg"
-        v-if="queryObj.pageCount == queryObj.pageIndex && !loading"
+        v-if="queryObj.pageCount == queryObj.pageIndex && !loading && queryObj.pageCount != 1"
       >
         <span
           class="text-small bg-white"