打印

ghsApp/src/admin/billing/result.vue

@@ -11,7 +11,7 @@
     分享给<text style="font-weight:bold;margin-left:12upx;">{{customName}}</text>
   </button>
   <!-- #endif -->
-
+  <button v-if="option.title != '报损成功'" class="admin-button-com big" @click="printOrder()">打印（无价格）</button>
 	<button v-if="option.title != '报损成功'" class="admin-button-com big" @click="gotoOrderDetail">订单详情</button>
 	<button class="admin-button-com big" @click="goBackHome">返回首页</button>
   </appResult>
@@ -19,7 +19,7 @@
 <script>
 import { mapGetters } from "vuex"
 import appResult from "@/components/app-result"
-import { getDetail} from "@/api/order/index"
+import { getDetail,cloudPrintOrder} from "@/api/order/index"
 import { getWeixinId } from "@/api/invite/index"
 import { IMGHOST } from '@/config'
 export default {
@@ -102,6 +102,12 @@ export default {
     gotoOrderDetail() {
       this.$util.pageTo({url: "/pagesOrder/detail",type:2,query: { id: this.option.orderId }})
     },
+    printOrder(){
+			uni.showLoading({title:"打印中..."})
+			cloudPrintOrder({id:this.detailInfo.id,noPrice:1}).then((res) => {
+				uni.hideLoading()
+			})
+    },
     gotoPlace() {
       uni.navigateBack({ delta: 1 });
     },

ghsApp/src/admin/item/list.vue

@@ -195,7 +195,7 @@ export default {
 		},
 		moreToDo(item){
 			let that=this;
-			let doList = ['复制花材','颜色管理', '销售记录','下架','上架']
+			let doList = ['复制花材','颜色管理', '下单记录','下架','上架']
 			uni.showActionSheet({
 				itemList: doList,
 				success: function (respond) {

ghsApp/src/pagesOrder/detail.vue

@@ -243,6 +243,9 @@
 			<!-- #ifdef APP-PLUS -->
 			<button class="admin-button-com default" v-if="detailInfo.status == 4" @click="shareOrder()">分享</button>
 			<!-- #endif -->
+
+			<button class="admin-button-com default" style="width:240upx;" v-if="detailInfo.status != 1 && detailInfo.status != 5" @click="printOrder(detailInfo)">打印（无价格）</button>
+
 			<button @click="cancelOrderFn(detailInfo)" v-if="detailInfo.status == 1" class="admin-button-com default" :class="active">取消</button>
 			<template v-for="s in detailInfo.buttonList">
 				<button :key="s.type" @click="clickBtn(s, detailInfo)" v-if="s.show == 1" :disabled="s.disable === 1" class="admin-button-com default" :class="s.disable === 1?'active':''">
@@ -460,6 +463,12 @@ export default {
 			//console.log(unixTimestamp);
 			return unixTimestamp;
 		},
+		printOrder(item){
+			uni.showLoading({title:"打印中..."})
+			cloudPrintOrder({id:item.id,noPrice:1}).then((res) => {
+				uni.hideLoading()
+			})
+		},
 		clickBtn(s, item) {
 			this.orderId = item.id;
 			if (s.type === "selfGet") {
@@ -480,17 +489,6 @@ export default {
 						item.printNum++
 						uni.hideLoading()
 					})
-				}else{
-					console.log('走蓝牙打印方式')
-					let BleVal = JSON.parse(item.printData);
-					switch(uni.getSystemInfoSync().platform){
-						case 'android':
-							this.destroyed(BleVal);
-							break;
-						case 'ios':
-							this.autoLinkBle(BleVal);
-							break;
-					}
 				}
 			} else if (s.type === "send") {
 				//发货

hdApp/src/admin/home/workbench.vue

@@ -230,7 +230,7 @@ export default {
   methods: {
     enterShop(item) {
       if(item.isOpen == 0){
-        this.$msg('本店已休息，请选择其它门店下单')
+        this.$msg('本店已休息，请选择其它门店')
         return false
       }
       const { id } = item

hdApp/src/pagesPurchase/order.vue

@@ -61,7 +61,7 @@ export default {
   methods: {
     enterShop(item) {
       if(item.isOpen == 0){
-        this.$msg('本店已休息，请选择其它门店下单')
+        this.$msg('本店已休息，请选择其它门店')
         return false
       }
       const { id } = item