Home Explore Help
Register Sign In
zhh
/
front-end
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

更新

shish 5 years ago
parent
c152898eff
commit
233fedba1b
14 changed files with 13 additions and 6 deletions
Unified View Show Diff Stats
  1. 0 0
      ghs/dist/shop/css/chunk-2858218e.fb0db302.css
  2. 0 0
      ghs/dist/shop/css/chunk-39b20acb.d5d189ba.css
  3. 0 0
      ghs/dist/shop/css/chunk-5e009b24.66e235c4.css
  4. 0 0
      ghs/dist/shop/css/chunk-894d7fec.af5d4d83.css
  5. 1 1
      ghs/dist/shop/index.html
  6. 0 0
      ghs/dist/shop/js/app.6c46db42.js
  7. 0 0
      ghs/dist/shop/js/chunk-2858218e.7ae30c6b.js
  8. 0 0
      ghs/dist/shop/js/chunk-39b20acb.38959d1b.js
  9. 0 0
      ghs/dist/shop/js/chunk-42590054.58f98404.js
  10. 0 0
      ghs/dist/shop/js/chunk-5e009b24.7c7392bc.js
  11. 0 0
      ghs/dist/shop/js/chunk-7dc5695b.aafd77c6.js
  12. 0 0
      ghs/dist/shop/js/chunk-894d7fec.b5b55f6e.js
  13. 2 1
      ghs/src/views/order/components/order-detail.vue
  14. 10 4
      ghs/src/views/order/list.vue

File diff suppressed because it is too large
+ 0 - 0
ghs/dist/shop/css/chunk-2858218e.fb0db302.css


File diff suppressed because it is too large
+ 0 - 0
ghs/dist/shop/css/chunk-39b20acb.d5d189ba.css


File diff suppressed because it is too large
+ 0 - 0
ghs/dist/shop/css/chunk-5e009b24.66e235c4.css


File diff suppressed because it is too large
+ 0 - 0
ghs/dist/shop/css/chunk-894d7fec.af5d4d83.css


+ 1 - 1
ghs/dist/shop/index.html
View File 

@@ -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.773477e0.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="http://img.hzghd.com/cdn/vue/2.6.10/vue.min.js"></script><script src="http://img.hzghd.com/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="http://img.hzghd.com/cdn/vuex/3.1.1/vuex.min.js"></script><script src="http://img.hzghd.com/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="http://img.hzghd.com/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="http://img.hzghd.com/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="http://img.hzghd.com/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="http://img.hzghd.com/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="http://img.hzghd.com/cdn/element-ui/2.13.0/index.js"></script><script src="http://img.hzghd.com/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="http://img.hzghd.com/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="http://img.hzghd.com/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.1c1e0cb4.js"></script><script src="/js/app.773477e0.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.6c46db42.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="http://img.hzghd.com/cdn/vue/2.6.10/vue.min.js"></script><script src="http://img.hzghd.com/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="http://img.hzghd.com/cdn/vuex/3.1.1/vuex.min.js"></script><script src="http://img.hzghd.com/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="http://img.hzghd.com/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="http://img.hzghd.com/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="http://img.hzghd.com/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="http://img.hzghd.com/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="http://img.hzghd.com/cdn/element-ui/2.13.0/index.js"></script><script src="http://img.hzghd.com/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="http://img.hzghd.com/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="http://img.hzghd.com/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.1c1e0cb4.js"></script><script src="/js/app.6c46db42.js"></script></body></html>

File diff suppressed because it is too large
+ 0 - 0
ghs/dist/shop/js/app.6c46db42.js


File diff suppressed because it is too large
+ 0 - 0
ghs/dist/shop/js/chunk-2858218e.7ae30c6b.js


File diff suppressed because it is too large
+ 0 - 0
ghs/dist/shop/js/chunk-39b20acb.38959d1b.js


File diff suppressed because it is too large
+ 0 - 0
ghs/dist/shop/js/chunk-42590054.58f98404.js


File diff suppressed because it is too large
+ 0 - 0
ghs/dist/shop/js/chunk-5e009b24.7c7392bc.js


File diff suppressed because it is too large
+ 0 - 0
ghs/dist/shop/js/chunk-7dc5695b.aafd77c6.js


File diff suppressed because it is too large
+ 0 - 0
ghs/dist/shop/js/chunk-894d7fec.b5b55f6e.js


+ 2 - 1
ghs/src/views/order/components/order-detail.vue
View File 

@@ -47,7 +47,8 @@
 
 						<el-table :data="data">
 
 						<el-table :data="data">
 
 							<el-table-column property="customName" label="名称"></el-table-column>
 
 							<el-table-column property="customName" label="名称"></el-table-column>
 
 							<el-table-column property="customMobile" label="手机号"></el-table-column>
 
 							<el-table-column property="customMobile" label="手机号"></el-table-column>
 
-							<el-table-column property="customAddress" label="地址" width="280px"></el-table-column>
 
+							<el-table-column property="fullAddress" label="地址" width="280px"></el-table-column>
 
+							<el-table-column property="showAddress" label="备用地址" width="280px"></el-table-column>
 
 						</el-table>
 
 						</el-table>
 
 					</div>
 
 					</div>
 
 				</div>
 
 				</div>

+ 10 - 4
ghs/src/views/order/list.vue
View File 

@@ -275,6 +275,12 @@ export default {
 
 							align: 'center',
 
 							align: 'center',
 
 							width: '160'
 
 							width: '160'
 
 						},
 
 						},
 
+						{
 
+							prop: 'sendCost',
 
+							label: '运费',
 
+							align: 'center',
 
+							width: '80'
 
+						},
 
 						{
 
 						{
 
 							prop: 'prePrice',
 
 							prop: 'prePrice',
 
 							label: '总价',
 
 							label: '总价',
 
@@ -292,25 +298,25 @@ export default {
 
 							prop: 'customName',
 
 							prop: 'customName',
 
 							label: '客户',
 
 							label: '客户',
 
 							align: 'center',
 
 							align: 'center',
 
-							width: '150'
 
+							width: '160'
 
 						},
 
 						},
 
 						{
 
 						{
 
 							prop: 'customMobile',
 
 							prop: 'customMobile',
 
 							label: '手机号',
 
 							label: '手机号',
 
 							align: 'center',
 
 							align: 'center',
 
-							width: '120'
 
+							width: '130'
 
 						},
 
 						},
 
 						{
 
 						{
 
 							prop: 'bigNum',
 
 							prop: 'bigNum',
 
 							label: '数量',
 
 							label: '数量',
 
 							align: 'center',
 
 							align: 'center',
 
-							width: '150'
 
+							width: '90'
 
 						},
 
 						},
 
 						{
 
 						{
 
 							prop: 'sendTypeName',
 
 							prop: 'sendTypeName',
 
 							label: '配送方式',
 
 							label: '配送方式',
 
 							align: 'center',
 
 							align: 'center',
 
-							width: '150'
 
+							width: '90'
 
 						},
 
 						},
 
 						{
 
 						{
 
 							prop: 'reachTime',
 
 							prop: 'reachTime',

Some files were not shown because too many files changed in this diff