学校登录可按条件查询，修复brand删除后更新错误

components.d.ts

@@ -9,11 +9,15 @@ export {}
 declare module 'vue' {
   export interface GlobalComponents {
     ABadge: typeof import('ant-design-vue/es')['Badge']
+    ABreadcrumb: typeof import('ant-design-vue/es')['Breadcrumb']
     ACheckbox: typeof import('ant-design-vue/es')['Checkbox']
     AConfigProvider: typeof import('ant-design-vue/es')['ConfigProvider']
+    ADatePicker: typeof import('ant-design-vue/es')['DatePicker']
     ADrawer: typeof import('ant-design-vue/es')['Drawer']
     AImage: typeof import('ant-design-vue/es')['Image']
     AInputNumber: typeof import('ant-design-vue/es')['InputNumber']
+    AMenu: typeof import('ant-design-vue/es')['Menu']
+    AMenuItem: typeof import('ant-design-vue/es')['MenuItem']
     AModal: typeof import('ant-design-vue/es')['Modal']
     APagination: typeof import('ant-design-vue/es')['Pagination']
     APopover: typeof import('ant-design-vue/es')['Popover']
@@ -21,11 +25,14 @@ declare module 'vue' {
     ASelect: typeof import('ant-design-vue/es')['Select']
     ASelectOption: typeof import('ant-design-vue/es')['SelectOption']
     ASlider: typeof import('ant-design-vue/es')['Slider']
+    ASpace: typeof import('ant-design-vue/es')['Space']
     ASpin: typeof import('ant-design-vue/es')['Spin']
+    ASubMenu: typeof import('ant-design-vue/es')['SubMenu']
     ASwitch: typeof import('ant-design-vue/es')['Switch']
     ATable: typeof import('ant-design-vue/es')['Table']
     ATabPane: typeof import('ant-design-vue/es')['TabPane']
     ATabs: typeof import('ant-design-vue/es')['Tabs']
+    ATimeRangePicker: typeof import('ant-design-vue/es')['TimeRangePicker']
     AUpload: typeof import('ant-design-vue/es')['Upload']
     ElCascader: typeof import('element-plus/es')['ElCascader']
     RouterLink: typeof import('vue-router')['RouterLink']

src/assets/style/style.css

@@ -2314,6 +2314,8 @@ textarea:focus {
   top: 0rem;
   flex: 1;
   border: 1px solid #dcdfe6;
+  width: calc(var(--width) + 6rem);
+  padding: 1rem;
 }
 .generage_btn_box {
   position: relative;

src/assets/style/style.less

@@ -2200,6 +2200,8 @@ textarea:focus{
 			top: 0rem;
 			flex: 1;
 			border: 1px solid #dcdfe6;
+			width: calc(var(--width) + 6rem);
+			padding: 1rem;
 		}
 		
 		// span{

src/component/LibraryPage/brandDetail.vue

@@ -175,6 +175,7 @@ export default defineComponent({
 			isNoData:false,//如果数据为空就不加载
 			isNull:true,
 			finishTime:'',
+			upLoadList:0,
 		})
 		const dataDom = reactive({
 			Cropper:null as any,
@@ -412,9 +413,7 @@ export default defineComponent({
         }
 		const confirmDeletePic = (value:any,index:any,nData:any)=>{
 			data.currentPage = 0
-			data.isNoData = false
+			
-			data.isNull = false
-			data.isShowMark = false
 			let libraryIds = value ? [value.id] : data.selectImgList
 			let newData = {
 				libraryIds:libraryIds,
@@ -426,6 +425,9 @@ export default defineComponent({
 				(rv: any) => {
 					dataDom.fall.clearData()
 					data.selectImgList = []
+					data.isNoData = false
+					data.isShowMark = false
+					// data.upLoadList++
 					// getLibraryList()
 				}
 			).catch((res)=>{

src/component/LoginPage/login/school.vue

@@ -251,27 +251,31 @@ export default defineComponent({
       schoolList: [] as any,
     });
     const schoolListChange = (e: any) => {};
-    const filterOption = (e: any) => {
+    const filterOption = (e: any,option: any) => {
-      let params = {
+		return option.value.toLowerCase().indexOf(e.toLowerCase()) >= 0;
-        name: e,
+      
-        type: "School",
-      };
-      Https.axiosPost(
-        Https.httpUrls.organizationNameSearch,
-        {},
-        { params: params }
-      ).then((rv: any) => {
-        data.schoolList = rv.map((item: any) => {
-          return {
-            label: item,
-            value: item,
-          };
-        });
-      });
     };
+	const getSchoolList = ()=>{
+		let params = {
+			name: '',
+			type: "School",
+		};
+		Https.axiosPost(
+			Https.httpUrls.organizationNameSearch,
+			{},
+			{ params: params }
+		).then((rv: any) => {
+			data.schoolList = rv.map((item: any) => {
+			return {
+				label: item,
+				value: item,
+			};
+			});
+		});
+	}
     const handleFocus = () => {
       if (data.schoolList.length == 0) {
-        filterOption("");
+        getSchoolList();
       }
     };
     return {

src/component/LoginPage/verificationCodeInput.vue

@@ -2,8 +2,9 @@
   <div id="app">
     <div class="captcha">
       <input v-for="(c, index) in getCtData" :key="index"
-		type="number"
+		type="text"
         v-model="getCtData[index]" ref="input" 
+		pattern="[0-9]*"
         @input="e => {onInput(e.target.value, index)}" 
         @keydown.delete="e=>{onKeydown(e.target.value, index)}"
         @focus="onFocus"
@@ -54,7 +55,9 @@ export default defineComponent({
   },
   methods: {
     onInput(val, index) {
-      val = val.replace(/\D/g, '');
+		// val = val.replace(/[^0-9]/g, '');
+	    val = String(val).replace(/\D/g, '');
+		this.getCtData[index] = val
       if (index == this.ctSize - 1) {
         this.getCtData[this.ctSize - 1] = val[0];   // 最后一个码，只允许输入一个字符。
       } else if(val.length > 1) {

src/component/home/tools/poseTransfer/index.vue

@@ -422,6 +422,11 @@ export default defineComponent({
 					// }
 					data.selectImg = res.data
 					data.fileList.filter((v: any) => v.status === "done");
+					let storeData = {
+						str:'add',
+						list:[file]
+					}
+					store.commit('setUploadElement',storeData)
 				}else{
 					bor = false
 				}

src/tool/https.js

@@ -40,6 +40,7 @@ const source = CancelToken.source();
 let isLoginTime = false
 const filterHttpsUrl = [
 	// '/api/portfolio/page',
+	'/api/third/party/parseGoogleCredential',
 	'/api/account/resetPwd',
 	'/api/portfolio/detail',
 	'/api/account/preLogin',

src/views/Administrator.vue

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

src/views/HomeView/library.vue

@@ -357,7 +357,7 @@
 												</i>
 												<i v-show="selectCode == 'Printboard' && scene?.value == 'Slogan'" :title="$t('Generate.sloganTitle')" @click.stop="setSlogan" class="fi fi-rr-poll-h"></i>
 												<i v-show="!isTextarea" class="fi fi-br-expand" @click.stop="setTextareaShow"></i>
-												<i v-show="isTextarea" class="fi fi-bs-compress" @click.stop="setTextareaShow"></i>
+												<i v-show="isTextarea" class="fi fi-bs-compress" style="z-index: 100;" @click.stop="setTextareaShow"></i>
 											</div>
 											<div class="input_box_btnBox sketch" v-else>
 												<div class="upload_item"  v-show="selectGenerateList.length > 0">