Skip to content

E
ElectricitySheep
Commit 348eb54e authored by zhangjianguo's avatar zhangjianguo
Browse files
Options

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

parents 2dfd8666 59e6fc9a
Hide whitespace changes
Inline Side-by-side
Showing with 1799 additions and 370 deletions
src/assets/css/common.css
View file @ 348eb54e
......@@ -34,6 +34,9 @@
.w100{
width:100px!important;
}
.w120{
width:120px!important;
}
.w200{
width:200px!important;
}
......
src/components/Ftemplate.vue
View file @ 348eb54e
......@@ -169,10 +169,10 @@
<li class="menu_item" :class="{'Fchecked':isChecked==1}" @click="isChecked=1,CommonJump('templateManage')">
<i class="el-icon-menu"></i><span>模板管理</span>
</li>
<li class="menu_item" :class="{'Fchecked':isChecked==2}" @click="isChecked=2,CommonJump('wexinappmsg')">
<li class="menu_item" :class="{'Fchecked':isChecked==2}" @click="isChecked=2">
<i class="el-icon-menu"></i><span>模板市场</span>
</li>
<li class="menu_item" :class="{'Fchecked':isChecked==3}" @click="isChecked=3">
<li class="menu_item" :class="{'Fchecked':isChecked==3}" @click="isChecked=3,CommonJump('CustomPage')">
<i class="el-icon-menu"></i><span>自定义页面</span>
</li>
<li class="menu_item" :class="{'Fchecked':isChecked==4}" @click="isChecked=4">
......
src/components/global/UE.vue
View file @ 348eb54e
<template>
<div>
<script type="text/plain" id="editor"></script>
<textarea type="text/plain" :id="id"></textarea>
<!-- 选择图片 -->
<el-dialog title="选择文件" :visible.sync="changeState" width="1240px">
<ChooseImg @SelectId="SelectId"></ChooseImg>
<ChooseImg @SelectId="SelectId"></ChooseImg>
</el-dialog>
</div>
</template>
......@@ -14,10 +14,13 @@
ChooseImg
},
name: 'UE',
data () {
data() {
return {
id: 'editor' + (Math.floor((Math.random() * 10000) + 1)),
editor: null,
changeState:false,
changeState: false,
isInputChange: false,
tempContent: this.defaultMsg
}
},
props: {
......@@ -29,63 +32,82 @@
},
},
mounted() {
this.loadUe();
},
watch: {
defaultMsg(newVal, oldVal) {
if (!this.isInputChange && newVal) {
if (this.editor && this.editor.isReady === 1) {
this.editor.setContent(newVal);
} else {
this.tempContent = newVal;
}
}
if (this.isInputChange) {
this.isInputChange = false;
}
},
},
methods: {
InitData(){
const _this = this;
this.editor = UE.getEditor('editor', this.config); // 初始化UE
this.editor.addListener("ready", function () {
_this.editor.setContent(_this.defaultMsg); // 确保UE加载完成后，放入内容。
});
this.loadUe();
InitData() {
},
SelectId(e) {
if (e) {
let html = '';
this.ue = UE.getEditor('editor');
html= '<img src="' + this.domainManager().ImageUrl+e.url + '" style="max-width: 100%;">';
this.ue.execCommand('inserthtml', html);
}
this.changeState=false;
if (e) {
let html = '';
this.ue = UE.getEditor(this.id);
html = '<img src="' + this.domainManager().ImageUrl + e.url + '" style="max-width: 100%;">';
this.ue.execCommand('inserthtml', html);
}
this.isInputChange = false;
},
getUEContent() { // 获取内容方法
return this.editor.getContent()
},
loadUe() {
const vm = this;
this.ue = UE.getEditor('editor');
// this.ue.addListener('ready', editor => {
// if (this.tempContent) {
// this.ue.setContent(this.tempContent);
// }
// });
// this.ue.addListener('keyup', editor => {
// this.isInputChange = true;
// this.$emit('input', this.ue.getContent());
// });
// this.ue.addListener('contentChange', editor => {
// this.isInputChange = true;
// this.$emit('input', this.ue.getContent());
// });
const _this = this;
UE.registerUI('appinsertimage', (editor, uiName) => {
return new UE.ui.Button({
name: uiName,
title: '插入图片',
//添加额外样式，指定icon图标，这里默认使用一个重复的icon
cssRules: 'background-position: -381px 0px;',
onclick() {
self.editor = editor;
_this.changeState = true;
},
});
});
this.editor = UE.getEditor(this.id, this.config); // 初始化UE
let self = this;
UE.registerUI('appinsertimage', (editor, uiName) => {
return new UE.ui.Button({
name: uiName,
title: '插入图片',
//添加额外样式，指定icon图标，这里默认使用一个重复的icon
cssRules: 'background-position: -381px 0px;',
onclick() {
self.ue = editor
vm.changeState = true;
},
});
this.editor.addListener("ready", function () {
_this.editor.setContent(_this.defaultMsg); // 确保UE加载完成后，放入内容。
});
this.editor.addListener('ready', editor => {
if (_this.tempContent) {
_this.editor.setContent(_this.tempContent);
}
});
this.editor.addListener('keyup', editor => {
this.isInputChange = false;
_this.$emit('input', _this.editor.getContent());
});
}
this.editor.addListener('contentChange', editor => {
this.isInputChange = false;
_this.$emit('input', _this.editor.getContent());
});
}
},
destroyed() {
this.editor.destroy();
},
}
</script>
\ No newline at end of file
</script>
src/components/orderMan/orderDetails.vue 0 → 100644
View file @ 348eb54e
<template>
<div class="orderDetails">
<div class="head-title">
<span @click="CommonJump('orderList')" class="blue point">订单列表</span> / 订单详情
</div>
<div class="content app-order-detail">
<el-card class="app-order-status" shadow="never">
<el-steps :active="activeStep" align-center>
<el-step title="已下单" icon="el-icon-edit" description="2020-05-13 16:36:11">
<i :class="activeStep==1?'step01Active':'step01'" slot="icon"></i>
</el-step>
<el-step title="已付款" icon="el-icon-edit" description="2020-05-13 16:36:11">
<i :class="activeStep==2?'step02Active':'step02'" slot="icon"></i>
</el-step>
<el-step title="未发货" icon="el-icon-edit" description="2020-05-13 16:36:11">
<i :class="activeStep==3?'step03Active':'step03'" slot="icon"></i>
</el-step>
<el-step title="已收货" icon="el-icon-edit" description="2020-05-13 16:36:11">
<i :class="activeStep==4?'step04Active':'step04'" slot="icon"></i>
</el-step>
<el-step title="未结束" icon="el-icon-edit" description="2020-05-13 16:36:11">
<i :class="activeStep==5?'step05Active':'step05'" slot="icon"></i>
</el-step>
</el-steps>
</el-card>
<el-row :gutter="16">
<el-col :span="8">
<div class="card-box">
<h3>订单信息</h3>
<div flex="dir:left cross:center" class="item-box">
<span class="label">订单号:</span>
<div>20200513163611394177</div>
</div>
<div flex="dir:left cross:center" class="item-box">
<span class="label">商户单号:</span>
<div>HMca0d3f54c0d1f400d78e398486ba1c</div>
</div>
<div flex="dir:left cross:center" class="item-box">
<span class="label">支付方式:</span>
<span class="el-tag el-tag--success el-tag--small el-tag--light is-hit">线上支付</span>
</div>
<div flex="dir:left cross:center" class="item-box">
<span class="label">配送方式:</span>
<span class="el-tag el-tag--primary el-tag--small el-tag--light is-hit">快递发送</span>
</div>
<div flex="dir:left cross:center" class="item-box">
<span class="label">用户:</span>
<div>🌸井澤💐</div>
</div>
<div flex="dir:left cross:center" class="item-box">
<span class="label">收货人:</span>
<div>李凤君</div>
</div>
<div flex="dir:left cross:center" class="item-box">
<span class="label">电话:</span>
<div>15134634264</div>
</div>
<div flex="dir:left cross:center" class="item-box">
<span class="label">收货地址:</span>
<div class="express-address">黑龙江省 哈尔滨市 道外区 哈尔滨市道外区陶瓷小区E2栋3单元1902室。15134634264李凤君
<button type="button" class="el-button el-button--text el-button--small is-circle">
<i class="el-icon-edit"></i>
</button>
</div>
</div>
<div flex="dir:top" class="item-box">
<div flex="dir:left cross:center">
<span class="label">物流信息:</span>
<span class="el-tag el-tag--info el-tag--small el-tag--light is-hit" style="margin-right: 5px;">
中通快递
</span>
<a href="https://www.baidu.com/s?wd=中通快递640213339544" target="_blank" title="点击搜索运单号">640213339544</a>
</div>
<div flex="dir:left">
<span class="label">商家留言:</span>
<span></span>
</div>
</div>
</div>
</el-col>
<el-col :span="8">
<div class="card-box">
<h3>订单信息</h3>
<div flex="dir:left cross:center" class="item-box" style="flex-shrink: 0;">
<span class="label">商家备注:</span>
<div>库存-1
<i class="el-icon-edit" style="color: rgb(64, 158, 255); cursor: pointer; margin-left: 10px;"></i>
</div>
</div>
</div>
</el-col>
<el-col :span="8">
<div flex="dir:top" class="card-box">
<h3>分销信息</h3>
<div>
<div class="share-title">一级分销商</div>
<div flex="dir:left cross:center" class="item-box">
<span class="label">姓名:</span>
<div>印象日本地接～谢军</div>
</div>
<div flex="dir:left cross:center" class="item-box">
<span class="label">手机号:</span>
<div></div>
</div>
<div flex="dir:left cross:center" class="item-box share-price">
<span class="label orange-label">佣金:</span>
<div>￥7.00</div>
</div>
</div>
</div>
</el-col>
</el-row>
<el-card shadow="never">
<el-table
border
:data="tableData"
style="width: 100%">
<el-table-column
prop="Id"
label="商品标题"
>
<template slot-scope="scope">
<div flex="dir:left cross:center">
<img src="https://cdnimg.iotweixin.com/uploads/mall1285/20200430/ba10bdeb05c86815ae711460c9de5d2c.jpg" alt="" style="height: 60px; width: 60px; margin-right: 5px;">
<div class="app-ellipsis">
<div class="vue-line-clamp" style="word-break: break-all; -webkit-line-clamp: 1;">
精选！土枇杷新鲜水果5斤装 四川精品野生超大甜枇杷果 四川省内包邮
</div>
</div>
</div>
</template>
</el-table-column>
<el-table-column
prop="name"
label="规格"
width="200">
<template slot-scope="scope">
<span class="el-tag el-tag--mini el-tag--light" style="margin-right: 5px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; max-width: 95%;">
重量:5斤装
</span>
</template>
</el-table-column>
<el-table-column
prop="address"
label="单价"
width="120">
</el-table-column>
<el-table-column
prop="address"
label="数量"
width="80">
</el-table-column>
<el-table-column
prop="address"
label="原价"
width="120">
</el-table-column>
<el-table-column
prop="address"
label="折扣后"
width="120">
</el-table-column>
</el-table>
<el-form label-width="200px" class="app-order-count-price">
<el-form-item label="商品小计">
￥90.00
</el-form-item>
<el-form-item label="运费">
￥90.00
</el-form-item>
<el-form-item label="实付款">
<span style="color: rgb(255, 69, 68);">￥<b>148.00</b></span>
</el-form-item>
</el-form>
</el-card>
<div flex="dir:right" class="action-box">
<el-button style="margin-left: 10px;" size="small" type="primary">打印发货单</el-button>
<el-button style="margin-left: 10px;" size="small" type="primary">打印小票</el-button>
<el-button style="margin-left: 10px;" size="small" type="primary">发货</el-button>
</div>
</div>
</div>
</template>
<script>
export default {
data() {
return {
activeStep:1,
tableData:[
{Id:1}
],
};
},
created() {
if(this.$route.query.UserId){
this.UserId=this.$route.query.UserId;
this.getData()
}
},
methods: {
getData(){
this.apipost("/api/user/GetMemberUserInfo",{UserId:this.UserId}, res => {
this.userInfo=res.data.data;
})
},
},
mounted() {
}
};
</script>
<style>
.app-order-detail .express-address {
width: 80%;
}
.app-order-detail .action-box {
padding: 10px 20px;
}
.app-order-detail .app-order-count-price .el-form-item {
margin-bottom: 5px;
}
.app-order-detail .app-order-count-price {
float: right;
margin-right: 55px;
font-size: 12px;
text-align: right;
margin-top: 15px;
}
.app-order-detail h3{
padding:15px 0;
}
.app-order-detail .share-price {
color: #EF8933;
}
.app-order-detail .share-title {
font-size: 15px;
margin: 10px 0 5px;
}
.app-order-detail .card-box .label {
color: #999999;
margin-right: 10px;
}
.app-order-detail .item-box {
margin-bottom: 10px;
}
.app-order-detail .card-box {
border: 1px solid #EBEEF5;
border-radius: 3px;
padding: 10px;
height: 300px;
overflow-y: scroll;
}
.app-order-detail .step05{
height: 30px;
width: 30px;
background-image: url("../../assets/img/userman/status_5.png");
}
.app-order-detail .step04{
height: 30px;
width: 30px;
background-image: url("../../assets/img/userman/status_4.png");
}
.app-order-detail .step03{
height: 30px;
width: 30px;
background-image: url("../../assets/img/userman/status_3.png");
}
.app-order-detail .step02{
height: 30px;
width: 30px;
background-image: url("../../assets/img/userman/status_2.png");
}
.app-order-detail .step04Active{
height: 30px;
width: 30px;
background-image: url("../../assets/img/userman/status_4_active.png");
}
.app-order-detail .step03Active{
height: 30px;
width: 30px;
background-image: url("../../assets/img/userman/status_3_active.png");
}
.app-order-detail .step02Active{
height: 30px;
width: 30px;
background-image: url("../../assets/img/userman/status_2_active.png");
}
.app-order-detail .step01Active{
height: 30px;
width: 30px;
background-image: url("../../assets/img/userman/status_1_active.png");
}
.app-order-detail .app-order-status {
padding: 50px 120px;
margin-bottom: 30px;
}
.orderDetails .content{
background: #fff;
margin-top: 10px;
padding: 20px;
box-sizing: border-box;
}
</style>
src/components/orderMan/orderList.vue 0 → 100644
View file @ 348eb54e
<template>
<div class="orderList">
<div class="head-title">
订单列表
<el-button style="float:right;margin-top: -5px;" size="small" type="primary">批量导出</el-button>
<el-button @click="ClearHsz" style="float:right;margin-top: -5px;margin-right:20px" size="small" type="primary">清空回收站</el-button>
</div>
<div class="content">
<div>
<span>下单时间：</span>
<el-date-picker
v-model="dateList"
@change="getList"
size="small"
type="datetimerange"
range-separator="至"
value-format="yyyy-MM-dd HH:mm:ss"
start-placeholder="开始日期"
end-placeholder="结束日期">
</el-date-picker>
<span style="margin-left:15px">所属平台：</span>
<el-select class="w120" @change="getList" style="margin-right: 10px;" v-model="msg.OrderSource" size="small" placeholder="请选择">
<el-option label="全部平台" :value="0"></el-option>
<el-option
v-for="item in platList"
:key="item.Id"
:label="item.Name"
:value="item.Id">
</el-option>
</el-select>
<span style="margin-left:15px">订单类型：</span>
<el-select class="w120" @change="getList" style="margin-right: 10px;" v-model="msg.OrderSource" size="small" placeholder="请选择">
<el-option label="全部平台" :value="0"></el-option>
<el-option
v-for="item in platList"
:key="item.Id"
:label="item.Name"
:value="item.Id">
</el-option>
</el-select>
<span style="margin-left:15px">配送方式：</span>
<el-select class="w120" @change="getList" style="margin-right: 10px;" v-model="msg.OrderSource" size="small" placeholder="请选择">
<el-option label="全部平台" :value="0"></el-option>
<el-option
v-for="item in platList"
:key="item.Id"
:label="item.Name"
:value="item.Id">
</el-option>
</el-select>
<el-input style="margin-left:15px;width:350px" placeholder="请输入内容" v-model="msgVal" size="small">
<el-select @change="ChangeId" v-model="msgId" slot="prepend" placeholder="请选择">
<el-option
v-for="item in option"
:key="item.Id"
:label="item.name"
:value="item.Id">
</el-option>
</el-select>
</el-input>
</div>
<div>
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane :dataId="0" label="全部" name="first"></el-tab-pane>
<el-tab-pane :dataId="1" label="上架中" name="second"></el-tab-pane>
<el-tab-pane :dataId="2" label="下架中" name="third"></el-tab-pane>
<el-tab-pane :dataId="3" label="售罄" name="fourth"></el-tab-pane>
</el-tabs>
<div class="app-order-title">
<div style="width: 55%;">订单信息</div>
<div style="width: 20%;">实付金额</div>
<div style="width: 20%;">操作</div>
</div>
<div class="app-order-list">
<el-card class="app-order-item" shadow="never">
<div slot="header" class="clearfix">
<div flex="cross:center" class="app-order-head">
<div class="app-order-time">2020-05-13 11:27:04</div>
<div class="app-order-user">
<span class="app-order-time">订单号：</span>20200513112704781609
</div>
<div flex="cross:center" class="app-order-user"><img src="../../assets/img/userman/wx.png" alt=""> <span>Lesleyyp(84021)</span></div>
<div flex="dir:left wrap:wrap" class="app-order-offline">
<div class="express-send-box">
<span class="el-tag el-tag--small el-tag--light">快递发送</span>
</div>
<span style="margin-left:5px" class="el-tag el-tag--warning el-tag--small el-tag--light">未付款</span>
</div>
<el-tooltip class="item" effect="dark" content="强制取消" placement="top-start">
<img @click="OrderExit(3)" style="right:60px" class="app-order-btnimg" src="../../assets/img/userman/force.png" alt="">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="加入回收站" placement="top-start">
<img class="app-order-btnimg" src="../../assets/img/userman/del1.png" alt="">
</el-tooltip>
</div>
</div>
<div class="app-order-body">
<div class="goods-item" style="width: 55%;">
<div class="goods">
<img src="https://cdnimg.iotweixin.com/uploads/mall1285/20200427/b0e6c3d4b43747302f143c2c45cafc02.jpg" class="goods-image">
<div flex="dir:left">
<div class="goods-info">
<div class="goods-name">
<div class="app-ellipsis">
<div class="vue-line-clamp" style="word-break: break-all; -webkit-line-clamp: 2;">
<span class="el-tag el-tag--warning el-tag--mini el-tag--light is-hit" style="margin-right: 5px;">
商城
</span>
日本Horse Oil熊野油脂马油无硅油滋润洗发水护发素（2瓶洗发水600ml+1瓶护发素600ml）全国包邮
</div>
</div>
</div>
<div style="margin-bottom: 24px;">
<span style="margin-right: 10px;">
规格：
<span class="el-tag el-tag--mini el-tag--light" style="margin-right: 5px; max-width: 300px; overflow: hidden; white-space: nowrap; text-overflow: ellipsis;">
套装:2瓶洗发水+1瓶护发素
</span>
</span>
</div>
<div class="app-order-goods-price">
<span>货号：日本严选</span>
</div>
</div>
<div flex="dir:left box:mean" style="width: 250px;">
<div flex="cross:center main:center">
<span>小计：￥128.00</span>
</div>
<div flex="cross:center main:center">数量：x 1</div>
</div>
</div>
</div>
</div>
<div flex="cross:center" class="app-order-info" style="width: 20%;">
<div flex="dir:top">
<div>
<span style="font-size: 16px;">￥128.00</span>
<el-popover
placement="top-start"
title="标题"
width="200"
trigger="hover"
content="这是一段内容,这是一段内容,这是一段内容,这是一段内容。">
<img slot="reference" src="../../assets/img/userman/price.png" alt="">
</el-popover>
</div>
<div class="express-price"><span>
<span style="color: rgb(144, 147, 153);">(含运费￥0.00)
<img @click="OrderExit(2)" src="../../assets/img/userman/edit1.png" alt="">
</span>
</span></div>
<div><el-tag effect="dark" type="warning" size="mini">在线支付</el-tag></div>
</div>
</div>
<div class="app-order-info" style="padding: 10px; border-right: 0px; width: 20%;">
<div flex="wrap:wrap cross:center">
<el-tooltip class="item" effect="dark" content="发货" placement="top">
<img @click="fhBtn" class="app-order-icon" src="../../assets/img/userman/send.png" alt="">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="打印小票" placement="top">
<img class="app-order-icon" src="../../assets/img/userman/print.png" alt="">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="打印发货单" placement="top">
<img class="app-order-icon" src="../../assets/img/userman/invoice.png" alt="">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="添加备注" placement="top">
<img @click="OrderExit(1)" class="app-order-icon" src="../../assets/img/userman/add_remark.png" alt="">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="查看订单详情" placement="top">
<img @click="CommonJump('orderDetails')" class="app-order-icon" src="../../assets/img/userman/detail.png" alt="">
</el-tooltip>
</div>
</div>
</div>
<div class="card-footer">
<div>
<div flex="dir:left">
<div class="address-box">收货人: 陈冰 电话：13606097366 地址：福建省 厦门市 思明区 寿彭路鸿山新村4号2102室</div>
<button @click="ExitshAdress" type="button" class="el-button el-button--text is-circle"><i class="el-icon-edit"></i></button>
</div>
</div>
</div>
</el-card>
</div>
</div>
</div>
<!-- 订单取消 -->
<el-dialog title="修改" :visible.sync="exitDig" width="600px">
<el-form :model="exitMsg" ref="exitMsg" label-width="0">
<p style="padding:10px 0" v-if="exitMsg.Type==3">填写取消理由：</p>
<p style="padding:10px 0" v-if="exitMsg.Type==1">添加备注：</p>
<template v-if="exitMsg.Type==2">
<el-form-item label="商品总价">
<el-input size="small" v-model="exitMsg.Remark"></el-input>
</el-form-item>
<el-form-item label="运费">
<el-input size="small" v-model="exitMsg.Remark"></el-input>
</el-form-item>
</template>
<el-form-item>
<el-input type="textarea" row="2" size="small" v-model="exitMsg.Remark"></el-input>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button size="small" @click="exitDig = false">取 消</el-button>
<el-button size="small" type="primary" @click="submitForm('exitMsg')">确 定</el-button>
</span>
</el-dialog>
<!-- 发货 -->
<el-dialog custom-class="app-send" title="发货" :visible.sync="fhDig" width="35%">
<div class="title-box">
<span class="text">选择发货商品</span>
<span>(默认全选)</span>
</div>
<el-table
:data="fahuoList"
@selection-change="TableSelectChange"
style="width: 100%">
<el-table-column
type="selection"
width="55">
</el-table-column>
<el-table-column
prop="id"
label="图片"
width="60">
<template slot-scope="scope">
<img style="width:30px;height:30px" src="../../assets/img/business.png" alt="">
</template>
</el-table-column>
<el-table-column
prop="name"
label="名称"
width="314">
</el-table-column>
<el-table-column
prop="name"
label="数量"
width="80">
</el-table-column>
<el-table-column
prop="address"
label="规格">
</el-table-column>
</el-table>
<div class="title-box"><span class="text">物流信息</span></div>
<el-form :model="fhMsg" ref="exitMsg" :rules="fhrules" label-width="130px">
<el-form-item label="物流快递">
<el-radio v-model="fhMsg.Type" :label="1">快递</el-radio>
<el-radio v-model="fhMsg.Type" :label="2">其他方式</el-radio>
</el-form-item>
<template v-if="fhMsg.Type==1">
<el-form-item label="快递公司" prop="ExpressId">
<el-select class="w200" size="small" v-model="fhMsg.ExpressId" filterable placeholder="请选择">
<el-option
v-for="item in ExpressList"
:key="item.ID"
:label="item.Name"
:value="item.ID">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="收件人邮编">
<el-input type="number" min="1" size="small" v-model="exitMsg.PostCode"></el-input>
</el-form-item>
<el-form-item label="快递单号" prop="ExpressNumber">
<el-input size="small" v-model="exitMsg.ExpressNumber">
<el-button slot="append"> 获取面单</el-button>
</el-input>
</el-form-item>
<el-form-item label="商家留言">
<el-input type="textarea" row="2" size="small" v-model="exitMsg.Remark"></el-input>
</el-form-item>
</template>
<template v-if="fhMsg.Type==2">
<el-form-item label="物流内容">
<el-input type="textarea" row="2" size="small" v-model="exitMsg.Remark"></el-input>
</el-form-item>
</template>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button size="small" @click="fhDig = false">取 消</el-button>
<el-button size="small" type="primary" @click="FhsubmitForm('exitMsg')">确 定</el-button>
</span>
</el-dialog>
<!-- 修改收货地址 -->
<el-dialog title="修改收货地址" :visible.sync="shDig" width="600px">
<el-form :model="shMsg" :rules="shMsgrule" ref="exitMsg" label-width="80px">
<el-form-item label="收件人" prop="Consignee">
<el-input size="small" v-model="shMsg.Consignee"></el-input>
</el-form-item>
<el-form-item label="电话" prop="Mobile">
<el-input type="number" size="small" v-model="shMsg.Mobile"></el-input>
</el-form-item>
<el-form-item label="所在区域" prop="Province">
<el-select size="small" @change="getCity" v-model="shMsg.Province" style="width:144px" filterable placeholder="请选择">
<el-option
v-for="item in provinceList"
:key="item.ID"
:label="item.Name"
:value="item.ID">
</el-option>
</el-select>
<el-select size="small" @change="getArea" v-model="shMsg.City" style="width:144px" filterable placeholder="请选择">
<el-option
v-for="item in cityList"
:key="item.ID"
:label="item.Name"
:value="item.ID">
</el-option>
</el-select>
<el-select size="small" v-model="shMsg.District" style="width:144px" filterable placeholder="请选择">
<el-option
v-for="item in areaList"
:key="item.ID"
:label="item.Name"
:value="item.ID">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="详细地址" prop="ShippingAddress">
<el-input size="small" v-model="shMsg.ShippingAddress"></el-input>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button size="small" @click="shDig = false">取 消</el-button>
<el-button size="small" type="primary" @click="shsubmitForm('shMsg')">确 定</el-button>
</span>
</el-dialog>
<!-- 选择导出信息 -->
<el-dialog
title="选择导出信息"
:visible.sync="dialogVisible"
width="960px">
<el-form style="border: 1px solid #F0F2F7;" :model="addMsg" ref="addMsg" label-width="100px">
<div style="box-sizing: border-box;background-color: #F3F5F6;width: 100%;padding-left: 20px;height: 50px;line-height: 50px;">
<el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange">全选</el-checkbox>
</div>
<div style="margin: 15px 0;"></div>
<div style="padding: 10px 25px 20px;">
<el-checkbox-group v-model="checkedCities" @change="handleCheckedCitiesChange">
<el-checkbox style="margin-bottom:10px" v-for="city in cities" :label="city.Id" :key="city.Name">{{city.Name}}</el-checkbox>
</el-checkbox-group>
</div>
</el-form>
<div style="text-align:right;margin-top:20px">
<el-button size="small" type="primary" @click="Export">导出</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
export default {
name: "orderList",
data(){
return{
checkAll: false,
checkedCities: [],
cities: [],
cityOptions: [],
isIndeterminate: true,
addMsg:{},
dialogVisible:false,
shDig:false,
shMsg:{
OrderId:0,
Consignee:'',
Mobile:'',
Province:'',
City:'',
District:'',
ShippingAddress:'',
},
shMsgrule:{
Province: [
{ required: true, message: '请选择省', trigger: 'change' }
],
ShippingAddress: [
{ required: true, message: '请输入详细地址', trigger: 'blur' }
],
Mobile: [
{ required: true, message: '请输入手机号', trigger: 'blur' }
],
Consignee: [
{ required: true, message: '请输入收件人', trigger: 'blur' }
],
},
fhrules:{
ExpressId: [
{ required: true, message: '请选择快递公司', trigger: 'change' }
],
ExpressNumber: [
{ required: true, message: '请输入快递单号', trigger: 'blur' }
],
},
fhMsg:{
Type:1,
PostCode:'',
PostCode:0,
ExpressNumber:'',
Remark:'',
OrderDetailIdList:[],
},
fahuoList:[
{id:1},
],
fhDig:false,
exitMsg:{
OrderId:0,
Type:1,
Remark:'',
Income:'',
},
exitDig:false,
activeName:'first',
msgVal:'',
dateList:[],
msg:{
pageIndex:1,
pageSize:15,
Name:'',
OrderSource:0,
OrderType:0,
DeliveryMethod:0,
OrderId:0,
StartTime:'',
EndTime:'',
OrderStatus:0,
OrderNo:'',
MerchantsNo:'',
UserName:'',
UserId:'',
GoodsName:'',
Consignee:'',
Mobile:'',
ProductCode:'',
Recycled:1,
},
platList:[],
option:[
{Id:1,name:'订单号'},
{Id:2,name:'商户单号'},
{Id:3,name:'用户名'},
{Id:4,name:'用户ID'},
{Id:5,name:'商品名称'},
{Id:6,name:'收货人'},
{Id:7,name:'收货人电话'},
{Id:8,name:'门店名称'},
{Id:9,name:'商品货号'},
],
msgId:1,
ExpressList:[],
provinceList:[],
cityList:[],
areaList:[],
}
},
created(){
this.getList();
this.getplat();
this.getExpressInfo();
this.getProvince();
this.getDown();
},
mounted(){},
methods:{
// 发货
fhBtn(){
this.fhDig=true;
},
// 修改收货地址
shsubmitForm(formName){
this.$refs[formName].validate((valid) => {
if (valid) {
this.apipost('/api/order/SetOrderShopingAddress',this.shMsg,
res => {
if (res.data.resultCode === 1) {
this.getList();
this.Success(res.data.message)
} else {
this.Error(res.data.message);
}
},
null
);
} else {
return false;
}
});
},
// 清空回收站
ClearHsz(){
let that=this;
that.$confirm('此操作将清空回收站，是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.apipost('/api/order/SetOrderEmptyRecycleBin',
res => {
if (res.data.resultCode === 1) {
this.getList();
this.Success(res.data.message)
} else {
this.Error(res.data.message);
}
},
null
);
}).catch(() => {
});
},
Export(){
this.msg.ExcelEnumIds=this.checkedCities;
let msg = JSON.parse(JSON.stringify(this.msg));
this.JavaGetLocalFile(
"/api/order/GetMemberUserListToExcel",
msg,
"订单列表.xls"
);
},
getDown(){
this.cityOptions=[];
this.apipost("/api/order/GetOrderListExportEnumList",{}, res => {
this.cities=res.data.data;
let data=res.data.data;
data.forEach(item=>{
this.cityOptions.push(item.Id)
})
})
},
handleCheckAllChange(val) {
this.checkedCities = val ? this.cityOptions : [];
this.isIndeterminate = false;
},
handleCheckedCitiesChange(value) {
let checkedCount = value.length;
this.checkAll = checkedCount === this.cities.length;
this.isIndeterminate = checkedCount > 0 && checkedCount < this.cities.length;
},
ExitshAdress(){
this.shDig=true;
},
FhsubmitForm(formName){
this.$refs[formName].validate((valid) => {
if (valid) {
this.apipost('/api/order/SetOrderSendGoods',this.fhMsg,
res => {
if (res.data.resultCode === 1) {
this.getList();
this.Success(res.data.message)
} else {
this.Error(res.data.message);
}
},
null
);
} else {
return false;
}
});
},
TableSelectChange(val){},
// 强制取消
OrderExit(type){
this.exitMsg.Type=type;
this.exitDig=true;
},
handleClick(val){
let dataId=val.$attrs.dataId;
if(dataId==0){
this.msg.GoodsStatus=0;
this.msg.IsSelectSellOut=0;
}
if(dataId==1){
this.msg.GoodsStatus=1;
this.msg.IsSelectSellOut=0;
}
if(dataId==2){
this.msg.GoodsStatus=2;
this.msg.IsSelectSellOut=0;
}
if(dataId==3){
this.msg.GoodsStatus=0;
this.msg.IsSelectSellOut=1;
}
this.getList();
},
ChangeId(val){
console.log("ChangeId",val)
},
getList(){
if(this.dateList && this.dateList.length>0){
this.msg.StartTime=this.dateList[0];
this.msg.EndTime=this.dateList[1];
}else{
this.msg.StartTime='';
this.msg.EndTime='';
}
this.loading=true;
this.apipost("/api/order/GetGoodsOrderPageList", this.msg, res => {
this.loading=false;
if(res.data.resultCode==1){
this.total=res.data.data.count;
let pageData=res.data.data.pageData;
this.tableData=pageData;
}
})
},
getplat(){
this.apipost("/api/user/GetMemberUserSourceEnumList",{}, res => {
this.platList=res.data.data;
})
},
getArea(val){
this.apipost("/api/Destination/GetChildList",{Id:val}, res => {
this.areaList=res.data.data;
})
},
getCity(val){
this.apipost("/api/Destination/GetChildList",{Id:val}, res => {
this.cityList=res.data.data;
if(this.cityList.length>0){
this.getArea(this.cityList[0].ID)
}
})
},
getProvince(){
this.apipost("/api/Destination/GetChildList",{Id:2}, res => {
this.provinceList=res.data.data;
if(this.provinceList.length>0){
this.getCity(this.provinceList[0].ID)
}
})
},
// 快递公司
getExpressInfo(){
this.apipost("/api/MallBase/GetExpressInfo",{} , res => {
if (res.data.resultCode == 1) {
this.ExpressList = res.data.data;
} else {
this.Info(res.data.message);
}
})
},
},
};
</script>
<style>
.app-send .el-table__header-wrapper th {
background-color: #f5f7fa;
}
.app-send .title-box .text {
background-color: #FEFAEF;
color: #E6A23C;
padding: 6px;
}
.app-send .title-box {
margin: 15px 0;
}
.app-order-list .app-order-item .el-button {
padding: 0;
}
.app-order-list .card-footer .address-box {
margin-right: 10px;
}
.app-order-list .card-footer {
background: #F3F5F6;
padding: 10px 20px;
}
.app-order-list .app-order-info > div {
width: 100%;
}
.app-order-icon {
margin-right: 5%;
margin-bottom: 10px;
cursor: pointer;
}
.app-order-body {
display: flex;
flex-wrap: nowrap;
}
.app-order-list .app-order-info {
display: flex;
align-items: center;
width: 15%;
text-align: center;
border-right: 1px solid #EBEEF5;
justify-content: center;
}
.app-order-list .el-card__body {
padding: 0;
}
.app-order-list .express-price {
height: 30px;
line-height: 30px;
}
.app-order-list .goods-item {
border-right: 1px solid #EBEEF5;
}
.app-order-list .app-order-info {
display: flex;
align-items: center;
width: 15%;
text-align: center;
border-right: 1px solid #EBEEF5;
}
.app-order-list .goods-item .goods .app-order-goods-price {
height: 24px;
margin-top: 10px;
position: absolute;
bottom: 20px;
left: 125px;
}
.app-order-list .goods-item .goods-info .goods-name {
margin-bottom: 5px;
word-break: break-all;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
overflow: hidden;
}
.app-order-list .goods-item .goods-info {
width: 50%;
margin-top: 5px;
}
.app-order-list .goods-image {
height: 90px;
width: 90px;
margin-right: 15px;
float: left;
}
.app-order-list .goods-item .goods {
position: relative;
padding: 20px;
min-height: 130px;
border-top: 1px solid #EBEEF5;
}
.app-order-list .goods-item .goods:first-of-type {
border-top: 0;
}
.orderList .app-order-list .app-order-item:hover .app-order-btnimg{
display: block;
}
.orderList .app-order-list .app-order-item:hover{
border: 1px solid #3399FF;
}
.orderList .app-order-btnimg {
position: absolute;
top: 20px;
right:25px;
color: #7C868D;
font-size: 18px;
padding: 0;
display: none;
}
.orderList .app-order-offline {
margin-left: 30px;
margin-top: -2px;
}
.orderList .app-order-user img {
height: 20px;
width: 20px;
display: block;
float: left;
border-radius: 50%;
margin-right: 10px;
}
.orderList .app-order-list .app-order-time {
color: #909399;
}
.orderList .app-order-user {
margin-left: 30px;
}
.orderList .app-order-list .app-order-time {
color: #909399;
}
.orderList .app-order-list .app-order-item .el-card__header {
padding: 0;
}
.orderList .app-order-list .app-order-item {
margin-top: 20px;
min-width: 750px;
}
.orderList .app-order-list .app-order-head {
padding: 20px;
background-color: #F3F5F6;
color: #303133;
min-width: 750px;
display: flex;
position: relative;
}
.orderList .app-order-title div {
text-align: center;
}
.orderList .app-order-title {
background-color: #F3F5F6;
height: 40px;
line-height: 40px;
display: flex;
min-width: 750px;
}
.orderList .content{
background: #fff;
margin-top: 10px;
padding: 20px;
box-sizing: border-box;
}
</style>
src/components/sallCenter/CustomPage.vue 0 → 100644
View file @ 348eb54e
<template>
<div class="CustomPage">
<template v-if="CustomIsShowAdd">
<div class="head-title">
页面管理
<el-button @click="CustomIsShowAdd=false" style="float:right;margin-top: -5px;" size="small" type="primary">
新增页面
</el-button>
</div>
<div class="content">
<el-table :data="dataList" v-loading="loading" border style="width: 100%;margin:20px 0">
<el-table-column prop="Id" label="ID" width="100">
</el-table-column>
<el-table-column prop="PageName" width="436" label="标题">
</el-table-column>
<el-table-column label="导航与模板" prop="DetailsList" width="750">
<template slot-scope="scope">
<div class="templat-list">
<template v-if="scope.row.DetailsList && scope.row.DetailsList.length>0"
v-for="(subItem,subIndex) in scope.row.DetailsList">
<div class="templat-item" :key="subIndex">
<div>{{subItem.NavName}}</div>
<div style="color: rgb(153, 153, 153);">{{subItem.TemplateId}}</div>
</div>
</template>
</div>
</template>
</el-table-column>
<el-table-column prop="IsHome" label="设为首页" width="80">
<template slot-scope="scope">
<el-switch v-model="scope.row.IsHome" active-color="#409EFF" :active-value="1" :inactive-value="0">
</el-switch>
</template>
</el-table-column>
<el-table-column prop="IsUse" label="禁用/启用" width="85">
<template slot-scope="scope">
<el-switch v-model="scope.row.IsUse" active-color="#409EFF" :active-value="1" :inactive-value="0">
</el-switch>
</template>
</el-table-column>
<el-table-column label="操作">
<template slot-scope="scope">
<img @click="EditCustom(scope.row)" style="width:32px;height:32px;margin:0 10px"
src="../../assets/img/userman/edit.png" alt="">
<img @click="RemoveCustom(scope.row,6)" style="width:32px;height:32px;margin:0 10px"
src="../../assets/img/userman/del.png" alt="">
</template>
</el-table-column>
</el-table>
<el-pagination style="text-align:right" background @current-change="handleCurrentChange"
:page-size="msg.pageSize" layout="prev, pager, next" :total="total">
</el-pagination>
</div>
</template>
<template v-else>
<div class="head-title">
<span @click="CustomIsShowAdd=true" style="color:rgb(64, 158, 255);cursor:pointer;">自定义页面</span><span
style="margin:0 9px;color:#C0C4CC">/</span><span>编辑</span>
</div>
<div class="content">
<div class="conten_indder">
<el-form label-width="150px">
<el-form-item label="标题">
<el-input type="text" size="small" v-model="addMsg.PageName"></el-input>
</el-form-item>
<el-form-item label="启用/禁用">
<el-switch v-model="addMsg.IsUse" active-color="#409EFF" :active-value="1" :inactive-value="0">
</el-switch>
</el-form-item>
<el-form-item label="显示导航条">
<el-switch v-model="addMsg.IsShowNav" active-color="#409EFF" :active-value="1" :inactive-value="0">
</el-switch>
</el-form-item>
<el-form-item label="模板和导航">
<div style="max-width:480px;">
<div class="Custom_item" v-for="(item,index) in addMsg.DetailsList" :key="index">
<div flex="box:last">
<el-form label-width="80px">
<el-form-item label="导航名称" style="margin-bottom:20px;">
<el-input type="text" v-model="item.NavName" size="small"></el-input>
</el-form-item>
<el-form-item label="对应模板">
<el-input type="text" size="small" v-model="item.TemplateId">
<el-button slot="append">选择模板</el-button>
</el-input>
</el-form-item>
</el-form>
<div style="padding-left: 15px;">
<el-tooltip class="item" effect="dark" content="删除导航" placement="bottom">
<img @click="delModel(item,index)" style="cursor:pointer;"
src="../../assets/img/userman/del.png" alt="">
</el-tooltip>
</div>
</div>
</div>
<el-button type="text" @click="addModule()">
<i class="el-icon-plus"></i>
<span style="color: rgb(53, 53, 53);">新增模版和导航</span>
</el-button>
</div>
</el-form-item>
</el-form>
</div>
</div>
<el-button size="small" style="margin-top:20px;padding:9px 25px;" type="primary" @click="submitform('addMsg')">保存
</el-button>
</template>
</div>
</template>
<script>
export default {
data() {
return {
loading: false,
CustomIsShowAdd: true,
dataList: [],
msg: {
pageIndex: 1,
pageSize: 10,
},
addMsg: {
Id: 0,
PageName: '',
IsHome: 0,
IsUse: 1,
IsShowNav: 0,
DetailsList: []
},
total: 0,
};
},
components: {
},
created() {
},
methods: {
handleCurrentChange(val) {
this.msg.pageIndex = val;
this.getList();
},
getList() {
this.apipost("/api/Template/GetMiniprogramPageTemplPageList", this.msg, res => {
if (res.data.resultCode == 1) {
this.dataList = res.data.data.pageData;
console.log("this.dataList", this.dataList);
this.total = res.data.data.count;
} else {
this.Info(res.data.message);
}
})
},
submitform(addMsg) {
this.apipost("/api/Template/SetMiniprogramPageTempl", this.addMsg, res => {
if (res.data.resultCode == 1) {
this.getList();
this.CustomIsShowAdd = true;
} else {
this.Info(res.data.message);
}
})
},
//编辑
EditCustom(item) {
this.apipost("/api/Template/GetMiniprogramPageTempl", {
Id: item.Id
}, res => {
if (res.data.resultCode == 1) {
var jsonData = res.data.data;
this.addMsg.Id = jsonData.Id;
this.addMsg.PageName = jsonData.PageName;
this.addMsg.IsUse = jsonData.IsUse;
this.addMsg.IsShowNav = jsonData.IsShowNav;
this.addMsg.IsHome = jsonData.IsHome;
this.addMsg.DetailsList = jsonData.DetailsList;
this.CustomIsShowAdd = false;
} else {
this.Info(res.data.message);
}
})
},
//删除
RemoveCustom(item) {
let that = this;
that.Confirm("是否删除?", function () {
that.apipost("/api/Template/RemoveMiniprogramPageTempl", {
Id: item.Id,
Status: 1,
}, res => {
if (res.data.resultCode == 1) {
that.getList();
} else {
that.Info(res.data.message);
}
})
});
},
//新增模板导航
addModule() {
let obj = {
Id: 0,
PageTemplID: 0,
NavName: "",
TemplateId: 0,
}
this.addMsg.DetailsList.push(obj);
},
//删除模板
delModel(item, index) {
let that = this;
if (item.Id > 0) {
that.Confirm("是否删除?", function () {
that.apipost("/api/Template/RemoveMiniprogramPageTemplDetails", {
Id: item.Id,
}, res => {
if (res.data.resultCode == 1) {
that.addMsg.DetailsList.splice(index, 1);
} else {
that.Info(res.data.message);
}
})
});
} else {
that.addMsg.DetailsList.splice(index, 1);
}
}
},
mounted() {
this.getList();
}
};
</script>
<style>
.CustomPage .templat-list {
border: 1px solid #EBEEF5;
}
.CustomPage .templat-item {
line-height: 40px;
height: 40px;
display: flex;
font-size: 13px;
}
.templat-item:nth-child(odd) {
background-color: #f7f7f7;
}
.templat-item:nth-child(even) {
background-color: #fff;
}
.CustomPage .templat-item div {
width: 50%;
padding-left: 20px;
}
.CustomPage .Custom_item {
border: 1px solid #EBEEF5;
background-color: #FFF;
color: #303133;
-webkit-transition: .3s;
transition: .3s;
margin-bottom: 10px;
}
.CustomPage .Custom_item>div {
padding: 20px;
}
.CustomPage .content {
background: #fff;
margin-top: 10px;
padding: 20px;
-webkit-box-sizing: border-box;
box-sizing: border-box;
}
.CustomPage .conten_indder {
padding: 20px;
background-color: #fff;
padding-right: 50%;
min-width: 1100px;
}
</style>
src/components/sallCenter/plugin/advance.vue
View file @ 348eb54e
......@@ -358,17 +358,6 @@
this.data.goodsTagPicUrl = msg.url;
this.choicImg = false;
},
//判断是否包含http
getIconLink(url) {
let str = ''
if (url.indexOf('http') != -1) {
str = url
} else {
str = 'http://viitto-1301420277.cos.ap-chengdu.myqcloud.com' + url
}
return str;
},
cGoodsPicStyle(picUrl) {
let style = `background-image: url(${this.getIconLink(picUrl)});` +
`background-size: ${(this.data.fill === 1 ? 'cover' : 'contain')};`;
......
src/components/sallCenter/plugin/advert.vue
View file @ 348eb54e
......@@ -433,11 +433,9 @@
<el-form-item v-if="data.type === 'before-video'" label="视频播放链接" prop="video_url">
<el-input v-model="data.video_url" placeholder="请输入视频原地址或选择上传视频">
<template slot="append">
<!-- <app-attachment :multiple="false" :max="1" v-model="data.video_url" type="video"> -->
<el-tooltip class="item" effect="dark" content="支持格式mp4;支持编码H.264;视频大小不能超过50 MB" placement="top">
<el-button size="mini" @click="choicImg=true">添加视频</el-button>
</el-tooltip>
<!-- </app-attachment> -->
<el-tooltip class="item" effect="dark" content="支持格式mp4;支持编码H.264;视频大小不能超过50 MB" placement="top">
<el-button size="mini" @click="changeState1=true">添加视频</el-button>
</el-tooltip>
</template>
</el-input>
<el-link class="box-grow-0" type="primary" style="font-size:12px" v-if='data.video_url' :underline="false"
......@@ -499,20 +497,26 @@
<el-dialog title="选择文件" :visible.sync="choicImg" width="1240px">
<ChooseImg @SelectId="SelectId"></ChooseImg>
</el-dialog>
<!-- 选择视频 -->
<el-dialog title="选择文件" :visible.sync="changeState1" width="1240px">
<Choosevideo @Selectvideo="Selectvideo"></Choosevideo>
</el-dialog>
</div>
</template>
<script>
import ChooseImg from "@/components/global/ChooseImg.vue";
import Choosevideo from "@/components/global/Choosevideo.vue";
export default {
props: ["advData", "index", "dataLeng"],
components: {
ChooseImg
ChooseImg,
Choosevideo
},
data() {
return {
loading: false,
choicImg:false,
changeState1:false,
data: this.advData.data,
};
......@@ -532,22 +536,16 @@
couponClose(row, index) {
row.award_coupons.splice(index, 1);
},
//判断是否包含http
getIconLink(url) {
let str = ''
if (url.indexOf('http') != -1) {
str = url
} else {
str = 'http://viitto-1301420277.cos.ap-chengdu.myqcloud.com' + url
}
return str;
},
//选择图片
SelectId(msg) {
this.data.pic_url = msg.url;
this.choicImg = false;
},
//选择视频
Selectvideo(val){
this.data.video_url=val.Path;
this.changeState1=false;
}
},
computed: {
......
src/components/sallCenter/plugin/bargain.vue
View file @ 348eb54e
......@@ -350,17 +350,6 @@
this.data.goodsTagPicUrl = msg.url;
this.choicImg = false;
},
//判断是否包含http
getIconLink(url) {
let str = ''
if (url.indexOf('http') != -1) {
str = url
} else {
str = 'http://viitto-1301420277.cos.ap-chengdu.myqcloud.com' + url
}
return str;
},
cGoodsPicStyle(picUrl) {
let style = `background-image: url(${this.getIconLink(picUrl)});` +
`background-size: ${(this.data.fill === 1 ? 'cover' : 'contain')};`;
......
src/components/sallCenter/plugin/booking.vue
View file @ 348eb54e
......@@ -330,17 +330,6 @@
this.data.goodsTagPicUrl = msg.url;
this.choicImg = false;
},
//判断是否包含http
getIconLink(url) {
let str = ''
if (url.indexOf('http') != -1) {
str = url
} else {
str = 'http://viitto-1301420277.cos.ap-chengdu.myqcloud.com' + url
}
return str;
},
cGoodsPicStyle(picUrl) {
let style = `background-image: url(${this.getIconLink(picUrl)});` +
`background-size: ${(this.data.fill === 1 ? 'cover' : 'contain')};`;
......
src/components/sallCenter/plugin/check-in.vue
View file @ 348eb54e
......@@ -95,16 +95,6 @@
this.data.backgroundPicUrl = msg.url;
this.choicImg = false;
},
//判断是否包含http
getIconLink(url) {
let str = ''
if (url.indexOf('http') != -1) {
str = url
} else {
str = 'http://viitto-1301420277.cos.ap-chengdu.myqcloud.com' + url
}
return str;
},
// 热区选择(edit)
selectHotspot(e) {
if (e && e.length) {
......
src/components/sallCenter/plugin/copyright.vue
View file @ 348eb54e
......@@ -92,16 +92,6 @@
this.data.picUrl = msg.url;
this.choicImg = false;
},
//判断是否包含http
getIconLink(url) {
let str = ''
if (url.indexOf('http') != -1) {
str = url
} else {
str = 'http://viitto-1301420277.cos.ap-chengdu.myqcloud.com' + url
}
return str;
},
//获取选择链接
getChoiceLink() {
//调用子组件方法
......
src/components/sallCenter/plugin/coupon.vue
View file @ 348eb54e
......@@ -136,16 +136,6 @@
}
this.choicImg = false;
},
//判断是否包含http
getIconLink(url) {
let str = ''
if (url.indexOf('http') != -1) {
str = url
} else {
str = 'http://viitto-1301420277.cos.ap-chengdu.myqcloud.com' + url
}
return str;
}
},
computed: {
cListStyle() {
......
src/components/sallCenter/plugin/goods.vue
View file @ 348eb54e
......@@ -675,17 +675,6 @@
this.data.goodsTagPicUrl = msg.url;
this.choicImg = false;
},
//判断是否包含http
getIconLink(url){
let str=''
if(url.indexOf('http')!=-1){
str=url
}else{
str= 'http://viitto-1301420277.cos.ap-chengdu.myqcloud.com'+url
}
return str;
},
//选择商品分类
getChoiceFenlei(){
var ckedArr=this.$refs.ChooseFenlei.getChoicedFenlei();
......
src/components/sallCenter/plugin/image-text.vue 0 → 100644
View file @ 348eb54e
<style>
.diy-image-text {
width: 100%;
height: 500px;
overflow: hidden;
overflow-y: auto;
}
.bb {
visibility: hidden;
}
.classA {
visibility: visible;
}
</style>
<template>
<div :class="{'active':imageData.isCked}">
<div class="diy-component-options" v-if="imageData.isCked">
<el-button type="primary" icon="el-icon-delete" style="left: -25px; top: 0px;" @click="delPlugin()"></el-button>
<el-button type="primary" icon="el-icon-document-copy" style="left: -25px; top: 30px;"></el-button>
<el-button type="primary" icon="el-icon-arrow-up" v-if="index>0" @click="resetSord(0)"
style="right: -25px; top: 0;"></el-button>
<el-button type="primary" icon="el-icon-arrow-down" v-if="index!=dataLeng-1" @click="resetSord(1)"
style="right: -25px; top: 30px;"></el-button>
</div>
<div class="diy-modal">
<div class="diy-component-preview">
<div class="diy-image-text">
<div v-if="data.content" v-html="data.content"></div>
<div v-else flex="main:center" style="line-height: 500px;color: rgb(173, 177, 184);">图文详情</div>
</div>
</div>
<div class="diy-component-edit bb" :class="{'classA':imageData.isCked}">
<UE :defaultMsg="defaultMsg" :config="config" ref="ue" @input="input"></UE>
</div>
</div>
</div>
</template>
<script>
import UE from '@/components/global/UE.vue'
export default {
props: ["imageData", "index", "dataLeng"],
components: {
UE
},
data() {
return {
data: this.imageData.data,
defaultMsg: '',
config: {
initialFrameWidth: null,
initialFrameHeight: 350,
},
content: ''
};
},
created() {},
methods: {
//向父组件传值 并调用排序
resetSord(IsUp) {
this.$emit('getSord', this.index, IsUp);
},
//点击触发父组件删除
delPlugin() {
this.$emit('comDelPlugin', this.index);
},
input(obj) {
this.data.content = obj
},
},
computed: {},
mounted() {
this.$refs.ue.InitData();
},
watch: {
defaultMsg: {
handler(newVal, oldVal) {
console.log(newVal);
},
deep: true
}
}
};
</script>
src/components/sallCenter/plugin/integral-mall.vue
View file @ 348eb54e
......@@ -389,17 +389,6 @@
}
this.choicImg = false;
},
//判断是否包含http
getIconLink(url) {
let str = ''
if (url.indexOf('http') != -1) {
str = url
} else {
str = 'http://viitto-1301420277.cos.ap-chengdu.myqcloud.com' + url
}
return str;
},
cGoodsPicStyle(picUrl) {
let style = `background-image: url(${this.getIconLink(picUrl)});` +
`background-size: ${(this.data.fill === 1 ? 'cover' : 'contain')};`;
......
src/components/sallCenter/plugin/link.vue
View file @ 348eb54e
......@@ -281,16 +281,6 @@
this.data.picUrl = msg.url;
this.choicImg = false;
},
//判断是否包含http
getIconLink(url) {
let str = ''
if (url.indexOf('http') != -1) {
str = url
} else {
str = 'http://viitto-1301420277.cos.ap-chengdu.myqcloud.com' + url
}
return str;
},
//获取选择链接
getChoiceLink() {
//调用子组件方法
......
src/components/sallCenter/plugin/lottery.vue
View file @ 348eb54e
......@@ -333,16 +333,6 @@
this.data.goodsTagPicUrl = msg.url;
this.choicImg = false;
},
//判断是否包含http
getIconLink(url) {
let str = ''
if (url.indexOf('http') != -1) {
str = url
} else {
str = 'http://viitto-1301420277.cos.ap-chengdu.myqcloud.com' + url
}
return str;
},
cGoodsPicStyle(picUrl) {
let style = `background-image: url(${this.getIconLink(picUrl)});` +
......
src/components/sallCenter/plugin/map.vue
View file @ 348eb54e
......@@ -103,16 +103,6 @@
this.data.backgroundPicUrl = msg.url;
this.choicImg = false;
},
//判断是否包含http
getIconLink(url) {
let str = ''
if (url.indexOf('http') != -1) {
str = url
} else {
str = 'http://viitto-1301420277.cos.ap-chengdu.myqcloud.com' + url
}
return str;
},
//得到地图信息
mapEvent(e) {
this.data.location = e.lat + ',' + e.long;
......
src/components/sallCenter/plugin/modal.vue
View file @ 348eb54e
......@@ -205,17 +205,6 @@
this.data.list[this.comImgIndex].link.url = obj.PageUrl;
this.isShowLink = false;
},
//判断是否包含http
getIconLink(url) {
let str = ''
if (url.indexOf('http') != -1) {
str = url
} else {
str = 'http://viitto-1301420277.cos.ap-chengdu.myqcloud.com' + url
}
return str;
},
},
computed: {
......
src/components/sallCenter/plugin/navigationIcon.vue
View file @ 348eb54e
......@@ -377,16 +377,6 @@
this.commonIndex=index;
this.selectType=2;
},
//判断是否包含http
getIconLink(url){
let str=''
if(url.indexOf('http')!=-1){
str=url
}else{
str= 'http://viitto-1301420277.cos.ap-chengdu.myqcloud.com'+url
}
return str;
},
//点击触发父组件删除
delPlugin(){
this.$emit('comDelPlugin', this.index);
......
src/components/sallCenter/plugin/notice.vue
View file @ 348eb54e
......@@ -230,16 +230,6 @@
}
this.choicImg = false;
},
//判断是否包含http
getIconLink(url) {
let str = ''
if (url.indexOf('http') != -1) {
str = url
} else {
str = 'http://viitto-1301420277.cos.ap-chengdu.myqcloud.com' + url
}
return str;
}
},
computed: {
cStyle() {
......
src/components/sallCenter/plugin/pintuan.vue
View file @ 348eb54e
......@@ -310,16 +310,6 @@
this.data.goodsTagPicUrl = msg.url;
this.choicImg = false;
},
//判断是否包含http
getIconLink(url) {
let str = ''
if (url.indexOf('http') != -1) {
str = url
} else {
str = 'http://viitto-1301420277.cos.ap-chengdu.myqcloud.com' + url
}
return str;
},
cGoodsPicStyle(picUrl) {
let style = `background-image: url(${this.getIconLink(picUrl)});` +
......
src/components/sallCenter/plugin/quick-nav.vue
View file @ 348eb54e
......@@ -58,7 +58,6 @@
<el-radio v-model="data.navStyle" :label="2">样式2(全部展示)</el-radio>
</el-form-item>
<el-form-item label="收起图标">
<app-image-upload width="100" height="100" v-model="data.closedPicUrl"></app-image-upload>
<div class="zk_pic_box" @click="choicImg=true,getImgUtl(1)"
flex="main:center cross:center"
:style="{backgroundImage:'url(' + getIconLink(data.closedPicUrl) + ')'}">
......@@ -190,11 +189,17 @@
<el-switch v-model="data.customize.opened"></el-switch>
</el-form-item>
<el-form-item v-if="data.customize.opened" label="图标">
<app-image-upload width="100" height="100" v-model="data.customize.picUrl"></app-image-upload>
<div class="zk_pic_box" @click="choicImg=true,getImgUtl(9)"
flex="main:center cross:center"
:style="{backgroundImage:'url(' + getIconLink(data.customize.picUrl) + ')'}">
<i v-if="data.customize.picUrl==''" class="el-icon-picture-outline"></i>
<el-button type="danger" v-if="data.customize.picUrl!=''" class="image-delete" size="mini"
icon="el-icon-close" @click.stop="data.customize.picUrl=''" circle></el-button>
</div>
</el-form-item>
<el-form-item v-if="data.customize.opened" label="跳转链接">
<el-input :disabled="true" size="small" v-model="data.customize.link_url" autocomplete="off">
<el-button size="mini" @click="isShowLink=true">选择链接</el-button>
<el-button slot="append" size="mini" @click="isShowLink=true">选择链接</el-button>
</el-input>
</el-form-item>
</div>
......@@ -280,6 +285,9 @@
case 8:
this.data.mapNav.picUrl=msg.url;
break;
case 9:
this.data.customize.picUrl=msg.url;
break;
}
this.choicImg = false;
},
......@@ -290,22 +298,12 @@
this.data.customize.link_url = obj.PageUrl;
this.isShowLink = false;
},
//判断是否包含http
getIconLink(url) {
let str = ''
if (url.indexOf('http') != -1) {
str = url
} else {
str = 'http://viitto-1301420277.cos.ap-chengdu.myqcloud.com' + url
}
return str;
},
getImgUtl(type,) {
this.type = type;
},
mapEvent(e) {
this.data.mapNav.location = e.lat + ',' + e.long;
this.isShowMap=false;
},
},
......
src/components/sallCenter/plugin/store.vue
View file @ 348eb54e
......@@ -224,16 +224,6 @@
}
this.choicImg = false;
},
//判断是否包含http
getIconLink(url) {
let str = ''
if (url.indexOf('http') != -1) {
str = url
} else {
str = 'http://viitto-1301420277.cos.ap-chengdu.myqcloud.com' + url
}
return str;
},
deleteStore(index) {
this.data.list.splice(index, 1);
},
......
src/components/sallCenter/plugin/timer.vue
View file @ 348eb54e
......@@ -100,16 +100,6 @@
this.data.picUrl = msg.url;
this.choicImg = false;
},
//判断是否包含http
getIconLink(url) {
let str = ''
if (url.indexOf('http') != -1) {
str = url
} else {
str = 'http://viitto-1301420277.cos.ap-chengdu.myqcloud.com' + url
}
return str;
},
//获取选择链接
getChoiceLink() {
//调用子组件方法
......
src/components/sallCenter/plugin/user-info.vue
View file @ 348eb54e
......@@ -89,16 +89,6 @@
this.data.backgroundPicUrl = msg.url;
this.choicImg = false;
},
//判断是否包含http
getIconLink(url) {
let str = ''
if (url.indexOf('http') != -1) {
str = url
} else {
str = 'http://viitto-1301420277.cos.ap-chengdu.myqcloud.com' + url
}
return str;
},
},
computed: {
cFlexDir() {
......
src/components/sallCenter/plugin/user-order.vue
View file @ 348eb54e
......@@ -101,16 +101,6 @@
this.data.navs[this.ckedIndex].picUrl = msg.url;
this.choicImg = false;
},
//判断是否包含http
getIconLink(url) {
let str = ''
if (url.indexOf('http') != -1) {
str = url
} else {
str = 'http://viitto-1301420277.cos.ap-chengdu.myqcloud.com' + url
}
return str;
},
//点击选图片
getImgChoice(index) {
this.choicImg = true;
......
src/components/sallCenter/plugin/video.vue
View file @ 348eb54e
......@@ -53,7 +53,7 @@
</label>
<el-input size="small" v-model="data.url" placeholder="请输入视频原地址或选择上传视频">
<template slot="append">
<el-button size="mini" @click="choicImg=true">选择文件</el-button>
<el-button size="mini" @click="changeState1=true">选择文件</el-button>
</template>
</el-input>
</el-form-item>
......@@ -62,19 +62,27 @@
<!-- 选择图片文件 -->
<el-dialog title="选择文件" :visible.sync="choicImg" width="1240px">
<ChooseImg @SelectId="SelectId"></ChooseImg>
</el-dialog>
<!-- 选择视频 -->
<el-dialog title="选择文件" :visible.sync="changeState1" width="1240px">
<Choosevideo @Selectvideo="Selectvideo"></Choosevideo>
</el-dialog>
</div>
</template>
<script>
import ChooseImg from "@/components/global/ChooseImg.vue";
import Choosevideo from "@/components/global/Choosevideo.vue";
export default {
props: ["videoData", "index", "dataLeng"],
components: {
ChooseImg
ChooseImg,
Choosevideo
},
data() {
return {
choicImg: false,
changeState1:false,
data: this.videoData.data,
};
},
......@@ -95,16 +103,11 @@
this.data.pic_url = msg.url;
this.choicImg = false;
},
//判断是否包含http
getIconLink(url) {
let str = ''
if (url.indexOf('http') != -1) {
str = url
} else {
str = 'http://viitto-1301420277.cos.ap-chengdu.myqcloud.com' + url
}
return str;
}
//选择视频
Selectvideo(val){
this.data.url=val.Path;
this.changeState1=false;
},
},
computed: {
......
src/components/sallCenter/plugin/vip-card.vue
View file @ 348eb54e
......@@ -311,17 +311,6 @@
}
this.choicImg = false;
},
//判断是否包含http
getIconLink(url) {
let str = ''
if (url.indexOf('http') != -1) {
str = url
} else {
str = 'http://viitto-1301420277.cos.ap-chengdu.myqcloud.com' + url
}
return str;
},
chooseColor() {
this.data.background = this.background;
},
......
src/components/sallCenter/pluginCenter.vue
View file @ 348eb54e
......@@ -37,7 +37,7 @@
<h3 class="plugin_ListTitle">已安装</h3>
</div>
<div class="plugin-list el-row">
<div class="el-col el-col-24 el-col-xs-24 el-col-sm-12 el-col-md-8 el-col-lg-6 el-col-xl-4">
<div class="el-col el-col-24 el-col-xs-24 el-col-sm-12 el-col-md-8 el-col-lg-6 el-col-xl-4" @click="goDiyCenter('Fsetting')">
<div flex="dir:left box:first" class="plugin-item">
<div style="padding-right: 12px;"><img src="../../assets/img/sallCenter/icon.png" style="width: 50px; height: 50px; display: block;"></div>
<div>
......@@ -47,7 +47,7 @@
</div>
</div>
</div>
<div class="el-col el-col-24 el-col-xs-24 el-col-sm-12 el-col-md-8 el-col-lg-6 el-col-xl-4" @click="goDiyCenter">
<div class="el-col el-col-24 el-col-xs-24 el-col-sm-12 el-col-md-8 el-col-lg-6 el-col-xl-4" @click="goDiyCenter('Ftemplate')">
<div flex="dir:left box:first" class="plugin-item">
<div style="padding-right: 12px;"><img src="../../assets/img/sallCenter/Diy.png" style="width: 50px; height: 50px; display: block;"></div>
<div>
......@@ -74,9 +74,9 @@
},
methods: {
//跳转微信小程序
goDiyCenter(){
goDiyCenter(path){
let routeData = this.$router.resolve({
name: 'Ftemplate',
name: path,
query: {}
});
window.open(routeData.href, "_blank");
......
src/components/sallCenter/templateEdit.vue
View file @ 348eb54e
......@@ -171,7 +171,7 @@
<div class="all-components">
<el-form label-width="80px">
<el-form-item label="模板名称">
<el-input type="text" size="small"></el-input>
<el-input type="text" size="small" v-model="addMsg.TemplateName"></el-input>
</el-form-item>
<el-form-item label="背景设置">
<el-button size="small">设置</el-button>
......@@ -262,6 +262,8 @@
:index="index" :dataLeng="dataList.length"></modal>
<quickNav v-if="item.Id=='quick-nav'" :quickData="item" @getSord="getSord" @comDelPlugin="comDelPlugin"
:index="index" :dataLeng="dataList.length"></quickNav>
<imageText v-if="item.Id=='image-text'" :imageData="item" @getSord="getSord" @comDelPlugin="comDelPlugin"
:index="index" :dataLeng="dataList.length"></imageText>
</div>
</div>
</div>
......@@ -269,7 +271,7 @@
</div>
</div>
<div class="tpEdit_btmMenu">
<el-button type="primary" size="small" @click="getAllData()">保存</el-button>
<el-button type="primary" size="small" @click="SaveData()">保存</el-button>
</div>
</div>
</template>
......@@ -303,9 +305,17 @@
import advert from "../sallCenter/plugin/advert.vue"
import modal from "../sallCenter/plugin/modal.vue"
import quickNav from "../sallCenter/plugin/quick-nav.vue"
import imageText from "../sallCenter/plugin/image-text.vue"
export default {
data() {
return {
addMsg: {
Id: 0, //编号
TemplateName: '', //模板名称
TemplateData: '',
ComponentDataList:[],
},
allComponents: [],
dataList: [],
//是否为空
......@@ -344,7 +354,8 @@
empty,
advert,
modal,
quickNav
quickNav,
imageText
},
methods: {
//获取左侧菜单
......@@ -667,7 +678,7 @@
Id: 'image-text',
isCked: false,
data: {
position: 'auto'
content: '',
}
}
this.dataList.push(tuwenObj);
......@@ -1081,11 +1092,37 @@
item.isCked = true;
},
//点击保存
getAllData() {
console.log(this.dataList, 'dataListtt');
SaveData() {
this.addMsg.ComponentDataList = this.dataList;
console.log("addMsg", this.addMsg);
this.apipost("/api/Template/SetMiniTemplate", this.addMsg, res => {
console.log(res.data)
if (res.data.resultCode == 1) {
} else {
this.Info(res.data.message);
}
})
},
GetData() {
this.apipost("/api/Template/SetMiniTemplate", {
Id: this.addMsg.Id
}, res => {
console.log(res.data)
if (res.data.resultCode == 1) {} else {
this.Info(res.data.message);
}
})
}
},
mounted() {
if (this.$route.query.Id) {
this.addMsg.Id = this.$route.query.Id;
}
if (this.addMsg.Id > 0) {
this.GetData();
}
this.GetPlugInList();
}
};
......
src/components/sallCenter/templateManage.vue
View file @ 348eb54e
<style>
.templateManage .template_comheader{
padding: 13px 20px;
border-bottom: 1px solid #EBEEF5;
-webkit-box-sizing: border-box;
box-sizing: border-box;
background: #fff;
}
.templateManage .template_comheader>div{
display: flex;
justify-content: space-between;
align-items: center;
flex-direction: row;
}
.templateManage .temp_content{
margin-top:10px;
background: #fff;
padding:20px;
}
.templateManage .temp_imgStyle{
display:inline-block;
margin-right:10px;
}
.templateManage .template_comheader {
padding: 13px 20px;
border-bottom: 1px solid #EBEEF5;
-webkit-box-sizing: border-box;
box-sizing: border-box;
background: #fff;
}
.templateManage .template_comheader>div {
display: flex;
justify-content: space-between;
align-items: center;
flex-direction: row;
}
.templateManage .temp_content {
margin-top: 10px;
background: #fff;
padding: 20px;
}
.templateManage .temp_imgStyle {
display: inline-block;
margin-right: 10px;
}
</style>
<template>
<div class="templateManage">
<div class="template_comheader">
<div>
<span>模板管理</span>
<el-button type="primary" size="small" @click="CommonJump('templateEdit')">添加模板</el-button>
</div>
</div>
<div class="temp_content">
<el-table :data="tableData" border style="width: 100%">
<el-table-column prop="ID" label="ID"></el-table-column>
<el-table-column prop="name" label="模板名称"></el-table-column>
<el-table-column prop="date" label="创建时间"></el-table-column>
<el-table-column label="操作">
<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="edit(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="delRow(scope.row)">
</el-tooltip>
</template>
</el-table-column>
</el-table>
</div>
<div class="templateManage">
<div class="template_comheader">
<div>
<span>模板管理</span>
<el-button type="primary" size="small" @click="CommonJump('templateEdit',{Id:0})">添加模板</el-button>
</div>
</div>
<div class="temp_content">
<el-table :data="dataList" border style="width: 100%">
<el-table-column prop="Id" label="编号"></el-table-column>
<el-table-column prop="TemplateName" label="模板名称"></el-table-column>
<el-table-column prop="CreateDateStr" label="创建时间"></el-table-column>
<el-table-column label="操作">
<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="EditeTemplate(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="DeleteTemplate(scope.row)">
</el-tooltip>
</template>
</el-table-column>
</el-table>
</div>
</div>
</template>
<script>
export default {
data() {
return {
tableData: [{
ID: '3542',
name: '微途测试',
date: '2020-04-27 19:20:08',
}]
dataList: [],
qMsg: {
pageIndex: 1,
pageSize: 20,
},
total: 0
};
},
created() {
},
methods: {
getList() {
this.apipost("/api/Template/GetMiniTemplatePageList", 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);
}
})
},
//修改模板
EditeTemplate(item) {
this.CommonJump('templateEdit', {
Id: item.Id
});
},
//删除模板
DeleteTemplate(item) {
let that = this;
that.Confirm("是否删除?", function () {
that.apipost("/api/Template/RemoveMiniTemplate", {
Id: item.Id,
Status: 1,
}, res => {
if (res.data.resultCode == 1) {
that.getList();
} else {
that.Info(res.data.message);
}
})
});
}
},
mounted() {
this.getList();
}
};
</script>
</script>
\ No newline at end of file
src/plug/index.js
View file @ 348eb54e
......@@ -54,9 +54,9 @@ export default {
//域名管理对象
Vue.prototype.domainManager = function () {
let domainUrl = '';
domainUrl = "http://192.168.2.214:8200";
//domainUrl = "http://192.168.2.214:8200";
// domainUrl = "https://localhost:5001";
domainUrl = "http://192.168.2.65";
domainUrl = "http://192.168.0.102:8200";
// domainUrl = "http://192.168.2.17:8088";
let locationName = window.location.hostname;
......@@ -182,7 +182,19 @@ export default {
query: obj
});
}
//公用判断图片地址 判断是否包含http
Vue.prototype.getIconLink = function (url) {
let str = ''
if(url!=''){
if (url.indexOf('http') != -1) {
str = url
} else {
str = 'http://viitto-1301420277.cos.ap-chengdu.myqcloud.com' + url
}
return str;
}
}
//HTTP提交数据
Vue.prototype.apipost = function (cmd, msg, successCall, faildCall, isOnline) {
if (msg == null || msg == "") {
......
src/router/index.js
View file @ 348eb54e
......@@ -80,6 +80,10 @@ export default new Router({
path:'/templateEdit',
name: 'templateEdit',
component: resolve => require(['@/components/sallCenter/templateEdit'], resolve),
},{ //自定义页面
path:'/CustomPage',
name: 'CustomPage',
component: resolve => require(['@/components/sallCenter/CustomPage'], resolve),
}]
},
{
......@@ -224,6 +228,18 @@ export default new Router({
name: 'goodsListEdit',
component: resolve => require(['@/components/CommodityMan/goodsListEdit'], resolve),
},
// 商品管理 商品列表新增
{
path: '/orderList',
name: 'orderList',
component: resolve => require(['@/components/orderMan/orderList'], resolve),
},
// 商品管理 商品详情
{
path: '/orderDetails',
name: 'orderDetails',
component: resolve => require(['@/components/orderMan/orderDetails'], resolve),
},
//设置 基础设置
{
path: '/basicSetUp',
......
static/UE/lang/zh-cn/zh-cn.js
View file @ 348eb54e
......@@ -664,6 +664,6 @@ UE.I18N['zh-cn'] = {
},
'autosave': {
'saving':'保存中...',
'success':'本地保存成功'
'success':''
}
};
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