1 participants
-
mentioned in commit 8dda55a40483d18b32152cad4b073c8004e60c5f
-
Status changed to merged
Showing
3 changed files
components/diy_notice/diy_notice.wxml
| 1 | <wxs module="g_filter" src="g_filter.wxs"></wxs> | 1 | <wxs module="g_filter" src="g_filter.wxs"></wxs> |
| 2 | <block wx:if="{{object.style==1}}"> | 2 | <block wx:if="{{object.style==1}}"> |
| 3 | - <block wx:if="{{g_filter.has_char(object.wxapp_url,'plugin')>=0}}"> | 3 | + <block wx:if="{{g_filter.has_char(object.wxapp_url,'plugin')>=0}}"> |
| 4 | <navigator url="{{object.wxapp_url}}" class="s1_gk_a1" style="background-color: {{object.notice_bgcolor}}"> | 4 | <navigator url="{{object.wxapp_url}}" class="s1_gk_a1" style="background-color: {{object.notice_bgcolor}}"> |
| 5 | <view class="big_border"> | 5 | <view class="big_border"> |
| 6 | <image class="image_c" src="{{imghost}}/miniapp/images/notice.png"></image> | 6 | <image class="image_c" src="{{imghost}}/miniapp/images/notice.png"></image> |
| @@ -13,7 +13,24 @@ | @@ -13,7 +13,24 @@ | ||
| 13 | </view> | 13 | </view> |
| 14 | </view> | 14 | </view> |
| 15 | </navigator> | 15 | </navigator> |
| 16 | - </block> | 16 | + </block> |
| 17 | + | ||
| 18 | + <block wx:elif="{{object.AppId}}"> | ||
| 19 | + <navigator target="miniProgram" app-id="{{object.AppId}}" path="{{object.wxapp_url}}" class="s1_gk_a1" style="background-color: {{object.notice_bgcolor}}"> | ||
| 20 | + <view class="big_border"> | ||
| 21 | + <image class="image_c" src="{{imghost}}/miniapp/images/notice.png"></image> | ||
| 22 | + <view class="marquee"> | ||
| 23 | + <view class="content"> | ||
| 24 | + <text style="color: {{object.notice_color}}">{{object.noticetxt}}</text> <text style="display: inline-block; width: 590rpx;line-height:30rpx;"></text> | ||
| 25 | + <text style="color: {{object.notice_color}}">{{object.noticetxt}}</text> <text style="display: inline-block; width: 590rpx;line-height:30rpx;"></text> | ||
| 26 | + <text style="color: {{object.notice_color}}">{{object.noticetxt}}</text> <text style="display: inline-block; width: 590rpx;line-height:30rpx;"></text> | ||
| 27 | + </view> | ||
| 28 | + </view> | ||
| 29 | + </view> | ||
| 30 | + </navigator> | ||
| 31 | + | ||
| 32 | + </block> | ||
| 33 | + | ||
| 17 | 34 | ||
| 18 | <block wx:else> | 35 | <block wx:else> |
| 19 | <view data-url="{{object.wxapp_url}}" class="s1_gk_a1" bindtap="go_url" style="background-color: {{object.notice_bgcolor}}"> | 36 | <view data-url="{{object.wxapp_url}}" class="s1_gk_a1" bindtap="go_url" style="background-color: {{object.notice_bgcolor}}"> |
components/diy_title/diy_title.wxml
| @@ -9,12 +9,36 @@ | @@ -9,12 +9,36 @@ | ||
| 9 | <view class="txet_rim"><view class="text" style='color:{{object.title_namecolor}}'>{{object.title_name}}</view></view> | 9 | <view class="txet_rim"><view class="text" style='color:{{object.title_namecolor}}'>{{object.title_name}}</view></view> |
| 10 | </navigator> | 10 | </navigator> |
| 11 | 11 | ||
| 12 | + <navigator wx:elif="{{object.AppId}}" style="width:{{100/nav_list.length}}%;" target="miniProgram" app-id="{{object.AppId}}" path="{{object.wxapp_url}}"> | ||
| 13 | + <view class="txet_rim"><view class="text" style='color:{{object.title_namecolor}}'>{{object.title_name}}</view></view> | ||
| 14 | + </navigator> | ||
| 15 | + | ||
| 12 | <view data-url="{{object.wxapp_url}}" bindtap="go_url" wx:else> | 16 | <view data-url="{{object.wxapp_url}}" bindtap="go_url" wx:else> |
| 13 | <view class="txet_rim"><view class="text" style='color:{{object.title_namecolor}}'>{{object.title_name}}</view></view> | 17 | <view class="txet_rim"><view class="text" style='color:{{object.title_namecolor}}'>{{object.title_name}}</view></view> |
| 14 | </view> | 18 | </view> |
| 15 | 19 | ||
| 16 | <block wx:if="{{object.title_right!= ''}}"> | 20 | <block wx:if="{{object.title_right!= ''}}"> |
| 17 | - <view bindtap="go_url" data-url='{{object.wxapp_url}}'> | 21 | + |
| 22 | + <navigator url="{{object.wxapp_url}}" wx:if="{{g_filter.has_char(object.wxapp_url,'plugin')>=0}}"> | ||
| 23 | + <view class="right_rim"> | ||
| 24 | + <view class="font_right_rim"> | ||
| 25 | + <view class="caption" style='color:{{object.title_rightcolor}}'>{{object.title_right}}</view> | ||
| 26 | + </view> | ||
| 27 | + <view class="aa"></view> | ||
| 28 | + </view> | ||
| 29 | + </navigator> | ||
| 30 | + | ||
| 31 | + <navigator target="miniProgram" app-id="{{object.AppId}}" path="{{object.wxapp_url}}" wx:elif="{{object.AppId}}"> | ||
| 32 | + <view class="right_rim"> | ||
| 33 | + <view class="font_right_rim"> | ||
| 34 | + <view class="caption" style='color:{{object.title_rightcolor}}'>{{object.title_right}}</view> | ||
| 35 | + </view> | ||
| 36 | + <view class="aa"></view> | ||
| 37 | + </view> | ||
| 38 | + </navigator> | ||
| 39 | + | ||
| 40 | + | ||
| 41 | + <view wx:else bindtap="go_url" data-url='{{object.wxapp_url}}'> | ||
| 18 | <view class="right_rim"> | 42 | <view class="right_rim"> |
| 19 | <view class="font_right_rim"> | 43 | <view class="font_right_rim"> |
| 20 | <view class="caption" style='color:{{object.title_rightcolor}}'>{{object.title_right}}</view> | 44 | <view class="caption" style='color:{{object.title_rightcolor}}'>{{object.title_right}}</view> |
| @@ -22,5 +46,6 @@ | @@ -22,5 +46,6 @@ | ||
| 22 | <view class="aa"></view> | 46 | <view class="aa"></view> |
| 23 | </view> | 47 | </view> |
| 24 | </view> | 48 | </view> |
| 49 | + | ||
| 25 | </block> | 50 | </block> |
| 26 | </view> | 51 | </view> |
pages/goods/goodsInfo/goodsInfo.wxss
| @@ -3718,10 +3718,11 @@ button.custom-service::after { | @@ -3718,10 +3718,11 @@ button.custom-service::after { | ||
| 3718 | .poster-container { | 3718 | .poster-container { |
| 3719 | box-sizing: border-box; | 3719 | box-sizing: border-box; |
| 3720 | position: fixed; | 3720 | position: fixed; |
| 3721 | + width: 610rpx; | ||
| 3721 | top: 50%; | 3722 | top: 50%; |
| 3722 | left: 50%; | 3723 | left: 50%; |
| 3723 | transform: translate(-50%, -50%); | 3724 | transform: translate(-50%, -50%); |
| 3724 | - width: calc(100% - 210rpx); | 3725 | + /* width: calc(100% - 210rpx); */ |
| 3725 | z-index: 1000; | 3726 | z-index: 1000; |
| 3726 | } | 3727 | } |
| 3727 | 3728 | ||
| @@ -3742,7 +3743,7 @@ button.custom-service::after { | @@ -3742,7 +3743,7 @@ button.custom-service::after { | ||
| 3742 | .poster { | 3743 | .poster { |
| 3743 | box-sizing: border-box; | 3744 | box-sizing: border-box; |
| 3744 | width: 100%; | 3745 | width: 100%; |
| 3745 | - height: 940rpx; | 3746 | + height: 980rpx; |
| 3746 | border-radius: 16rpx; | 3747 | border-radius: 16rpx; |
| 3747 | /* box-shadow: 0 8px 12px #666; */ | 3748 | /* box-shadow: 0 8px 12px #666; */ |
| 3748 | position: relative; | 3749 | position: relative; |