首页 发现 帮助
注册 登录
zhh
/
front-end
1
0
派生 0
文件 工单管理 0 合并请求 0 Wiki
浏览代码

PC

shish 5 年之前
父节点
0be181413b
当前提交
ce129fc44c
共有 27 个文件被更改，包括 14 次插入 和 10 次删除
合并视图 显示文件统计
  1. 0 0
      ghs/dist/shop/css/chunk-3df14533.95f9a300.css
  2. 0 0
      ghs/dist/shop/css/chunk-5d2a92dc.2fcd1876.css
  3. 1 1
      ghs/dist/shop/index.html
  4. 0 0
      ghs/dist/shop/js/app.036f6142.js
  5. 0 0
      ghs/dist/shop/js/chunk-3df14533.8721bade.js
  6. 0 0
      ghs/dist/shop/js/chunk-58b34f22.14d1e7ba.js
  7. 0 0
      ghs/dist/shop/js/chunk-5d2a92dc.db56723a.js
  8. 0 0
      ghs/dist/shop/js/chunk-d33fbe56.d299ff9f.js
  9. 1 1
      ghs/src/views/item/list.vue
  10. 0 0
      hd/dist/shop/css/chunk-7a0e9994.d90842c5.css
  11. 0 0
      hd/dist/shop/css/chunk-ea55aef2.e5de081e.css
  12. 1 1
      hd/dist/shop/index.html
  13. 0 0
      hd/dist/shop/js/app.4e443120.js
  14. 0 0
      hd/dist/shop/js/chunk-11788cde.ccb54881.js
  15. 0 0
      hd/dist/shop/js/chunk-7a0e9994.c7169d3a.js
  16. 0 0
      hd/dist/shop/js/chunk-ea55aef2.bdff17ac.js
  17. 1 1
      hd/src/views/item/list.vue
  18. 0 0
      pt/dist/web/css/chunk-50ccf70b.5d5eee51.css
  19. 0 0
      pt/dist/web/css/chunk-5a52dee3.509afa5e.css
  20. 0 0
      pt/dist/web/css/chunk-a6b52ec8.a5bcf1a2.css
  21. 1 1
      pt/dist/web/index.html
  22. 0 0
      pt/dist/web/js/app.687556b0.js
  23. 0 0
      pt/dist/web/js/chunk-3e351852.9a4ce7b1.js
  24. 0 0
      pt/dist/web/js/chunk-50ccf70b.b96f909a.js
  25. 0 0
      pt/dist/web/js/chunk-5a52dee3.e5dec6ef.js
  26. 0 0
      pt/dist/web/js/chunk-a6b52ec8.d063e178.js
  27. 9 5
      pt/src/views/item/list.vue

文件差异内容过多而无法显示
+ 0 - 0
ghs/dist/shop/css/chunk-3df14533.95f9a300.css


文件差异内容过多而无法显示
+ 0 - 0
ghs/dist/shop/css/chunk-5d2a92dc.2fcd1876.css


+ 1 - 1
ghs/dist/shop/index.html
查看文件 

