收款列表

components/empty.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="empty-content">
-		<image class="empty-content-image" src="/static/icon_empty.png" mode="aspectFit"></image>
+		<image class="empty-content-image" :src="StaticUrl + '/icon/icon-remarks-empty@2x.png'" mode="aspectFit"></image>
 		<text class="error-text">{{EmptyText}}</text>
 	</view>
 </template>
@@ -23,13 +23,8 @@
 
 		data() {
 			return {
-				typeSrcall: {
-					empty: 'https://img.caimei365.com/group1/M00/03/71/Cmis2F3wna6AcewRAAEtqt4jZmU397.png',				
-				},
-				typeSrc: {
-					empty: 'https://img.caimei365.com/group1/M00/03/71/Cmis2F3wna6AJZvwAAGWWe4DnXk371.png',				
-				},
-				EmptyText:'',
+				StaticUrl: this.$Static,
+				EmptyText:'暂无数据~',
 			}
 		},
 		created(){
@@ -41,13 +36,13 @@
 		},
 		computed: {
 			setSrc() {
-				let url;
+				let url
 				if(this.typeIndex==0){					
 					url = this.typeSrcall[this.src]
 				}else{
 					url = this.typeSrc[this.src]
 				}
-				return url;
+				return url
 			},
 		},
 	}

components/thorui/tui-loadmore/tui-loadmore.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="tui-loadmore">
+	<view class="tui-loadmore" v-if="visible">
 		<view :class="['tui-loading-'+index, (index==3 && type)?'tui-loading-'+type:'']"></view>
 		<view class="tui-loadmore-tips">{{text}}</view>
 	</view>
@@ -14,6 +14,11 @@
 				type: String,
 				default: "正在加载..."
 			},
