app 兼容

ghsApp/src/admin/billing/index.vue

@@ -50,7 +50,12 @@
 				<view class="select-cmd_bx" v-if="customData">
 					<view class="kc"><text class="unit_price">库存 {{ parseFloat(customData.stock) }}</text><text class="unit_price"> 单价 {{ parseFloat(customData.price) }}</text>1扎={{customData.ratio}}支</view>
 					<view class="num_bx">
+						<!-- #ifdef APP-PLUS -->
+						<input v-model="customData.bigCount" type="number" />扎
+						<!-- #endif -->
+						<!-- #ifdef MP-WEIXIN -->
 						<input v-model="customData.bigCount" :focus="isAddInputFocus" type="number" />扎
+						<!-- #endif -->
 						<input v-model="customData.smallCount" type="number" style="margin-left:24upx" />支
 					</view>
 					<view class="num_bx">

ghsApp/src/admin/breakage/index.vue

@@ -51,7 +51,16 @@
 				<view class="select-cmd_bx" v-if="customData">
 					<view class="kc"><text class="unit_price">库存 {{ customData.stock }}</text></view>
 					<view class="num_bx">
+						
+
+						<!-- #ifdef APP-PLUS -->
+						<input v-model="customData.bigCount" type="number" />扎
+						<!-- #endif -->
+						<!-- #ifdef MP-WEIXIN -->
 						<input v-model="customData.bigCount" :focus="isAddInputFocus" type="number" />扎
+						<!-- #endif -->
+
+
 						<input v-model="customData.smallCount" type="number" style="margin-left:24upx" />支
 					</view>
 				</view>

ghsApp/src/api/clear/index.js

@@ -1,21 +1,21 @@
 import https from "@/plugins/luch-request_0.0.7/request";
 
-//供应商的结帐单详情
+//供应商的结账单详情
 export const getDetail = async id => {
 	return https.get("/clear/get-full-info", { id });
 };
 
-//供应商的结帐单
+//供应商的结账单
 export const getClearList = async data => {
 	return https.get("/clear/list", data);
 };
 
-//客户的结帐单
+//客户的结账单
 export const getCustomClearList = async data => {
 	return https.get("/clear/custom-list", data);
 };
 
-//客户的结帐单详情
+//客户的结账单详情
 export const getCustomDetail = async id => {
 	return https.get("/clear/get-custom-full-info", { id });
 };

ghsApp/src/components/plugin/modal.vue

@@ -1,6 +1,6 @@
 <template>
 	<view @touchmove.stop.prevent>
-		<view class="tui-modal-box" style="margin-top: -150rpx" :style="{width:width,padding:padding,borderRadius:radius,background:bgcolor}" :class="[(fadein || show)?'tui-modal-normal':'tui-modal-scale',show?'tui-modal-show':'']">
+		<view class="tui-modal-box" style="margin-top: -150rpx" :style="{padding:padding,borderRadius:radius,background:bgcolor}" :class="[(fadein || show)?'tui-modal-normal':'tui-modal-scale',show?'tui-modal-show':'']">
 			<view v-if="!custom">
 				<view class="tui-modal-title" v-if="title">{{title}}</view>
 				<!-- <view class="tui-modal-content" :class="[title?'':'tui-mtop']"> -->
@@ -42,10 +42,6 @@ export default {
 			type: Boolean,
 			default: false
 		},
