订单问题

ghsApp/src/admin/billing/index.vue

@@ -106,7 +106,6 @@ export default {
 	mixins: [productMins],
 	data() {
 		return {
-			pageType: "kd",
 			COMMODITY_TYPE,
 			isFocus: false,
 			isModel: false,

ghsApp/src/admin/home/order.vue

@@ -276,11 +276,7 @@ export default {
     }, // 操作按钮
   clickBtn(s, item) {
       this.orderId=item.id;
-      // 花材
-      if (s.type === "item") {
-        uni.navigateTo({ url: `/pagesOrder/select?id=${item.id}` });
-        // 自取
-      } else if (s.type === "selfGet") {
+      if (s.type === "selfGet") {
         this.operateData = item;
         let self = this;
         uni.showModal({
@@ -328,6 +324,9 @@ export default {
 				uni.showActionSheet({
 					itemList: ['请选择结算方式：', '欠款', '已收款'],
 					success: function (res) {
+            if(res.tapIndex == 0){
+              return false
+            }
 						let payWay = 0
 						let title = res.tapIndex == 1 ? '确认客户欠款？' : '确认已收款？'
 						//1欠款 2已收款
@@ -339,9 +338,9 @@ export default {
 								success: function (respond) {
 									let currentIndex = respond.tapIndex
 									let inWay = [{name:"未选择",id:-1},{name:"微信",id:0},{name:"支付宝",id:1},{name:"现金",id:4},{name:"银行卡",id:5}]
-									if (self.$util.isEmpty(inWay[currentIndex].id || inWay[currentIndex].id == -1)) {
-										return false;
-									}
+									if(currentIndex == 0){
+                    return false
+                  }
 									payWay = inWay[currentIndex].id
 									let params = {id:item.id,clearType:clearType,payWay:payWay}
 									self.toConfrim(params,title)

ghsApp/src/pagesOrder/detail.vue

@@ -269,10 +269,7 @@ export default {
 		},
 		clickBtn(s, item) {
 			this.orderId = item.id;
-			if (s.type === "item") {
-				// 花材
-				this.gotoSelect();
-			} else if (s.type === "selfGet") {
+			if (s.type === "selfGet") {
 				// 自取
 				let self = this;
 				uni.showModal({title: "提示",content: "确认客户已自取",confirmText: "确认",
@@ -352,8 +349,11 @@ export default {
 			}else if(s.type == 'confirm'){
 				let self = this;
 				uni.showActionSheet({
-					itemList: ['请选择结算方式：', '欠款', '已收款'],
+					itemList: ['结算方式：', '欠款', '已收款'],
 					success: function (res) {
+						if(res.tapIndex == 0){
+							return false
+						}
 						let payWay = 0
 						let title = res.tapIndex == 1 ? '确认客户欠款？' : '确认已收款？'
 						//1欠款 2已收款
@@ -361,12 +361,12 @@ export default {
 						//选择的已收款，还需要选择收款方式
 						if(clearType == 2){
 							uni.showActionSheet({
-								itemList: ['请选择收款方式：', '微信', '支付宝','现金','银行卡'],
+								itemList: ['收款方式：', '微信', '支付宝','现金','银行卡'],
 								success: function (respond) {
 									let currentIndex = respond.tapIndex
 									let inWay = [{name:"未选择",id:-1},{name:"微信",id:0},{name:"支付宝",id:1},{name:"现金",id:4},{name:"银行卡",id:5}]
-									if (self.$util.isEmpty(inWay[currentIndex].id || inWay[currentIndex].id == -1)) {
-										return false;
+									if(currentIndex == 0){
+										return false
 									}
 									payWay = inWay[currentIndex].id
 									let params = {id:item.id,clearType:clearType,payWay:payWay}