重复收入问题解决

hdApp/src/admin/cg/code.vue

@@ -8,7 +8,7 @@
     </view>
 
     <view style="text-align: center;font-size:32upx;">
-      收款码是否算收入：<switch style="transform:scale(0.7,0.7)" :checked="gatherRepeat == 0 ? true : false" @change="gatherRepeatChangeFn" />{{ gatherRepeat==0?'是':'否' }}
+      收款码是否算收入：<switch style="transform:scale(0.7,0.7)" :checked="gatherRepeat == 0 ? true : false" @change="gatherRepeatChangeFn" />{{ gatherRepeat==0?'是（没有重复收款）':'否（属于重复收款）' }}
     </view>
 
   </view>

hdApp/src/admin/home/components/order-item.vue

@@ -5,7 +5,7 @@
 				<view class="image">
 					<image :src="info.cover" mode="aspectFit"></image>
 				</view>
-				<image class="scan-icon" v-if="info.repeat == 1 && info.payStatus == 1" :src="`${constant.imgUrl}/gathering/scan.jpg`" mode="aspectFit"></image>
+				<image class="scan-icon" v-if="info.repeat == 1 && info.payStatus == 1" :src="`${constant.imgUrl}/gathering/scan2.jpg`" mode="aspectFit"></image>
 				<view class="list-msg">
 					<view><text>客户：</text><text>{{info.customName||''}}</text></view>
 					<view style="margin-top:3upx;"><text>配送：</text>
@@ -75,10 +75,10 @@ export default {
 		}
 		.scan-icon{
 			position: absolute;
-			width:130upx;
-			height:130upx;
+			width:170upx;
+			height:170upx;
 			top:80upx;
-			left:390upx;
+			left:320upx;
 		}
 		.list-msg {
 			color:#999999;

hdApp/src/admin/home/order.vue

@@ -40,15 +40,31 @@
           本客户共有{{item.sameTimeIdsNum?item.sameTimeIdsNum:0}}个订单，可合并发货
         </view>
             <view class="list-button">
-              <view class="admin-button-com middle" v-if="item.status == 2" @click.stop="">扣库存</view>
+
+              <block v-if="item.payStatus == 1 && item.repeat == 1">
+                <view class="admin-button-com middle" @click.stop="reduceStock(item)">扣库存</view>
+              </block>
+              <block v-else>
+                <view class="admin-button-com middle default" v-if="item.payStatus == 1 && item.repeat == 0" @click.stop="setRepeat(item)">转重复</view>
+                <view class="admin-button-com middle default" @click.stop="" v-else>扣库存</view>                
+              </block>
+
               <view class="admin-button-com middle" v-if="item.status == 2" @click.stop="sendOrderFn(item)">发货</view>
-              <view class="admin-button-com default" v-else>发货</view>
+              <view class="admin-button-com default" v-else @click.stop="">发货</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 class="admin-button-com middle" v-if="item.sendStatus == '0' && (item.status > 1 && item.status < 4)" @click.stop="openExpressPage(item.id, true)">配送</view>
-              <view class="admin-button-com default" v-if="item.sendStatus == '1' && (item.status > 1 && item.status < 4)" @click.stop="cancelExpress(item.id)" style="background-color: #ff6b6b;">取消配送</view>
-              <view class="admin-button-com middle" v-if="item.sendStatus == '3' && (item.status > 1 && item.status < 4)" @click.stop="openExpressPage(item.id, false)">重新配送</view>
-              <view class="admin-button-com middle" v-if="item.sendStatus == '2' && item.status == 4" @click.stop="selectExpress(item.id)">配送成功</view>
+              <view class="admin-button-com default" v-else @click.stop="">打印</view>
+
+              <block v-if="item.payStatus == 0">
+                <view class="admin-button-com middle" @click.stop="">呼叫跑腿</view>
+              </block>
+              <block v-else>
+                <view class="admin-button-com middle" v-if="item.sendStatus == '0' && item.payStatus == 1" @click.stop="openExpressPage(item.id, true)">呼叫跑腿</view>
+                <view class="admin-button-com default" v-if="item.sendStatus == '1' && item.payStatus == 1" @click.stop="cancelExpress(item.id)" style="background-color: #ff6b6b;">取消跑腿</view>
+                <view class="admin-button-com middle" v-if="item.sendStatus == '3' && item.payStatus == 1" @click.stop="openExpressPage(item.id, false)">重叫跑腿</view>
+                <view class="admin-button-com middle" v-if="item.sendStatus == '2' && item.payStatus == 1" @click.stop="selectExpress(item.id)">跑腿完成</view>
+              </block>
+
             </view>
           </view>
         </view>
@@ -162,6 +178,12 @@ export default {
       this.resetList();
       this.searchText = e;
       this.getOrderList()
+    },
+    reduceStock(item){
+
+    },
+    setRepeat(item){
+
     },
     sendOrderFn(item){
       let that = this
@@ -317,7 +339,7 @@ export default {
           justify-content: flex-end;
           flex-wrap: nowrap;
           .admin-button-com {
-            margin-left: 20upx;
+            margin-left: 30upx;
             padding: 16upx 20upx;
             white-space: nowrap;
           }