Merge branch 'dev_huanmoxiaoshuoge_dy_240528' of...

Merge branch 'dev_huanmoxiaoshuoge_dy_240528' of http://gitlab.mints-id.com/android/uniapp_vedio into dev_huanmoxiaoshuoge_dy_240528

vedio/components/c-list/c-list.vue

@@ -126,7 +126,17 @@
 		},
 		computed: {
 			showEmpty: function() {
-				return isEmpty(this.dataList);
+				console.log(this.dataList)
+				if (isEmpty(this.dataList)) {
+					return true
+				} else {
+					if (typeof this.dataList == 'object') {
+						if (this.dataList.list != undefined) {
+							return isEmpty(this.dataList.list)
+						}
+					}
+				}
+				return false
 			},
 			scrollStyle: function() {
 				return {

vedio/components/c-shelf-empty/c-shelf-empty.vue

@@ -20,9 +20,10 @@
 		},
 		methods: {
 			goWareHouse() {
-				uni.switchTab({
-					url: '/pages/warehouse/warehouse'
-				});
+				uni.$emit('goWareHouse')
+				// uni.switchTab({
+				// 	url: '/pages/warehouse/warehouse'
+				// });
 			}
 		},
 	}

vedio/pages/home.vue

@@ -86,6 +86,11 @@
 		mounted() {
 			// 渲染完成 初始化首页数据
 			this.loadComponentData();
+
+			let that = this
+			uni.$on('goWareHouse', function(data) {
+				that.tabChange(1)
+			})
 		},
 		methods: {
 			tabChange(index) {