Ver código fonte

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

zhangwei 2 anos atrás
pai
commit
593a322c77

+ 0 - 1
src/view/iframe/publish/components/follow-input.vue

@@ -293,7 +293,6 @@ const onUserMouseLeave = (params, index) => {
             .at-user-input-placeholder {
                 position: absolute; 
                 top: -1000px;
-                font-size: 13px;
                 min-width: 12px;
                 max-width: 128px;
             }

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

@@ -269,7 +269,7 @@
                                 </div>
                                 <!-- 需充值 -->
                                 <div class="card-content" v-if="Number(baseFormData.amountValue) > Number(currentCurrencyInfo.balance)">
-                                    <!-- <template v-if="currentCurrencyInfo.currencyCode === 'USD'">
+                                    <template v-if="currentCurrencyInfo.currencyCode === 'USD'">
                                         <div class="card-title">
                                             <img class="img" :src=" require('@/assets/subject/top-02.svg') " />
                                             <div class="font">Deposit to Send Giveaway</div>
@@ -293,7 +293,7 @@
                                             </div>
                                         </div>
                                     </template>
-                                    <template v-else> -->
+                                    <template v-else>
                                         <div class="card-title">
                                             <img class="img" :src=" require('@/assets/subject/top-02.svg') " />
                                             <div class="font">Deposit to Send Giveaway</div>
@@ -320,7 +320,7 @@
                                                 :src=" require('@/assets/svg/icon-form-refresh-blue.svg') "
                                             />
                                         </div>
-                                    <!-- </template> -->
+                                    </template>
                                 </div>
                             </div>
                         </template>
@@ -560,7 +560,7 @@ let formList = reactive([
         nodeType: "div",
         text: '',
         type: 8,
-        checked: true,
+        checked: false,
         show: true
     },
     {
@@ -569,7 +569,7 @@ let formList = reactive([
         nodeType: "input",
         text: '',
         type: 7,
-        checked: true,
+        checked: false,
         show: true
     },
 ]);
@@ -1849,8 +1849,17 @@ onMounted(() => {
                         .form-cell-content {
                             .select-mode-ele {
                                 display: flex;
-                                justify-content: space-between;
                                 cursor: pointer;
+
+                                img:first-child {
+                                    margin-right: 10px;
+                                }
+
+                                img {
+                                    -webkit-user-drag: none;
+                                    width: 220px;
+                                    height: 160px;
+                                }
                             }
                             .form-base {
                                 margin-top: 14px;

+ 2 - 0
src/view/iframe/red-packet/luck-draw.vue

@@ -563,6 +563,7 @@ function clickDone() {
         postId: state.postId,
         srcContentId: state.tweetId,
         senderId: state.userId,
+        redPacketType: 1
     });
 }
 function handleScroll(e) {
@@ -1113,6 +1114,7 @@ const showNotOpenPage = () => {
         postId: state.postId,
         srcContentId: state.tweetId,
         senderId: state.userId,
+        redPacketType: 1
     });
 }
 const showOpenedPage = () => {

+ 2 - 0
src/view/iframe/red-packet/red-packet.vue

@@ -507,6 +507,7 @@ function clickDone() {
     postId: state.postId,
     srcContentId: state.tweetId,
     senderId: state.userId,
+    redPacketType: 0
   });
 }
 function handleScroll(e) {
@@ -980,6 +981,7 @@ const showNotOpenPage = () => {
     postId: state.postId,
     srcContentId: state.tweetId,
     senderId: state.userId,
+    redPacketType: 0
   });
 }
 const showOpenedPage = () => {