diff --git a/src/component/Administrator/SE/allUser/index.vue b/src/component/Administrator/SE/allUser/index.vue
index aa5be500..4e3c7489 100644
--- a/src/component/Administrator/SE/allUser/index.vue
+++ b/src/component/Administrator/SE/allUser/index.vue
@@ -1,600 +1,778 @@
 <template>
-  <div class="admin_page all-user">
-    <div class="admin_table_search">
-      <div class="admin_state">
-        <div class="admin_state_item">
-          <span>{{ $t('admin.CreateTime') }}:</span>
-          <a-range-picker
-            style="width: 230px"
-            class="range_picker"
-            v-model:value="rangePickerValue"
-            :placeholder="[$t('HistoryPage.StartDate'), $t('HistoryPage.EndDate')]"
-            valueFormat="YYYY-MM-DD"
-          >
-            <template #suffixIcon>
-              <span class="icon iconfont range_picker_icon icon-rili"></span>
-            </template>
-          </a-range-picker>
-        </div>
-        <!-- <div class="admin_state_item">
-                    <span>Country or Region:</span>
-					<a-select
-                        v-model:value="country"
-						:allowClear="true"
-						show-search
-                        style="width: 230px"
-                        :filter-option="filterOption"
-                        placeholder="Select Item..."
-                        max-tag-count="responsive"
-                        :options="allCountry"
-                    ></a-select>
-                </div> -->
-        <!-- <div class="admin_state_item">
-                    <span>Email:</span>
-                    <input
-                        v-model="email"
-                        placeholder="Please enter email"
-                        @keydown.enter="gettrialList"
-                        type="text"
-                        style="width: 230px"
-                    />
-                </div> -->
-        <div class="admin_state_item">
-          <span>{{ $t('admin.UserName') }}:</span>
-          <a-select
-            v-model:value="ids"
-            mode="multiple"
-            style="width: 230px"
-            :field-names="{ label: 'label', value: 'label' }"
-            :filter-option="filterOption"
-            :placeholder="$t('admin.selectUserName')"
-            max-tag-count="responsive"
-            :options="allUserList"
-            @keydown.enter="gettrialList"
-          ></a-select>
-        </div>
-        <!-- <div class="admin_state_item">
-                    <span>User Type:</span>
-                    <a-select
-                        v-model:value="systemUser"
-                        size="large"
-                        style="width: 230px"
-                        optionFilterProp="label"
-                        :options="state"
-                        placeholder="Please select"
-                        allowClear
-                        show-search
-                    ></a-select>
-                </div> -->
-      </div>
-      <div class="admin_search">
-        <div class="admin_search_item" @click="searchHistoryList">
-          {{ $t('admin.search') }}
-        </div>
-        <div class="admin_search_item" @click="addhHistoryList">
-          {{ $t('admin.add') }}
-        </div>
-        <div
-          class="admin_search_item"
-          style="width: auto; padding: 0 2rem"
-          @click="downloadTemplate"
-        >
-          {{ $t('admin.DownloadTemplate') }}
-        </div>
-        <div
-          class="admin_search_item"
-          style="width: auto; padding: 0 2rem"
-          @click="uploadTemplate"
-        >
-          {{ $t('admin.UploadTemplate') }}
-        </div>
-        <div
-          class="admin_search_item"
-          style="width: auto; padding: 0 2rem"
-          @click="ExportAccountData"
-        >
-          {{ $t('admin.ExportAccountData') }}
-        </div>
-        <div
-          class="admin_search_item"
-          style="width: auto; padding: 0 2rem"
-          @click="deleteList"
-        >
-          {{ $t('admin.Delete') }}
-        </div>
-      </div>
-      <div class="admin_state_list">
-        <div class="admin_state_list_item" @click="lastGeTrialList('year')">
-          {{ $t('admin.NearlyAYear') }}
-        </div>
-        <div class="admin_state_list_item" @click="lastGeTrialList('month')">
-          {{ $t('admin.LastMonth') }}
-        </div>
-        <div class="admin_state_list_item" @click="lastGeTrialList('week')">
-          {{ $t('admin.LastWeek') }}
-        </div>
-      </div>
-    </div>
-    <div class="admin_table_content" ref="historyTable">
-      <a-table
-        @resizeColumn="handleResizeColumn"
-        :loading="tableLoading"
-        :columns="columns"
-        :data-source="dataList"
-        :row-selection="rowSelection"
-        rowKey="id"
-        :scroll="{ y: historyTableHeight }"
-        @change="changePage"
-        :showSorterTooltip="false"
-        :pagination="{
-          showSizeChanger: true,
-          current: currentPage,
-          pageSize: pageSize,
-          total: total,
-          showQuickJumper: true,
-          bordered: false
-        }"
-      >
-        <template #bodyCell="{ column, text, record, index }">
-          <div class="operate_list" v-if="column?.Operations">
-            <div
-              class="operate_item"
-              @click="setAagree(record)"
-              style="margin-right: 2rem"
-            >
-              {{ $t('admin.Edit') }}
-            </div>
-            <div class="operate_item" @click="deleteAagree(record)">
-              {{ $t('admin.Delete') }}
-            </div>
-            <!-- <div
-							class="operate_item"
-							@click="deleteGroup(record, index)"
-						>
-							Delete
-						</div> -->
-          </div>
-        </template>
-      </a-table>
-    </div>
-    <allUserPoerationsVue
-      ref="allUserPoerationsVue"
-      @searchHistoryList="searchHistoryList"
-    ></allUserPoerationsVue>
-  </div>
-</template>
-<script lang="ts">
-import {
-  defineComponent,
-  ref,
-  createVNode,
-  computed,
-  reactive,
-  toRefs,
-  onMounted
-} from 'vue'
-import { formatTime } from '@/tool/util'
-import { useStore } from 'vuex'
-import { Https } from '@/tool/https'
-import { Modal, message } from 'ant-design-vue'
-import { ExclamationCircleOutlined } from '@ant-design/icons-vue'
-import allUserPoerationsVue from './addAllUser.vue'
-import { useI18n } from 'vue-i18n'
-import SelectUser from '@/component/common/SelectUser.vue'
-export default defineComponent({
-  components: { allUserPoerationsVue },
-  setup() {
-    const store: any = useStore()
-    const selectedRowKeys = ref([]) as any
-    const onSelectChange = (changableRowKeys: string[]) => {
-      selectedRowKeys.value = changableRowKeys
-    }
-    let filter: any = reactive({
-      dataList: [],
-      tableLoading: false,
-      allUserList: computed(() => {
-        return store.state.adminPage.allUserList
-      }),
-      allCountry: [],
-      rowSelection: computed(() => {
-        return {
-          selectedRowKeys: unref(selectedRowKeys),
-          onChange: onSelectChange
-        }
-      })
-    })
-    const { t } = useI18n()
-
-    let filterData: any = reactive({
-      rangePickerValue: [],
-      currentPage: 1,
-      pageSize: 10,
-      total: 0,
-      country: '',
-      email: '',
-      userType: '',
-      ids: [],
-      occupation: '',
-      systemUser: '',
-      order: '', //'Ascending  升序 Descending 降序'
-      orderBy: '',
-      userName: ''
-    })
-
-    let renameData: any = ref({}) //修改名字选中的数据
-    const columns: any = computed(() => {
-      return [
-        {
-          title: t('admin.UserId'),
-          align: 'center',
-          dataIndex: 'id',
-          key: 'id',
-          width: 100,
-          fixed: 'left',
-          sorter: true
-        },
-        {
-          title: t('admin.Email'),
-          align: 'center',
-          dataIndex: 'userEmail',
-          key: 'userEmail',
-          width: 200,
-          ellipsis: true
-        },
-        {
-          title: t('admin.UserName'),
-          align: 'center',
-          dataIndex: 'userName',
-          key: 'userName',
-          width: 150,
-          ellipsis: true
-          // customRender: (record: any) => {
-          //     let time = formatTime(
-          //         record.text / 1000,
-          //         "YYYY-MM-DD hh:mm:ss"
-          //     );
-          //     return time;
-          // },
-        },
-        {
-          title: t('admin.language'),
-          align: 'center',
-          dataIndex: 'language',
-          key: 'language',
-          width: 100,
-          ellipsis: true,
-          customRender: (record: any) => {
-            return t(`admin.${record.text}`)
-          }
-        },
-        {
-          title: t('admin.CreateDate'),
-          align: 'center',
-          dataIndex: 'createDate',
-          key: 'createDate',
-          width: 200,
-          sorter: true
-        },
-        {
-          title: t('admin.Credits'),
-          align: 'center',
-          // width: 150,
-          // minWidth: 100,
-          // maxWidth: 200,
-          // resizable: true,
-          dataIndex: 'credits',
-          key: 'credits',
-          width: 100,
-          sorter: true
-        },
-        {
-          title: t('admin.CreditsUsage'),
-          align: 'center',
-          dataIndex: 'creditsUsage',
-          key: 'creditsUsage',
-          width: 150,
-          sorter: true
-        },
-        {
-          title: t('admin.CreditsUsageLimit'),
-          align: 'center',
-          dataIndex: 'creditsUsageLimit',
-          key: 'creditsUsageLimit',
-          width: 200,
-          sorter: true
-        },
-        {
-          title: t('admin.Operations'),
-          key: 'operation',
-          width: 120,
-          align: 'center',
-          fixed: 'right',
-          // slots:{customRender:'action'}
-          Operations: true
-        }
-      ]
-    })
-    //改变页码
-    let changePage = (e: any, filters: any, sorter: any) => {
-      filterData.currentPage = e.current
-      filterData.pageSize = e.pageSize
-      if (sorter.order) {
-        if (sorter.columnKey == 'id') {
-          filterData.orderBy = 'id'
-        } else if (sorter.columnKey == 'createDate') {
-          filterData.orderBy = 'time'
-        } else if (sorter.columnKey == 'credits') {
-          filterData.orderBy = 'credits'
-        }
-      }
-      if (sorter.order) {
-        filterData.order = sorter.order == 'descend' ? 'Descending' : 'Ascending'
-      } else {
-        filterData.order = ''
-      }
-
-      gettrialList()
-    }
-
-    //查询列表
-    let searchHistoryList = () => {
-      filterData.currentPage = 1
-      gettrialList()
-    }
-    let clearHistoryList = () => {
-      ;(filterData.rangePickerValue = []),
-        (filterData.currentPage = 1),
-        (filterData.pageSize = 10),
-        (filterData.total = 0),
-        (filterData.country = ''),
-        (filterData.email = ''),
-        (filterData.userType = ''),
-        (filterData.ids = []),
-        (filterData.occupation = ''),
-        (filterData.order = ''), //'Ascending  升序 Descending 降序'
-        (filterData.orderBy = ''), //'Ascending  升序 Descending 降序'
-        (filterData.systemUser = ''),
-        (filterData.userName = '')
-    }
-    let setHistoryListData = () => {
-      let startDate: any = filterData.rangePickerValue?.[0]
-        ? filterData.rangePickerValue[0] + ' ' + '00:00:00'
-        : ''
-      let endDate: any = filterData.rangePickerValue?.[1]
-        ? filterData.rangePickerValue[1] + ' ' + '23:59:59'
-        : ''
-      let data = {
-        endTime: endDate,
-        startTime: startDate,
-        size: filterData.pageSize,
-        page: filterData.currentPage,
-        systemUser: filterData.systemUser,
-        country: filterData.country,
-        // email: filterData.email.trim(),
-        userType: filterData.userType,
-        ids: [],
-        occupation: filterData.occupation,
-        order: filterData.order,
-        orderBy: filterData.orderBy,
-        // userName: filterData.userName,
-        userName: filterData.ids
-      }
-      return data
-    }
-    //获取列表
-    let gettrialList = () => {
-      filter.tableLoading = true
-      let data = setHistoryListData()
-      Https.axiosPost(Https.httpUrls.subAccountList, data).then((rv: any) => {
-        if (rv) {
-          console.log(rv)
-          // this.dataList = rv
-          filter.dataList = rv.content
-          filterData.total = rv.total
-          filter.tableLoading = false
-
-          // this.workspaceItem.position = this.singleTypeList[0].label
-        }
-      })
-    }
-    let lastGeTrialList = (str: string) => {
-      clearHistoryList()
-      let currentDate = new Date()
-      let currentTimestamp = Math.floor(currentDate.getTime() / 1000)
-      // 计算30天前的时间戳
-      let thirtyDaysAgoTimestamp
-      if (str == 'year') {
-        thirtyDaysAgoTimestamp = currentTimestamp - 360 * 24 * 60 * 60
-      } else if (str == 'month') {
-        thirtyDaysAgoTimestamp = currentTimestamp - 30 * 24 * 60 * 60
-      } else if (str == 'week') {
-        thirtyDaysAgoTimestamp = currentTimestamp - 7 * 24 * 60 * 60
-      }
-      filterData.rangePickerValue[0] = formatTime(thirtyDaysAgoTimestamp, 'YYYY-MM-DD')
-      gettrialList()
-    }
-    let filterOption = (input: any, option: any) => {
-      // 使用 option.label 进行搜索
-      return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
-    }
-    let addhHistoryList = () => {
-      allUserPoerationsVue.value.init({ value: 'Add', label: t('admin.add') }, '')
-    }
-    let allUserPoerationsVue = ref()
-    let setAagree = (data: any) => {
-      allUserPoerationsVue.value.init({ value: 'Edit', label: t('admin.Edit') }, data)
-    }
-    const downloadTemplate = () => {
-      Https.axiosGet(Https.httpUrls.subAccountImportExcelDownload, {
-        responseType: 'blob',
-        env: { binary: true }
-      }).then((rv: any) => {
-        const link = document.createElement('a')
-        link.href = rv.url
-        link.download = 'file.xlsx' // 设置正确的文件扩展名
-        document.body.appendChild(link)
-        link.click()
-        document.body.removeChild(link)
-        // 释放 URL 对象
-        URL.revokeObjectURL(link.href)
-      })
-    }
-    const ExportAccountData = () => {
-      Https.axiosGet(Https.httpUrls.exportAccountsToExcel, {
-        headers: { responseType: 'blob' },
-        env: {
-          binary: true,
-          binaryType:
-            'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=UTF-8'
-        }
-      }).then((rv: any) => {
-        const link = document.createElement('a')
-        link.href = rv.url
-        link.download = 'file.xlsx' // 设置正确的文件扩展名
-        document.body.appendChild(link)
-        link.click()
-        document.body.removeChild(link)
-        // 释放 URL 对象
-        URL.revokeObjectURL(link.href)
-      })
-    }
-    const uploadTemplate = () => {
-      const fileInput = document.createElement('input')
-      fileInput.type = 'file'
-      fileInput.accept = '.xlsx' // 只接受 .xlsx 文件
-      fileInput.onchange = (event: any) => {
-        const file = event.target.files[0] // 获取选择的文件
-        if (file) {
-          let param = new FormData()
-          param.append('file', file)
-          let config: any = {
-            headers: { 'Content-Type': 'multipart/form-data', 'Accept': '*/*' }
-          }
-          Https.axiosPost(Https.httpUrls.subAccountImport, param, config).then(
-            (rv: any) => {
-              gettrialList()
-            }
-          )
-        }
-      }
-      fileInput.click()
-    }
-    const confirmDelete = () => {
-      return new Promise<void>((resolve, reject) => {
-        Modal.confirm({
-          title: t('admin.jsDelete'),
-          icon: createVNode(ExclamationCircleOutlined),
-          okText: 'Yes',
-          cancelText: 'No',
-          centered: true,
-          onOk() {
-            resolve(true)
-          },
-          onCancel() {
-            resolve(false)
-          }
-        })
-      })
-    }
-    const deleteList = async () => {
-      console.log(selectedRowKeys.value)
-      if (selectedRowKeys.value.length == 0) return
-      let boolean: any = await confirmDelete()
-      if (!boolean) {
-        return
-      }
-      Https.axiosPost(Https.httpUrls.deleteSubAccount, {
-        deleteIdList: selectedRowKeys.value
-      }).then((rv: any) => {
-        gettrialList()
-      })
-    }
-    const deleteAagree = async (event: any) => {
-      let boolean: any = await confirmDelete()
-      if (!boolean) {
-        return
-      }
-      const value = {
-        deleteIdList: [event.id]
-      }
-      Https.axiosPost(Https.httpUrls.deleteSubAccount, value).then((rv: any) => {
-        gettrialList()
-      })
-    }
-    onMounted(() => {
-      let allCountry: any = sessionStorage.getItem('allCountry')
-      if (allCountry) {
-        filter.allCountry = JSON.parse(allCountry)
-      }
-      gettrialList()
-    })
-    return {
-      ...toRefs(filter),
-      ...toRefs(filterData),
-      columns,
-      renameData,
-      changePage,
-      searchHistoryList,
-      addhHistoryList,
-      lastGeTrialList,
-      gettrialList,
-      filterOption,
-      allUserPoerationsVue,
-      setAagree,
-      downloadTemplate,
-      ExportAccountData,
-      uploadTemplate,
-      deleteList,
-      deleteAagree
-    }
-  },
-  data() {
-    return {
-      historyTableHeight: 0,
-      handleResizeColumn: (w: any, col: any) => {
-        col.width = w
-      }
-    }
-  },
-  mounted() {
-    let historyTable: any = this.$refs.historyTable
-    this.historyTableHeight = historyTable.clientHeight - 200
-  },
-  methods: {}
-})
-</script>
-<style lang="less" scoped>
-.admin_page {
-  display: flex;
-  flex-direction: column;
-  height: 100%;
-}
-.admin_table_content {
-  flex: 1;
-  display: flex;
-  flex-direction: column;
-  overflow: hidden;
-}
-.admin_page .admin_table_search .admin_state {
-  display: flex;
-  width: 70%;
-  flex-wrap: wrap;
-  align-content: flex-start;
-}
-.admin_page .admin_table_search .admin_search {
-  display: flex;
-  flex-wrap: wrap;
-  width: 30%;
-  > .admin_search_item {
-    height: 4rem;
-    font-size: 1.6rem;
+	<div class="admin_page all-user">
+	  <div class="admin_table_search">
+		<div class="admin_state">
+		  <div class="admin_state_item">
+			<span>{{ $t('admin.CreateTime') }}:</span>
+			<a-range-picker
+			  style="width: 230px"
+			  class="range_picker"
+			  v-model:value="rangePickerValue"
+			  :placeholder="[$t('HistoryPage.StartDate'), $t('HistoryPage.EndDate')]"
+			  valueFormat="YYYY-MM-DD"
+			>
+			  <template #suffixIcon>
+				<span class="icon iconfont range_picker_icon icon-rili"></span>
+			  </template>
+			</a-range-picker>
+		  </div>
+		  <div class="admin_state_item">
+			<span>{{ $t('admin.UserName') }}:</span>
+			<a-select
+			  v-model:value="ids"
+			  mode="multiple"
+			  style="width: 230px"
+			  :field-names="{ label: 'label', value: 'label' }"
+			  :filter-option="filterOption"
+			  :placeholder="$t('admin.selectUserName')"
+			  max-tag-count="responsive"
+			  :options="allUserList"
+			  @keydown.enter="gettrialList"
+			></a-select>
+		  </div>
+		</div>
+		<div class="admin_search">
+		  <div class="admin_search_item" @click="searchHistoryList">
+			{{ $t('admin.search') }}
+		  </div>
+		  <div class="admin_search_item" @click="addhHistoryList">
+			{{ $t('admin.add') }}
+		  </div>
+		  <div
+			class="admin_search_item"
+			style="width: auto; padding: 0 2rem"
+			@click="downloadTemplate"
+		  >
+			{{ $t('admin.DownloadTemplate') }}
+		  </div>
+		  <div
+			class="admin_search_item"
+			style="width: auto; padding: 0 2rem"
+			@click="uploadTemplate"
+		  >
+			{{ $t('admin.UploadTemplate') }}
+		  </div>
+		  <div
+			class="admin_search_item"
+			style="width: auto; padding: 0 2rem"
+			@click="ExportAccountData"
+		  >
+			{{ $t('admin.ExportAccountData') }}
+		  </div>
+		  <div
+			class="admin_search_item"
+			style="width: auto; padding: 0 2rem"
+			@click="deleteList"
+		  >
+			{{ $t('admin.Delete') }}
+		  </div>
+		</div>
+		<div class="admin_state_list">
+		  <div class="admin_state_list_item" @click="lastGeTrialList('year')">
+			{{ $t('admin.NearlyAYear') }}
+		  </div>
+		  <div class="admin_state_list_item" @click="lastGeTrialList('month')">
+			{{ $t('admin.LastMonth') }}
+		  </div>
+		  <div class="admin_state_list_item" @click="lastGeTrialList('week')">
+			{{ $t('admin.LastWeek') }}
+		  </div>
+		</div>
+	  </div>
+	  <div class="admin_table_content" ref="historyTable">
+		<div class="admin_state_list plan_list">
+		  <div
+			v-for="plan in planFilterOptions"
+			:key="plan.id"
+			class="plan_item"
+			:class="{
+			  active: subscriptionPlanId === plan.id,
+			  disabled: plan.status === 'PENDING'
+			}"
+			@click="plan.status !== 'PENDING' && selectPlanFilter(plan.id)"
+		  >
+			<span class="plan_name">{{ plan.name }}</span>
+			<MoreOutlined
+			  class="plan_more_icon"
+			  @click.stop="plan.status !== 'PENDING' && openPlanRenameModal(plan)"
+			/>
+		  </div>
+		</div>
+		<a-table
+		  @resizeColumn="handleResizeColumn"
+		  :loading="tableLoading"
+		  :columns="columns"
+		  :data-source="dataList"
+		  :row-selection="rowSelection"
+		  rowKey="id"
+		  :scroll="{ y: historyTableHeight }"
+		  @change="changePage"
+		  :showSorterTooltip="false"
+		  :pagination="{
+			showSizeChanger: true,
+			current: currentPage,
+			pageSize: pageSize,
+			total: total,
+			showQuickJumper: true,
+			bordered: false
+		  }"
+		>
+		  <template #bodyCell="{ column, text, record, index }">
+			<div class="operate_list" v-if="column?.Operations">
+			  <div
+				class="operate_item"
+				@click="setAagree(record)"
+				style="margin-right: 2rem"
+			  >
+				{{ $t('admin.Edit') }}
+			  </div>
+			  <div class="operate_item" @click="deleteAagree(record)">
+				{{ $t('admin.Delete') }}
+			  </div>
+			</div>
+		  </template>
+		</a-table>
+	  </div>
+	  <allUserPoerationsVue
+		ref="allUserPoerationsVue"
+		@searchHistoryList="searchHistoryList"
+		:plan-options="planFilterOptions"
+	  ></allUserPoerationsVue>
+	  <div class="renamePlanModal" ref="renamePlanModal"></div>
+	  <!-- 重命名订阅计划弹窗 -->
+	  <a-modal
+		v-model:visible="renamePlanModalVisible"
+		:title="$t('admin.RenamePlan')"
+		@ok="confirmRenamePlan"
+		@cancel="cancelRenamePlan"
+		:ok-text="$t('admin.OK')"
+		:cancel-text="$t('admin.Cancel')"
+		:get-container="() => $refs.renamePlanModal"
+	  >
+		<div class="rename-plan-form">
+		  <div class="admin_state_item">
+			<span>{{ $t('admin.PlanName') }}:</span>
+			<a-input
+			  v-model:value="renamePlanForm.planName"
+			  :placeholder="$t('admin.InputPlanName')"
+			  style="width: 250px"
+			  @pressEnter="confirmRenamePlan"
+			/>
+		  </div>
+		</div>
+	  </a-modal>
+	</div>
+  </template>
+  <script lang="ts">
+  import {
+	defineComponent,
+	ref,
+	createVNode,
+	computed,
+	reactive,
+	toRefs,
+	unref,
+	watch
+  } from 'vue'
+  import { formatTime } from '@/tool/util'
+  import { useStore } from 'vuex'
+  import { Https } from '@/tool/https'
+  import { Modal, message, Input } from 'ant-design-vue'
+  import { ExclamationCircleOutlined, MoreOutlined } from '@ant-design/icons-vue'
+  import allUserPoerationsVue from './addAllUser.vue'
+  import { useI18n } from 'vue-i18n'
+  export default defineComponent({
+	components: { allUserPoerationsVue, MoreOutlined },
+	setup() {
+	  const store: any = useStore()
+	  const currentOrganizationId = computed(
+		() => store.state.UserHabit.userDetail.organizationId
+	  )
+	  const selectedRowKeys = ref([]) as any
+	  const onSelectChange = (changableRowKeys: string[]) => {
+		selectedRowKeys.value = changableRowKeys
+	  }
+	  let filter: any = reactive({
+		dataList: [],
+		tableLoading: false,
+		allUserList: computed(() => {
+		  return store.state.adminPage.allUserList
+		}),
+		allCountry: [],
+		rowSelection: computed(() => {
+		  return {
+			selectedRowKeys: unref(selectedRowKeys),
+			onChange: onSelectChange
+		  }
+		})
+	  })
+  
+	  const { t } = useI18n()
+  
+	  let filterData: any = reactive({
+		rangePickerValue: [],
+		currentPage: 1,
+		pageSize: 10,
+		total: 0,
+		country: '',
+		email: '',
+		userType: '',
+		ids: [],
+		occupation: '',
+		systemUser: '',
+		order: '', //'Ascending  升序 Descending 降序'
+		orderBy: '',
+		userName: '',
+		subscriptionPlanId: ''
+	  })
+  
+	  let renameData: any = ref({}) //修改名字选中的数据
+	  const renamePlanModalVisible = ref(false)
+	  const renamePlanForm = reactive({
+		planId: null as number | null,
+		planName: ''
+	  })
+	  const columns: any = computed(() => {
+		return [
+		  {
+			title: t('admin.UserId'),
+			align: 'center',
+			dataIndex: 'id',
+			key: 'id',
+			width: 100,
+			fixed: 'left',
+			sorter: true
+		  },
+		  {
+			title: t('admin.Email'),
+			align: 'center',
+			dataIndex: 'userEmail',
+			key: 'userEmail',
+			width: 200,
+			ellipsis: true
+		  },
+		  {
+			title: t('admin.UserName'),
+			align: 'center',
+			dataIndex: 'userName',
+			key: 'userName',
+			width: 150,
+			ellipsis: true
+		  },
+		  {
+			title: t('admin.language'),
+			align: 'center',
+			dataIndex: 'language',
+			key: 'language',
+			width: 100,
+			ellipsis: true,
+			customRender: (record: any) => {
+			  return t(`admin.${record.text}`)
+			}
+		  },
+		  {
+			title: t('admin.CreateDate'),
+			align: 'center',
+			dataIndex: 'createDate',
+			key: 'createDate',
+			width: 200,
+			sorter: true
+		  },
+		  {
+			title: t('admin.Credits'),
+			align: 'center',
+			dataIndex: 'credits',
+			key: 'credits',
+			width: 100,
+			sorter: true
+		  },
+		  {
+			title: t('admin.CreditsUsage'),
+			align: 'center',
+			dataIndex: 'creditsUsage',
+			key: 'creditsUsage',
+			width: 150,
+			sorter: true
+		  },
+		  {
+			title: t('admin.CreditsUsageLimit'),
+			align: 'center',
+			dataIndex: 'creditsUsageLimit',
+			key: 'creditsUsageLimit',
+			width: 200,
+			sorter: true
+		  },
+		  {
+			title: t('admin.Operations'),
+			key: 'operation',
+			width: 120,
+			align: 'center',
+			fixed: 'right',
+			Operations: true
+		  }
+		]
+	  })
+	  //改变页码
+	  let changePage = (e: any, filters: any, sorter: any) => {
+		filterData.currentPage = e.current
+		filterData.pageSize = e.pageSize
+		if (sorter.order) {
+		  if (sorter.columnKey == 'id') {
+			filterData.orderBy = 'id'
+		  } else if (sorter.columnKey == 'createDate') {
+			filterData.orderBy = 'time'
+		  } else if (sorter.columnKey == 'credits') {
+			filterData.orderBy = 'credits'
+		  }
+		}
+		if (sorter.order) {
+		  filterData.order = sorter.order == 'descend' ? 'Descending' : 'Ascending'
+		} else {
+		  filterData.order = ''
+		}
+  
+		gettrialList()
+	  }
+  
+	  //查询列表
+	  let searchHistoryList = () => {
+		filterData.currentPage = 1
+		gettrialList()
+	  }
+	  let clearHistoryList = () => {
+		;(filterData.rangePickerValue = []),
+		  (filterData.currentPage = 1),
+		  (filterData.pageSize = 10),
+		  (filterData.total = 0),
+		  (filterData.country = ''),
+		  (filterData.email = ''),
+		  (filterData.userType = ''),
+		  (filterData.ids = []),
+		  (filterData.occupation = ''),
+		  (filterData.order = ''), //'Ascending  升序 Descending 降序'
+		  (filterData.orderBy = ''), //'Ascending  升序 Descending 降序'
+		  (filterData.systemUser = ''),
+		  (filterData.userName = ''),
+		  (filterData.subscriptionPlanId = '')
+	  }
+	  let setHistoryListData = () => {
+		let startDate: any = filterData.rangePickerValue?.[0]
+		  ? filterData.rangePickerValue[0] + ' ' + '00:00:00'
+		  : ''
+		let endDate: any = filterData.rangePickerValue?.[1]
+		  ? filterData.rangePickerValue[1] + ' ' + '23:59:59'
+		  : ''
+		let data = {
+		  endTime: endDate,
+		  startTime: startDate,
+		  size: filterData.pageSize,
+		  page: filterData.currentPage,
+		  systemUser: filterData.systemUser,
+		  country: filterData.country,
+		  // email: filterData.email.trim(),
+		  userType: filterData.userType,
+		  ids: [],
+		  occupation: filterData.occupation,
+		  order: filterData.order,
+		  orderBy: filterData.orderBy,
+		  // userName: filterData.userName,
+		  userName: filterData.ids,
+		  subscriptionPlanId: filterData.subscriptionPlanId
+		}
+		return data
+	  }
+	  //获取列表
+	  const gettrialList = () => {
+		filter.tableLoading = true
+		let data = setHistoryListData()
+		Https.axiosPost(Https.httpUrls.subAccountList, data).then((rv: any) => {
+		  if (rv) {
+			filter.dataList = rv.content
+			filterData.total = rv.total
+			filter.tableLoading = false
+  
+			// this.workspaceItem.position = this.singleTypeList[0].label
+		  }
+		})
+	  }
+	  let lastGeTrialList = (str: string) => {
+		clearHistoryList()
+		let currentDate = new Date()
+		let currentTimestamp = Math.floor(currentDate.getTime() / 1000)
+		// 计算30天前的时间戳
+		let thirtyDaysAgoTimestamp
+		if (str == 'year') {
+		  thirtyDaysAgoTimestamp = currentTimestamp - 360 * 24 * 60 * 60
+		} else if (str == 'month') {
+		  thirtyDaysAgoTimestamp = currentTimestamp - 30 * 24 * 60 * 60
+		} else if (str == 'week') {
+		  thirtyDaysAgoTimestamp = currentTimestamp - 7 * 24 * 60 * 60
+		}
+		filterData.rangePickerValue[0] = formatTime(thirtyDaysAgoTimestamp, 'YYYY-MM-DD')
+		gettrialList()
+	  }
+	  let filterOption = (input: any, option: any) => {
+		// 使用 option.label 进行搜索
+		return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+	  }
+	  // 订阅计划筛选（按钮点击）
+	  const selectPlanFilter = async (planId: string) => {
+		filterData.subscriptionPlanId = planId
+		// 切换管理员订阅计划
+		Https.axiosGet(Https.httpUrls.switchSubscribePlan, {
+		  params: {
+			targetSubscriptionPlanId: planId,
+			adminAccId: store.state.UserHabit.userDetail.id
+		  }
+		}).then((res: any) => {
+		  console.log(res)
+		})
+		searchHistoryList()
+	  }
+	  const planFilterOptions = ref([])
+	  const fetchSubscribePlanList = () => {
+		const orgId = currentOrganizationId.value
+		if (!orgId) return
+		Https.axiosPost(Https.httpUrls.searchSubscribeByOrg, {
+		  organizationId: orgId,
+		  status: ['ACTIVE', 'PENDING']
+		}).then(res => {
+		  // 将与当前用户 subscriptionPlanId 相同的订阅计划放到第一个
+		  const userSubscriptionPlanId = store.state.UserHabit.userDetail.subscriptionPlanId
+		  if (userSubscriptionPlanId && Array.isArray(res)) {
+			const sortedList = [...res].sort((a: any, b: any) => {
+			  const isAUserPlan = a.id == userSubscriptionPlanId
+			  const isBUserPlan = b.id == userSubscriptionPlanId
+			  if (isAUserPlan && !isBUserPlan) return -1
+			  if (!isAUserPlan && isBUserPlan) return 1
+			  return 0
+			})
+			planFilterOptions.value = sortedList
+		  } else {
+			planFilterOptions.value = res
+		  }
+		})
+	  }
+	  // 监听组织ID，获取到值后再拉取订阅计划
+	  watch(
+		() => currentOrganizationId.value,
+		orgId => {
+		  if (orgId) {
+			fetchSubscribePlanList()
+			const userSubscriptionPlanId =
+			  store.state.UserHabit.userDetail.subscriptionPlanId
+			if (userSubscriptionPlanId) {
+			  selectPlanFilter(userSubscriptionPlanId)
+			}
+		  }
+		},
+		{ immediate: true }
+	  )
+	  // 打开重命名弹窗（基于当前点击的计划）
+	  const openPlanRenameModal = plan => {
+		renamePlanForm.planId = plan.id
+		renamePlanForm.planName = plan?.name || ''
+		renamePlanModalVisible.value = true
+		console.log(renamePlanForm)
+	  }
+	  let addhHistoryList = () => {
+		allUserPoerationsVue.value.init({ value: 'Add', label: t('admin.add') }, '')
+	  }
+	  let allUserPoerationsVue = ref()
+	  let setAagree = (data: any) => {
+		allUserPoerationsVue.value.init({ value: 'Edit', label: t('admin.Edit') }, data)
+	  }
+	  const downloadTemplate = () => {
+		Https.axiosGet(Https.httpUrls.subAccountImportExcelDownload, {
+		  responseType: 'blob',
+		  env: { binary: true }
+		}).then((rv: any) => {
+		  const link = document.createElement('a')
+		  link.href = rv.url
+		  link.download = 'file.xlsx' // 设置正确的文件扩展名
+		  document.body.appendChild(link)
+		  link.click()
+		  document.body.removeChild(link)
+		  // 释放 URL 对象
+		  URL.revokeObjectURL(link.href)
+		})
+	  }
+	  const ExportAccountData = () => {
+		Https.axiosGet(Https.httpUrls.exportAccountsToExcel, {
+		  headers: { responseType: 'blob' },
+		  env: {
+			binary: true,
+			binaryType:
+			  'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=UTF-8'
+		  }
+		}).then((rv: any) => {
+		  const link = document.createElement('a')
+		  link.href = rv.url
+		  link.download = 'file.xlsx' // 设置正确的文件扩展名
+		  document.body.appendChild(link)
+		  link.click()
+		  document.body.removeChild(link)
+		  // 释放 URL 对象
+		  URL.revokeObjectURL(link.href)
+		})
+	  }
+	  const uploadTemplate = () => {
+		const fileInput = document.createElement('input')
+		fileInput.type = 'file'
+		fileInput.accept = '.xlsx' // 只接受 .xlsx 文件
+		fileInput.onchange = (event: any) => {
+		  const file = event.target.files[0] // 获取选择的文件
+		  if (file) {
+			let param = new FormData()
+			param.append('file', file)
+			let config: any = {
+			  headers: { 'Content-Type': 'multipart/form-data', 'Accept': '*/*' }
+			}
+			Https.axiosPost(Https.httpUrls.subAccountImport, param, config).then(
+			  (rv: any) => {
+				gettrialList()
+			  }
+			)
+		  }
+		}
+		fileInput.click()
+	  }
+	  const confirmDelete = () => {
+		return new Promise<void>((resolve, reject) => {
+		  Modal.confirm({
+			title: t('admin.jsDelete'),
+			icon: createVNode(ExclamationCircleOutlined),
+			okText: 'Yes',
+			cancelText: 'No',
+			centered: true,
+			onOk() {
+			  resolve(true)
+			},
+			onCancel() {
+			  resolve(false)
+			}
+		  })
+		})
+	  }
+	  const deleteList = async () => {
+		console.log(selectedRowKeys.value)
+		if (selectedRowKeys.value.length == 0) return
+		let boolean: any = await confirmDelete()
+		if (!boolean) {
+		  return
+		}
+		Https.axiosPost(Https.httpUrls.deleteSubAccount, {
+		  deleteIdList: selectedRowKeys.value
+		}).then((rv: any) => {
+		  gettrialList()
+		})
+	  }
+	  const deleteAagree = async (event: any) => {
+		let boolean: any = await confirmDelete()
+		if (!boolean) {
+		  return
+		}
+		const value = {
+		  deleteIdList: [event.id]
+		}
+		Https.axiosPost(Https.httpUrls.deleteSubAccount, value).then((rv: any) => {
+		  gettrialList()
+		})
+	  }
+  
+	  // 确认重命名
+	  const confirmRenamePlan = () => {
+		if (!renamePlanForm.planName || !renamePlanForm.planName.trim()) {
+		  message.warning(t('admin.PlanNameRequired'))
+		  return
+		}
+  
+		Https.axiosPost(Https.httpUrls.updateSubscribePlan, {
+		  id: renamePlanForm.planId,
+		  name: renamePlanForm.planName.trim()
+		})
+		  .then((rv: any) => {
+			message.success(t('admin.RenamePlanSuccess'))
+			renamePlanModalVisible.value = false
+			fetchSubscribePlanList()
+		  })
+		  .catch((error: any) => {
+			message.error(error.message || t('admin.RenamePlanFailed'))
+		  })
+	  }
+	  // 取消重命名
+	  const cancelRenamePlan = () => {
+		renamePlanModalVisible.value = false
+		renamePlanForm.planId = null
+		renamePlanForm.planName = ''
+	  }
+	  onMounted(() => {
+		let allCountry: any = sessionStorage.getItem('allCountry')
+		if (allCountry) {
+		  filter.allCountry = JSON.parse(allCountry)
+		}
+		gettrialList()
+	  })
+	  return {
+		...toRefs(filter),
+		...toRefs(filterData),
+		columns,
+		renameData,
+		changePage,
+		searchHistoryList,
+		addhHistoryList,
+		lastGeTrialList,
+		gettrialList,
+		filterOption,
+		allUserPoerationsVue,
+		setAagree,
+		downloadTemplate,
+		ExportAccountData,
+		uploadTemplate,
+		deleteList,
+		deleteAagree,
+		planFilterOptions,
+		selectPlanFilter,
+		openPlanRenameModal,
+		renamePlanModalVisible,
+		renamePlanForm,
+		confirmRenamePlan,
+		cancelRenamePlan,
+		fetchSubscribePlanList
+	  }
+	},
+	data() {
+	  return {
+		historyTableHeight: 0,
+		handleResizeColumn: (w: any, col: any) => {
+		  col.width = w
+		}
+	  }
+	},
+	mounted() {
+	  this.updateTableHeight()
+	  window.addEventListener('resize', this.updateTableHeight)
+	},
+	beforeUnmount() {
+	  window.removeEventListener('resize', this.updateTableHeight)
+	},
+	methods: {
+	  updateTableHeight() {
+		const historyTable: any = this.$refs.historyTable
+		if (historyTable) {
+		  // 为底部分页器预留固定空间，使表格部分高度固定且分页器始终可见
+		  this.historyTableHeight = historyTable.clientHeight - 200
+		}
+	  }
+	}
+  })
+  </script>
+  <style lang="less" scoped>
+  .admin_page {
+	display: flex;
+	flex-direction: column;
+	height: 100%;
   }
