收款金额必须大于0

ghsApp/src/admin/billing/affirm.vue

@@ -131,11 +131,10 @@
 
     <view class="under-bar">
       <view class="price-view">
-        <text class="price-title" v-if="isBilling">
+        <text class="price-title">
           <text>实际金额</text>
         </text>
-        <text class="price-title" v-else>金额</text>
-        <text class="price-number">¥<text class="large">{{ finalPrice }}</text></text>
+        <text class="price-number">¥<text class="large">{{ modifyPrice }}</text></text>
       </view>
       <button class="admin-button-com blue middle" @click="confirmSubmit">提交</button>
     </view>
@@ -422,6 +421,10 @@ export default {
       if (formData.sendType == 2) {
         formData.sendCost = "";
       }
+      if(Number(this.modifyPrice) <= 0){
+        this.$msg('收款金额必须大于0');
+        return false
+      }
       let Fn = createOrder
       let params = {...formData,modifyPrice: this.modifyPrice,newVersion:1};
       if(this.option.orderId && this.option.orderId > 0){

ghsApp/src/admin/itemClass/addPrice.vue

@@ -34,11 +34,11 @@
         <view class="app-footer">
             <view class="admin-button-com middle blue" @click="showBatchUpdate('add')">整列累加</view>
             <view style="margin-left:20upx;" class="admin-button-com middle blue" @click="showBatchUpdate('update')">整列改为</view>
-            <view style="margin-left:20upx;" class="admin-button-com middle blue" @click="pageTo({url: '/admin/item/list',type:3})">花材</view>
+            <view style="margin-left:20upx;" class="admin-button-com middle blue" @click="pageTo({url: '/admin/item/list'})">花材</view>
 		    <view style="margin-left:20upx;" class="admin-button-com middle blue" @click="savePrice">全部保存</view>
 		</view>
 
-		<modal-module :show="batchModel" @cancel="modalCancel" @click="affirmBatch" title="批量操作" color="#333" :size="32" padding="30upx 30upx" >
+		<modal-module :show="batchModel" @click="affirmBatch" title="批量操作" color="#333" :size="32" padding="30upx 30upx" >
 			<template slot="customContent">
 				<view class="select-cmd_bx">
 					<view class="num_bx" style="margin:60upx 0 60upx 0;font-size:35upx;">

ghsApp/src/admin/itemClass/more.vue

@@ -30,11 +30,11 @@
         <view class="app-footer">
             <view class="admin-button-com middle blue" @click="showBatchUpdate('add')">整列累加</view>
             <view style="margin-left:20upx;" class="admin-button-com middle blue" @click="showBatchUpdate('update')">整列改为</view>
-            <view style="margin-left:20upx;" class="admin-button-com middle blue" @click="pageTo({url: '/admin/item/list',type:3})">花材</view>
+            <view style="margin-left:20upx;" class="admin-button-com middle blue" @click="pageTo({url: '/admin/item/list'})">花材</view>
 		    <view style="margin-left:20upx;" class="admin-button-com middle blue" @click="savePrice">全部保存</view>
 		</view>
 
-		<modal-module :show="batchModel" @cancel="modalCancel" @click="affirmBatch" title="批量操作" color="#333" :size="32" padding="30upx 30upx" >
+		<modal-module :show="batchModel" @click="affirmBatch" title="批量操作" color="#333" :size="32" padding="30upx 30upx" >
 			<template slot="customContent">
 				<view class="select-cmd_bx">
 					<view class="num_bx" style="margin:60upx 0 60upx 0;font-size:35upx;">

ghsApp/src/mixins/globalMixins.js

@@ -148,11 +148,13 @@ export default {
     //监听pda扫码开单
     listenPDAkd(){
 
-          //PDA扫码开单前准备好所有花材
-          allProduct().then(res=>{
-            this.allProduct = res.data.list
-            console.log('................载入最新花材和库存................')
-          })
+          //PDA扫码开单前准备好所有花材，首页已经有加载不再需要
+          if(currentRoute != 'admin/home/workbench'){
+            allProduct().then(res=>{
+              this.allProduct = res.data.list
+              console.log('................载入最新花材和库存................')
+            })
+          }
 
           this.checkStock = true
 

ghsApp/src/pagesStorehouse/flower/category.vue

@@ -188,10 +188,13 @@ export default {
 		delEvent(item, index) {
 			let that = this
 			that.$util.confirmModal({content:`确认删除${item.name || ""}`},() => {
-				await deleteFlowerApi(item.id)
-				uni.showToast({ title: "删除成功" })
-				that.resetList()
-				that._list()
+				deleteFlowerApi(item.id).then(res=>{
+					if(res.code == 1){
+						uni.showToast({ title: "删除成功" })
+						that.resetList()
+						that._list()
+					}
+				})
 			})
 		},
 		changeItem: lodash.debounce(function(e, item, key, index) {

ghsApp/src/pagesStorehouse/flower/manage.vue

@@ -161,13 +161,16 @@ export default {
 				this.closeModal();
 			} catch (error) {}
 		},
-		async delEvent(item, index) {
+		delEvent(item, index) {
 			let that = this
 			that.$util.confirmModal({content:`确认删除${item.name}`},() => {
-				await deleteFlowerCategoryApi(item.id)
-				uni.showToast({ title: "删除成功" })
-				that.resetList()
-				that._list()
+				deleteFlowerCategoryApi(item.id).then(res=>{
+					if(res.code == 1){
+						uni.showToast({ title: "删除成功" })
+						that.resetList()
+						that._list()
+					}
+				})
 			})
 		},
 		editEvent(item) {