优化

ghsApp/src/admin/billing/affirm.vue

@@ -154,7 +154,7 @@
             <view class="tui-title">付款方式</view>
             <button @click="form.hasPay = 2" class="admin-button-com middle" :class="form.hasPay == 2 ? 'blue' : 'default'">赊账</button>
             <button @click="form.hasPay = 0" class="admin-button-com middle" :class="form.hasPay == 0 ? 'blue' : 'default'">扫码付</button>
-            <button @tap="form.hasPay = 1" class="admin-button-com middle" :class="form.hasPay == 1 ? 'blue' : 'default'">线下付</button>
+            <button @tap="form.hasPay = 1" class="admin-button-com middle" :class="form.hasPay == 1 ? 'blue' : 'default'">线下</button>
           </tui-list-cell>
 
           <tui-list-cell class="line-cell" :arrow="true" v-if="form.hasPay == 1">

ghsApp/src/admin/billing/result.vue

@@ -16,24 +16,11 @@
   <button v-if="option.title != '报损成功'" class="admin-button-com big" @click="printOrder()">打印(无价格)</button>
 	<button class="admin-button-com big" @click="goBackHome">返回首页</button>
 
-  <view style="margin-top:50upx;">
-    <block v-for="(item, index) in detailInfo.product" :key="index">
-      <view style="text-align:center;margin-bottom:10upx;">
-        <text style="font-size:30upx;">
-        {{item.name}}
-        <text v-if="item.giveNum && Number(item.giveNum)>0" style="color:green;">，已赠{{item.giveNum}}{{item.xhUnitName}}</text>
-        </text>
-        <view v-if="item.xhUnitType == 1" style="width:100%;">
-          <button class="admin-button-com middle" style="width:180upx;margin:10upx 0 0 0;" @click="partOne(item)">拆1扎</button>
-          <button class="admin-button-com middle blue" style="width:180upx;margin:10upx 0 0 20upx;" @click="subHalf(item)">减半扎</button>
-        </view>
-        <view v-else style="width:100%;">
-          <button class="admin-button-com middle" style="width:180upx;margin:10upx 0 0 0;" @click="giveItemFn(item)">赠送</button>
-          <button class="admin-button-com middle blue" style="width:180upx;margin:10upx 0 0 20upx;" @click="subHalf(item)">减半扎</button>
-        </view>
-      </view>
-    </block>
-  </view>
+  <!-- #ifdef MP-WEIXIN -->
+  <view style="width:688upx;height:20upx;background-color: #ece5e5;"></view>
+  <ad-custom unit-id="adunit-42a99bd9e25e3626" style="width:688upx;"></ad-custom>
+  <view style="width:688upx;height:20upx;background-color: #ece5e5;"></view>
+  <!-- #endif -->
 
   <modal-module :show="givePopShow" @click="confirmGive" :maskClosable="true" title="数量" padding="30rpx 30rpx" >
   <template v-slot:content>

ghsApp/src/pagesOrder/detail.vue

@@ -166,7 +166,7 @@
 					<view>累计退款：</view>
 					<view style="color:red;font-weight:bold;font-size:30upx;">{{parseFloat(detailInfo.tkPrice)}}</view>
 					<view class="price" v-if="detailInfo.refundLog==1">
-						<button @click="pageTo({url: '/pagesOrder/refundList',query: {orderSn: detailInfo.orderSn}})" style="color:red;" class="admin-button-com">售后记录</button>
+						<button @click="pageTo({url: '/pagesOrder/refundList',query: {orderSn: detailInfo.orderSn}})" style="color:red;border: 1upx solid red;" class="admin-button-com">售后记录</button>
 					</view>
 				</view>
 				<view v-if="detailInfo.refundLog == 1" class="order-info_box">

ghsApp/src/pagesOrder/refund.vue

@@ -24,7 +24,6 @@
 					<input type="number" placeholder="退货数" v-model="res.refundCount" placeholder-style="color:#CCCCCC" style="height:60upx;width:160upx;" />
 					<text style="margin-left:10upx;">{{res.xhUnitName}}</text>
 					<text style="color:green;margin-left:20upx;">可退{{Number(res.xhNum)-Number(res.refundNum)}}{{res.xhUnitName}}</text>
-					<button class="admin-button-com mini-btn" @click="addHalf(res)" v-if="res.xhUnitType == 1" style="margin-left:10upx;">退半扎</button>
 				</view>
 			</view>
 			</view>