零售优化

hdApp/src/admin/billing/affirm.vue

@@ -57,26 +57,32 @@
 						<view class="tui-input" v-if="clientInfo.id" @click="showCustomer = true">{{ clientInfo.name }}</view>
 						<view class="tui-placeholder" style="width: 100%" v-else @click="showCustomer = true">请选择客户</view>
 					</tui-list-cell>
+
+					<tui-list-cell class="line-cell" :hover="false" :arrow="false">
+						<view class="tui-title ">付款方式</view>
+						<button class="admin-button-com mini-btn" :class="payType==res.id?'blue':'default'" style="margin-right: 10rpx"
+														@tap="payType=res.id"  v-for="(res,i) in getDictionariesInfo.htPayWayOption" :key="i">
+							{{ res.name }}
+						</button>
+					</tui-list-cell>
+
 					<tui-list-cell class="line-cell" :hover="false" :arrow="false" >
 						<view class="tui-title ">包装费</view>
 						<input type="number" placeholder="请填写人工和材料费" @input="countAllPrices()" v-model="packingMoney" placeholder-class="tui-placeholder">
 					</tui-list-cell>
+
+					<!--
 					<tui-list-cell class="line-cell" :hover="false" :arrow="false">
 						<view class="tui-title ">送货</view>
 						<button @tap="sendType=1" class="admin-button-com mini-btn" :class="sendType==1?'blue':'default'">自取</button>
 						<button @tap="sendType=0" class="admin-button-com mini-btn" :class="sendType==0?'blue':'default'">配送</button>
 					</tui-list-cell>
-					<tui-list-cell v-if="sendType == 0" class="line-cell" :hover="false" :arrow="false" >
+					-->
+
+					<tui-list-cell class="line-cell" :hover="false" :arrow="false" >
 						<view class="tui-title ">运费</view>
 						<input type="number" placeholder="选填" v-model="freight" @input="countAllPrices()" placeholder-class="tui-placeholder">
 					</tui-list-cell>
-					<tui-list-cell class="line-cell" :hover="false" :arrow="false">
-						<view class="tui-title ">结算方式</view>
-						<button class="admin-button-com mini-btn" :class="payType==res.id?'blue':'default'" style="margin-right: 10rpx"
-														@tap="payType=res.id"  v-for="(res,i) in getDictionariesInfo.htPayWayOption" :key="i">
-							{{ res.name }}
-						</button>
-					</tui-list-cell>
 
 					<tui-list-cell class="line-cell" :hover="false" :arrow="false" >
 						<view class="tui-title">总金额</view>

hdApp/src/admin/billing/affirmGoods.vue

@@ -52,27 +52,30 @@
 					<tui-list-cell class="line-cell" :hover="false" :arrow="true" @click="showCustomer = true">
 						<view class="tui-title ">客户</view>
 						<view class="tui-input" v-if="clientInfo.id">{{ clientInfo.name }}</view>
-						<view class="tui-placeholder" style="width: 100%" v-else >请选择客户</view>
+						<view class="tui-placeholder" style="width: 100%" v-else >选填</view>
 					</tui-list-cell>
 
+					<tui-list-cell class="line-cell" :hover="false" :arrow="false">
+						<view class="tui-title ">付款方式</view>
+						<button class="admin-button-com mini-btn" :class="payType==res.id?'blue':'default'" style="margin-right: 10rpx"
+														@tap="payType=res.id"  v-for="(res,i) in getDictionariesInfo.htPayWayOption" :key="i">
+							{{ res.name }}
+						</button>
+					</tui-list-cell>
+
+					<!--
 					<tui-list-cell class="line-cell" :hover="false" :arrow="false">
 						<view class="tui-title ">送货</view>
 						<button @tap="sendType=1,freight=0,countAllPrices()" class="admin-button-com mini-btn" :class="sendType==1?'blue':'default'">自取</button>
 						<button @tap="sendType=0,freight=0" class="admin-button-com mini-btn" :class="sendType==0?'blue':'default'">配送</button>
 					</tui-list-cell>
+					-->
 
-					<tui-list-cell v-if="sendType == 0" class="line-cell" :hover="false" :arrow="false" >
+					<tui-list-cell class="line-cell" :hover="false" :arrow="false" >
 						<view class="tui-title ">运费</view>
 						<input type="number" placeholder="留空免运费" v-model="freight" @input="countAllPrices()" placeholder-class="tui-placeholder">
 					</tui-list-cell>
 
-					<tui-list-cell class="line-cell" :hover="false" :arrow="false">
-						<view class="tui-title ">付款方式</view>
-						<button class="admin-button-com mini-btn" :class="payType==res.id?'blue':'default'" style="margin-right: 10rpx"
-														@tap="payType=res.id"  v-for="(res,i) in getDictionariesInfo.htPayWayOption" :key="i">
-							{{ res.name }}
-						</button>
-					</tui-list-cell>
 					<tui-list-cell class="line-cell" :hover="false" :arrow="false" >
 						<view class="tui-title">总金额</view>
 						<text style="color: #3385FF" >{{	(Number(freight)+Number(allGoodsPrice)).toFixed(2)  }}</text>

hdApp/src/admin/home/order.vue

@@ -43,10 +43,6 @@
 
             <div class="list-button">
 
-              <div class="admin-button-com" @click.stop>打印</div>
-              <div class="admin-button-com default" @click.stop>收花人</div>
-              <div class="admin-button-com" @click.stop>收花人</div>
-
               <template v-if="item.status == 0">
                 <div
                   class="admin-button-com default"