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

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

@@ -100,6 +100,18 @@ const searchHandler = async () => {
 
   let siteRes = await axios.get(siteUrl.value);
 
+  let currentApp = {
+    appId: '',
+    cateId: '',
+    createType: '',
+    defaultUrl: siteUrl.value,
+    guideData: '',
+    iconPath: favicon,
+    interactType: '',
+    linkImagePath: "",
+    name: siteTitle,
+  }
+
   if (siteRes) {
     if (siteRes.headers['content-type'].indexOf('text/html') < 0 || siteRes.request.status > 399) {
       // 提示
@@ -110,24 +122,12 @@ const searchHandler = async () => {
       siteTitle = getTitleByHtmlStr(siteRes.data);
       if (!siteTitle) {
         siteTitle = urlObj.hostname;
+        currentApp.defaultTit = siteTitle;
       }
-      console.log(siteTitle)
     }
     favicon = urlObj.origin + '/favicon.ico';
   }
 
-  let currentApp = {
-    appId: '',
-    cateId: '',
-    createType: '',
-    defaultUrl: siteUrl.value,
-    guideData: '',
-    iconPath: favicon,
-    interactType: '',
-    linkImagePath: "",
-    name: siteTitle,
-  }
-
   let convertRes = await convertUrl({ params: { originUrl: siteUrl.value } });
   let params = { convertUrl: siteUrl.value, originUrl: siteUrl.value, appId: '', currentApp };
 

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

@@ -202,7 +202,7 @@
                     </div>
                 </div>
             </div>
-            <get-more :style_type="state.detail.rewardType === RewardType.money ? 1 : 3"></get-more>
+            <get-more></get-more>
         </div>
 
 
@@ -1385,7 +1385,7 @@ function init(initParams) {
             state.userId = res.data.srcUserId;
             state.tweet_author = state.detail.postUserInfo && state.detail.postUserInfo.nickName || '';
             state.customCover = state.detail.posterType == 2 ? 1 : 0;
-            state.customGiveaway = state.detail.posterType == 2 ? 1 : 0;
+            state.customGiveaway = state.detail.rewardType == 2 ? 1 : 0;
             // 不要删除这个console
             console.log('postBizData', state.detail)
             checkFacebookReply();

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

@@ -207,7 +207,7 @@
           </div>
         </div>
       </div>
-      <get-more :style_type="state.detail.rewardType === RewardType.money ? 1 : 3"></get-more>
+      <get-more></get-more>
     </div>