mirror of
https://gitee.com/hzchunfen/erp.git
synced 2025-11-30 22:20:45 +00:00
8.18 to 2
This commit is contained in:
yezhenman
parent
15d5126b7b
commit
e88f3b1442
@ -1 +1 @@
|
|||||||
#nprogress{pointer-events:none}#nprogress .bar{background:#29d;position:fixed;z-index:1031;top:0;left:0;width:100%;height:2px}#nprogress .peg{display:block;position:absolute;right:0;width:100px;height:100%;box-shadow:0 0 10px #29d,0 0 5px #29d;opacity:1;transform:rotate(3deg) translateY(-4px)}#nprogress .spinner{display:block;position:fixed;z-index:1031;top:15px;right:15px}#nprogress .spinner-icon{width:18px;height:18px;box-sizing:border-box;border:2px solid transparent;border-top-color:#29d;border-left-color:#29d;border-radius:50%;-webkit-animation:nprogress-spinner .4s linear infinite;animation:nprogress-spinner .4s linear infinite}.nprogress-custom-parent{overflow:hidden;position:relative}.nprogress-custom-parent #nprogress .bar,.nprogress-custom-parent #nprogress .spinner{position:absolute}@-webkit-keyframes nprogress-spinner{0%{-webkit-transform:rotate(0deg)}to{-webkit-transform:rotate(1turn)}}@keyframes nprogress-spinner{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}.loss[data-v-275d755b]{position:relative}.table[data-v-275d755b]{margin-top:40px;position:relative}.btn[data-v-275d755b]{float:right}[data-v-275d755b] .cell{display:flex;align-items:center}.commodityimg[data-v-275d755b]{width:59px;height:59px;background:hsla(0,0%,89%,.39);opacity:1;display:block;margin-right:12px}.Img[data-v-275d755b]{width:100%;height:100%}.confirmbtn[data-v-275d755b]{width:114px;height:44px;border-radius:3px;margin-top:21px;margin-bottom:8px}.import-right[data-v-275d755b]{margin-top:30px}.import-right a[data-v-275d755b]{text-decoration:none;color:#000}[data-v-275d755b] .btn11{padding:0;width:14px;height:14px}[data-v-275d755b] .btn11 img{width:100%;height:100%}.page[data-v-275d755b]{margin-top:20px}
|
#nprogress{pointer-events:none}#nprogress .bar{background:#29d;position:fixed;z-index:1031;top:0;left:0;width:100%;height:2px}#nprogress .peg{display:block;position:absolute;right:0;width:100px;height:100%;box-shadow:0 0 10px #29d,0 0 5px #29d;opacity:1;transform:rotate(3deg) translateY(-4px)}#nprogress .spinner{display:block;position:fixed;z-index:1031;top:15px;right:15px}#nprogress .spinner-icon{width:18px;height:18px;box-sizing:border-box;border:2px solid transparent;border-top-color:#29d;border-left-color:#29d;border-radius:50%;-webkit-animation:nprogress-spinner .4s linear infinite;animation:nprogress-spinner .4s linear infinite}.nprogress-custom-parent{overflow:hidden;position:relative}.nprogress-custom-parent #nprogress .bar,.nprogress-custom-parent #nprogress .spinner{position:absolute}@-webkit-keyframes nprogress-spinner{0%{-webkit-transform:rotate(0deg)}to{-webkit-transform:rotate(1turn)}}@keyframes nprogress-spinner{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}.loss[data-v-00572fb2]{position:relative}.table[data-v-00572fb2]{margin-top:40px;position:relative}.btn[data-v-00572fb2]{float:right}[data-v-00572fb2] .cell{display:flex;align-items:center}.commodityimg[data-v-00572fb2]{width:59px;height:59px;background:hsla(0,0%,89%,.39);opacity:1;display:block;margin-right:12px}.Img[data-v-00572fb2]{width:100%;height:100%}.confirmbtn[data-v-00572fb2]{width:114px;height:44px;border-radius:3px;margin-top:21px;margin-bottom:8px}.import-right[data-v-00572fb2]{margin-top:30px}.import-right a[data-v-00572fb2]{text-decoration:none;color:#000}[data-v-00572fb2] .btn11{padding:0;width:14px;height:14px}[data-v-00572fb2] .btn11 img{width:100%;height:100%}.page[data-v-00572fb2]{margin-top:20px}
|
||||||
2
public/dist/index.html
vendored
2
public/dist/index.html
vendored
@ -1 +1 @@
|
|||||||
<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><title>erp</title><link href="css/chunk-0f67ac47.e437602b.css" rel="prefetch"><link href="css/chunk-14ff3ba6.56e84236.css" rel="prefetch"><link href="css/chunk-50481dc1.e437602b.css" rel="prefetch"><link href="css/chunk-5ed10db2.12c276ba.css" rel="prefetch"><link href="css/chunk-61dfd850.94d448e7.css" rel="prefetch"><link href="css/chunk-62101cb8.67947a26.css" rel="prefetch"><link href="css/chunk-7136ffb6.9ae72c1b.css" rel="prefetch"><link href="css/chunk-84c0d1fa.47f57404.css" rel="prefetch"><link href="css/chunk-8d75e00c.568a5552.css" rel="prefetch"><link href="css/chunk-8eb4b592.9e793ba8.css" rel="prefetch"><link href="css/chunk-959f9a24.ed76f224.css" rel="prefetch"><link href="js/chunk-0f67ac47.eed43c85.js" rel="prefetch"><link href="js/chunk-14ff3ba6.8728594a.js" rel="prefetch"><link href="js/chunk-2d23156c.6af6d42e.js" rel="prefetch"><link href="js/chunk-50481dc1.4db40c89.js" rel="prefetch"><link href="js/chunk-5ed10db2.f7bc8652.js" rel="prefetch"><link href="js/chunk-61dfd850.075e1892.js" rel="prefetch"><link href="js/chunk-62101cb8.df8fe332.js" rel="prefetch"><link href="js/chunk-7136ffb6.248bdb7b.js" rel="prefetch"><link href="js/chunk-84c0d1fa.4b6880d0.js" rel="prefetch"><link href="js/chunk-8d75e00c.a6ca0a4a.js" rel="prefetch"><link href="js/chunk-8eb4b592.2e383453.js" rel="prefetch"><link href="js/chunk-959f9a24.5809f600.js" rel="prefetch"><link href="css/app.62fa08a2.css" rel="preload" as="style"><link href="css/chunk-vendors.a6a7f90c.css" rel="preload" as="style"><link href="js/app.3d3cf302.js" rel="preload" as="script"><link href="js/chunk-vendors.dc4080e5.js" rel="preload" as="script"><link href="css/chunk-vendors.a6a7f90c.css" rel="stylesheet"><link href="css/app.62fa08a2.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but erp doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="js/chunk-vendors.dc4080e5.js"></script><script src="js/app.3d3cf302.js"></script></body></html>
|
<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><title>erp</title><link href="css/chunk-0f67ac47.e437602b.css" rel="prefetch"><link href="css/chunk-14ff3ba6.56e84236.css" rel="prefetch"><link href="css/chunk-45019d92.b1c3c56f.css" rel="prefetch"><link href="css/chunk-50481dc1.e437602b.css" rel="prefetch"><link href="css/chunk-5ed10db2.12c276ba.css" rel="prefetch"><link href="css/chunk-61dfd850.94d448e7.css" rel="prefetch"><link href="css/chunk-62101cb8.67947a26.css" rel="prefetch"><link href="css/chunk-7136ffb6.9ae72c1b.css" rel="prefetch"><link href="css/chunk-84c0d1fa.47f57404.css" rel="prefetch"><link href="css/chunk-8eb4b592.9e793ba8.css" rel="prefetch"><link href="css/chunk-959f9a24.ed76f224.css" rel="prefetch"><link href="js/chunk-0f67ac47.eed43c85.js" rel="prefetch"><link href="js/chunk-14ff3ba6.8728594a.js" rel="prefetch"><link href="js/chunk-2d23156c.6af6d42e.js" rel="prefetch"><link href="js/chunk-45019d92.7c880acf.js" rel="prefetch"><link href="js/chunk-50481dc1.4db40c89.js" rel="prefetch"><link href="js/chunk-5ed10db2.f7bc8652.js" rel="prefetch"><link href="js/chunk-61dfd850.075e1892.js" rel="prefetch"><link href="js/chunk-62101cb8.df8fe332.js" rel="prefetch"><link href="js/chunk-7136ffb6.248bdb7b.js" rel="prefetch"><link href="js/chunk-84c0d1fa.4b6880d0.js" rel="prefetch"><link href="js/chunk-8eb4b592.2e383453.js" rel="prefetch"><link href="js/chunk-959f9a24.5809f600.js" rel="prefetch"><link href="css/app.62fa08a2.css" rel="preload" as="style"><link href="css/chunk-vendors.a6a7f90c.css" rel="preload" as="style"><link href="js/app.1d87b9d7.js" rel="preload" as="script"><link href="js/chunk-vendors.dc4080e5.js" rel="preload" as="script"><link href="css/chunk-vendors.a6a7f90c.css" rel="stylesheet"><link href="css/app.62fa08a2.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but erp doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="js/chunk-vendors.dc4080e5.js"></script><script src="js/app.1d87b9d7.js"></script></body></html>
|
||||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
4
public/dist/js/chunk-45019d92.7c880acf.js
vendored
Normal file
4
public/dist/js/chunk-45019d92.7c880acf.js
vendored
Normal file
File diff suppressed because one or more lines are too long
1
public/dist/js/chunk-45019d92.7c880acf.js.map
vendored
Normal file
1
public/dist/js/chunk-45019d92.7c880acf.js.map
vendored
Normal file
File diff suppressed because one or more lines are too long
4
public/dist/js/chunk-8d75e00c.a6ca0a4a.js
vendored
4
public/dist/js/chunk-8d75e00c.a6ca0a4a.js
vendored
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -319,29 +319,27 @@
|
|||||||
<el-table-column sortable label="店铺订单" min-width="110">
|
<el-table-column sortable label="店铺订单" min-width="110">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<div>
|
<div>
|
||||||
<span v-for="(item, key, index) in shopOrder" :key="index">
|
<span v-if="shopOrder[scope.row.daily.sku_id]">{{
|
||||||
<span v-if="key == scope.row.daily.sku_id"
|
shopOrder[scope.row.daily.sku_id].total
|
||||||
>{{ item ? item.total : 0 }}
|
}}</span>
|
||||||
</span>
|
<span v-else>0</span>
|
||||||
</span>
|
|
||||||
</div>
|
</div>
|
||||||
<el-popover
|
<el-popover
|
||||||
placement="right-start"
|
placement="right-start"
|
||||||
width="200"
|
width="200"
|
||||||
trigger="hover"
|
trigger="hover"
|
||||||
v-for="(item, key, index) in shopOrder"
|
v-if="shopOrder[scope.row.daily.sku_id]"
|
||||||
|
>
|
||||||
|
<div>
|
||||||
|
<p
|
||||||
|
v-for="(j, index) in shopOrder[scope.row.daily.sku_id]
|
||||||
|
.items"
|
||||||
:key="index"
|
:key="index"
|
||||||
>
|
>
|
||||||
<div v-if="key == scope.row.daily.sku_id">
|
|
||||||
<p v-for="(j, index) in item.items" :key="index">
|
|
||||||
{{ j.shop_name }} : {{ j.num }}
|
{{ j.shop_name }} : {{ j.num }}
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
<el-button
|
<el-button class="btn11" type="text" slot="reference"
|
||||||
class="btn11"
|
|
||||||
type="text"
|
|
||||||
slot="reference"
|
|
||||||
v-if="key == scope.row.daily.sku_id"
|
|
||||||
><img src="../../css/img/眼睛.png" alt=""
|
><img src="../../css/img/眼睛.png" alt=""
|
||||||
/></el-button>
|
/></el-button>
|
||||||
</el-popover>
|
</el-popover>
|
||||||
@ -517,30 +515,7 @@ export default {
|
|||||||
tableData: [], // 商品列表
|
tableData: [], // 商品列表
|
||||||
shopsData: [], //店铺传参数组
|
shopsData: [], //店铺传参数组
|
||||||
sku_code: {}, //店铺传参对象
|
sku_code: {}, //店铺传参对象
|
||||||
shopOrder: {
|
shopOrder: {}, //店铺悬浮窗详情数据
|
||||||
14: {
|
|
||||||
total: 999999,
|
|
||||||
items: [
|
|
||||||
{
|
|
||||||
shop_name: "麋小鹿花卉",
|
|
||||||
num: "999999",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
shop_name: "麋小鹿花卉22222",
|
|
||||||
num: "222222",
|
|
||||||
},
|
|
||||||
],
|
|
||||||
},
|
|
||||||
15: {
|
|
||||||
total: "888888",
|
|
||||||
items: [
|
|
||||||
{
|
|
||||||
shop_name: "叶问花卉",
|
|
||||||
num: "888888",
|
|
||||||
},
|
|
||||||
],
|
|
||||||
},
|
|
||||||
}, //店铺悬浮窗详情数据
|
|
||||||
options: [
|
options: [
|
||||||
{
|
{
|
||||||
id: "1",
|
id: "1",
|
||||||
@ -641,7 +616,7 @@ export default {
|
|||||||
//店铺订单请求
|
//店铺订单请求
|
||||||
getShop() {
|
getShop() {
|
||||||
shops(this.sku_code).then((res) => {
|
shops(this.sku_code).then((res) => {
|
||||||
// console.log("店铺订单请求", res);
|
this.shopOrder = res.data;
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
@ -662,7 +637,6 @@ export default {
|
|||||||
});
|
});
|
||||||
this.total = res.data.meta.total;
|
this.total = res.data.meta.total;
|
||||||
this.Paginationdata = res.data.meta;
|
this.Paginationdata = res.data.meta;
|
||||||
console.log(111111111, this.tableData);
|
|
||||||
this.shopsData = this.tableData.map((item) => {
|
this.shopsData = this.tableData.map((item) => {
|
||||||
item = item.goods.goods_code + "_" + item.sku_code;
|
item = item.goods.goods_code + "_" + item.sku_code;
|
||||||
return item;
|
return item;
|
||||||
|
|||||||
3
resources/frontend/vue.config.js
vendored
3
resources/frontend/vue.config.js
vendored
@ -12,7 +12,8 @@ module.exports = {
|
|||||||
// 配置代理
|
// 配置代理
|
||||||
"/api": {
|
"/api": {
|
||||||
// target: 'http://doc.ii090.com/mock/267/',
|
// target: 'http://doc.ii090.com/mock/267/',
|
||||||
target: "http://erp.staging.miaoxuan66.cn",
|
// target: "http://erp.staging.miaoxuan66.cn",
|
||||||
|
target: "http://erp.chutang66.com",
|
||||||
changeOrigin: true, // 开启代理
|
changeOrigin: true, // 开启代理
|
||||||
pathRewrite: {
|
pathRewrite: {
|
||||||
// 重命名
|
// 重命名
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user