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

PT update

shish 5 years ago
parent
6d9ab0bef6
commit
1bd929fabe
9 changed files with 66 additions and 76 deletions
Unified View Show Diff Stats
  1. 1 1
      pt/dist/web/index.html
  2. 0 0
      pt/dist/web/js/app.19a33ffd.js
  3. 0 0
      pt/dist/web/js/chunk-205a2464.fc032870.js
  4. 0 0
      pt/dist/web/js/chunk-2d0b3109.8c391bd8.js
  5. 0 0
      pt/dist/web/js/chunk-618a77aa.4e05d6e0.js
  6. 0 0
      pt/dist/web/js/chunk-618a77aa.c9f82712.js
  7. 9 10
      pt/src/mock/userInfo.js
  8. 43 57
      pt/src/saas/shop/shop.vue
  9. 13 8
      pt/src/views/assets/ptYeChange.vue

+ 1 - 1
pt/dist/web/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.93a14dde.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.93a14dde.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.19a33ffd.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.19a33ffd.js"></script></body></html>

File diff suppressed because it is too large
+ 0 - 0
pt/dist/web/js/app.19a33ffd.js


File diff suppressed because it is too large
+ 0 - 0
pt/dist/web/js/chunk-205a2464.fc032870.js


File diff suppressed because it is too large
+ 0 - 0
pt/dist/web/js/chunk-2d0b3109.8c391bd8.js


File diff suppressed because it is too large
+ 0 - 0
pt/dist/web/js/chunk-618a77aa.4e05d6e0.js


File diff suppressed because it is too large
+ 0 - 0
pt/dist/web/js/chunk-618a77aa.c9f82712.js


+ 9 - 10
pt/src/mock/userInfo.js
View File 

