shish 4 лет назад
Родитель
Сommit
80b04ec852

+ 5 - 4
ghsApp/src/admin/home/workbench.vue

@@ -160,10 +160,11 @@ export default {
 	onShow() {
 		// #ifdef APP-PLUS
 		//PDA扫码开单前准备好所有花材
-		allProduct().then(res=>{
-			this.allProduct = res.data.list
-			console.log('................载入最新花材................')
-		})
+		//PDA功能未启用,暂时注释
+		// allProduct().then(res=>{
+		// 	this.allProduct = res.data.list
+		// 	console.log('................载入最新花材................')
+		// })
 		// #endif
 	},
 	methods: {

+ 3 - 3
ghsApp/src/mixins/globalMixins.js

@@ -90,7 +90,7 @@ export default {
           store.commit('setLoginInfo', { ...subRes.data.admin, ...subRes.data })
           this.skCustomId = subRes.data.skCustomId
           // #ifdef APP-PLUS
-          this.listenPDAkd()
+          //this.listenPDAkd()
           // #endif
           this.setUserShopAll()
           if (this.init) {
@@ -118,7 +118,7 @@ export default {
           store.commit('setLoginInfo', { ...subRes.data.admin, ...subRes.data })
           this.skCustomId = subRes.data.skCustomId
           // #ifdef APP-PLUS
-          this.listenPDAkd()
+          //this.listenPDAkd()
           // #endif
           this.setUserShopAll()
           if (this.init) {
@@ -167,7 +167,7 @@ export default {
                 that.globalPDAKd(productIdCode)
               }
             })
-            console.log('!!!!!!!!!!!!!!!!!!!!!!!!商米收银台发起监听!!!!!!!!!!!!!!!!!!!!!!!')
+            console.log('!!!!!!!!!!!!!!!!!!!!!!!!商米收银台发起监听!!!!!!!!!!!!!!!!!!!!!!!!')
           }
 
           //新大陆PDA

+ 1 - 1
ghsApp/src/pagesOrder/detail.vue

@@ -81,7 +81,7 @@
 				<view>结算状态:</view>
 					<view style="color:red;font-weight:bold;">欠款</view>
 					<view class="price">
-						<text v-if="detailInfo.debtAmount > 0" @click='pageTo({url:"/pagesArrears/details",query: {id: detailInfo.customId}})' style="margin-right:50upx;color:#3385FF;font-size:26upx;">全部欠</text>
+						<text v-if="detailInfo.debtAmount > 0" @click='pageTo({url:"/pagesArrears/details",query: {id: detailInfo.customId}})' style="margin-right:50upx;color:#3385FF;font-size:26upx;">全部欠</text>
 						<button @click="settleOrder(detailInfo)" class="admin-button-com">结清</button>
 					</view>
 				</view>

+ 1 - 1
ghsApp/src/pagesPurchase/info.vue

@@ -65,7 +65,7 @@
 				<view>结算状态:</view>
 					<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>
+					<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>
 					</view>
 				</view>