shish 3 éve
szülő
commit
c8ded9165f

+ 5 - 12
ghsApp/src/components/app-wrapper-empty.vue

@@ -30,7 +30,6 @@
 		</div>
 	</div>
 </template>
-
 <script>
 export default {
 	name: 'AppWrapperEmpty',
@@ -42,25 +41,21 @@ export default {
 		// 图片宽度
 		pictureWidth: {
 			type: String,
-			default: '400upx'
+			default: '420upx'
 		},
-
 		pictureHeight: {
 			type: String,
 			default: ''
 		},
-
 		title: {
 			type: String,
 			default: ''
 		},
-
 		// 是否垂直居中
 		content: {
 			type: String,
 			default: ''
 		},
-
 		isEmpty: {
 			type: Boolean,
 			default: false
@@ -89,9 +84,9 @@ export default {
 			} else if (this.type == 'search') {
 				return `${this.$constant.imgUrl}/retail/common/img_noorder.png`
 			} else if (this.type == 'billing') {
-				return `${this.$constant.imgUrl}/ghs/common/img_nodata.png`
+				return `${this.$constant.imgUrl}/common/no_data_hua.png`
 			} else {
-				return `${this.$constant.imgUrl}/retail/common/img_nodata.png`
+				return `${this.$constant.imgUrl}/common/no_data_hua.png`
 			}
 		}
 	},
@@ -115,14 +110,13 @@ export default {
 		& .app-empty-img {
 			width: 100%;
 			text-align: center;
-			margin: 116upx auto 20upx;
+			margin: 100upx auto 20upx;
 			& image {
-				width: 180upx;
+				width: 260upx;
 				height: auto;
 				margin:0 auto;
 			}
 		}
-
 		& .app-empty-title {
 			display: flex;
 			flex-direction: column;
@@ -131,7 +125,6 @@ export default {
 			color: #8b8b8b;
 			& span {
 				font-weight: 400;
-
 				& + span {
 					font-weight: initial;
 					margin-top: 10upx;

+ 56 - 0
ghsApp/src/components/empty.vue

@@ -0,0 +1,56 @@
+<template>
+	<div class="app-empty">
+		<div class="app-empty-center">
+			<div class="app_empty_img">
+				<image :src="`${constant.imgUrl}/common/no_data_hua.png`" mode="widthFix"></image>
+			</div>
+			<div class="app-empty-title">
+				<span class="empty_no_data">{{title}}</span>
+			</div>
+		</div>
+	</div>
+</template>
+<script>
+export default {
+	name: 'empty',
+	props: {
+		title: {
+			type: String,
+			default: '暂无数据'
+		}
+	},
+	computed: {
+	},
+	data() {
+		return {}
+	}
+}
+</script>
+<style lang="scss" scoped>
+.app-empty {
+    width: 100%;
+    display: flex;
+    align-items: center;
+    & .app-empty-center {
+        width: 100%;
+    }
+    & .app_empty_img {
+        width: 100%;
+        margin-top:80upx;
+        text-align: center;
+        & image {
+            margin:0 auto;
+            width: 40%;
+        }
+    }
+    & .app-empty-title {
+        font-size: 32upx;
+        margin-top:30upx;
+        text-align:center;
+        color:#666161;
+        & .empty_no_data {
+            font-size:30upx;
+        }
+    }
+}
+</style>

+ 1 - 1
ghsApp/src/pagesPurchase/order.vue

@@ -13,7 +13,7 @@
 			</block>
 		</view>
 		<view class="app-footer open_btn">
-			<view @click="getGhsList" class="admin-button-com big blue">供货商列表</view>
+			<view @click="getGhsList" class="admin-button-com big blue" style="margin-right:90upx;">供货商列表</view>
 			<view @click="addEvent" class="admin-button-com big blue">新增采购</view>
 		</view>
 	</view>

+ 31 - 31
hdApp/src/components/app-wrapper-empty.vue

@@ -1,8 +1,8 @@
 <template>
 	<div class="app-empty">
 		<div class="app-empty-center">
-			<div class="app-empty__img">
-				<image :src="`${constant.imgUrl}/retail/common/img_nodata.png`" mode="widthFix"></image>
+			<div class="app_empty_img">
+				<image :src="`${constant.imgUrl}/common/no_data_hua.png`" mode="widthFix"></image>
 			</div>
 			<div class="app-empty-title">
 				<span class="empty_noData">{{ title }}</span>
@@ -55,40 +55,40 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-	.app-empty {
+.app-empty {
+	width: 100%;
+	display: flex;
+	align-items: center;
+	& .app-empty-center {
 		width: 100%;
+	}
+	& .app_empty_img {
+		width: 100%;
+		margin-top:100upx;
+		text-align: center;
+		& image {
+			margin:0 auto;
+			width:260upx;
+		}
+	}
+	& .app-empty-title {
 		display: flex;
+		flex-direction: column;
 		align-items: center;
-		& .app-empty-center {
-			width: 100%;
-		}
-		& .app-empty__img {
-			width: 100%;
-			margin-top:100upx;
-			text-align: center;
-			& image {
-				margin:0 auto;
-				width: 180upx;
-			}
-		}
-		& .app-empty-title {
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-			font-size: 32upx;
-			color: #cccccc;
-			& span {
-				font-weight: 400;
-
-				& + span {
-					font-weight: initial;
-					margin-top: 10upx;
-					font-size: 26upx;
-				}
-			}
-			& .empty_noData {
+		font-size: 32upx;
+		color: #cccccc;
+		margin-top:30upx;
+		& span {
+			font-weight: 400;
+			& + span {
+				font-weight: initial;
+				margin-top: 10upx;
 				font-size: 26upx;
 			}
 		}
+		& .empty_noData {
+			font-size: 26upx;
+		}
 	}
+}
 </style>

+ 7 - 6
hdApp/src/pagesPurchase/shopping.vue

@@ -1,20 +1,21 @@
 <template>
   <view class="order-page">
     <app-tabs :tabs="tabs" :isFixed="true" :currentTab="tabIndex" @change="change" itemWidth="20%"/>
+    <block v-if="!$util.isEmpty(list.data)">
     <view class="pay_list">
-      <block v-if="!$util.isEmpty(list.data)">
         <OrderItem v-for="(item, index) in list.data" :key="index" :info="item" @click="goToDetail"></OrderItem>
-      </block>
-      <block v-else>
-        <AppWrapperEmpty title="暂无数据" :is-empty="$util.isEmpty(list.data)"/>
-      </block>
     </view>
+    </block>
+    <block v-else>
+    <view>
+      <AppWrapperEmpty title="暂无数据" :is-empty="$util.isEmpty(list.data)"/>
+    </view>
+    </block>
     <view class="app-footer open_btn">
 			<view @click="addEvent" class="admin-button-com big blue">新增采购</view>
 		</view>
   </view>
 </template>
-
 <script>
 import AppTabs from "@/components/plugin/tabs";
 import OrderItem from "./orderItem";