@@ -11,7 +11,7 @@ let userList = [
 
 	{
 
 	{
 
 		id: '21',
 
 		id: '21',
 
 		name: '测试部门权限2',
 
 		name: '测试部门权限2',
 
-		password: 'e10adc3949ba59abbe56e057f20f883e',
 
+		password: '',
 
 		passwordV: 1,
 
 		passwordV: 1,
 
 		nickName: '权限2昵称',
 
 		nickName: '权限2昵称',
 
 		headImg: null,
 
 		headImg: null,
 
@@ -29,7 +29,7 @@ let userList = [
 
 	{
 
 	{
 
 		id: '20',
 
 		id: '20',
 
 		name: '测试部门权限',
 
 		name: '测试部门权限',
 
-		password: 'e10adc3949ba59abbe56e057f20f883e',
 
+		password: '',
 
 		passwordV: 1,
 
 		passwordV: 1,
 
 		nickName: '测试部门权限昵称',
 
 		nickName: '测试部门权限昵称',
 
 		headImg: null,
 
 		headImg: null,
 
@@ -47,7 +47,7 @@ let userList = [
 
 	{
 
 	{
 
 		id: '19',
 
 		id: '19',
 
 		name: '33',
 
 		name: '33',
 
-		password: 'e10adc3949ba59abbe56e057f20f883e',
 
+		password: '',
 
 		passwordV: 1,
 
 		passwordV: 1,
 
 		nickName: '333',
 
 		nickName: '333',
 
 		headImg: null,
 
 		headImg: null,
 
@@ -65,7 +65,7 @@ let userList = [
 
 	{
 
 	{
 
 		id: '18',
 
 		id: '18',
 
 		name: '阿打算',
 
 		name: '阿打算',
 
-		password: 'e10adc3949ba59abbe56e057f20f883e',
 
+		password: '',
 
 		passwordV: 1,
 
 		passwordV: 1,
 
 		nickName: '12312',
 
 		nickName: '12312',
 
 		headImg: null,
 
 		headImg: null,
 
@@ -83,7 +83,7 @@ let userList = [
 
 	{
 
 	{
 
 		id: '17',
 
 		id: '17',
 
 		name: '阿',
 
 		name: '阿',
 
-		password: 'e10adc3949ba59abbe56e057f20f883e',
 
+		password: '',
 
 		passwordV: 1,
 
 		passwordV: 1,
 
 		nickName: '123',
 
 		nickName: '123',
 
 		headImg: null,
 
 		headImg: null,
 
@@ -101,7 +101,7 @@ let userList = [
 
 	{
 
 	{
 
 		id: '16',
 
 		id: '16',
 
 		name: 'test',
 
 		name: 'test',
 
-		password: 'e10adc3949ba59abbe56e057f20f883e',
 
+		password: '',
 
 		passwordV: 1,
 
 		passwordV: 1,
 
 		nickName: null,
 
 		nickName: null,
 
 		headImg: null,
 
 		headImg: null,
 
@@ -121,7 +121,7 @@ let userList = [
 
 let userInfo = {
 
 let userInfo = {
 
 	createTime: '2019-06-25 10:20:20',
 
 	createTime: '2019-06-25 10:20:20',
 
 	email: '123456@qq.com',
 
 	email: '123456@qq.com',
 
-	headImg: 'https://pic.qqtn.com/up/2019-11/2019110209212070747.jpg',
 
+	headImg: '',
 
 	id: '1',
 
 	id: '1',
 
 	name: '超级管理员',
 
 	name: '超级管理员',
 
 	nickName: '超管',
 
 	nickName: '超管',
 
@@ -159,9 +159,6 @@ let menu = {
 
 		'sys:log:clear'
 
 		'sys:log:clear'
 
 	],
 
 	],
 
 	menus: [
 
 	menus: [
 
-		// 商家管理
 
-		{id: '9',parentId: null,name: '控制台',type: 0,icon: 'icongongzuotai',orderNum: 1,router: '',viewPath: '',keepAlive: 1},
 
-		{id: '91',parentId: '9',name: '今日概况',type: 1,icon: 'icongongzuotai',orderNum: 1,router: '/',viewPath: 'Home',keepAlive: 1},
 
 		{id: '1',parentId: null,name: '商家',type: 0,icon: 'icongongzuotai',orderNum: 1,router: '',viewPath: '',keepAlive: 1},
 
 		{id: '1',parentId: null,name: '商家',type: 0,icon: 'icongongzuotai',orderNum: 1,router: '',viewPath: '',keepAlive: 1},
 
 		{id: '11',parentId: '1',name: '申请记录',type: 1,icon: 'icongongzuotai',orderNum: 1,router: '/saas/shop/apply',viewPath: 'saas/shop/apply',keepAlive: 1},
 
 		{id: '11',parentId: '1',name: '申请记录',type: 1,icon: 'icongongzuotai',orderNum: 1,router: '/saas/shop/apply',viewPath: 'saas/shop/apply',keepAlive: 1},
 
 		{id: '13',parentId: '1',name: '门店管理',type: 1,icon: 'icongongzuotai',orderNum: 1,router: '/saas/shop/shop',viewPath: 'saas/shop/shop',keepAlive: 1},
 
 		{id: '13',parentId: '1',name: '门店管理',type: 1,icon: 'icongongzuotai',orderNum: 1,router: '/saas/shop/shop',viewPath: 'saas/shop/shop',keepAlive: 1},
 
@@ -170,6 +167,8 @@ let menu = {
 
 		{id: '15',parentId: '1',name: '小程序',type: 1,icon: 'icongongzuotai',orderNum: 1,router: '/saas/shop/upgrade',viewPath: 'saas/shop/upgrade',keepAlive: 1},
 
 		{id: '15',parentId: '1',name: '小程序',type: 1,icon: 'icongongzuotai',orderNum: 1,router: '/saas/shop/upgrade',viewPath: 'saas/shop/upgrade',keepAlive: 1},
 
 		{id: '16',parentId: '1',name: '付费订单',type: 1,icon: 'icongongzuotai',orderNum: 1,router: '/saas/shop/buy',viewPath: 'saas/shop/buy',keepAlive: 1},
 
 		{id: '16',parentId: '1',name: '付费订单',type: 1,icon: 'icongongzuotai',orderNum: 1,router: '/saas/shop/buy',viewPath: 'saas/shop/buy',keepAlive: 1},
 
         {id: '17',parentId: '1',name: '提现申请',type: 1,icon: 'icongongzuotai',orderNum: 1,router: '/saas/shop/deposit',viewPath: 'saas/shop/deposit',keepAlive: 1},
 
         {id: '17',parentId: '1',name: '提现申请',type: 1,icon: 'icongongzuotai',orderNum: 1,router: '/saas/shop/deposit',viewPath: 'saas/shop/deposit',keepAlive: 1},
 
+		{id: '9',parentId: null,name: '控制台',type: 0,icon: 'icongongzuotai',orderNum: 1,router: '',viewPath: '',keepAlive: 1},
 
+		{id: '91',parentId: '9',name: '今日概况',type: 1,icon: 'icongongzuotai',orderNum: 1,router: '/',viewPath: 'Home',keepAlive: 1},
 
 		{id: '10',parentId: null,name: '资产',type: 0,icon: 'icongongzuotai',orderNum: 1,router: '',viewPath: '',keepAlive: 1},
 
 		{id: '10',parentId: null,name: '资产',type: 0,icon: 'icongongzuotai',orderNum: 1,router: '',viewPath: '',keepAlive: 1},
 
 		{id: '101',parentId: '10',name: '余额明细',type: 1,icon: 'icongongzuotai',orderNum: 1,router: '/assets/ptYeChange',viewPath: 'views/assets/ptYeChange',keepAlive: 1},
 
 		{id: '101',parentId: '10',name: '余额明细',type: 1,icon: 'icongongzuotai',orderNum: 1,router: '/assets/ptYeChange',viewPath: 'views/assets/ptYeChange',keepAlive: 1},
 
 		{id: '2',parentId: null,name: '订单',type: 1,icon: 'icongongzuotai',orderNum: 2,router: '/saas/order/list',viewPath: 'saas/order/list',keepAlive: 1},
 
 		{id: '2',parentId: null,name: '订单',type: 1,icon: 'icongongzuotai',orderNum: 2,router: '/saas/order/list',viewPath: 'saas/order/list',keepAlive: 1},

+ 43 - 57
pt/src/saas/shop/shop.vue
View File 

@@ -1,5 +1,6 @@
 
 <template>
 
 <template>
 
     <div class="app-list-content">
 
     <div class="app-list-content">
 
+      
         <x-crud class="liu-crud-wrap" @load="onLoad">
 
         <x-crud class="liu-crud-wrap" @load="onLoad">
 
             <!-- 余额 -->
 
             <!-- 余额 -->
 
             <template #table-column-balance="{scope}">
 
             <template #table-column-balance="{scope}">
 
@@ -14,64 +15,67 @@
 
                 <el-link :underline="true" @click="AmountShowFn(scope.row,'0')" style="font-size:12px;display:inline-block;">{{ scope.row.totalExpend }}</el-link>
 
                 <el-link :underline="true" @click="AmountShowFn(scope.row,'0')" style="font-size:12px;display:inline-block;">{{ scope.row.totalExpend }}</el-link>
 
             </template>
 
             </template>
 
             <!-- 收款码 -->
 
             <!-- 收款码 -->
 
-            <template #table-column-gatheringCode="{scope}">
 
-                <el-button type="text" @click="gotoPage(1,scope.row)">查看</el-button>
 
+            <template #table-column-gatheringCode>
 
+                <el-button type="text">下载</el-button>
 
             </template>
 
             </template>
 
             <!-- 充值 -->
 
             <!-- 充值 -->
 
             <template #slot-apply="{scope}">
 
             <template #slot-apply="{scope}">
 
               <el-button type="text" @click="topUp(scope.row.shopName, scope.row.id)">充值</el-button>
 
               <el-button type="text" @click="topUp(scope.row.shopName, scope.row.id)">充值</el-button>
 
             </template>
 
             </template>
 
         </x-crud>
 
         </x-crud>
 
+
 
         <!-- 用户详情 -->
 
         <!-- 用户详情 -->
 
         <balance-detail v-if='showBalanceDetail' @closeFn='showBalanceDetail = false' ref="balanceDetail" :orderOperate="optionData" />
 
         <balance-detail v-if='showBalanceDetail' @closeFn='showBalanceDetail = false' ref="balanceDetail" :orderOperate="optionData" />
 
+        
         <amount-detail v-if='showAmountDetail' @closeFn='showAmountDetail = false' ref="amountDetail" :orderOperate="optionData" />
 
         <amount-detail v-if='showAmountDetail' @closeFn='showAmountDetail = false' ref="amountDetail" :orderOperate="optionData" />
 
+
 
         <el-dialog :visible.sync="wxPayDialog" :close-on-click-modal="false" width="500px" >
 
         <el-dialog :visible.sync="wxPayDialog" :close-on-click-modal="false" width="500px" >
 
-        <el-form
 
-          :model="topForm"
 
-          :rules="ruleForm"
 
-          ref="adForm"
 
-          label-width="80px"
 
-          class="demo-form"
 
-        >
 
-        <el-form-item
 
-            label="充值门店"
 
-            style="text-align: left;"
 
-          >
 
-            <span>{{dialogTitle}}</span>
 
-          </el-form-item>
 
-          <el-form-item
 
-            label="充值金额"
 
-            prop="amount"
 
-            style="text-align: left;"
 
+          <el-form
 
+            :model="topForm"
 
+            :rules="ruleForm"
 
+            ref="adForm"
 
+            label-width="80px"
 
+            class="demo-form"
 
           >
 
           >
 
-            <el-input
 
-              placeholder="请输入充值金额"
 
-              size="small"
 
-              v-model="topForm.amount"
 
-            ></el-input>
 
-          </el-form-item>
 
           <el-form-item
 
           <el-form-item
 
-            label="登录密码"
 
-            prop="password"
 
-            style="text-align: left;"
 
-          >
 
-            <el-input
 
-              placeholder="请输入登录密码"
 
-              size="small"
 
-              v-model="topForm.password"
 
-            ></el-input>
 
-          </el-form-item>
 
-        </el-form>
 
+              label="充值门店"
 
+              style="text-align: left;"
 
+            >
 
+              <span>{{dialogTitle}}</span>
 
+            </el-form-item>
 
+            <el-form-item
 
+              label="充值金额"
 
+              prop="amount"
 
+              style="text-align: left;"
 
+            >
 
+              <el-input
 
+                placeholder="请输入充值金额"
 
+                size="small"
 
+                v-model="topForm.amount"
 
+              ></el-input>
 
+            </el-form-item>
 
+            <el-form-item
 
+              label="登录密码"
 
+              prop="password"
 
+              style="text-align: left;"
 
+            >
 
+              <el-input
 
+                placeholder="请输入登录密码"
 
+                size="small"
 
+                v-model="topForm.password"
 
+              ></el-input>
 
+            </el-form-item>
 
+          </el-form>
 
           <div slot="footer" class="dialog-footer">
 
           <div slot="footer" class="dialog-footer">
 
             <el-button size="small" @click="resetForm">取 消</el-button>
 
             <el-button size="small" @click="resetForm">取 消</el-button>
 
             <el-button type="primary" size="small" @click="submitForm">确认</el-button>
 
             <el-button type="primary" size="small" @click="submitForm">确认</el-button>
 
           </div>
 
           </div>
 
         </el-dialog>
 
         </el-dialog>
 
+
 
     </div>
 
     </div>
 
 </template>
 
 </template>
 
 
 
 <script>
 
 <script>
 
-    import { getFirstHost } from '@/cool/utils';
 
     import balanceDetail from './components/balance-detail';
 
     import balanceDetail from './components/balance-detail';
 
     import amountDetail from './components/amount-detail';
 
     import amountDetail from './components/amount-detail';
 
     export default {
 
     export default {
 
@@ -170,7 +174,7 @@
 
                                 label: '地址',
 
                                 label: '地址',
 
                                 align: 'center',
 
                                 align: 'center',
 
                                 emptyText: '无',
 
                                 emptyText: '无',
 
-                                width: '300'
 
+                                width: '370'
 
                             },
 
                             },
 
                             {
 
                             {
 
                                 prop: 'gatheringCode',
 
                                 prop: 'gatheringCode',
 
@@ -179,17 +183,14 @@
 
                                 width: '130'
 
                                 width: '130'
 
                             }
 
                             }
 
                         ],
 
                         ],
 
-                        // 操作列
 
                         op: {
 
                         op: {
 
                           visible: true, // 是否显示
 
                           visible: true, // 是否显示
 
-                          // 同 element-ui Table-column Attributes
 
                           props: {
 
                           props: {
 
-                            width: 100,
 
+                            width: 120,
 
                             align: 'center',
 
                             align: 'center',
 
                             fixed: 'right',
 
                             fixed: 'right',
 
                             label: '操作'
 
                             label: '操作'
 
                           },
 
                           },
 
-                          // 布局，请移步 `layout`
 
                           layout: ['slot-apply']
 
                           layout: ['slot-apply']
 
                         }
 
                         }
 
                     })
 
                     })
 
@@ -236,25 +237,10 @@
 
             AmountShowFn(item,type){
 
             AmountShowFn(item,type){
 
                 this.optionData = {...item,io: type}
 
                 this.optionData = {...item,io: type}
 
                 console.log(this.optionData)
 
                 console.log(this.optionData)
 
-                // this.optionData = item;
 
                 this.showAmountDetail = true;
 
                 this.showAmountDetail = true;
 
                 setTimeout(() => {
 
                 setTimeout(() => {
 
                     this.$refs.amountDetail.init();
 
                     this.$refs.amountDetail.init();
 
                 });
 
                 });
 
-            },
 
-            gotoPage(type,data) {
 
-                console.log(data)
 
-                let host = `http://api.pt.${getFirstHost()}`;
 
-                let url=null
 
-                switch (type) {
 
-                    case 1:
 
-                        url=`/user/gathering-code?id=${data.id}`
 
-                        break
 
-                    case 2:
 
-                        url=`/user/apply-code?id=${data.id}`
 
-                        break;
 
-                }
 
-                window.open(host + url);
 
             }
 
             }
 
         }
 
         }
 
     };
 
     };

+ 13 - 8
pt/src/views/assets/ptYeChange.vue
View File 

@@ -91,47 +91,52 @@
 
 							{
 
 							{
 
 								prop: 'id',
 
 								prop: 'id',
 
 								label: 'ID',
 
 								label: 'ID',
 
-								align: 'center'
 
+								align: 'center',
 
+								'min-width': '50px'
 
 							},
 
 							},
 
 							{
 
 							{
 
 								prop: 'sjName',
 
 								prop: 'sjName',
 
 								label: '商家',
 
 								label: '商家',
 
 								align: 'center',
 
 								align: 'center',
 
-								'min-width': '120px'
 
+								'min-width': '60px'
 
 							},
 
 							},
 
 							{
 
 							{
 
 								prop: 'shopName',
 
 								prop: 'shopName',
 
 								label: '门店',
 
 								label: '门店',
 
 								align: 'center',
 
 								align: 'center',
 
-								'min-width': '150px'
 
+								'min-width': '60px'
 
 							},
 
 							},
 
 							{
 
 							{
 
 								prop: 'event',
 
 								prop: 'event',
 
 								label: '事项',
 
 								label: '事项',
 
 								align: 'center',
 
 								align: 'center',
 
-								'min-width': '120px'
 
+								'min-width': '200px'
 
 							},
 
 							},
 
 							{
 
 							{
 
 								prop: 'amount',
 
 								prop: 'amount',
 
 								label: '金额',
 
 								label: '金额',
 
 								align: 'center',
 
 								align: 'center',
 
-								emptyText: '无'
 
+								emptyText: '无',
 
+								width:'100px'
 
 							},
 
 							},
 
 							{
 
 							{
 
 								prop: 'capitalType',
 
 								prop: 'capitalType',
 
 								label: '流水类型',
 
 								label: '流水类型',
 
 								align: 'center',
 
 								align: 'center',
 
-								emptyText: '无'
 
+								emptyText: '无',
 
+								width:'90px'
 
+
 
 							},
 
 							},
 
 							{
 
 							{
 
 								prop: 'balance',
 
 								prop: 'balance',
 
 								label: '当前余额',
 
 								label: '当前余额',
 
 								align: 'center',
 
 								align: 'center',
 
-								emptyText: '无'
 
+								emptyText: '无',
 
+								width:'120px'
 
 							},
 
 							},
 
 							{
 
 							{
 
 								prop: 'txBalance',
 
 								prop: 'txBalance',
 
-								label: '当前可提现余额',
 
+								label: '当前可提现',
 
 								align: 'center',
 
 								align: 'center',
 
 								emptyText: '无'
 
 								emptyText: '无'
 
 							},
 
 							},

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