Merge branch 'StableVersion' of ssh://18.167.251.121:10002/aidlab/aida_front into StableVersion

2026-01-15 10:47:57 +08:00
parent cc0127f195 f4043d6f61
commit fb1bfc353c
56 changed files with 3384 additions and 1719 deletions
--- a/src/component/Administrator/SE/allUser/addAllUser.vue
+++ b/src/component/Administrator/SE/allUser/addAllUser.vue
@@ -17,7 +17,8 @@
    <div class="generalModel_btn">
      <div class="generalModel_closeIcon" @click.stop="cancelDsign()">
        <svg
-          width="100%" height="100%"
+          width="100%"
+          height="100%"
          viewBox="0 0 46 46"
          fill="none"
          xmlns="http://www.w3.org/2000/svg"
@@ -49,7 +50,10 @@
    </div>
    <div class="allUserPoeration_center admin_page">
      <div class="admin_state_item">
-        <span>{{ $t('admin.UserName') }}: <span>*</span></span>
+        <span>
+          {{ $t('admin.UserName') }}:
+          <span>*</span>
+        </span>
        <input
          v-model="userName"
          :placeholder="$t('admin.enterUserName')"
@@ -58,7 +62,10 @@
        />
      </div>
      <div class="admin_state_item">
-        <span>{{ $t('admin.UserEmail') }}: <span>*</span></span>
+        <span>
+          {{ $t('admin.UserEmail') }}:
+          <span>*</span>
+        </span>
        <input
          v-model="userEmail"
          :placeholder="$t('admin.enterEmail')"
@@ -67,7 +74,10 @@
        />
      </div>
      <div class="admin_state_item">
-        <span>{{ $t('admin.Password') }}: <span>*</span></span>
+        <span>
+          {{ $t('admin.Password') }}:
+          <span>*</span>
+        </span>
        <input
          @focus="focus"
          @blur="blur"
@@ -86,6 +96,19 @@
          style="width: 250px"
        />
      </div>
+      <div class="admin_state_item" v-if="title?.value == 'Edit'">
+        <span>
+          {{ $t('admin.SubscribePlan') }}:
+          <span>*</span>
+        </span>
+        <a-select
+          v-model:value="subscriptionPlanId"
+          style="width: 250px"
+          :options="activePlanOptions"
+          :field-names="{ label: 'name', value: 'id' }"
+          :placeholder="$t('admin.SelectPlan')"
+        ></a-select>
+      </div>
    </div>
    <div class="allUserPoeration_btn admin_page">
      <div class="admin_search_item" @click="cancelDsign">{{ $t('admin.Close') }}</div>
@@ -96,7 +119,7 @@
    <a-spin size="large" />
  </div>
 </template>
