Merge branch 'test' of https://newgitea.sxczgkj.cn/czg_team/cashier-web into test

src/views/tool/Instead/components/choose-user.vue

@@ -4,7 +4,7 @@
       <div class="head-container">
         <el-form :model="query" inline>
           <el-form-item label="">
-            <el-input v-model="query.name" placeholder="请输入昵称或手机号"></el-input>
+            <el-input v-model="query.key" placeholder="请输入昵称或手机号"></el-input>
           </el-form-item>
 
           <el-form-item>
@@ -22,7 +22,10 @@
           <el-table-column label="用户" prop="headImg" width="200px">
             <template v-slot="scope">
               <div class="user_info">
-                <el-image :src="scope.row.headImg" style="width: 40px; height: 40px; flex-shrink: 0">
+                <el-image
+                  :src="scope.row.headImg"
+                  style="width: 40px; height: 40px; flex-shrink: 0"
+                >
                   <template #error>
                     <div class="image-slot">
                       <i class="el-icon-user"></i>
@@ -30,7 +33,14 @@
                   </template>
                 </el-image>
                 <span class="name">{{ scope.row.nickName }}</span>
-                <el-tag disable-transitions type="primary" style="margin-left: 10px;" v-if="scope.row.new">新</el-tag>
+                <el-tag
+                  disable-transitions
+                  type="primary"
+                  style="margin-left: 10px"
+                  v-if="scope.row.new"
+                >
+                  新
+                </el-tag>
               </div>
             </template>
           </el-table-column>
@@ -38,7 +48,9 @@
 
           <el-table-column label="会员" prop="isVip" width="140">
             <template v-slot="scope">
-              <el-tag type="warning" v-if="scope.row.isVip">会员等级{{ scope.row.memberLevelName }}</el-tag>
+              <el-tag type="warning" v-if="scope.row.isVip">
+                会员等级{{ scope.row.memberLevelName }}
+              </el-tag>
               <span v-else>否</span>
             </template>
           </el-table-column>
@@ -60,9 +72,14 @@
         </el-table>
       </div>
       <div class="head-container">
-        <el-pagination :total="tableData.total" :current-page="tableData.page" :page-size="tableData.size"
-          @size-change="sizeChange" @current-change="paginationChange"
-          layout="total, sizes, prev, pager, next, jumper"></el-pagination>
+        <el-pagination
+          :total="tableData.total"
+          :current-page="tableData.page"
+          :page-size="tableData.size"
+          @size-change="sizeChange"
+          @current-change="paginationChange"
+          layout="total, sizes, prev, pager, next, jumper"
+        ></el-pagination>
       </div>
     </div>
   </el-dialog>
@@ -71,13 +88,13 @@
 <script setup>
 import shopUserApi from "@/api/account/shopUser";
 import dayjs from "dayjs";
-import { multiplyAndFormat } from '@/utils'
+import { multiplyAndFormat } from "@/utils";
 let cacheData = {};
 
 const state = reactive({
   show: false,
   query: {
-    name: "",
+    key: "",
     // isVip: 1,
   },
   tableData: {
@@ -242,4 +259,4 @@ defineExpose({
 .gap-20 {
   gap: 20px;
 }
-</style>
+</style>