diff --git a/src/api/account/points.ts b/src/api/account/points.ts
index 7cc66e0..f7c5cac 100644
--- a/src/api/account/points.ts
+++ b/src/api/account/points.ts
@@ -6,7 +6,7 @@ const Api = {
 
   calcOrderUsablePoints(params: any) {
     return request<any>({
-      url: `${baseURL}/member-points/calc-usable-points`,
+      url: `${baseURL}/memberPoints/calcUsablePoints`,
       method: "get",
       params
     });
@@ -14,7 +14,7 @@ const Api = {
   // 004-根据抵扣金额计算所需积分
   calcMoneyUsablePoints(params: any) {
     return request<any>({
-      url: `${baseURL}/member-points/calc-used-points`,
+      url: `${baseURL}/memberPoints/calcUsedPoints`,
       method: "get",
       params
     });
@@ -22,7 +22,7 @@ const Api = {
   // 003-根据积分计算可抵扣金额
   calcPointsToMoney(params: any) {
     return request<any>({
-      url: `${baseURL}/member-points/calc-deduction-amount`,
+      url: `${baseURL}/memberPoints/calcDeductionAmount`,
       method: "get",
       params
     });
diff --git a/src/views/application/marketing/points/index.ts b/src/views/application/marketing/points/index.ts
index e1eaebe..5a7577c 100644
--- a/src/views/application/marketing/points/index.ts
+++ b/src/views/application/marketing/points/index.ts
@@ -1,5 +1,5 @@
 import request from "@/utils/request";
-const baseURL = "/account/admin/points/basic-setting";
+const baseURL = "/account/admin/points/basicSetting";
 // 积分-配置
 const AuthAPI = {
   // 积分基本设置详情
diff --git a/src/views/application/marketing/points/pointsconfig/BasicSettings.vue b/src/views/application/marketing/points/pointsconfig/BasicSettings.vue
index bb71180..e2253b9 100644
--- a/src/views/application/marketing/points/pointsconfig/BasicSettings.vue
+++ b/src/views/application/marketing/points/pointsconfig/BasicSettings.vue
@@ -54,7 +54,11 @@
     </el-form-item>
     <el-form-item label="显示样式">
       <div class="style_wrap">
-        <div class="item style1" :class="{ active: Elform.browseMode == 'list' }" @click="Elform.browseMode = 'list'">
+        <div
+          class="item style1"
+          :class="{ active: Elform.browseMode == 'list' }"
+          @click="Elform.browseMode = 'list'"
+        >
           <div class="row">
             <div class="cover"></div>
             <div class="info">
@@ -72,7 +76,11 @@
             </div>
           </div>
         </div>
-        <div class="item style2" :class="{ active: Elform.browseMode == 'grid' }" @click="Elform.browseMode = 'grid'">
+        <div
+          class="item style2"
+          :class="{ active: Elform.browseMode == 'grid' }"
+          @click="Elform.browseMode = 'grid'"
+        >
           <div class="row">
             <div class="cover"></div>
             <div class="line"></div>
@@ -99,37 +107,35 @@
 </template>
 
 <script setup>
-import { reactive } from 'vue'
-import API from '../index'
+import { reactive } from "vue";
+import API from "../index";
 // do not use same name with ref
 const Elform = reactive({
-  "enableRewards": 1,
-  "rewardsGroup": "all",
-  "consumeAmount": 0,
-  "enableDeduction": 1,
-  "deductionGroup": 'all',
-  "minPaymentAmount": 0,
-  "maxDeductionRatio": 0,
-  "equivalentPoints": 0,
-  "enablePointsMall": 1,
-  "browseMode": "list",
-})
+  enableRewards: 1,
+  rewardsGroup: "all",
+  consumeAmount: 0,
+  enableDeduction: 1,
+  deductionGroup: "all",
+  minPaymentAmount: 0,
+  maxDeductionRatio: 0,
+  equivalentPoints: 0,
+  enablePointsMall: 1,
+  browseMode: "list",
+});
 onMounted(() => {
-  getList()
-})
+  getList();
+});
 async function getList() {
-  const res = await API.getBasicSetting({})
-  for (const key in Elform) {
-    Elform[key] = res[key]
-  }
+  const res = await API.getBasicSetting({});
+  Object.assign(Elform, res);
 }
 async function onSubmit() {
-  const res = await API.BasicSettingadd(Elform)
+  const res = await API.BasicSettingadd(Elform);
   if (res.code == 200) {
     ElMessage({
-      message: '成功',
-      type: 'success',
-    })
+      message: "成功",
+      type: "success",
+    });
   }
 }
 </script>
@@ -144,7 +150,7 @@ async function onSubmit() {
     flex: 1;
     padding: 10px;
     border: 1px solid #ddd;
-    $color: #3F9EFF;
+    $color: #3f9eff;
 
     &:hover {
       cursor: pointer;
@@ -159,7 +165,7 @@ async function onSubmit() {
     }
 
     .line {
-      background-color: #D9D9D9;
+      background-color: #d9d9d9;
     }
 
     &.style1 {
diff --git a/src/views/order/index/components/detail.vue b/src/views/order/index/components/detail.vue
index 0cad223..9059c43 100644
--- a/src/views/order/index/components/detail.vue
+++ b/src/views/order/index/components/detail.vue
@@ -1,19 +1,22 @@
 <template>
-  <div>
-    <el-drawer title="订单详情" size="60%" v-model="drawer" direction="rtl" v-loading="loading">
+  <div v-loading="loading">
+    <el-drawer title="订单详情" size="60%" v-model="drawer" direction="rtl" @close="reset">
       <div class="header">
         <div class="title" style="text-align: center">【收银订单】</div>
-        <div class="container">
+        <div class="container" v-if="user">
           <div class="info_content">
             <div class="item">
               <div class="label">会员信息</div>
               <div class="row">
-                <div>会员昵称：-</div>
-                <div>联系电话：-</div>
+                <div>会员昵称：-{{ user.nickName || "" }}</div>
+                <div>联系电话：-{{ user.phone || "" }}</div>
               </div>
             </div>
           </div>
         </div>
+        <div v-else>
+          <h3>服务员下单</h3>
+        </div>
         <div class="table">
           <div class="item">
             <div class="t">订单状态</div>
@@ -73,7 +76,7 @@
             <div class="row">
               <div>打包费：{{ detail.packFee || "-" }}</div>
               <div>订单原价：￥{{ detail.originAmount }}</div>
-              <div>优惠金额：￥{{ youHuiJinE }}</div>
+              <div>优惠金额：￥{{ detail.discountAmount }}</div>
               <div>
                 实收金额：
                 <span style="color: red">￥{{ detail.payAmount }}</span>
@@ -98,7 +101,13 @@
           <div style="margin-bottom: 16px; font-size: 16px">商品信息</div>
           <template v-for="(item, index) in detail.detailMap" :key="index">
             <h4>第{{ index }}次下单</h4>
-            <el-table :data="item">
+            <el-table
+              :data="item"
+              :ref="'refTable' + index"
+              @selection-change="selectionChange"
+              @row-click="rowClick($event, index)"
+            >
+              <el-table-column type="selection" width="55" />
               <el-table-column label="商品">
                 <template v-slot="scope">
                   <div class="shop_info">
@@ -125,18 +134,21 @@
                 <template v-slot="scope">x{{ scope.row.num }}</template>
               </el-table-column>
               <el-table-column label="单价">
-                <template v-slot="scope">￥{{ scope.row.price }}</template>
+                <template v-slot="scope">￥{{ scope.row.unitPrice }}</template>
               </el-table-column>
               <el-table-column label="小计">
                 <template v-slot="scope">￥{{ scope.row.payAmount }}</template>
               </el-table-column>
+              <el-table-column label="实付">
+                <template v-slot="scope">￥{{ scope.row.payAmount }}</template>
+              </el-table-column>
               <el-table-column label="操作">
                 <template v-slot="scope">
                   <template v-if="detail.status != 'unpaid'">
                     <el-button
                       v-if="canTuikuan(scope.row)"
                       link
-                      size="mini"
+                      size="small"
                       @click="tuikuan(scope.row)"
                     >
                       <span>退款</span>
@@ -147,7 +159,7 @@
                     <el-button
                       v-if="canTuicai(scope.row)"
                       type="text"
-                      size="mini"
+                      size="small"
                       @click="tuiCai(scope.row)"
                     >
                       <span>退菜</span>
@@ -158,6 +170,14 @@
               </el-table-column>
             </el-table>
           </template>
+          <div class="u-p-20 u-flex u-row-right">
+            <el-checkbox
+              v-model="allSelected"
+              @change="allSelectedChange"
+              label="全选"
+            ></el-checkbox>
+            <el-button type="danger" class="u-m-l-20" @click.stop="tuikuan('all')">退款</el-button>
+          </div>
         </div>
       </div>
     </el-drawer>
@@ -177,6 +197,7 @@ import { ElMessage } from "element-plus";
 import { returnOptionsLabel } from "../config/config";
 import * as $util from "../order_goods_util.js";
 import orderApi from "@/api/order/order";
+import shopUserApi from "@/api/account/shopUser";
 import orderEnum from "./orderEnum";
 import dayjs from "dayjs";
 export default {
@@ -185,6 +206,8 @@ export default {
   },
   data() {
     return {
+      allSelected: false,
+      user: "",
       orderEnum,
       drawer: false,
       type: "1",
@@ -230,6 +253,26 @@ export default {
     },
   },
   methods: {
+    rowClick(row, index) {
+      this.$refs["refTable" + index][0].toggleRowSelection(row);
+    },
+    selectionChange(e) {
+      console.log(e);
+    },
+    allSelectedChange(newval) {
+      for (let i in this.detail.detailMap) {
+        this.detail.detailMap[i].forEach((item) => {
+          if (newval) {
+            this.$refs["refTable" + i][0].toggleRowSelection(item, true);
+          } else {
+            this.$refs["refTable" + i][0].toggleRowSelection(item, false);
+          }
+        });
+      }
+    },
+    reset() {
+      this.user = "";
+    },
     returnPayType(payType) {
       if (!payType) {
         return "";
@@ -304,9 +347,19 @@ export default {
       this.update();
     },
     tuikuan(item) {
+      let arr = [];
+      if (item === "all") {
+        for (let i in this.detail.detailMap) {
+          arr.push(...this.$refs["refTable" + i][0].getSelectionRows());
+        }
+      } else {
+        arr = [item];
+      }
+      if (arr.length == 0) {
+        return ElMessage.error("请选择要退款的商品");
+      }
       this.selGoods = item;
-      console.log(item);
-      this.$refs.refReturnMoney.open({ ...item, priceAmount: item.canReturnAmount });
+      this.$refs.refReturnMoney.open(arr, this.detail);
     },
     tuiCai(item) {
       this.selGoods = item;
@@ -337,7 +390,13 @@ export default {
     async tbOrderInfoDetail(id) {
       try {
         this.loading = true;
-        const res = await orderApi.getHistoryList({ orderId: id });
+        const res = await orderApi.get({ orderId: id });
+        if (res.userId) {
+          shopUserApi.get({ userId: res.userId }).then((res1) => {
+            this.user = res1;
+          });
+        }
+
         this.detail = res;
         this.loading = false;
       } catch (error) {
diff --git a/src/views/order/index/components/return-money.vue b/src/views/order/index/components/return-money.vue
index 70ba32a..1ad5982 100644
--- a/src/views/order/index/components/return-money.vue
+++ b/src/views/order/index/components/return-money.vue
@@ -1,35 +1,59 @@
 <template>
-  <el-dialog title="退款" width="410px" v-model="show" @close="reset" :modal="modal">
-    <div class="u-flex font-bold color-333">
-      {{ goods.productName }}
+  <el-dialog title="修改退款金额" width="410px" v-model="show" @close="reset" :modal="modal">
+    <div class="u-flex u-col-top">
+      <span class="u-m-0">退款商品</span>
+      <div class="u-p-l-20 goods-list">
+        <div
+          class="u-flex u-font-12 goods-list-item"
+          v-for="(goods, index) in goodsList"
+          :key="index"
+        >
+          <span class="">
+            {{ goods.productName }}
+          </span>
+          <span class="color-999 u-m-l-10">x{{ goods.num || "" }}</span>
+          <span class="color-333 u-m-l-10 u-font-600">
+            {{ goods.payAmount || "" }}
+          </span>
+        </div>
+      </div>
     </div>
-    <div class="u-flex color-999 u-m-t-4">
-      {{ goods.productSkuName || "" }}
+    <div class="u-flex u-col-top u-m-t-22">
+      <h4span class="u-m-0">支付金额</h4span>
+      <div class="u-p-l-20">
+        {{ detail.payAmount }}
+      </div>
+    </div>
+    <div class="u-flex u-col-top u-m-t-22">
+      <span class="u-m-0">优惠金额</span>
+      <div class="u-p-l-20">
+        {{ detail.discountAmount }}
+      </div>
+    </div>
+    <div class="u-p-b-16 u-m-t-22">
+      <div class="flex u-row-between">
+        <span>线下收款</span>
+        <div class="u-flex u-flex-1 u-p-l-20">
+          <el-input type="number" v-model="number" :min="min" :max="max">
+            <template #append>可退1元</template>
+          </el-input>
+        </div>
+      </div>
+      <div class="u-flex u-col-top u-m-t-22">
+        <span class="u-m-0">退款金额</span>
+        <div class="u-p-l-20">
+          <span class="color-red">￥ {{ detail.discountAmount }}</span>
+          <span class="color-666 u-m-l-4">(退款商品金额：260.16)</span>
+        </div>
+      </div>
+      <div class="u-flex u-col-top u-m-t-22">
+        <span class="u-m-0">退回优惠券</span>
+        <div class="u-p-l-20">
+          <span class="color-666 u-m-l-4">该订单未使用优惠券</span>
+        </div>
+      </div>
     </div>
 
-    <div class="u-p-b-16 border-bottom">
-      <div class="flex u-row-between">
-        <span>退款数量</span>
-        <div class="u-flex">
-          <el-input-number v-model="number" :min="min" :max="max"></el-input-number>
-        </div>
-      </div>
-      <div class="u-font-12 color-999 u-m-t-8" v-if="isSeatFee">
-        <div>
-          <span class="color-red">*</span>
-          <span>客座费只能全退</span>
-        </div>
-      </div>
-    </div>
-    <div class="u-m-t-12 u-font-12 color-999">菜品已点数量 {{ max }} 份</div>
-    <div class="u-flex u-m-t-12">
-      <span>支付金额</span>
-      <span class="">￥{{ goods.payAmount }}</span>
-    </div>
-    <div class="u-flex u-m-t-12">
-      <span>退款金额</span>
-      <span class="color-red font-bold">￥{{ tuikuanJine }}</span>
-    </div>
     <div class="u-p-b-16 border-bottom">
       <div class="flex">
         <span class="u-m-r-12">是否现金</span>
@@ -55,12 +79,12 @@
       </div>
     </div>
     <div class="u-m-t-20">
-      <el-input v-model="note" size="medium" placeholder="请输入自定义备注"></el-input>
+      <el-input v-model="note" placeholder="请输入自定义备注"></el-input>
     </div>
     <template #footer>
       <div>
-        <el-button size="medium" @click="close">取消</el-button>
-        <el-button size="medium" type="primary" @click="confirm">确定</el-button>
+        <el-button @click="close">取消</el-button>
+        <el-button type="primary" @click="confirm">确定</el-button>
       </div>
     </template>
   </el-dialog>
@@ -81,6 +105,8 @@ export default {
   },
   data() {
     return {
+      detail: "",
+      goodsList: [],
       cash: false,
       isFloat: false,
       min: 0,
@@ -128,23 +154,10 @@ export default {
       }
       this.note = tag + "," + this.note;
     },
-    open(item) {
-      this.goods = item ? item : this.goods;
-      console.log(item);
-      if (item && item.isWeight) {
-        //称重商品
-        this.isFloat = true;
-        this.number = item.num;
-      }
-      if (item && !item.isWeight) {
-        if (item.productId != "-999") {
-          this.number = 1;
-        } else {
-          this.number = item.num;
-        }
-      }
-
+    open(goods, detailInfo) {
+      this.goodsList = goods;
       this.show = true;
+      this.detail = detailInfo;
     },
     close() {
       this.show = false;
@@ -209,4 +222,14 @@ export default {
   -webkit-appearance: none;
   margin: 0;
 }
+.goods-list-item {
+  height: 24px;
+  line-height: 24px;
+  background: #f0f2f5;
+  border-radius: 3px;
+  padding: 0 10px;
+}
+.goods-list-item:not(:first-child) {
+  margin-top: 6px;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/tool/Instead/components/diner-number.vue b/src/views/tool/Instead/components/diner-number.vue
index d618d60..19ee9a1 100644
--- a/src/views/tool/Instead/components/diner-number.vue
+++ b/src/views/tool/Instead/components/diner-number.vue
@@ -13,7 +13,7 @@
             <div>清空</div>
           </template>
           <template #input>
-            <div class="u-p-l-20 u-p-r-20 u-flex w-full">
+            <div class="u-flex w-full">
               <el-input
                 placeholder="请输入就餐人数"
                 v-model="number"
@@ -27,8 +27,8 @@
           </template>
         </key-board>
         <div class="confirm_btns">
-          <el-button @click="close">取消</el-button>
-          <el-button type="primary" @click="confirm">确定</el-button>
+          <el-button size="large" @click="close">取消</el-button>
+          <el-button size="large" type="primary" @click="confirm">确定</el-button>
         </div>
       </div>
     </el-dialog>
diff --git a/src/views/tool/Instead/components/order.vue b/src/views/tool/Instead/components/order.vue
index 0bc2a45..efd5b5e 100644
--- a/src/views/tool/Instead/components/order.vue
+++ b/src/views/tool/Instead/components/order.vue
@@ -7,7 +7,7 @@
           <div class="u-m-l-12">
             <p>
               <span class="name u-font-16">{{ user.nickName }}</span>
-              <span class="vip" v-if="user.isVip">>VIP{{ user.isVip }}</span>
+              <span class="vip" v-if="user.isVip">VIP{{ user.isVip }}</span>
             </p>
             <p class="u-font-14 color-666 u-m-t-10">
               <span class="money">余额：{{ user.amount }}</span>
diff --git a/src/views/tool/Instead/index.vue b/src/views/tool/Instead/index.vue
index 19b834d..2182c68 100644
--- a/src/views/tool/Instead/index.vue
+++ b/src/views/tool/Instead/index.vue
@@ -97,7 +97,9 @@
               <span>就餐人数：{{ perpole || "-" }} 位</span>
               <el-icon><ArrowRight /></el-icon>
             </div>
-            <a @click="clearCarts" style="color: #1890ff">清空</a>
+            <el-button link type="primary" :disabled="carts.isEmpty" @click="clearCarts">
+              清空
+            </el-button>
           </div>
           <!-- 购物车 -->
           <cartsList
@@ -324,7 +326,11 @@ async function createOrder(key) {
         refresh();
         return;
       }
-
+      if (res.userId) {
+        const userRes = await shopUserApi.get({ userId: res.userId });
+        user.value = userRes;
+        carts.changeUser(userRes);
+      }
       if (res.id) {
         // 获取历史订单数据
         const res1 = await orderApi.getHistoryList({
@@ -391,8 +397,9 @@ function getTableList() {
     tableList.value = res.records.filter((v) => v.tableCode);
   });
 }
-function getTableDetail(table_code) {
-  tableApi.get(table_code);
+async function getTableDetail(params) {
+  const res = await tableApi.get(params);
+  return res;
 }
 function tablesearchInput() {}
 //返回桌台状态颜色
@@ -407,7 +414,7 @@ function returnTableLabel(key) {
 }
 function tableClick(item) {
   console.log(item);
-  getTableDetail(item.tableCode);
+  getTableDetail({ tableCode: item.tableCode });
 
   table.value = item;
   carts.changeTable(item.tableCode);