signup loading

.gitignore

@@ -40,5 +40,8 @@ src/dashoo.cn/backend/lab_eqptdata_service/lab_eqptdata_service
 src/dashoo.cn/backend/api/static/limsdoc/dataentry/doc/**/*
 !src/dashoo.cn/backend/api/static/limsdoc/dataentry/doc/readme.txt
 
+src/dashoo.cn/backend/api/static/limsdoc/dataentry/template/**/*
+!src/dashoo.cn/backend/api/static/limsdoc/dataentry/template/readme.txt
+
 .DS_Store
 .idea

src/dashoo.cn/backend/api/business/oilsupplier/suppliercert/oilsuppliercert.go

@@ -174,6 +174,6 @@ const (
 	ERJIWUZI string = "3" // 二级物资准入
 	ZHANLUEHEZUO string = "4" // 战略合作准入
 	NEIBUDUOYUAN string = "5" // 内部多元准入
-	WAIBUSHICHANG string = "6" // 外部市场准入
+	WAIBUSHICHANG string = "6" // 外部市场准入 //选择项已暂停使用
 
 )

src/dashoo.cn/frontend_web/nuxt.config.ignore.js

@@ -161,18 +161,18 @@ module.exports = {
   },
   ignore: [
     'pages/oilsupplier/addtionaudit/*.*',
-    // 'pages/oilsupplier/annualaudit/*.*',
-    // 'pages/oilsupplier/badrecord/*.*',
+     'pages/oilsupplier/annualaudit/*.*',
+     'pages/oilsupplier/badrecord/*.*',
     'pages/oilsupplier/basisbuild/*.*',
     'pages/oilsupplier/compayaudit/*.*',
     'pages/oilsupplier/goodsaptitude/*.*',
     'pages/oilsupplier/infochange/*.*',
     'pages/oilsupplier/infochangech/*.*',
-    'pages/oilsupplier/supplier/*.*',
+    //'pages/oilsupplier/supplier/*.*',
     'pages/oilsupplier/supplierappend/*.*',
     'pages/oilsupplier/supplieraudit/*.*',
     'pages/oilsupplier/suppliercert/*.*',
-    'pages/oilsupplier/supplierfile/*.*',
+   // 'pages/oilsupplier/supplierfile/*.*',
 
     'pages/oilsupplier/suppliernopass/*.*',
     // 'pages/oilsupplier/supplierps/*.*',

src/dashoo.cn/frontend_web/src/pages/signup.vue

@@ -151,7 +151,7 @@
                 <router-link to="#">《麦吉轮用户注册协议》</router-link><router-link to="#">《隐私政策》</router-link> -->
               </el-row>
               <el-row style="margin-left: 50%; margin-top: 10px; margin-bottom: 20px;">
-                <el-button type="primary" @click="register" style="width: 30%" v-if="isShow">立即注册</el-button>
+                <el-button type="primary" @click="register" style="width: 30%" v-if="isShow" :loading="isLoading">立即注册</el-button>
               </el-row>
             </el-form>
 
@@ -344,6 +344,7 @@
         }
       }
       return {
+        isLoading: false,
         isShow: true,
         activeIndex: '1',
         waituploads: [], // 等待上传的文件列表
@@ -578,6 +579,7 @@
 
       // 注册
       register () {
+        this.isLoading = true
         // this.formData.CheckUserId = this.formData.CheckUserId.slice(0, this.formData.CheckUserId.length - 1)
         // this.formData.CheckUserName = this.formData.CheckUserName.slice(0, this.formData.CheckUserName.length - 1)
         this.$refs['RegisterFormData'].validate((valid) => {
@@ -617,6 +619,7 @@
                   _this.$router.push('/login') // 跳转到登录页
                 } else {
                   _this.isShow = true
+                  _this.isLoading = false
                   _this.$alert(response.data.message, '提示', {
                     confirmButtonText: '确定'
                   })
@@ -624,8 +627,11 @@
               })
               .catch(function (error) {
                 _this.isShow = true
+                _this.isLoading = false
                 console.log(error)
               })
+          } else {
+            this.isLoading = false
           }
         })
       },