Merge branch 'dev_1.1.2' of https://git.yishihui.com/DeNet/de-net into dev_1.1.2

src/http/configAPI.js

@@ -1,4 +1,4 @@
-export const appVersionCode = 11
+export const appVersionCode = 12
 
 const api = {
 	production: 'https://api.denetme.net',

src/manifest.json

@@ -2,7 +2,7 @@
     "manifest_version": 3,
     "name": "DeNet",
     "description": "Growing more twitter followers with Denet",
-    "version": "1.1.1",
+    "version": "1.1.2",
     "background": {
         "service_worker": "/js/background.js"
     },

src/view/iframe/buy-nft/buy/home.vue

@@ -149,9 +149,9 @@ onMounted(() => {
     background: #fff;
     border-radius: 25px;
     max-width: 1000px;
-    min-width: 800px;
+    min-width: 1000px;
     max-height: 90%;
-    min-height: 90%;
+    min-height: 800px;
     z-index: 23;
     display: flex;
     flex-direction: column;
@@ -202,7 +202,9 @@ onMounted(() => {
         .mark {
             margin-left: 20px;
 
-            .sold {}
+            .sold {
+                margin-bottom: 7px;
+            }
 
             .limit {
                 color: #AF934E;
@@ -251,7 +253,7 @@ onMounted(() => {
                 .off {
                     color: #AF934E;
                     font-weight: 700;
-                    font-size: 14px;
+                    font-size: 12px;
 
                     letter-spacing: 0.3px;
                 }

src/view/iframe/buy-nft/buy/pay.vue

@@ -209,7 +209,8 @@ onMounted(() => {
     border-radius: 25px;
     max-width: 1000px;
     min-width: 800px;
-    height: 90%;
+    max-height: 90%;
+    min-height: 800px;
     z-index: 23;
     display: flex;
     flex-direction: column;
@@ -259,6 +260,7 @@ onMounted(() => {
 
             .tip {
                 margin-top: 15px;
+                font-size: 16px;    
                 display: flex;
                 justify-content: space-between;
 

src/view/iframe/publish/components/top-up.vue

@@ -180,7 +180,7 @@ onMounted(() => {
             justify-content: space-between;
 
             .item {
-                width: 48%;
+                width: 49%;
 
                 .label {
                     color: #A0A0A0;

src/view/iframe/publish/give-dialog.vue

@@ -2,11 +2,13 @@
     <div class="overlay" v-if="visible">
         <div class="content"
             :style="{
-                height: dialogStyle.dialogHeight + 'px',
-                width: showComType == 'default' ?  dialogStyle.dialogContentWidth + 'px' : '880px'}">   
-            <div class="pop-mask"  
-                v-show="showCurrencyPop || showCurrencySelect" 
-                @click.stop="showCurrencyPop = false; showCurrencySelect=false"></div>
+                height: showComType === 'preview' ? 'calc(100vh - 40px)' : dialogStyle.dialogHeight + 'px',
+                width: dialogStyle.dialogContentWidth + 'px',
+            }">
+            <div class="pop-mask"
+                v-show="showCurrencyPop || showCurrencySelect"
+                @click.stop="showCurrencyPop = false; showCurrencySelect=false">
+            </div>
 
             <!-- 头部 -->
             <div class="head">
@@ -416,8 +418,8 @@ let visible = ref(false);
 
 //弹窗高度
 let dialogStyle = reactive({
-    dialogHeight: 680,
-    dialogContentWidth: 1080
+    dialogHeight: 670,
+    dialogContentWidth: 1100
 })
 
 // 当前展示组件内容 default(表单)  preview(预览)  topUp(充值)
@@ -1642,6 +1644,7 @@ onMounted(() => {
         transform: translate(-50%, -50%);
         box-sizing: border-box;
         z-index: 2000;
+        max-height: 825px;
 
         .pop-mask {
             width: 100%;
@@ -2156,10 +2159,11 @@ onMounted(() => {
     overflow-y: auto;
     .card {
         float: left;
+        width: 480px;
         position: relative;
         .flash {
             overflow: hidden;
-            height: 460px;
+            height: 600px;
             border-radius: 26px;
             border: solid 1px #ECECEC;
         }
@@ -2187,7 +2191,7 @@ onMounted(() => {
     }
     .card-content {
         float: right;
-        width: 430px;
+        width: 500px;
     }
     .card-amount {
         overflow: hidden;

src/view/iframe/red-packet/luck-draw.vue

@@ -1511,11 +1511,10 @@ function handleRedPacket() {
             postId: state.postId
         }
     }).then((res) => {
-        state.loading_show = false
         if (res.code == 0) {
-            showOpenedPage()
             init()
         } else {
+            state.loading_show = false
             handleErrorCode(res)
         }
     }).catch(() => {