shish 4 лет назад
Родитель
Сommit
0f44658d2b

+ 0 - 1
ghsApp/src/admin/staff/achieve.vue

@@ -3,7 +3,6 @@
 	<view class="ex-page">
 		<view class="top-bar">
 			<DateSelect class="bar" top="0" @selectDateFn="selectDateFn" />
-			<ShopSelect class="bar" top="0" @selectShopFn="selectShopFn" />
 		</view>
 		<scroll-view scroll-y scroll-with-animation class="main-view">
 			<view class="space-view ex-table">

+ 36 - 36
ghsApp/src/admin/stat/stock.vue

@@ -1,41 +1,41 @@
 <template>
-<view class="app-content">
-	<view class="ex-page">
-        <view class="input-wrap_box">
-            <view>
-                <AppSearchModule placeholder="输入拼音首字母搜索" @input="searchFn"/>
-            </view>
-        </view>
-        <view class="top-bar" style="margin-left:115upx;">实时</view>
-		<scroll-view scroll-y scroll-with-animation class="main-view">
-			<view class="space-view ex-table">
-                <t-table :headerBackgroundColor="'#F0F2F6'">
-                    <t-tr header><t-th>花材</t-th><t-th>库存</t-th><t-th>操作</t-th></t-tr>
-                    <block v-if="!$util.isEmpty(classItemData)">
-                        <block v-for="(classItem,classIndex) in classItemData" :key="classIndex">
-							<block v-if="classItem.child && !$util.isEmpty(classItem.child)">
-								<t-tr>
-									<t-td><text style="color:#3385FF;font-weight:bold;">{{ classItem.className }}</text></t-td>
-									<t-td></t-td>
-									<t-td></t-td>
-								</t-tr>
-								<template v-if="classItem.child && !$util.isEmpty(classItem.child)">
-									<block v-for="(productItem, productIndex) in classItem.child" :key="productIndex">
-										<t-tr>
-											<t-td><view>{{productItem.name}}</view></t-td>
-											<t-td><view>{{productItem.stock?parseFloat(productItem.stock):0}}</view></t-td>
-											<t-td></t-td>
-										</t-tr>
-									</block>
-								</template>
-							</block>
-                        </block>
-                    </block>
-                </t-table>
+	<view class="app-content">
+		<view class="ex-page">
+			<view class="input-wrap_box">
+				<view>
+					<AppSearchModule placeholder="输入拼音首字母搜索" @input="searchFn"/>
+				</view>
 			</view>
-		</scroll-view>
+			<view class="top-bar" style="margin-left:115upx;">实时</view>
+			<scroll-view scroll-y scroll-with-animation class="main-view">
+				<view class="space-view ex-table">
+					<t-table :headerBackgroundColor="'#F0F2F6'">
+						<t-tr header><t-th>花材</t-th><t-th>库存</t-th><t-th>操作</t-th></t-tr>
+						<block v-if="!$util.isEmpty(classItemData)">
+							<block v-for="(classItem,classIndex) in classItemData" :key="classIndex">
+								<block v-if="classItem.child && !$util.isEmpty(classItem.child)">
+									<t-tr>
+										<t-td><text style="color:#3385FF;font-weight:bold;">{{ classItem.className }}</text></t-td>
+										<t-td></t-td>
+										<t-td></t-td>
+									</t-tr>
+									<template v-if="classItem.child && !$util.isEmpty(classItem.child)">
+										<block v-for="(productItem, productIndex) in classItem.child" :key="productIndex">
+											<t-tr>
+												<t-td><view>{{productItem.name}}</view></t-td>
+												<t-td><view>{{productItem.stock?parseFloat(productItem.stock):0}}</view></t-td>
+												<t-td></t-td>
+											</t-tr>
+										</block>
+									</template>
+								</block>
+							</block>
+						</block>
+					</t-table>
+				</view>
+			</scroll-view>
+		</view>
 	</view>
-</view>
 </template>
 <script>
 import AppWrapperEmpty from "@/components/app-wrapper-empty";
@@ -100,7 +100,7 @@ export default {
 		left: 0;
 		display: flex;
 		width: 100%;
-		top:135upx;
+		top:125upx;
 		z-index: 20;
 		.bar{
 			width: 50%;

+ 6 - 6
ghsApp/src/components/module/app-search.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="app-search-module" :style="{ height: height + 'upx' }">
-		<div class="map-search" :style="{ backgroundColor: backColor }" style="height: 90upx">
+		<div class="map-search" :style="{ backgroundColor: backColor }" style="height: 80upx">
 			<div class="icon-wrap" v-if="isIcon">
 				<i class="iconfont" :class="[icon]"></i>
 			</div>
@@ -33,7 +33,7 @@ export default {
 		// 搜索组件的高度
 		height: {
 			type: Number,
-			default: 90
+			default: 66
 		},
 		placeholder: {
 			type: String,
@@ -109,7 +109,7 @@ export default {
 	.map-search {
 		@include disFlex(center, flex-start);
 		width: 100%;
-		height: 110upx;
+		height: 100%;
 		border-radius: 50upx;
 		.icon-wrap {
 			margin-left: 20upx;
@@ -121,13 +121,13 @@ export default {
 		}
 		.input-wrap {
 			width: calc(100% - 90upx);
-			height: 110upx;
+			height: 80upx;
 			margin-left: 14upx;
 			input {
-				height: 110upx;
+				height: 100%;
 				font-size: 30upx !important;
 				text-align: left;
-				line-height: 90upx;
+				line-height: 80upx;
 			}
 			.placeholder {
 				color: #ccc;