@@ -43,4 +43,4 @@
 
 			.once .sub-title {
 
 			.once .sub-title {
 
 				color: #ababab;
 
 				color: #ababab;
 
 				font-size: 12px;
 
 				font-size: 12px;
 
-			}</style><link href="/css/app.6f07e55a.css" rel="preload" as="style"><link href="/css/chunk-libs.2e1e87b5.css" rel="preload" as="style"><link href="/js/app.cc559980.js" rel="preload" as="script"><link href="/js/chunk-libs.1c1e0cb4.js" rel="preload" as="script"><link href="/css/chunk-libs.2e1e87b5.css" rel="stylesheet"><link href="/css/app.6f07e55a.css" rel="stylesheet"></head><body><noscript></noscript><div id="app"><div class="once"><div class="container"><div class="title">正在加载资源</div><div class="sub-title">初次加载资源可能需要较多时间 请耐心等待</div></div><div class="footer"><a href="https://www.baidu.com/" target="_blank">花卉宝</a></div></div></div><script src="https://img.hzghd.com/cdn/vue/2.6.10/vue.min.js"></script><script src="https://img.hzghd.com/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="https://img.hzghd.com/cdn/vuex/3.1.1/vuex.min.js"></script><script src="https://img.hzghd.com/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="https://img.hzghd.com/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="https://img.hzghd.com/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="https://img.hzghd.com/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="https://img.hzghd.com/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="https://img.hzghd.com/cdn/element-ui/2.13.0/index.js"></script><script src="https://img.hzghd.com/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="https://img.hzghd.com/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="https://img.hzghd.com/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.1c1e0cb4.js"></script><script src="/js/app.cc559980.js"></script></body></html>
 
+			}</style><link href="/css/app.6f07e55a.css" rel="preload" as="style"><link href="/css/chunk-libs.2e1e87b5.css" rel="preload" as="style"><link href="/js/app.036f6142.js" rel="preload" as="script"><link href="/js/chunk-libs.1c1e0cb4.js" rel="preload" as="script"><link href="/css/chunk-libs.2e1e87b5.css" rel="stylesheet"><link href="/css/app.6f07e55a.css" rel="stylesheet"></head><body><noscript></noscript><div id="app"><div class="once"><div class="container"><div class="title">正在加载资源</div><div class="sub-title">初次加载资源可能需要较多时间 请耐心等待</div></div><div class="footer"><a href="https://www.baidu.com/" target="_blank">花卉宝</a></div></div></div><script src="https://img.hzghd.com/cdn/vue/2.6.10/vue.min.js"></script><script src="https://img.hzghd.com/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="https://img.hzghd.com/cdn/vuex/3.1.1/vuex.min.js"></script><script src="https://img.hzghd.com/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="https://img.hzghd.com/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="https://img.hzghd.com/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="https://img.hzghd.com/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="https://img.hzghd.com/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="https://img.hzghd.com/cdn/element-ui/2.13.0/index.js"></script><script src="https://img.hzghd.com/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="https://img.hzghd.com/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="https://img.hzghd.com/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.1c1e0cb4.js"></script><script src="/js/app.036f6142.js"></script></body></html>

文件差异内容过多而无法显示
+ 0 - 0
ghs/dist/shop/js/app.036f6142.js


文件差异内容过多而无法显示
+ 0 - 0
ghs/dist/shop/js/chunk-3df14533.8721bade.js


文件差异内容过多而无法显示
+ 0 - 0
ghs/dist/shop/js/chunk-58b34f22.14d1e7ba.js


文件差异内容过多而无法显示
+ 0 - 0
ghs/dist/shop/js/chunk-5d2a92dc.db56723a.js


文件差异内容过多而无法显示
+ 0 - 0
ghs/dist/shop/js/chunk-d33fbe56.d299ff9f.js


+ 1 - 1
ghs/src/views/item/list.vue
查看文件 

@@ -393,7 +393,7 @@ export default {
 
             },
 
             },
 
             {
 
             {
 
               prop: 'unit',
 
               prop: 'unit',
 
-              label: '单位',
 
+              label: '大小单位',
 
               align: 'center',
 
               align: 'center',
 
               'min-width': 100
 
               'min-width': 100
 
             },
 
             },

文件差异内容过多而无法显示
+ 0 - 0
hd/dist/shop/css/chunk-7a0e9994.d90842c5.css


文件差异内容过多而无法显示
+ 0 - 0
hd/dist/shop/css/chunk-ea55aef2.e5de081e.css


+ 1 - 1
hd/dist/shop/index.html
查看文件 