-<script>
+<script lang="ts">
 import {
  defineComponent,
  ref,
@@ -105,90 +128,114 @@ import {
  onMounted,
  nextTick,
  toRefs,
-} from "vue";
-import { Https } from "@/tool/https";
-import { Modal, message } from "ant-design-vue";
-import { ExclamationCircleOutlined } from "@ant-design/icons-vue";
-import { formatTime, isEmail } from "@/tool/util";
-import md5 from "md5";
+  computed
+} from 'vue'
+import { Https } from '@/tool/https'
+import { Modal, message } from 'ant-design-vue'
+import { ExclamationCircleOutlined } from '@ant-design/icons-vue'
+import { formatTime, isEmail } from '@/tool/util'
+import md5 from 'md5'
 import { useI18n } from 'vue-i18n'
 export default defineComponent({
  components: {},
-  emits: ["searchHistoryList"],
+  props: {
+    planOptions: {
+      type: Array,
+      default: () => []
+    }
+  },
+  emits: ['searchHistoryList'],
  setup(props, { emit }) {
-	const {t} = useI18n()
+    const { t } = useI18n()
+    const { planOptions } = toRefs(props)
+    // 筛选出状态为 ACTIVE 的订阅计划
+    const activePlanOptions = computed(() => {
+      if (!planOptions.value || !Array.isArray(planOptions.value)) {
+        return []
+      }
+      return planOptions.value.filter((plan: any) => plan.status === 'ACTIVE')
+    })
    let operations = reactive({
      operationsModal: false,
      operationsEdit: false,
      loadingShow: false,
-      title: null,
-    });
+      title: null
+    })
    let operationsData = reactive({
      accountId: -1,
-      userName: "",
-      userEmail: "",
-      password: "",
-      oldPassword: "",
-      credits: "",
-    });
+      userName: '',
+      userEmail: '',
+      password: '',
+      oldPassword: '',
+      credits: '',
+      subscriptionPlanId: '',
+      oldSubscriptionPlanId: ''
+    })
    let state = ref([
      {
-        label: "visitor",
-        value: "0",
+        label: 'visitor',
+        value: '0'
      },
      {
-        label: "yearly",
-        value: "1",
+        label: 'yearly',
+        value: '1'
      },
      {
-        label: "monthly",
-        value: "2",
+        label: 'monthly',
+        value: '2'
      },
      {
-        label: "trial",
-        value: "3",
-      },
-    ]);
+        label: 'trial',
+        value: '3'
+      }
+    ])
    let init = (funStr, data) => {
-      operations.operationsModal = true;
-      operations.operationsEdit = true;
-      operations.title = funStr;
-      if (funStr.value == "Add") operations.operationsEdit = false;
-      if (funStr.value == "Edit") {
-        operationsData.accountId = data.id;
-        operationsData.userName = data.userName;
-        operationsData.userEmail = data.userEmail;
-        operationsData.password = data.userPassword?data.userPassword:null;
-        operationsData.oldPassword = data.userPassword;
+      operations.operationsModal = true
+      operations.operationsEdit = true
+      operations.title = funStr
+      if (funStr.value == 'Add') operations.operationsEdit = false
+      if (funStr.value == 'Edit') {
+        operationsData.accountId = data.id
+        operationsData.userName = data.userName
+        operationsData.userEmail = data.userEmail
+        operationsData.password = data.userPassword ? data.userPassword : null
+        operationsData.oldPassword = data.userPassword
        // operationsData.validStartTime='2024-08-05T00:00:06'
        // operationsData.validEndTime='2024-08-05T00:00:06'
-        operationsData.credits = data.creditsUsageLimit;
+        operationsData.credits = data.creditsUsageLimit
+        operationsData.subscriptionPlanId = data.subscriptionPlanId || ''
+        operationsData.oldSubscriptionPlanId = data.subscriptionPlanId || ''
        // operationsData.accountId = data.accountId
        // operationsData.userName = data.userName
        // operationsData.userEmail = data.userEmail
        // operationsData.validStartTime = formatTime(data.validStartTime)
        // operationsData.validEndTime = formatTime(data.validEndTime)
      }
-    };
-    let focus = (event) => {
+      if (funStr.value == 'Add') {
+        operationsData.subscriptionPlanId = ''
+        operationsData.oldSubscriptionPlanId = ''
+      }
+    }
+    let focus = event => {
      if (operationsData.password == operationsData.oldPassword) {
-        operationsData.password = "";
+        operationsData.password = ''
      }
-    };
-    let blur = (event) => {
-      console.log(operationsData.password == "" && operationsData.oldPassword);
-      if (operationsData.password == "" && operationsData.oldPassword) {
-        operationsData.password = operationsData.oldPassword;
+    }
+    let blur = event => {
+      console.log(operationsData.password == '' && operationsData.oldPassword)
+      if (operationsData.password == '' && operationsData.oldPassword) {
+        operationsData.password = operationsData.oldPassword
      }
-    };
+    }
    let setAddData = () => {
      return {
        creditsUsageLimit: operationsData.credits,
        userEmail: operationsData.userEmail,
-        userPassword: operationsData.password?md5(operationsData.password + "abc"):'',
+        userPassword: operationsData.password ? md5(operationsData.password + 'abc') : '',
        userName: operationsData.userName,
-      };
-    };
+        subscriptionPlanId: operationsData.subscriptionPlanId
+      }
+    }
    let setEditData = () => {
      return {
        id: operationsData.accountId,
@@ -198,57 +245,63 @@ export default defineComponent({
        userPassword:
          operationsData.password == operationsData.oldPassword
            ? null
-            : md5(operationsData.password + "abc"),
-      };
-    };
-    let cancelDsign = () => {
-      operationsData.accountId = -1;
-      operationsData.userName = "";
-      operationsData.userEmail = "";
-      operationsData.password = "";
-      operationsData.credits = "";
-      operations.operationsModal = false;
-    };
-    let setOk = () => {
-      let data;
-      if (operations.title?.value == "Add") {
-        data = setAddData();
-        if (!isEmail(data.userEmail)) {
-          message.info(t('admin.jsContent1'));
-          return;
-        }
-        if (
-          !data.userName ||
-          !data.userEmail ||
-          !data.userPassword
-        )
-          return message.warning(t('admin.jsContent2'));
-        Https.axiosPost(Https.httpUrls.addOrUpdateSubAccount, data).then(
-          (rv) => {
-            if (rv) {
-              cancelDsign();
-              emit("searchHistoryList");
-            }
-          }
-        );
-      } else {
-        data = setEditData();
-        if (!isEmail(data.userEmail)) {
-          message.info("The email format is incorrect");
-          return;
-        }
-        if (!data.userName || !data.userEmail)
-          return message.warning("Please check the input box marked with *");
-        Https.axiosPost(Https.httpUrls.addOrUpdateSubAccount, data).then(
-          (rv) => {
-            if (rv) {
-              cancelDsign();
-              emit("searchHistoryList");
-            }
-          }
-        );
+            : md5(operationsData.password + 'abc'),
+        subscriptionPlanId: operationsData.subscriptionPlanId
      }
-    };
+    }
+    let cancelDsign = () => {
+      operationsData.accountId = -1
+      operationsData.userName = ''
+      operationsData.userEmail = ''
+      operationsData.password = ''
+      operationsData.credits = ''
+      operationsData.subscriptionPlanId = ''
+      operationsData.oldSubscriptionPlanId = ''
+      operations.operationsModal = false
+    }
+    let setOk = () => {
+      let data
+      if (operations.title?.value == 'Add') {
+        data = setAddData()
+        if (!isEmail(data.userEmail)) {
+          message.info(t('admin.jsContent1'))
+          return
+        }
+        if (!data.userName || !data.userEmail || !data.userPassword)
+          return message.warning(t('admin.jsContent2'))
+        Https.axiosPost(Https.httpUrls.addOrUpdateSubAccount, data).then(rv => {
+          if (rv) {
+            cancelDsign()
+            emit('searchHistoryList')
+          }
+        })
+      } else {
+        data = setEditData()
+        if (!isEmail(data.userEmail)) {
+          message.info('The email format is incorrect')
+          return
+        }
+        if (!data.userName || !data.userEmail || !data.subscriptionPlanId)
+          return message.warning('Please check the input box marked with *')
+        const needSwitchPlan =
+          operationsData.subscriptionPlanId &&
+          operationsData.subscriptionPlanId !== operationsData.oldSubscriptionPlanId
+        Https.axiosPost(Https.httpUrls.addOrUpdateSubAccount, data).then(async rv => {
+          if (rv) {
+            if (needSwitchPlan) {
+              await Https.axiosGet(Https.httpUrls.switchSubAccountSubscribePlan, {
+                params: {
+                  targetSubscriptionPlanId: operationsData.subscriptionPlanId,
+                  subAccId: operationsData.accountId
+                }
+              })
+            }
+            cancelDsign()
+            emit('searchHistoryList')
+          }
+        })
+      }
+    }
    return {
      ...toRefs(operations),
      ...toRefs(operationsData),
@@ -258,14 +311,16 @@ export default defineComponent({
      focus,
      blur,
      setOk,
-    };
+      planOptions,
+      activePlanOptions
+    }
  },
  data() {
-    return {};
+    return {}
  },
  mounted() {},
-  methods: {},
-});
+  methods: {}
+})
 </script>
 <style lang="less" scoped>
 :deep(.allUserPoeration_modal) {
--- a/src/component/Administrator/SE/allUser/index.vue
+++ b/src/component/Administrator/SE/allUser/index.vue
@@ -16,29 +16,6 @@
            </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
@@ -53,19 +30,6 @@
            @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">
@@ -116,6 +80,24 @@
      </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"
@@ -147,12 +129,6 @@
            <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>
@@ -160,7 +136,31 @@
    <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">
@@ -171,19 +171,23 @@ import {
  computed,
  reactive,
  toRefs,
-  onMounted
+  unref,
+  watch
 } 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 { 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 },
+  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
@@ -202,6 +206,7 @@ export default defineComponent({
        }
      })
    })
