Browse Source

调整完成

傅行帆 4 years ago
parent
commit
305c31377a

+ 7
- 0
src/api/lottery/shop-api.js View File

@@ -40,4 +40,11 @@ shopApi.getLotteryList = id => {
40 40
   })
41 41
 }
42 42
 
43
+shopApi.getShopDetail = id => {
44
+  return request({
45
+    url: '/taShop/info/' + id,
46
+    method: 'get'
47
+  })
48
+}
49
+
43 50
 export default shopApi

+ 2
- 0
src/views/lottery/customer/customer-bill-list.vue View File

@@ -92,6 +92,7 @@
92 92
           pageIndex: 1,
93 93
           pageSize: 10,
94 94
           phone: null,
95
+          customerId: "",
95 96
           idCard: null,
96 97
           name: null,
97 98
           pageSorts: []
@@ -101,6 +102,7 @@
101 102
       }
102 103
     },
103 104
     created() {
105
+      this.listQuery.customerId = this.$route.query.customerId;
104 106
       this.setDefaultSort()
105 107
       this.getList()
106 108
     },

+ 6
- 2
src/views/lottery/customer/customer-lottery-list.vue View File

@@ -24,7 +24,7 @@
24 24
       </el-table-column>
25 25
       <el-table-column label="昵称" min-width="100px" align="center">
26 26
         <template slot-scope="{row}">
27
-          <span>{{ row.name }}</span>
27
+          <span @click="goToBillList(row)"  style="color: blue; cursor:pointer">{{ row.name }}</span>
28 28
         </template>
29 29
       </el-table-column>
30 30
       <el-table-column label="头像" width="80px" align="center">
@@ -63,6 +63,7 @@
63 63
   import waves from '@/directive/waves'
64 64
   import Pagination from '@/components/Pagination'
65 65
   import customerApi from '@/api/lottery/customer-api'
66
+import router from '../../../router'
66 67
 
67 68
   const stateEnum = { 0: '待审核', 1: '已审核', 2: '审核不通过' }
68 69
   const statusOptions = [
@@ -113,7 +114,10 @@
113 114
           this.listLoading = false
114 115
         });
115 116
       },
116
-
117
+      // 跳转流水页面
118
+      goToBillList(row){
119
+        this.$router.push("customer-bill-list?customerId=" + row.customerId)
120
+      },
117 121
       handleFilter() {
118 122
         this.listQuery.pageIndex = 1
119 123
         this.getList()

+ 89
- 0
src/views/lottery/shop/components/shop-detail.vue View File

@@ -0,0 +1,89 @@
1
+<template>
2
+  <el-dialog
3
+    title="店铺详情"
4
+    :visible.sync="dialogVisible"
5
+    custom-class="page-dialog sys-user-dialog"
6
+  >
7
+    <el-form
8
+      ref="shopVerifyForm"
9
+      :rules="rules"
10
+      :model="form"
11
+      label-position="right"
12
+      label-width="80px"
13
+      class="page-form"
14
+      style="width: 100%;"
15
+    >
16
+      <el-form-item label="店铺名称" prop="name">
17
+        <el-input v-model="form.name" readonly="true" />
18
+      </el-form-item>
19
+      <el-form-item label="详细地址" prop="address">
20
+        <el-input v-model="form.address" readonly="true" />
21
+      </el-form-item>
22
+      <el-form-item label="店主" prop="keeperName">
23
+        <el-input v-model="form.keeperName" readonly="true" />
24
+      </el-form-item>
25
+      <el-form-item label="店主手机号" prop="phone">
26
+        <el-input v-model="form.phone" readonly="true" />
27
+      </el-form-item>
28
+      <el-form-item label="账户余额" prop="amount">
29
+        <el-input v-model="form.amount" readonly="true" />
30
+      </el-form-item>
31
+      <el-form-item label="创建时间" prop="createDate">
32
+        <el-input v-model="form.createDate" readonly="true" />
33
+      </el-form-item>
34
+    </el-form>
35
+    <div slot="footer" class="dialog-footer">
36
+
37
+    </div>
38
+  </el-dialog>
39
+</template>
40
+
41
+<script>
42
+  import shopApi from '@/api/lottery/shop-api'
43
+
44
+  export default {
45
+    name: 'ShopDetail',
46
+    components: { },
47
+    props: {
48
+    },
49
+    data() {
50
+      return {
51
+        dialogVisible: false,
52
+        form: {
53
+        },
54
+        updateId: null,
55
+        rules: {
56
+          status: [
57
+            { required: true, message: '请选择状态', trigger: 'change' }
58
+          ]
59
+        }
60
+      }
61
+    },
62
+    computed: {},
63
+    created() {
64
+
65
+    },
66
+    mounted() {
67
+
68
+    },
69
+    methods: {
70
+      handle(id) {
71
+        console.log(id, "id-----")
72
+        shopApi.getShopDetail(id).then(response => {
73
+          this.form = response.data
74
+        });
75
+        this.dialogVisible = true
76
+      },
77
+    }
78
+  }
79
+</script>
80
+
81
+<style lang="scss">
82
+  .sys-user-dialog {
83
+    margin-top: 40px !important;
84
+  }
85
+</style>
86
+
87
+<style lang="scss" scoped>
88
+
89
+</style>

+ 9
- 3
src/views/lottery/shop/shop-lottery-list.vue View File

@@ -30,7 +30,7 @@
30 30
       </el-table-column>
31 31
       <el-table-column label="店铺名称" min-width="100px" align="center">
32 32
         <template slot-scope="{row}">
33
-          <span>{{ row.name }}</span>
33
+          <span @click="detailShop(row)" style="color: blue; cursor:pointer">{{ row.name }}</span>
34 34
         </template>
35 35
       </el-table-column>
36 36
       <el-table-column label="详细地址" min-width="110px" align="center">
@@ -60,6 +60,7 @@
60 60
 
61 61
     <shop-verify ref="verifyPage" @change="getList"/>
62 62
     <shop-lottery-manage ref="shopLotteryManagePage" />
63
+    <shop-detail ref="shopDetailPage" />
63 64
 
64 65
   </div>
65 66
 </template>
@@ -71,6 +72,7 @@
71 72
 
72 73
   import ShopVerify from './components/shop-verify'
73 74
   import ShopLotteryManage from './components/shop-lottery-manage'
75
+  import ShopDetail from './components/shop-detail'
74 76
 
75 77
   const stateEnum = { 0: '待审核', 1: '已审核', 2: '审核不通过' }
76 78
   const statusOptions = [
@@ -81,7 +83,7 @@
81 83
 
82 84
   export default {
83 85
     name: 'shopLotteryList',
84
-    components: { Pagination, ShopVerify, ShopLotteryManage },
86
+    components: { Pagination, ShopVerify, ShopLotteryManage, ShopDetail },
85 87
     directives: { waves },
86 88
     filters: {
87 89
       statusFilter(state) {
@@ -120,7 +122,11 @@
120 122
           this.listLoading = false
121 123
         });
122 124
       },
123
-
125
+      detailShop(row) {
126
+        this.$nextTick(() => {
127
+          this.$refs.shopDetailPage.handle(row.shopId)
128
+        });
129
+      },
124 130
       handleFilter() {
125 131
         this.listQuery.pageIndex = 1
126 132
         this.getList()