shish 5 lat temu
rodzic
commit
023f550de4

Plik diff jest za duży
+ 0 - 0
ghs/dist/shop/css/chunk-712541b8.f41b4caf.css


Plik diff jest za duży
+ 0 - 0
ghs/dist/shop/css/chunk-7b4c135e.0a1b2e89.css


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

@@ -43,4 +43,4 @@
 			.once .sub-title {
 				color: #ababab;
 				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.9e55eed0.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.9e55eed0.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.a3ab15b8.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.a3ab15b8.js"></script></body></html>

Plik diff jest za duży
+ 0 - 0
ghs/dist/shop/js/app.a3ab15b8.js


Plik diff jest za duży
+ 0 - 0
ghs/dist/shop/js/chunk-49260f43.bf6733ae.js


Plik diff jest za duży
+ 0 - 0
ghs/dist/shop/js/chunk-712541b8.82816153.js


Plik diff jest za duży
+ 0 - 0
ghs/dist/shop/js/chunk-7b4c135e.799d2479.js


Plik diff jest za duży
+ 0 - 0
ghs/dist/shop/js/chunk-8743f732.ea66fb20.js


+ 5 - 31
ghs/src/views/order/list.vue

@@ -75,32 +75,6 @@
             </div>
           </div>
         </template>
-
-        <!--				<template v-if="scope.row.status == 1">-->
-        <!--					<el-button size="small" disabled>打印</el-button>-->
-        <!--					<el-button size="small" disabled>自取</el-button>-->
-        <!--					<el-button size="small" disabled>发货</el-button>-->
-        <!--				</template>-->
-        <!--				<template v-else-if="['4', '5', '6'].indexOf(scope.row.status) != -1"></template>-->
-        <!--				<template v-else>-->
-        <!--					<template v-if="scope.row.currentFlow == 1">-->
-        <!--						<el-popover placement="top" width="160" :ref="'popover-' + scope.row.id">-->
-        <!--							<p>确认已自取?</p>-->
-        <!--							<div style="text-align: right; margin: 0">-->
-        <!--								<el-button size="mini" type="text" @click="selfGetCancel(scope.row.id)">取消</el-button>-->
-        <!--								<el-button type="primary" size="mini" @click="noSendShipFn(scope.row)">确定</el-button>-->
-        <!--							</div>-->
-        <!--							<el-button slot="reference" size="mini" type="primary" plain>自取</el-button>-->
-        <!--						</el-popover>-->
-        <!--						<el-button @click="shipDrawFn(scope.row)" size="mini" type="primary" plain style="margin-left:14px;">发货</el-button>-->
-        <!--						<el-button @click="printOrder(scope.row)" size="mini" type="primary" plain style="margin-left:14px;">打印</el-button>-->
-        <!--					</template>-->
-        <!--					<template v-else>-->
-        <!--						<el-button size="mini" type="primary" plain @click="shipDrawFn(scope.row)">发货</el-button>-->
-        <!--						<el-button @click="printOrder(scope.row)" size="mini" type="primary" plain style="margin-left:14px;">打印</el-button>-->
-        <!--					</template>-->
-
-        <!--				</template>-->
       </template>
     </x-crud>
     <!-- 用户详情 -->
@@ -397,11 +371,11 @@ export default {
           .on('refresh', async (params, { next }) => {
             // 继续执行刷新
             let  asset  = await next(params);
-            this.tabsData[0].val = asset.allNum;
-            this.tabsData[1].val = asset.unPayNum;
-            this.tabsData[2].val = asset.unSendNum;
-            this.tabsData[3].val = asset.sendingNum;
-            this.tabsData[4].val = asset.finishNum;
+            this.tabsData[0].val = asset.shop.totalOrder;
+            this.tabsData[1].val = asset.shop.unPayOrder;
+            this.tabsData[2].val = asset.shop.unSendOrder;
+            this.tabsData[3].val = asset.shop.sendingOrder;
+            this.tabsData[4].val = asset.shop.finishOrder;
           })
           .done();
       app.refresh({ status: this.tabIndex });

Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików