创建优惠吗添加开始时间

src/component/Administrator/coupons/addAllUser.vue

@@ -79,12 +79,23 @@
 			style="width: 220px"
 		  />
 		</div>
+		<div class="admin_state_item">
+		  <!-- <div class="admin_state_item" > -->
+		  <span>Start Time: <span>*</span></span>
+		  <a-space direction="vertical" style="width: 220px">
+			<a-date-picker
+			  v-model:value="startTime"
+			  :disabled="title != 'Add'"
+			  style="width: 220px"
+			/>
+		  </a-space>
+		</div>
 		<div class="admin_state_item">
 		  <!-- <div class="admin_state_item" > -->
 		  <span>End Time: <span>*</span></span>
 		  <a-space direction="vertical" style="width: 220px">
 			<a-date-picker
-            v-model:value="rangePickerValue"
+			  v-model:value="endTime"
 			  :disabled="title != 'Add'"
 			  style="width: 220px"
 			/>
@@ -156,7 +167,8 @@ export default defineComponent({
 		title: "",
 	  });
 	  let operationsData = reactive({
-      rangePickerValue: "",
+		endTime: "",
+		startTime: "",
 		percentOff: "",
 		commissionRate: "",
 		maxRedemptions: "",
@@ -178,12 +190,28 @@ export default defineComponent({
 		  operationsData.cooperator = data.cooperator;
 		  operationsData.paidCommission = data.paidCommission;
 		  operationsData.remark = data.remark;
-        operationsData.rangePickerValue = dayjs(
+		  operationsData.endTime = dayjs(
-          new Date(data.redeemBy * 1000).toISOString().split("T")[0],
+			new Date(data.redeemBy * 1000).toLocaleDateString('zh-CN', {
+				year: 'numeric',
+				month: '2-digit',
+				day: '2-digit'
+			}).replace(/\//g, '/'),
 			"YYYY/MM/DD"
 		  );
-
+		   // 确保格式一致
-        // operationsData.rangePickerValue='2024-08-05T00:00:06'
+		//   operationsData.startTime = dayjs(
+		// 	new Date(data.startTime * 1000).toISOString().split("T")[0],
+		// 	"YYYY/MM/DD"
+		//   );
+		  operationsData.startTime = dayjs(
+			new Date(data.startTime * 1000).toLocaleDateString('zh-CN', {
+				year: 'numeric',
+				month: '2-digit',
+				day: '2-digit'
+			}).replace(/\//g, '/'),
+			"YYYY/MM/DD"
+		  );
+		  // operationsData.endTime='2024-08-05T00:00:06'
 		  // operationsData.validEndTime='2024-08-05T00:00:06'
 		  // operationsData.commissionRate = data.commissionRate
 		  // operationsData.maxRedemptions = data.maxRedemptions
@@ -192,20 +220,23 @@ export default defineComponent({
 		}
 	  };
 	  let setAddData = () => {
-      const timestampMs =
+		const emdTimeMs =
-        new Date(operationsData.rangePickerValue).getTime() / 1000; // 直接获取毫秒时间戳
+		  new Date(operationsData.endTime).getTime() / 1000; // 直接获取毫秒时间戳
+		const startTimeMs =
+		  new Date(operationsData.startTime).getTime() / 1000; // 直接获取毫秒时间戳
 		return {
 		  percentOff: operationsData.percentOff,
 		  maxRedemptions: operationsData.maxRedemptions,
 		  commissionRate: operationsData.commissionRate,
-        timestamp: timestampMs,
+		  endTime: emdTimeMs,
+		  startTime: startTimeMs,
 		  cooperator: operationsData.cooperator,
 		  remark: operationsData.remark,
 		};
 	  };
 	  let setEditData = () => {
 		const timestampMs =
-        new Date(operationsData.rangePickerValue).getTime() / 1000; // 直接获取毫秒时间戳
+		  new Date(operationsData.endTime).getTime() / 1000; // 直接获取毫秒时间戳
 		return {
 		  id: operationsData.id,
 		  paidCommission: operationsData.commissionRate,
@@ -214,7 +245,8 @@ export default defineComponent({
 		};
 	  };
 	  let cancelDsign = () => {
-      operationsData.rangePickerValue = "";
+		operationsData.endTime = "";
+		operationsData.startTime = "";
 		operationsData.percentOff = "";
 		operationsData.commissionRate = "";
 		operationsData.maxRedemptions = "";
@@ -228,7 +260,7 @@ export default defineComponent({
 		let data;
 		if (operations.title == "Add") {
 		  data = setAddData();
-        if (!data.commissionRate || !data.timestamp || !data.percentOff)
+		  if (!data.commissionRate || !data.startTime || !data.percentOff || !data.endTime)
 			return message.warning("Please check the input box marked with *");
 		  Https.axiosPost(Https.httpUrls.createCoupon, data).then((rv) => {
 			if (rv) {
@@ -296,3 +328,4 @@ export default defineComponent({
 	}
   }
   </style>
+  

src/component/Detail/DesignDetail.vue

@@ -299,7 +299,11 @@ export default defineComponent({
 				// ]	
 				let isCurrent = list[i].id == detailData?.selectDetail?.id
 				console.log(isCurrent,newData)
-				let color = (detailData.currentDetailType == 'color' && isCurrent)?(newData?.rgba?.r?`${newData.rgba.r} ${newData.rgba.g} ${newData.rgba.b}`:''):(list[i].color?.rgba?.r?`${list[i].color.rgba.r} ${list[i].color.rgba.g} ${list[i].color.rgba.b}`:'')
+				let color = (detailData.currentDetailType == 'color' && isCurrent && !detailData.isEditPattern.value)?
+				(newData?.rgba?.r?`${newData.rgba.r} ${newData.rgba.g} ${newData.rgba.b}`:''):
+				(list[i].color?.rgba?.r?
+				`${list[i].color.rgba.r} ${list[i].color.rgba.g} ${list[i].color.rgba.b}`:
+				'')
 				if(detailData.currentDetailType == 'sketch' && newData){
 					color = detailData.designDetail.clothes[0].color?.rgba?.r?`${detailData.designDetail.clothes[0].color.rgba.r} ${detailData.designDetail.clothes[0].color.rgba.g} ${detailData.designDetail.clothes[0].color.rgba.b}`:''
 					detailData.selectDetail.maskUrl = ''
@@ -308,8 +312,8 @@ export default defineComponent({
 				let data:any = {
 					changed:false,
 					color,
-					designType:(newData && detailData.currentDetailType == 'sketch' && isCurrent)?newData.designType:list[i].designType,
+					designType:(newData && detailData.currentDetailType == 'sketch' && isCurrent && !detailData.isEditPattern.value)?newData.designType:list[i].designType,
-					id:(newData && detailData.currentDetailType == 'sketch' && isCurrent)?newData.id:list[i].id,
+					id:(newData && detailData.currentDetailType == 'sketch' && isCurrent && !detailData.isEditPattern.value)?newData.id:list[i].id,
 					maskMinioUrl:(newData && detailData.currentDetailType == 'sketch')?'':list[i]?.maskMinioUrl,
 					// maskUrl:'',
 					maskUrl:(newData && detailData.currentDetailType == 'sketch')?'':list[i]?.maskUrl,
@@ -320,19 +324,19 @@ export default defineComponent({
 					offset,
 					partialDesign:list[i].partialDesign || {},
 					// partialDesign:detailData.isEditPattern.value?list[i].partialDesign:{},
-					path:(newData && detailData.currentDetailType == 'sketch' && isCurrent)?newData.minIOPath:list[i].minIOPath,
+					path:(newData && detailData.currentDetailType == 'sketch' && isCurrent && !detailData.isEditPattern.value)?newData.minIOPath:list[i].minIOPath,
-					printObject:(newData && detailData.currentDetailType == 'print' && isCurrent)?{prints:newData}:list[i].printObject?list[i].printObject:{prints:[]},
+					printObject:(newData && detailData.currentDetailType == 'print' && isCurrent && !detailData.isEditPattern.value)?{prints:newData}:list[i].printObject?list[i].printObject:{prints:[]},
 					priority,
 					// scale:[
                     //                 0.5,
                     //                 0.35822305
                     //             ],
 					scale:[scale[0]?scale[0]:1,scale[1]?scale[1]:1],
-					type:(newData && detailData.currentDetailType == 'sketch' && isCurrent)?newData.level2Type || newData.categoryValue:list[i].type,
+					type:(newData && detailData.currentDetailType == 'sketch' && isCurrent && !detailData.isEditPattern.value)?newData.level2Type || newData.categoryValue:list[i].type,
 					sketchString:list[i].sketchString?list[i].sketchString:'',
-					trims:(newData && detailData.currentDetailType == 'element' && isCurrent)?{prints:newData}:list[i].trims?.prints?list[i].trims:{prints:[]},
+					trims:(newData && detailData.currentDetailType == 'element' && isCurrent && !detailData.isEditPattern.value)?{prints:newData}:list[i].trims?.prints?list[i].trims:{prints:[]},
 				}
-				if((list[i].color?.gradient || list[i].newDetail?.color?.gradient)){
+				if((list[i].color?.gradient || list[i].newDetail?.color?.gradient) && !detailData.isEditPattern.value){
 					gradient = list[i].newDetail?.color?.gradient || list[i].color.gradient
 					gradient.colorImg = await setGradual(gradient,320,700)
 					data.gradient = gradient
@@ -388,7 +392,7 @@ export default defineComponent({
 				designSingleItemDTOList:clothes,
 				isPreview:false,
 				// ifSubmit:designItemDetail.isPreview,
-				gender:workspace?.sex == 'Male'?1:0,
+				gender:workspace?.sex,
 				sketchString:'',
 				modelId:(detailData.currentDetailType == 'models' && detailData.designDetail.newModel)?detailData.designDetail.newModel.id:detailData.designDetail.oldModel?detailData.designDetail.oldModel.id:'',
 				modelType:(detailData.currentDetailType == 'models' && detailData.designDetail.newModel)?detailData.designDetail.newModel.type:detailData.designDetail.oldModel?detailData.designDetail.oldModel.type:'',