From 32bde487b2b59e3b17d934752900889a55dde750 Mon Sep 17 00:00:00 2001
From: luo <17530855@qq.com>
Date: Thu, 21 Sep 2023 09:27:09 +0800
Subject: [PATCH] 公告增加左边图片zdy

---
 components/diy_notice/diy_notice.wxml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/components/diy_notice/diy_notice.wxml b/components/diy_notice/diy_notice.wxml
index 2f45c6f..71ae8fb 100644
--- a/components/diy_notice/diy_notice.wxml
+++ b/components/diy_notice/diy_notice.wxml
@@ -3,8 +3,8 @@
     <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>
-            <view class="marquee">
+            <image class="image_c" mode="heightFix"  src="{{object.leftImage ? object.leftImage : (imghost+'/miniapp/images/notice.png')}}"></image>
+            <view class="marquee" style="{{object.leftImage ? 'margin-left:20rpx;' :''}}">
                 <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>
@@ -18,8 +18,8 @@
     <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">
+                <image class="image_c" mode="heightFix"  src="{{object.leftImage ? object.leftImage : (imghost+'/miniapp/images/notice.png')}}"></image>
+                <view class="marquee" style="{{object.leftImage ? 'margin-left:20rpx;' :''}}">
                     <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>
@@ -35,8 +35,8 @@
 	<block wx:elif="{{object.finderUserName && object.video_type}}">
     <view bindtap="nv_void" data-feedId="{{object.feedId}}" data-video_type="{{object.video_type}}" data-finderUserName="{{object.finderUserName}}" 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">
+            <image class="image_c" mode="heightFix"  src="{{object.leftImage ? object.leftImage : (imghost+'/miniapp/images/notice.png')}}"></image>
+            <view class="marquee" style="{{object.leftImage ? 'margin-left:20rpx;' :''}}">
                 <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>
@@ -49,8 +49,8 @@
 	<block wx:else>
     <view data-url="{{object.wxapp_url}}" class="s1_gk_a1" bindtap="go_url" style="background-color: {{object.notice_bgcolor}}">
         <view class="big_border">
-            <image class="image_c" src="{{imghost}}/miniapp/images/notice.png"></image>
-            <view class="marquee">
+            <image class="image_c" mode="heightFix"  src="{{object.leftImage ? object.leftImage : (imghost+'/miniapp/images/notice.png')}}"></image>
+            <view class="marquee" style="{{object.leftImage ? 'margin-left:20rpx;' :''}}">
                 <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>
--
libgit2 0.21.4