Merge branch 'wq' into 'master'

Wq

See merge request !2

src/views/order/ProductInfo.vue

@@ -102,17 +102,17 @@
         </span>
       </div>
       <div
-        :title="item.remark || ''"
+        :title="(item as InterItem).remark || ''"
         class="order-list-expand_item_info_title"
       >
         <span class="order-list-expand_item_label">备注:</span>
         <span class="order-list-expand_item_value"
-          >{{ item.remark || '--' }}
+          >{{ (item as InterItem).remark || '--' }}
         </span>
         <el-icon
           class="icon"
           style="color: #e6a23c"
-          @click="setRemarks(item.id, item.remark)"
+          @click="setRemarks(item.id, (item as InterItem).remark||'')"
           ><EditPen
         /></el-icon>
       </div>
@@ -196,6 +196,11 @@ defineProps({
     type: Number,
   },
 })
+interface InterItem {
+  id: number;
+  remark?: string; // 可选属性
+  [propName: string]: string | number | boolean | undefined | unknown; // 额外属性
+}
 const emit = defineEmits<{
       (e: 'update-remark', payload: { id: number; remark: string }): void;
     }>();