-}
-.all-user {
   .admin_table_content {
-    :deep(.ant-table-wrapper) {
-      overflow: hidden ;
-    }
+	flex: 1;
+	display: flex;
+	flex-direction: column;
+	overflow: hidden;
   }
-}
-</style>
+  .admin_page .admin_table_search .admin_state {
+	display: flex;
+	width: 70%;
+	flex-wrap: wrap;
+	align-content: flex-start;
+  }
+  .admin_page .admin_table_search .admin_search {
+	display: flex;
+	flex-wrap: wrap;
+	width: 30%;
+	> .admin_search_item {
+	  height: 4rem;
+	  font-size: 1.6rem;
+	}
+  }
+  .plan_list {
+	margin-top: 1rem;
+	display: flex;
+	// flex-wrap: wrap;
+	padding-left: 2.8rem;
+	column-gap: 0.6rem;
+	margin-bottom: 2rem;
+	.plan_item {
+	  height: 4rem;
+	  width: auto;
+	  min-width: 10rem;
+	  display: flex;
+	  align-items: center;
+	  justify-content: center;
+	  // font-size: 1.8rem;
+  
+	  font-weight: 600;
+	  border-radius: 1.3rem;
+	  color: #fff;
+	  cursor: pointer;
+	  border: 1.8px solid #000;
+	  background-color: #000;
+	  padding: 0 1rem 0 2rem;
+  
+	  &:hover {
+		color: #000;
+		background-color: #fff;
+	  }
+  
+	  &.active {
+		background: #ffffff;
+		color: #000000;
+	  }
+  
+	  &.disabled {
+		opacity: 0.5;
+		cursor: not-allowed;
+		background-color: #d9d9d9;
+		border-color: #d9d9d9;
+		color: #999;
+  
+		&:hover {
+		  background-color: #d9d9d9;
+		  color: #999;
+		}
+	  }
+	}
+  
+	.plan_item {
+	  column-gap: 0.6rem;
+	}
+  
+	.plan_more_icon {
+	  font-size: 1.6rem;
+	  cursor: pointer;
+	}
+  }
+  .subscription-plan-cell {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+  }
+  .rename-plan-form {
+	padding: 2rem 0;
+	.admin_state_item {
+	  display: flex;
+	  align-items: center;
+	  > span {
+		width: 10rem;
+		margin-right: 1rem;
+	  }
+	}
+  }
+  .all-user {
+	.admin_table_content {
+	  :deep(.ant-table-wrapper) {
+		overflow: hidden;
+	  }
+	}
+  }
+  </style>
+  
\ No newline at end of file
diff --git a/src/component/Canvas/CanvasEditor/commands/BackgroundCommands.js b/src/component/Canvas/CanvasEditor/commands/BackgroundCommands.js
index 60fd70f9..35b3759b 100644
--- a/src/component/Canvas/CanvasEditor/commands/BackgroundCommands.js
+++ b/src/component/Canvas/CanvasEditor/commands/BackgroundCommands.js
@@ -207,7 +207,8 @@ export class BackgroundSizeCommand extends Command {
     this.bgLayer = this.layers.value.find((layer) => layer.isBackground);
 
     // 记录原尺寸
-    this.backgroundObject = findObjectById(this.canvas, this.bgLayer.fabricObject.id).object;
+	this.bgId = this.bgLayer.fabricObject?.id || this.bgLayer.fabricObjects?.[0]?.id;
+    this.backgroundObject = findObjectById(this.canvas, this.bgId).object;
 
     this.oldWidth = this.backgroundObject.width;
     this.oldHeight = this.backgroundObject.height;
diff --git a/src/component/Canvas/CanvasEditor/components/HeaderMenu.vue b/src/component/Canvas/CanvasEditor/components/HeaderMenu.vue
index 9d2e2de9..d1e03863 100644
--- a/src/component/Canvas/CanvasEditor/components/HeaderMenu.vue
+++ b/src/component/Canvas/CanvasEditor/components/HeaderMenu.vue
@@ -11,6 +11,7 @@ const layerManager = inject("layerManager");
 const isShowLayerPanel = inject("isShowLayerPanel", ref(false));
 
 const props = defineProps({
+  title: String,
   activeTool: String,
   canvasWidth: Number,
   canvasHeight: Number,
@@ -274,7 +275,7 @@ onMounted(() => {
 <template>
   <div class="canvas-header">
     <div class="canvas-header-wrapper">
-      <span class="canvas-title">{{ $t('Canvas.Canvas') }}</span>
+      <span class="canvas-title">{{ props.title || $t("Canvas.Canvas") }}</span>
       <!-- 默认设置 -->
       <!-- v-if="
         !activeTool ||
diff --git a/src/component/Canvas/CanvasEditor/components/LayersPanel/LayersList.vue b/src/component/Canvas/CanvasEditor/components/LayersPanel/LayersList.vue
index 42433748..c34ebe18 100644
--- a/src/component/Canvas/CanvasEditor/components/LayersPanel/LayersList.vue
+++ b/src/component/Canvas/CanvasEditor/components/LayersPanel/LayersList.vue
@@ -242,7 +242,7 @@ const canDeleteComputed = computed(() => {
     return parentLayer?.children?.length > 1;
   }
   // 否则直接返回根图层的可删除状态
-  return props.layers.length > 3;
+  return true;
 });
 </script>
 
diff --git a/src/component/Canvas/CanvasEditor/components/LayersPanel/LayersPanel.vue b/src/component/Canvas/CanvasEditor/components/LayersPanel/LayersPanel.vue
index 1b72e5ac..0ed765d5 100644
--- a/src/component/Canvas/CanvasEditor/components/LayersPanel/LayersPanel.vue
+++ b/src/component/Canvas/CanvasEditor/components/LayersPanel/LayersPanel.vue
@@ -414,14 +414,14 @@ function deleteSelectedLayers() {
   }
 
   // 检查删除后是否还有足够的普通图层
-  const remainingNormalLayers = layers.value.filter(
-    (layer) => !layer.isBackground && !layer.isFixed && !selectedLayerIds.value.includes(layer.id)
-  ).length;
+//   const remainingNormalLayers = layers.value.filter(
+//     (layer) => !layer.isBackground && !layer.isFixed && !selectedLayerIds.value.includes(layer.id)
+//   ).length;
 
-  if (remainingNormalLayers < 1) {
-    console.warn("不能删除所有普通图层");
-    return;
-  }
+//   if (remainingNormalLayers < 1) {
+//     console.warn("不能删除所有普通图层");
+//     return;
+//   }
 
   // 确认删除
   if (selectedLayers.length > 1) {
@@ -876,13 +876,15 @@ function toggleSelectedLayersVisibility() {
 
 function canDeleteLayers() {
   const selectedLayers = getSelectedLayers();
+  console.log(selectedLayers);
   if (selectedLayers.length === 0) return false;
-
   // 检查是否包含不能删除的图层
   const undeletableLayers = selectedLayers.filter((layer) => layer.isBackground || layer.isFixed);
 
   if (undeletableLayers.length > 0) return false;
 
+  return true
+
   // 检查删除后是否还有足够的普通图层
   const remainingNormalLayers = layers.value.filter(
     (layer) => !layer.isBackground && !layer.isFixed && !selectedLayerIds.value.includes(layer.id)
diff --git a/src/component/Canvas/CanvasEditor/index.vue b/src/component/Canvas/CanvasEditor/index.vue
index 7cfa469e..f08f38ad 100644
--- a/src/component/Canvas/CanvasEditor/index.vue
+++ b/src/component/Canvas/CanvasEditor/index.vue
@@ -67,6 +67,10 @@ const emit = defineEmits([
 ]);
 
 const props = defineProps({
+  title: {
+    type: String,
+    default: "", // 默认空
+  },
   canvasJSON: {
     type: [Object, String],
     default: "", // 默认空
@@ -1192,6 +1196,7 @@ isContainNormalLayer})
     <!-- 头部菜单组件 -->
     <div class="header-menu">
       <HeaderMenu
+		:title="props.title"
         v-if="canvasManagerLoaded"
         :activeTool="activeTool"
         :canvasWidth="canvasWidth"
diff --git a/src/component/Canvas/CanvasEditor/managers/CanvasManager.js b/src/component/Canvas/CanvasEditor/managers/CanvasManager.js
index ae7d8ca9..30be134d 100644
--- a/src/component/Canvas/CanvasEditor/managers/CanvasManager.js
+++ b/src/component/Canvas/CanvasEditor/managers/CanvasManager.js
@@ -1330,7 +1330,7 @@ backgroundObject.scaleY,'CanvasManager resetCanvasSizeByFixedLayer')
     }
     // 解析JSON字符串
     try {
-      const parsedJson = JSON.parse(json);
+      const parsedJson = window.testCanvasJson || JSON.parse(json);
       console.log("加载画布JSON数据:", parsedJson);
 	  this.FixJsonIdLoss(parsedJson);
       this.canvasWidth.value = parsedJson.canvasWidth || this.width;
@@ -1411,7 +1411,7 @@ backgroundObject.scaleY,'CanvasManager resetCanvasSizeByFixedLayer')
               // console.log("图层关联验证结果:", isValidate);
               // 排序
               // 使用LayerSort工具重新排列画布对象（如果可用）
-              await this?.layerManager?.layerSort?.rearrangeObjects();
+              await this?.layerManager?.layerSort?.rearrangeObjectsAsync();
 
               this.layerManager.activeLayerId.value = this.layers.value[0]
                 .children?.length
@@ -1455,15 +1455,21 @@ backgroundObject.scaleY,'CanvasManager resetCanvasSizeByFixedLayer')
 	const layers = json?.layers || [];
 	const objects = json?.canvas?.objects || [];
 	layers.forEach((layer) => {
-		if(!layer.fabricObjects?.length && !layer.fabricObject){
+		if(!layer.fabricObjects?.[0]?.id && !layer.fabricObject?.id){
 			const obj = objects?.find((o) => o.layerId === layer.id);
-			if(!obj) return;
-			layer.fabricObjects = [{
-				id: obj.id,
-				type: obj.type,
-			}]
+			if(obj) {
+				layer.fabricObjects = [{
+					id: obj.id,
+					type: obj.type,
+				}]
+			}
 		}
 	})
+	// 排序
+	objects.sort((a, b) => {
+		if (a.isBackground) return -1;
+		if (b.isBackground) return 1;
+	})
   }
 
 
diff --git a/src/component/Canvas/CanvasEditor/utils/LayerSort.js b/src/component/Canvas/CanvasEditor/utils/LayerSort.js
index eb87403c..d7c16369 100644
--- a/src/component/Canvas/CanvasEditor/utils/LayerSort.js
+++ b/src/component/Canvas/CanvasEditor/utils/LayerSort.js
@@ -71,17 +71,17 @@ export class LayerSort {
       // if (!layer.visible) {
       //   continue;
       // }
-
+	  let id = layer.fabricObject?.id || layer.fabricObjects?.[0]?.id || null;
       // 处理不同类型的图层
-      if (layer.isBackground && layer.fabricObject) {
+      if (layer.isBackground && id) {
         // 背景图层对象放在最底层
-        zIndexMap.set(layer.fabricObject.id, currentZIndex++);
-      } else if (layer.isFixed && layer.fabricObject) {
+        zIndexMap.set(id, currentZIndex++);
+      } else if (layer.isFixed && id) {
         // 固定图层对象
-        zIndexMap.set(layer.fabricObject.id, currentZIndex++);
-      } else if (layer.isFixedOther && layer.fabricObject) {
+        zIndexMap.set(id, currentZIndex++);
+      } else if (layer.isFixedOther && id) {
         // 其他固定图层对象
-        zIndexMap.set(layer.fabricObject.id, currentZIndex++);
+        zIndexMap.set(id, currentZIndex++);
       } else if (!layer.isBackground && !layer.isFixed) {
         // 普通图层
         currentZIndex = this.processLayerObjects(
@@ -91,7 +91,6 @@ export class LayerSort {
         );
       }
     }
-
     return zIndexMap;
   }
 
diff --git a/src/component/Detail/DesignDetail.vue b/src/component/Detail/DesignDetail.vue
index dd36ee2f..ff753391 100644
--- a/src/component/Detail/DesignDetail.vue
+++ b/src/component/Detail/DesignDetail.vue
@@ -545,6 +545,7 @@ export default defineComponent({
 				await detailDom.canvasBox.privewDetail()
 				await upDateFrontBackSketch()
 				saveCanvasJSONToSession()
+				await uploadSelectDetail()
 				detailData.loadingShow = false
 			}
 		}
@@ -672,22 +673,16 @@ export default defineComponent({
 			if(detailData.isEditPattern.value == 'canvasEditor'){
 				// await detailDom.canvasBox.saveCanvas()
 				const allInfo = await (detailDom.canvasBox as any).getCanvasElement()
-				if(allInfo.trims?.length > 0){
-					// detailData.selectDetail.trims.prints = allInfo.trims
-					let value = {
-						data:allInfo.trims,
-						str:'element'
-					}
-					store.commit('DesignDetail/setNewDetail',value)
+				let trimsValue = {
+					data:allInfo.trims || [],
+					str:'element'
 				}
-				if(allInfo.prints?.length > 0){
-					// detailData.selectDetail.printObject.prints = allInfo.prints
-					let value = {
-						data:allInfo.prints,
-						str:'print'
-					}
-					store.commit('DesignDetail/setNewDetail',value)
+				store.commit('DesignDetail/setNewDetail',trimsValue)
+				let printValue = {
+					data:allInfo.prints || [],
+					str:'print'
 				}
+				store.commit('DesignDetail/setNewDetail',printValue)
 				if(allInfo.color?.color?.rgba){
 					let canvasColor = allInfo.color.color;
 					let colorData:any = await getColorName(allInfo.color.color?.rgba)
@@ -713,8 +708,61 @@ export default defineComponent({
 					if(detailData.currentDetailType == 'color'){
 						detailData.detailLeftColorKey++
 					}
+				}else{
+					let value = {
+						data:{},
+						str:'color'
+					}
+					store.commit('DesignDetail/setNewDetail',value)
 				}
 			}
+		}
+		const uploadSelectDetail = async ()=>{//更新选中的detail
+			// await detailDom.canvasBox.saveCanvas()
+			const allInfo = await (detailDom.canvasBox as any).getCanvasElement()
+			let color:any = {}
+			if(allInfo.color?.color?.rgba){
+				let canvasColor = allInfo.color.color;
+				let colorData:any = await getColorName(allInfo.color.color?.rgba)
+				color = {
+					hsv:{
+						h:colorData.h,
+						s:colorData.s,
+						v:colorData.v,
+					},
+					name:colorData.name,
+					tcx:colorData.tcx,
+					rgba:canvasColor.rgba,
+					hex:rgbaToHex([canvasColor.rgba.r,canvasColor.rgba.g,canvasColor.rgba.b]),
+				}
+				if(canvasColor.gradient){
+					color.gradient = canvasColor.gradient
+				}
+				if(detailData.currentDetailType == 'color'){
+					detailData.detailLeftColorKey++
+				}
+			}
+			if(detailData.isEditPattern.value !== 'canvasEditor'){
+				delete detailData.selectDetail.newDetail
+				detailData.selectDetail.trims.prints = allInfo.trims || []
+				detailData.selectDetail.printObject.prints = allInfo.prints || []
+				detailData.selectDetail.color = color
+			}else{
+				if(detailData.currentDetailType == 'color'){
+					delete detailData.selectDetail.newDetail.color
+					detailData.selectDetail.color = color
+				}
+				if(detailData.currentDetailType == 'print'){
+					delete detailData.selectDetail.newDetail.print
+					detailData.selectDetail.printObject.prints = allInfo.prints || []
+				}
+				if(detailData.currentDetailType == 'element'){
+					delete detailData.selectDetail.newDetail.element
+					detailData.selectDetail.trims.prints = allInfo.trims || []
+				}
+			}
+			
+			
 		}
 		const canvasReload = async ()=>{
 			if(detailData.isEditPattern.value){
diff --git a/src/component/Detail/canvas/index.vue b/src/component/Detail/canvas/index.vue
index ad98a5a6..bcca72b7 100644
--- a/src/component/Detail/canvas/index.vue
+++ b/src/component/Detail/canvas/index.vue
@@ -8,6 +8,7 @@
 					<div class="canvas" :class="{'active': currentView === 'canvasEditor'}"@click.stop>
 						<!-- :clothingMinIOPath="selectDetail.minIOPath" 部件选取 -->
 						<editCanvas v-if="canvasLoad" :config="canvasConfig" 
+							:title="t('CanvasTitle.ModifyItem')"
 							@canvasInit="editSketchCanvasInit"
 							is-edit
 							:clothingImageUrl="selectDetail.path"
@@ -26,6 +27,7 @@
 					</div>
 					<div class="editFrontBack" v-if="currentView === 'redGreenExample'" @click.stop>
 						<editCanvas v-if="canvasLoad" :config="canvasConfig" 
+							:title="t('CanvasTitle.RedGreen')"
 							@canvasInit="editFrontBackCanvasInit"
 							:enabledRedGreenMode="true"
 							:clothingImageUrl="selectDetail.path" 
@@ -40,7 +42,7 @@
 						</editCanvas>
 					</div>
 					<div class="editSketch" v-if="currentView === 'editSketch'" @click.stop>
-						<generalMiniCanvas ref="generalMiniCanvas" :btnShow="false" :imgUrl="selectDetail.sketchString || selectDetail.path"></generalMiniCanvas>
+						<generalMiniCanvas ref="generalMiniCanvas" :isChangeCanvasSize="false" :canvasTitle="t('CanvasTitle.ModifySketch')" :btnShow="false" :imgUrl="selectDetail.sketchString || selectDetail.path"></generalMiniCanvas>
 					</div>
 				</div>
 				
@@ -287,12 +289,27 @@ export default defineComponent({
 		const saveCanvas = async (canvasData:any)=>{
 			const index = detailData.designDetail.clothes.findIndex(item => item.id === canvasData.id);
 			await new Promise<void>((resolve, reject) => {
-				let canvasJSON = JSON.parse(canvasData.canvasJSON)
-				if(!canvasJSON)return resolve()
-				// canvasData.canvas.objects.forEach((objectsItem:any) => {
-				// 	if(objectsItem.type == 'image')objectsItem.minioUrl = getMinioUrl(objectsItem.src)
-				// });
-				let blob = new Blob([JSON.stringify(canvasJSON)], { type: "application/json" });
+				if(!detailDom?.editCanvas)return resolve()
+				let canvasJSON = detailDom?.editCanvas?.getJSON()
+				let canvasData = JSON.parse(canvasJSON)
+				if(!canvasData)return resolve()
+				function deepProcessObjects(data:any, callback:any) {
+					if (!Array.isArray(data)) return data;
+					return data.map(item => {
+						callback(item)
+						const processedItem = {...item};
+						if (processedItem.objects && 
+							Array.isArray(processedItem.objects) && 
+							processedItem.objects.length > 0) {
+						processedItem.objects = deepProcessObjects(processedItem.objects, callback);
+						}
+						return processedItem;
+					});
+				}
+				canvasData.canvas.objects = deepProcessObjects(canvasData.canvas.objects,(item:any)=>{
+					if(item.type == 'image')item.minioUrl = getMinioUrl(item.src)
+				})
+				let blob = new Blob([JSON.stringify(canvasData)], { type: "application/json" });
 				let formData = new FormData();
 				formData.append("file", blob, "data.json");
 				formData.append("designItemDetailId", detailData.selectDetail.id);
@@ -410,6 +427,7 @@ export default defineComponent({
         return{
 			...toRefs(detailDom),
 			...toRefs(detailData),
+			t,
 			editFront,
 			privewDetail,
 			setFrontBackColor,
diff --git a/src/component/Detail/model/modelPosition.vue b/src/component/Detail/model/modelPosition.vue
index 51da1ef3..52869e50 100644
--- a/src/component/Detail/model/modelPosition.vue
+++ b/src/component/Detail/model/modelPosition.vue
@@ -14,7 +14,12 @@
 			<div ref="moveableContainer" class="moveableContainer"></div>
 		</div>
 		<div class="designOpenrtion_imgMask" v-if="!frontBack?.body?.path">
-			<img :src="selectDetail?.undividedLayerWithSinglePrint || selectDetail?.undividedLayer || selectDetail?.path" style="object-fit: cover;" alt="">
+			<div class="designOpenrtion_print">
+				<img v-if="frontBack.back?.[0].imageUrl" :src="frontBack.back?.[0].imageUrl" style="object-fit: cover;" alt="">
+			</div>
+			<div class="detail_modal_item_front" style="position: relative;">
+				<img :src="frontBack.front?.[0].imageUrl || selectDetail?.path" style="object-fit: cover;" alt="">
+			</div>
 			<!-- <img @load="setSelectSketch()" :src="designDetail?.currentFullBodyView || selectDetail?.undividedLayer" style="object-fit: cover;" alt=""> -->
 		</div>
     </div>
diff --git a/src/component/HomePage/Generate.vue b/src/component/HomePage/Generate.vue
index db010f26..245cb13b 100644
--- a/src/component/HomePage/Generate.vue
+++ b/src/component/HomePage/Generate.vue
@@ -925,7 +925,9 @@ export default defineComponent({
               },
               onCancel() {}
             })
-          }
+          }else{
+			this.fileList = this.fileList.filter((item: any) => item.imgUrl)
+		  }
         })
     },
     setGenerate(dataList: any) {
diff --git a/src/component/LoginPage/login/personal.vue b/src/component/LoginPage/login/personal.vue
index 17276121..a597ba09 100644
--- a/src/component/LoginPage/login/personal.vue
+++ b/src/component/LoginPage/login/personal.vue
@@ -854,6 +854,10 @@ export default defineComponent({
             font-size: 2.2rem;
             font-weight: bold;
             color: #030303;
+			@media (max-width: 767px) {
+				font-size: 1.2rem;
+				margin-left: .5rem;
+			}
           }
           .email_last_step_block_icon {
             cursor: pointer;
diff --git a/src/component/LoginPage/verificationCodeInput.vue b/src/component/LoginPage/verificationCodeInput.vue
index 4b113036..d539c546 100644
--- a/src/component/LoginPage/verificationCodeInput.vue
+++ b/src/component/LoginPage/verificationCodeInput.vue
@@ -161,6 +161,13 @@
 		font-size: 2.4rem;
 		line-height: 8.7rem;
 		outline: none;
+		@media (max-width: 767px) {
+			border-radius: .7rem;
+			width: 3.5rem;
+			height: 3.5rem;
+			font-size: 1.8rem;
+			line-height: 3.5rem;
+		}
 	}
 	input:last-of-type {
 		margin-right: 0;
diff --git a/src/component/home/design/tools.vue b/src/component/home/design/tools.vue
index 7c77be77..69722c19 100644
--- a/src/component/home/design/tools.vue
+++ b/src/component/home/design/tools.vue
@@ -335,9 +335,22 @@ export default defineComponent({
 			let canvasData = JSON.parse(canvasJSON)
 			
 			if(!canvasData)return
-			canvasData.canvas.objects.forEach((objectsItem:any) => {
-				if(objectsItem.type == 'image')objectsItem.minioUrl = getMinioUrl(objectsItem.src)
-			});
+			function deepProcessObjects(data:any, callback:any) {
+				if (!Array.isArray(data)) return data;
+				return data.map(item => {
+					callback(item)
+					const processedItem = {...item};
+					if (processedItem.objects && 
+						Array.isArray(processedItem.objects) && 
+						processedItem.objects.length > 0) {
+					processedItem.objects = deepProcessObjects(processedItem.objects, callback);
+					}
+					return processedItem;
+				});
+			}
+			canvasData.canvas.objects = deepProcessObjects(canvasData.canvas.objects,(item:any)=>{
+				if(item.type == 'image')item.minioUrl = getMinioUrl(item.src)
+			})
 			let blob = new Blob([JSON.stringify(canvasData)], { type: "application/json" });
 			let formData = new FormData();
 			formData.append("file", blob, "data.json");
diff --git a/src/component/home/tools/deReconstruction/index.vue b/src/component/home/tools/deReconstruction/index.vue
index e6d7c772..2c8577f2 100644
--- a/src/component/home/tools/deReconstruction/index.vue
+++ b/src/component/home/tools/deReconstruction/index.vue
@@ -206,11 +206,22 @@ export default defineComponent({
 			if(!canvasJSON)return
 			if(!store.state.Workspace.probjects?.id)return
 			let canvasData = JSON.parse(canvasJSON)
-			console.log(canvasData)
-			canvasData.canvas.objects.forEach((objectsItem:any) => {
-				if(objectsItem.type == 'image')objectsItem.minioUrl = getMinioUrl(objectsItem.src)
-				
-			});
+			function deepProcessObjects(data:any, callback:any) {
+				if (!Array.isArray(data)) return data;
+				return data.map(item => {
+					callback(item)
+					const processedItem = {...item};
+					if (processedItem.objects && 
+						Array.isArray(processedItem.objects) && 
+						processedItem.objects.length > 0) {
+					processedItem.objects = deepProcessObjects(processedItem.objects, callback);
+					}
+					return processedItem;
+				});
+			}
+			canvasData.canvas.objects = deepProcessObjects(canvasData.canvas.objects,(item:any)=>{
+				if(item.type == 'image')item.minioUrl = getMinioUrl(item.src)
+			})
 			let blob = new Blob([JSON.stringify(canvasData)], { type: "application/json" });
 			let formData = new FormData();
 			formData.append("file", blob, "data.json");
diff --git a/src/component/mainPage/signUp/registerModel.vue b/src/component/mainPage/signUp/registerModel.vue
index 210742fd..9b3d52ed 100644
--- a/src/component/mainPage/signUp/registerModel.vue
+++ b/src/component/mainPage/signUp/registerModel.vue
@@ -79,7 +79,7 @@
 										Forgot password？
 									</div> -->
                 </div>
-                <div class="password_input_block">
+                <div class="password_input_block" v-show="emailStap !== 2">
                   <div v-show="passwordConditionShow" class="conditionShow">
                     <div class="item">
                       <div class="icon">
@@ -144,12 +144,13 @@
                     @click="changePasswordType()"
                   ></div>
                 </div>
-                <span style="font-weight: 400; opacity: 0.7"
+                <span style="font-weight: 400; opacity: 0.7"  v-show="emailStap !== 2"
                   >{{ userI18n[selectUserI18n].inputPasswordTip }}</span
                 >
-                <div class="login_form_title marign_top30">{{ userI18n[selectUserI18n].Email }}</div>
+                <div class="login_form_title marign_top30"  v-show="emailStap !== 2">{{ userI18n[selectUserI18n].Email }}</div>
                 <input
                   class="login_form_input"
+				   v-show="emailStap !== 2"
                   :placeholder="userI18n[selectUserI18n].inputEmail"
                   v-model="email"
                   @keydown.enter="submitPerLogin()"
@@ -917,6 +918,7 @@ export default defineComponent({
         position: relative;
 		@media (max-width: 768px) {
 			margin-top: 2.4rem;
+			height: 20rem;
 		}
         &[state="2"] {
           > * {
@@ -1015,6 +1017,9 @@ export default defineComponent({
         // margin-top: 4rem;
         .email_last_step_bottom {
           padding: 0 40px;
+			@media (max-width: 767px) {
+				padding: 0 2rem;	
+			}
         }
         .email_last_step_block {
           padding: 10px;
@@ -1028,6 +1033,10 @@ export default defineComponent({
             font-size: 2.2rem;
             font-weight: bold;
             color: #030303;
+			@media (max-width: 767px) {
+				font-size: 1.2rem;
+				margin-left: .5rem;
+			}
           }
           .email_last_step_block_icon {
             cursor: pointer;
@@ -1229,6 +1238,9 @@ export default defineComponent({
     font-weight: bold;
     color: #000;
     cursor: pointer;
+	@media (max-width: 767px) {
+		font-size: 1rem;
+	}
   }
 
   .email_last_step_des {
@@ -1237,16 +1249,25 @@ export default defineComponent({
     justify-content: space-between;
     margin-top: 4rem;
     margin-bottom: 2rem;
-
+	@media (max-width: 767px) {
+		margin-top: 2rem;
+		margin-bottom: 1rem;
+	}
     .sent_email_content {
       font-size: 1.8rem;
       font-weight: bold;
       color: #a5b0c2;
+	  @media (max-width: 767px) {
+		font-size: 1.2rem;
+	  }
     }
 
     .email_tip_content {
       font-size: 1.4rem;
       color: #030303;
+		@media (max-width: 767px) {
+			font-size: 1.2rem;
+		}
     }
   }
 }
diff --git a/src/component/modules/generalMiniCanvas.vue b/src/component/modules/generalMiniCanvas.vue
index 7c8cb384..2e7bd00d 100644
--- a/src/component/modules/generalMiniCanvas.vue
+++ b/src/component/modules/generalMiniCanvas.vue
@@ -2,11 +2,13 @@
 	<div class="generalCanvas">
 		<div class="canvasBox" ref="canvasBox">
 			<editCanvas v-if="canvasLoad" :config="canvasConfig" 
+				:title="canvasTitle"
 				@canvasInit="canvasInit"
 				@changeCanvas="changeCanvas"
 				is-general
 				:hideCanvas="hideCanvas"
 				:isBackgroundChangeable="false"
+				:isChangeCanvasSize="isChangeCanvasSize"
 				ref="editCanvas"></editCanvas>
 		</div>
 		<div class="btn" v-if="btnShow">
@@ -35,6 +37,14 @@ export default defineComponent({
 		editCanvas,
     },
 	props:{
+		canvasTitle:{
+			type:String,
+			default:''
+		},
+		isChangeCanvasSize:{
+			type:Boolean,
+			default:true
+		},
 		imgUrl:{
 			type:String,
 			default:''
@@ -174,6 +184,7 @@ export default defineComponent({
         return {
 			...toRefs(data),
 			...toRefs(dataDom),
+			...toRefs(props),
 			isShowMark,
 			canvasLoadAddImg,
 			getCanvasData,
diff --git a/src/component/toolsPage/index.vue b/src/component/toolsPage/index.vue
index 8b3e72ed..84828edb 100644
--- a/src/component/toolsPage/index.vue
+++ b/src/component/toolsPage/index.vue
@@ -165,9 +165,22 @@ export default defineComponent({
 			time = setTimeout(()=>{
 				let canvasData = JSON.parse(canvasJSON)
 				if(!canvasData)return
-				canvasData.canvas.objects.forEach((objectsItem:any) => {
-					if(objectsItem.type == 'image')objectsItem.minioUrl = getMinioUrl(objectsItem.src)
-				});
+				function deepProcessObjects(data:any, callback:any) {
+					if (!Array.isArray(data)) return data;
+					return data.map(item => {
+						callback(item)
+						const processedItem = {...item};
+						if (processedItem.objects && 
+							Array.isArray(processedItem.objects) && 
+							processedItem.objects.length > 0) {
+						processedItem.objects = deepProcessObjects(processedItem.objects, callback);
+						}
+						return processedItem;
+					});
+				}
+				canvasData.canvas.objects = deepProcessObjects(canvasData.canvas.objects,(item:any)=>{
+					if(item.type == 'image')item.minioUrl = getMinioUrl(item.src)
+				})
 				let blob = new Blob([JSON.stringify(canvasData)], { type: "application/json" });
 				let formData = new FormData();
 				formData.append("file", blob, "data.json");
diff --git a/src/lang/cn.ts b/src/lang/cn.ts
index e8e9ef8e..2ec36b83 100644
--- a/src/lang/cn.ts
+++ b/src/lang/cn.ts
@@ -1147,6 +1147,11 @@ export default {
     System: '系统',
     Library: '库'
   },
+  CanvasTitle: {
+	ModifySketch: '修改草图',
+	ModifyItem: '修改单品',
+	RedGreen: '编辑前片后片',
+  },
   Canvas: {
     Canvas: '画布',
     layer: '图层',
diff --git a/src/lang/en.ts b/src/lang/en.ts
index c35c602d..1794a793 100644
--- a/src/lang/en.ts
+++ b/src/lang/en.ts
@@ -1181,6 +1181,11 @@ export default {
     System: 'System',
     Library: 'Library'
   },
+  CanvasTitle: {
+	ModifySketch: 'Modify Sketch',
+	ModifyItem: 'Modify Item',
+	RedGreen: 'Front and back section',
+  },
   Canvas: {
     Canvas: 'Canvas',
     layer: 'Layer',
diff --git a/src/views/HomeView/library.vue b/src/views/HomeView/library.vue
index ae57cb0c..79c3191f 100644
--- a/src/views/HomeView/library.vue
+++ b/src/views/HomeView/library.vue
@@ -1814,6 +1814,8 @@ export default defineComponent({
 							
 						}
 					});
+				}else{
+					this.generateList[selectCodeStr] = this.generateList[selectCodeStr].filter((item: any) => item.imgUrl)
 				}
             });
 		},
@@ -2420,6 +2422,7 @@ export default defineComponent({
 											display: flex;
 											align-items: center;
 											justify-content: center;
+											position: absolute;
 										}
                                         &:hover .img_item_hover{
                                             // display: block;
diff --git a/src/views/Upgrade.vue b/src/views/Upgrade.vue
index 3ce53e10..a32762e0 100644
--- a/src/views/Upgrade.vue
+++ b/src/views/Upgrade.vue
@@ -8,15 +8,15 @@
 			<!-- <div class="upgrade-content-text">System upgrading</div> -->
 			<div class="upgrade-content-text">System maintenance</div>
 			<!-- 没有截至时间 -->
-			<div class="upgrade-content-textab">The AiDA system cannot be accessed temporarily due to system server maintenance. We apologize for any inconvenience this may cause and thank you for your understanding.</div>
+			<!-- <div class="upgrade-content-textab">The AiDA system cannot be accessed temporarily due to system server maintenance. We apologize for any inconvenience this may cause and thank you for your understanding.</div> -->
 			<!-- <div class="upgrade-content-textab">Due to the system server upgrade, we will start the upgrade from 9:30 am Hong Kong time on the weekend of October 20th until October 21st. During this time,<br> the AiDA system will be temporarily inaccessible. We apologize for any inconvenience this may cause and thank you for your understanding.</div> -->
 			<!-- 有截至时间 -->
-			<!-- <div class="upgrade-content-textab">Due to system server upgrades, we will be upgrading from Tuesday, September 2 at 00:00 (HKT) to Wednesday, September 3 at 00:00. During this period, the AiDA system will be temporarily inaccessible. <br>We sincerely apologize for the inconvenience caused and thank you for your understanding</div> -->
+			<div class="upgrade-content-textab">Due to system server upgrades, maintenance will be carried out from 21:00 to 22:00 on December 19.<br>The AiDA system will be temporarily unavailable during this period. We sincerely apologize for any inconvenience caused and thank you for your understanding.</div>
 			<br>
 			<br>
 			<br>
-			<div class="upgrade-content-textab">由于系统服务器维护，AiDA系统暂时无法访问。对于由此造成的任何不便，我们深表歉意，并感谢您的理解</div>
-			<!-- <div class="upgrade-content-textab">由于系统服务器升级，我们将于9月2日（星期二）凌晨00:00（香港时间）至9月3日（星期三）凌晨00:00进行升级。<br>在此期间，AiDA系统将暂时无法访问。给您带来的不便，我们深表歉意，并感谢您的理解</div> -->
+			<!-- <div class="upgrade-content-textab">由于系统服务器维护，AiDA系统暂时无法访问。对于由此造成的任何不便，我们深表歉意，并感谢您的理解</div> -->
+			<div class="upgrade-content-textab">由于系统服务器升级，我们将于12月19日21:00 至12月19日22:00进行升级。<br>在此期间，AiDA系统将暂时无法访问。给您带来的不便，我们深表歉意，并感谢您的理解</div>
 		</div>
 	</div>
 </template>