搜索优化

ghsApp/src/admin/billing/toPay.vue

@@ -37,8 +37,8 @@
         <view style="margin-top:35upx;">
             <button style="width:25vh;" @click="goBack()" class="admin-button-com big default">返回首页</button>
         </view>
-        <view v-if="orderInfo.orderType == 1" style="color:#CCCCCC;margin-top:20upx;">15分钟后，订单将自动变成欠款单 <text @click="cancelOrder()" style="color:#666666;margin-left:10upx;text-decoration:underline;">取消订单</text></view>
-        <view v-else style="color:#CCCCCC;margin-top:20upx;">客户下单，15分钟后将自动取消</view>
+        <view v-if="orderInfo.orderType == 1" style="color:#CCCCCC;margin-top:20upx;">10分钟后，订单状态将自动变成欠款 <text @click="cancelOrder()" style="color:#666666;margin-left:10upx;text-decoration:underline;">取消订单</text></view>
+        <view v-else style="color:#CCCCCC;margin-top:20upx;">客户下单，10分钟后未付款将自动取消</view>
       </view>
     </view>
   </view>

ghsApp/src/admin/home/order.vue

@@ -1,6 +1,5 @@
 <template>
   <div class="app-main app-content">
-
     <view class="input-wrap_box">
 
       <view @click="setSearchType" style="font-size:30upx;margin-right:10upx;color:#666666">

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

@@ -6,7 +6,7 @@
 			</div>
 			<div class="input-wrap">
 				<input
-					:type="isPCWx ? 'text' : 'password'" placeholder-style="color:#ccc"
+					type="text" placeholder-style="color:#ccc"
 					ref="searchInput"
 					v-model="search"
 					:focus="focus"
@@ -96,22 +96,9 @@ export default {
 	},
 	data() {
 		return {
-			search: "",
-			isPCWx:false
+			search: ""
 		};
 	},
-	mounted(){
-		// #ifdef MP-WEIXIN
-		let that = this
-		uni.getSystemInfo({
-			success: function (res) {
-				if(res.platform == 'windows'){
-					that.isPCWx = true
-				}
-			}
-		})
-		// #endif
-	},
 	methods: {
 		searchFn() {
 			this.$emit("search", this.search);

ghsApp/src/pagesPurchase/orderItem.vue

@@ -25,9 +25,9 @@
 					<text class="info-label"> 人员：</text>
 					<text class="info-value" style="overflow: hidden; text-overflow:ellipsis; white-space: nowrap;width:300upx;">{{ info.adminName }} </text>
 				</view>
-				<view class="info-row">
-					<text class="info-label"> 备注：</text>
-					<text class="info-value" style="overflow: hidden; text-overflow:ellipsis; white-space: nowrap;width:450upx;">{{ info.remark }} </text>
+				<view v-if="!$util.isEmpty(info.remark)" class="info-row">
+					<text class="info-label" style="color:red;"> 备注：</text>
+					<text class="info-value" style="overflow: hidden; text-overflow:ellipsis; white-space: nowrap;width:450upx;color:red;">{{ info.remark }} </text>
 				</view>
 			</view>
 			<view class="item-price"

ghsApp/src/pagesPurchase/supplier.vue

@@ -1,20 +1,15 @@
 <template>
 <view class="app-content">
+    <view class="input-wrap_box">
+      <view>
+        <AppSearchModule placeholder="输英文字母搜索" @input="searchFn"/>
+      </view>
+    </view>
   <view class="order-page">
-    <scroll-view
-      scroll-y
-      class="order_list"
-      scroll-view
-    >
+    <view class="order_list" >
     <block>
-        <!-- 供应商列表 -->
         <block v-if="!$util.isEmpty(supplierList)">
-          <view
-            class="list_item"
-            v-for="(item, index) in supplierList"
-            :key="index"
-            @click="gotoDetails(item)"
-          >
+          <view class="list_item" v-for="(item, index) in supplierList" :key="index" @click="gotoDetails(item)" >
             <view class="store_name">
               <image :src="item.avatar"></image>
               <view class="store_title">{{item.name}}</view>
@@ -33,27 +28,24 @@
           </view>
         </block>
         <block v-else>
-          <AppWrapperEmpty
-            title="暂无数据"
-            :is-empty="$util.isEmpty(supplierList)"
-          />
+          <AppWrapperEmpty title="暂无数据" :is-empty="$util.isEmpty(supplierList)" />
         </block>
       </block>
-    </scroll-view>
-    <!-- 按钮 -->
+    </view>
 			<div class="app-footer">
 				<div class="admin-button-com middle blue add-ghs" @click="add">新增供应商</div>
 			</div>
   </view>
 </view>
 </template>
-
 <script>
 import AppWrapperEmpty from "@/components/app-wrapper-empty";
 import { getList } from "@/api/ghs";
+import AppSearchModule from "@/components/module/app-search";
 export default {
   components: {
     AppWrapperEmpty,
+    AppSearchModule
   },
   data () {
     return {
@@ -74,11 +66,15 @@ export default {
   },
   methods: {
     init() {
-      this.getGHSList() 
+      this.getGHSList('')
+    },
+    searchFn(e) {
+      this.getGHSList(e)
     },
-    getGHSList () {
+    getGHSList (name) {
       return getList({
-        pageSize: 100
+        pageSize: 100,
+        name:name
       }).then(res => {
         this.supplierList = res.data.list
       }).catch(err => { console.log(err) })
@@ -93,23 +89,40 @@ export default {
 		},
     // 采购记录详情
     gotoDetails (item) {
-      this.pageTo({
-        url: '/pagesPurchase/add?ghsId='+item.id+'&ghsName='+item.name,
-        type:2
-      })
+      this.pageTo({ url: '/pagesPurchase/add?ghsId='+item.id+'&ghsName='+item.name, type:2 })
     },
     // 添加供应商
     add() {
-      this.pageTo({
-        url: '/pagesPurchase/suppAdd'
-      })
+      this.pageTo({ url: '/pagesPurchase/suppAdd' })
     }
   }
 }
 </script>
 
 <style lang="scss" scoped>
+.input-wrap_box {
+  background-color: #fff;
+  position: fixed;
+  top: 0;
+  z-index: 10;
+  /* 手机mobile屏幕小于1000px */
+  @media screen and (max-width: 1100px) {
+    width: 100%;
+  }
+  /* 收银台cashier屏幕大于1000px */
+  @media screen and (min-width:1100px) {
+    width: 40%;
+  }   
+  height: 100upx;
+  display: flex;
+  align-items: center;
+  padding: 0 30upx;
+  & > view:nth-child(1) {
+    flex: 1;
+  }
+}
 .order-page {
+  margin-top:100upx;
   padding-bottom:100upx;
   .tabs {
     height: 80upx;