Merge branch 'dev' into 'test'

Dev See merge request !1028

Merge branch 'dev' into 'test'
Dev See merge request !1028
后端研发-苏明海
2 parents 716de7e1 a8f12876
Showing 3 changed files with 48 additions and 5 deletions
components/diy_notice/diy_notice.wxml
components/diy_title/diy_title.wxml
pages/goods/goodsInfo/goodsInfo.wxss
 <wxs module="g_filter" src="g_filter.wxs"></wxs>
 <block wx:if="{{object.style==1}}">
-  <block wx:if="{{g_filter.has_char(object.wxapp_url,'plugin')>=0}}">
+    <block wx:if="{{g_filter.has_char(object.wxapp_url,'plugin')>=0}}">
     <navigator url="{{object.wxapp_url}}" class="s1_gk_a1" style="background-color: {{object.notice_bgcolor}}">
         <view class="big_border">
             <image class="image_c" src="{{imghost}}/miniapp/images/notice.png"></image>
@@ -13,7 +13,24 @@
             </view>
         </view>
     </navigator> 
-	</block>	
+	</block>
+
+    <block wx:elif="{{object.AppId}}">
+        <navigator target="miniProgram" app-id="{{object.AppId}}" path="{{object.wxapp_url}}" class="s1_gk_a1" style="background-color: {{object.notice_bgcolor}}">
+            <view class="big_border">
+                <image class="image_c" src="{{imghost}}/miniapp/images/notice.png"></image>
+                <view class="marquee">
+                    <view class="content">
+                        <text style="color: {{object.notice_color}}">{{object.noticetxt}}</text> <text style="display: inline-block; width: 590rpx;line-height:30rpx;"></text>
+                        <text style="color: {{object.notice_color}}">{{object.noticetxt}}</text> <text style="display: inline-block; width: 590rpx;line-height:30rpx;"></text>
+                        <text style="color: {{object.notice_color}}">{{object.noticetxt}}</text> <text style="display: inline-block; width: 590rpx;line-height:30rpx;"></text>
+                    </view>
+                </view>
+            </view>
+        </navigator>
+
+    </block>
+
 	<block wx:else>
     <view data-url="{{object.wxapp_url}}" class="s1_gk_a1" bindtap="go_url" style="background-color: {{object.notice_bgcolor}}">
@@ -9,12 +9,36 @@
         <view class="txet_rim"><view class="text" style='color:{{object.title_namecolor}}'>{{object.title_name}}</view></view>
     </navigator>
+    <navigator  wx:elif="{{object.AppId}}" style="width:{{100/nav_list.length}}%;" target="miniProgram" app-id="{{object.AppId}}" path="{{object.wxapp_url}}">
+        <view class="txet_rim"><view class="text" style='color:{{object.title_namecolor}}'>{{object.title_name}}</view></view>
+    </navigator>
+
     <view data-url="{{object.wxapp_url}}" bindtap="go_url" wx:else>
         <view class="txet_rim"><view class="text" style='color:{{object.title_namecolor}}'>{{object.title_name}}</view></view>
     </view>
     <block wx:if="{{object.title_right!= ''}}">
-        <view bindtap="go_url" data-url='{{object.wxapp_url}}'>
+
+        <navigator  url="{{object.wxapp_url}}" wx:if="{{g_filter.has_char(object.wxapp_url,'plugin')>=0}}">
+            <view class="right_rim">
+                <view class="font_right_rim">
+                    <view class="caption" style='color:{{object.title_rightcolor}}'>{{object.title_right}}</view>
+                </view>
+                <view class="aa"></view>
+            </view>
+        </navigator>
+
+        <navigator  target="miniProgram" app-id="{{object.AppId}}" path="{{object.wxapp_url}}" wx:elif="{{object.AppId}}">
+            <view class="right_rim">
+                <view class="font_right_rim">
+                    <view class="caption" style='color:{{object.title_rightcolor}}'>{{object.title_right}}</view>
+                </view>
+                <view class="aa"></view>
+            </view>
+        </navigator>
+
+
+        <view  wx:else  bindtap="go_url" data-url='{{object.wxapp_url}}'>
             <view class="right_rim">
                 <view class="font_right_rim">
                     <view class="caption" style='color:{{object.title_rightcolor}}'>{{object.title_right}}</view>
@@ -22,5 +46,6 @@
                 <view class="aa"></view>
             </view>
         </view>
+        
     </block>
 </view>
@@ -3718,10 +3718,11 @@ button.custom-service::after {
 .poster-container {
 	box-sizing: border-box;
 	position: fixed;
+	width: 610rpx;
 	top: 50%;
 	left: 50%;
 	transform: translate(-50%, -50%);
-	width: calc(100% - 210rpx);
+	/* width: calc(100% - 210rpx); */
 	z-index: 1000;
 }
@@ -3742,7 +3743,7 @@ button.custom-service::after {
 .poster {
 	box-sizing: border-box;
 	width: 100%;
-	height: 940rpx;
+	height: 980rpx;
 	border-radius: 16rpx;
 	/* box-shadow: 0 8px 12px #666; */
 	position: relative;