@@ -43,4 +43,4 @@
 
 			.once .sub-title {
 
 			.once .sub-title {
 
 				color: #ababab;
 
 				color: #ababab;
 
 				font-size: 12px;
 
 				font-size: 12px;
 
-			}</style><link href="/css/app.6f07e55a.css" rel="preload" as="style"><link href="/css/chunk-libs.2e1e87b5.css" rel="preload" as="style"><link href="/js/app.869aa36c.js" rel="preload" as="script"><link href="/js/chunk-libs.1c1e0cb4.js" rel="preload" as="script"><link href="/css/chunk-libs.2e1e87b5.css" rel="stylesheet"><link href="/css/app.6f07e55a.css" rel="stylesheet"></head><body><noscript></noscript><div id="app"><div class="once"><div class="container"><div class="title">正在加载资源</div><div class="sub-title">初次加载资源可能需要较多时间 请耐心等待</div></div><div class="footer"><a href="https://www.baidu.com/" target="_blank">花卉宝</a></div></div></div><script src="https://img.huaml.com/cdn/vue/2.6.10/vue.min.js"></script><script src="https://img.huaml.com/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="https://img.huaml.com/cdn/vuex/3.1.1/vuex.min.js"></script><script src="https://img.huaml.com/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="https://img.huaml.com/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="https://img.huaml.com/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="https://img.huaml.com/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="https://img.huaml.com/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="https://img.huaml.com/cdn/element-ui/2.13.0/index.js"></script><script src="https://img.huaml.com/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="https://img.huaml.com/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="https://img.huaml.com/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.1c1e0cb4.js"></script><script src="/js/app.869aa36c.js"></script></body></html>
 
+			}</style><link href="/css/app.6f07e55a.css" rel="preload" as="style"><link href="/css/chunk-libs.2e1e87b5.css" rel="preload" as="style"><link href="/js/app.4e443120.js" rel="preload" as="script"><link href="/js/chunk-libs.1c1e0cb4.js" rel="preload" as="script"><link href="/css/chunk-libs.2e1e87b5.css" rel="stylesheet"><link href="/css/app.6f07e55a.css" rel="stylesheet"></head><body><noscript></noscript><div id="app"><div class="once"><div class="container"><div class="title">正在加载资源</div><div class="sub-title">初次加载资源可能需要较多时间 请耐心等待</div></div><div class="footer"><a href="https://www.baidu.com/" target="_blank">花卉宝</a></div></div></div><script src="https://img.huaml.com/cdn/vue/2.6.10/vue.min.js"></script><script src="https://img.huaml.com/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="https://img.huaml.com/cdn/vuex/3.1.1/vuex.min.js"></script><script src="https://img.huaml.com/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="https://img.huaml.com/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="https://img.huaml.com/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="https://img.huaml.com/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="https://img.huaml.com/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="https://img.huaml.com/cdn/element-ui/2.13.0/index.js"></script><script src="https://img.huaml.com/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="https://img.huaml.com/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="https://img.huaml.com/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.1c1e0cb4.js"></script><script src="/js/app.4e443120.js"></script></body></html>

文件差异内容过多而无法显示
+ 0 - 0
hd/dist/shop/js/app.4e443120.js


文件差异内容过多而无法显示
+ 0 - 0
hd/dist/shop/js/chunk-11788cde.ccb54881.js


文件差异内容过多而无法显示
+ 0 - 0
hd/dist/shop/js/chunk-7a0e9994.c7169d3a.js


文件差异内容过多而无法显示
+ 0 - 0
hd/dist/shop/js/chunk-ea55aef2.bdff17ac.js


+ 1 - 1
hd/src/views/item/list.vue
查看文件 

@@ -393,7 +393,7 @@
 
 							},
 
 							},
 
 							{
 
 							{
 
 								prop: 'unit',
 
 								prop: 'unit',
 
-								label: '单位',
 
+								label: '大小单位',
 
 								align: 'center',
 
 								align: 'center',
 
 								'min-width': 100
 
 								'min-width': 100
 
 							},
 
 							},

文件差异内容过多而无法显示
+ 0 - 0
pt/dist/web/css/chunk-50ccf70b.5d5eee51.css


文件差异内容过多而无法显示
+ 0 - 0
pt/dist/web/css/chunk-5a52dee3.509afa5e.css


文件差异内容过多而无法显示
+ 0 - 0
pt/dist/web/css/chunk-a6b52ec8.a5bcf1a2.css


+ 1 - 1
pt/dist/web/index.html
查看文件 

