Commit b1626751 by zhangmeng

修改bug

parent 0aacdd1a
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
.DS_Store
node_modules/
npm-debug.log*
yarn-debug.log*
yarn-error.log*
# Editor directories and files
.idea
.vscode
*.suo
*.ntvs*
*.njsproj
*.sln
Tue Sep 04 2018 17:42:16 GMT+0800 (GMT+08:00) Mon Aug 27 2018 16:59:39 GMT+0800 (GMT+08:00)
\ No newline at end of file \ No newline at end of file
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
> A Vue.js confirm-people select Plugin > A Vue.js confirm-people select Plugin
![预览图](http://115.159.76.241/vue-plugins/vue-gic-confirm-people/raw/master/preview/1.jpg)
## Install ## Install
```shell ```shell
......
This source diff could not be displayed because it is too large. You can view the blob instead.
File mode changed from 100644 to 100755
{ {
"_from": "@gic-test/vue-gic-confirm-people@^1.0.2",
"_id": "@gic-test/vue-gic-confirm-people@1.0.2",
"_inBundle": false,
"_integrity": "sha1-AFkmY2d2PXgz7ELwGQCfKSryzBY=",
"_location": "/@gic-test/vue-gic-confirm-people",
"_phantomChildren": {},
"_requested": {
"type": "range",
"registry": true,
"raw": "@gic-test/vue-gic-confirm-people@^1.0.2",
"name": "@gic-test/vue-gic-confirm-people", "name": "@gic-test/vue-gic-confirm-people",
"description": "vue-gic-confirm-people Plugin", "escapedName": "@gic-test%2fvue-gic-confirm-people",
"version": "1.0.2", "scope": "@gic-test",
"license": "MIT", "rawSpec": "^1.0.2",
"private": false, "saveSpec": null,
"main": "dist/vue-gic-confirm-people.js", "fetchSpec": "^1.0.2"
"scripts": {
"dev": "cross-env NODE_ENV=development webpack-dev-server --open --hot",
"build": "cross-env NODE_ENV=production webpack --progress --hide-modules"
},
"dependencies": {
"axios": "^0.18.0",
"qs": "^6.5.2",
"vue": "^2.5.16"
}, },
"_requiredBy": [
"#USER",
"/"
],
"_resolved": "http://www.gicdev.com:7001/@gic-test/vue-gic-confirm-people/download/@gic-test/vue-gic-confirm-people-1.0.2.tgz",
"_shasum": "0059266367763d7833ec42f019009f292af2cc16",
"_spec": "@gic-test/vue-gic-confirm-people@^1.0.2",
"_where": "C:\\Users\\Administrator\\Desktop\\private",
"browserslist": [ "browserslist": [
"> 1%", "> 1%",
"last 2 versions", "last 2 versions",
"not ie <= 8" "not ie <= 8"
], ],
"bundleDependencies": false,
"dependencies": {
"axios": "^0.18.0",
"qs": "^6.5.2",
"vue": "^2.5.16"
},
"deprecated": false,
"description": "vue-gic-confirm-people Plugin",
"devDependencies": { "devDependencies": {
"babel-core": "^6.26.0", "babel-core": "^6.26.0",
"babel-loader": "^7.1.2", "babel-loader": "^7.1.2",
...@@ -35,6 +53,13 @@ ...@@ -35,6 +53,13 @@
"webpack": "^3.6.0", "webpack": "^3.6.0",
"webpack-dev-server": "^2.9.1" "webpack-dev-server": "^2.9.1"
}, },
"_from": "@gic-test/vue-gic-confirm-people@1.0.2", "license": "MIT",
"_resolved": "http://www.gicdev.com:7001/@gic-test/vue-gic-confirm-people/download/@gic-test/vue-gic-confirm-people-1.0.2.tgz" "main": "dist/vue-gic-confirm-people.js",
"name": "@gic-test/vue-gic-confirm-people",
"private": false,
"scripts": {
"build": "cross-env NODE_ENV=production webpack --progress --hide-modules",
"dev": "cross-env NODE_ENV=development webpack-dev-server --open --hot"
},
"version": "1.0.3"
} }
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
...@@ -2,16 +2,16 @@ ...@@ -2,16 +2,16 @@
<section class="confirm-people"> <section class="confirm-people">
<div class="confirm-people_l"> <div class="confirm-people_l">
<header> <header>
<el-input size="small"" style="width:370px;" placeholder="请输入昵称卡号" prefix-icon="el-icon-search" v-model="keyWord" clearable @change="loadList"></el-input> <el-input size="small" style="width:370px;" placeholder="请输入昵称卡号" prefix-icon="el-icon-search" v-model="keyWord" clearable @change="loadList"></el-input>
</header> </header>
<el-table v-loading="loading" tooltipEffect="light" ref="multipleTable" :data="leftList" tooltip-effect="dark" style="width: 100%" height="400px" @selection-change="handleSelectionChange"> <el-table v-loading="loading" tooltipEffect="light" ref="multipleTable" :data="leftList" tooltip-effect="dark" style="width: 100%" height="400px" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55"></el-table-column> <el-table-column type="selection" width="55" :selectable="selectable" ></el-table-column>
<el-table-column label="会员信息" min-width="120" :show-overflow-tooltip="true"> <el-table-column :render-header="renderHeader" min-width="120" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
<img style="vertical-align: middle;" :src="scope.row.photoUrl || avatar" width="40px" height="40px" alt="" srcset=""> <img class="avatar-img" style="vertical-align: middle;" :src="scope.row.photoUrl || avatar" width="40px" height="40px" alt="" srcset="">
<span class="avatar"> <span class="avatar">
<p>{{ scope.row.name }}</p> <p>{{ scope.row.name || '--' }}</p>
<p style="color:#909399;">{{ scope.row.cardNo }}</p> <p style="color:#909399; font-size:13px;">{{ scope.row.cardNo || '--'}}</p>
</span> </span>
</template> </template>
</el-table-column> </el-table-column>
...@@ -31,10 +31,10 @@ ...@@ -31,10 +31,10 @@
<el-table-column type="selection" width="55"></el-table-column> <el-table-column type="selection" width="55"></el-table-column>
<el-table-column label="会员信息" min-width="120" :show-overflow-tooltip="true"> <el-table-column label="会员信息" min-width="120" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
<img style="vertical-align: middle;" :src="scope.row.photoUrl || avatar" width="40px" height="40px" alt="" srcset=""> <img class="avatar-img" style="vertical-align: middle;" :src="scope.row.photoUrl || avatar" width="40px" height="40px" alt="" srcset="">
<span class="avatar"> <span class="avatar">
<p>{{ scope.row.name }}</p> <p>{{ scope.row.name || '--' }}</p>
<p style="color:#909399;">{{ scope.row.cardNo }}</p> <p style="color:#909399; font-size:13px;">{{ scope.row.cardNo || '--' }}</p>
</span> </span>
</template> </template>
</el-table-column> </el-table-column>
...@@ -96,7 +96,7 @@ export default { ...@@ -96,7 +96,7 @@ export default {
rightList:[], rightList:[],
leftSelected:[], leftSelected:[],
rightSelected:[], rightSelected:[],
avatar:require('./head_default.jpg') avatar:require('./head_default.png')
} }
}, },
watch: { watch: {
...@@ -172,6 +172,16 @@ export default { ...@@ -172,6 +172,16 @@ export default {
}); });
this.rightList = filterList; this.rightList = filterList;
} }
},
renderHeader(h,{column,$index}) {
return h('span',[
h('span',{style:'font-weight:500;'},'会员信息'),
h('span',{style:'font-weight:500;font-size:12px;color:#909399;margin-left:5px;'},this.onlyWxMember?'未关注公众号用户不可选择':'')
],
)
},
selectable(row,index) {
return !this.onlyWxMember || 1 === row.attentionStatus;
} }
} }
} }
...@@ -201,12 +211,17 @@ export default { ...@@ -201,12 +211,17 @@ export default {
} }
} }
/deep/ .avatar{ /deep/ .avatar{
display: inline-block;vertical-align: middle; display: inline-block;
vertical-align: middle;
}
/deep/ .avatar-img {
display: inline-block;
vertical-align: middle;
width: 40px;
height: 40px;
border-radius: 2px;
border:1px solid #e4e7ed;
} }
// /deep/ .el-table__body-wrapper::-webkit-scrollbar-button {
// background-color:#000;
// }
} }
</style> </style>
import vueGicConfirmPeople from './vue-gic-confirm-people.vue' // 导入组件 import component from './component.vue' // 导入组件
const gicConfirmPeople = { const gicComponent = {
install(Vue, options) { install(Vue, options) {
Vue.component(vueGicConfirmPeople.name, vueGicConfirmPeople) // vueGicConfirmPeople.name 组件的name属性 Vue.component(component.name, component) // vueGicConfirmPeople.name 组件的name属性
// 类似通过 this.$xxx 方式调用插件的 其实只是挂载到原型上而已 // 类似通过 this.$xxx 方式调用插件的 其实只是挂载到原型上而已
// Vue.prototype.$xxx // 最终可以在任何地方通过 this.$xxx 调用 // Vue.prototype.$xxx // 最终可以在任何地方通过 this.$xxx 调用
// 虽然没有明确规定用$开头 但是大家都默认遵守这个规定 // 虽然没有明确规定用$开头 但是大家都默认遵守这个规定
} }
} }
if (typeof window !== 'undefined' && window.Vue) { if (typeof window !== 'undefined' && window.Vue) {
window.Vue.use(gicConfirmPeople); window.Vue.use(gicComponent);
} }
export default gicConfirmPeople export default gicComponent
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
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