配置外网部署文件

docker/docker-extranet-compose-build.yml

+version: '3'
+services:
+  yongxinda-h5:
+    build:
+      context: ../
+    image: dockerprivatestorage:80/yongxinda-h5
\ No newline at end of file

docker/docker-extranet.sh

+
+
+cd ../
+yarn install
+yarn run build:h5
+
+cd docker
+docker-compose -f docker-extranet-compose-build build
+docker-compose -f docker-extranet-compose-build push
\ No newline at end of file

src/pages/productLine/productLine.vue

@@ -33,15 +33,24 @@
 								:line-color="scope.row?.show ? '#0000f0' : ''"
 								style="margin-left: 20rpx;"
 							>
-								<template
-									v-if="item?.isSubmit || scope.row.isSubmit !== undefined"
-									#right
-								>
+								<template #right>
 									<u-icon
+										v-if="!scope.row.isSubmit && scope.row.deleted"
 										name="error-circle-fill"
 										color="#ff0000"
 										style="margin-right: 4rpx;"
 									/>
+									<u-icon
+										v-if="
+											scope.row.deleted === undefined &&
+											scope.row.isSubmit === undefined
+												? false
+												: !scope.row.isSubmit && !scope.row.deleted
+										"
+										name="error-circle-fill"
+										color="#0055ff"
+										style="margin-right: 4rpx;"
+									/>
 								</template>
 							</u-section>
 							<view v-else class="add">
@@ -233,18 +242,24 @@ let closeSku = (val: string) => {
 			if (lineList.value.length === 2) index = 0;
 			let data = lineList.value[index];
 			lineList.value.splice(index, 1);
+			// 通过购物车产品线进入修改
 			if (lineId.value) {
 				lineEdit.value.productId = data.productId;
 				lineEdit.value.specificationCustom = data.specificationCustom;
 				lineEdit.value.specifications = data.specifications;
 				lineEdit.value.number = data.number;
+				// 当是失效商品需要重新选规格时使用
+				if (lineList.value[editIndex.value.index + 1].hasOwnProperty('deleted'))
+					delete lineList.value[editIndex.value.index + 1].deleted;
+				if (lineList.value[editIndex.value.index + 1].hasOwnProperty('isSubmit'))
+					delete lineList.value[editIndex.value.index + 1].isSubmit;
 				lineList.value.splice(editIndex.value.index, 0, lineEdit.value);
 			} else lineList.value.splice(editIndex.value.index, 0, data);
-			console.log(lineEdit.value);
 		}
 		store.$patch({
 			lineData: lineList.value,
 		});
+		console.log(store.lineData);
 		goodsSkuRef.value.handleClose();
 		editFlag.value = false;
 	} else {
@@ -313,6 +328,7 @@ let sheetCopy = (index: number) => {
 			lineData: lineList.value,
 		});
 	}
+	console.log(store.lineData);
 	nextTick(() => {
 		flag.value = true;
 	});