Merge branch 'deveolp_lsy' into develop

src/views/Assignlicense.vue

@@ -5,7 +5,10 @@ export default {
   data() {
     return {
       active: 0,
-      team: '',
+      signleAssign: '',
+      signleProduct: '',
+      teamAssign: '',
+      teamProduct: '',
       memberId: '',
       product: '',
       teamList: [],
@@ -49,8 +52,8 @@ export default {
     assignLicense() {
       var urlencoded = new URLSearchParams()
       urlencoded.append('memberIds', this.memberId)
-      urlencoded.append('teamId', this.team)
-      urlencoded.append('productIds', this.product)
+      urlencoded.append('teamId', this.signleAssign)
+      urlencoded.append('productIds', this.signleProduct)
       post(
         'http://81.68.234.235:8032/pdf-tech/vppLicenseCode/singleAssign',
         urlencoded
@@ -73,8 +76,8 @@ export default {
     },
     assignTeamLicense() {
       var urlencoded = new URLSearchParams()
-      urlencoded.append('teamId', this.team)
-      urlencoded.append('productIds', this.product)
+      urlencoded.append('teamId', this.teamAssing)
+      urlencoded.append('productIds', this.teamProduct)
       post(
         'http://81.68.234.235:8032/pdf-tech/vppLicenseCode/teamAssign',
         urlencoded
@@ -149,7 +152,7 @@ export default {
             >Team<span class="text-[#FF5054]">*</span></span
           >
           <el-select
-            v-model="team"
+            v-model="signleAssign"
             placeholder="Product Designer"
             class="w-600px"
           >
@@ -186,7 +189,7 @@ export default {
             >Product<span class="text-[#FF5054]">*</span></span
           >
           <el-select
-            v-model="product"
+            v-model="signleProduct"
             multiple
             placeholder="Please select"
             class="w-600px"
@@ -246,7 +249,7 @@ export default {
             >Team<span class="text-[#FF5054]">*</span></span
           >
           <el-select
-            v-model="team"
+            v-model="teamAssign"
             placeholder="Product Designer"
             class="w-600px"
           >
@@ -264,7 +267,7 @@ export default {
             >Product<span class="text-[#FF5054]">*</span></span
           >
           <el-select
-            v-model="product"
+            v-model="teamProduct"
             multiple
             placeholder="Please select"
             class="w-600px"

src/views/Create.vue

@@ -18,7 +18,6 @@ export default {
       verificationCodeError: false,
       passwordError: false,
       passwordConfirmError: false,
-      companyError: false,
       ruleForm: {
         email: '',
         verificationCode: '',
@@ -80,6 +79,9 @@ export default {
   },
   methods: {
     createAccount() {
+      this.verificationCodeError = false
+      this.passwordError = false
+      this.passwordConfirmError = false
       if (this.checked) {
         this.loading = true
         this.$refs['ruleForm'].validate((valid) => {
@@ -130,6 +132,7 @@ export default {
                   message: 'Create Success',
                   type: 'success'
                 })
+                this.$router.push('/login')
               }
             })
           }