shish 10 месяцев назад
Родитель
Сommit
05120429f2
2 измененных файлов с 58 добавлено и 14 удалено
  1. 3 2
      ghsApp/src/admin/home/components/OrderItem.vue
  2. 55 12
      ghsApp/src/pagesOrder/detail.vue

+ 3 - 2
ghsApp/src/admin/home/components/OrderItem.vue

@@ -104,8 +104,8 @@
           </view>
         </view>
         <view class="order-info_box" v-if="!$util.isEmpty(item.remark)">
-          <view class="remark-label">备注:</view>
-          <view class="remark-text">{{ item.remark }}</view>
+          <view class="remark-label" style="color:red;">备注:</view>
+          <view class="remark-text" style="color:red;">{{ item.remark }}</view>
         </view>
         <view
           v-if="item.sameTimeIdsNum && item.sameTimeIdsNum > 1"
@@ -155,6 +155,7 @@
         <block v-else-if="item.sendStatus == 3">
           <view class="text-center"><button class="admin-button-com" @click="callIntraCity(item)">重叫跑腿</button></view>
         </block>
+        <view class="text-center"><button class="admin-button-com" @click="">修改备注</button></view>
         <view class="text-center"><button class="admin-button-com" @click="addExpress(item)">顺丰下单</button></view>
         <view class="text-center"><button class="admin-button-com" @click="cancelExpress(item)">取消顺丰订单</button></view>
         <view class="text-center"><button class="admin-button-com" @click="fillNoFh(item)">填单发货</button></view>

+ 55 - 12
ghsApp/src/pagesOrder/detail.vue

@@ -300,12 +300,19 @@
 			</view>
 
 			<view class="content-box price-detail">
-				<div class="module-com input-line-wrap" @click="dealRemark(detailInfo.remark)">
+				<div class="module-com input-line-wrap">
 					<tui-list-cell class="line-cell" :hover="false">
 						<div class="tui-title">备注</div>
-						<div>
-							{{ detailInfo.remark }}
-							<i class="iconfont iconbianji" style="font-size:25upx;margin-left:20upx;"></i>
+						<div class="remark-content-wrapper">
+							<div class="remark-text">{{ 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>
 						</div>
 					</tui-list-cell>
 				</div>
@@ -792,14 +799,6 @@ export default {
 			this.modifyRemarkText = val
 			this.$refs.modifyRemarkRef.open('center')
 		},
-		dealRemark(val){
-			let that = this
-			that.$util.confirmModal({content:'请选择操作项',okText:'修改',cancelText:'复制',cacelTextColor:'#38ADFF',okTextColor:'#37863a'},() => {
-				that.beginModify(val)
-			},()=>{
-				that.copyRemark(val)
-			})
-		},
 		backBefore(){
 			//返回上一页带参数
 			let pages = getCurrentPages();
@@ -1677,4 +1676,48 @@ export default {
     }
   }
 }
+
+// 备注区域样式
+.remark-content-wrapper {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  width: 100%;
+  
+  .remark-text {
+    flex: 1;
+    margin-right: 20upx;
+    word-break: break-all;
+  }
+  
+  .remark-actions {
+    display: flex;
+    align-items: center;
+    gap: 15upx;
+    
+    .action-btn {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      width: 60upx;
+      height: 60upx;
+      font-size: 32upx;
+      border-radius: 8upx;
+      background-color: #f8f9fa;
+      border: 1px solid #e9ecef;
+      transition: all 0.2s ease;
+      cursor: pointer;
+      
+      &:hover {
+        background-color: #e9ecef;
+        transform: scale(1.05);
+      }
+      
+      &:active {
+        transform: scale(0.95);
+        background-color: #dee2e6;
+      }
+    }
+  }
+}
 </style>