制作单

hdApp/src/admin/ghsProduct/detail.vue

@@ -24,14 +24,6 @@
         </button>
       </div>
 
-    </div>
-    <div class="shop-express app-color-3">
-
-      <text>散客 {{parseFloat(productInfo.originalInfo.skPrice)||0}}</text>
-      <text>普店{{parseFloat(productInfo.originalInfo.price)||0}}</text>
-      <text>银店 {{parseFloat(productInfo.originalInfo.hjPrice)||0}}</text>
-      <text>金店 {{parseFloat(productInfo.originalInfo.zsPrice)||0}}</text>
-
     </div>
 
     <div class="module-wrap shop-detail">

hdApp/src/admin/home/order.vue

@@ -18,7 +18,7 @@
               <span class="app-size-30 app-bold">¥{{ item.orderPrice ? parseFloat(item.orderPrice) :0 }}</span>
             </view>
             <view class="list-button">
-                <view class="admin-button-com middle" v-if="item.payStatus == 1">打印</view>
+                <view class="admin-button-com middle" v-if="item.payStatus == 1" @click.stop="printOrder(item)">打印</view>
                 <view class="admin-button-com default" v-else>打印</view>
             </view>
           </view>
@@ -39,7 +39,7 @@ import ModalModule from "@/components/plugin/modal";
 import { getCategory, getUsage } from '@/utils/config'
 import { list } from "@/mixins";
 import { mapGetters } from 'vuex';
