Commit 0d29d168 authored by xd's avatar xd

解决冲突

parents 116f63e4 5b5d275a
...@@ -8,3 +8,22 @@ export function ApiStoreGetMainList(inData) { ...@@ -8,3 +8,22 @@ export function ApiStoreGetMainList(inData) {
params: inData params: inData
}) })
} }
export function ApiStoreGetStoreDetail(inData) {
return request({
url: '/admin/auth/stall/get',
method: 'get',
params: inData
})
}
export function ApiStoreDelStore(inData) {
return request({
url: '/admin/auth/stall/delete',
method: 'delete',
params: inData
})
}
...@@ -3,10 +3,10 @@ ...@@ -3,10 +3,10 @@
effect="dark" effect="dark"
:content="active ? '退出全屏' : '全屏'" :content="active ? '退出全屏' : '全屏'"
placement="bottom"> placement="bottom">
<el-button class="d2-mr btn-text can-hover" type="text" @click="toggle"> <!-- <el-button class="d2-mr btn-text can-hover" type="text" @click="toggle"> -->
<d2-icon v-if="active" name="compress"/> <!-- <d2-icon v-if="active" name="compress"/> -->
<d2-icon v-else name="arrows-alt" style="font-size: 16px"/> <!-- <d2-icon v-else name="arrows-alt" style="font-size: 16px"/> -->
</el-button> <!-- </el-button> -->
</el-tooltip> </el-tooltip>
</template> </template>
......
...@@ -15,7 +15,9 @@ ...@@ -15,7 +15,9 @@
flex-box="0" flex-box="0"
flex flex
> >
<img class="zlogos" :src="`/image/logo.png`" /> <!-- <img class="zlogos" :src="`/image/logo.png`" /> -->
<img class="zlogos" :src="`/image/logoNew.png`" />
<d2-menu-header class="header-menus" flex-box="1" /> <d2-menu-header class="header-menus" flex-box="1" />
<!-- 顶栏右侧 --> <!-- 顶栏右侧 -->
<div class="d2-header-right" flex-box="0"> <div class="d2-header-right" flex-box="0">
...@@ -161,10 +163,13 @@ export default { ...@@ -161,10 +163,13 @@ export default {
</style> </style>
<style lang="scss" scoped> <style lang="scss" scoped>
.zlogos { .zlogos {
height: 60px; // height: 60px;
width: 300px; height: 25px;
width: 125px;
padding-left: 20px; padding-left: 20px;
padding-top: 16px;
object-fit: cover; object-fit: cover;
// border: 2px solid red;
} }
.d2-theme-header{ .d2-theme-header{
background-color: #4E59C7; background-color: #4E59C7;
......
<template> <template>
<div class="dialogs"> <div class="dialogs">
<el-dialog title="创建任务" :visible.sync="dialogVisible" width="480px" <!-- <el-dialog title="创建任务" :visible.sync="dialogVisible" width="480px" -->
<el-dialog title="佣金配置" :visible.sync="dialogVisible" width="480px"
:before-close="handleClose" class="addGoods"> :before-close="handleClose" class="addGoods">
<div class="dialogMain"> <div class="dialogMain">
<el-form :model="form" :rules="formRules" ref="addform" label-width="130px"> <el-form :model="form" :rules="formRules" ref="addform" label-width="130px">
<el-form-item label="商品:" prop="goods"> <el-form-item label="商品:" prop="goods">
<el-input v-model="form.goods"></el-input> <el-input v-model="form.goodName"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="价格:"> <el-form-item label="价格:">
<el-input v-model="form.price"></el-input> <el-input disabled="true" v-model="form.goodPrice"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="库存:"> <el-form-item label="库存:">
<el-input v-model.number="form.num"></el-input> <el-input v-model.number="form.goodNum"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="佣金:" prop="charges"> <el-form-item label="佣金:" prop="charges">
<el-radio-group v-model="form.charges"> <el-radio-group v-model="form.goodBackType">
<el-radio :label="1">佣金</el-radio> <el-radio :label="1">佣金</el-radio>
<el-radio :label="2">百分比</el-radio> <el-radio :label="2">百分比</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item v-if="form.charges===1" label="金额:" label-width="176px" class="chargeInput" > <el-form-item v-if="form.goodBackType===1" label="金额:" label-width="176px" class="chargeInput" >
<el-input v-model="form.num"></el-input> <el-input v-model="form.goodBackPrice"></el-input>
<span class="unit">元 ( ¥ )</span> <span class="unit">元 ( ¥ )</span>
</el-form-item> </el-form-item>
<el-form-item v-if="form.charges===2" label="佣金比例:" label-width="176px" class="chargeInput" > <el-form-item v-if="form.goodBackType===2" label="佣金比例:" label-width="176px" class="chargeInput" >
<el-input v-model="form.num"></el-input> <el-input v-model="form.goodBackPercent"></el-input>
<span class="unit">( % )</span> <span class="unit">( % )</span>
</el-form-item> </el-form-item>
</el-form> </el-form>
...@@ -44,10 +45,18 @@ ...@@ -44,10 +45,18 @@
return{ return{
dialogVisible:false, dialogVisible:false,
form:{ form:{
goods:'', goodName: '膳魔师',
price:'', goodPrice: '200',
goodNum: '44',
goodBackType: 2,
goodBackPrice: '20',
goodBackPercent: '10',
goods:'膳魔师',
price:'200',
charges:1, charges:1,
num:0 num:44
}, },
formRules:{ formRules:{
goods: [ goods: [
......
This diff is collapsed.
...@@ -51,25 +51,25 @@ ...@@ -51,25 +51,25 @@
stripe stripe
class="list" class="list"
ref="multipleTable" ref="multipleTable"
:data="list.main" :data="list.mainV"
tooltip-effect="dark" tooltip-effect="dark"
style="width: 100%" style="width: 100%"
@selection-change="listPick" @selection-change="listPick"
height="calc(100vh - 360px)" height="calc(100vh - 360px)"
> >
<el-table-column type="selection" width="60"></el-table-column> <el-table-column type="selection" width="60"></el-table-column>
<el-table-column prop="taskName" label="门店名称" align="center"></el-table-column> <el-table-column prop="name" label="门店名称" align="center"></el-table-column>
<el-table-column prop="taskType" label="门店类型" align="center" width="120"></el-table-column> <el-table-column prop="type" label="门店类型" align="center" width="120"></el-table-column>
<el-table-column prop="bar" label="门店负责人" align="center" width="120"></el-table-column> <el-table-column prop label="门店负责人" align="center" width="120"></el-table-column>
<el-table-column prop="bar" label="所属柜组" align="center" width="120"></el-table-column> <el-table-column prop="signNum" label="所属柜组" align="center" width="120"></el-table-column>
<el-table-column prop="bar" label="位置" align="center" width="120"></el-table-column> <el-table-column prop="location" label="位置" align="center" width="120"></el-table-column>
<el-table-column prop="bar" label="门牌号" align="center" width="120"></el-table-column> <el-table-column prop="shopId" label="门牌号" align="center" width="120"></el-table-column>
<el-table-column label="操作" align="center" fixed="right" width="200"> <el-table-column label="操作" align="center" fixed="right" width="200">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" class="btn" @click="handleDetail(scope.row)">详情</el-button> <el-button type="text" class="btn" @click="storeGetStoreDetail(scope.row.id)">详情</el-button>
<el-button type="text" class="btn" @click="testButtonClick(scope.row)">编辑</el-button> <el-button type="text" class="btn" @click="testButtonClick(scope.row)">编辑</el-button>
<el-button type="text" @click="testButtonClick(scope.row)" class="listButtonRed">删除</el-button> <el-button type="text" @click="storeDelStore(scope.row.id)" class="listButtonRed">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -90,7 +90,12 @@ ...@@ -90,7 +90,12 @@
<script> <script>
import AddStore from "./components/addStore"; import AddStore from "./components/addStore";
import StoreDetail from "./components/storeDetail"; import StoreDetail from "./components/storeDetail";
import { ApiStoreGetMainList } from "@api/in/store"; import {
ApiStoreGetMainList,
ApiStoreGetStoreDetail,
ApiStoreDelStore
} from "@api/in/store";
const zlog = console.log.bind(console);
export default { export default {
components: { components: {
...@@ -163,6 +168,7 @@ export default { ...@@ -163,6 +168,7 @@ export default {
sendDate: "2019/02/08" sendDate: "2019/02/08"
} }
], ],
mainV: [],
search: { search: {
bar: [ bar: [
{ {
...@@ -200,15 +206,41 @@ export default { ...@@ -200,15 +206,41 @@ export default {
} }
}; };
}, },
created() {
this.ApiStoreGetMainList(); // created() {
// this.storeGetMainList();
// zlog('--->Created!')
// },
mounted() {
this.storeGetMainList();
zlog("--->Mounted!");
}, },
methods: { methods: {
storeGetMainList() { storeGetMainList() {
ApiGetStoreList().then(res => { zlog("--->In Get API!");
this.list.main = res.data.adminStalls; ApiStoreGetMainList().then(res => {
this.list.mainV = res.data.adminStalls;
});
},
storeGetStoreDetail(inData) {
zlog("--->id:", inData);
let postData = {
inDetail: true,
stallId: inData
};
zlog('--->type: stallId:', typeof(Number(postData.stallId)))
ApiStoreGetStoreDetail(postData).then(res => {
zlog("--->detail: res:", res);
}); });
}, },
storeDelStore(inData) {
let postData = {
stallId: 123456
};
ApiStoreDelStore(inData).then(res => {});
},
listPick() {}, listPick() {},
testButtonClick() {}, testButtonClick() {},
......
...@@ -2,7 +2,7 @@ import axios from 'axios' ...@@ -2,7 +2,7 @@ import axios from 'axios'
import md5 from "js-md5" import md5 from "js-md5"
let BASE_API = "http://139.155.48.151:8084" let BASE_API = "http://139.155.48.151:8084"
const log = console.log.bind(console) const zlog = console.log.bind(console)
// 创建 axios 实例 // 创建 axios 实例
...@@ -14,6 +14,7 @@ const service = axios.create({ ...@@ -14,6 +14,7 @@ const service = axios.create({
// request 拦截器 // request 拦截器
service.interceptors.request.use( service.interceptors.request.use(
request => { request => {
zlog('--->request: request:', request)
return request return request
}, },
error => { error => {
......
<template> <template>
<div class="page-login"> <div class="page-login">
<div class="page-login--layer page-login--layer-area"> <!-- <div class="page-login--layer page-login--layer-area">
<ul class="circles" style="2px solid greed;"> <ul class="circles" style="2px solid greed;">
<li v-for="n in 10" :key="n"></li> <li v-for="n in 10" :key="n"></li>
</ul> </ul>
</div> </div> -->
<div <!-- <div
class="page-login--layer page-login--layer-time loginbktime" class="page-login--layer page-login--layer-time loginbktime"
flex="main:center cross:center"> flex="main:center cross:center">
{{time}} {{time}}
</div> </div> -->
<div class="page-login--layer"> <div class="page-login--layer">
<div <div
class="page-login--content" class="page-login--content"
...@@ -183,6 +183,14 @@ export default { ...@@ -183,6 +183,14 @@ export default {
.page-login--layer { .page-login--layer {
@extend %full; @extend %full;
overflow: auto; overflow: auto;
// background-image: url("./bkimg_gold.jpg");
// background-image: url("./bkimg_blue.jpg");
background-image: url("./bkimg_lightblue.jpg");
background-repeat: no-repeat;
// background-size:100% 100%;
background-size: cover;
// -moz-background-size:100% 100%;
-moz-background-size: cover;
} }
.page-login--layer-area { .page-login--layer-area {
overflow: hidden; overflow: hidden;
......
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