Skip to content

E
ElectricitySheep
Commit 06c0c844 authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

update

parent 6761aa59
Hide whitespace changes
Inline Side-by-side
Showing with 135 additions and 30 deletions
src/components/CommodityMan/goodsListEdit.vue
View file @ 06c0c844
......@@ -944,13 +944,10 @@
},
created() {},
mounted() {
this.$refs.ue.InitData();
if (this.$route.query.GoodsId) {
this.GoodsId = this.$route.query.GoodsId;
this.getData()
} else {
this.$refs.ue.InitData();
}
this.getTree();
this.getService();
......@@ -1425,6 +1422,8 @@
GradeCommissionList: this.GradeCommissionList
};
this.disList1.push(objNew);
console.log("this.addMsg.GoodsDetails",this.addMsg.GoodsDetails)
this.$refs.ue.SetVal(this.addMsg.GoodsDetails);
})
},
getRule() {
......
src/components/CommodityMan/taoBaoCSV.vue 0 → 100644
View file @ 06c0c844
<template>
<div class="taoBaoCSV">
<el-card shadow="never">
<div slot="header" class="clearfix">
<span>淘宝CSV上传</span>
</div>
<div class="danger">
尽量在服务器空闲时间来操作，会占用大量内存与带宽，在获取过程中，请不要进行任何操作!
</div>
<el-card shadow="never">
<div slot="header" class="clearfix">
<span>淘宝CSV上传上传助手</span>
</div>
<div style="margin-bottom:6px">
<span>功能介绍：</span>
<span>可将<span class="blue">淘宝助理</span>以及其他途径获取的淘宝商品CSV文件快速上传至商城,节约您的大量时间!</span>
</div>
<div flex="dir:left box:first"><div>使用方法：</div> <div><span> 1. 将您获取到的CSV文件转存为Excel格式,否则将无法识别</span> <br> <span>2. 将配套的图片文件包压缩为Zip格式压缩包并且导入(图片需在压缩包根目录下) </span> <br> <span>3. 确认上传即可</span></div></div>
<div style="margin-top:6px">
<span>Excel示例文件:</span>
<span class="f12 blue">Excel示例文件</span>
</div>
<div style="margin:6px 0">
<span>Zip示例文件:</span>
<span class="f12 blue">Zip示例文件</span>
</div>
<div style="color: rgb(255, 69, 68);">注意：导入的商品尽量控制在10个以内</div>
</el-card>
<el-form class="smallForm" style="margin-top:24px" ref="form" :model="form" label-width="120px">
<el-form-item label="EXCEL">
<el-button size="mini" type="primary">点击上传</el-button>
</el-form-item>
<el-form-item label="ZIP">
<el-button size="mini" type="primary">点击上传</el-button>
</el-form-item>
<el-form-item>
<el-button size="small" type="primary">确认导入</el-button>
</el-form-item>
</el-form>
</el-card>
</div>
</template>
<script>
export default {
name: "taoBaoCSV",
data(){
return{
}
},
created(){
},
methods:{},
};
</script>
<style>
.taoBaoCSV .smallForm .el-form-item{
margin-bottom: 18px!important;
}
.taoBaoCSV .danger{
background-color: #fce9e6;
width: 100%;
border-color: #edd7d4;
color: #e55640;
border-radius: 2px;
padding: 15px;
margin-bottom: 20px;
}
</style>
src/components/UserMan/distributionOrder.vue
View file @ 06c0c844
......@@ -109,8 +109,8 @@
<div style="margin-bottom: 24px;">
<span style="margin-right: 10px;">
规格：
<el-tag style="top: 5px;position: relative;margin-right: 5px; max-width: 300px; overflow: hidden; white-space: nowrap; text-overflow: ellipsis;" size="mini">
{{list.Specification}}
<el-tag v-for="(item2,index2) in list.SpecificationList" :key="index2" style="top: 5px;position: relative;margin-right: 5px; max-width: 300px; overflow: hidden; white-space: nowrap; text-overflow: ellipsis;" size="mini">
{{item2}}
</el-tag>
</span>
</div>
......@@ -402,6 +402,7 @@ export default {
</script>
<style>
.orderList .pendSelect .el-input {
width: 100px;
}
......
src/components/UserMan/distributors.vue
View file @ 06c0c844
......@@ -56,7 +56,7 @@
@select="SingelCheck" style="width: 100%;margin:0 0 20px 0">
<el-table-column type="selection">
</el-table-column>
<el-table-column prop="Id" label="用户ID">
<el-table-column prop="Id" label="用户ID" width="80">
</el-table-column>
<el-table-column prop="address" label="基本信息">
<template slot-scope="scope">
......@@ -116,6 +116,10 @@
</el-table-column>
<el-table-column prop="address" width="200" label="操作">
<template slot-scope="scope">
<el-tooltip class="item" effect="dark" content="查看订单" placement="top-start">
<img v-if="scope.row.AuditStatus==2" @click="CommonJump('distributionOrder')" style="width:32px;height:32px"
src="../../assets/img/userman/order.png" alt="">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="同意" placement="top-start">
<img v-if="scope.row.AuditStatus==1" @click="openReason(1,scope.row)" style="width:32px;height:32px"
src="../../assets/img/userman/pass.png" alt="">
......
src/components/UserMan/setMember.vue
View file @ 06c0c844
......@@ -105,7 +105,7 @@
</el-form-item>
<el-form-item class="hygz" label="会员规则" prop="MemberSpecification">
<div style="width:455px">
<UE :defaultMsg=defaultMsg :config=config ref="ue"></UE>
<UE :defaultMsg="addMsg.MemberSpecification" :config="config" ref="ue"></UE>
</div>
</el-form-item>
</el-form>
......@@ -158,9 +158,7 @@
dialogVisible: false,
value: '',
options: [],
tableData: [{
ID: '111'
}],
tableData: [],
msg: {
pageIndex: 1,
pageSize: 15,
......@@ -202,14 +200,14 @@
},
mounted() {
this.$refs.ue.InitData();
if (this.$route.query.GradeId) {
this.GradeId = this.$route.query.GradeId;
this.getData()
} else {
this.$refs.ue.InitData();
}
}
},
methods: {
input(){},
openChangeDig(str, index) {
this.imgType = str;
this.changeState = true;
......@@ -284,8 +282,7 @@
if (res.data.resultCode == 1) {
this.addMsg = res.data.data;
this.addMsg.MallBaseId = this.getLocalStorage().MallBaseId;
this.defaultMsg = res.data.data.MemberSpecification;
this.$refs.ue.InitData();
this.$refs.ue.SetVal(this.addMsg.MemberSpecification);
}
})
......
src/components/UserMan/usersList.vue
View file @ 06c0c844
......@@ -27,14 +27,14 @@
style="color:#979dad;font-size:14px;position:relative;top:1px"></span>
</div>
<div class="searchInput" style="width:150px">
<el-input style="display:inline-block;width:125px;height:30px" placeholder="请输入昵称" v-model="msg.Name"
<el-input @clear="getList" style="display:inline-block;width:125px;height:30px" placeholder="请输入昵称" v-model="msg.Name"
size="small" clearable>
</el-input>
<span @click="getList" class="el-icon-search"
style="color:#979dad;font-size:14px;position:relative;top:1px"></span>
</div>
<div class="searchInput" style="width:150px">
<el-input style="display:inline-block;width:125px;height:30px" placeholder="请输入手机号" v-model="msg.Moblie"
<el-input @clear="getList" style="display:inline-block;width:125px;height:30px" placeholder="请输入手机号" v-model="msg.Moblie"
size="small" clearable>
</el-input>
<span @click="getList" class="el-icon-search"
......@@ -66,39 +66,47 @@
</el-table-column>
<el-table-column prop="name" label="订单数">
<template slot-scope="scope">
<span class="blue">{{scope.row.OrderNum}}</span>
<span @click="CommonJump('orderList',{TypeId:4,UserId:scope.row.Id})" class="blue point">{{scope.row.OrderNum}}</span>
</template>
</el-table-column>
<el-table-column prop="name" label="优惠券数量">
<template slot-scope="scope">
<span class="blue">{{scope.row.CouponsNum}}</span>
<span @click="CommonJump('couponManage')" class="blue point">{{scope.row.CouponsNum}}</span>
</template>
</el-table-column>
<el-table-column prop="name" label="卡券数量">
<template slot-scope="scope">
<span class="blue">{{scope.row.CardVolumeNum}}</span>
<span class="blue point">{{scope.row.CardVolumeNum}}</span>
</template>
</el-table-column>
<el-table-column prop="name" label="余额">
<template slot-scope="scope">
<span class="blue">{{scope.row.Balance}}</span>
<span @click="CommonJump('balanceBudget')" class="blue point">{{scope.row.Balance}}</span>
</template>
</el-table-column>
<el-table-column prop="name" label="积分">
<template slot-scope="scope">
<span class="blue">{{scope.row.Integral}}</span>
<span @click="CommonJump('IntegralRecord')" class="blue point">{{scope.row.Integral}}</span>
</template>
</el-table-column>
<el-table-column prop="CreateDate" width="150" label="加入时间">
</el-table-column>
<el-table-column prop="address" width="200" label="操作">
<template slot-scope="scope">
<img @click="EditgoUrl(scope.row)" style="width:32px;height:32px" src="../../assets/img/userman/edit.png"
<el-tooltip class="item" effect="dark" content="编辑" placement="top">
<img @click="EditgoUrl(scope.row)" style="width:32px;height:32px" src="../../assets/img/userman/edit.png"
alt="">
<img @click="OpenczjfDig(scope.row,1)" style="width:32px;height:32px;margin:0 10px"
</el-tooltip>
<el-tooltip class="item" effect="dark" content="充值积分" placement="top">
<img @click="OpenczjfDig(scope.row,1)" style="width:32px;height:32px;margin:0 10px"
src="../../assets/img/userman/integral.png" alt="">
<img @click="OpenczjfDig(scope.row,2)" style="width:32px;height:32px"
</el-tooltip>
<el-tooltip class="item" effect="dark" content="充值余额" placement="top">
<img @click="OpenczjfDig(scope.row,2)" style="width:32px;height:32px"
src="../../assets/img/userman/balance.png" alt="">
</el-tooltip>
</template>
</el-table-column>
</el-table>
......@@ -190,7 +198,7 @@
Name: '',
Source: 0,
MemberGrade: 0,
Id: 0,
Id: '',
Moblie: ''
},
total: 0,
......@@ -292,6 +300,9 @@
Export() {
this.msg.ExcelEnumIds = this.checkedCities;
let msg = JSON.parse(JSON.stringify(this.msg));
if(!msg.Id ||msg.Id==''){
msg.Id=0;
}
this.JavaGetLocalFile(
"/api/user/GetMemberUserListToExcel",
msg,
......@@ -303,7 +314,11 @@
},
getList() {
this.loading = true;
this.apipost("/api/user/GetMemberUserPageList", this.msg, res => {
let msg=JSON.parse(JSON.stringify(this.msg));
if(!msg.Id ||msg.Id==''){
msg.Id=0;
}
this.apipost("/api/user/GetMemberUserPageList", msg, res => {
this.loading = false;
if (res.data.resultCode == 1) {
this.total = res.data.data.count;
......@@ -329,7 +344,7 @@
let msg = {
Grade: 0,
Name: '',
Enabled: 0,
Enabled: 1,
};
this.apipost("/api/user/GetMemberGradeList", msg, res => {
this.memberGradeList = res.data.data;
......
src/components/global/UE.vue
View file @ 06c0c844
......@@ -38,7 +38,7 @@
defaultMsg(newVal, oldVal) {
if (!this.isInputChange && newVal) {
if (this.editor && this.editor.isReady === 1) {
// this.editor.setContent(newVal);
// this.editor.setContent(newVal);
} else {
this.tempContent = newVal;
}
......@@ -49,6 +49,10 @@
},
},
methods: {
SetVal(val){
console.log("sfsdf",val);
this.editor.setContent(val);
},
InitData() {
},
......
src/components/orderMan/orderList.vue
View file @ 06c0c844
......@@ -572,6 +572,13 @@
}
},
created() {
if(this.$route.query.TypeId){
this.msgId=Number(this.$route.query.TypeId)
}
if(this.$route.query.UserId){
this.msgVal=Number(this.$route.query.UserId);
this.msg.UserId=Number(this.$route.query.UserId)
}
this.getList();
this.getplat();
this.getExpressInfo();
......
src/router/index.js
View file @ 06c0c844
......@@ -245,6 +245,12 @@ export default new Router({
name: 'goodsListEdit',
component: resolve => require(['@/components/CommodityMan/goodsListEdit'], resolve),
},
// 商品管理 淘宝CSV
{
path: '/taoBaoCSV',
name: 'taoBaoCSV',
component: resolve => require(['@/components/CommodityMan/taoBaoCSV'], resolve),
},
// 订单管理 商品列表新增
{
path: '/orderList',
......
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