Skip to content

H
haoban-3
Commit e4be68ec by 无尘
Options

fix: 修改选择品牌

parent fe0d4b64
Showing with 56 additions and 18 deletions
dist/index.html
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>好办管理平台</title><link rel=stylesheet type=text/css href=//web-1251519181.file.myqcloud.com/custom-element/custom-element.1.0.28.css><link href=./static/css/app.32d301cb13f9cb8888b5e9b606408785.css rel=stylesheet></head><body style="min-width: 1400px;" class=damolish><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.6.6/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/components/img-preview.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script>// Raven.config('https://3715a345910d4c768e7a1ec14619c2d5@sentry.io/1413672').install();</script><script type=text/javascript src=./static/js/manifest.d8e9726c548a6d0d36f4.js></script><script type=text/javascript src=./static/js/vendor.eba504b5417c438bb1ca.js></script><script type=text/javascript src=./static/js/app.0b462e9f90e379f91bd2.js></script></body></html>
\ No newline at end of file
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>好办管理平台</title><link rel=stylesheet type=text/css href=//web-1251519181.file.myqcloud.com/custom-element/custom-element.1.0.28.css><link href=./static/css/app.f48502c80343c690a75477afa928b757.css rel=stylesheet></head><body style="min-width: 1400px;" class=damolish><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.6.6/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/components/img-preview.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script>// Raven.config('https://3715a345910d4c768e7a1ec14619c2d5@sentry.io/1413672').install();</script><script type=text/javascript src=./static/js/manifest.eb4df3021ed9bf5975ed.js></script><script type=text/javascript src=./static/js/vendor.eba504b5417c438bb1ca.js></script><script type=text/javascript src=./static/js/app.0b462e9f90e379f91bd2.js></script></body></html>
\ No newline at end of file
dist/static/css/app.32d301cb13f9cb8888b5e9b606408785.css deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/app.f48502c80343c690a75477afa928b757.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/0.1a8311ab3f4cd8490920.js → dist/static/js/0.64eaf1764ae88a040931.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/manifest.d8e9726c548a6d0d36f4.js → dist/static/js/manifest.eb4df3021ed9bf5975ed.js
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,b,n){for(var r,t,o,i=0,u=[];i<a.length;i++)t=a[i],d[t]&&u.push(d[t][0]),d[t]=0;for(r in b)Object.prototype.hasOwnProperty.call(b,r)&&(e[r]=b[r]);for(c&&c(a,b,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=f(f.s=n[i]);return o};var a={},d={90:0};function f(c){if(a[c])return a[c].exports;var d=a[c]={i:c,l:!1,exports:{}};return e[c].call(d.exports,d,d.exports,f),d.l=!0,d.exports}f.e=function(e){var c=d[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,f){c=d[e]=[a,f]});c[2]=a;var b=document.getElementsByTagName("head")[0],n=document.createElement("script");n.type="text/javascript",n.charset="utf-8",n.async=!0,n.timeout=12e4,f.nc&&n.setAttribute("nonce",f.nc),n.src=f.p+"static/js/"+e+"."+{0:"1a8311ab3f4cd8490920",1:"2fe1fea28b338647500e",2:"1ee388c2d99a13efc1ce",3:"bdfd1dea1968b59c4721",4:"d9188c5ef11d148a9172",5:"d3f88d7a7ab12a0c3ee3",6:"3014e775749d7f5b55f5",7:"c7a7f149b9bda67ba206",8:"44ef777174215bae215b",9:"a62fb8970e3ef30127ce",10:"546b16617e8d45a97acd",11:"fce5fcc498c4ce97d798",12:"a5f9a2b161799c2c5bb9",13:"acdad5e4c434690dabb4",14:"0515ff16e22ad1985252",15:"5145c587ec0a653fd73e",16:"7400088166b56885fd23",17:"df7d17412a0cb4c4d42f",18:"a27027674b0f188d0735",19:"f11c386818436323fde4",20:"e3adbfd3e776cf2e8f9f",21:"d78352462bc271cf6c69",22:"b775cd5a3407a1f4c844",23:"ed8ffa7851cf7b93d55d",24:"76079e07f55c773e8ebe",25:"755d295db713955f70d0",26:"033c6e723fba9da08a93",27:"8ae3986881568fb833a3",28:"f1937bdc9b58f02047ba",29:"9fc187d28f0558e31cb3",30:"a383e23152f401e14903",31:"a81d5594ab762bad1101",32:"18695c9f2b46cc400c85",33:"0a4442de53039502010e",34:"e1c92d68f0bd271d5f80",35:"ea6b99a3057b0b403906",36:"47f03b8472e95e8be943",37:"e3388332c83433feb21d",38:"0542c39c04f998333558",39:"2bb602426d304fcd7094",40:"db819bd27dc38965bea1",41:"3cb068afd8ac14727454",42:"1353238a90cf41857acd",43:"d3b1480cc3da06f0e5ad",44:"c3c053883f6e1a8bc5b5",45:"3e3c2814f2f4dd046509",46:"9fdc2afb9afcb2febfff",47:"f285e67e8e1c64e62f98",48:"86d8f05f428187b8cbb5",49:"5fe4d82dc60e13b63747",50:"47021614c317a7887445",51:"16a6ad4cd62038a8e7f5",52:"2d7171cb51a511e3c9d7",53:"ca67cc9462193af0a5b0",54:"ae3dde631a8a551ebb99",55:"3e1030263a334927802b",56:"19d7d91cdee929782a7b",57:"a2c026b3f95f859b9e14",58:"f099b7cf189020e78d5c",59:"fbdf692d4d60874dbc72",60:"f4ccd1a957338c1fac1d",61:"bd012bc42649c4354ab6",62:"9d2c7a0219c01d18680c",63:"43127785681a412ff10e",64:"ddadfb520817e737b7ba",65:"8cc800e31738b5e6ec04",66:"d96b50c60d1318b9cd5e",67:"3217c7fb038b3607490e",68:"10019405023074d8884d",69:"e8bb4a2dc30748f8c86f",70:"be0ace71c4ab70921bf2",71:"3b76393d37e218db1edc",72:"87361d87caa3c4b6c414",73:"a9cb9070eb6f88b67de0",74:"ed4697a92f8f1214de4d",75:"edd89ba2b2d753c494cc",76:"968e9276b0a38016d558",77:"16af377178647ebac827",78:"483fad30b165a7d4b355",79:"510a6d59b3808c0ba62c",80:"080b532cea2b17b0ede7",81:"c4163ef5fac02ab01e3e",82:"fcbb6ef04a6f77624db4",83:"32b1d7c9ef64aff93dd3",84:"7828f9a76760d609f2a2",85:"af97159587cda007ae6c",86:"31c91be5699d4c6698ad",87:"3cdfa496ad47fb7e6ffd"}[e]+".js";var r=setTimeout(t,12e4);function t(){n.onerror=n.onload=null,clearTimeout(r);var c=d[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),d[e]=void 0)}return n.onerror=n.onload=t,b.appendChild(n),a},f.m=e,f.c=a,f.d=function(e,c,a){f.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},f.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return f.d(c,"a",c),c},f.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},f.p="./",f.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,b,n){for(var r,t,o,i=0,u=[];i<a.length;i++)t=a[i],d[t]&&u.push(d[t][0]),d[t]=0;for(r in b)Object.prototype.hasOwnProperty.call(b,r)&&(e[r]=b[r]);for(c&&c(a,b,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=f(f.s=n[i]);return o};var a={},d={90:0};function f(c){if(a[c])return a[c].exports;var d=a[c]={i:c,l:!1,exports:{}};return e[c].call(d.exports,d,d.exports,f),d.l=!0,d.exports}f.e=function(e){var c=d[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,f){c=d[e]=[a,f]});c[2]=a;var b=document.getElementsByTagName("head")[0],n=document.createElement("script");n.type="text/javascript",n.charset="utf-8",n.async=!0,n.timeout=12e4,f.nc&&n.setAttribute("nonce",f.nc),n.src=f.p+"static/js/"+e+"."+{0:"64eaf1764ae88a040931",1:"2fe1fea28b338647500e",2:"1ee388c2d99a13efc1ce",3:"bdfd1dea1968b59c4721",4:"d9188c5ef11d148a9172",5:"d3f88d7a7ab12a0c3ee3",6:"3014e775749d7f5b55f5",7:"c7a7f149b9bda67ba206",8:"44ef777174215bae215b",9:"a62fb8970e3ef30127ce",10:"546b16617e8d45a97acd",11:"fce5fcc498c4ce97d798",12:"a5f9a2b161799c2c5bb9",13:"acdad5e4c434690dabb4",14:"0515ff16e22ad1985252",15:"5145c587ec0a653fd73e",16:"7400088166b56885fd23",17:"df7d17412a0cb4c4d42f",18:"a27027674b0f188d0735",19:"f11c386818436323fde4",20:"e3adbfd3e776cf2e8f9f",21:"d78352462bc271cf6c69",22:"b775cd5a3407a1f4c844",23:"ed8ffa7851cf7b93d55d",24:"76079e07f55c773e8ebe",25:"755d295db713955f70d0",26:"033c6e723fba9da08a93",27:"8ae3986881568fb833a3",28:"f1937bdc9b58f02047ba",29:"9fc187d28f0558e31cb3",30:"a383e23152f401e14903",31:"a81d5594ab762bad1101",32:"18695c9f2b46cc400c85",33:"0a4442de53039502010e",34:"e1c92d68f0bd271d5f80",35:"ea6b99a3057b0b403906",36:"47f03b8472e95e8be943",37:"e3388332c83433feb21d",38:"0542c39c04f998333558",39:"2bb602426d304fcd7094",40:"db819bd27dc38965bea1",41:"3cb068afd8ac14727454",42:"1353238a90cf41857acd",43:"d3b1480cc3da06f0e5ad",44:"c3c053883f6e1a8bc5b5",45:"3e3c2814f2f4dd046509",46:"9fdc2afb9afcb2febfff",47:"f285e67e8e1c64e62f98",48:"86d8f05f428187b8cbb5",49:"5fe4d82dc60e13b63747",50:"47021614c317a7887445",51:"16a6ad4cd62038a8e7f5",52:"2d7171cb51a511e3c9d7",53:"ca67cc9462193af0a5b0",54:"ae3dde631a8a551ebb99",55:"3e1030263a334927802b",56:"19d7d91cdee929782a7b",57:"a2c026b3f95f859b9e14",58:"f099b7cf189020e78d5c",59:"fbdf692d4d60874dbc72",60:"f4ccd1a957338c1fac1d",61:"bd012bc42649c4354ab6",62:"9d2c7a0219c01d18680c",63:"43127785681a412ff10e",64:"ddadfb520817e737b7ba",65:"8cc800e31738b5e6ec04",66:"d96b50c60d1318b9cd5e",67:"3217c7fb038b3607490e",68:"10019405023074d8884d",69:"e8bb4a2dc30748f8c86f",70:"be0ace71c4ab70921bf2",71:"3b76393d37e218db1edc",72:"87361d87caa3c4b6c414",73:"a9cb9070eb6f88b67de0",74:"ed4697a92f8f1214de4d",75:"edd89ba2b2d753c494cc",76:"968e9276b0a38016d558",77:"16af377178647ebac827",78:"483fad30b165a7d4b355",79:"510a6d59b3808c0ba62c",80:"080b532cea2b17b0ede7",81:"c4163ef5fac02ab01e3e",82:"fcbb6ef04a6f77624db4",83:"32b1d7c9ef64aff93dd3",84:"7828f9a76760d609f2a2",85:"af97159587cda007ae6c",86:"31c91be5699d4c6698ad",87:"3cdfa496ad47fb7e6ffd"}[e]+".js";var r=setTimeout(t,12e4);function t(){n.onerror=n.onload=null,clearTimeout(r);var c=d[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),d[e]=void 0)}return n.onerror=n.onload=t,b.appendChild(n),a},f.m=e,f.c=a,f.d=function(e,c,a){f.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},f.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return f.d(c,"a",c),c},f.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},f.p="./",f.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
src/components/nav/nav-app.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2018-10-10 14:44:45
* @LastEditors: 无尘
* @LastEditTime: 2020-12-16 16:03:35
* @LastEditTime: 2020-12-16 17:26:13
-->
<template>
<div class="navwrap border-box flex flex-space-between">
......@@ -26,12 +26,42 @@
<el-tooltip class="item" effect="dark" content="不同品牌的工作台可分别进行管理。点击后切换，可以管理不同品牌下的应用" placement="top-start">
<span class="font-14 color-606266" style="cursor: pointer;padding-bottom: 2px; border-bottom: 1px dashed #2F54EB;">授权商户名称 </span>
</el-tooltip>
<el-select class="p-l-10" v-model="activeBrand" placeholder="请选择" @change="changeSelect">
<!-- <el-select class="p-l-10" v-model="activeBrand" placeholder="请选择" @change="changeSelect">
<el-option class="mult-line-select" v-for="item in brandListData" :key="item.enterpriseId" :label="item.enterpriseName" :value="item.enterpriseId">
<p class="line-20">{{ item.enterpriseName }}</p>
<div class="line-20 font-12 color-909399">{{ item.brandName || '--' }}</div>
</el-option>
</el-select>
</el-select> -->
<el-popover placement="bottom" width="300" trigger="click">
<div class="company-select">
<div class="el-scrollbar define-search-select">
<div class="el-select-dropdown__wrap el-scrollbar__wrap" style="overflow: auto;">
<ul class="el-scrollbar__view el-select-dropdown__list">
<li :class="['el-select-dropdown__item ', selectBrand.enterpriseId == item.enterpriseId ? 'selected' : '']" v-for="(item, index) in brandListData" :key="index + 'search'" @click="changeSelect(item)">
<div class="flex flex-space-between">
<div>
<span class="block text-ellipsis">{{ item.brandName || '--' }}</span>
<span class="block text-ellipsis">{{ item.enterpriseName || '--' }}</span>
</div>
</div>
</li>
</ul>
</div>
</div>
</div>
<div class="select-search-input cursor-pointer" slot="reference" style="width: 213px">
<div>
<div class="el-select p-l-10 el-select--large" style="width: 213px">
<div class="el-input el-input--large el-input--suffix">
<div class="el-input__inner">
<div class="text-ellipsis line-h-16">{{ selectBrand.brandName || '--' }}</div>
<div class="text-ellipsis line-h-16">{{ selectBrand.enterpriseName || '--' }}</div>
</div>
</div>
</div>
</div>
</div>
</el-popover>
</div>
</div>
</template>
......@@ -45,7 +75,11 @@ export default {
return {
projectName: 'haoban', // 当前项目名
activeBrand: '',
brandListData: []
brandListData: [],
selectBrand: {
brandName: '',
enterpriseName: ''
}
};
},
props: {
......@@ -76,7 +110,7 @@ export default {
},
methods: {
changeRoute(path, relocation) {
let that = this;
const that = this;
if (relocation) {
window.location.href = path;
} else {
......@@ -86,15 +120,10 @@ export default {
/**
* 选择品牌
*/
changeSelect(val) {
let that = this;
let enterpriseId = '';
that.brandListData.forEach(ele => {
if (ele.enterpriseId == val) {
enterpriseId = ele.enterpriseId;
}
});
that.$emit('selectBrandId', val, enterpriseId);
changeSelect(item) {
const that = this;
that.selectBrand = item;
that.$emit('selectBrandId', item.enterpriseId);
},
/**
......@@ -146,6 +175,15 @@ export default {
line-height: 48px;
}
}
.text-ellipsis {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.line-h-16 {
line-height: 16px;
}
.boxbttom {
border-bottom: 1px solid #e4e7ed;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment