Merge branch 'main' into release

.env.development

@@ -7,5 +7,3 @@ VUE_APP_URL = 'http://localhost:9528'
 # 掌权登录跳转url
 NODE_ENV = 'development'
 ENV = 'development'
-
-isTestWx = true
\ No newline at end of file

.env.production

@@ -4,3 +4,4 @@ NODE_ENV = 'production'
 # base api
 VUE_APP_BASE_API = '/api/'
 
+

package.json

@@ -4,7 +4,7 @@
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",
-    "build:prod": "vue-cli-service build --mode prod",
+    "build:prod": "vue-cli-service build --mode production",
     "build:stage": "vue-cli-service build --mode staging",
     "lint": "vue-cli-service lint"
   },

src/main.js

@@ -19,18 +19,20 @@ import BiElementUi from 'bi-element-ui'
 // import 'bi-element-ui/lib/bi-element-ui.css'
 import uploading from '@/utils/cos-upload'
 import 'element-ui/lib/theme-chalk/index.css';
+
 if(process.env.NODE_ENV !== 'production'){
   new VConsole();
 }
+// 测试一下
 Vue.use(uploading)
 Vue.use(BiElementUi, {
-  dev: process.env.NODE_ENV !== 'production',
-  env: process.env.NODE_ENV,
+  dev: true,
+  env: 'development',
   system: null
 })
 Vue.use(Element, {
   size: Cookies.get('size') || 'small' // set element-ui default size
-  // locale: enLang, // 如果使用中文，无需设置，请删除
+  // locale: enLang, // 如果使用中文，无需设置，请删除123132
 })
 new Vue({
   router,

src/views/login.vue

@@ -75,6 +75,7 @@ export default {
     }
   },  
   async mounted() {
+    console.log(1231321321,'1231321321')
     this.$nextTick(() => {
       this.initLogin()
     })
@@ -137,7 +138,7 @@ export default {
     // 1. 企微静默授权
     async startWeComSilentAuth() {
       this.urlParams = getParams();
-      const corp_id = Cookies.get('corp_id')
+      const corp_id = this.urlParams.corp_id
       if(!corp_id){
         this.$message.error('当前客服号信息异常，请切换会话后重试')
         return
@@ -340,6 +341,7 @@ export default {
   font-weight: bold;
   margin-right: 5px;
 }
+
 .loginContent{
   display: flex;
   flex-direction: column;

src/views/userInfo/components/Info.vue

@@ -10,7 +10,7 @@
         <p>②不能以任何形式推送APP/网页链接，也不可承认有APP/网页端口！！</p>
       </div>
       <div
-        v-if="change_appraisal"
+        v-if="change_appraisal && false"
         style="
           font-size: 12px;
           color: red;
@@ -420,6 +420,17 @@ import watchMember from '@/mixins/watchMember'
       font-weight: 600;
     }
   }
+  .warnText{
+    width:100%;
+    height:auto;
+    font-weight: 600;
+    font-size: 18px;
+    margin-bottom: 10px;
+    p{
+      color: #F56C6C;
+      line-height: 25px;
+    }
+  }
 
   .content {
     width: 100%;