ananzhusen il y a 1 an
Parent
commit
d4005a34e6
1 fichiers modifiés avec 33 ajouts et 18 suppressions
  1. 33 18
      src/views/components/Header.vue

+ 33 - 18
src/views/components/Header.vue

@@ -332,9 +332,15 @@
   <template #header>
         <div>
           <span style="vertical-align: middle">{{ payListDialog.title }}</span>
-          <t-tooltip  content="这是Tooltip内容">
-            <HelpCircleIcon style="margin-left:12px;" />
-        </t-tooltip>
+          <!-- <t-tooltip  content="这是Tooltip内容"> -->
+          <a
+            :href="payListDialog.href"
+            target="_blank"
+            class="hover"
+          >
+            <HelpCircleIcon class="hover" style="margin-left:12px;" />
+          </a>
+        <!-- </t-tooltip> -->
         </div>
    </template>
    <div class="pay-box">
@@ -383,10 +389,19 @@
     :close-on-overlay-click="false"
     :top="95"
     :width="700"
-    :cancel-btn="null" 
-    :confirm-btn="downloadZipDialog.checked?'去支付(不支持退款)':'直接下载'"
+    :cancel-btn="{
+          content: '直接下载',
+          variant: 'outline',
+          style: {
+            width: '100px',
+            color:'#707B8F',
+            marginRight:'8px'
+          }
+    }"
+    :confirm-btn="downloadZipDialog.checked?'去支付(不支持退款)':null"
     @close="downloadZipDialog.show = false"
     @confirm="prePayDownloadZip"
+    @cancel="doDownloadZip"
   >
   <template #header>
         <div>
@@ -979,11 +994,11 @@ const prePayDownloadZip = async ()=>{
     data.order = res;
   }else {
     doDownloadZip();
-    downloadZipDialog.show = false;
   }
 }
 
 const doDownloadZip = async ()=>{
+  downloadZipDialog.show = false;
   MessagePlugin.info('正在下载打包中,可能需要几分钟,请耐心等待...');
   const [{ default: JSZip }, { saveAs }] = await Promise.all([
     import('jszip'),
@@ -2319,7 +2334,7 @@ const finishPay = async () => {
     MessagePlugin.success('支付成功');
     wechatPayDialog.show = false;
     if(wechatPayDialog.isZip){
-      downloadZipDialog.show = false;
+      // downloadZipDialog.show = false;
       wechatPayDialog.isZip = false;
       doDownloadZip();
     }else{
@@ -2470,29 +2485,29 @@ const onSuccess = (success: boolean) => {
     max-height: 200px;
     overflow-y: scroll;
     &>div{
-      width: 96px;
-      height: 96px;
+      width: 48px;
+      height: 48px;
       background: #1c283b;
       border-radius: 4px;
-      margin-right:6px;
-      margin-bottom:8px;
-      &:nth-child(6n){
+      margin-right:2.5px;
+      margin-bottom:2.5px;
+      &:nth-child(12n){
         margin-right: 0px;
       }
       img{
-        margin:8px;
-        width:80px;
-        height:80px;
+        margin:4px;
+        width:40px;
+        height:40px;
       }
       .l-icon{
         /* width: 80px; */
         /* height: 80px; */
         /* margin:8px; */
-        font-size:60px;
-        margin:18px;
+        font-size:24px;
+        margin:12px;
       }
       &>div{
-        margin: 32px 36px;
+        margin: 8px 12px;
       }
     }