Browse Source

[fix] Post Editor LinkImg、US Pay

wenliming 2 years ago
parent
commit
a7df4a9948

+ 6 - 0
src/view/iframe/publish/give-dialog.vue

@@ -1014,6 +1014,12 @@ const updateCurrencyBanlce = async () => {
     if(currentCurrencyInfo.value.currencyCode == 'USD') {
     if(currentCurrencyInfo.value.currencyCode == 'USD') {
         let currencyInfoRes = await getCurrencyByCode({currencyCode: currentCurrencyInfo.value.currencyCode});
         let currencyInfoRes = await getCurrencyByCode({currencyCode: currentCurrencyInfo.value.currencyCode});
 
 
+        calcRechPayAmount({
+            currencyCode: currentCurrencyInfo.value.currencyCode,
+            orderAmountValue: baseFormData.amountValue,
+            payChannel: 'ach'
+        });
+
         if(currencyInfoRes.code == 0 && currencyInfoRes.data) {
         if(currencyInfoRes.code == 0 && currencyInfoRes.data) {
             currentCurrencyInfo.value = currencyInfoRes.data;
             currentCurrencyInfo.value = currencyInfoRes.data;
         }
         }

+ 5 - 1
src/view/iframe/publish/tool-box/child/editor.vue

@@ -153,7 +153,11 @@ const searchHandler = async (_params) => {
   }
   }
   
   
   let convertRes = await convertUrl({ params: { originUrl: siteUrl.value } });
   let convertRes = await convertUrl({ params: { originUrl: siteUrl.value } });
-  let params = { convertUrl: siteUrl.value, originUrl: siteUrl.value, appId: currentApp.appId, linkImagePath: currentApp.linkImagePath, currentApp };
+  let params = { convertUrl: siteUrl.value, 
+                  originUrl: siteUrl.value, 
+                  appId: currentApp.appId, 
+                  linkImagePath: currentApp.linkImagePath, 
+                  currentApp };
 
 
   loadingHide();
   loadingHide();
   clearTimeout(timer);
   clearTimeout(timer);

+ 3 - 3
src/view/iframe/publish/tool-box/child/preview.vue

@@ -120,7 +120,7 @@ const props = defineProps({
 watch(() => props.screenshotWebsiteData,
 watch(() => props.screenshotWebsiteData,
     (newVal) => {
     (newVal) => {
         let { appId } = props.previewData;
         let { appId } = props.previewData;
-        if (loadingHide && !appId && (newVal.url || newVal.status)) {
+        if (loadingHide && (!appId || appId && !props.previewData.linkImagePath ) && (newVal.url || newVal.status)) {
             loadingHide();
             loadingHide();
             loadingHide = null;
             loadingHide = null;
             submitPublish();
             submitPublish();
@@ -198,7 +198,7 @@ const publishHandler = () => {
         return;
         return;
     }
     }
 
 
-    if (!appId && !props.screenshotWebsiteData.url) {
+    if ((!appId || appId && !props.previewData.linkImagePath) && !props.screenshotWebsiteData.url) {
         loadingHide = message.loading('loading...', 0);
         loadingHide = message.loading('loading...', 0);
         return;
         return;
     }
     }
@@ -408,7 +408,7 @@ onUnmounted(() => {
                     .cover {
                     .cover {
                         height: calc(100% - 73px);
                         height: calc(100% - 73px);
                         width: 100%;
                         width: 100%;
-                        object-fit: contain;
+                        object-fit: cover;
                     }
                     }
 
 
                     .bottom-bar {
                     .bottom-bar {

+ 3 - 3
src/view/iframe/publish/tool-box/index.vue

@@ -64,9 +64,9 @@ const changeShowCom = (params) => {
     previewData.linkImagePath = params.linkImagePath || '';
     previewData.linkImagePath = params.linkImagePath || '';
     previewData.currentApp = params.currentApp || {};
     previewData.currentApp = params.currentApp || {};
 
 
-    if(!params.appId) {
-        screenshotWebsiteData.url = '';
-        screenshotWebsiteData.status = '';
+    screenshotWebsiteData.url = '';
+    screenshotWebsiteData.status = '';
+    if(!params.appId || params.appId && !params.linkImagePath) {
         screenshotWebsite({
         screenshotWebsite({
             params: {
             params: {
                 url: params.convertUrl
                 url: params.convertUrl