Skip to content

H
haoban-3
Commit 9979e8d8 by 无尘
Options

fix：修改选择商户

parent 17a109d1
Showing with 74 additions and 30 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.4a7c9e8b387eeb17bdd392b3375b7db6.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.b0cfe9241a1abe046b6f.js></script><script type=text/javascript src=./static/js/vendor.c9b2df17ceb0429de99c.js></script><script type=text/javascript src=./static/js/app.b99a03fc8c77ea553945.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.8fba9cec5d4edb258eb48d7f45d627a5.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.d099ec8cd3a8d6c84f93.js></script><script type=text/javascript src=./static/js/vendor.c9b2df17ceb0429de99c.js></script><script type=text/javascript src=./static/js/app.0602949e18b9e8e51943.js></script></body></html>
\ No newline at end of file
dist/static/css/app.4a7c9e8b387eeb17bdd392b3375b7db6.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.8fba9cec5d4edb258eb48d7f45d627a5.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/4.7fb54b0d6edc84c910b5.js → dist/static/js/4.0a98d8e99887f1a7febf.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/manifest.b0cfe9241a1abe046b6f.js → dist/static/js/manifest.d099ec8cd3a8d6c84f93.js
!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,d,n){for(var r,t,o,i=0,u=[];i<c.length;i++)t=c[i],f[t]&&u.push(f[t][0]),f[t]=0;for(r in d)Object.prototype.hasOwnProperty.call(d,r)&&(e[r]=d[r]);for(a&&a(c,d,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=b(b.s=n[i]);return o};var c={},f={88:0};function b(a){if(c[a])return c[a].exports;var f=c[a]={i:a,l:!1,exports:{}};return e[a].call(f.exports,f,f.exports,b),f.l=!0,f.exports}b.e=function(e){var a=f[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var c=new Promise(function(c,b){a=f[e]=[c,b]});a[2]=c;var d=document.getElementsByTagName("head")[0],n=document.createElement("script");n.type="text/javascript",n.charset="utf-8",n.async=!0,n.timeout=12e4,b.nc&&n.setAttribute("nonce",b.nc),n.src=b.p+"static/js/"+e+"."+{0:"765150d21437c9212924",1:"954a8a70c5f1171933ac",2:"8b5a7a776d5388025833",3:"1e3e367b0515b6639885",4:"7fb54b0d6edc84c910b5",5:"f7ad326b7bff884d7fb2",6:"5ee92f72dd41102d6f5e",7:"facffc398c23923c8192",8:"7af05b76eacb9f493905",9:"963a2a13383e472eca38",10:"19f28610b91e54eb20c9",11:"675631224d24bc64b905",12:"78ccd34a95a7c69f6875",13:"0b6f9fa3dca5445bea41",14:"48e54ee2a9b06727d19f",15:"1a4794eae71e5676b82a",16:"c823b839370adaef5fb7",17:"d80df1815e68edafd6e4",18:"4ca44c844d82921e6965",19:"7aeab35d0eb876ff2b5a",20:"b56e6cfbe83445a1ac43",21:"1ffac55b4c27983e097f",22:"5967c8aac0d8efec27bb",23:"491faa03cecb9d035fc6",24:"8c63bc2c5c38d0efdfab",25:"7076feee8fb02a9fbd13",26:"b5b7db9a0d380eb65514",27:"98b07cae060277f91c6b",28:"0a1e4e532e911fe8ee50",29:"0bb81c4fabb8b086313b",30:"e8acf4370a8d3f28a6aa",31:"f15018c679d31a23a484",32:"915737f4f806d2dc5ef0",33:"d60beb8286a5273c8520",34:"74dbee5301dc48a15627",35:"cd7b2a7dae393ab5c205",36:"e42295b1f10082eedd48",37:"27cb05ed00a6f77774b4",38:"6380ef21f1904f03f42b",39:"b64160a2fdbfc78b53e4",40:"58b97f413035bfcac73d",41:"3bde66f2e298d3ad896f",42:"b49cb3220f9199fe2f52",43:"3dc244d19910d9c21a9f",44:"a22bd4a80c711131d8cf",45:"eba0691dbaf3680ac324",46:"58c1c13888c5686231a4",47:"70cc2a0b3655268985bd",48:"534afe1a47d06e71d7b3",49:"d1b418c9a1a90b748bd4",50:"e20178299b2dc456b4d8",51:"8d3bc732a698489ca3ae",52:"f93af5da422d05d2774a",53:"0f272faa90b7fec00e38",54:"10ecc7ed2ff70a3e11be",55:"6278791a036e758fa238",56:"ac903e1db186704b98da",57:"9f9fb6bfcac478732dad",58:"7ca51a6189813a34c8e8",59:"94cef91aa20f1ed4e307",60:"af4a6c684004f80a7ee0",61:"2e48b9d3256cb7f54155",62:"306973a81895e421b5f5",63:"e5d1cfb8dee067e09550",64:"4285972e7bce618c7563",65:"bcb2c6c313aed039c66b",66:"b5bf727065a1ed5946a8",67:"1fe24764bbf2648873df",68:"5c88c8205192e47c5440",69:"4df5e7e8568b818a23af",70:"9659ef903577b569add6",71:"7b248fa9ae5be34661ed",72:"2a406ab7e8647fc9e8f6",73:"22ffedec58d987173423",74:"ab3c100dfd2009311e7f",75:"251a7f0a164aea4bd0a9",76:"04d98376c7148163d09b",77:"9568405fcd7f68bbbed2",78:"17e2c96b0a1584aa23fb",79:"1813052e3f610897c373",80:"062ff7e7240f79737a4c",81:"68e4dc61e8a53c908430",82:"80e1bea9e7c52a0010e2",83:"1f973e5fb06a7b6aafb6",84:"e08cae32b8d07ae3eb93",85:"cb39869b0ab00851c322"}[e]+".js";var r=setTimeout(t,12e4);function t(){n.onerror=n.onload=null,clearTimeout(r);var a=f[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return n.onerror=n.onload=t,d.appendChild(n),c},b.m=e,b.c=c,b.d=function(e,a,c){b.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},b.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return b.d(a,"a",a),a},b.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},b.p="./",b.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(f,d,n){for(var r,t,o,i=0,u=[];i<f.length;i++)t=f[i],c[t]&&u.push(c[t][0]),c[t]=0;for(r in d)Object.prototype.hasOwnProperty.call(d,r)&&(e[r]=d[r]);for(a&&a(f,d,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=b(b.s=n[i]);return o};var f={},c={88:0};function b(a){if(f[a])return f[a].exports;var c=f[a]={i:a,l:!1,exports:{}};return e[a].call(c.exports,c,c.exports,b),c.l=!0,c.exports}b.e=function(e){var a=c[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var f=new Promise(function(f,b){a=c[e]=[f,b]});a[2]=f;var d=document.getElementsByTagName("head")[0],n=document.createElement("script");n.type="text/javascript",n.charset="utf-8",n.async=!0,n.timeout=12e4,b.nc&&n.setAttribute("nonce",b.nc),n.src=b.p+"static/js/"+e+"."+{0:"765150d21437c9212924",1:"954a8a70c5f1171933ac",2:"8b5a7a776d5388025833",3:"1e3e367b0515b6639885",4:"0a98d8e99887f1a7febf",5:"f7ad326b7bff884d7fb2",6:"5ee92f72dd41102d6f5e",7:"facffc398c23923c8192",8:"7af05b76eacb9f493905",9:"963a2a13383e472eca38",10:"19f28610b91e54eb20c9",11:"675631224d24bc64b905",12:"78ccd34a95a7c69f6875",13:"0b6f9fa3dca5445bea41",14:"48e54ee2a9b06727d19f",15:"1a4794eae71e5676b82a",16:"c823b839370adaef5fb7",17:"d80df1815e68edafd6e4",18:"b3c5931b02edf850ab40",19:"1f013034b987bc6725d9",20:"f5e8cd0f8ef819283ae7",21:"909d0c8e599a956fd7a7",22:"5967c8aac0d8efec27bb",23:"491faa03cecb9d035fc6",24:"8c63bc2c5c38d0efdfab",25:"7076feee8fb02a9fbd13",26:"b5b7db9a0d380eb65514",27:"98b07cae060277f91c6b",28:"0a1e4e532e911fe8ee50",29:"0bb81c4fabb8b086313b",30:"e8acf4370a8d3f28a6aa",31:"f15018c679d31a23a484",32:"915737f4f806d2dc5ef0",33:"d60beb8286a5273c8520",34:"74dbee5301dc48a15627",35:"cd7b2a7dae393ab5c205",36:"e42295b1f10082eedd48",37:"27cb05ed00a6f77774b4",38:"6380ef21f1904f03f42b",39:"b64160a2fdbfc78b53e4",40:"58b97f413035bfcac73d",41:"3bde66f2e298d3ad896f",42:"b49cb3220f9199fe2f52",43:"3dc244d19910d9c21a9f",44:"a22bd4a80c711131d8cf",45:"eba0691dbaf3680ac324",46:"58c1c13888c5686231a4",47:"70cc2a0b3655268985bd",48:"534afe1a47d06e71d7b3",49:"d1b418c9a1a90b748bd4",50:"e20178299b2dc456b4d8",51:"8d3bc732a698489ca3ae",52:"f93af5da422d05d2774a",53:"0f272faa90b7fec00e38",54:"10ecc7ed2ff70a3e11be",55:"6278791a036e758fa238",56:"ac903e1db186704b98da",57:"9f9fb6bfcac478732dad",58:"7ca51a6189813a34c8e8",59:"94cef91aa20f1ed4e307",60:"af4a6c684004f80a7ee0",61:"2e48b9d3256cb7f54155",62:"306973a81895e421b5f5",63:"e5d1cfb8dee067e09550",64:"4285972e7bce618c7563",65:"bcb2c6c313aed039c66b",66:"b5bf727065a1ed5946a8",67:"1fe24764bbf2648873df",68:"5c88c8205192e47c5440",69:"4df5e7e8568b818a23af",70:"9659ef903577b569add6",71:"7b248fa9ae5be34661ed",72:"2a406ab7e8647fc9e8f6",73:"22ffedec58d987173423",74:"ab3c100dfd2009311e7f",75:"251a7f0a164aea4bd0a9",76:"04d98376c7148163d09b",77:"9568405fcd7f68bbbed2",78:"17e2c96b0a1584aa23fb",79:"1813052e3f610897c373",80:"062ff7e7240f79737a4c",81:"68e4dc61e8a53c908430",82:"80e1bea9e7c52a0010e2",83:"1f973e5fb06a7b6aafb6",84:"e08cae32b8d07ae3eb93",85:"cb39869b0ab00851c322"}[e]+".js";var r=setTimeout(t,12e4);function t(){n.onerror=n.onload=null,clearTimeout(r);var a=c[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),c[e]=void 0)}return n.onerror=n.onload=t,d.appendChild(n),f},b.m=e,b.c=f,b.d=function(e,a,f){b.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:f})},b.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return b.d(a,"a",a),a},b.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},b.p="./",b.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
src/components/company/add-enterprise.vue
......@@ -3,7 +3,7 @@
* @Author : 无尘
* @Date : 2020-02-13 16:13:59
* @LastEditors: 无尘
* @LastEditTime: 2020-06-09 16:40:18
* @LastEditTime: 2020-08-19 14:21:10
* @FilePath : \Hapi-demoj:\公司\haoban-3\src\components\company\add-enterprise.vue
-->
<!--
......@@ -17,13 +17,6 @@
<div>
<div class="font-12 color-909399 m-b-20">提示：授权商户成功后，导购可通过企业微信好办小程序绑定导购账号后登录</div>
<el-form :model="partForm" :rules="rules" ref="form" label-width="140px" class="dialog-form">
<!-- <el-form-item label="选择商户" prop="enterpriseName">
<el-autocomplete style="width: 363px;" v-model="partForm.enterpriseName" :fetch-suggestions="querySearchAsync" @select="handleSelect">
<el-select v-model="partForm.version" slot="prepend" class="w-95" :disabled="disflag">
<el-option v-for="(item, index) in versionList" :label="item.label" :value="item.value" :key="index + 'option'">{{ item.value }}</el-option>
</el-select>
</el-autocomplete>
</el-form-item> -->
<div :class="['el-form-item el-form-item--large is-required', showError ? 'is-error' : '']" style="position:relative;">
<label for="name" class="el-form-item__label" style="width: 140px; cursor: pointer;">
<el-tooltip class="item" effect="dark" content="卡券限制每个会员最大发放次数" placement="top-start">
......@@ -32,11 +25,38 @@
</el-tooltip>
</label>
<div class="el-form-item__content" style="margin-left: 140px;">
<el-autocomplete style="width: 363px;" v-model="partForm.enterpriseName" :fetch-suggestions="querySearchAsync" @select="handleSelect">
<!-- <el-autocomplete style="width: 363px;" v-model="partForm.enterpriseName" :fetch-suggestions="querySearchAsync" @select="handleSelect">
<el-select v-model="partForm.version" slot="prepend" class="w-95" :disabled="disflag">
<el-option v-for="(item, index) in versionList" :label="item.label" :value="item.value" :key="index + 'option'">{{ item.value }}</el-option>
</el-select>
</el-autocomplete>
</el-autocomplete> -->
<div>
<el-select v-model="partForm.version" slot="prepend" class="w-95" :disabled="disflag">
<el-option v-for="(item, index) in versionList" :label="item.label" :value="item.value" :key="index + 'option'">{{ item.value }}</el-option> </el-select
><el-popover placement="bottom" title="" width="267" v-model="visible">
<div class="company-select">
<div class="el-scrollbar define-search-select">
<div class="el-select-dropdown__wrap el-scrollbar__wrap" style="margin-bottom: -5px; margin-right: -5px;">
<ul class="el-scrollbar__view el-select-dropdown__list">
<li :class="['el-select-dropdown__item']" v-for="(item, index) in searchArray" :key="index + 'search'" @click="handleSelect(item)">
<div class="flex flex-space-between">
<div style="line-height: 26px;">
<span class="block text-ellipsis">{{ item.enterpriseName }}</span>
<div class="text-ellipsis font-12 color-909399">{{ item.enterpriseName || '--' }}</div>
</div>
</div>
</li>
</ul>
</div>
</div>
</div>
<div class="show-select-num cursor-pointer" slot="reference">
<div class="select-search-input">
<span>{{ partForm.enterpriseName }}</span> <el-input class="w-267" placeholder="请搜索选择商户" maxlength="50" v-model="searchSelect" @keyup.native="value => querySearchAsync(value, searchSelect)"> </el-input>
</div>
</div>
</el-popover>
</div>
</div>
<div v-if="showError" class="el-form-item__error" style="margin-left: 140px;">请选择商户</div>
</div>
......@@ -129,6 +149,8 @@ export default {
}
]
},
searchSelect: '',
searchArray: [],
disableBtn: true, // 发验证码.默认无手机号，不可点击
countNum: 60,
tableData: [],
......@@ -256,21 +278,16 @@ export default {
/**
* 搜索查询列表
*/
async querySearchAsync(queryString, cb) {
async querySearchAsync() {
const that = this;
if (queryString == '') {
cb([]);
if (String(that.searchSelect).trim() == '') {
that.searchArray = [];
return false;
}
const res = await that.getSearchList(queryString);
cb(res);
// console.log(res);
// clearTimeout(that.timeout);
// that.timeout = setTimeout(() => {
// cb(res);
// }, 300);
const res = await that.getSearchList(that.searchSelect);
that.searchArray = res;
},
handleSelect(item) {
// console.log(item);
const that = this;
that.partForm.enterpriseId = item.enterpriseId;
that.partForm.clerkName = item.clerkName;
......@@ -407,7 +424,25 @@ export default {
width: 95px;
}
.w-267 {
width: 267px;
}
.m-l-30 {
margin-left: 30px;
}
.company-select {
position: relative;
.el-select-dropdown__item {
height: 52px;
line-height: 52px;
}
.text-ellipsis {
max-width: 200px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
}
</style>
src/views/business/authMerchant.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-03-20 14:36:37
* @LastEditors: 无尘
* @LastEditTime: 2020-08-17 16:21:55
* @LastEditTime: 2020-08-19 11:42:03
-->
<template>
<div class="my-customer-wrap common-set-wrap">
......@@ -26,10 +26,13 @@
<img :src="scope.row.enterpriseLogo" alt="img" />
</div>
<div class="cell-info">
<div class="cell-info-name font-14 color-303133">
<div class="cell-info-name flex font-14 color-303133">
<span class="gic-name">{{ scope.row.enterpriseName }}</span
><span class="gic-version">{{ scope.row.version }}</span>
</div>
<div class="cell-info-name flex font-14 color-303133">
<span class="gic-name">{{ scope.row.enterpriseName }}</span>
</div>
</div>
</div>
</template>
......@@ -287,12 +290,18 @@ export default {
padding-left: 10px;
box-sizing: border-box;
.cell-info-name {
height: 40px;
max-width: 370px;
height: 20px;
line-height: 19px;
white-space: pre-wrap;
word-break: break-all;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.gic-name {
width: 100%;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
font-size: 14px;
color: #303133;
line-height: 18px;
......
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