Skip to content

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

解决冲突

parents 54880c12 f2515d09
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1146 additions and 1400 deletions
package.json
View file @ f1049b05
......@@ -15,10 +15,12 @@
"dependencies": {
"axios": "^0.19.2",
"cos-js-sdk-v5": "^0.5.26",
"echarts": "^4.8.0",
"element-ui": "^2.13.1",
"js-md5": "^0.7.3",
"vue": "^2.5.2",
"vue-router": "^3.0.1"
"vue-router": "^3.0.1",
"vuedraggable": "^2.23.2"
},
"devDependencies": {
"autoprefixer": "^7.1.2",
......
src/components/Index.vue
View file @ f1049b05
......@@ -6,7 +6,7 @@
<div class="hoindexImgdiv">
<img src="../assets/img/logo.png" alt="" style="height:30px">
</div>
<div class="hoindexRight">
<div class="hoindexRight" style="cursor:pointer;">
<el-dropdown>
<span class="el-dropdown-link" style="color:#fff;font-size:16px">
<i class="iconfont icon-iconzh1"></i>
......
src/components/sallCenter/plugin/rubik.vue
View file @ f1049b05
......@@ -57,13 +57,15 @@
margin-bottom: 10px;
position: relative;
}
.diy-rubik .layout .rubik .delete {
position: absolute;
right: -16px;
top: -16px;
padding: 8px;
z-index: 14;
position: absolute;
right: -16px;
top: -16px;
padding: 8px;
z-index: 14;
}
</style>
<template>
<div :class="{'active':rubData.isCked}">
......@@ -89,13 +91,12 @@
icon="el-icon-close" circle @click.stop="deleteRubik(index)"></el-button>
</template>
<span v-if="!rubData.data.list[index].pic_url">{{rubikSize(index)}}</span>
<img v-else :src="getIconLink(rubData.data.list[index].pic_url)"
style="width: 100%;visibility: hidden;">
<img v-else :src="getIconLink(rubData.data.list[index].pic_url)" style="width: 100%;visibility: hidden;">
</div>
<div class="rubik" :style="emptyStyle(index)" v-if="rubData.data.style == 8" :key="index"></div>
<img v-if="rubData.data.list[index].pic_url && rubData.data.style == 0"
:src="getIconLink(rubData.data.list[index].pic_url)"
:key="index" style="width: 100%;visibility: hidden;display: block">
:src="getIconLink(rubData.data.list[index].pic_url)" :key="index"
style="width: 100%;visibility: hidden;display: block">
</template>
</div>
</div>
......@@ -131,7 +132,7 @@
</el-input>
</el-form-item>
</template>
<template v-if="!rubData.data.list[rubik]">
<template v-if="rubData.data.list&&!rubData.data.list[rubik]">
<el-form-item label="图片上传">
<span>请先在左边选择图片位置</span>
</el-form-item>
......@@ -140,17 +141,17 @@
<el-card shadow="never">
<el-form-item label="图片上传">
<el-button size="mini" @click="choicImg=true">选择图片</el-button>
<div flex style="flex-wrap: wrap;" v-if="rubData.data.list[rubik].pic_url">
<div flex style="flex-wrap: wrap;" v-if="rubData.data.list&&rubData.data.list[rubik].pic_url">
<div flex="main:center cross:center" class="app-gallery-item"
style="height: 100px; width: 100px;">
<img
:src="getIconLink(rubData.data.list[rubik].pic_url)"
style="width:100%;height:100%;">
<img :src="getIconLink(rubData.data.list[rubik].pic_url)" style="width:100%;height:100%;">
</div>
</div>
</el-form-item>
<el-form-item label="选择链接">
<el-input size="small" v-model="rubData.data.list[rubik].link.name" :disabled="true">
<el-input size="small" v-if="rubData.data.list&&rubData.data.list.length>0
&& rubData.data.list[rubik].link && rubData.data.list[rubik].link.length>0" v-model="
rubData.data.list[rubik].link[0].PageName" :disabled="true">
<template slot="append">
<el-button @click="isShowLink=true">选择链接</el-button>
</template>
......@@ -210,7 +211,7 @@
x: 0,
y: 0,
}, ],
icon: this.domainManager().ImageUrl+'/Static/rubik-0.png',
icon: this.domainManager().ImageUrl + '/Static/rubik-0.png',
},
{
name: '2张图',
......@@ -230,7 +231,7 @@
y: 0,
},
],
icon: this.domainManager().ImageUrl+'/Static/rubik-1.png',
icon: this.domainManager().ImageUrl + '/Static/rubik-1.png',
},
{
name: '3张图',
......@@ -256,7 +257,7 @@
y: 6,
},
],
icon: this.domainManager().ImageUrl+'/Static/rubik-2.png',
icon: this.domainManager().ImageUrl + '/Static/rubik-2.png',
},
{
name: '4张图',
......@@ -288,7 +289,7 @@
y: 12,
},
],
icon: this.domainManager().ImageUrl+'/Static/rubik-3.png',
icon: this.domainManager().ImageUrl + '/Static/rubik-3.png',
},
{
name: '2张图平分',
......@@ -308,7 +309,7 @@
y: 0,
},
],
icon: this.domainManager().ImageUrl+'/Static/rubik-4.png',
icon: this.domainManager().ImageUrl + '/Static/rubik-4.png',
},
{
name: '3张图平分',
......@@ -334,7 +335,7 @@
y: 0,
},
],
icon: this.domainManager().ImageUrl+'/Static/rubik-5.png',
icon: this.domainManager().ImageUrl + '/Static/rubik-5.png',
},
{
name: '4张图左右平分',
......@@ -366,7 +367,7 @@
y: 0,
},
],
icon: this.domainManager().ImageUrl+'/Static/rubik-6.png',
icon: this.domainManager().ImageUrl + '/Static/rubik-6.png',
},
{
name: '4张图上下平分',
......@@ -398,7 +399,7 @@
y: 62,
},
],
icon: this.domainManager().ImageUrl+'/Static/rubik-7.png',
icon: this.domainManager().ImageUrl + '/Static/rubik-7.png',
},
{
name: '自定义魔方',
......@@ -437,7 +438,7 @@
y: 93,
},
],
icon: this.domainManager().ImageUrl+'/Static/rubik-8.png',
icon: this.domainManager().ImageUrl + '/Static/rubik-8.png',
},
]
};
......@@ -467,7 +468,9 @@
} else {
if (index === 0) {
this.rubData.data.height = 'auto';
return `height: ${this.rubData.data.list[0].pic_url ? 'auto' : '360px'}`;
if (this.rubData.data.list && this.rubData.data.list.length > 0) {
return `height: ${this.rubData.data.list[0].pic_url ? 'auto' : '360px'}`;
}
}
return `height: ${this.style_list[index] ? this.style_list[index].height : 360}px`;
}
......@@ -525,7 +528,12 @@
}
let style = JSON.parse(JSON.stringify(this.style_list[index]));
for (let i in style.list) {
style.list[i].link = {};
style.list[i].link = [{
PageUrl: '',
IsParameter: 0,
ParameterValue: '',
PageName: ''
}];
}
this.rubData.data.height = style.height;
this.rubData.data.w = style.w;
......@@ -706,7 +714,10 @@
if (this.rubData.data.list.length <= 0) {
return '';
}
this.rubData.data.list[this.rubik].link.name = obj.PageName;
this.rubData.data.list[this.rubik].link[0].PageUrl = obj.PageUrl;
this.rubData.data.list[this.rubik].link[0].IsParameter = obj.IsParameter;
this.rubData.data.list[this.rubik].link[0].ParameterValue = obj.ParameterValue;
this.rubData.data.list[this.rubik].link[0].PageName = obj.PageName;
this.isShowLink = false;
},
......
src/components/sallCenter/templateEdit.vue
View file @ f1049b05
This diff is collapsed.
src/components/sallCenter/templateManage.vue
View file @ f1049b05
......@@ -50,6 +50,9 @@
</template>
</el-table-column>
</el-table>
<el-pagination style="text-align:right" background @current-change="handleCurrentChange" :page-size="qMsg.pageSize"
layout="prev, pager, next" :total="total">
</el-pagination>
</div>
</div>
</template>
......@@ -60,7 +63,7 @@
dataList: [],
qMsg: {
pageIndex: 1,
pageSize: 20,
pageSize: 15,
},
total: 0
};
......@@ -69,6 +72,10 @@
},
methods: {
handleCurrentChange(val) {
this.qMsg.pageIndex = val;
this.getList();
},
getList() {
this.apipost("/api/Template/GetMiniTemplatePageList", this.qMsg, res => {
if (res.data.resultCode == 1) {
......@@ -106,4 +113,5 @@
this.getList();
}
};
</script>
\ No newline at end of file
</script>
src/components/sallCenter/templateMarketManage.vue 0 → 100644
View file @ f1049b05
<style>
.templateMarketManage .template_comheader {
padding: 13px 20px;
border-bottom: 1px solid #EBEEF5;
-webkit-box-sizing: border-box;
box-sizing: border-box;
background: #fff;
}
.templateMarketManage .template_comheader>div {
display: flex;
justify-content: space-between;
align-items: center;
flex-direction: row;
}
.templateMarketManage .temp_content {
margin-top: 10px;
background: #fff;
padding: 20px;
}
.templateMarketManage .temp_imgStyle {
display: inline-block;
margin-right: 10px;
}
</style>
<template>
<div class="templateMarketManage">
<div class="template_comheader">
<div>
<span>模板市场管理</span>
<el-button type="primary" size="small" @click="CommonJump('templateMarket',{})">模板市场</el-button>
<el-button type="primary" size="small" @click="isShow=true,clearMsg()">新增</el-button>
</div>
</div>
<div class="temp_content">
<el-table :data="dataList" border style="width: 100%">
<el-table-column prop="Id" label="编号" width="100"></el-table-column>
<el-table-column prop="Name" label="模板名称"></el-table-column>
<el-table-column label="封面图" width="200">
<template slot-scope="scope">
<img :src="scope.row.Pics" style="width:180px;height:150px;">
</template>
</el-table-column>
<el-table-column label="启用/禁用" width="100">
<template slot-scope="scope">
<el-switch v-model="scope.row.IsUse" active-color="#409EFF" :active-value="1" :inactive-value="0"
@change="updateIsUse(scope.row)">
</el-switch>
</template>
</el-table-column>
<el-table-column label="显示/隐藏" width="100">
<template slot-scope="scope">
<el-switch v-model="scope.row.IsShow" active-color="#409EFF" :active-value="1" :inactive-value="0"
@change="updateIsShow(scope.row)">
</el-switch>
</template>
</el-table-column>
<el-table-column prop="SortNum" label="排序" width="180"></el-table-column>
<el-table-column prop="CreateByName" label="操作人" width="150"></el-table-column>
<el-table-column prop="CreateDateStr" label="创建时间" width="180"></el-table-column>
<el-table-column label="操作" width="180">
<template slot-scope="scope">
<el-tooltip class="item" effect="dark" content="编辑" placement="top">
<img src="../../assets/img/setup/edit.png" alt="" class="temp_imgStyle" @click="EditeMarket(scope.row)">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="删除" placement="top">
<img src="../../assets/img/setup/del.png" alt="" class="temp_imgStyle" @click="DeleteMarket(scope.row)">
</el-tooltip>
</template>
</el-table-column>
</el-table>
<el-pagination style="text-align:right" background @current-change="handleCurrentChange"
:page-size="qMsg.pageSize" layout="prev, pager, next" :total="total">
</el-pagination>
</div>
<!-- 新增修改模板市场 -->
<el-dialog title="模板市场" :visible.sync="isShow" width="700px">
<div class="content">
<el-form label-width="120px" style="padding:0 20px;">
<el-form-item label="模板名称">
<el-input v-model="PostMsg.Name" class="w400" size="small" maxlength="20" placeholder="请输入模板名称" />
</el-form-item>
<el-form-item label="封面图">
<el-input type="text" v-model="PostMsg.Pics" size="small" class="w400" placeholder="请输入选择封面图" />
</el-form-item>
<el-form-item label="价格">
<el-input type="text" v-model="PostMsg.Price" size="small" class="w400"
@keyup.native="checkPrice(PostMsg,'Price')" placeholder="请输入价格" />
</el-form-item>
<el-form-item label="启用/禁用">
<el-switch v-model="PostMsg.IsUse" active-color="#409EFF" :active-value="1" :inactive-value="0"></el-switch>
</el-form-item>
<el-form-item label="显示/隐藏">
<el-switch v-model="PostMsg.IsShow" active-color="#409EFF" :active-value="1" :inactive-value="0">
</el-switch>
</el-form-item>
<el-form-item label="排序">
<el-input type="text" v-model="PostMsg.SortNum" size="small" class="w400"
@keyup.native="checkInteger(PostMsg,'SortNum')" placeholder="请输入排序" />
</el-form-item>
<el-form-item label="模板内容">
<el-input type="textarea" :rows="5" v-model="PostMsg.TemplateData" size="small" class="w400"
placeholder="请输入模板内容" />
</el-form-item>
</el-form>
</div>
<span slot="footer" class="dialog-footer">
<el-button size="small" @click="isShow = false,clearMsg()">取消</el-button>
<el-button size="small" type="primary" @click="SaveMarket()">保存</el-button>
</span>
</el-dialog>
</div>
</template>
<script>
export default {
data() {
return {
isShow: false,
dataList: [],
qMsg: {
pageIndex: 1,
pageSize: 15,
IsUse:-1,
IsShow:-1,
},
total: 0,
//添加修改
PostMsg: {
Id: 0, //编号
Name: "", //模板名称
Pics: "", //封面图
Price: 0.00, //价格
IsUse: 1, //是否使用(0-禁用,1-使用)
IsShow: 1, //是否显示(0-不显示,1-显示)
TemplateData: "", //模板数据
SortNum: 0, //排序
}
};
},
created() {
},
methods: {
handleCurrentChange(val) {
this.qMsg.pageIndex = val;
this.getList();
},
//清空数据
clearMsg() {
this.PostMsg.Id = 0;
this.PostMsg.Name = "";
this.PostMsg.Pics = "";
this.PostMsg.Price = 0;
this.PostMsg.IsUse = 1;
this.PostMsg.IsShow = 1;
this.PostMsg.TemplateData = "";
this.PostMsg.SortNum = 0;
},
getList() {
this.apipost("/api/Template/GetTemplateMarketPageListModule", this.qMsg, res => {
if (res.data.resultCode == 1) {
this.dataList = res.data.data.pageData;
this.total = res.data.data.count;
} else {
this.Info(res.data.message);
}
})
},
//保存模板市场数据
SaveMarket() {
this.apipost("/api/Template/SetTemplateMarket", this.PostMsg, res => {
if (res.data.resultCode == 1) {
this.isShow=false;
this.Success(res.data.message);
this.getList();
this.clearMsg();
} else {
this.Info(res.data.message);
}
})
},
//修改模板市场
EditeMarket(item) {
this.apipost("/api/Template/GetTemplateMarket", {
Id: item.Id,
}, res => {
if (res.data.resultCode == 1) {
this.PostMsg = res.data.data;
this.isShow = true;
} else {
this.Info(res.data.message);
}
})
},
//删除模板市场
DeleteMarket(item) {
let that = this;
that.Confirm("是否删除?", function () {
that.apipost("/api/Template/RemoveTemplateMarket", {
Id: item.Id,
}, res => {
if (res.data.resultCode == 1) {
that.Success(res.data.message);
that.getList();
} else {
that.Info(res.data.message);
}
})
});
},
//更新是否使用
updateIsUse(item) {
this.apipost("/api/Template/UpdateTemplateMarketIsUse", {
Id: item.Id,
IsUse: item.IsUse
}, res => {
if (res.data.resultCode == 1) {
this.Success(res.data.message);
this.getList();
} else {
this.Info(res.data.message);
}
})
},
//更新是否显示
updateIsShow(item) {
this.apipost("/api/Template/UpdateTemplateMarketIsShow", {
Id: item.Id,
IsShow: item.IsShow
}, res => {
if (res.data.resultCode == 1) {
this.Success(res.data.message);
this.getList();
} else {
this.Info(res.data.message);
}
})
}
},
mounted() {
this.getList();
}
};
</script>
src/plug/index.js
View file @ f1049b05
This diff is collapsed.
src/router/index.js
View file @ f1049b05
......@@ -91,14 +91,18 @@ export default new Router({
path: '/CustomPage',
name: 'CustomPage',
component: resolve => require(['@/components/sallCenter/CustomPage'], resolve),
},{ //授权页面
}, { //授权页面
path: '/authorization',
name: 'authorization',
component: resolve => require(['@/components/sallCenter/authorization'], resolve),
},{ //模板市场
}, { //模板市场
path: '/templateMarket',
name: 'templateMarket',
component: resolve => require(['@/components/sallCenter/templateMarket'], resolve),
}, { //模板市场管理页面
path: '/templateMarketManage',
name: 'templateMarketManage',
component: resolve => require(['@/components/sallCenter/templateMarketManage'], resolve),
}]
},
{
......@@ -273,7 +277,7 @@ export default new Router({
name: 'bulkImport',
component: resolve => require(['@/components/CommodityMan/bulkImport'], resolve),
},
// 商品管理 淘宝CSV
{
path: '/taoBaoCSV',
......@@ -299,36 +303,36 @@ export default new Router({
component: resolve => require(['@/components/orderMan/afterSalesOrder'], resolve),
},
// 订单管理 售后订单详情
        {
          path: '/salesOrderDetails',
          name: 'salesOrderDetails',
          component: resolve => require(['@/components/orderMan/salesOrderDetails'], resolve),
        },
        // 订单管理 评价模板
        {
          path: '/evaluationTemplate',
          name: 'evaluationTemplate',
          component: resolve => require(['@/components/orderMan/evaluationTemplate'], resolve),
        },
        // 订单管理 评价管理
        {
          path: '/evaluationMan',
          name: 'evaluationMan',
          component: resolve => require(['@/components/orderMan/evaluationMan'], resolve),
        },
{
path: '/salesOrderDetails',
name: 'salesOrderDetails',
component: resolve => require(['@/components/orderMan/salesOrderDetails'], resolve),
},
// 订单管理 评价模板
{
path: '/evaluationTemplate',
name: 'evaluationTemplate',
component: resolve => require(['@/components/orderMan/evaluationTemplate'], resolve),
},
// 订单管理 评价管理
{
path: '/evaluationMan',
name: 'evaluationMan',
component: resolve => require(['@/components/orderMan/evaluationMan'], resolve),
},
// 订单管理 客户评价
        {
          path: '/customerEvaluation',
          name: 'customerEvaluation',
          component: resolve => require(['@/components/orderMan/customerEvaluation'], resolve),
        },
{
path: '/customerEvaluation',
name: 'customerEvaluation',
component: resolve => require(['@/components/orderMan/customerEvaluation'], resolve),
},
// 订单管理 批量发货
        {
          path: '/BulkShipment',
          name: 'BulkShipment',
          component: resolve => require(['@/components/orderMan/BulkShipment'], resolve),
        },
{
path: '/BulkShipment',
name: 'BulkShipment',
component: resolve => require(['@/components/orderMan/BulkShipment'], resolve),
},
//设置 基础设置
{
path: '/basicSetUp',
......
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