-		width: {
-			type: String,
-			default: '84%'
-		},
 		padding: {
 			type: String,
 			default: '40rpx 30rpx'
@@ -144,6 +140,14 @@ export default {
 
 <style lang="scss" scoped>
 	.tui-modal-box {
+		/* 手机mobile屏幕小于1000px */
+		@media screen and (max-width: 1100px) {
+		width: 84%;
+		}
+		/* 收银台cashier屏幕大于1000px */
+		@media screen and (min-width:1100px) {
+		width: 40%;
+		}   
 		position: fixed;
 		left: 50%;
 		top: 50%;

ghsApp/src/pages.json

@@ -285,7 +285,7 @@
 			"root": "pagesGys",
 			"pages": [
 				{ "path": "list", "style": { "navigationBarTitleText": "欠款订单", "enablePullDownRefresh": true } },
-				{ "path": "details", "style": { "navigationBarTitleText": "结帐单", "enablePullDownRefresh": true } }
+				{ "path": "details", "style": { "navigationBarTitleText": "结账单", "enablePullDownRefresh": true } }
 			]
 		},
 		{
@@ -305,7 +305,7 @@
 		{
 			"root": "admin/clear",
 			"pages": [
-				{"path": "list","style": {"navigationBarTitleText": "结帐記錄"}},
+				{"path": "list","style": {"navigationBarTitleText": "结账记录"}},
 				{"path": "info","style": {"navigationBarTitleText": "详情"}},
 				{"path": "customList","style": {"navigationBarTitleText": "历史帐单"}},
 				{"path": "customInfo","style": {"navigationBarTitleText": "详情"}}

ghsApp/src/pagesGys/details.vue

@@ -48,7 +48,7 @@
 				</view>
 			</template>
 			<view class="btn-view">
-				<button :class="['admin-button-com', 'blue']" @click="clearSelectedOrder" >结帐</button>
+				<button :class="['admin-button-com', 'blue']" @click="clearSelectedOrder" >结账</button>
 			</view>
 		</view>
 
@@ -224,7 +224,7 @@ export default {
 		// 支付成功
 		async paySuccess(parameter) {
 			await clearOrderApi(parameter);
-			this.pageTo({url:'/common/pageSuccess?title=结帐成功', type: 2});
+			this.pageTo({url:'/common/pageSuccess?title=结账成功', type: 2});
 		},
 		payFail() {
 		}

ghsApp/src/pagesOrder/detail.vue

@@ -236,7 +236,7 @@ export default {
 		this.init();
 	},
 	methods: {
-		//结帐（单个结帐没有优惠）
+		//结账（单个结账没有优惠）
 		settleOrder(item) {
 			let id = item.id
 			let customId = item.customId

ghsApp/src/pagesPurchase/add.vue

@@ -49,7 +49,15 @@
 					<view class="select-cmd_bx">
 						<view class="num_bx">
 							<view class="kc">数量</view>
-							<input v-model="customData.bigCount" :focus="isAddInputFocus" type="number" placeholder="填写扎数" />
+							
+
+						<!-- #ifdef APP-PLUS -->
+						<input v-model="customData.bigCount" type="number" placeholder="填写扎数" />
+						<!-- #endif -->
+						<!-- #ifdef MP-WEIXIN -->
+						<input v-model="customData.bigCount" :focus="isAddInputFocus" type="number" placeholder="填写扎数" />
+						<!-- #endif -->
+
 						</view>
 					</view>
 					<view class="select-cmd_bx">

ghsApp/src/pagesPurchase/details.vue

@@ -238,7 +238,7 @@ export default {
 			if(Number(this.form.packingCharge) > 0){
 				price	 = Number(price) + Number(this.form.packingCharge)
 			}
-			//到付的，长途和短途运费不能算在要结帐的订单金额里。寄付的则要算。
+			//到付的，长途和短途运费不能算在要结账的订单金额里。寄付的则要算。
 			if(this.form.yfPayWay == 1){
 				//短途运费
 				if(Number(this.form.shortCharge) > 0){

ghsApp/src/pagesPurchase/info.vue

@@ -66,7 +66,7 @@
 					<view style="color:red;">欠款</view>
 					<view class="price">
 					<text v-if="detailInfo.debtAmount > 0" @click="goToClear(detailInfo)" style="margin-right:38upx;color:#3385FF;font-size:26upx;">全部欠款</text>
-					<button @click="clearOrder(detailInfo)" class="admin-button-com">结帐</button>
+					<button @click="clearOrder(detailInfo)" class="admin-button-com">结账</button>
 					</view>
 				</view>
 				<view class="order-info_box" v-else>
@@ -231,12 +231,12 @@ export default {
 
 	},
 	methods: {
-		//咨询是否结帐
+		//咨询是否结账
 		clearOrder(item){
 			let self = this
 			uni.showModal({
 				title: '提示',
-				content: '确定结帐？',
+				content: '确定结账？',
 				success: function (res) {
 					if (res.confirm) {
 						self.doClearOrder(item)
@@ -244,7 +244,7 @@ export default {
 				}
 			});
 		},
-		//结帐
+		//结账
 		doClearOrder(item) {
 			let that = this
 			let id = item.id
@@ -257,7 +257,7 @@ export default {
 			}
 			clearOrderApi(paramData).then(res => {
 				if(res.code == 1) {
-					that.pageTo({url: '/common/pageSuccess?title=结帐成功',type: 2})
+					that.pageTo({url: '/common/pageSuccess?title=结账成功',type: 2})
 				}
 			}).catch(err => {
 				console.log('err', err)

ghsApp/src/pagesPurchase/supplier.vue

@@ -20,7 +20,6 @@
               <view class="store_title">{{item.name}}</view>
               <view class="accumulative"></view>
             </view>
-            <view class="cg-button">采购</view>
             <view class="store_btn">
               <view class="btn_entrance" @click.stop="gotoDetailsEvent(item)" >
                 欠款订单
@@ -29,6 +28,7 @@
                 结账记录
               </view>
               <view class="btn_entrance" @click.stop="pageTo({url:'/pagesPurchase/order'})">采购记录</view>
+              <view class="cg-button">采购</view>
             </view>
           </view>
         </block>
@@ -150,18 +150,6 @@ export default {
       background: #fff;
       display: flex;
       align-items: center;
-      .cg-button{
-          display: inline-block;
-          font-size: 28upx;
-          color: white;
-          border: 1upx solid #3385FF;
-          border-radius: 80upx;
-          padding: 12upx 32upx;
-          position: absolute;
-          top:70upx;
-          right:60upx;
-          background: #3385FF;
-      }
       & > .store_name {
         margin-left: 30upx;
         width: 700upx;
@@ -197,11 +185,23 @@ export default {
         & > .btn_entrance {
           display: inline-block;
           font-size: 26upx;
-          color: #CCCCCC;
+          color: #979494;
           padding: 10upx 20upx;
           margin-left: 20upx;
           text-decoration:underline;
         }
+        .cg-button{
+            display: inline-block;
+            font-size: 28upx;
+            color: white;
+            border: 1upx solid #3385FF;
+            border-radius: 80upx;
+            padding: 12upx 32upx;
+            background: #3385FF;
+            position: absolute;
+            top:-50upx;
+            right:-180upx;
+        }
       }
     }
   }

ghsApp/src/pagesStorehouse/allot/exSelect.vue

@@ -47,7 +47,15 @@
 				<view class="select-cmd_bx" v-if="customData">
 					<view class="kc"> 库存{{ customData.stock }} </view>
 					<view class="num_bx">
+						
+
+						<!-- #ifdef APP-PLUS -->
+						<input v-model="customData.bigCount" type="number" />扎
+						<!-- #endif -->
+						<!-- #ifdef MP-WEIXIN -->
 						<input v-model="customData.bigCount" :focus="isAddInputFocus" type="number" />扎
+						<!-- #endif -->
+
 						<input v-model="customData.smallCount"  type="number" style="margin-left:24upx"/>支
 					</view>
 				</view>

ghsApp/src/pagesStorehouse/inventory/select.vue

@@ -46,7 +46,15 @@
 				<view class="select-cmd_bx" v-if="customData">
 					<view class="kc"> 库存{{ customData.stock }} </view>
 					<view class="num_bx">
+						
+
+						<!-- #ifdef APP-PLUS -->
+						<input v-model="customData.bigCount" type="number" />扎
+						<!-- #endif -->
+						<!-- #ifdef MP-WEIXIN -->
 						<input v-model="customData.bigCount" :focus="isAddInputFocus" type="number" />扎
+						<!-- #endif -->
+
 						<input v-model="customData.smallCount" type="number" style="margin-left:24upx"/>支
 					</view>
 				</view>