shish пре 4 година
родитељ
комит
7eacf796ec

+ 1 - 1
ghsApp/src/admin/home/apply.vue

@@ -36,7 +36,7 @@ export default {
                         {name: "花材",img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`,url: "/admin/item/list"},
                         {name: "花材分类",img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`,url: "/admin/itemClass/list"},
                         {name: "小菊颜色",img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`,url: "/admin/item/xjSelect"},
-                        {name: "排序加价",img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`,url: "/admin/itemClass/add"},
+                        {name: "排序加价",img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`,url: "/admin/itemClass/add"},
                         {name: "停用花材",img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`,url: "/admin/item/list?delStatus=1"},
                     ]
                 },

+ 2 - 2
ghsApp/src/admin/stat/cgStat.vue

@@ -136,7 +136,7 @@ export default {
 	.top-bar {
 		position: absolute;
 		left: 0;
-		top:125upx;
+		top:130upx;
 		display: flex;
 		width: 100%;
 		z-index: 20;
@@ -150,7 +150,7 @@ export default {
 		}
 	}
 	.main-view {
-		margin-top: 80upx;
+		margin-top: 90upx;
 		flex: 1;
 		background-color: #f9fbfc;
 		.space-view {

+ 5 - 5
ghsApp/src/admin/stat/customSale.vue

@@ -2,9 +2,9 @@
 <view class="app-content">
 	<view class="ex-page">
 		<view class="input-wrap_box">
-		<view>
-			<AppSearchModule placeholder="输入拼音首字母搜索" @input="searchFn"/>
-		</view>
+			<view>
+				<AppSearchModule placeholder="输入拼音首字母搜索" @input="searchFn"/>
+			</view>
 		</view>
 
 		<view class="top-bar">
@@ -186,7 +186,7 @@ export default {
 	.top-bar {
 		position: absolute;
 		left: 0;
-		top:125upx;
+		top:130upx;
 		display: flex;
 		width: 100%;
 		z-index: 20;
@@ -200,7 +200,7 @@ export default {
 		}
 	}
 	.main-view {
-		margin-top: 80upx;
+		margin-top: 90upx;
 		flex: 1;
 		background-color: #f9fbfc;
 		.space-view {

+ 2 - 2
ghsApp/src/admin/stat/incomeStat.vue

@@ -115,7 +115,7 @@ export default {
 		left: 0;
 		display: flex;
 		width: 100%;
-		top:125upx;
+		top:130upx;
 		z-index: 20;
 		.bar{
 			width: 50%;
@@ -127,7 +127,7 @@ export default {
 		}
 	}
 	.main-view {
-		margin-top: 80upx;
+		margin-top: 90upx;
 		flex: 1;
 		background-color: #f9fbfc;
 		.space-view {

+ 12 - 5
ghsApp/src/admin/stat/kdIncome.vue

@@ -1,8 +1,14 @@
 <template>
 <view class="app-content">
 	<view class="ex-page">
-		<!-- <view class="top-bar"><DateSelect class="bar" top="0" @selectDateFn="selectDateFn" /></view> -->
-		<view class="top-bar" style="margin-left:100upx;">今天</view>
+		<view class="input-wrap_box">
+			<view>
+				<AppSearchModule placeholder="输入拼音首字母搜索" @input="searchFn"/>
+			</view>
+		</view>
+		<view class="top-bar">
+			<DateSelect class="bar" top="0" @selectDateFn="selectDateFn" />
+		</view>
 		<view  class="main-view">
 			<view class="space-view ex-table">
 				<block>
@@ -64,6 +70,7 @@
 </template>
 <script>
 import AppWrapperEmpty from "@/components/app-wrapper-empty";
+import AppSearchModule from "@/components/module/app-search";
 import SelectList from "@/components/plugin/selectList";
 import { getStatKdProfile } from "@/api/stat/index";
 import { list } from "@/mixins";
@@ -72,7 +79,7 @@ import DateSelect from "@/components/module/dateSelect";
 import {mapActions, mapGetters} from "vuex";
 import ModalModule from "@/components/plugin/modal";
 export default {
-	components: { SelectList, AppWrapperEmpty,ShopSelect,DateSelect,ModalModule},
+	components: { SelectList, AppWrapperEmpty,ShopSelect,DateSelect,ModalModule,AppSearchModule},
 	mixins: [list],
 	computed: {		
 		...mapGetters(["getDictionariesInfo","getLoginInfo"])
@@ -166,9 +173,9 @@ export default {
 	.top-bar {
 		position: absolute;
 		left: 0;
+		top:130upx;
 		display: flex;
 		width: 100%;
-		top:20upx;
 		z-index: 20;
 		.bar{
 			width: 50%;
@@ -180,7 +187,7 @@ export default {
 		}
 	}
 	.main-view {
-		margin-top: 60upx;
+		margin-top: 90upx;
 		flex: 1;
 		background-color: #f9fbfc;
 		.space-view {

+ 2 - 2
ghsApp/src/admin/stat/mayPayStat.vue

@@ -112,7 +112,7 @@ export default {
 		left: 0;
 		display: flex;
 		width: 100%;
-		top:125upx;
+		top:130upx;
 		z-index: 20;
 		.bar{
 			width: 50%;
@@ -124,7 +124,7 @@ export default {
 		}
 	}
 	.main-view {
-		margin-top: 80upx;
+		margin-top: 90upx;
 		flex: 1;
 		background-color: #f9fbfc;
 		.space-view {

+ 2 - 2
ghsApp/src/admin/stat/productSale.vue

@@ -160,7 +160,7 @@ export default {
 		left: 0;
 		display: flex;
 		width: 100%;
-		top:125upx;
+		top:130upx;
 		z-index: 20;
 		.bar{
 			width: 50%;
@@ -172,7 +172,7 @@ export default {
 		}
 	}
 	.main-view {
-		margin-top: 80upx;
+		margin-top: 90upx;
 		flex: 1;
 		background-color: #f9fbfc;
 		.space-view {

+ 13 - 5
ghsApp/src/admin/stat/profit.vue

@@ -1,8 +1,14 @@
 <template>
 <view class="app-content">
 	<view class="ex-page">
-		<!-- <view class="top-bar"> <DateSelect class="bar" top="0" @selectDateFn="selectDateFn" /> </view> -->
-		<view class="top-bar" style="margin-left:100upx;">今天</view>
+		<view class="input-wrap_box">
+		<view>
+			<AppSearchModule placeholder="输入拼音首字母搜索" @input="searchFn"/>
+		</view>
+		</view>
+		<view class="top-bar">
+			 <DateSelect class="bar" top="0" @selectDateFn="selectDateFn" /> 
+		</view>
 		<scroll-view scroll-y scroll-with-animation class="main-view">
 			<view class="space-view ex-table">
 				<block>
@@ -46,9 +52,10 @@ import { getStatProfit } from "@/api/stat/index";
 import { list } from "@/mixins";
 import ShopSelect from "@/components/module/shopSelect";
 import DateSelect from "@/components/module/dateSelect";
+import AppSearchModule from "@/components/module/app-search";
 import {mapActions, mapGetters} from "vuex";
 export default {
-	components: { SelectList, AppWrapperEmpty,ShopSelect,DateSelect},
+	components: { SelectList, AppWrapperEmpty,ShopSelect,DateSelect,AppSearchModule},
 	mixins: [list],
 	computed: {		
 		...mapGetters(["getDictionariesInfo","getLoginInfo"])
@@ -112,15 +119,16 @@ export default {
 <style lang="scss" scoped>
 .ex-page {
 	background: white;
+	padding-top:20upx;
 	height: 100%;
 	display: flex;
 	flex-direction: column;
 	.top-bar {
 		position: absolute;
 		left: 0;
+		top:130upx;
 		display: flex;
 		width: 100%;
-		top:20upx;
 		z-index: 20;
 		.bar{
 			width: 50%;
@@ -132,7 +140,7 @@ export default {
 		}
 	}
 	.main-view {
-		margin-top: 80upx;
+		margin-top: 90upx;
 		flex: 1;
 		background-color: #f9fbfc;
 		.space-view {

+ 2 - 2
ghsApp/src/admin/stat/sale.vue

@@ -136,7 +136,7 @@ export default {
 		left: 0;
 		display: flex;
 		width: 100%;
-		top:125upx;
+		top:130upx;
 		z-index: 20;
 		.bar{
 			width: 50%;
@@ -148,7 +148,7 @@ export default {
 		}
 	}
 	.main-view {
-		margin-top: 80upx;
+		margin-top: 90upx;
 		flex: 1;
 		background-color: #f9fbfc;
 		.space-view {

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

@@ -100,7 +100,7 @@ export default {
 		left: 0;
 		display: flex;
 		width: 100%;
-		top:125upx;
+		top:130upx;
 		z-index: 20;
 		.bar{
 			width: 50%;
@@ -112,7 +112,7 @@ export default {
 		}
 	}
 	.main-view {
-		margin-top: 80upx;
+		margin-top: 90upx;
 		flex: 1;
 		background-color: #f9fbfc;
 		.space-view {

+ 1 - 1
ghsApp/src/pages.json

@@ -354,7 +354,7 @@
 			"root": "admin/itemClass",
 			"pages": [
 				{"path": "list","style": {"navigationBarTitleText": "花材分类"}},
-				{"path": "add","style": {"navigationBarTitleText": "排序加价"}},
+				{"path": "add","style": {"navigationBarTitleText": "排序加价"}},
 				{"path": "addPrice","style": {"navigationBarTitleText": "加价设置"}},
 				{"path": "more","style": {"navigationBarTitleText": "更多"}}
 			]