Skip to content

E
ElectricitySheep
Commit 740c64c2 authored by 罗超's avatar 罗超
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/huangyuanyuan/electricitysheep into master

parents 45ef0f8f 097db8fa
Hide whitespace changes
Inline Side-by-side
Showing with 112 additions and 85 deletions
src/components/blindDate/PPPlusStyle.vue
View file @ 740c64c2
......@@ -108,7 +108,6 @@ export default {
(res) => {
if (res.data.resultCode == 1) {
this.currentStyle = res.data.data.MiaiPPPlusStyle;
console.log(244, this.currentStyle, res.data.data.MiaiPPPlusStyle);
}
}
);
......
src/components/blindDate/customerActiveEvaluation.vue
View file @ 740c64c2
......@@ -165,7 +165,6 @@ export default {
},
created() {
this.addMsg.ActivityId = this.$route.query.data.Id;
console.log(139, this.addMsg);
},
methods: {
SelectId(msg) {
......
src/components/common/choiceSystemFenlei.vue
View file @ 740c64c2
......@@ -50,7 +50,6 @@ export default {
if (res.data.resultCode == 1) {
this.total = res.data.data.count;
var dataArray = res.data.data.pageData;
console.log(42, dataArray);
this.dataList = [];
if (dataArray && dataArray.length > 0) {
dataArray.forEach((x) => {
......
src/components/sallCenter/plugin/posts.vue
View file @ 740c64c2
......@@ -1269,7 +1269,6 @@ export default {
staticGoods: 1,
};
this.data.catList.push(obj);
console.log(1024, this.data.catList);
},
//取消商品分类选择
quxiaoFenlei() {
......@@ -1282,7 +1281,6 @@ export default {
var myArray = [];
if (ckedArr && ckedArr.length > 0) {
ckedArr.forEach((element) => {
console.log("element", element);
myArray.push({
id: element.Id,
name: element.ActivityTitle,
......@@ -1343,7 +1341,6 @@ export default {
cCatList() {
if (this.data.showCat) {
if (this.data.catList && this.data.catList.length) {
console.log(1301, this.data.catList);
return this.data.catList;
} else {
const defaultCatItem = {
......
src/components/tradePavilion/publishAlist.vue
View file @ 740c64c2
......@@ -237,10 +237,6 @@ export default {
img.src = imgSrc;
let this_ = this;
img.onload = function () {
console.log(img.width, img.height);
// if (img.width && img.height) {
// this_.$message.success("真棒！！！");
// }
};
this.UploadFileToTencent(this.FileType().UserImg, file.file, (res) => {
if (res.resultCode == 1) {
......
src/components/tradePavilion/signList.vue
View file @ 740c64c2
<style>
.signList_Table{
width:100%;
border-collapse:collapse;
margin-top:20px;
}
.signTableDiv{
width:100%;
min-width: 800px;
/* overflow: hidden; */
overflow-x: auto;
}
.signList_Table th{
border:1px solid #EBEEF5;
height:48px;
line-height: 48px;
text-align: center;
color:#909399;
padding:0 10px;
text-align: left;
}
.signList_Table td{
border:1px solid #EBEEF5;
height:48px;
line-height: 48px;
text-align: center;
color:#606266;
font-size:14px;
padding:0 10px;
text-align: left;
}
.signList_Table tr:hover>td{
background-color: #F5F7FA;
}
</style>
<template>
<div class="signList tradeactivity">
<div class="head-title">
......@@ -17,77 +52,79 @@
<el-button style="float:right;margin-top: -5px;" size="small" type="primary" @click="Export()">导出</el-button>
</div>
</div>
<table class="signTable">
<thead>
<tr>
<th>
用户昵称
</th>
<th>
认证状态
</th>
<th>
认证公司
</th>
<th>
认证信息
</th>
<th>
公司
</th>
<th>
性质
</th>
<th>
联系人
</th>
<th>
联系电话
</th>
<th>
职务
</th>
<th>
地址
</th>
</tr>
</thead>
<tbody v-for="(item,index) in tableData" :key="index">
<tr v-for="(sItem,sIndex) in item.SignUserList" :key="sIndex">
<td :rowspan="item.SignUserList.length>1?item.SignUserList.length:0" v-if='sIndex==0'>
{{item.UserName}}
</td>
<td :rowspan="item.SignUserList.length>1?item.SignUserList.length:0" v-if='sIndex==0'>
{{item.CompanyStatusStr}}
</td>
<td :rowspan="item.SignUserList.length>1?item.SignUserList.length:0" v-if='sIndex==0'>
{{item.CompanyName}}
</td>
<td :rowspan="item.SignUserList.length>1?item.SignUserList.length:0" v-if='sIndex==0'>
{{item.AuthName}}
</td>
<td>
{{sItem.CompanyName}}
</td>
<td>
{{sItem.Nature}}
</td>
<td>
{{sItem.LinkMan}}
</td>
<td>
{{sItem.LinkTel}}
</td>
<td>
{{sItem.Post}}
</td>
<td>
{{sItem.CountryInfo}}
</td>
</tr>
</tbody>
<div class="signTableDiv">
<table class="signList_Table" cellpadding="0" cellspa>
<thead>
<tr>
<th>
用户昵称
</th>
<th>
认证状态
</th>
<th>
认证公司
</th>
<th>
认证信息
</th>
<th>
公司
</th>
<th>
性质
</th>
<th>
联系人
</th>
<th>
联系电话
</th>
<th>
职务
</th>
<th>
地址
</th>
</tr>
</thead>
<tbody v-for="(item,index) in tableData" :key="index">
<tr v-for="(sItem,sIndex) in item.SignUserList" :key="sIndex">
<td :rowspan="item.SignUserList.length>1?item.SignUserList.length:0" v-if='sIndex==0'>
{{item.UserName}}
</td>
<td :rowspan="item.SignUserList.length>1?item.SignUserList.length:0" v-if='sIndex==0'>
{{item.CompanyStatusStr}}
</td>
<td :rowspan="item.SignUserList.length>1?item.SignUserList.length:0" v-if='sIndex==0'>
{{item.CompanyName}}
</td>
<td :rowspan="item.SignUserList.length>1?item.SignUserList.length:0" v-if='sIndex==0'>
{{item.AuthName}}
</td>
<td>
{{sItem.CompanyName}}
</td>
<td>
{{sItem.Nature}}
</td>
<td>
{{sItem.LinkMan}}
</td>
<td>
{{sItem.LinkTel}}
</td>
<td>
{{sItem.Post}}
</td>
<td>
{{sItem.CountryInfo}}
</td>
</tr>
</tbody>
</table>
</table>
</div>
<el-pagination style="text-align:right" background @current-change="handleCurrentChange" :page-size="msg.pageSize"
:current-page.sync="msg.pageIndex" layout="total,prev, pager, next" :total="total">
</el-pagination>
......@@ -110,7 +147,7 @@
created() {},
mounted() {
if (this.$route.query.Id) {
//this.msg.ActivityId = this.$route.query.Id;
this.msg.ActivityId = this.$route.query.Id;
}
this.getList();
},
......@@ -121,8 +158,7 @@
this.loading = false;
if (res.data.resultCode == 1) {
this.tableData = res.data.data.pageData;
console.log("tableData", this.tableData);
this.total = res.data.data.pageCount;
this.total = res.data.data.count;
}
})
},
......
src/components/tradePavilion/tradeactivityList.vue
View file @ 740c64c2
......@@ -46,9 +46,10 @@
</el-table-column>
<el-table-column prop="JoinNum" label="报名人数">
<template slot-scope="scope">
<el-button type="text" @click="dialogTableVisible = true,getItem(scope.row)">
<!-- <el-button type="text" @click="dialogTableVisible = true,getItem(scope.row)">
{{scope.row.JoinNum}} 人
</el-button>
</el-button> -->
{{scope.row.JoinNum}} 人
</template>
</el-table-column>
<el-table-column prop="Id" width="200" label="操作">
......
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