+
    const { t } = useI18n()

    let filterData: any = reactive({
@@ -217,10 +222,16 @@ export default defineComponent({
      systemUser: '',
      order: '', //'Ascending  升序 Descending 降序'
      orderBy: '',
-      userName: ''
+      userName: '',
+      subscriptionPlanId: ''
    })

    let renameData: any = ref({}) //修改名字选中的数据
+    const renamePlanModalVisible = ref(false)
+    const renamePlanForm = reactive({
+      planId: null as number | null,
+      planName: ''
+    })
    const columns: any = computed(() => {
      return [
        {
@@ -247,13 +258,6 @@ export default defineComponent({
          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'),
@@ -277,10 +281,6 @@ export default defineComponent({
        {
          title: t('admin.Credits'),
          align: 'center',
-          // width: 150,
-          // minWidth: 100,
-          // maxWidth: 200,
-          // resizable: true,
          dataIndex: 'credits',
          key: 'credits',
          width: 100,
@@ -308,7 +308,6 @@ export default defineComponent({
          width: 120,
          align: 'center',
          fixed: 'right',
-          // slots:{customRender:'action'}
          Operations: true
        }
      ]
@@ -353,7 +352,8 @@ export default defineComponent({
        (filterData.order = ''), //'Ascending  升序 Descending 降序'
        (filterData.orderBy = ''), //'Ascending  升序 Descending 降序'
        (filterData.systemUser = ''),
-        (filterData.userName = '')
+        (filterData.userName = ''),
+        (filterData.subscriptionPlanId = '')
    }
    let setHistoryListData = () => {
      let startDate: any = filterData.rangePickerValue?.[0]
@@ -376,18 +376,17 @@ export default defineComponent({
        order: filterData.order,
        orderBy: filterData.orderBy,
        // userName: filterData.userName,
-        userName: filterData.ids
+        userName: filterData.ids,
+        subscriptionPlanId: filterData.subscriptionPlanId
      }
      return data
    }
    //获取列表
-    let gettrialList = () => {
+    const 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
@@ -416,6 +415,66 @@ export default defineComponent({
      // 使用 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') }, '')
    }
@@ -520,6 +579,33 @@ export default defineComponent({
        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) {
@@ -544,7 +630,15 @@ export default defineComponent({
      ExportAccountData,
      uploadTemplate,
      deleteList,
-      deleteAagree
+      deleteAagree,
+      planFilterOptions,
+      selectPlanFilter,
+      openPlanRenameModal,
+      renamePlanModalVisible,
+      renamePlanForm,
+      confirmRenamePlan,
+      cancelRenamePlan,
+      fetchSubscribePlanList
    }
  },
  data() {
@@ -556,13 +650,35 @@ export default defineComponent({
    }
  },
  mounted() {
-    let historyTable: any = this.$refs.historyTable
-    this.historyTableHeight = historyTable.clientHeight - 200
+    this.updateTableHeight()
+    window.addEventListener('resize', this.updateTableHeight)
  },
-  methods: {}
+  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%;
+}
+.admin_table_content {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
+}
 .admin_page .admin_table_search .admin_state {
  display: flex;
  width: 70%;
@@ -578,10 +694,83 @@ export default defineComponent({
    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 ;
+      overflow: hidden;
    }
  }
 }
--- a/src/component/Administrator/subscriptionPlan.vue
+++ b/src/component/Administrator/subscriptionPlan.vue
--- a/src/component/Canvas/CanvasEditor/index.vue
+++ b/src/component/Canvas/CanvasEditor/index.vue
@@ -902,7 +902,7 @@ const changeCanvas = async (command) => {
    ...command, // 传递完整的命令数据
  };
  emit("changeCanvas", commandData);
-  if (command.canUndo || command.canRedo) {
+  if ((command.canUndo || command.canRedo) && props.enabledRedGreenMode) {
    setTimeout(async () => {
      const imageData = await canvasManager.exportImage({
        restoreOpacityInRedGreen: true, // 恢复红绿图模式下的透明度
--- a/src/component/Canvas/CanvasEditor/managers/ExportManager.js
+++ b/src/component/Canvas/CanvasEditor/managers/ExportManager.js
@@ -555,23 +555,17 @@ export class ExportManager {
      );
    }

-    // 获取固定图层对象的边界矩形（包含位置、尺寸、缩放等信息）
-    const fixedBounds = fixedLayerObject?.getBoundingRect?.();
-
    // 使用固定图层的实际显示尺寸作为导出画布尺寸
-    const canvasWidth = Math.round(fixedBounds.width);
-    const canvasHeight = Math.round(fixedBounds.height);
+    const canvasWidth = Math.round(fixedLayerObject.width * fixedLayerObject.scaleX);
+    const canvasHeight = Math.round(fixedLayerObject.height * fixedLayerObject.scaleY);

    console.log(`红绿图模式导出，画布尺寸: ${canvasWidth}x${canvasHeight}`);
-    console.log("固定图层边界:", fixedBounds);

    // 创建固定尺寸的临时画布
    const scaleFactor = 2; // 高清导出
    const tempCanvas = document.createElement("canvas");
    tempCanvas.width = canvasWidth * scaleFactor;
    tempCanvas.height = canvasHeight * scaleFactor;
-    tempCanvas.style.width = canvasWidth + "px";
-    tempCanvas.style.height = canvasHeight + "px";

    const tempFabricCanvas = new fabric.StaticCanvas(tempCanvas, {
      width: canvasWidth,
@@ -584,8 +578,7 @@ export class ExportManager {

    try {
      // 获取裁剪路径对象（如果存在）
-      const clipPathObject = await this._getClipPathObject(fixedBounds);
-
+      const clipPathObject = await this._getClipPathObject(fixedLayerObject);
      // 克隆并添加所有对象到临时画布，需要调整位置相对于固定图层
      for (let i = 0; i < objectsToExport.length; i++) {
        const obj = objectsToExport[i];
@@ -594,19 +587,20 @@ export class ExportManager {
          restoreOpacityInRedGreen && true
        );
        if (cloned) {
-          // 调整对象位置：将原画布坐标转换为以固定图层为原点的相对坐标
          cloned.set({
-            left: cloned.left - fixedBounds.left,
-            top: cloned.top - fixedBounds.top,
+            left: 0,
+            top: 0,
+			originX: "left",
+			originY: "top",
          });

          // 更新对象坐标
          cloned.setCoords();

          // 设置裁剪路径到对象
-          if (clipPathObject) {
-            cloned.clipPath = clipPathObject;
-          }
+        //   if (clipPathObject) {
+        //     cloned.clipPath = clipPathObject;
+        //   }

          tempFabricCanvas.add(cloned);
        }
--- a/src/component/Detail/DesignDetail.vue
+++ b/src/component/Detail/DesignDetail.vue
@@ -61,7 +61,7 @@
 					<model 
 						ref="model" 
 						:key="positionKey"
-
+						@addDetail="addDetail"
 						@canvasReload="canvasReload" 
 						@detailEdit="detailEdit" 
 						@addSketch="()=>isEditPattern.value = ''"
@@ -78,7 +78,16 @@
 				<div class="item detailRight" :class="{canvas:isEditPattern.value}">
 					<div class="submit">
 					</div>
-					<div class="contentRight" v-if="currentDetailType && !isEditPattern.value">
+					<div class="contentRight" v-if="currentDetailType === 'sketch' && !selectDetail?.newDetail?.[currentDetailType] && !selectDetail.sketchString && !isEditPattern.value">
+						<img 
+							style="width: 100%; height: 100%;object-fit: contain;"
+							:src="
+							'/image/toolsGuide/' +
+							(locale == 'ENGLISH' ? 'detailEN' : 'detailCN') +
+							'.png'
+						" alt="">
+					</div>
+					<div class="contentRight" v-else-if="currentDetailType && !isEditPattern.value">
 						<detailRight ref="detailRight"></detailRight>
 						<div class="btn" 
 							v-show="
@@ -102,7 +111,7 @@
 					</div> -->
 				</div>
 			</div>
-			
+			<addDetails ref="addDetails" @setSloganData="setSloganData"></addDetails>
        </a-modal>
         <div class="mark_loading" v-show="loadingShow">
            <a-spin size="large" />
@@ -128,17 +137,18 @@ import { useI18n } from 'vue-i18n'
 import addDetails from '@/component/Detail/addDetails.vue'
 export default defineComponent({
    components:{
-		detailLeft,model,detailRight,canvasBox
+		detailLeft,model,detailRight,canvasBox,addDetails
    },
 	emits:['destroy'],
    setup(props,{emit}) {
        const store = useStore();
-      
+		const {locale} = useI18n()
 		const detailDom = reactive({
 			model:null,
 			canvasBox,
 			detailRight,
 			detailLeft:null as any,
+			addDetails:null as any,
 		})
 		const userDetail = computed(()=>{
 			return store.state.UserHabit.userDetail
@@ -506,6 +516,17 @@ export default defineComponent({
 			sessionStorage.setItem('revocation', JSON.stringify(revocation));
 			sessionStorage.setItem('oppositeRevocation',JSON.stringify([]));
 		}
+
+		const addDetail = () =>{
+			let addDetails:any = detailDom.addDetails
+			addDetails.init(detailData.selectDetail,'')
+		}
+		const setSloganData = (data:any)=>{
+			detailData.selectDetail.sketchString = data
+			if(detailData.currentDetailType == 'sketch' && detailData.selectDetail?.newDetail?.sketch){
+				detailData.selectDetail.newDetail.sketch = null
+			}
+		}
 		onMounted(()=>{
 			window.addEventListener('resize', handleResize);
 		})
@@ -518,6 +539,7 @@ export default defineComponent({
 		})
 		
        return{
+			locale,
 			...toRefs(detailDom),
 			...toRefs(detailData),
            closeModal,
@@ -531,6 +553,8 @@ export default defineComponent({
 			canvasReload,
 			modelOnLoad,
 			sketchSysToLibrary,
+			addDetail,
+			setSloganData,
        }
    },
 	
--- a/src/component/Detail/detailLeft/index.vue
+++ b/src/component/Detail/detailLeft/index.vue
@@ -6,7 +6,6 @@
 		<element v-show="currentDetailType == 'element'"></element>
 		<accessory v-show="currentDetailType == 'accessory'"></accessory>
 		<models v-show="currentDetailType == 'models'"></models>
-		<addDetails ref="addDetails" @setSloganData="setSloganData"></addDetails>
    </div>
 </template>
 <script lang="ts">
@@ -22,12 +21,12 @@ import color from './colorBox/index.vue'
 import element from './element.vue'
 import accessory from './accessory.vue'
 import models from './models.vue'
-import addDetails from '@/component/Detail/addDetails.vue'

 export default defineComponent({
    components:{
-		sketch,print,color,addDetails,element,models,accessory
+		sketch,print,color,element,models,accessory
    },
+	emit:['addDetail'],
    setup(props,{emit}) {
        const store = useStore();
 		const detailData = reactive({
@@ -45,14 +44,7 @@ export default defineComponent({
 			sketch:null as any,
 		})
 		const addDetail = () =>{
-			let addDetails:any = getDetailListDom.addDetails
-			addDetails.init(detailData.selectDetail,'')
-		}
-		const setSloganData = (data:any)=>{
-			detailData.selectDetail.sketchString = data
-			if(detailData.currentDetailType == 'sketch' && detailData.selectDetail?.newDetail?.sketch){
-				detailData.selectDetail.newDetail.sketch = null
-			}
+			emit('addDetail')
 		}
 		const sketchSysToLibrary = ()=>{//系统sketch添加到library更新library
 			getDetailListDom.sketch.sketchSysToLibrary()
@@ -63,7 +55,6 @@ export default defineComponent({
 			...toRefs(getDetailListData),
 			...toRefs(getDetailListDom),
 			addDetail,
-			setSloganData,
 			sketchSysToLibrary,
        }
    },
--- a/src/component/Detail/detailLeft/module/libraryList.vue
+++ b/src/component/Detail/detailLeft/module/libraryList.vue
@@ -350,6 +350,7 @@ export default defineComponent({
 			margin-top: 1rem;
 			justify-content: space-between;
 			align-content: flex-start;
+			padding-bottom: 2rem;
 			// &::-webkit-scrollbar{display: none;}
 			> .content_img_item{
 				width: calc((50% - 1rem));
@@ -368,9 +369,12 @@ export default defineComponent({
 			> .material_content_list_loding{
 				width: 100%;
 				aspect-ratio: 1/1;
+				height: 4rem;
 				overflow: hidden;
 				> img{
 					width: 100%;
+					height: 100%;
+					object-fit: contain;
 				}
 			}
 		}
--- a/src/component/Detail/detailLeft/sketch.vue
+++ b/src/component/Detail/detailLeft/sketch.vue
@@ -5,7 +5,7 @@
 			<!-- <img :src="selectDetail?.sketchString?selectDetail?.sketchString:selectDetail.path" alt=""> -->
 			<img :src="selectDetail.path" alt="">
 			<!-- <img :src="selectDetail.sketchString || selectDetail.path" alt=""> -->
-			<i :title="$t('DesignDetail.editSketchTitle')" class="fi fi-rs-pencil-paintbrush" @click.stop="openAddDetail"></i>
+			<!-- <i :title="$t('DesignDetail.editSketchTitle')" class="fi fi-rs-pencil-paintbrush" @click.stop="openAddDetail"></i> -->
 		</div>
 		<div class="select_sketch" v-else>
 			<div>
--- a/src/component/Detail/model/index.vue
+++ b/src/component/Detail/model/index.vue
@@ -14,6 +14,7 @@
 				<i class="icon iconfont icon-chehui" @click="revocation"></i>
 				<i class="icon iconfont icon-fanchehui" @click="oppositeRevocation"></i>
 				<!-- 编辑 -->
+				<i class="fi fi-rs-pencil-paintbrush" :title="$t('DesignDetail.editSketchTitle')" :class="{'pointerEventsNone':!selectDetail?.id}" @click="()=>$emit('addDetail')"></i>
 				<i class="fi fi-rr-edit" :title="$t('DesignDetail.editTitle')" :class="{active:isEditPattern.value == 'canvasEditor','pointerEventsNone':!selectDetail?.id}" @click="showDesignImgDetail('canvasEditor')"></i>

 				<i class="icon iconfont icon-clothes" :title="$t('Canvas.editFrontBack')" style="font-size: 3.2rem;" @click="showDesignImgDetail('redGreenExample')" :class="{active:isEditPattern.value == 'redGreenExample','pointerEventsNone':!selectDetail?.id}"></i>
@@ -50,7 +51,7 @@ export default defineComponent({
    components:{
 		position,modelNav
    },
-	emits:['detailEdit','canvasReload','addSketch','revocation','oppositeRevocation','modelOnLoad','sketchSysToLibrary'],
+	emits:['detailEdit','canvasReload','addSketch','revocation','oppositeRevocation','modelOnLoad','sketchSysToLibrary','addDetail'],
    setup(props,{emit}) {
 		const {t} = useI18n()
        const store = useStore();
--- a/src/component/HomePage/Generate.vue
+++ b/src/component/HomePage/Generate.vue
@@ -1379,6 +1379,7 @@ export default defineComponent({
        display: flex;
        align-items: center;
        justify-content: center;
+		position: absolute;
      }
      img {
        // width: calc(10rem*1.2);
--- a/src/component/HomePage/Material.vue
+++ b/src/component/HomePage/Material.vue
@@ -486,7 +486,7 @@ export default defineComponent({
 		.my_material_header_left{
 			margin-right: auto;
 			.select_block{
-				border: calc(0.1rem* 1.2) solid #F1F1F1;
+				// border: calc(0.1rem* 1.2) solid #F1F1F1;
 				margin-right: calc(2.3rem*1.2);
 				height: auto;
 				.ant-select-selector{
--- a/src/component/HomePage/layout.vue
+++ b/src/component/HomePage/layout.vue
@@ -34,8 +34,8 @@
 					</div>
 				</div>
 				<div class="layout_centent" :class="{active:flex_direction}" id="layoutCentent">
-					<div v-for="item,index in layoutList" :key="item" :class="moodbClassName[index]" class="modal_imgItem" v-layout="item" @mousedown="setpitch(item,index)"  @touchstart="setpitch(item,index)" ref="content" >
-						<img crossOrigin="anonymous" :src="item.imgUrl" :style="{'transform':`translate(-50%, -50%) scale(${item.zoom?item.zoom:1}) rotateZ(${item.angle?item.angle:0}deg)`}"  draggable="false" :class="moodbClassName[index]" v-modelImg> 
+					<div v-for="item,index in layoutList" :key="item" :class="moodbClassName[index]" class="modal_imgItem" v-layout="item" @mousedown="setpitch(item,index)"  @touchstart="setpitch(item,index)" ref="content"  :style="{'background-image':`url(${item.imgUrl})`,'transform':`scale(${item.zoom?item.zoom:1}) rotateZ(${item.angle?item.angle:0}deg)`}">
+						<!-- <img crossOrigin="anonymous" :src="item.imgUrl" :style="{'transform':`translate(-50%, -50%) scale(${item.zoom?item.zoom:1}) rotateZ(${item.angle?item.angle:0}deg)`}"  draggable="false" :class="moodbClassName[index]" v-modelImg>  -->
 						<ul v-show="item.setPitch" class="layout_btn" >
 							<li class="layout_btn_top" v-compile.stop="'top'"></li>
 							<li class="layout_btn_bottom" v-compile.stop="'bottom'"></li>
@@ -736,6 +736,7 @@ export default defineComponent({
 		setmoodb(item:any){
 			this.moodbClassName = item
 			this.$emit('setmoodbClass',this.moodbClassName)
+			this.styleObj.class = this.moodbClassName
 			if(this.content){
 				for (item of (this.content as any)) {
 					item.classList.remove('active')
@@ -772,7 +773,7 @@ export default defineComponent({
 		initDomStyle(){
 			nextTick(()=>{
 				this.content.forEach((item:any,index:any) => {
-					if(this.styleObj.domStyle[index]){
+					if(this.styleObj.domStyle[index]?.left){
 						item.classList.add('active')
 						this.initStyle(item,this.styleObj.domStyle[index])
 					}
@@ -794,7 +795,7 @@ export default defineComponent({
 			})
 		},
 		initStyle(dom:any,style:any){
-			if(!style)return
+			if(!style || !dom)return
 			for (const [property, value] of Object.entries(style)) {
 				
 				dom.style.setProperty(property, value);
@@ -806,7 +807,7 @@ export default defineComponent({
 				this.styleObj.domStyle.push(this.setStyle(item.style))
 				this.domObj.dom.forEach((domName:any,index:any) => {
 					let style = this.domObj.domStyle[index]
-					let dom = item.querySelector(domName)
+					let dom = item.querySelector(domName) || item
 					this.styleObj[style].push(this.setStyle(dom.style))
 				})
 			});
@@ -840,7 +841,6 @@ export default defineComponent({
 					let config:any = {headers:{'Content-Type':'multipart/form-data','Accept':'*/*'  }}
 					Https.axiosPost(Https.httpUrls.elementUpload,param,config)
 					.then((rv: any) => {
-							// console.log(rv);
 							rv.imgUrl = rv.url
 							this.layout = false
 							this.loadingShow = false
@@ -1062,27 +1062,12 @@ export default defineComponent({
 				// 	height: 100%;
 				// }
 				overflow: hidden;
+				background-repeat: no-repeat;
+				background-position: center;
+				background-size: cover;
 				&.active{
 					position: absolute;
 				}
-				img{
-					// object-fit: cover;
-					// width: 100%;
-					// height: 100%;
-					pointer-events: none;
-					float: left;
-					user-select:none;
-					-webkit-user-drag: none;
-					position: absolute;
-					top: 50%;
-					left: 50%;
-					transform: translate(-50%,-50%) scale(1);
-				}
-				::selection {
-						// background: rgba(0,0,0,0);
-						// background: yellow;
-					}
-			
 			}
 		}
 		.wh1{
--- a/src/component/HomePage/renew.vue
+++ b/src/component/HomePage/renew.vue
--- a/src/component/LibraryPage/brandDetail.vue
+++ b/src/component/LibraryPage/brandDetail.vue
@@ -41,7 +41,7 @@
 					<i v-else class="fi fi-br-check" @click="editChek('brandSlogan')"></i>
 				</div>
 			</div>
-			<div class="compute" style="flex:1;text-align: right;" v-show="fall?.list?.length > 0">
+			<div class="compute" style="margin-left: auto;text-align: right;" v-show="fall?.list?.length > 0">
 				<!-- <div @click="setProgress(50)">123123123</div> -->
 				<div class="gallery_btn" @click="compute" :class="{'loading':!(schedule.num == 1||(schedule.num == 0 && !schedule.state))}">
 					{{$t('brandDNA.Compute')}}
@@ -546,6 +546,7 @@ export default defineComponent({
 				}
 				.gallery_btn{
 					&.loading{
+						width: min-content;
 						pointer-events: none;
 						color: #5F5F5F;
 					}
--- a/src/component/LoginPage/googleLogin.vue
+++ b/src/component/LoginPage/googleLogin.vue
@@ -6,7 +6,7 @@
 		<!-- <div class="icon" @click="toGmailLogin"> -->
 		<div class="icon">
 			<img src="@/assets/images/loginPage/gmailIcon.svg" alt="">
-			<span>{{ $props.text }}</span>
+			<span>{{ displayText }}</span>
 		 </div>
    </div>
 </template>
@@ -21,7 +21,7 @@
 		props: {
 			text: {
 				type: String,
-				default: 'Sign in with Google'
+				default: ''
 			}
 		},
 		setup(props, { emit }) {
@@ -108,6 +108,9 @@
 			const toGmailLogin = ()=>{
 				message.info(t('account.canNotUtilize'))
 			}
+			const displayText = computed(() => {
+				return props.text || t('Login.LoginWithGoogle')
+			})
 			onBeforeUnmount(()=>{
 				var existingScript = document.querySelector(`script[src="${data.scriptSrc}"]`);
 				if(existingScript){
@@ -120,6 +123,7 @@
 			})
 			return {
 				toGmailLogin,
+				displayText,
            }
 		},
    })
--- a/src/component/LoginPage/login/personal.vue
+++ b/src/component/LoginPage/login/personal.vue
@@ -553,13 +553,14 @@ export default defineComponent({
 				loginType: "EMAIL",
 				userId: this.userId,
 			};
-			this.$emit('update:isMask',true)
+			this.store.commit('set_loading', true)
 			Https.axiosPost(Https.httpUrls.accountLogin, data)
 				.then((rv: any) => {
-				this.setSuccessLogin(rv);
+					this.setSuccessLogin(rv);
+					this.store.commit('set_loading', false)
 				})
 				.catch((res) => {
-					this.$emit('update:isMask',false)
+					this.store.commit('set_loading', false)
 				});
 		},1000)
    },
@@ -853,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;
--- 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;
--- a/src/component/LoginPage/weiXinLogin.vue
+++ b/src/component/LoginPage/weiXinLogin.vue
@@ -2,7 +2,7 @@
  <div class="Container">
    <div class="icon" @click="openWeiXinModel">
      <img src="@/assets/images/loginPage/weiXinIcon.svg" alt="" />
-      <span>{{ $props.text }}</span>
+      <span>{{ displayText }}</span>
    </div>
    <weiXinModel ref="weiXinModel"></weiXinModel>
  </div>
@@ -18,6 +18,7 @@ import {
  toRefs,
 } from "vue";
 import weiXinModel from "./weiXinModel.vue";
+import { useI18n } from 'vue-i18n'
 export default defineComponent({
  name: "login",
  components: {
@@ -26,20 +27,25 @@ export default defineComponent({
  props: {
    text: {
      type: String,
-      default: "Sign in with Wechat",
+	  default: ''
    },
  },
-  setup() {
+  setup(props) {
    let weiXinDom = reactive({
      weiXinModel: null,
    });
+	const { t } = useI18n()
    const openWeiXinModel = () => {
      weiXinDom.weiXinModel.init();
    };
+	const displayText = computed(() => {
+		return props.text || t('Login.LoginWithWechat')
+	})
    onMounted(() => {});
    return {
      ...toRefs(weiXinDom),
      openWeiXinModel,
+	  displayText,
    };
  },
 });
--- a/src/component/WorksPage/newScaleImage.vue
+++ b/src/component/WorksPage/newScaleImage.vue
@@ -113,8 +113,8 @@
 								<img v-for="item in scaleImageData?.designPythonOutfitList" v-lazy="item.designUrl">
 							</div>
 						</div>
-						<div v-if="userDetail.systemList.indexOf(1) > -1 && scaleImageData.isMine != 1 && scaleImageData.selected != 1 && scaleImageData.openSource != 0" class="started_btn" @click="setChoose" >{{$t('newScaleImage.SecondaryCreation')}}</div>
-						<!-- <div v-if="systemUser.value == 1 && scaleImageData.isMine != 1 && scaleImageData.selected != 1" class="started_btn" @click="setChoose" :title="systemUser.value != 1?$t('newScaleImage.jsContent1'): scaleImageData.openSource == 0?$t('newScaleImage.jsContent2'):''" :class="{active:systemUser.value != 1?true:scaleImageData.openSource == 0}">{{$t('newScaleImage.SecondaryCreation')}}</div> -->
+						<!-- <div v-if="userDetail.systemList.indexOf(1) > -1 && scaleImageData.isMine != 1 && scaleImageData.selected != 1 && scaleImageData.openSource != 0" class="started_btn" @click="setChoose" >{{$t('newScaleImage.SecondaryCreation')}}</div> -->
+						<div v-if="userDetail.systemList.indexOf(1) > -1 && scaleImageData.openSource != 0" class="started_btn" @click="setChoose" >{{$t('newScaleImage.SecondaryCreation')}}</div>
 					</div>
 					<div v-else class="newScaleImage_right_content_generate">
 						<div class="scaleImage_chunk_item content_left_generate_item">
@@ -276,7 +276,6 @@ import { Modal,message } from "ant-design-vue";
 import { useI18n } from 'vue-i18n';
 import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
 import fullScreenImg from '@/component/HomePage/fullScreenImg.vue'
-import { debounce } from 'lodash-es'

 export default defineComponent({
    components:{fullScreenImg},
@@ -438,25 +437,36 @@ export default defineComponent({
 			})
 			
 		}
-		let setChoose =  debounce(async()=>{
-			if(userDetail.value.systemList.indexOf(1) == -1){
-							return message.info(t('newScaleImage.jsContent1'))
-						}
+		let flag = true
+		let setChoose = async()=>{
+			if(!flag) return
+			flag = false
+			try {
+				if(userDetail.value.systemList.indexOf(1) == -1){
+					message.info(t('newScaleImage.jsContent1'))
+					return
+				}

-						const targetDate = new Date('2025-09-01T00:00:00');
-						// 解析输入日期字符串
-						const inputDate = new Date(imgData.scaleImageData.createDate);
-						if(inputDate < targetDate){
-							return message.info(t('newScaleImage.jsContent2'))
-						}
-						if(imgData.scaleImageData.openSource == 0){
-							return message.info(t('newScaleImage.jsContent2'))
-						}
-						let id = await getWorks(imgData.scaleImageData.id)
-								router.push(`/home/history/${id}`)
-								// router.push({name:'home',params: {id:imgData.scaleImageData.id,type:'Works'}})
-						store.commit('setChooseIsDesign',false)
-		},300)
+				const targetDate = new Date('2025-09-01T00:00:00');
+				// 解析输入日期字符串
+				const inputDate = new Date(imgData.scaleImageData.createDate);
+				if(inputDate < targetDate){
+					message.info(t('newScaleImage.jsContent2'))
+					return
+				}
+				if(imgData.scaleImageData.openSource == 0){
+					message.info(t('newScaleImage.jsContent2'))
+					return
+				}
+				store.state.Workspace.cachedRoutes = [];
+				let id = await getWorks(imgData.scaleImageData.id)
+				await router.push(`/home/history/${id}`)
+				store.commit('setChooseIsDesign',false)
+			} finally {
+				// 函数执行完成后恢复为 true，确保无论成功还是失败都能再次点击
+				flag = true
+			}
+		}
 		
 		let setCommentReply = (value:any,str:any)=>{
 				imgData.commentReply.leve1Id = value.id
--- a/src/component/home/design/collection/MoodboardUpload.vue
+++ b/src/component/home/design/collection/MoodboardUpload.vue
@@ -132,8 +132,8 @@
 				</div>
 				<div class="modal_img_max">
 					<div v-if="!modalImg[0]?.id" class="modal_img" id="modal_img" :class="{active:flex_direction}">
-						<div v-for="item,index in layoutList" :class="[moodb_className[index]]"  class="modal_imgItem">
-							<img :src="item.imgUrl" v-modelImg>
+					<!-- <div class="modal_img" id="modal_img" :class="{active:flex_direction}"> -->
+						<div v-for="item,index in layoutList" :class="[moodb_className[index]]" :style="{'background-image':`url(${item.imgUrl})`}" class="modal_imgItem">
 						</div>
 					</div>
 					<div v-else class="modal_img">
@@ -244,30 +244,6 @@ export default defineComponent({
        this.token = getCookie("token") || "";
        this.uploadUrl = getUploadUrl();
    },
-	directives:{
-		modelImg:{
-			mounted(el) {
-				let parentNode = el.parentNode
-				if(parentNode.offsetHeight >= parentNode.offsetWidth){
-					el.style.height = 100+'%'
-					el.style.width = 'auto'
-				}else{
-					el.style.width = 100+'%'
-					el.style.height = 'auto'
-				}
-			},
-			updated (el) {
-				let parentNode = el.parentNode
-				if(parentNode.offsetHeight >= parentNode.offsetWidth){
-					el.style.height = 100+'%'
-					el.style.width = 'auto'
-				}else{
-					el.style.width = 100+'%'
-					el.style.height = 'auto'
-				}
-			}
-		}
-	},
    methods: {
        open(num: Number) {
            this.openClick = num;
@@ -445,7 +421,7 @@ export default defineComponent({
 					}
 				}
 				this.edieShow = true
-				if(this.moodb_[arr.length-1].length == 2){
+				if(this.moodb_[arr.length-1].length == 1){
 					this.moodb_className = this.moodb_[arr.length-1][0]
 				}else{
 					this.moodb_className = this.moodb_[arr.length-1][random]
@@ -628,6 +604,7 @@ export default defineComponent({
 				height: calc(5rem*1.2);
 				overflow-x: hidden;
 				display: flex;
+				
 				&.modal_img::-webkit-scrollbar {
 					display: none;
 				}
@@ -706,16 +683,9 @@ export default defineComponent({
 					position: relative;
 					overflow: hidden;
 					text-align: center;
-					img{
-						position: absolute;
-						top: 50%;
-						left: 50%;
-						transform: translate(-50%,-50%);
-						float: left;
-						object-fit: contain;
-						user-select:none;
-						-webkit-user-drag: none;
-					}
+					background-repeat: no-repeat;
+					background-position: center;
+					background-size: cover;
 				}
 				.wh1{
 					width: 23%;
--- a/src/component/home/design/editDesignType/index.vue
+++ b/src/component/home/design/editDesignType/index.vue
@@ -242,7 +242,16 @@
              </div>
            </div>
            <div class="prompt-input-container" v-show="!showMotion">
-              <div class="title">{{ $t('ProductImg.Prompt') }}</div>
+              <div class="title">
+				<span>{{ $t('ProductImg.Prompt') }}</span>
+				<SvgIcon
+					class="cursor-icon"
+					@click="handleNavigateHelp"
+					name="CHelpFlip"
+					size="18"
+					color="#000"
+				/>
+			  </div>
              <promptInput :content="prompt" ref="promptInputRef" />
            </div>
            <div class="transferPose" v-show="showMotion">
@@ -380,7 +389,7 @@
      <a-spin size="large" />
    </div>
    <template>
-      <Prompt v-if="scaleImageList[scaleImageIndex]?.resultType === 'ToProductImage'" v-model:showModal="showPromptAssist" isDesignPage />
+      <Prompt v-if="scaleImageList[scaleImageIndex]?.resultType === 'ToProductImage'" v-model:showModal="showPromptAssist" />
      <PromptEditProduct v-if="scaleImageList[scaleImageIndex]?.resultType === 'Relight'" v-model:showModal="showPromptAssist" />
    </template>
    <Product
@@ -450,7 +459,7 @@ export default defineComponent({
    let userDetail: any = computed(() => {
      return store.state.UserHabit.userDetail
    })
-    let { t } = useI18n()
+    let { t, locale } = useI18n()
    const textareaRef = useTemplateRef<HTMLTextAreaElement>('textareaRef')
    const videoType = ref(2)
    const showMotion = computed(() => videoType.value === 1)
@@ -599,13 +608,13 @@ export default defineComponent({
    })
    const showPromptAssist = ref(false)
    const handleClickAssistBtn = () => {
-      const { httpType } = store.state.Workspace.probjects
-      const isSingleDesign = httpType === 'SINGLE_DESIGN'
-      if (!isSingleDesign) {
-        const promptText = t('ProductImg.Series')
-        productimg.productimgSearchName = promptText
-        return
-      }
+    //   const { httpType } = store.state.Workspace.probjects
+    //   const isSingleDesign = httpType === 'SINGLE_DESIGN'
+    //   if (!isSingleDesign) {
+    //     const promptText = t('ProductImg.Series')
+    //     productimg.productimgSearchName = promptText
+    //     return
+    //   }
      showPromptAssist.value = true
    }

@@ -1310,7 +1319,13 @@ export default defineComponent({
        return videoType.value === 3 ? false : true
      }
    })
-
+	const handleNavigateHelp = () => {
+      const url =
+        locale === 'CHINESE_SIMPLIFIED'
+          ? 'https://aida-user-manual-chinese.super.site/2b08f755cedd80a985cffdf2af80c538'
+          : 'https://aida-user-manual.super.site/advanced-tool/animated-product-image/to-product-video-prompt-assist '
+      window.open(url,'_blank')
+    }
    onBeforeUnmount(() => {
      clearInterval(prductimgTime)
      clearInterval(remPrductimgTime)
@@ -1374,7 +1389,8 @@ export default defineComponent({
      handlePlayNewVideo,
      isNewVideoPlaying,
      showDropdown,
-      inputPlaceholder
+      inputPlaceholder,
+	  handleNavigateHelp
    }
  },
  data() {
@@ -1786,12 +1802,16 @@ export default defineComponent({
          :deep(.promptInput) {
            box-sizing: border-box;
          }
-          .title {
-            font-weight: 500;
-            color: #000;
-            font-size: 1.7rem;
-            margin-bottom: 1.4rem;
-          }
+		  .title {
+			display: flex;
+			align-items: center;
+			column-gap: 1rem;
+			.cursor-icon {
+				display: flex;
+				width: auto;
+				cursor: pointer;
+			}
+		  }
        }
        .prompt-container {
          margin-top: 4rem;
--- a/src/component/home/design/index.vue
+++ b/src/component/home/design/index.vue
@@ -1200,6 +1200,11 @@ export default defineComponent({
 				likeDesignCollectionList.value.forEach((likeItem:any,index:any)=>{
 					if(likeItem?.childList?.length > 0){
 						let index = likeItem.childList.findIndex((item:any)=>{return item.taskId == listItem})
+						likeItem.childList.forEach((item)=>{
+							if(item.sort > likeItem.childList[index].sort){
+								item.sort -= 1
+							}
+						})
 						likeItem.childList.splice(index,1)
 					}
 				})
--- a/src/component/home/index.vue
+++ b/src/component/home/index.vue
@@ -7,7 +7,7 @@
 			<!-- <div v-show="openType === 'history'" class="function">
 				<design :key="componentKey" ref="design"></design>
 			</div> -->
-			<router-view v-if="
+			<router-view v-show="
 				(openType && openType != 'history' && !routeQuery.id) || 
 				$route.path != '/home'" 
 				@setTask="setTask"
@@ -23,7 +23,7 @@
 			<!-- <div v-else-if="routeQuery.id" class="function">
 				<design :key="componentKey" ref="design"></design>
 			</div> -->
-			<div v-else-if="!routeQuery.history" class="function">
+			<div v-if="!$route.params.id && !routeQuery.id" class="function">
 				<newPorject ref="newPorject" @newProject=newProject></newPorject>
 			</div>
 			<!-- <iframe src="https://kaput-relative-4bb.notion.site/ebd/22a8f755cedd809e98a2c8c6366ee701" width="100%" height="100%" frameborder="0" allowfullscreen /> -->
@@ -55,13 +55,16 @@ export default defineComponent({
 		const data = reactive({
 			openType:'', 
 			componentKey:null,
-			isShowMark:false,
+			isShowMark:true,
 			routeQuery:{} as any,
 			selectObject:computed(()=>store.state.Workspace.probjects) as any,//选择的项目
 			chatData:null as any,
 			dataLoad:true as any,
 			cachedRoutes:computed(()=>store.state.Workspace.cachedRoutes),//
 		})
+		onMounted(()=>{
+			data.isShowMark = false
+		})
 		let settingGetHistory:any = inject('settingGetHistory')
 		const setIsShowMark = (boolean:boolean)=>{
 			data.isShowMark = boolean
--- a/src/component/home/newProject/workspace.vue
+++ b/src/component/home/newProject/workspace.vue
@@ -38,7 +38,7 @@
 			</div>
 			<div class="style marginBottom" v-if="show.style">
 				<div class="text">{{$t('Habit.Style')}}：</div>
-				<div class="center">{{ selectObject?.styleName?selectObject?.styleName:'All' }}</div>
+				<div class="center">{{ selectObject?.styleName?selectObject?.styleName:$t('Header.All') }}</div>
 				<div class="gallery_btn" @click="setStyle">{{ $t('Habit.Select') }}</div>
 			</div>
 			<div class="style brand marginBottom">
--- a/src/component/home/tools/poseTransfer/index.vue
+++ b/src/component/home/tools/poseTransfer/index.vue
@@ -777,6 +777,7 @@ export default defineComponent({
      })
    }
    const likeSetBtn = (id: any, str: string) => {
+		console.log(1111)
      data.likeList.forEach((item: any, index: any) => {
        if (item.id == id && id) {
          if (str == 'zoom') {
@@ -814,6 +815,7 @@ export default defineComponent({
    let likeFile = (item: any, str: any, index: any) => {
      let url
      let value = {}
+	  console.log(props.isDesignPage)
      if (str == 'like') {
        value = {
          likeOrDislike: 'like',
@@ -1669,7 +1671,7 @@ export default defineComponent({
        .ant-upload-select-picture-card {
          width: 100%;
          height: 100%;
-          border: 1px solid #000;
+          border: 0.1rem solid #000;
          background: #fff;
        }
      }
--- a/src/component/home/tools/poseTransfer/promptInput.vue
+++ b/src/component/home/tools/poseTransfer/promptInput.vue
@@ -65,7 +65,7 @@ defineExpose({
 <style lang="less" scoped>
 .promptInput {
  --promptInputBorderRadius: 10px;
-  --promptInputBorder: 2px solid #dcdfe6;
+  --promptInputBorder: 1px solid #000;
  --promptInputPadding: 1.5rem;

  width: 100%;
@@ -86,7 +86,7 @@ defineExpose({
 .sender-container {
  position: relative;
  border-radius: 10px;
-  border: 2px solid #dcdfe6;
+  border: 1px solid #000;
  padding: 1.5rem;
  font-size: 1.8rem;
  .sender-wrapper {
@@ -100,7 +100,7 @@ defineExpose({
 .textarea-container {
  position: relative;
  border-radius: 10px;
-  border: 2px solid #dcdfe6;
+  border: 1px solid #000;
  padding: 1.5rem;
  height: auto;
  font-size: 1.8rem;
--- a/src/component/home/tools/toProduct/Prompt.vue
+++ b/src/component/home/tools/toProduct/Prompt.vue
@@ -121,7 +121,7 @@ const promptList = computed(() => {
    return [t('ProductImg.UploadWithoutModel'), t('ProductImg.UploadWithModel')]
  } else {
    // 如果是从design来的
-    if (isSingleDesign) {
+    if (props.isDesignPage) {
      // SINGLE_DESIGN: 两个提示词
      // 根据年龄和性别选择对应的提示词
      let firstPrompt: string // 不带模特的提示词
@@ -255,8 +255,8 @@ const exampleList = computed(() => {
    }
  } else {
    const { ageGroup, httpType, sex } = store.state.Workspace.probjects
-    const isSingleDesign = httpType === 'SINGLE_DESIGN'
-    if (!isSingleDesign) return {}
+    // const isSingleDesign = httpType === 'SINGLE_DESIGN'
+    // if (!isSingleDesign) return {}
    const isAdult = ageGroup === 'Adult'
    const isFemale = sex === 'Female'
    if (isAdult) {
--- a/src/component/home/tools/toProduct/index.vue
+++ b/src/component/home/tools/toProduct/index.vue
@@ -1101,13 +1101,13 @@ export default defineComponent({

    const showPromptAssist = ref(false)
    const handleClickAssistBtn = () => {
-      const { httpType } = store.state.Workspace.probjects
-      const isSingleDesign = httpType === 'SINGLE_DESIGN'
-      if (props.isDesignPage && !isSingleDesign) {
-        const promptText = t('ProductImg.Series')
-        productImgData.searchName[props.productimgMenu.value] = promptText
-        return
-      }
+      //   const { httpType } = store.state.Workspace.probjects
+      //   const isSingleDesign = httpType === 'SINGLE_DESIGN'
+      //   if (props.isDesignPage && !isSingleDesign) {
+      //     const promptText = t('ProductImg.Series')
+      //     productImgData.searchName[props.productimgMenu.value] = promptText
+      //     return
+      //   }
      showPromptAssist.value = true
    }

@@ -1250,13 +1250,15 @@ export default defineComponent({

    > .item {
      margin-right: 1rem;
-      width: calc(100% / 2 - 0.5rem);
+      // width: calc(100% / 2 - 0.5rem);
+      // height: 25rem;
+      width: 12.7rem;
+      height: 17.8rem;
      cursor: pointer;
      overflow: hidden;
      display: flex;
      justify-content: center;
      flex-shrink: 0;
-      height: 25rem;
      position: relative;
      // &.active{
      // 	border: 2px solid;
@@ -1532,6 +1534,9 @@ export default defineComponent({
      .ant-upload-select-picture-card {
        width: 12.7rem;
        height: 17.8rem;
+        border-width: 1px;
+        background: #fff;
+        border: 0.1rem solid #000;
      }
    }
  }
--- a/src/component/mainPage/signUp/index.vue
+++ b/src/component/mainPage/signUp/index.vue
@@ -106,12 +106,12 @@ export default defineComponent({
        Yearly: '年度',
        monthly: [
          {
-            title: '免费版',
+            title: '试用版',
            img: CChargeIcon,
            type: 'personal',
            info: '您的AI时尚设计助手',
            price: 'HK$0',
-            detail: '5天·50积分',
+            detail: '自注册之日起 5 天内 · 50 个积分',
            highlight: '',
            discounts: '9折优惠',
            detailList: [
@@ -185,12 +185,12 @@ export default defineComponent({
        ],
        yearl: [
          {
-            title: '免费版',
+            title: '试用版',
            img: CChargeIcon,
            type: 'personal',
            info: '您的AI时尚设计助手',
            price: 'HK$0',
-            detail: '5天·50积分',
+            detail: '自注册之日起 5 天内 · 50 个积分',
            highlight: '',
            discounts: '9折优惠',
            detailList: [
@@ -250,12 +250,12 @@ export default defineComponent({
        Yearly: 'Yearly',
        monthly: [
          {
-            title: 'Free',
+            title: 'Trial',
            img: CChargeIcon,
            type: 'personal',
            info: 'Your AI Fashion Design Assistant',
            price: 'HK$0',
-            detail: '5 days · 50 credits',
+            detail: '5 days from sign-up · 50 credits',
            highlight: '',
            discounts: '10% off',
            detailList: [
@@ -329,12 +329,12 @@ export default defineComponent({
        ],
        yearl: [
          {
-            title: 'Free',
+            title: 'Trial',
            img: CChargeIcon,
-            type: 'free',
+            type: 'personal',
            info: 'Your AI Fashion Design Assistant',
            price: 'HK$0',
-            detail: '5 days · 50 credits',
+            detail: '5 days from sign-up · 50 credits',
            highlight: '',
            discounts: '10% off',
            detailList: [
--- 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;
+		}
    }
  }
 }