Skip to content

S
SuperMan
Commit c38d6a97 authored by zhengke's avatar zhengke
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

parents 5616cccb 9eb34d13
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 512 additions and 246 deletions
src/components/Buying/AdManageList.vue 0 → 100644
View file @ c38d6a97
<style>
.height_auto.el-select .el-input {
height: auto
}
</style>
<template>
<div class="flexOne">
<div class="clearfix"></div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
<tr>
<th>编号</th>
<th>广告图</th>
<th>广告链接</th>
<th>状态</th>
<th>{{$t('system.table_operation')}}</th>
</tr>
<tr v-for="item in dataList">
<td>{{item.Id}}</td>
<td>{{item.AdImage}}</td>
<td>{{item.AdLink}}</td>
<td>{{item.Status}}</td>
<td>
<el-button-group>
<el-tooltip class="item" effect="dark" :content="$t('active.ld_editInfo')" placement="top">
<el-button type="primary" size="mini" icon="el-icon-edit" @click="getAdManage(item.Id)">
</el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="删除" placement="top">
<el-button type="danger" size="mini" class="iconfont icon-quxiao1" @click="removeAdManage(item.Id)"></el-button>
</el-tooltip>
</el-button-group>
</td>
</tr>
</table>
<div class="noDataNotice" v-if="dataList.length<1">
<i class="iconfont icon-kong"></i>
<p>{{$t("active.ld_noData")}}</p>
</div>
</div>
</template>
<script>
import {
get
} from 'http';
export default {
data() {
return {
//查询参数
msg: {},
addMsg: {
Id: 0, //编号
AdImage: "", //广告图片
AdLink: "", //广告链接
},
loading: false,
dataList: [],
};
},
mounted() {
this.getList();
},
filters: {},
methods: {
//获取数据
getList() {
this.loading = true;
this.apipost("ShopAd_get_GetAdManageListService", this.msg, res => {
this.loading = false;
if (res.data.resultCode === 1) {
this.dataList = res.data.data;
} else {
this.Error(res.data.message)
}
}, null);
},
//添加修改广告
SetAdmanage() {
this.apipost("ShopAd_post_SetAdManageService", this.addMsg, res => {
if (res.data.resultCode === 1) {
this.getList();
} else {
this.Error(res.data.message)
}
}, null);
},
//根据编号获取广告详情
getAdManage(Id) {
this.apipost("ShopAd_get_GetAdManageService", {
Id: Id
}, res => {
if (res.data.resultCode === 1) {
this.addMsg = res.data.data;
} else {
this.Error(res.data.message)
}
}, null);
},
//根据编号删除广告详情
removeAdManage(Id) {
this.apipost("ShopAd_post_RemoveAdManageService", {
Id: Id
}, res => {
if (res.data.resultCode === 1) {
this.getList();
} else {
this.Error(res.data.message)
}
}, null);
},
}
};
</script>
src/components/Buying/BuyingList.vue 0 → 100644
View file @ c38d6a97
<style>
.height_auto.el-select .el-input{
height: auto
}
.BuyingList .el-button-group .el-button{
padding: 6px !important;
}
.BuyingList .el-button-group .el-button.iconfont{
font-size: 12px !important;
}
</style>
<template>
<div class="flexOne BuyingList">
<div class="query-box">
<ul class="user_time_picker">
<li>
<span>
<em>{{$t('MarketingActi.commName')}}</em>
<el-input v-model="msg.name" @keyup.enter.native="getList"></el-input>
</span>
</li>
<li>
<span>
<em>商品类型</em>
<el-select filterable v-model="msg.SellType">
<el-option :label="$t('pub.unlimitedSel')" :value="0" key="0"></el-option>
<el-option v-for="item in CommodityTypeList" :label="item.Name" :value="item.Id" :key="item.Id"></el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>商品分类</em>
<el-select filterable v-model="msg.CategoryId">
<el-option :label="$t('pub.unlimitedSel')" :value="-1"></el-option>
<el-option v-for="item in GoodsTypeList" :label="item.Name" :value="item.Id" :key="item.Id"></el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>{{$t('admin.admin_status')}}</em>
<el-select filterable v-model="msg.Status">
<el-option :label="$t('pub.unlimitedSel')" :value="-1"></el-option>
<el-option label="待完善" :value="1"></el-option>
<el-option label="上架" :value="2"></el-option>
<el-option label="下架" :value="3"></el-option>
<el-option label="取消" :value="4"></el-option>
</el-select>
</span>
</li>
<li>
<input type="button" @click="getList" class="hollowFixedBtn" :value="$t('pub.searchBtn')">
<input type="button" @click="addIntegralMall('BuyingAdd')" class="normalBtn" :value="$t('pub.addBtn')">
</li>
</ul>
</div>
<div class="clearfix"></div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
<tr>
<th width='80'>{{$t('MarketingActi.commNum')}}</th>
<th>{{$t('MarketingActi.commName')}}</th>
<th>分类名称</th>
<th>类型名称</th>
<th>成本价</th>
<th>销售价</th>
<th>领队返佣</th>
<th>公司返佣</th>
<th>同行返佣</th>
<th>微途返佣</th>
<th>状态</th>
<th>操作人</th>
<th>操作时间</th>
<th>{{$t('system.table_operation')}}</th>
</tr>
<tr v-for="item in dataList">
<td>{{item.Id}}</td>
<td>{{item.Name}}</td>
<td>{{item.CategoryName}}</td>
<td>{{item.SellTypeName}}</td>
<td>{{item.CostPrice}}</td>
<td>{{item.SellPrice}}</td>
<td>{{item.LeaderRebate}}</td>
<td>{{item.CompanyRebate}}</td>
<td>{{item.ClientRebate}}</td>
<td>{{item.WeiTuRebate}}</td>
<td>{{item.StatusName}}</td>
<td>{{item.UpdateBy}}</td>
<td>{{item.UpdateDate}}</td>
<td class="BuyingList">
<el-button-group size="mini">
<el-tooltip class="item" effect="dark" content="修改" placement="top">
<el-button type="primary" size="mini" class="iconfont icon-xiugai" @click="addIntegralMall('BuyingAdd', item.Id, '修改商品')"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="上架" placement="top">
<el-button type="success" size="mini" class="iconfont icon-shangjia1" @click="setProS(3, item.Id)" v-if="item.Status === 2 || item.Status === 1"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="下架" placement="top">
<el-button type="warning" size="mini" class="iconfont icon-xiajia1" @click="setProS(2, item.Id)" v-if="item.Status === 3"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="取消" placement="top">
<el-button type="danger" size="mini" class="iconfont icon-quxiao1" @click="setProS(4, item.Id)"></el-button>
</el-tooltip>
</el-button-group>
</td>
</tr>
</table>
<el-pagination background @current-change="handleCurrentChange" layout="total,prev, pager, next, jumper" :page-size=msg.pageSize :total=total>
</el-pagination>
<div class="noDataNotice" v-if="dataList.length<1">
<i class="iconfont icon-kong"></i>
<p>{{$t("active.ld_noData")}}</p>
</div>
</div>
</template>
<script>
export default {
data() {
return {
//请求
msg: {
pageSize: 15,
pageIndex: 1,
SellType: 0,
Name: '',
CategoryId: -1,
Status: -1
},
loading:false,
dataList:[],
GoodsTypeList: [],
total:0,
CommodityTypeList: [],
};
},
mounted() {
this.getList();
this.getCommodityTypeList();
this.getGoodsTypeManager();
},
filters: {
},
methods: {
setProS(t, id){
this.apipost("Shop_post_SetCommodityStatus",{CommodityId: id, Status: t},res => {
if (res.data.resultCode === 1) {
this.$message.success(res.data.message);
this.getList()
} else {
this.Error(res.data.message);
}
},
null
);
},
handleCurrentChange(val){
this.msg.pageIndex=val;
this.getList();
},
addIntegralMall: function( path, proId, tab){
this.$router.push({ name: path,query:{blank: 'y', proId: proId, tab: tab} })
},
getGoodsTypeManager() {
this.apipost("Shop_post_GetCommodityCategoryList",{Name: "", ParentId: -1},res => {
if (res.data.resultCode === 1) {
this.GoodsTypeList = res.data.data;
} else {
this.Error(res.data.message);
}
},
null
);
},
getCommodityTypeList() {
this.apipost(
"Shop_post_GetCommodityTypeList",
{},
res => {
if (res.data.resultCode === 1) {
this.CommodityTypeList = res.data.data;
} else {
this.Error(res.data.message);
}
},
null
);
},
//获取数据
getList() {
this.loading = true;
this.apipost("Shop_post_GetPageList", this.msg, res => {
this.loading = false;
if (res.data.resultCode === 1) {
this.dataList = res.data.data.pageData;
this.total= res.data.data.count;
} else {
this.Error(res.data.message)
}
}, null);
},
}
};
</script>
\ No newline at end of file
src/components/activity/BuyingType.vue → src/components/Buying/BuyingType.vue
View file @ c38d6a97
...@@ -119,7 +119,7 @@ ...@@ -119,7 +119,7 @@
<el-tooltip <el-tooltip
class="item" class="item"
effect="dark" effect="dark"
:content="$t('active.ld_editInfo')" content="修改"
placement="top" placement="top"
> >
<el-button <el-button
...@@ -129,6 +129,9 @@ ...@@ -129,6 +129,9 @@
@click="outerVisible=true,dialogTitle='修改商品类型',updateData(item)" @click="outerVisible=true,dialogTitle='修改商品类型',updateData(item)"
></el-button> ></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="删除" placement="top">
<el-button @click="Delete(item)" type="danger" class='zidingyiFz' icon="el-icon-delete" circle ></el-button>
</el-tooltip>
</td> </td>
</tr> </tr>
</table> </table>
...@@ -194,12 +197,6 @@ ...@@ -194,12 +197,6 @@
</div> </div>
</div> </div>
</el-form-item> </el-form-item>
<el-form-item label="是否展示" prop="state">
<el-select filterable v-model="addMsg.Status">
<el-option label="展示" :value="0"></el-option>
<el-option label="不展示" :value="1"></el-option>
</el-select>
</el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<button <button
...@@ -269,27 +266,18 @@ export default { ...@@ -269,27 +266,18 @@ export default {
}, },
// 删除 // 删除
Delete(item) { Delete(item) {
this.$confirm("是否删除"+ item.name+"? 删除后不可恢复", "提示", { this.$confirm("是否删除"+ item.Name+"? 删除后不可恢复", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning" type: "warning"
}) })
.then(() => { .then(() => {
this.apiJavaPost( this.updateData(item, 2)
"/api/IntegralManager/goodsTypeManager", this.addAward()
{ reqType: 'delete', id: item.id },
res => {
if (res.data.resultCode == 1) {
this.Success(res.data.message);
this.getList();
} else {
this.Error(res.data.message);
}
},
err => {}
);
}) })
.catch(() => {}); .catch(() => {
this.resetInfo()
});
}, },
//上传图片 //上传图片
uploadTypeImgBtn(file){ uploadTypeImgBtn(file){
...@@ -386,15 +374,17 @@ export default { ...@@ -386,15 +374,17 @@ export default {
); );
}, },
//修改信息 //修改信息
updateData(item) { updateData(item, t) {
this.outerVisible = true; if (!t) {
this.outerVisible = true;
}
this.addMsg.IsShowIndex = item.IsShowIndex; this.addMsg.IsShowIndex = item.IsShowIndex;
this.addMsg.Name = item.Name; this.addMsg.Name = item.Name;
this.addMsg.ParentId = item.ParentId; this.addMsg.ParentId = item.ParentId;
this.addMsg.Sort = item.Sort; this.addMsg.Sort = item.Sort;
this.addMsg.Image = item.Image; this.addMsg.Image = item.Image;
this.addMsg.Id = item.Id; this.addMsg.Id = item.Id;
this.addMsg.Status = item.Status this.addMsg.Status = t ? 1 : item.Status
}, },
//重置信息 //重置信息
resetInfo() { resetInfo() {
......
src/components/activity/BuyingList.vue → src/components/Buying/GuestAccountList.vue
View file @ c38d6a97
...@@ -37,14 +37,16 @@ ...@@ -37,14 +37,16 @@
<em>{{$t('admin.admin_status')}}</em> <em>{{$t('admin.admin_status')}}</em>
<el-select filterable v-model="msg.Status"> <el-select filterable v-model="msg.Status">
<el-option :label="$t('pub.unlimitedSel')" :value="-1"></el-option> <el-option :label="$t('pub.unlimitedSel')" :value="-1"></el-option>
<el-option label="展示" :value="0"></el-option> <el-option label="待完善" :value="1"></el-option>
<el-option label="不展示" :value="1"></el-option> <el-option label="上架" :value="2"></el-option>
<el-option label="下架" :value="3"></el-option>
<el-option label="取消" :value="4"></el-option>
</el-select> </el-select>
</span> </span>
</li> </li>
<li> <li>
<input type="button" @click="getList" class="hollowFixedBtn" :value="$t('pub.searchBtn')"> <input type="button" @click="getList" class="hollowFixedBtn" :value="$t('pub.searchBtn')">
<input type="button" @click="addIntegralMall('addIntegralMall', '', $t('MarketingActi.addComm'))" class="normalBtn" :value="$t('pub.addBtn')"> <input type="button" @click="addIntegralMall('BuyingAdd')" class="normalBtn" :value="$t('pub.addBtn')">
</li> </li>
</ul> </ul>
</div> </div>
...@@ -69,21 +71,27 @@ ...@@ -69,21 +71,27 @@
<td>{{item.Name}}</td> <td>{{item.Name}}</td>
<td>{{item.CategoryName}}</td> <td>{{item.CategoryName}}</td>
<td>{{item.SellTypeName}}</td> <td>{{item.SellTypeName}}</td>
<td>{{item.price}}{{item.priceUnit === 1 ? '人民币' : '积分'}}</td> <td>{{item.CostPrice}}</td>
<td>{{item.marketPrice}}</td> <td>{{item.SellPrice}}</td>
<td>{{item.quota === 0 ? '不限购' : `限购${item.quota}次`}}</td> <td>{{item.LeaderRebate}}</td>
<td>{{item.logistic}}</td> <td>{{item.CompanyRebate}}</td>
<td>{{getHotName(item.ishot)}}</td> <td>{{item.ClientRebate}}</td>
<td>{{item.state === 1 ? '上架' : item.state === 0 ? '下架' : '删除'}}</td> <td>{{item.WeiTuRebate}}</td>
<td> <td>
<el-button-group>
<el-tooltip class="item" effect="dark" :content="$t('active.ld_editInfo')" placement="top"> <el-tooltip class="item" effect="dark" :content="$t('active.ld_editInfo')" placement="top">
<el-button <el-button type="primary" size="mini" icon="el-icon-edit" @click="addIntegralMall('BuyingAdd', item.Id, '修改商品')"></el-button>
type="primary"
icon="el-icon-edit"
circle
@click="addIntegralMall('addIntegralMall', item, '修改商品')"
></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="上架" placement="top">
<el-button type="success" size="mini" class="iconfont icon-shangjia1"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="下架" placement="top">
<el-button type="warning" size="mini" class="iconfont icon-xiajia1"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="取消" placement="top">
<el-button type="danger" size="mini" class="iconfont icon-quxiao1"></el-button>
</el-tooltip>
</el-button-group>
</td> </td>
</tr> </tr>
</table> </table>
...@@ -111,7 +119,6 @@ export default { ...@@ -111,7 +119,6 @@ export default {
loading:false, loading:false,
dataList:[], dataList:[],
GoodsTypeList: [], GoodsTypeList: [],
GoodsSeriesList: [],
total:0, total:0,
CommodityTypeList: [], CommodityTypeList: [],
}; };
...@@ -119,7 +126,6 @@ export default { ...@@ -119,7 +126,6 @@ export default {
mounted() { mounted() {
this.getList(); this.getList();
this.getGoodsSeries();
this.getCommodityTypeList(); this.getCommodityTypeList();
this.getGoodsTypeManager(); this.getGoodsTypeManager();
}, },
...@@ -131,33 +137,8 @@ export default { ...@@ -131,33 +137,8 @@ export default {
this.msg.pageIndex=val; this.msg.pageIndex=val;
this.getList(); this.getList();
}, },
getHotName: function (id) { addIntegralMall: function( path, proId, tab){
for(let i = 0; i < this.GoodsSeriesList.length; i++ ) { this.$router.push({ name: path,query:{blank: 'y', proId: proId, tab: tab} })
if (this.GoodsSeriesList[i].id === id) {
return this.GoodsSeriesList[i].name
}
}
return '无'
},
getGoodsSeries() {
this.loading = true;
this.apiJavaPost(
"/api/IntegralManager/getGoodsSeries",
{},
res => {
this.loading = false;
if (res.data.resultCode === 1) {
this.GoodsSeriesList = res.data.data;
} else {
this.Error(res.data.message);
}
},
null
);
},
addIntegralMall: function( path, obj, tab){
localStorage.editIntegralMall = JSON.stringify(obj);
this.$router.push({ name: path,query:{blank: 'y', tab: tab} })
}, },
getGoodsTypeManager() { getGoodsTypeManager() {
this.apipost("Shop_post_GetCommodityCategoryList",{Name: "", ParentId: 0},res => { this.apipost("Shop_post_GetCommodityCategoryList",{Name: "", ParentId: 0},res => {
......
src/components/FinancialModule/RecPayQueryTeam.vue
View file @ c38d6a97
...@@ -172,12 +172,12 @@ ...@@ -172,12 +172,12 @@
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="订单号："> <el-form-item label="订单号：">
<el-input placeholder="" class="" v-model="msg.OrderId" @keyup.native="checkInteger(msg,'OrderId')"></el-input> <el-input placeholder="" class="" v-model="msg.OrderId" @keyup.native="checkInteger(msg,'OrderId')" maxlength="8"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="团队编号："> <el-form-item label="团队编号：">
<el-input v-model="msg.TCID" class=""></el-input> <el-input v-model="msg.TCID" class="" @keyup.native="checkInteger(msg,'TCID')" maxlength="7"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
......
src/plug/index.js
View file @ c38d6a97
...@@ -112,7 +112,7 @@ export default { ...@@ -112,7 +112,7 @@ export default {
Vue.prototype.domainManager = function () { Vue.prototype.domainManager = function () {
let domainUrl = ''; let domainUrl = '';
domainUrl = "http://192.168.2.214:8082"; domainUrl = "http://192.168.2.214:8082";
// domainUrl = "http://192.168.2.65:8025"; // 吴春 domainUrl = "http://192.168.2.16:8083"; // 吴春
let locationName = window.location.hostname; let locationName = window.location.hostname;
let javaUrldo=""; let javaUrldo="";
......
src/router/config.js
View file @ c38d6a97
...@@ -3953,15 +3953,23 @@ export default { ...@@ -3953,15 +3953,23 @@ export default {
{ {
path: '/BuyingType', path: '/BuyingType',
name: 'BuyingType', name: 'BuyingType',
component: resolve => require(['@/components/activity/BuyingType'], resolve), component: resolve => require(['@/components/Buying/BuyingType'], resolve),
meta: { meta: {
title: '代购商品类型' title: '代购商品类型'
} }
}, },
{
path: '/BuyingAdd',
name: 'BuyingAdd',
component: resolve => require(['@/components/Buying/BuyingAdd'], resolve),
meta: {
title: '新增代购商品'
}
},
{ {
path: '/BuyingList', path: '/BuyingList',
name: 'BuyingList', name: 'BuyingList',
component: resolve => require(['@/components/activity/BuyingList'], resolve), component: resolve => require(['@/components/Buying/BuyingList'], resolve),
meta: { meta: {
title: '代购商品列表' title: '代购商品列表'
} }
......
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