From 57bb0e55eb95a58479e506cc1816bc3b0e498318 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Mon, 15 May 2023 10:35:13 +0800
Subject: [PATCH] =?UTF-8?q?refector:=20=E4=BF=AE=E6=94=B9=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=EF=BC=8C=E5=A2=9E=E5=8A=A0companyname=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test_client/src/config/index.js               |  2 +-
 .../src/layout/components/Sidebar/Logo.vue    |  2 +-
 test_client/src/router/index.js               | 30 +++++++++----------
 test_client/src/settings.js                   |  2 +-
 test_client/src/views/crm/consumer.vue        | 11 +++++--
 test_client/src/views/login/index.vue         |  2 +-
 6 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/test_client/src/config/index.js b/test_client/src/config/index.js
index 52dd9ea..6b0ea5e 100644
--- a/test_client/src/config/index.js
+++ b/test_client/src/config/index.js
@@ -10,7 +10,7 @@ function get_api_url(){
 	if(process.env.ENV === 'development' || (process.env.ENV === 'production' && window.location.host.indexOf('localhost') > -1)){
 		return process.env.VUE_APP_BASE_API
 	}
-	return 'http://' + window.location.host + '/api'
+	return 'https://' + window.location.host + '/api'
 }
 // // 如果生产模式，就合并动态的APP_CONFIG
 // // public/config.js
diff --git a/test_client/src/layout/components/Sidebar/Logo.vue b/test_client/src/layout/components/Sidebar/Logo.vue
index 603b02a..6394f4f 100644
--- a/test_client/src/layout/components/Sidebar/Logo.vue
+++ b/test_client/src/layout/components/Sidebar/Logo.vue
@@ -24,7 +24,7 @@ export default {
   },
   data() {
     return {
-      title: '辐射学堂后台管理',
+      title: '小程序后台管理',
       logo: 'https://wpimg.wallstcn.com/69a1c46c-eb1c-4b46-8bd4-e9e686ef5251.png'
     }
   }
diff --git a/test_client/src/router/index.js b/test_client/src/router/index.js
index 78dec53..d1a3ef7 100644
--- a/test_client/src/router/index.js
+++ b/test_client/src/router/index.js
@@ -311,21 +311,21 @@ export const asyncRoutes = [
     ]
   },
   
-  {
-    path: '/qtest',
-    component: Layout,
-    redirect: '/qtest/consult',
-    name: 'Qtest',
-    meta: { title: '铅当量检测', icon: '', perms: ['qtest_view']},
-    children: [
-      {
-        path: 'consult',
-        name: 'Consult',
-        component: () => import('@/views/qtest/consult.vue'),
-        meta: { title: '铅当量检测', icon: 'eye-open', perms: ['qtest_view'] }
-      },
-    ]
-  },
+  // {
+  //   path: '/qtest',
+  //   component: Layout,
+  //   redirect: '/qtest/consult',
+  //   name: 'Qtest',
+  //   meta: { title: '铅当量检测', icon: '', perms: ['qtest_view']},
+  //   children: [
+  //     {
+  //       path: 'consult',
+  //       name: 'Consult',
+  //       component: () => import('@/views/qtest/consult.vue'),
+  //       meta: { title: '铅当量检测', icon: 'eye-open', perms: ['qtest_view'] }
+  //     },
+  //   ]
+  // },
   {
     path: '/system',
     component: Layout,
diff --git a/test_client/src/settings.js b/test_client/src/settings.js
index cd73c99..7f11d51 100644
--- a/test_client/src/settings.js
+++ b/test_client/src/settings.js
@@ -1,6 +1,6 @@
 module.exports = {
 
-  title: '中科辐射',
+  title: '小程序',
 
   /**
    * @type {boolean} true | false
diff --git a/test_client/src/views/crm/consumer.vue b/test_client/src/views/crm/consumer.vue
index 2b28550..b77e166 100644
--- a/test_client/src/views/crm/consumer.vue
+++ b/test_client/src/views/crm/consumer.vue
@@ -209,8 +209,12 @@
       <el-table-column label="单位" sortable="custom" prop="company">
         <template
           slot-scope="scope"
-          v-if="scope.row.company_name != null"
-        >{{ scope.row.company_name }}</template>
+        >
+        <span v-if="scope.row.company_name">{{ scope.row.company_name }}</span>
+        <span v-else>
+          <span v-if="scope.row.companyname">{{ scope.row.companyname }}</span>
+        </span>
+      </template>
       </el-table-column>
       <el-table-column label="工作类别" sortable="custom" prop="workscope">
         <template slot-scope="scope">
@@ -297,6 +301,9 @@
             <el-button slot="append" icon="el-icon-search" @click="choose()"></el-button>
           </el-input>
         </el-form-item>
+        <el-form-item label="单位(自填)" prop="companyname">
+          <el-input v-model="consumer.companyname" placeholder="单位" />
+        </el-form-item>
         <el-form-item label="缴费学科" prop="subjects">
           <el-select v-model="consumer.subjects" placeholder="缴费学科" style="width:100%" multiple>
             <el-option
diff --git a/test_client/src/views/login/index.vue b/test_client/src/views/login/index.vue
index 31919a0..bd396d1 100644
--- a/test_client/src/views/login/index.vue
+++ b/test_client/src/views/login/index.vue
@@ -12,7 +12,7 @@
       <!-- <img class="logo" src="../../assets/logo.png" /> -->
     </div>
       <div class="title-container">
-        <h3 class="title">辐射学堂后台管理</h3>
+        <h3 class="title">小程序后台管理</h3>
       </div>
       <el-form-item prop="username">
         <span class="svg-container">