From 5a685934e52a3ce50222f7ed452fc84a6f6a49f2 Mon Sep 17 00:00:00 2001
From: taiyuan <taiyuan@yolipai.com>
Date: Fri, 30 Jul 2021 11:43:02 +0800
Subject: [PATCH] 幸运大转盘跳转修改

---
 app.wxss                                           | 13 ++++++++++---
 packageB/pages/luckactivity/luckinfo/luckinfo.js   |  2 +-
 packageB/pages/luckactivity/luckinfo/luckinfo.wxml |  4 ++--
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/app.wxss b/app.wxss
index 5e585fb..1b890d0 100644
--- a/app.wxss
+++ b/app.wxss
@@ -703,9 +703,9 @@ background: #ffe3e2;
 /* 图标字体(ty) */
 @font-face {
   font-family: 'iconfont';  /* Project id 2054717 */
-  src: url('//at.alicdn.com/t/font_2054717_nzwl8grylfi.woff2?t=1627287108388') format('woff2'),
-       url('//at.alicdn.com/t/font_2054717_nzwl8grylfi.woff?t=1627287108388') format('woff'),
-       url('//at.alicdn.com/t/font_2054717_nzwl8grylfi.ttf?t=1627287108388') format('truetype');
+  src: url('//at.alicdn.com/t/font_2054717_v0znypg14xq.woff2?t=1627541682562') format('woff2'),
+       url('//at.alicdn.com/t/font_2054717_v0znypg14xq.woff?t=1627541682562') format('woff'),
+       url('//at.alicdn.com/t/font_2054717_v0znypg14xq.ttf?t=1627541682562') format('truetype');
 }
 
 .iconfont {
@@ -716,6 +716,13 @@ background: #ffe3e2;
   -moz-osx-font-smoothing: grayscale;
 }
 
+
+.icon-zhiwen:before {
+  content: "\e6aa";
+}
+
+
+
 .icon-guan:before {
   content: "\e612";
 }
diff --git a/packageB/pages/luckactivity/luckinfo/luckinfo.js b/packageB/pages/luckactivity/luckinfo/luckinfo.js
index 7485e86..da17d83 100644
--- a/packageB/pages/luckactivity/luckinfo/luckinfo.js
+++ b/packageB/pages/luckactivity/luckinfo/luckinfo.js
@@ -633,7 +633,7 @@ Page({
 	
 		
 		
-		if(no_luck_urltype == 1) {
+		if(no_luck_urltype == 1 && (resultTitle == '谢谢参与')) {
 			if(this.data.luckInfo.no_luck_weappurl) {
 				let num = this.data.num;
 				let url = this.data.luckInfo.no_luck_weappurl;
diff --git a/packageB/pages/luckactivity/luckinfo/luckinfo.wxml b/packageB/pages/luckactivity/luckinfo/luckinfo.wxml
index e86d819..f53d314 100644
--- a/packageB/pages/luckactivity/luckinfo/luckinfo.wxml
+++ b/packageB/pages/luckactivity/luckinfo/luckinfo.wxml
@@ -165,7 +165,7 @@
 				<view class="bold c-tb fs40">{{luckInfo.no_luck_name}}</view>
 				<view class="pdt10">{{luckInfo.no_luck_remark}}</view>
 				<view class="img-container2"><image src="{{imghost + (luckInfo.no_luck_img ? luckInfo.no_luck_img:'/miniapp/images/luckDraw/nolockimg.png')}}" class="img" mode="aspectFit"></image></view>
-				
+				<view class="pdt40 fs26 c9 t-c" wx:if="{{(luckInfo.no_luck_urltype == 1) && luckInfo.no_luck_weappurl}}">{{num}}s后自动跳转...</view>
 			</block>
 			<block wx:else>
 				<view class="bold c-tb fs40">恭喜你获得</view>
@@ -178,7 +178,7 @@
 			<view class="btn btn2" bindtap="clickReceive">立即领取</view>
 		</view>
 		
-		<view class="pdt40 fs26 c9 t-c" wx:if="{{luckInfo.no_luck_urltype == 1 && luckInfo.no_luck_weappurl}}">{{num}}s后自动跳转...</view>
+		
 		<!-- <view class="note">注：未领取就关闭弹窗视为主动放弃奖品。</view> -->
 	</view>
 </view>
--
libgit2 0.21.4