优化

.env.development

@@ -1,9 +1,9 @@
 ENV = 'development'
 
 # 接口地址
-VUE_APP_BASE_API  = 'http://192.168.2.44:8000'
+# VUE_APP_BASE_API  = 'http://192.168.2.44:8000'
 # VUE_APP_BASE_API  = 'http://192.168.2.133:8000'
-# VUE_APP_BASE_API  = 'https://admintestpapi.sxczgkj.cn'
+VUE_APP_BASE_API  = 'https://admintestpapi.sxczgkj.cn'
 # VUE_APP_BASE_API  = 'https://cashieradmin.sxczgkj.cn'
 # VUE_APP_BASE_API  = 'http://192.168.2.96:8000'
 VUE_APP_WS_API = 'ws://192.168.2.128:8000'

src/api/setting.js

@@ -96,3 +96,15 @@ export function tbCouponCategoryGet(params) {
     params
   });
 }
+
+/**
+ * 查询资源类别列表
+ * @returns
+ */
+export function tbPlatformDictType(params) {
+  return request({
+    url: "/api/tbPlatformDictType",
+    method: "get",
+    params
+  });
+}

src/api/shop.js

@@ -428,3 +428,18 @@ export function findActivate(params) {
     params
   });
 }
+
+/**
+ * 商家用户列表
+ * @returns
+ */
+export function queryAllShopUser(params) {
+  return request({
+    url: `/api/tbShopUser/queryAllShopUser`,
+    method: "get",
+    params: {
+      shopId: localStorage.getItem("shopId"),
+      ...params
+    }
+  });
+}

src/views/shop/components/shopInfo.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <div>
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px" label-position="left">
+      <el-form ref="form" :model="form" :rules="rules" label-width="140px" label-position="left">
         <el-form-item label="门店名称" prop="shopName">
           <el-input v-model="form.shopName" placeholder="请输入门店名称" style="width: 500px;"></el-input>
         </el-form-item>
@@ -77,6 +77,10 @@
           <el-switch v-model="form.isOpenYhq" active-value="true" inactive-value="false"></el-switch>
           <!-- <div style="color: #999;">是否允许用户在小程序端支付订单</div> -->
         </el-form-item>
+        <el-form-item label="是否开启会员支付">
+          <el-switch v-model="form.isOpenYhq" active-value="true" inactive-value="false"></el-switch>
+          <!-- <div style="color: #999;">是否允许用户在小程序端支付订单</div> -->
+        </el-form-item>
         <!-- <el-form-item label="结算类型">
                     <el-radio-group v-model="form.settleType">
                         <el-radio :label="0">今日</el-radio>

src/views/system/resource_manage/components/add.vue

@@ -5,7 +5,7 @@
         <el-form ref="form" :model="form" :rules="rules" label-width="120px" label-position="left">
           <el-form-item label="资源类型" prop="type">
             <el-select v-model="form.type" placeholder="请选择资源类型" @change="typeChange">
-              <el-option v-for="item in typeList" :key="item.value" :label="item.label" :value="item.value"></el-option>
+              <el-option v-for="item in typeList" :key="item.key" :label="item.name" :value="item.key"></el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="团购卷" prop="group">
@@ -84,7 +84,7 @@
 </template>
 
 <script>
-import { tbPlatformDictPostPut } from "@/api/setting";
+import { tbPlatformDictPostPut, tbPlatformDictType } from "@/api/setting";
 import uploadImg from '@/components/uploadImg'
 import enumData from '../enumData.js'
 import groupTypeList from '@/components/groupTypeList'
@@ -140,14 +140,24 @@ export default {
         ]
       },
       jumpTypeList: enumData.jumpTypeList,
