From 307960b07d8cb122d9de0c8267b8cb7a63cfc605 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 09 二月 2026 18:24:25 +0800
Subject: [PATCH] a

---
 web/unpackage/dist/dev/mp-weixin/pages/merchant/merchatCenter/merchantActivity/merchantActivity.wxml |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/web/unpackage/dist/dev/mp-weixin/pages/merchant/merchatCenter/merchantActivity/merchantActivity.wxml b/web/unpackage/dist/dev/mp-weixin/pages/merchant/merchatCenter/merchantActivity/merchantActivity.wxml
index b8ed7cd..ddbdaa6 100644
--- a/web/unpackage/dist/dev/mp-weixin/pages/merchant/merchatCenter/merchantActivity/merchantActivity.wxml
+++ b/web/unpackage/dist/dev/mp-weixin/pages/merchant/merchatCenter/merchantActivity/merchantActivity.wxml
@@ -1 +1,5 @@
-<view class="activity-list"><view class="search-area"><view class="search-conainer"><uni-easyinput style="margin:auto 0;" vue-id="832b5666-1" inputBorder="{{false}}" prefixIcon="search" placeholder="鎼滅储娲诲姩" confirmType="search" value="{{searchValue}}" data-event-opts="{{[['^confirm',[['confirm']]],['^input',[['__set_model',['','searchValue','$event',[]]]]]]}}" bind:confirm="__e" bind:input="__e" bind:__l="__l"></uni-easyinput></view></view><me-tabs vue-id="832b5666-2" top="{{90}}" fixed="{{true}}" tabs="{{tabs}}" numbers="{{orderNumList}}" value="{{tabIndex}}" data-event-opts="{{[['^change',[['tabChange']]],['^input',[['__set_model',['','tabIndex','$event',[]]]]]]}}" bind:change="__e" bind:input="__e" bind:__l="__l"></me-tabs><mescroll-body class="vue-ref" vue-id="832b5666-3" top="{{orderTop}}" up="{{upOption}}" data-ref="mescrollRef" data-event-opts="{{[['^init',[['mescrollInit']]],['^down',[['downCallback']]],['^up',[['upCallback']]]]}}" bind:init="__e" bind:down="__e" bind:up="__e" bind:__l="__l" vue-slots="{{['default']}}"><block wx:for="{{activities}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view><merchant-activity-item vue-id="{{('832b5666-4-'+index)+','+('832b5666-3')}}" itme="{{item}}" data-event-opts="{{[['^select',[['showActivity',['$0'],[[['activities','',index]]]]]],['^deleteAction',[['deleteAction',['$0'],[[['activities','',index]]]]]],['^editAction',[['editAction',['$0'],[[['activities','',index]]]]]],['^showApply',[['showApply',['$0'],[[['activities','',index]]]]]]]}}" bind:select="__e" bind:deleteAction="__e" bind:editAction="__e" bind:showApply="__e" bind:__l="__l"></merchant-activity-item></view></block></mescroll-body><view class="bottom-add"></view><view class="bottom-add" style="position:fixed;bottom:0;"><view data-event-opts="{{[['tap',[['select',['$event']]]]]}}" class="add-action" bindtap="__e">鏂板娲诲姩</view></view></view>
\ No newline at end of file
+<<<<<<< HEAD
+<view class="activity-list"><view class="search-area"><view class="search-conainer"><uni-easyinput style="margin:auto 0;" vue-id="832b5666-1" inputBorder="{{false}}" prefixIcon="search" placeholder="鎼滅储娲诲姩" confirmType="search" value="{{searchValue}}" data-event-opts="{{[['^confirm',[['confirm']]],['^input',[['__set_model',['','searchValue','$event',[]]]]]]}}" bind:confirm="__e" bind:input="__e" bind:__l="__l"></uni-easyinput></view></view><me-tabs vue-id="832b5666-2" top="{{90}}" fixed="{{true}}" tabs="{{tabs}}" numbers="{{orderNumList}}" value="{{tabIndex}}" data-event-opts="{{[['^change',[['tabChange']]],['^input',[['__set_model',['','tabIndex','$event',[]]]]]]}}" bind:change="__e" bind:input="__e" bind:__l="__l"></me-tabs><mescroll-body class="vue-ref" vue-id="832b5666-3" top="{{orderTop}}" up="{{upOption}}" data-ref="mescrollRef" data-event-opts="{{[['^init',[['mescrollInit']]],['^down',[['downCallback']]],['^up',[['upCallback']]]]}}" bind:init="__e" bind:down="__e" bind:up="__e" bind:__l="__l" vue-slots="{{['default']}}"><block wx:for="{{activities}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view><merchant-activity-item vue-id="{{('832b5666-4-'+index)+','+('832b5666-3')}}" itme="{{item}}" data-event-opts="{{[['^select',[['showActivity',['$0'],[[['activities','',index]]]]]],['^deleteAction',[['deleteAction',['$0'],[[['activities','',index]]]]]],['^editAction',[['editAction',['$0'],[[['activities','',index]]]]]],['^showApply',[['showApply',['$0'],[[['activities','',index]]]]]]]}}" bind:select="__e" bind:deleteAction="__e" bind:editAction="__e" bind:showApply="__e" bind:__l="__l"></merchant-activity-item></view></block></mescroll-body><view class="bottom-add"></view><view class="bottom-add" style="position:fixed;bottom:0;"><view data-event-opts="{{[['tap',[['select',['$event']]]]]}}" class="add-action" bindtap="__e">鏂板娲诲姩</view></view></view>
+=======
+<view class="activity-list"><view class="search-area"><view class="search-conainer"></view></view><me-tabs vue-id="832b5666-1" top="{{90}}" fixed="{{true}}" tabs="{{tabs}}" numbers="{{orderNumList}}" value="{{tabIndex}}" data-event-opts="{{[['^change',[['tabChange']]],['^input',[['__set_model',['','tabIndex','$event',[]]]]]]}}" bind:change="__e" bind:input="__e" bind:__l="__l"></me-tabs><view class="bottom-add"></view><view class="bottom-add" style="position:fixed;bottom:0;"><view data-event-opts="{{[['tap',[['select',['$event']]]]]}}" class="add-action" bindtap="__e">鏂板娲诲姩</view></view></view>
+>>>>>>> 4eac422e52a4d28fb651b75d0f054697c7a2c0fa

--
Gitblit v1.9.3