shish 5 лет назад
Родитель
Сommit
739a089af9

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
pt/dist/web/css/chunk-089668fb.2846cec8.css


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
pt/dist/web/css/chunk-fc613414.90c165b5.css


+ 1 - 1
pt/dist/web/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.89108736.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="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.afac7b8c.js"></script><script src="/js/app.89108736.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.e216c651.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="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.afac7b8c.js"></script><script src="/js/app.e216c651.js"></script></body></html>

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
pt/dist/web/js/app.e216c651.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
pt/dist/web/js/chunk-089668fb.40d30a5d.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
pt/dist/web/js/chunk-fc613414.64b0e2c6.js


+ 59 - 12
pt/src/saas/shop/deposit.vue

@@ -1,6 +1,8 @@
 <template>
 	<div class="app-list-content">
 		<x-crud class="liu-crud-wrap" @load="onLoad">
+
+
 			<!-- 审核 -->
 			<template #slot-apply="{scope}">
 
@@ -8,16 +10,20 @@
 					<el-button type="text" @click="showModalFn(scope.row)">待审核</el-button>
 				</template>
 
+			</template>
+
+			<template #table-column-status="{scope}">
+				<template v-if="scope.row.status == 1">
+					<span>待审核</span>
+				</template>
 				<template v-else-if="scope.row.status == 2">
-					<!-- <el-button type="text">审核通过</el-button> success_color -->
 					<span class="success_color">审核通过</span>
 				</template>
-        <template v-else-if="scope.row.status == 3">
-					<!-- <el-button type="text" style="color: '#ff2842'">审核通过</el-button> -->
-          <span class="error_color">审核通过</span>
+        		<template v-else-if="scope.row.status == 3">
+          			<span class="error_color">审核未通过</span>
 				</template>
-
 			</template>
+
 		</x-crud>
 		<!-- 审核弹窗 -->
 		<el-dialog
@@ -95,32 +101,73 @@ export default {
 						{
 							prop: 'id',
 							label: 'ID',
-							align: 'center'
+							align: 'center',
+							width: '70'
+						},
+						{
+							prop: 'sjName',
+							label: '商家',
+							align: 'center',
+							width: '120'
+						},
+						{
+							prop: 'shopName',
+							label: '门店',
+							align: 'center',
+							width: '120'
 						},
 						{
 							prop: 'sjId',
 							label: '商家ID',
-							align: 'center'
+							align: 'center',
+							width: '90'
 						},
 						{
 							prop: 'shopId',
 							label: '门店ID',
-							align: 'center'
+							align: 'center',
+							width: '90'
+						},
+						{
+							prop: 'cashName',
+							label: '姓名',
+							align: 'center',
+							width: '120'
+						},
+						{
+							prop: 'cashAccount',
+							label: '帐号',
+							align: 'center',
+							width: '130'
 						},
 						{
 							prop: 'amount',
 							label: '提现金额',
 							align: 'center',
-							emptyText: '无'
+							emptyText: '无',
+							width: '100'
+						},
+						{
+							prop: 'thirdOrderSn',
+							label: '提现回执',
+							align: 'center',
+							emptyText: '',
+							width: '130'
+						},
+						{
+							prop: 'remark',
+							label: '备注',
+							align: 'center',
+							emptyText: '',
+							width: '180'
 						},
-						
 						{
 							prop: 'status',
 							label: '状态',
 							align: 'center',
 							emptyText: '无'
 						},
-            {
+            			{
 							prop: 'addTime',
 							label: '提交时间',
 							align: 'center',
@@ -132,7 +179,7 @@ export default {
 						visible: true, // 是否显示
 						// 同 element-ui Table-column Attributes
 						props: {
-							width: 100,
+							width: 150,
 							align: 'center',
 							fixed: 'right',
 							label: '操作'

Некоторые файлы не были показаны из-за большого количества измененных файлов