修改邮箱添加用户id

src/component/Account/account.vue

@@ -50,10 +50,10 @@
 									<div v-if="!isEditEmail">{{ userDetail.email }}</div>
 									<input v-else type="text" :value="editEmail">
 								</div>
-								<!-- <div class="icon">
+								<div class="icon">
 									<i v-if="!isEditEmail" class="fi fi-rr-edit" @click="openEdit('email')"></i>
 									<i v-else class="fi fi-br-check" @click="editChek('email')"></i>
-								</div> -->
+								</div>
 							</div>
 						</div>
 						<div class="content_item_user_left_detail_bottom">

src/component/Administrator/coupons/addAllUser.vue

@@ -78,13 +78,24 @@
           type="text"
           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,17 @@ 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],
           "YYYY/MM/DD"
         );
+		operationsData.startTime = dayjs(
+          new Date(data.startTime * 1000).toISOString().split("T")[0],
+          "YYYY/MM/DD"
+        );
+		console.log(data)
 
-        // operationsData.rangePickerValue='2024-08-05T00:00:06'
+        // operationsData.endTime='2024-08-05T00:00:06'
         // operationsData.validEndTime='2024-08-05T00:00:06'
         // operationsData.commissionRate = data.commissionRate
         // operationsData.maxRedemptions = data.maxRedemptions
@@ -192,20 +209,23 @@ export default defineComponent({
       }
     };
     let setAddData = () => {
-      const timestampMs =
-        new Date(operationsData.rangePickerValue).getTime() / 1000; // 直接获取毫秒时间戳
+      const emdTimeMs =
+        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 +234,8 @@ export default defineComponent({
       };
     };
     let cancelDsign = () => {
-      operationsData.rangePickerValue = "";
+      operationsData.endTime = "";
+      operationsData.startTime = "";
       operationsData.percentOff = "";
       operationsData.commissionRate = "";
       operationsData.maxRedemptions = "";
@@ -228,7 +249,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) {

src/component/HomePage/bindEmail.vue

@@ -365,6 +365,7 @@ export default defineComponent({
 					title:this.selectSex,
 					surname:this.surname,
 					givenName:this.givenName,
+					userId:this.userDetail.userId,
 				};
 				if(this.loginTime){
 					this.loginTime = false

src/component/home/design/index.vue

@@ -1818,7 +1818,19 @@ export default defineComponent({
 		},
 
 		getSkecthBoard(boardData: any) {
+			console.log(boardData,this.store.state.Workspace.probjects)
 			boardData = boardData || []
+			const mapB = new Map();
+			boardData.forEach(item => {
+				if (item.categoryValue !== undefined) {
+					mapB.set(item.categoryValue, true);
+				}
+			});
+			
+			boardData.filter(item => 
+				item.categoryValue !== undefined && mapB.has(item.categoryValue)
+			);
+			console.log(boardData)
 			let sketchBoards = boardData.map((v: any) => {
 				let data = {
 					designType: v.resData.designType,

src/component/home/newProject/workspace.vue

@@ -27,11 +27,11 @@
 				<div class="text">{{$t('Habit.Gender')}}:</div>
 				<div class="radio">
 					<label>
-						<input type="radio" :disabled="status == 'edit'" name="gender" v-model="selectObject.sex" value="Female">
+						<input type="radio" name="gender" v-model="selectObject.sex" value="Female">
 						<span>{{$t('Habit.Female')}}</span>
 					</label>
 					<label>
-						<input type="radio" :disabled="status == 'edit'" name="gender" v-model="selectObject.sex" value="Male">
+						<input type="radio" name="gender" v-model="selectObject.sex" value="Male">
 						<span>{{$t('Habit.Male')}}</span>
 					</label>
 				</div>

src/store/homeStore/homeStore.ts

@@ -95,7 +95,6 @@ const HomeStoreModule : Module<DesignDetail,RootState> = {
 			}
         },
 		setUploadElement(state,data){
-			console.log(data)
 			if(data?.isGetModule){
 				state.uploadElement = []
 			}

src/views/Administrator.vue

@@ -4,7 +4,7 @@
 			<div class="administrator_title ">
 				<div class="modal_title_text" @click="setBack">
 					<i class="fi fi-sr-left"></i>
-					<div class="modal_title_intro administrator_title_text">{{ $t('upgradePlan.Back') }}Back</div>
+					<div class="modal_title_intro administrator_title_text">{{ $t('upgradePlan.Back') }}</div>
 				</div>
 			</div>
 			<div class="modal_title_text">{{ $t('Header.Administrator') }}</div>