shish 7 месяцев назад
Родитель
Сommit
7712f0e4b7

+ 6 - 0
ghsApp/src/admin/delivery/allDelivery.vue

@@ -223,6 +223,12 @@ export default {
       this.loadOrderData();
       this.handleLoadDelivery();
     }
+
+		//返回订单列表页不需要刷新
+		let pages = getCurrentPages();
+		let prevPage = pages[ pages.length - 2 ];
+		prevPage.$vm.fromDetail = {status:1}
+
   },
   created() {
       if (this.deliveryList.length > 0 && !this.selectedDelivery) {

+ 16 - 8
ghsApp/src/pagesOrder/detail.vue

@@ -7,7 +7,7 @@
 			<view class="address-des_bx content-box">
 				<view @click.stop="goCustom(detailInfo)">
 					<view style="overflow:hidden;text-overflow:ellipsis;white-space: nowrap;width:450upx;"> {{ detailInfo.customName }} {{ detailInfo.customMobile }}</view>
-					<view style="margin-bottom:20upx;color:#333333;padding:10upx 0 20upx 0;">店长 {{ detailInfo.customSuper.name||''}}</view>
+					<view style="margin-bottom:20upx;color:#333333;padding:10upx 0 28upx 0;">店长 {{ detailInfo.customSuper.name||''}}</view>
 					<view style="margin-bottom:15upx;color:black;">{{ detailInfo.customAddress}}</view>
 					<view v-if="!$util.isEmpty(detailInfo.showAddress) && detailInfo.showAddress != detailInfo.customAddress" style="color:#656363;">{{detailInfo.showAddress}}</view>
 				</view>
@@ -17,8 +17,8 @@
 						<i @click.stop="navigateTo(detailInfo.lat,detailInfo.long,detailInfo.customName)" class="iconfont icondianhua"></i>
 					</view>
 				</view>
-				<button class="admin-button-com bule middle copy-address" style="position: absolute;top:90upx;right:28upx;" @click.stop="copyCustom(detailInfo)">复制地址</button>
-				<button class="admin-button-com default middle" style="position: absolute;top:90upx;right:210upx;" @click.stop="modifyAddress(detailInfo)">修改地址</button>
+				<button class="admin-button-com bule middle copy-address" style="position: absolute;top:98upx;right:28upx;" @click.stop="copyCustom(detailInfo)">复制地址</button>
+				<button class="admin-button-com default middle" style="position: absolute;top:98upx;right:210upx;" @click.stop="modifyAddress(detailInfo)">修改地址</button>
 			</view>
 
 			<view class="flex-space title" v-if="Number(detailInfo.sendStatus)>-4">
@@ -320,14 +320,14 @@
 					<tui-list-cell class="line-cell" :hover="false">
 						<div class="tui-title">备注</div>
 						<div class="remark-content-wrapper">
-							<div class="remark-text">{{ detailInfo.remark }}</div>
+							<div class="remark-text" @click.stop="copyRemark(detailInfo.remark)">{{ detailInfo.remark }}</div>
 							<div class="remark-actions">
-								<div class="action-btn" @click.stop="beginModify(detailInfo.remark)" title="修改备注">
-									✏️
-								</div>
 								<div class="action-btn" @click.stop="copyRemark(detailInfo.remark)" title="复制备注">
 									📋
 								</div>
+								<div class="action-btn" @click.stop="beginModify(detailInfo.remark)" title="修改备注">
+									<i class="iconfont iconbianji"></i>
+								</div>
 							</div>
 						</div>
 					</tui-list-cell>
@@ -2023,7 +2023,7 @@ export default {
   .remark-actions {
     display: flex;
     align-items: center;
-    gap: 15upx;
+    gap: 30upx;
     
     .action-btn {
       display: flex;
@@ -2038,6 +2038,14 @@ export default {
       transition: all 0.2s ease;
       cursor: pointer;
       
+      i {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        font-size: 32upx;
+        line-height: 1;
+      }
+      
       &:hover {
         background-color: #e9ecef;
         transform: scale(1.05);

+ 6 - 0
hdApp/src/admin/delivery/allDelivery.vue

@@ -220,6 +220,12 @@ export default {
       this.loadOrderData();
       this.handleLoadDelivery();
     }
+
+    //返回订单列表页时不需要刷新
+    let pages = getCurrentPages();
+    let prevPage = pages[pages.length - 2];
+    prevPage.$vm.refreshPage = 0
+
   },
   created() {
       if (this.deliveryList.length > 0 && !this.selectedDelivery) {