hailu
2021-10-29 d9465d41453026f8502e8b44ec3b6cbde89e2785
登陆界面加微信扫码
7个文件已修改
293 ■■■■■ 已修改文件
package.json 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/router/index.js 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/store/module/user.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/view/chengtou/zoneAnalyse.vue 102 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/view/diligenceTools/trustMarket.vue 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/view/enterpriseControl/offSiteCheck.vue 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/view/login/login.vue 166 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
package.json
@@ -66,7 +66,7 @@
    "not ie <= 8"
  ],
  "gitHooks": {
    "pre-commit": "lint-staged"
    "pre-": "lint-staged"
  },
  "lint-staged": {
    "*.js": [
src/router/index.js
@@ -66,6 +66,7 @@
    } else {
      store.dispatch('getUserInfo').then(user => {
        // 拉取用户信息,通过用户权限和跳转的页面的name来判断是否有权限访问;access必须是一个数组,如:['super_admin'] ['super_admin', 'admin']
        console.log(user,'69')
        if (user && user.Check) {
          let a = {name: localStorage.getItem('setUrlRec')}
          // for(let i;i<router.options.routes.length;i++){
@@ -76,7 +77,7 @@
          //     user.Data.access=['error_401']
          //   }
          // }
          console.log(a)
          console.log(a,'80')
          turnTo(a, user.Data.access, next)
        } else {
          setToken('')
src/store/module/user.js
@@ -198,6 +198,7 @@
    },
    // 获取用户相关信息
    getUserInfo ({state, commit}) {
      console.log(state)
      return new Promise((resolve, reject) => {
        try {
          getUserInfo(state.token).then(res => {
src/view/chengtou/zoneAnalyse.vue
@@ -16,16 +16,21 @@
          </Row>
        </div>
        <div style="width: 200px;margin-left: 12px">
          <Cascader :data="areaList" v-model="areaCascaderValue" change-on-select size="large"  @on-change="areaChange"  placeholder="请选择区域"></Cascader>
          <Cascader filterable :data="areaList" v-model="areaCascaderValue" change-on-select size="large"  @on-change="btncontrol"  placeholder="请选择区域"></Cascader>
        </div>
        <div style="width: 150px;margin-left: 12px">
        <div style="width: 180px;margin-left: 12px" class="levelclass">
          <Select v-model="areaAdministration"
                  size="large"
                  @on-change="areaChange"
                  :max-tag-count="1"  multiple
                  placeholder="请选择行政级别"
                  @on-select="btncontrollevel"
                  @on-change="btelevelchange"
          >
            <Option  v-for="item in levelList"  :value="item" :key="item" :label="item">{{item}}</Option>
            <Option  v-for="item in levelList"  :value="item"  :key="item" :label="item">{{item}}</Option>
          </Select>
        </div>
        <div style="margin-left: 12px">
          <Button style="font-size: 14px" :disabled="checkBtn" type="primary" size="large" @click="areaChange">查询</Button>
        </div>
<!--        <div style="width: 150px;margin-left: 12px">-->
<!--          <Select v-model="areakoujing"-->
@@ -102,11 +107,12 @@
  name: 'zoneAnalyse',
  data () {
    return {
      checkBtn:true,
      loadingplatform:false,
      checkShowList:[],
      areaQueryArr:[],
      addModalShow:false,
      areaCascaderValue:[],
      areaCascaderValue:["全部"],
      defaultassetsmode:false,
      pageIndex:1,
      levelList:[],
@@ -115,7 +121,7 @@
      loadingarea: false,
      areaSelect: false,
      searchArea: '',
      areaAdministration: '',
      areaAdministration: ["全部"],
      areaProvince: '',
      areaCities: '',
      areaCounty: '',
@@ -152,7 +158,7 @@
          title: '省份',
          key: 'Province',
          align: 'center',
          minWidth:80,
          minWidth:120,
        },{
          title: '城市',
          key: 'City',
@@ -428,6 +434,13 @@
    }
  },
  methods: {
    btelevelchange(){
      this.pageIndex=1
      this.checkBtn=false
      this.$nextTick(()=>{
        this.getPlatform()
      })
    },
    clickdown(params){
      $(".gdpClass i").css({'color':'#575656'})
      $(".xiangxia").css({'color':'#4f8cf0'})
@@ -643,20 +656,32 @@
      let a;
      let b;
      let c;
      if(this.areaCascaderValue===undefined||this.areaCascaderValue===null||this.areaCascaderValue===[]){
        a="";
        b="";
      let d;
      if(this.areaCascaderValue[0]==="全部"){
        a=""
        b=""
        c=""
      }else{
        a=this.areaCascaderValue[0]
        b=this.areaCascaderValue[1]
        c=this.areaCascaderValue[2]
        if(this.areaCascaderValue===undefined||this.areaCascaderValue===null||this.areaCascaderValue===[]){
          a="";
          b="";
          c=""
        }else{
          a=this.areaCascaderValue[0]
          b=this.areaCascaderValue[1]
          c=this.areaCascaderValue[2]
        }
      }
      if(this.areaAdministration[0]==="全部"){
        d=[]
      }else{
        d=this.areaAdministration
      }
      this.loadingplatform=true
      let data={
        pageIndex:this.pageIndex,
        pageSize:20,
        level:this.areaAdministration,
        level:d,
        province:a,
        city:b,
        area:c,
@@ -691,6 +716,7 @@
    getAreaList(){
      console.log(this.areaTime)
      this.areaList=[]
      let area=[]
      let data={
        year:this.areaTime.getFullYear()
      }
@@ -700,9 +726,24 @@
        method: 'post'
      }).then(res => {
        if (res.data.Check) {
          this.areaList=JSON.parse(JSON.stringify(res.data.Data))
          area=JSON.parse(JSON.stringify(res.data.Data))
          if(area){
            area.unshift({
              label: "全部",
              value: "全部",
            })
            this.areaList=area
          }else{
            this.areaList=[{
              label: "全部",
              value: "全部",
            }]
          }
        } else {
          this.areaList=[]
          this.areaList=[{
            label: "全部",
            value: "全部",
          }]
        }
      }, res => {
@@ -727,6 +768,7 @@
            for (let i=0;i<res.data.Data.length;i++){
              this.levelList.push(res.data.Data[i])
            }
            this.levelList.unshift('全部')
          }
        } else {
@@ -735,11 +777,34 @@
      })
    },
    btncontrol(){
      this.checkBtn=false
    },
    btncontrollevel(row){
      this.$nextTick(() => {
        let a = []
        this.areaAdministration.forEach((val, index) => {
          if (val.value != '全部') {
            a.push(val.value)
          }
        })
        if (row.value==='全部' && (this.areaAdministration.length != this.levelList.length||this.areaAdministration.length === this.levelList.length)) {
          this.areaAdministration = ['全部']
        }else if(this.areaAdministration.indexOf('全部')>-1&&this.areaAdministration.length != this.levelList.length){
          this.areaAdministration.splice(this.areaAdministration.indexOf('全部'),1)
        }
        // this.isnotZhixingCompany = false
        // this.initzhuangtai=true
        this.pageIndex=1
        this.checkBtn=false
      })
    },
    areaChangeYear(){
      this.pageIndex=1
      this.checkBtn=false
      this.$nextTick(()=>{
        this.getAreaList()
        this.getPlatform()
      //  this.getPlatform()
      })
    },
    areaChange () {
@@ -918,4 +983,7 @@
  top: 30%;
  z-index: 4;
}
.levelclass  .ivu-tag-text{
  font-size: 14px;
}
</style>
src/view/diligenceTools/trustMarket.vue
@@ -82,7 +82,7 @@
                </li>
              </ul>
            </Poptip>
            <div @click="clickJumpPage(params.row.Financier)" v-else style="cursor: pointer;text-align: left;width: 100%;margin: 8px 0;">{{params.row.Financier}}</div>
            <div @click="clickJumpPage(params.row.Financier)" v-else style="cursor: pointer;text-align: left;width: 100%;margin: 0px 0;">{{params.row.Financier}}</div>
          </template>
          <template slot="TrustCompanySlot" slot-scope="params">
<!--            <Tooltip v-if="params.row.TrustCompany.length>30" :content=params.row.TrustCompany  class="tableActionMargintab1"  theme="light" transfer max-width="350"-->
@@ -104,7 +104,7 @@
                </li>
              </ul>
            </Poptip>
            <div @click="clickJumpPage2(params.row.TrustCompany)" v-else style="cursor: pointer;text-align: left;width: 100%;margin: 8px 0;">{{params.row.TrustCompany}}</div>
            <div @click="clickJumpPage2(params.row.TrustCompany)" v-else style="cursor: pointer;text-align: left;width: 100%;margin: 0px 0;">{{params.row.TrustCompany}}</div>
          </template>
          <template slot="action" slot-scope="params">
            <Tooltip content="查看"  class="tableActionMargin"  theme="light" transfer max-width="200"
@@ -1315,8 +1315,11 @@
</script>
<style>
.trustclass_title .ivu-table td, .ivu-table th{
  height:40px
}
.trustclass_title .ivu-table-cell{
  margin: 8px 0;
  margin:0px 0;
}
.trustclass:nth-child(odd){
  background: #f2f2f2;
src/view/enterpriseControl/offSiteCheck.vue
@@ -25,7 +25,7 @@
              <div style="width:260px;" class="overclassipt">
                <FormItem>
<!--                  @on-open-change="opencloseFun"-->
                  <Select ref="oneref" id="onid" transfer class="overclass"  @on-open-change="opencloseFun"  :max-tag-count="1"  multiple @on-select="companySelect"  filterable v-model="offSiteCheckModel.companyName" style="width: 100%;white-space: nowrap;" label="企业名称" size="large">
                  <Select transfer-class-name="gogogcompanyClass" ref="oneref" id="onid" transfer class="overclass"  @on-open-change="opencloseFun"  :max-tag-count="1"  multiple @on-select="companySelect"  filterable v-model="offSiteCheckModel.companyName" style="width: 100%;white-space: nowrap;" label="企业名称" size="large">
                    <Option :value="item.value" :label="item.CompanyName" @click.native="gogogoCompany" v-for="item in CompanyNameList" :key="item.Id">{{item.CompanyName}}</Option>
                  </Select>
                </FormItem>
@@ -66,7 +66,7 @@
              <div style="margin-left: 15px;margin-right: 15px;width:260px" class="overclassipt">
                    <FormItem>
                      <!--                  @on-open-change="eventTypeChange"-->
                      <Select ref="threeref" id="threeid" transfer @on-open-change="eventTypeChange" class="overclass" :max-tag-count="1"  multiple  @on-select="typeSelect" filterable v-model="offSiteCheckModel.type" style="width: 100%;white-space: nowrap;" label="事件类别" size="large">
                      <Select transfer-class-name="gogogoTypeClass" ref="threeref" id="threeid" transfer @on-open-change="eventTypeChange" class="overclass" :max-tag-count="1"  multiple  @on-select="typeSelect" filterable v-model="offSiteCheckModel.type" style="width: 100%;white-space: nowrap;" label="事件类别" size="large">
                        <!--                    <Option value="all">预警模块全部</Option>-->
                        <Option v-for="item in typelist" :value="item.Id" @click.native="gogogo" :label="item.Name" :key="item.Id">{{item.Name}}</Option>
                      </Select>
@@ -11892,6 +11892,12 @@
</script>
<style lang="less">
.gogogoTypeClass {
  min-width: 415px!important;
}
.gogogcompanyClass {
  min-width: 360px!important;
}
.overclassipt .ivu-form-item{
  margin-bottom: 12px!important;
}
src/view/login/login.vue
@@ -82,6 +82,7 @@
import $ from 'jquery'
import axios from '@/libs/api.request'
import wexinchat from '@/view/diligenceTools/wexinchatPoptip.vue'
import Cookies from "js-cookie";
export default {
  components: {
    LoginForm,
@@ -122,15 +123,22 @@
    }
    let href=window.location.href
    let code=""
    let fronturl
    let behindurl
    console.log(window.location.href)
    if(href.indexOf('code')>=0){
      this.code=href.split('?').pop().split('=')[1].split('&')[0]
      code=href.split('?').pop().split('=')[1].split('&')[0]
      console.log(this.code)
      localStorage.setItem('code',code)
      window.location.href='https://www.weycredit.com/Pages/index.html#/login'
      return false
    }else{
     // window.location.href='https://www.weycredit.com/Pages/index.html'
    }
    if(this.code){
      this.codehave=this.code
      this.haveCode()
      if(localStorage.getItem('code')){
        this.codehave=localStorage.getItem('code')
        this.code=localStorage.getItem('code')
        localStorage.removeItem('code')
        this.haveCode()
      }
    }
    // this.geterweima()
    // else if (userAgent.indexOf('Firefox') != -1) {
@@ -144,9 +152,20 @@
    // }
  },
  methods: {
    requestuser(token){
      return axios.request({
        url:'/User/GetUserInfo',
        params: {
          token,
          Name: 'newdiligenceTools'
        },
        method: 'post'
      })
    },
    haveCode(){
      let p=[]
      let state
      let commit
      let data={
        userName:'',
        password:'',
@@ -166,73 +185,76 @@
            this.unionid=p[1]
          }else{
            state=res.data.Data
           this.getUserInfo(state).then(res=>{
               localStorage.setItem('RateGradeFlag', '')
               localStorage.setItem('inputType', '')
               localStorage.setItem('inputType_g', '')
               localStorage.setItem('BelongLtdId', '')
               localStorage.setItem('BelongLtdId_g', '')
               localStorage.setItem('projectMessage', null)
               localStorage.setItem('companyStore',res.data.Data.access[0])
               localStorage.setItem('setUrlRec',res.data.Data.currentRedirect)
               this.$store.commit('TypeId', this.$store.state.user.TypeId)
               if (res.data.Data.access.indexOf('super_admin') > -1) {
                 this.$store.commit('setMainTag', 'AccountManagement_s')
                 this.$router.push({
                   name: 'accountManagement_s'
                 })
               } else if (res.data.Data.access.indexOf('company_admin') > -1) {
                 this.$store.commit('setMainTag', 'AccountManagement')
                 this.$router.push({
                   name: 'accountManagement'
                 })
               } else {
                 console.log(res.data.Data)
                 this.$store.commit('setMainTag', 'login')
                 this.$router.push({
                   name: this.$config.homeName
                 })
               }
            console.log(state)
            return new Promise((resolve, reject) => {
              try {
               this.requestuser(state).then(res => {
                 const data = res.data
                  if (data.Check) {
                    let ran = Math.random()
                    this.$store.commit('setToken', data.Data.token)
                    this.$store.commit('setRateGradeFlag', data.Data.defaultrategrade)
                    this.$store.commit('setAvator', data.Data.avator)
                    this.$store.commit('setUserName', data.Data.name)
                    this.$store.commit('setUserId', data.Data.user_id)
                    this.$store.commit('setDefaultworkflow', data.Data.defaultworkflow)
                    this.$store.commit('setAccess', data.Data.access)
                    this.$store.commit('setRealName', data.Data.releName + ran)
                    this.$store.commit('redirectList',data.Data.redirectList)
                    this.$store.commit('companyRedirect',data.Data.currentRedirect)
                    this.$store.commit('companyRedirect2',data.Data.currentRedirect)
                    localStorage.setItem('localAccess',data.Data.access)
                    localStorage.setItem('RateGradeFlag', data.Data.defaultrategrade)
                    localStorage.setItem('RiskProjectId', data.Data.defaultproj_id)
                    localStorage.setItem('RiskCompanyId', data.Data.company_id)
                    localStorage.setItem('userId', data.Data.user_id)
                    localStorage.setItem('RealName', data.Data.releName)
                    localStorage.setItem('companyStore',data.Data.access[0])
                    localStorage.setItem('defaultworkflow', data.Data.defaultworkflow)
                    localStorage.setItem('defaultmoneymonitorflag', data.Data.defaultmoneymonitorflag)
                    localStorage.setItem('RateGradeFlag', '')
                    localStorage.setItem('inputType', '')
                    localStorage.setItem('inputType_g', '')
                    localStorage.setItem('BelongLtdId', '')
                    localStorage.setItem('BelongLtdId_g', '')
                    localStorage.setItem('projectMessage', null)
                    localStorage.setItem('companyStore',data.Data.access[0])
                    localStorage.setItem('setUrlRec',data.Data.currentRedirect)
                    localStorage.setItem('powerAccess',data.Data.currentRedirect)
                    this.$store.commit('TypeId', this.$store.state.user.TypeId)
                    if (data.Data.access.indexOf('super_admin') > -1) {
                      this.$store.commit('setMainTag', 'AccountManagement_s')
                      this.$router.push({
                        name: 'accountManagement_s'
                      })
                    } else if (data.Data.access.indexOf('company_admin') > -1) {
                      this.$store.commit('setMainTag', 'AccountManagement')
                      this.$router.push({
                        name: 'accountManagement'
                      })
                    } else {
                      this.$store.commit('setMainTag', 'login')
                      this.$router.push({
                        name: 'newsFlashEx_tool'
                      })
                      console.log(this.$router,'sss')
                    }
                    resolve(data)
                  } else {
                    this.$store.commit('setToken', '')
                    this.$store.commit('setAccess', [])
                    resolve()
                  }
                }).catch(err => {
                 this.$store.commit('setToken', '')
                  reject(err)
                })
              } catch (error) {
                reject(error)
              }
            })
            // loginsrc=res.data.Data
            // let data={
            //   token:loginsrc,
            //   Name: "newdiligenceTools"
            // }
            // axios.request({
            //   url: '/User/GetUserInfo',
            //   data,
            //   method: 'post'
            // }).then(res1 => {
            //   this.$store.state.user.current = ''
            //   localStorage.setItem('RateGradeFlag', '')
            //   localStorage.setItem('inputType', '')
            //   localStorage.setItem('inputType_g', '')
            //   localStorage.setItem('BelongLtdId', '')
            //   localStorage.setItem('BelongLtdId_g', '')
            //   localStorage.setItem('projectMessage', null)
            //   localStorage.setItem('companyStore',res1.data.Data.access[0])
            //   localStorage.setItem('setUrlRec',res1.data.Data.currentRedirect)
            //   this.$store.commit('TypeId', this.$store.state.user.TypeId)
            //   if (res1.data.Data.access.indexOf('super_admin') > -1) {
            //     this.$store.commit('setMainTag', 'AccountManagement_s')
            //     this.$router.push({
            //       name: 'accountManagement_s'
            //     })
            //   } else if (res1.data.Data.access.indexOf('company_admin') > -1) {
            //     this.$store.commit('setMainTag', 'AccountManagement')
            //     this.$router.push({
            //       name: 'accountManagement'
            //     })
            //   } else {
            //     console.log(res.data.Data)
            //     this.$store.commit('setMainTag', 'login')
            //     this.$router.push({
            //       name: this.$config.homeName
            //     })
            //   }
            // })
          }
          localStorage.removeItem('code')
        } else {
        }
@@ -282,7 +304,7 @@
    wechatLoginfun(){
      // this.accountLogin=false
      // this.wechatQR=true
      window.location.href="https://open.weixin.qq.com/connect/qrconnect?appid=wx3a6c408d13d014a0&redirect_uri=https://www.weycredit.com/Pages/index.html&response_type=code&scope=snsapi_login&state=c1f906995e0745ad8a869fadfc96c827#wechat_redirect"
      window.location.href="https://open.weixin.qq.com/connect/qrconnect?appid=wx3a6c408d13d014a0&redirect_uri=https%3A%2F%2Fwww.weycredit.com%2FPages%2Findex.html&response_type=code&scope=snsapi_login&state=c1f906995e0745ad8a869fadfc96c827#wechat_redirect"
    },
    ...mapActions([
      'handleLogin',