shish 5 часов назад
Родитель
Сommit
7bba942cda
2 измененных файлов с 2 добавлено и 2 удалено
  1. 1 1
      ghsApp/src/admin/billing/result.vue
  2. 1 1
      ghsApp/src/pagesOrder/detail.vue

+ 1 - 1
ghsApp/src/admin/billing/result.vue

@@ -12,7 +12,7 @@
     分享给<text style="font-weight:bold;margin-left:12upx;">{{customName}}</text>
     分享给<text style="font-weight:bold;margin-left:12upx;">{{customName}}</text>
   </button>
   </button>
   <!-- #endif -->
   <!-- #endif -->
-  <button v-if="option.title != '报损成功'" class="admin-button-com big" style="background-color: green;border-color: green;color:white;" @click="printOrder()">打印(无价格)</button>
+  <button v-if="option.title != '报损成功'" class="admin-button-com big" style="background-color: green;border-color: green;color:white;" @click="printOrder()">无价打印</button>
   	<button v-if="option.title != '报损成功'" class="admin-button-com big" @click="gotoOrderDetail()">订单详情</button>
   	<button v-if="option.title != '报损成功'" class="admin-button-com big" @click="gotoOrderDetail()">订单详情</button>
 	<button class="admin-button-com big" @click="goBackHome">返回首页</button>
 	<button class="admin-button-com big" @click="goBackHome">返回首页</button>
 
 

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

@@ -472,7 +472,7 @@
 			<!-- #endif -->
 			<!-- #endif -->
 			<button class="admin-button-com middle blue" v-if="detailInfo.sendStatus == -4 && detailInfo.status== 2 && detailInfo.payStatus == 1" @click.stop="openExpressPage()">呼叫跑腿</button>
 			<button class="admin-button-com middle blue" v-if="detailInfo.sendStatus == -4 && detailInfo.status== 2 && detailInfo.payStatus == 1" @click.stop="openExpressPage()">呼叫跑腿</button>
 			<button class="admin-button-com middle blue" v-if="[-1, -2].includes(Number(detailInfo.sendStatus)) && [2].includes(Number(detailInfo.status))" @click.stop="openExpressPage()">重叫跑腿</button>
 			<button class="admin-button-com middle blue" v-if="[-1, -2].includes(Number(detailInfo.sendStatus)) && [2].includes(Number(detailInfo.status))" @click.stop="openExpressPage()">重叫跑腿</button>
-			<button class="admin-button-com middle blue" style="background-color: green;border-color: green;" v-if="detailInfo.status != 1 && detailInfo.status != 5" @click="printOrder(detailInfo)">打印(无价格)</button>
+			<button class="admin-button-com middle blue" style="background-color: green;border-color: green;" v-if="detailInfo.status != 1 && detailInfo.status != 5" @click="printOrder(detailInfo)">无价打印</button>
 
 
 			<template v-for="s in detailInfo.buttonList">
 			<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 middle blue" :class="s.disable === 1?'active':''">
 				<button :key="s.type" @click="clickBtn(s, detailInfo)" v-if="s.show == 1" :disabled="s.disable === 1" class="admin-button-com middle blue" :class="s.disable === 1?'active':''">