+

pages/template/base-list.vue

@@ -20,8 +20,8 @@
 			<uni-load-more :status="loadMoreStatus" :icon-size="16" v-if="detail || items.length > 0"
 				:content-text="loadMoreViewContentText" />
 		</scroll-view>
-		<view class="com-view-bottom" :style="{paddingBottom: bottomBtnPaddingBottom}">
-			<text class="text-bottom-btn" @click="onBottomBtnClick">{{btnText}}</text>
+		<view class="com-v-bottom-btn-parent">
+			<c-button-1 :ui="bottomBtnUI" @onClick="onBottomBtnClick"></c-button-1>
 		</view>
 	</view>
 </template>
@@ -78,7 +78,7 @@
 				this.refresh();
 			},
 			onNavBarLeftClick() {
-				uni.navigateBack();
+				util.navigateBack();
 			},
 			onClickTitleRightIcon() {
 				console.log("click...");
@@ -105,6 +105,7 @@
 			refresh() {
 				let _this = this;
 				setTimeout(() => {
+					_this.refreshFlag = true;
 					_this.refresherTriggered = true;
 				}, 35);
 			},

pages/template/base-tab.vue

@@ -36,7 +36,9 @@
 			</swiper-item>
 		</swiper>
 
-		<text class="text-bottom-btn center active2" @click="onAddEmployeeBtnClick">添加店员</text>
+		<view class="com-v-bottom-btn-parent">
+			<c-button-1 :ui="bottomBtnUI" @onClick="onBottomBtnClick"></c-button-1>
+		</view>
 
 		<c-pop-passcard-filter ref="filter" @onEnsureBtnClick="onFilterEnsureBtnClick"></c-pop-passcard-filter>
 	</view>
@@ -155,6 +157,7 @@
 			refresh() {
 				var tab = this.tabBars[this.tabIndex];
 				setTimeout(() => {
+					tab.content.refreshFlag = true;
 					tab.content.refreshing = true;
 				}, 35)
 			},