预订功能优化

ghsApp/src/admin/book/custom.vue

@@ -26,8 +26,11 @@
 							<view v-for="(item, index) in bookCustomData" :key="index" @click="goAction(item)">
 								<t-tr>
 									<t-td>
-										<view class="num" :class="[item.bookNum == item.onNum ? 'finish' : 'normal']" style="position: relative;">
-										{{item.name}}
+										<view class="num" :class="[item.bookNum == item.onNum ? 'finish' : 'normal']">
+											<view>{{item.name}}</view>
+											<view v-if="item.seatSn != 0">
+											{{item.seatSn }}号
+											</view>
 										</view>
 									</t-td>
 									<t-td><view class="num" :class="[item.bookNum == item.onNum ? 'finish' : 'normal']">{{item.bookNum?parseFloat(item.bookNum):0}}</view></t-td>

ghsApp/src/admin/home/apply.vue

@@ -1,5 +1,10 @@
 <template>
 <view class="app-content">
+
+	<block v-if="loginInfo.staff && loginInfo.staff.identity == 2">
+	</block>
+	<block v-else>
+
     <view class="apply-content_box">
         <view v-for="item in menuList" :key="item.title" class="apply-list_box">
             <view class="tit">
@@ -17,11 +22,15 @@
             </view> 
         </view>
     </view>
+
+    </block>
+
     <NotLogin></NotLogin>
 </view>
 </template>
 <script>
 import NotLogin from "@/components/not-login";
+import { mapGetters,mapActions } from "vuex";
 export default {
     name:'apply',
     components: {
@@ -118,6 +127,9 @@ export default {
             ]
         }
     },
+	computed: {
+		...mapGetters({ loginInfo: "getLoginInfo" })
+	},
     onPullDownRefresh() {
         uni.stopPullDownRefresh();
     },

ghsApp/src/admin/home/me.vue

@@ -7,7 +7,8 @@
           <view v-if="myInfo.shopAdminId > 0"> <view class="name"> {{ myInfo.adminName }} </view> <view class="mobile"> ID {{ myInfo.shopAdminId }} / {{ myInfo.adminMobile ? myInfo.adminMobile : '' }}</view> </view>
         </view>
       </view>
-      <view class="me-shop_box">
+
+      <view class="me-shop_box" v-if="getLoginInfo.staff.identity!=2">
         <view class="me-shop_content content_box">
           <view class="me-shop_top">
             <view class="shop-top_left">
@@ -153,6 +154,9 @@
         <view class="bottom-version">闽ICP备15017325号-12A</view>
 
       </view>
+      <view v-else>
+        <view @click="loginOut()" style="margin-top:300upx;font-size:36upx;font-weight:bold;">退出账号</view>
+      </view>
     </template>
     <ShopSelect ref="shopSelectComponent" class="bar" :isShowTit="false" top="0upx" @selectShopFn="selectShopFn" />
     <NotLogin></NotLogin>

ghsApp/src/admin/home/workbench.vue

@@ -1,5 +1,16 @@
 <template>
 <view>
+
+	<block v-if="loginInfo.staff && loginInfo.staff.identity == 2">
+		<view style="font-size:38upx;font-weight:bold;margin:30upx 0 0 30upx;">
+			<view @click="goBookAll()">预订汇总</view>
+			<view style="margin-top:50upx;" @click="goBookCustom()">预订客户</view>
+		</view>
+	</block>
+	<block v-else>
+
+	
+
   <block v-if="loginStyle  == 0">
 	<!-- #ifdef MP-WEIXIN -->
     <view style="width:100vw;height:300upx;display:flex;align-items:center;justify-content:center;position:relative;">
@@ -114,6 +125,8 @@
 	</view>
   </block>
 
+</block>
+
 	<uni-popup ref="errorPriceRef" background-color="#fff" type="center" :animation="false">
 		<view style="padding-top:30upx;font-size:30upx;padding-bottom:20upx;">
 			<view style="margin-bottom:10upx;" v-for="(errItem, errIndex) in errorPirceList" :key="errIndex">
@@ -423,6 +436,12 @@ export default {
 		orderGather(){
 			this.pageTo({ url: '/admin/order/statBook'})
 		},
+		goBookAll(){
+			this.pageTo({ url: '/admin/order/statBook'})
+		},
+		goBookCustom(){
+			this.pageTo({ url: '/admin/book/custom'})
+		},
 		skKd(){
 			let that = this
 			let currentId = 0;

ghsApp/src/pagesPurchase/order.vue

@@ -1,8 +1,13 @@
 <template>
 <view class="app-content">
 	<view class="order-page">
+		<view class="input-wrap_box">
+			<view>
+				<AppSearchModule placeholder="核销码 / 名称 / 手机号" @input="searchFn"/>
+			</view>
+		</view>
 		<view class="tabs">
-			<Tabs :isFixed="true" :tabs="tabs" :currentTab="tabIndex" @change="changeTabEvent" itemWidth="25%"></Tabs>
+			<Tabs :isFixed="false" :tabs="tabs" :currentTab="tabIndex" @change="changeTabEvent" itemWidth="25%"></Tabs>
 		</view>
 		<view scroll-y class="order-list">
 			<block v-if="!$util.isEmpty(list.data)">
@@ -24,11 +29,13 @@ import OrderItem from "./orderItem";
 import AppWrapperEmpty from "@/components/app-wrapper-empty";
 import { list } from "@/mixins";
 import { getPurchaseListApi,getLsRunningOrderNum } from "@/api/purchase";
+import AppSearchModule from "@/components/module/app-search";
 export default {
 	components: {
 		Tabs,
 		OrderItem,
-		AppWrapperEmpty
+		AppWrapperEmpty,
+		AppSearchModule
 	},
 	mixins: [list],
 	data() {
@@ -58,7 +65,9 @@ export default {
 					key: "5",
 					value: "0"
 				}
-			]
+			],
+			T:null,
+			searchContent:''
 		};
 	},
 	onPullDownRefresh() {
@@ -80,13 +89,24 @@ export default {
 		this.getCgList()
 	},
 	methods: {
+		searchFn(e){
+			let that = this
+			if(that.T != null){
+				clearTimeout(that.T)
+			}
+			that.T = setTimeout(function(){
+				that.searchContent = e
+				that.resetList()
+				that.getCgList()
+			},700)
+		},
 		init(){
 
 		},
 		getCgList() {
 			let ghsId = this.option.ghsId || 0
 			let status = this.tabs[this.tabIndex].key
-			let options = {page:this.list.page,status:status,ghsId:ghsId}
+			let options = {page:this.list.page,status:status,ghsId:ghsId,search:this.searchContent}
 			return getPurchaseListApi(options) .then(res => {
 				this.completes(res);
 			})
@@ -116,7 +136,7 @@ export default {
 	flex-direction: column;
 	background-color: #f9fbfc;
 	.order-list {
-		padding-top:120upx;
+		padding-top:20upx;
 		padding-bottom:100upx;
 		flex: 1;
 		.allot-item {