app 兼容app

ghsApp/src/admin/custom/levelSet.vue

@@ -1,4 +1,5 @@
 <template>
+<view class="app-content">
 	<view class="ex-page">
         <view class="title">
             每个等级需要消费的最少扎数和金额：
@@ -37,6 +38,7 @@
             <button class="admin-button-com big blue" @click="saveData()">保存</button>
         </view>
 	</view>
+</view>
 </template>
 <script>
 import { mapGetters } from "vuex";

ghsApp/src/admin/itemClass/addPrice.vue

@@ -1,5 +1,5 @@
 <template>
-	<view>
+	<view class="app-content">
 		<view v-if="!$util.isEmpty(list.data)" style="padding-bottom:120upx;">
 			<t-table :headerBackgroundColor="'#F0F2F6'">
 				<t-tr header>
@@ -42,7 +42,7 @@
 			<template slot="customContent">
 				<view class="select-cmd_bx">
 					<view class="num_bx" style="margin:60upx 0 60upx 0;font-size:35upx;">
-						<view class="flex">金额：<input v-model="batchPrice" type="digit" focus style="border:1upx solid #CCCCCC;height:60upx;" /></view>
+						<view class="flex">金额：<input v-model="batchPrice" type="digit" style="border:1upx solid #CCCCCC;height:60upx;" /></view>
 					</view>
 				</view>
 			</template>

ghsApp/src/admin/itemClass/more.vue

@@ -1,5 +1,5 @@
 <template>
-	<view>
+	<view class="app-content">
 		<view v-if="!$util.isEmpty(list.data)" style="padding-bottom:120upx;">
 			<t-table :headerBackgroundColor="'#F0F2F6'">
 				<t-tr header>
@@ -38,7 +38,7 @@
 			<template slot="customContent">
 				<view class="select-cmd_bx">
 					<view class="num_bx" style="margin:60upx 0 60upx 0;font-size:35upx;">
-						<view class="flex">数值：<input v-model="batchNum" type="digit" focus style="border:1upx solid #CCCCCC;height:60upx;" /></view>
+						<view class="flex">数值：<input v-model="batchNum" type="digit" style="border:1upx solid #CCCCCC;height:60upx;" /></view>
 					</view>
 				</view>
 			</template>

ghsApp/src/admin/staff/achieve.vue

@@ -1,4 +1,5 @@
 <template>
+<view class="app-content">
 	<view class="ex-page">
 		<view class="top-bar">
 				<DorpdownSelect class="bar"
@@ -48,6 +49,7 @@
 			themeColor="#4C83D6" fields="day"></rangeDatePick>
       <!-- <kd-entrance></kd-entrance> -->
 	</view>
+</view>
 </template>
 <script>
 const Month = (new Date().getMonth()+1)<10?'0'+(new Date().getMonth()+1):new Date().getMonth()+1

ghsApp/src/admin/statistics/cgStat.vue

@@ -1,6 +1,6 @@
 <template>
+<view class="app-content">
 	<view class="ex-page">
-
 		<view class="input-wrap_box">
 		<view>
 			<AppSearchModule placeholder="输英文字母搜索" @input="searchFn"/>
@@ -50,8 +50,8 @@
 			@change="timeChange"
 			@cancel="timeCancel"
 			themeColor="#4C83D6" fields="day"></rangeDatePick>
-
 	</view>
+</view>
 </template>
 <script>
 const Month = (new Date().getMonth()+1)<10?'0'+(new Date().getMonth()+1):new Date().getMonth()+1

ghsApp/src/admin/statistics/customSale.vue

@@ -1,6 +1,6 @@
 <template>
+<view class="app-content">
 	<view class="ex-page">
-
 		<view class="input-wrap_box">
 		<view>
 			<AppSearchModule placeholder="输英文字母搜索" @input="searchFn"/>
@@ -55,6 +55,7 @@
 			themeColor="#4C83D6" fields="day"></rangeDatePick>
 
 	</view>
+</view>
 </template>
 <script>
 const Month = (new Date().getMonth()+1)<10?'0'+(new Date().getMonth()+1):new Date().getMonth()+1

ghsApp/src/admin/statistics/kdIncome.vue

@@ -1,4 +1,5 @@
 <template>
+<view class="app-content">
 	<view class="ex-page">
 		<view class="top-bar">
 			<DateSelect class="bar"
@@ -33,8 +34,8 @@
 			</view>
 			<view class="act-income">实际收入：¥{{income}}</view>
 		</view>
-
 	</view>
+</view>
 </template>
 <script>
 const Month = (new Date().getMonth()+1)<10?'0'+(new Date().getMonth()+1):new Date().getMonth()+1

ghsApp/src/admin/statistics/productSale.vue

@@ -1,6 +1,6 @@
 <template>
+<view class="app-content">
 	<view class="ex-page">
-
     <view class="input-wrap_box">
       <view>
         <AppSearchModule placeholder="输英文字母搜索" @input="searchFn"/>
@@ -38,6 +38,7 @@
 			</view>
 		</scroll-view>
 	</view>
+</view>
 </template>
 <script>
 const Month = (new Date().getMonth()+1)<10?'0'+(new Date().getMonth()+1):new Date().getMonth()+1

ghsApp/src/admin/statistics/profit.vue

@@ -1,4 +1,5 @@
 <template>
+<view class="app-content">
 	<view class="ex-page">
 		<view class="top-bar">
 			<DateSelect class="bar"