@@ -43,4 +43,4 @@
 
 			.once .sub-title {
 
 			.once .sub-title {
 
 				color: #ababab;
 
 				color: #ababab;
 
 				font-size: 12px;
 
 				font-size: 12px;
 
-			}</style><link href="/css/app.6f07e55a.css" rel="preload" as="style"><link href="/css/chunk-libs.2e1e87b5.css" rel="preload" as="style"><link href="/js/app.7c1287ed.js" rel="preload" as="script"><link href="/js/chunk-libs.afac7b8c.js" rel="preload" as="script"><link href="/css/chunk-libs.2e1e87b5.css" rel="stylesheet"><link href="/css/app.6f07e55a.css" rel="stylesheet"></head><body><noscript></noscript><div id="app"><div class="once"><div class="container"><div class="title">正在加载资源</div><div class="sub-title">初次加载资源可能需要较多时间 请耐心等待</div></div><div class="footer"><a href="https://www.baidu.com/" target="_blank">花卉宝</a></div></div></div><script src="https://img.hzghd.com/cdn/vue/2.6.10/vue.min.js"></script><script src="https://img.hzghd.com/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="https://img.hzghd.com/cdn/vuex/3.1.1/vuex.min.js"></script><script src="https://img.hzghd.com/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="https://img.hzghd.com/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="https://img.hzghd.com/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="https://img.hzghd.com/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="https://img.hzghd.com/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="https://img.hzghd.com/cdn/element-ui/2.13.0/index.js"></script><script src="https://img.hzghd.com/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="https://img.hzghd.com/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="https://img.hzghd.com/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.afac7b8c.js"></script><script src="/js/app.7c1287ed.js"></script></body></html>
 
+			}</style><link href="/css/app.6f07e55a.css" rel="preload" as="style"><link href="/css/chunk-libs.2e1e87b5.css" rel="preload" as="style"><link href="/js/app.687556b0.js" rel="preload" as="script"><link href="/js/chunk-libs.afac7b8c.js" rel="preload" as="script"><link href="/css/chunk-libs.2e1e87b5.css" rel="stylesheet"><link href="/css/app.6f07e55a.css" rel="stylesheet"></head><body><noscript></noscript><div id="app"><div class="once"><div class="container"><div class="title">正在加载资源</div><div class="sub-title">初次加载资源可能需要较多时间 请耐心等待</div></div><div class="footer"><a href="https://www.baidu.com/" target="_blank">花卉宝</a></div></div></div><script src="https://img.hzghd.com/cdn/vue/2.6.10/vue.min.js"></script><script src="https://img.hzghd.com/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="https://img.hzghd.com/cdn/vuex/3.1.1/vuex.min.js"></script><script src="https://img.hzghd.com/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="https://img.hzghd.com/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="https://img.hzghd.com/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="https://img.hzghd.com/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="https://img.hzghd.com/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="https://img.hzghd.com/cdn/element-ui/2.13.0/index.js"></script><script src="https://img.hzghd.com/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="https://img.hzghd.com/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="https://img.hzghd.com/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.afac7b8c.js"></script><script src="/js/app.687556b0.js"></script></body></html>

文件差异内容过多而无法显示
+ 0 - 0
pt/dist/web/js/app.687556b0.js


文件差异内容过多而无法显示
+ 0 - 0
pt/dist/web/js/chunk-3e351852.9a4ce7b1.js


文件差异内容过多而无法显示
+ 0 - 0
pt/dist/web/js/chunk-50ccf70b.b96f909a.js


文件差异内容过多而无法显示
+ 0 - 0
pt/dist/web/js/chunk-5a52dee3.e5dec6ef.js


文件差异内容过多而无法显示
+ 0 - 0
pt/dist/web/js/chunk-a6b52ec8.d063e178.js


+ 9 - 5
pt/src/views/item/list.vue
查看文件 

@@ -31,6 +31,10 @@
 
 				<span>{{ scope.row.goodsName }}</span>
 
 				<span>{{ scope.row.goodsName }}</span>
 
 			</template>
 
 			</template>
 
 
 
+			<template #table-column-unit="{scope}">
 
+				<span>{{ scope.row.bigUnit }} / {{scope.row.smallUnit}}</span>
 
+			</template>
 
+
 
 			<template #table-column-inTurn="{ scope }">
 
 			<template #table-column-inTurn="{ scope }">
 
 				<span v-if="!sort.status">{{ scope.row.inTurn }}</span>
 
 				<span v-if="!sort.status">{{ scope.row.inTurn }}</span>
 
 				<el-input
 
 				<el-input
 
@@ -437,16 +441,16 @@ export default {
 
 							'min-width': 100,
 
 							'min-width': 100,
 
 						},
 
 						},
 
 						{
 
 						{
 
-							prop: 'bigUnit',
 
-							label: '大单位',
 
+							prop: 'unit',
 
+							label: '大小单位',
 
 							align: 'center',
 
 							align: 'center',
 
 							minWidth: 100,
 
 							minWidth: 100,
 
 						},
 
 						},
 
 						{
 
 						{
 
-							prop: 'smallUnit',
 
-							label: '小单位',
 
+							prop: 'ratio',
 
+							label: '单位比',
 
 							align: 'center',
 
 							align: 'center',
 
-							minWidth: 100,
 
+							minWidth: 60,
 
 						},
 
 						},
 
 						{
 
 						{
 
 							prop: 'inTurn',
 
 							prop: 'inTurn',

部分文件因为文件数量过多而无法显示