update

TEAMModelOS/ClientApp/src/api/http.js

@@ -124,7 +124,7 @@ axios.interceptors.request.use(
 // http response 拦截器
 axios.interceptors.response.use(
     response => {
-        //debugger;
+
         if (response.data.errCode === 2) {
             router.push({
                 path: '/login',

TEAMModelOS/ClientApp/src/view/thirdparty/details.vue

@@ -62,23 +62,27 @@
                           <Input v-model="setform.domain" disabled v-else size="large" />
                       </FormItem>
                       <FormItem label="通知地址">
-                          <Input v-model="setform.webhook" class="notification-input" @input="saveState=true" v-if="PowerShow" size="large" />
-                          <Input v-model="setform.webhook" class="notification-input" disabled v-else size="large" />
+                          <Input v-model="setform.webhook" class="notification-input" @on-focus="hintShow=true" @on-blur="hintShow=false"  size="large" />
+                          <!--<Input v-model="setform.webhook" class="notification-input" disabled v-else size="large" />-->
                           <!-- <el-button class="mt-2" @click.prevent="addDomain()">添加通知地址</el-button> -->
+                          <p class="webhook-hint" v-show="hintShow">通知地址支持多个，请问英文逗号相隔</p>
                       </FormItem>
                       <FormItem label="通知访问金钥">
-                          <Input v-model="setform.webhook" class="notification-input" @input="saveState=true" v-if="PowerShow" size="large" />
-                          <Input v-model="setform.webhook" class="notification-input" disabled v-else size="large" />
+                          <Input v-model="setform.webhookToken" class="notification-input" size="large" @on-focus="detectionWebhook" @on-blur="detectionWebhook"/>
+                          <!--<Input v-model="setform.webhookToken" class="notification-input" disabled v-else size="large" />-->
                           <!-- <el-button class="mt-2" @click.prevent="addDomain()">添加通知地址</el-button> -->
+                          <p  class="webhint-token" v-show="webhookShow.token">请填写 通知访问金钥，访问金钥 和 金钥头部 如填写，均需填写</p>
                       </FormItem>
                       <FormItem label="通知金钥头部">
-                          <Input v-model="setform.webhook" class="notification-input" @input="saveState=true" v-if="PowerShow" size="large" />
-                          <Input v-model="setform.webhook" class="notification-input" disabled v-else size="large" />
+                          <Input v-model="setform.webhookHead" class="notification-input" size="large" @on-focus="detectionWebhook" @on-blur="detectionWebhook"/>
+                          <!--<Input v-model="setform.webhook" class="notification-input" disabled v-else size="large" />-->
                           <!-- <el-button class="mt-2" @click.prevent="addDomain()">添加通知地址</el-button> -->
+                          <p class="webhint-header" v-show="webhookShow.header">请填写 通知金钥头部，访问金钥 和 金钥头部 如填写，均需填写</p>
                       </FormItem>
                   </Form>
                   <div class="set-basics-save">
-                      <Button type="primary" @click="saveSet">保存修改</Button>
+                      <Button type="primary" @click="saveSet" v-if="submitState">保存修改</Button>
+                      <Button type="primary" disabled v-else>保存修改</Button>
                   </div>
               </div>
             </div>
@@ -167,7 +171,9 @@ export default {
         webhook: '',
         id: '',
         code: '',
-        jti: ''
+        jti: '',
+        webhookToken: '',
+        webhookHead:'',
       },
       formVerify: {
         name: [
@@ -209,6 +215,12 @@ export default {
       apidata: [],
       apitotal: 0,
       isLoading: false,
+        hintShow: false,
+        webhookShow: {
+            token: false,
+            header:false,
+        },
+        submitState:true,
     }
   },
   created () {
@@ -264,6 +276,8 @@ export default {
           this.setform.jti = res.business.jti
           this.setform.code = res.business.code
           this.tableData = res.business.schools
+          this.setform.webhookToken = res.business.webhookToken
+          this.setform.webhookHead = res.business.webhookHead
         }
         this.isLoading = false;
         this.getApilist()
@@ -312,15 +326,49 @@ export default {
    saveSet() {
         console.log(this.setform, '保存相关')
         let datas = this.setform
+       datas.webhook = datas.webhook.replace(/，/g, ",")
+       datas.webhook = datas.webhook.replace(/,,/g, ",")
         let schoolData = this.tableData
-        let saveData = { code: datas.code, id: datas.id, name: datas.name, credit: datas.credit, picture: datas.imageUrl, mobile: datas.mobile, email: datas.email, domain: datas.domain, webhook: datas.webhook, schools: schoolData }
+       let saveData = {
+           code: datas.code,
+           id: datas.id,
+           name: datas.name,
+           credit: datas.credit,
+           picture: datas.imageUrl,
+           mobile: datas.mobile,
+           email: datas.email,
+           domain: datas.domain,
+           webhook: datas.webhook,
+           schools: schoolData,
+           webhookHead: datas.webhookHead,
+           webhookToken: datas.webhookToken
+       }
         this.$api.thirdparty.updateThirdparty(saveData).then((res) => {
-            res.state === 200 ? (this.$Message.success('保存成功')) : this.$Message.error('保存失败')
+            res.state === 200 ? (this.$Message.success('保存成功'), this.updateAfters(saveData)) : this.$Message.error('保存失败')
         }).catch((error) => {
             this.$Message.error('API异常，保存失败')
         })
-    }
+      },
+   //webhookToken及header检测
+   detectionWebhook() {
+       let webHook = this.setform.webhookToken
+       let webHeade = this.setform.webhookHead
+       !webHook && !webHeade ? (this.webhookShow.header = false, this.webhookShow.token = false, this.submitState=true) :
+           webHook && !webHeade ? (this.webhookShow.header = true, this.webhookShow.token = false, this.submitState = false) :
+               !webHook && webHeade ? (this.webhookShow.header = false, this.webhookShow.token = true,this.submitState = false) :
+                   webHook && webHeade ? (this.webhookShow.header = false, this.webhookShow.token = false, this.submitState = true) :''
+   },
+   //更新成功后，数据同步到index 用户信息内
+      updateAfters(vals) {
+          console.log(vals)
+          let relevancy = JSON.parse(localStorage.getItem('thirdUser'))
+          console.log(relevancy)
+          relevancy.user.relation.length !== 0 ? relevancy.user.relation.forEach((item) => {item.bizId === vals.id ? (item.name = vals.name, item.picture = vals.picture) : '' }) : ''
+          localStorage.setItem('thirdUser', JSON.stringify(relevancy))
+          console.log(relevancy, '处理结果')
+      }
   }
+
 }
 </script>
 <style scoped>
@@ -484,6 +532,18 @@ export default {
         margin-left: 2%;
         opacity: 0;
     }
+    .webhook-hint {
+        font-size: 12px;
+        line-height: 18px;
+        margin-bottom: 2px;
+        color: #bdc3c7;
+    }
+    .webhint-header, .webhint-token {
+        font-size: 12px;
+        line-height: 18px;
+        margin-bottom: 0px;
+        color: #ff7675;
+    }
 </style>
 <style>
 .set-basics-form .el-upload {

TEAMModelOS/ClientApp/src/view/thirdparty/index.vue

@@ -141,12 +141,11 @@ export default {
     let result = JSON.parse(localStorage.getItem('thirdUser'))
     console.log(result, '用户信息')
     this.userBasics = result.user,
-      this.correlationFirm = result.user.relation
+    this.correlationFirm = result.user.relation
   },
   methods: {
     getlocaltion () {
       this.$api.thirdparty.getlocation('753b06a025d7fe62bdca1ff453149bfc', '182.139.161.4').then((res) => {
-        console.log(res)
         this.cityCode = res.rectangle.split(';')
         this.cityCode = this.cityCode[0]
         console.log(this.cityCode)
@@ -386,7 +385,7 @@ export default {
 .enterprise-item-content-name {
   font-size: 16px;
   font-weight: bold;
-  margin-top: 1%;
+  margin-top: 3%;
 }
 .enterprise-item-content-code {
   font-size: 14px;