@@ -45,8 +46,8 @@
 				</block>
 			</view>
 		</scroll-view>
-
 	</view>
+</view>
 </template>
 <script>
 const Month = (new Date().getMonth()+1)<10?'0'+(new Date().getMonth()+1):new Date().getMonth()+1

ghsApp/src/admin/tools/blue.vue

@@ -1,4 +1,5 @@
 <template>
+<view class="app-content">
 	<view class="content">
 		<view>
 			<button @click="openDefault" >连接蓝牙</button>
@@ -15,6 +16,7 @@
 			<text>{{tip}}</text>
 		</view>
 	</view>
+</view>
 </template>
 
 

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

@@ -6,7 +6,7 @@
 			</div>
 			<div class="input-wrap">
 				<input
-					type="text" placeholder-style="color:#ccc"
+					type="password" placeholder-style="color:#ccc"
 					ref="searchInput"
 					v-model="search"
 					:focus="focus"

ghsApp/src/components/plugin/t-table/t-td.vue

@@ -20,15 +20,15 @@ export default {
 		width: {
 			type: Number | null,
 			default: null
-		},
-		color: String
+		}
 	},
 	data() {
 		return {
 			thBorder: "1",
 			borderColor: "#d0dee5",
 			tdAlign: "center",
-			fontSize: "24"
+			fontSize: "24",
+			color:''
 		};
 	},
 	inject: ["table", "tr"],

ghsApp/src/components/plugin/t-table/t-th.vue

@@ -6,8 +6,7 @@
 			'border-width': thBorder + 'upx',
 			'border-color': borderColor,
 			'font-size': fontSize + 'upx',
-			'justify-content': thAlignCpd,
-			backgroundColor: backgroundColor
+			'justify-content': thAlignCpd
 		}"
 	>
 		<slot></slot>

ghsApp/src/pagesPurchase/supplier.vue

@@ -1,4 +1,5 @@
 <template>
+<view class="app-content">
   <view class="order-page">
     <scroll-view
       scroll-y
@@ -44,6 +45,7 @@
 				<div class="admin-button-com middle blue add-ghs" @click="add">新增供应商</div>
 			</div>
   </view>
+</view>
 </template>
 
 <script>

ghsApp/src/pagesStore/me/incomeExpenses.vue

@@ -1,6 +1,8 @@
 <template>
 	<view class="app-content">
+		<view class="app-tabs">
 		<app-tabs :tabs="tabs" :isFixed="true" :currentTab="tabIndex" :height="100" @change="changeIncome" itemWidth="50%"/>
+		</view>
 		<div class="list-by_box" v-if="!$util.isEmpty(list.data)">
 			<t-table :headerBackgroundColor="'#F0F2F6'">
 				<t-tr header>
@@ -9,12 +11,7 @@
 					</t-th>
 				</t-tr>
 				<t-tr v-for="(item, index) in list.data" :key="index">
-					<t-td
-						v-for="(column, colIndex) in columns"
-						:key="colIndex"
-						:align="column.align"
-						:color="column.color"
-					>
+					<t-td v-for="(column, colIndex) in columns" :key="colIndex" :align="column.align" :color="column.color" >
 						<view>
 							{{ item[column.dataIndex] || "" }}
 						</view>
@@ -108,7 +105,19 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-	.list-by_box {
-		padding-top: 100upx;
-	}
+.list-by_box {
+	padding-top: 100upx;
+}
+.app-tabs {
+    position: fixed;
+    /* 手机mobile屏幕小于1000px */
+    @media screen and (max-width: 1100px) {
+      width: 100%;
+    }
+    /* 收银台cashier屏幕大于1000px */
+    @media screen and (min-width:1100px) {
+      width: 40%;
+    }   
+    z-index: 9;
+  }
 </style>

ghsApp/src/pagesStorehouse/allot/allotEx.vue

@@ -1,5 +1,5 @@
 <template>
-	<!-- 出库列表 -->
+<view class="app-content">
 	<view class="allot-ex-page">
 		<view class="tabs">
 			<Tabs
@@ -54,6 +54,7 @@
 			<view @click="addEvent" class="admin-button-com middle blue">新增出库</view>
 		</view>
 	</view>
+</view>
 </template>
 <script>
 import Tabs from "@/components/plugin/tabs";

ghsApp/src/pagesStorehouse/allot/allotPut.vue

@@ -1,5 +1,5 @@
 <template>
-	<!-- 入库列表 -->
+<view class="app-content">
 	<view class="allot-ex-page">
 		<view class="tabs">
 			<Tabs
@@ -51,6 +51,7 @@
 			<!--<view @click="addEvent" class="admin-button-com middle blue">新增入库</view>-->
 		<!--</view>-->
 	</view>
+</view>
 </template>
 <script>
 import Tabs from "@/components/plugin/tabs";

ghsApp/src/static/css/common.scss

@@ -421,7 +421,14 @@ body {
 }
 
 .app-footer {
-    width: 100%;
+    /* 手机mobile屏幕小于1000px */
+    @media screen and (max-width: 1100px) {
+        width: 100%;
+      }
+      /* 收银台cashier屏幕大于1000px */
+      @media screen and (min-width:1100px) {
+        width: 40%;
+      }
     max-width: 750upx; /*no*/
     min-width: 320upx; /*no*/
     height: 100upx;