完善合作平台内容

TEAMModelOS/ClientApp/src/api/http.js

@@ -21,11 +21,11 @@ const NO_ACCESS_API = [
     'restapi.amap.com', //新增的2个，获取城市地址及天气的地址
     'devapi.qweather.com', //新增的2个，获取城市地址及天气的地址
     '/biz/get-loginuser',  //第三方登录 
-    '/biz/get-info',  //第三方获取企业详情
-    '/biz/set-bizuser', //第三方注册
-    '/biz/reset-secretkey', //第三方 重置
-    '/biz/get-openapi', //第三方 获取列表
-    '/biz/set-info', //第三方创建或者修改
+    //'/biz/get-info',  //第三方获取企业详情
+    //'/biz/set-bizuser', //第三方注册
+    //'/biz/reset-secretkey', //第三方 重置
+    //'/biz/get-openapi', //第三方 获取列表
+    //'/biz/set-info', //第三方创建或者修改
 ]
 // 需要携带access_token 不需要携带auth-token
 const NO_AUTH_API = [
@@ -35,6 +35,12 @@ const NO_AUTH_API = [
     '/student/get-student-info',
     '/teacher/init/GetUserInfo',
     '/grouplist/scan-code-join-list',
+
+    //'/biz/get-info',  //第三方获取企业详情
+    //'/biz/set-bizuser', //第三方注册
+    //'/biz/reset-secretkey', //第三方 重置
+    //'/biz/get-openapi', //第三方 获取列表
+    //'/biz/set-info', //第三方创建或者修改
 ]
 // 不进行错误提示白名单
 const NO_WARNING = [
@@ -92,7 +98,6 @@ axios.interceptors.request.use(
         //检查是否快到期
         let isExpired = checkToken()
         // let isExpired = true
-
         //token 未过期
         if (!isExpired) {
             return handleHeader(config)
@@ -119,6 +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

@@ -28,13 +28,10 @@
                       </FormItem>
                       <FormItem label="企业logo">
                           <div class="upload-logo">
-                              <Upload class="avatar-uploader" :headers="uploadHeader" accept=".png,.jpeg,.jpg" action="/blob/biz-upload-public" :disabled='uploadState' :show-file-list="false" :before-upload="changeBadge" :on-success="success" :on-error="handleUpdErr" v-if="PowerShow">
+                              <Upload class="avatar-uploader" :headers="uploadHeader" accept=".png,.jpeg,.jpg" action="/blob/public-upload " :disabled='uploadState' :show-file-list="false" :before-upload="changeBadge" :on-success="success" :on-error="handleUpdErr" v-if="PowerShow">
                                   <img v-if="setform.imageUrl" :src="setform.imageUrl" class="avatar" fit="contain" />
                                   <Icon type="ios-add" size="30" v-else />
                                   <div class="changebadge" v-show="setform.imageUrl">
-                                      <!-- <svg class="delete-logo" aria-hidden="true" @click="deltelogos">
-                      <use xlink:href="#icon-shanchu3"></use>
-                    </svg> -->
                                       <Icon type="ios-repeat" class="delete-logo" @click="deltelogos" size="30" />
                                   </div>
                               </Upload>
@@ -48,21 +45,13 @@
                           <Input v-model="setform.email" @input="saveState=true" v-if="PowerShow" size="large" />
                           <Input v-model="setform.email" disabled v-else size="large" />
                       </FormItem>
-                      <!-- <el-form-item label="企业密码" class="token-box">
-      <div class="tokenbox">
-        <el-input v-model="setform.pwd" :rows="2" type="textarea" @input="saveState=true" />
-      </div>
-      <div class="generatebox">
-        <el-button type="primary" size="small" @click="againGenerate('pwd')">重新生成密码</el-button>
-      </div>
-    </el-form-item> -->
                       <FormItem label="企业秘钥" class="token-box">
                           <div class="tokenbox">
                               <!-- <el-input v-model="setform.token" :rows="2" type="textarea" @input="saveState=true" v-if="PowerShow" /> -->
                               <Input v-model="setform.token" :rows="3" type="textarea" disabled size="large" />
                           </div>
                           <div class="generatebox-copy">
-                              <Button type="primary" v-clipboard:copy="setform.token"  v-clipboard:success="firstCopySuccess">复制秘钥</Button>
+                              <Button type="primary" v-clipboard:copy="setform.token" v-clipboard:success="firstCopySuccess">复制秘钥</Button>
                           </div>
                           <div class="generatebox" v-if="PowerShow">
                               <Button type="primary" @click="againGenerate">重新生成秘钥</Button>
@@ -77,10 +66,20 @@
                           <Input v-model="setform.webhook" class="notification-input" disabled v-else size="large" />
                           <!-- <el-button class="mt-2" @click.prevent="addDomain()">添加通知地址</el-button> -->
                       </FormItem>
-                      <div class="set-basics-save" v-show="saveState === true">
-                          <Button type="primary" @click="saveSet">保存修改</Button>
-                      </div>
+                      <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" />
+                          <!-- <el-button class="mt-2" @click.prevent="addDomain()">添加通知地址</el-button> -->
+                      </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" />
+                          <!-- <el-button class="mt-2" @click.prevent="addDomain()">添加通知地址</el-button> -->
+                      </FormItem>
                   </Form>
+                  <div class="set-basics-save">
+                      <Button type="primary" @click="saveSet">保存修改</Button>
+                  </div>
               </div>
             </div>
           </TabPane>
@@ -222,11 +221,11 @@ export default {
       console.log(this.firmData)
     },
     uploadInt () {
-        let token = JSON.parse(localStorage.getItem('openid_token'))
-       /* let actoken = JSON.parse(localStorage.getItem('access_token'))*/
+        let token = localStorage.getItem('auth_token')
+       let actoken =localStorage.getItem('access_token')
         console.log(token,'token值')
         this.uploadHeader['x-auth-authtoken'] = token
-        /*this.uploadHeader['authorization'] = 'Bearer ' + actoken*/
+        this.uploadHeader['authorization'] = 'Bearer ' + actoken
     },
     changeBadge (file) {
       if (file.type == 'image/png' || file.type == 'image/jpeg' || file.type == 'image/jpg') {
@@ -246,11 +245,12 @@ export default {
     handleUpdErr () {
       this.$Message.error('企业头像修改失败')
     },
-    detailsInfo (val) {
+      detailsInfo(val) {
+      console.log(val, '77777')
       let data = { id: val }
       this.isLoading = true;
       this.$api.thirdparty.getDetails(data).then((res) => {
-        console.log(res)
+       console.log(res)
         if (res.state === 200) {
           this.setform.name = res.business.name
           this.setform.credit = res.business.credit
@@ -349,7 +349,7 @@ export default {
   border: 1px solid #ccc;
   padding: 0.5%;
   margin: 0 auto;
-  /*overflow: auto;*/
+  overflow: auto;
   position: relative;
 }
 .set-basics-title {
@@ -435,7 +435,7 @@ export default {
 }
 .changebadge:hover {
   opacity: 1;
-  background-color: rgba(200, 214, 229, 0.9);
+  background-color: rgba(200, 214, 229, 0.7);
 }
 .changebadge {
   width: 100%;
@@ -515,4 +515,7 @@ export default {
         background: rgba(189, 195, 199, 0.6);
         cursor: pointer;
     }
+    .set-basics .ivu-form-item {
+        margin-bottom:16px;
+    }
 </style>

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

@@ -20,11 +20,14 @@
           <template #list>
             <DropdownMenu>
               <DropdownItem>姓名：{{userBasics.name}}</DropdownItem>
-              <DropdownItem @click="quit">
-                <svg class="header-icon" aria-hidden="true">
-                  <use xlink:href="#icon-tuichu"></use>
-                </svg>
-                退出登录
+              <DropdownItem>
+                  <div class="quits" @click="quit()">
+                      <!--<svg class="header-icon" aria-hidden="true">
+                          <use xlink:href="#icon-tuichu"></use>
+                      </svg>-->
+                      <Icon type="md-exit" class="header-icon"/>
+                      退出登录
+                  </div>
               </DropdownItem>
             </DropdownMenu>
           </template>
@@ -191,9 +194,9 @@ export default {
       // val === 'default' ? this.showModel = 'default' : ''
       this.showModel = 'default'
     },
-    quit () {
+      quit() {
       localStorage.clear();
-      router.push('/thirdparty')
+          this.$router.push('/bizlogin')
     }
   }
 }
@@ -374,7 +377,7 @@ export default {
     rgba(0, 0, 0, 0.06) 0px 0px 0px 1px;
 }
 .school-List-item-img {
-  width: 50%;
+  width: 40%;
   margin: 0 auto;
 }
 .enterprise-item-content {
@@ -430,22 +433,20 @@ export default {
   height: 7px; /*滚动条高度*/
   background-color: white;
 }
-/*定义滑块 内阴影+圆角*/
-::-webkit-scrollbar-thumb {
-  -webkit-box-shadow: inset 0 0 10px rgba(0, 0, 0, 0.3);
-  background-color: rgba(221, 222, 224); /*滚动条的背景颜色*/
-  border-radius: 5px;
-}
+    .quits {
+        text-align:center;
+    }
+    /*定义滑块 内阴影+圆角*/
+    ::-webkit-scrollbar-thumb {
+        -webkit-box-shadow: inset 0 0 10px rgba(0, 0, 0, 0.3);
+        background-color: rgba(221, 222, 224); /*滚动条的背景颜色*/
+        border-radius: 5px;
+    }
 </style>
 <style>
-.header-icon {
-  width: 1.2em;
-  height: 1.2em;
-  vertical-align: -0.3em;
-  fill: currentColor;
-  overflow: hidden;
-  margin-right: 5px;
-}
+    .header-icon {
+        transform: rotateZ(180deg);
+    }
 .log-icon {
   width: 2em;
   height: 2em;

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

@@ -127,8 +127,10 @@ export default {
             // store.commit('thirdUserInfo', res.bizUser),
             // store.commit('thirdCorrelationInfo', res.relBizInfos),
             users.user = res.businessUsers, users.correlation = res.relation,
-            localStorage.setItem('thirdUser', JSON.stringify(users)),
-            localStorage.setItem('openid_token', JSON.stringify(res.openid_token)), this.$router.push({ name: 'thirdIndex' }))
+                localStorage.setItem('thirdUser', JSON.stringify(users)),
+                localStorage.setItem('access_token',res.token.access_token),
+                localStorage.setItem('expires_in',res.token.expires_in),
+                localStorage.setItem('auth_token', res.openid_token), this.$router.push({ name: 'thirdIndex' }))
             : res.state === 40301 ? this.$Message.error('密码错误，请重新登录') : ''
       }).catch((error) => {
         this.isLoading = false;