.

src/main/zhi-rong-web/src/components/newsDynamic.vue

@@ -37,11 +37,11 @@ export default {
                 {
                     name: '发布时间',
                     key: 'issuedAt'
-                },
-                {
-                    name: '实施年份',
-                    key: 'implementationAt'
                 }
+                // {
+                //     name: '实施年份',
+                //     key: 'implementationAt'
+                // }
             ]
         };
     },
@@ -55,12 +55,12 @@ export default {
                 //     list: [...this.typeOptions],
                 //     default: this.$route.query.typeId ? Number(this.$route.query.typeId) : ''
                 // },
-                {
-                    name: '筛选政策层级',
-                    key: 'industryClass',
-                    type: 'select',
-                    list: [...this.policyLevel]
-                },
+                // {
+                //     name: '筛选政策层级',
+                //     key: 'industryClass',
+                //     type: 'select',
+                //     list: [...this.policyLevel]
+                // },
                 // {
                 //     name: '法律状态',
                 //     key: 'lawStatusId',

src/main/zhi-rong-web/src/components/newsDynamics.vue

@@ -53,12 +53,12 @@ export default {
                 //     list: [...this.typeOptions],
                 //     default: this.$route.query.typeId ? Number(this.$route.query.typeId) : ''
                 // },
-                {
-                    name: '筛选政策层级',
-                    key: 'industryClass',
-                    type: 'select',
-                    list: [...this.policyLevel]
-                },
+                // {
+                //     name: '筛选政策层级',
+                //     key: 'industryClass',
+                //     type: 'select',
+                //     list: [...this.policyLevel]
+                // },
                 // {
                 //     name: '法律状态',
                 //     key: 'lawStatusId',

src/main/zhi-rong-web/src/components/newsField.vue

@@ -72,12 +72,12 @@ export default {
                 //     list: [...this.typeOptions],
                 //     default: this.$route.query.typeId ? Number(this.$route.query.typeId) : ''
                 // },
-                {
-                    name: '筛选政策层级',
-                    key: 'policyLevelId',
-                    type: 'select',
-                    list: [...this.policyLevel]
-                },
+                // {
+                //     name: '筛选政策层级',
+                //     key: 'policyLevelId',
+                //     type: 'select',
+                //     list: [...this.policyLevel]
+                // },
                 // {
                 //     name: '法律状态',
                 //     key: 'lawStatusId',

src/main/zhi-rong-web/src/components/popup/Agreement2.vue

@@ -60,10 +60,15 @@
                                 />
                             </span>
                             <div>
-                                <el-input style="width: 300px" v-model="form.code" maxlength="4" placeholder="请输入短信验证码">
+                                <el-input
+                                    style="width: 300px"
+                                    v-model="form.code"
+                                    maxlength="4"
+                                    placeholder="请输入短信验证码"
+                                >
                                     <el-link
                                         @click="send"
-                                        class="code"
+                                        :class="time === 0 ? 'code' : 'code2'"
                                         type="primary"
                                         :underline="false"
                                         slot="append"
@@ -114,12 +119,12 @@ export default {
         forgotPassword() {
             this.login = false;
             this.$refs.agreement3.register = true;
-            this.$refs.agreement3.identification = 2
+            this.$refs.agreement3.identification = 2;
         },
-        registeredAccount(){
+        registeredAccount() {
             this.login = false;
             this.$refs.agreement3.register = true;
-            this.$refs.agreement3.identification = 1
+            this.$refs.agreement3.identification = 1;
         },
         loginPhone() {
             this.$refs.form.validate(valid => {
@@ -141,7 +146,7 @@ export default {
                                     localStorage.setItem('webToken', res);
                                     this.$message.warning('登录成功');
                                     this.$store.dispatch('getUserInfo');
-                                    this.login = false
+                                    this.login = false;
 
                                     // this.$router.replace('/');
                                 })
@@ -264,7 +269,7 @@ export default {
 .forgot_password {
     font-size: 12px;
     font-weight: 400;
-    color: #405CFF;
+    color: #405cff;
     line-height: 17px;
     margin-left: 385px;
     margin-top: 10px;
@@ -277,7 +282,7 @@ export default {
     .btn_one {
         width: 330px;
         height: 40px;
-        background: #405CFF;
+        background: #405cff;
         border-radius: 4px;
         font-size: 12px;
         font-weight: bold;
@@ -305,12 +310,33 @@ export default {
 }
 /deep/ .el-input-group__append {
     // width: 100px;
-    height: 34px;
-    background: #c8c9cc !important;
-    border-radius: 4px;
+    padding: 0 !important;
     border: none !important;
     .el-link--primary {
         color: #ffffff !important;
     }
 }
+.code {
+    width: 100px;
+    height: 34px;
+    background: #c8c9cc;
+    border-radius: 4px;
+    font-size: 13px;
+    font-weight: 400;
+    color: #ffffff;
+    line-height: 34px;
+    cursor: pointer;
+}
+.code2 {
+    width: 100px;
+    height: 34px;
+    background: #405cff;
+    border-radius: 4px;
+    font-size: 13px;
+    font-weight: 400;
+    color: #ffffff;
+    line-height: 34px;
+    cursor: pointer;
+}
 </style>
+

src/main/zhi-rong-web/src/components/popup/Agreement3.vue

@@ -60,7 +60,7 @@
                                     <div
                                         v-if="form.phone"
                                         @click="send"
-                                        class="code1"
+                                        :class="time === 0 ? 'code1' : 'code2'"
                                         type="primary"
                                         :underline="false"
                                         slot="suffix"
@@ -322,6 +322,17 @@ export default {
     line-height: 34px;
     cursor: pointer;
 }
+.code2 {
+    width: 140px;
+    height: 34px;
+    background: #405cff;
+    border-radius: 4px;
+    font-size: 13px;
+    font-weight: 400;
+    color: #ffffff;
+    line-height: 34px;
+    cursor: pointer;
+}
 .code {
     width: 100px;
     height: 34px;
@@ -379,3 +390,4 @@ export default {
     // align-items: center;
 }
 </style>
+

src/main/zhi-rong-web/src/components/popup/registrationReset.vue

@@ -54,17 +54,22 @@
                     <div @keyup.enter="loginPhone">
                         <el-form-item prop="code" :rules="{ required: true, message: '请输入', trigger: 'blur' }">
                             <span class="icon">
-                                <!-- <img
-                                    src=""
+                                <img
+                                    src="../../assets/login_icon_yanzhengma@3x (1).png"
                                     alt=""
                                     class="verification_code_img"
-                                /> -->
+                                />
                             </span>
                             <div>
-                                <el-input style="width: 300px" v-model="form.code" maxlength="4" placeholder="请输入短信验证码">
+                                <el-input
+                                    style="width: 300px"
+                                    v-model="form.code"
+                                    maxlength="4"
+                                    placeholder="请输入短信验证码"
+                                >
                                     <el-link
                                         @click="send"
-                                        class="code"
+                                        :class="time === 0 ? 'code' : 'code2'"
                                         type="primary"
                                         :underline="false"
                                         slot="append"
@@ -114,7 +119,7 @@ export default {
     },
     methods: {
         forgotPassword() {
-            this.login = false
+            this.login = false;
             this.$refs.agreement3.register = true;
             this.$refs.agreement3.identification = 2;
         },
@@ -143,7 +148,7 @@ export default {
                                     localStorage.setItem('webToken', res);
                                     this.$message.warning('登录成功');
                                     this.$store.dispatch('getUserInfo');
-                                    this.login = false
+                                    this.login = false;
                                     // this.$router.replace('/');
                                 })
                                 .catch(e => {
@@ -172,7 +177,7 @@ export default {
                             localStorage.setItem('webToken', res);
                             this.$message.warning('登录成功');
                             // this.$store.commit('loginTypeFn', true);
-                            this.login = false
+                            this.login = false;
                             return this.$store.dispatch('getUserInfo');
                         })
                         .then(() => {
@@ -266,7 +271,7 @@ export default {
 .forgot_password {
     font-size: 12px;
     font-weight: 400;
-    color: #405CFF;
+    color: #405cff;
     line-height: 17px;
     margin-left: 385px;
     margin-top: 10px;
@@ -279,7 +284,7 @@ export default {
     .btn_one {
         width: 330px;
         height: 40px;
-        background: #405CFF;
+        background: #405cff;
         border-radius: 4px;
         font-size: 12px;
         font-weight: bold;
@@ -307,12 +312,33 @@ export default {
 }
 /deep/ .el-input-group__append {
     // width: 100px;
-    height: 34px;
-    background: #c8c9cc !important;
-    border-radius: 4px;
+    padding: 0 !important;
     border: none !important;
     .el-link--primary {
         color: #ffffff !important;
     }
 }
+.code {
+    width: 100px;
+    height: 34px;
+    background: #c8c9cc;
+    border-radius: 4px;
+    font-size: 13px;
+    font-weight: 400;
+    color: #ffffff;
+    line-height: 34px;
+    cursor: pointer;
+}
+.code2 {
+    width: 100px;
+    height: 34px;
+    background: #405cff;
+    border-radius: 4px;
+    font-size: 13px;
+    font-weight: 400;
+    color: #ffffff;
+    line-height: 34px;
+    cursor: pointer;
+}
 </style>
+

src/main/zhi-rong-web/src/plugins/http.js

@@ -4,11 +4,12 @@ import qs from 'qs';
 let baseUrl = 'http://localhost:8080';
 switch (process.env.NODE_ENV) {
     case 'development':
-        //baseUrl = 'http://yangzhouip.izouma.com';
+        baseUrl = 'http://yangzhouip.izouma.com';
+        // baseUrl = 'https://www.bxgxzc.com';
         // baseUrl = '/www.bxgxzc.com';
-        // baseUrl = 'http://192.168.50.190:8080';
-         baseUrl = 'http://localhost:8080';
-        // baseUrl = 'http://192.168.50.190:8080';
+        // baseUrl = 'http://192.168.50.190:8080'; 
+        //  baseUrl = 'http://localhost:8080';
+        // baseUrl = 'http://192.168.50.190:8080'; 
         break;
     case 'test':
         baseUrl = 'http://localhost:8080';
@@ -75,11 +76,9 @@ const http = {
         return new Promise((resolve, reject) => {
             axiosInstance
                 .get(
-                    url,
-                    {
+                    url, {
                         params: params
-                    },
-                    {
+                    }, {
                         withCredentials: true
                     }
                 )
@@ -121,4 +120,4 @@ export default {
         _Vue.prototype.$axios = axiosInstance;
         _Vue.prototype.$http = http;
     }
-};
+};