-      typeList: enumData.typeList,
+      typeList: [],
       resetForm: "",
     };
   },
   mounted() {
     this.resetForm = { ...this.form };
+    this.tbPlatformDictType()
   },
   methods: {
+    // 获取资源类别
+    async tbPlatformDictType() {
+      try {
+        const res = await tbPlatformDictType()
+        this.typeList = res.content
+      } catch (error) {
+        console.log(error);
+      }
+    },
     groupSuccess(row) {
       this.productIds = [row]
       this.form.name = row.name

src/views/system/resource_manage/index.vue

@@ -8,8 +8,8 @@
                 </el-col>
                 <el-col :span="6">
                     <el-select v-model="query.type" placeholder="请选择资源类型">
-                        <el-option v-for="item in enumData.typeList" :key="item.value" :label="item.label"
+                        <el-option v-for="item in typeList" :key="item.key" :label="item.name"
-                            :value="item.value"></el-option>
+                            :value="item.key"></el-option>
                     </el-select>
                 </el-col>
                 <el-col :span="6">
@@ -106,7 +106,7 @@
 <script>
 import enumData from './enumData.js'
 import add from "./components/add";
-import { tbPlatformDictGet, tbPlatformDictPostPut } from "@/api/setting";
+import { tbPlatformDictGet, tbPlatformDictPostPut, tbPlatformDictType } from "@/api/setting";
 export default {
     components: {
         add
@@ -114,6 +114,7 @@ export default {
     data() {
         return {
             enumData,
+            typeList: [],
             query: {
                 name: "",
                 type: ''
@@ -128,18 +129,28 @@ export default {
         };
     },
     filters: {
-        typeFilter(t) {
-            let e = t ? enumData.typeList.find(item => item.value == t).label : t
-            return e ? e : t
-        },
         jumpFilter(t) {
             return t ? enumData.jumpTypeList.find(item => item.value == t).label : ''
         }
     },
     mounted() {
-        this.getTableData();
+        this.tbPlatformDictType()
     },
     methods: {
+        typeFilter(t) {
+            let e = t ? this.typeList.find(item => item.value == t).label : t
+            return e ? e : t
+        },
+        // 获取资源类别
+        async tbPlatformDictType() {
+            try {
+                const res = await tbPlatformDictType()
+                this.typeList = res.content
+                this.getTableData()
+            } catch (error) {
+                console.log(error);
+            }
+        },
         // 切换状态
         async changeHot(e, row) {
             try {

src/views/user_manage/components/addActive.vue

@@ -11,12 +11,12 @@
                 <el-form-item label="赠送数量">
                     <el-input-number v-model="form.handselNum" controls-position="right" :min="1"></el-input-number>
                 </el-form-item>
-                <el-form-item label="赠送类型">
+                <!-- <el-form-item label="赠送类型">
                     <el-select v-model="form.handselType">
                         <el-option :label="item.label" :value="item.value" v-for="item in handselTypes"
                             :key="item.value"></el-option>
                     </el-select>
-                </el-form-item>
+                </el-form-item> -->
                 <el-form-item label="状态">
                     <el-switch v-model="form.isDel" active-value="0" inactive-value="1"></el-switch>
                 </el-form-item>

src/views/user_manage/user_list.vue

@@ -1,3 +1,140 @@
 <template>
-    <div>用户列表</div>
+    <div class="app-container">
+        <div class="head-container">
+            <el-form :model="query" inline>
+                <el-form-item>
+                    <el-input v-model="query.telephone" placeholder="请输入手机号"></el-input>
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" @click="getTableData">查询</el-button>
+                    <el-button @click="resetHandle">重置</el-button>
+                </el-form-item>
+            </el-form>
+        </div>
+        <!-- <div class="head-container">
+            <el-button type="primary" icon="el-icon-plus" @click="$refs.addActive.show()">
+                添加活动
+            </el-button>
+        </div> -->
+        <div class="head-container">
+            <el-table :data="tableData.data" v-loading="tableData.loading">
+                <el-table-column label="用户" prop="headImg">
+                    <template v-slot="scope">
+                        <div class="user_info">
+                            <el-image :src="scope.row.headImg" style="width: 40px;height: 40px;" />
+                            <span class="name">{{ scope.row.nickName }}</span>
+                        </div>
+                    </template>
+                </el-table-column>
+                <el-table-column label="性别" prop="sex"></el-table-column>
+                <el-table-column label="余额" prop="amount"></el-table-column>
+                <el-table-column label="积分" prop="totalScore"></el-table-column>
+                <el-table-column label="手机号" prop="telephone"></el-table-column>
+                <el-table-column label="生日" prop="birthDay"></el-table-column>
+                <el-table-column label="注册时间" prop="createAt">
+                    <template v-slot="scope">
+                        {{ scope.row.createAt | timeFilter }}
+                    </template>
+                </el-table-column>
+                <el-table-column label="最近登录时间" prop="lastLoginAt">
+                    <template v-slot="scope">
+                        {{ scope.row.lastLoginAt | timeFilter }}
+                    </template>
+                </el-table-column>
+                <el-table-column label="操作" width="120">
+                    <template v-slot="scope">
+                        <el-button type="text" icon="el-icon-edit"
+                            @click="$refs.addActive.show(scope.row)">编辑</el-button>
+                        <!-- <el-popconfirm title="确定删除吗？" @confirm="delTableHandle([scope.row.id])">
+                            <el-button type="text" icon="el-icon-delete" style="margin-left: 20px !important;"
+                                slot="reference">删除</el-button>
+                        </el-popconfirm> -->
+                    </template>
+                </el-table-column>
+            </el-table>
+        </div>
+        <div class="head-container">
+            <el-pagination :total="tableData.total" :current-page="tableData.page + 1" :page-size="tableData.size"
+                @current-change="paginationChange" layout="total"></el-pagination>
+        </div>
+    </div>
 </template>
+
+<script>
+import { queryAllShopUser } from '@/api/shop'
+import dayjs from 'dayjs'
+export default {
+    data() {
+        return {
+            query: {
+                telephone: ''
+            },
+            tableData: {
+                data: [],
+                page: 0,
+                size: 10,
+                loading: false,
+                total: 0
+            }
+        }
+    },
+    filters: {
+        timeFilter(s) {
+            return dayjs(s).format('YYYY-MM-DD HH:mm:ss')
+        }
+    },
+    mounted() {
+        this.getTableData()
+    },
+    methods: {
+        // 切换状态
+        async statusChange(e, row) {
+            try {
+                this.tableData.loading = true
+                const data = { ...row }
+                data.status = e
+                await modityActivate(data)
+                this.getTableData()
+            } catch (error) {
+                console.log(error)
+                this.tableData.loading = false
+            }
+        },
+        // 重置查询
+        resetHandle() {
+            this.query.telephone = ''
+            this.getTableData()
+        },
+        // 分页回调
+        paginationChange(e) {
+            this.tableData.page = e - 1
+            this.getTableData()
+        },
+        // 获取商品列表
+        async getTableData() {
+            this.tableData.loading = true
+            try {
+                const res = await queryAllShopUser({
+                    telephone: this.query.telephone,
+                    isVip: 0
+                })
+                this.tableData.loading = false
+                this.tableData.data = res.content
+                this.tableData.total = res.totalElements
+            } catch (error) {
+                console.log(error)
+            }
+        }
+    }
+}
+</script>
+
+<style scoped lang="scss">
+.user_info {
+    display: flex;
+    align-items: center;
+    .name {
+        margin-left: 10px;
+    }
+}
+</style>