+			//是否可见
+			visible: {
+				type: Boolean,
+				default: false
+			},
 			//loading 样式 ：1,2,3
 			index: {
 				type: Number,

components/thorui/tui-nomore/tui-nomore.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="tui-nomore-class tui-loadmore-none">
+	<view class="tui-nomore-class tui-loadmore-none" v-if="visible">
 		<view :class="[isDot?'tui-nomore-dot':'tui-nomore']">
 			<view :style="{backgroundColor:backgroundColor}" :class="[isDot?'tui-dot-text':'tui-nomore-text']">{{isDot?dotText:text}}</view>
 		</view>
@@ -10,8 +10,13 @@
 	export default {
 		name: "tuiNomore",
 		props: {
+			//是否可见
+			visible: {
+				type: Boolean,
+				default: false
+			},
 			//当前页面背景颜色
-			backgroundColor: {
+			backgroundColor: { 
 				type: String,
 				default: "#fafafa"
 			},

main.js

@@ -18,7 +18,7 @@ Vue.prototype.$store = store
 Vue.prototype.$util = {msg,modal,json, prePage}
 Vue.prototype.$api = Api
 Vue.prototype.$reg = Regs
-
+Vue.prototype.$Static = 'https://static.caimei365.com/app/img/'
 
 
 

pages/collection/detail.vue

@@ -467,13 +467,12 @@ page {
 	.button {
 		width: 100%;
 		height: 80rpx;
-		background: $wechat-btn;
+		background: $btn-confirm;
 		border-radius: 40rpx;
 		text-align: center;
 		color: #ffffff;
 		line-height: 80rpx;
 		font-size: $font-size-28;
-		box-shadow: 0 10rpx 14rpx 0 rgba(86, 119, 252, 0.2);
 	}
 }
 

pages/collection/list.vue

@@ -16,7 +16,7 @@
 			class="tui-header-box"
 			:style="{ height: CustomBar -34 + 'px', backgroundImage: 'url(' + statistic_bg1 + ')' }"
 		></view>
-		<view class="user-section" :style="{ top: CustomBar + 16 + 'px', left: 0 + 'px' }">
+		<view class="user-section" :style="{ top: CustomBar + 20 + 'px', left: 0 + 'px' }">
 			<view class="header-content">
 				<view class="header-tabs day clearfix">
 					<view class="main one">
@@ -30,7 +30,7 @@
 							<view class="text">{{ item.name }}</view>
 						</view>
 					</view>
-					<view class="main day">
+					<view class="main day" v-if="currents == 0 || currents == 2">
 						<view
 							class="main-item tab"
 							v-for="(item, index) in listTabsType"
@@ -44,7 +44,7 @@
 				</view>
 				<view :class="{ 'tui-order-list': scrollTop >= 0 }" class="clearfix">
 					<!-- 空白页 -->
-					<empty v-if="isEmpty" :typeIndex="currentTabs" :navbarHeight="navbarHeight"></empty>
+					<empty v-if="isEmpty" :typeIndex="currents" :navbarHeight="navbarHeight"></empty>
 					<!-- 列表 -->
 					<view v-else class="tui-order-content">
 						<view
@@ -190,7 +190,6 @@ export default {
 			tabCurrents:0,
 			statistic_bg: statistic_bg2,
 			statistic_bg1: statistic_bg1,
-			CustomBar: this.CustomBar, // 顶部导航栏高度
 			userID: 0,
 			openId: '',
 			listQuery: Object.assign({}, defaultListQuery),
@@ -273,16 +272,6 @@ export default {
 			console.log('结束时间==>',event.detail.value)
 			this.queryData.endAddTime = event.detail.value
 		},
-		getOrderListCount() {
-			//查询数量
-			this.OrderService.OrderListCount()
-				.then(response => {
-					this.listCount = response.data
-				})
-				.catch(error => {
-					this.$util.msg(error.msg, 2000)
-				})
-		},
 		getOrderDatainit(index) {
 			this.listQuery.pageNum = 1
 			this.OrderService.OrderList(Object.assign({ status: index }, this.listQuery))
@@ -464,7 +453,6 @@ export default {
 					this.$util.msg('删除订单成功', 2000, true, 'success')
 					setTimeout(() => {
 						this.getOrderDatainit(this.currents)
-						this.getOrderListCount()
 					}, 2000)
 				})
 				.catch(error => {
@@ -478,7 +466,6 @@ export default {
 					this.$util.msg('关闭订单成功', 2000, true, 'success')
 					setTimeout(() => {
 						this.getOrderDatainit(this.currents)
-						this.getOrderListCount()
 					}, 2000)
 				})
 				.catch(error => {
@@ -640,16 +627,14 @@ export default {
 		setTimeout(() => {
 			this.listQuery.pageNum = 1
 			this.currents = 0
-			this.getOrderDatainit(this.currents)
-			this.getOrderListCount()
+			// this.getOrderDatainit(this.currents)
 			uni.stopPullDownRefresh()
 		}, 200)
 	},
 	onShow() {
 		this.$api.getComStorage('userInfo').then(resolve => {
 			this.listQuery.merchantId = resolve.id
-			this.getOrderDatainit(this.currents)
-			this.getOrderListCount()
+			// this.getOrderDatainit(this.currents)
 		})
 	}
 }
@@ -838,13 +823,11 @@ page {
 	width: 100%;
 	height: auto;
 	position: relative;
-	padding: 0 20rpx;
 	.header-tabs {
 		width: 100%;
 		height: auto;
 		margin-bottom: 40rpx;
 		padding: 20rpx;
-		border-radius: 20rpx;
 		background: #4688fa;
 		box-sizing: border-box;
 		&.day {
@@ -863,12 +846,13 @@ page {
 			width: 100%;
 			height: 80rpx;
 			&.day {
-				height: 50rpx;
+				height: 70rpx;
 				box-sizing: border-box;
-				margin-top: 20rpx;
+				padding: 20rpx 0;
+				border-top: 1px solid #EFEFEF;
 			}
 			&.one{
-				border-bottom: 1px solid #EFEFEF;
+				
 			}
 			.main-item {
 				float: left;
@@ -978,7 +962,7 @@ page {
 	height: auto;
 }
 .tui-order-list {
-	margin-top: 80rpx;
+	margin-top: 24rpx;
 	width: 100%;
 	position: relative;
 }