-import { orderClass } from '@/api/order'
+import { orderClass,onlinePrintOrder } from '@/api/order'
 import { getListB, freeShipping } from "@/api/order";
 import NotLogin from "@/components/not-login";
 export default {
@@ -95,6 +95,13 @@ export default {
     }
   },
   methods: {
+    printOrder(item){
+      onlinePrintOrder({id:item.id}).then(res=>{
+        if(res.code == 1){
+          this.$msg('操作成功')
+        }
+      })
+    },
     init () {
       this.getOrderList();
     },

hdApp/src/admin/order/detail.vue

@@ -103,7 +103,7 @@
     <view class="page-btn app-footer">
       <view class="flex-center"> </view>
       <view class="operate-btn-wrap">
-          <button class="admin-button-com middle" v-if="orderInfo.payStatus == 1">打印</button>
+          <button class="admin-button-com middle" @click.stop="printOrder(orderInfo)" v-if="orderInfo.payStatus == 1">打印</button>
       </view>
     </view>
   </view>
@@ -114,6 +114,7 @@ import detailItem from "./components/detail-item.vue";
 import AppCoupon from "@/components/app-coupon-sel";
 import ModalModule from "@/components/plugin/modal";
 import RateModule from "@/components/plugin/rate";
+import { onlinePrintOrder } from '@/api/order'
 import { getDetB} from "@/api/order";
 const commonUtil = require("@/utils/common.js");
 export default {
@@ -128,6 +129,13 @@ export default {
   onLoad() {
   },
   methods: {
+    printOrder(item){
+      onlinePrintOrder({id:item.id}).then(res=>{
+        if(res.code == 1){
+          this.$msg('操作成功')
+        }
+      })
+    },
     edit(){
       this.$msg('开发中')
     },

hdApp/src/admin/work/components/workItem.vue

@@ -29,8 +29,8 @@
         </view>
         <view class="list-bottom">
             <view class="list-button">
-                <button class="admin-button-com bule" @click.stop="cancel(item)" v-if="item.status == 0">取消</button>
-                <button disabled="true" class="admin-button-com default" v-else>取消</button>
+                <button class="admin-button-com bule" @click.stop="printWorkd(item)" v-if="item.status == 1">打印</button>
+                <button disabled="true" class="admin-button-com default" v-else>打印</button>
             </view>
         </view>
     </view>
@@ -48,6 +48,9 @@ export default {
 		};
 	},
 	methods: {
+    printWorkd(item){
+      this.$emit('printWork',item)
+    },
 		previewImage(url){
 			uni.previewImage({
 				urls: [url]

hdApp/src/admin/work/detail.vue

@@ -90,15 +90,17 @@
 			</view>
 		</view>
 		<div class="app-footer">
+			<button class="admin-button-com bule" v-if="detailInfo.status == 1" @click="printWork(detailInfo)">打印</button>
+			<button class="admin-button-com default" v-else>打印</button>
 			<button class="admin-button-com bule" v-if="detailInfo.status == 0" @click="cancelFn(detailInfo)">取消</button>
-			<button class="admin-button-com default" style="color:#CCCCCC;border-color:#CCCCCC;" v-else>取消</button>
+			<button class="admin-button-com default" v-else>取消</button>
 		</div>
 	</view>
 </template>
 <script>
 import { mapGetters } from "vuex";
 import TuiListCell from "@/components/plugin/list-cell";
-import { fullInfo,cancelWork } from "@/api/work/index";
+import { fullInfo,cancelWork,print } from "@/api/work/index";
 export default {
 	name: "detail",
 	components: { TuiListCell },
@@ -122,6 +124,13 @@ export default {
 		...mapGetters({ loginInfo: "getLoginInfo" }),
 	},
 	methods: {
+		printWork(item){
+			print({id:item.id}).then(res=>{
+				if(res.code == 1){
+					this.$msg(res.msg)
+				}
+			})
+		},
 		cancelFn(item){
 			let that = this
 			that.$util.confirmModal({content:'确认取消？'},() => {
@@ -349,18 +358,12 @@ export default {
 	justify-content: flex-end;
 	& .admin-button-com {
 		padding: 0;
-		margin-right:40upx;
+		margin-right:30upx;
 		width: 180upx;
 		height: 80upx;
 		line-height: 80upx;
 		font-size:30upx;
 		text-align: center;
-		color: #3385ff;
-		border: 1upx solid #3385ff;
-		&.active{
-			color: #666666;
-			border: 1upx solid #ccc;
-		}
 	}
 }
 </style>

hdApp/src/admin/work/list.vue

@@ -19,7 +19,7 @@
       <block v-if="!$util.isEmpty(list.data)">
         <div class="list" v-for="(item, index) in list.data" :key="index">
 
-          <workItem :item="item"  @cancel="cancel"></workItem>
+          <workItem :item="item"  @cancel="cancel" @printWork="printWork"></workItem>
 
         </div>
       </block>
@@ -39,7 +39,7 @@ import AppWrapperEmpty from "@/components/app-wrapper-empty";
 import ModalModule from "@/components/plugin/modal";
 import { list } from "@/mixins";
 import { mapGetters } from "vuex";
-import { getWorkList,cancelWork} from "@/api/work";
+import { getWorkList,cancelWork,print} from "@/api/work";
 import AppSearchModule from "@/components/module/app-search";
 import DropShopSelect from "@/components/module/shopSelect";
 import workItem from "./components/workItem";
@@ -103,7 +103,6 @@ export default {
     uni.stopPullDownRefresh()
   },
   onReachBottom() {
-    console.log('abcdefghijklmn')
     if (!this.list.finished) {
       this._list().then((res) => {
         uni.stopPullDownRefresh();
@@ -121,11 +120,15 @@ export default {
       this.tabIndex = parseInt(tabIndex.tabIndex);
     }
     this._list();
-  },
-  onShow() {
-
   },
   methods: {
+    printWork(item){
+			print({id:item.id}).then(res=>{
+				if(res.code == 1){
+					this.$msg(res.msg)
+				}
+			})
+    },
     cancel(item){
 			let that = this
 			that.$util.confirmModal({content:'确认取消？'},() => {

hdApp/src/api/order/index.js

@@ -1,5 +1,9 @@
 import https from "@/plugins/luch-request_0.0.7/request";
 
+export const onlinePrintOrder = data => {
+	return https.get("/order/print-order", data);
+};
+
 //退款
 export const refund = data => {return https.post("/refund/create-order", data);};
 

hdApp/src/api/work/index.js

@@ -1,5 +1,9 @@
 import https from '@/plugins/luch-request_0.0.7/request'
 
+export const print = data => {
+	return https.get('/work/print', data)
+}
+
 export const addWork = data => {
 	return https.post('/work/create', data)
 }

hdPad/src/pages/home/components/workList.vue

@@ -11,8 +11,9 @@
             <view v-for="item in list.data" :key="item.id" class="show-item_box" @click="getOrder(item,1)">
                 <view :class="[selectOrderId==item.id ? 'active' : 'not-active', 'item-body_box']">
                     <view class="flower-name_box">
-                        <view class="current-item-title"><text class="name">{{item.name}}</text></view>
+                        <view class="current-item-title"><text>{{item.name}}</text></view>
                         <image class="flower-image" :src="item.cover"></image>
+                        <text style="position:absolute;top:2upx;left:90upx;font-size:11upx;">{{item.sn}}</text>
                     </view>
                     <view class="item-price-num">
                         <view>{{item.addTime ?item.addTime.substr(5,11):''}}</view>
@@ -164,15 +165,13 @@ export default {
                     padding: 0 5upx;
                     position: relative;
                     .current-item-title {
-                        .name{
-                            font-size:12upx;
-                            color: #333333;
-                            font-weight: bold;
-                            overflow: hidden;
-                            text-overflow:ellipsis;
-                            white-space: nowrap;
-                            width:60upx;
-                        }
+                        font-size:12upx;
+                        color: #333333;
+                        font-weight: bold;
+                        overflow: hidden;
+                        text-overflow:ellipsis;
+                        white-space: nowrap;
+                        width:85upx;
                     }
                     .flower-image{
                         position: absolute;