Merge remote-tracking branch 'origin/master'

hdApp/src/admin/shop/list.vue

@@ -12,25 +12,14 @@
 								<span class="staff-name">{{ item.shopName }}</span>
 								<span>{{ item.telephone }}</span>
 							</div>
-							<!--<div class="flex-center">-->
-								<!--<div class="status-list">-->
-									<!--<span class v-if="item.gatheringCode" @click="downQrCodeFn(item, index)">收款码下载</span>-->
-									<!--<span v-else></span>-->
-								<!--</div>-->
-								<!--<div class="status-list">-->
-									<!--<span class v-if="item.gatheringCode" @click="downMemberCodeFn(item, index)">会员码下载</span>-->
-									<!--<span v-else></span>-->
-								<!--</div>-->
-							<!--</div>-->
 						</div>
 						<div class="list-det-right">
 							<navigator :url="`/admin/shop/downloadCode?id=${item.id}`">
-									<image style="width: 40rpx;height: 40rpx;" :src="`${constant.imgUrl}/shop/gathering_icon.png`"></image>
+									<image style="width: 50rpx;height: 50rpx;" :src="`${constant.imgUrl}/shop/gathering_icon.png`"></image>
 							</navigator>
 							<div @click="toModiyFn(item)">
 								<i class="iconfont iconbianji"></i>
 							</div>
-							<!-- 删除 -->
 							<!-- <div @click="delModalFn(item)">
 								<i class="iconfont iconshanchu1"></i>
 							</div> -->
@@ -220,7 +209,7 @@
 			.list-det-right {
 				@include disFlex(center, flex-start);
 				& > div {
-					margin-left: 50px;
+					margin-left: 70px;
 					&:first-child {
 						margin-left: 0;
 					}