From ba3291922055cd148cff605260a46d3e98a69dd7 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Thu, 18 Jan 2024 17:03:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E9=85=92=E5=8D=A1?=
 =?UTF-8?q?=E9=A2=9D=E5=BA=A6=E5=8F=98=E6=9B=B4=E8=AE=B0=E5=BD=95=20-=20?=
 =?UTF-8?q?=E5=86=BB=E7=BB=93=E5=92=8C=E5=89=A9=E4=BD=99=E9=A2=9D=E5=BA=A6?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=88=A0=E9=99=A4=EF=BC=8C=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=AC=E8=B5=A0=E6=8C=89=E9=92=AE=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=EF=BC=9A=E4=BC=9A=E5=91=98=E4=B8=AD=E5=BF=83=E5=BC=80=E9=80=9A?=
 =?UTF-8?q?=E4=BC=9A=E5=91=98=E5=8D=A1=E5=85=A5=E5=8F=A3=E9=9A=90=E8=97=8F?=
 =?UTF-8?q?=20=E6=96=87=E5=AD=97=E4=BF=AE=E6=94=B9=EF=BC=9A=E6=B6=88?=
 =?UTF-8?q?=E8=B4=B9=E4=B9=B0=E5=8D=95=E8=B5=A0=E9=80=81=E7=9A=84=E7=A7=AF?=
 =?UTF-8?q?=E5=88=86=E5=90=8D=E7=A7=B0=E6=94=B9=E4=B8=BA=E9=85=92=E6=B0=B4?=
 =?UTF-8?q?=E5=8D=A1=E7=A7=AF=E5=88=86=20=E4=BC=98=E5=8C=96=EF=BC=9A?=
 =?UTF-8?q?=E9=85=92=E9=81=93=E9=A6=86-=E5=85=91=E6=8D=A2=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E6=98=BE=E7=A4=BA=E6=89=A3=E9=99=A4=E7=9A=84=E9=85=92?=
 =?UTF-8?q?=E5=8D=A1=E9=A2=9D=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/exchange.js                               |   4 +
 pages.json                                    |   6 +
 pages/users/online_payment/exchange/index.vue |  10 +-
 .../users/online_payment/exchange/record.vue  |   3 +-
 pages/users/online_payment/record/quota.vue   |  54 +-
 .../online_payment/record/quota_transfer.vue  | 575 ++++++++++++++++++
 pages/users/online_payment/site/index.vue     |   3 +-
 7 files changed, 643 insertions(+), 12 deletions(-)
 create mode 100644 pages/users/online_payment/record/quota_transfer.vue

diff --git a/api/exchange.js b/api/exchange.js
index 699fc68..610c22e 100644
--- a/api/exchange.js
+++ b/api/exchange.js
@@ -56,3 +56,7 @@ export function recordQuotaList(data) {
 export function recordIntegralList(data) {
 	return request.get(`exchange/record_integral_list`,data);
 }
+// 额度转赠 - 提交
+export function quotaTransfer(data) {
+	return request.get(`exchange/quota_transfer`,data);
+}
diff --git a/pages.json b/pages.json
index 3789f90..b176daa 100644
--- a/pages.json
+++ b/pages.json
@@ -564,6 +564,12 @@
 						"navigationBarTitleText": "酒卡变更记录"
 					}
 				},
+				{
+					"path": "online_payment/record/quota_transfer",
+					"style": {
+						"navigationBarTitleText": "酒卡转赠"
+					}
+				},
 				{
 					"path": "online_payment/record/integral",
 					"style": {
diff --git a/pages/users/online_payment/exchange/index.vue b/pages/users/online_payment/exchange/index.vue
index be0b42e..7d2df93 100644
--- a/pages/users/online_payment/exchange/index.vue
+++ b/pages/users/online_payment/exchange/index.vue
@@ -43,11 +43,11 @@
             <view class="info-value">{{ pointUserInfo.available }}</view>
           </view>
           <view class="info-box">
-            <view class="info-title">剩余积分</view>
+            <view class="info-title">剩余酒水卡积分</view>
             <view class="info-value">{{ pointUserInfo.available_integral }}</view>
           </view>
           <view class="info-box" v-if="pay_info.use_integral > 0">
-            <view class="info-title">使用积分</view>
+            <view class="info-title">使用酒水卡积分</view>
             <view class="info-value">{{ pay_info.use_integral }}</view>
           </view>
           <view class="info-box" v-if="pay_info.diff_money > 0">
@@ -300,14 +300,14 @@ export default {
           return false;
         }
         // 计算使用的相关信息
-        // console.log('可用积分',Number(this.pointUserInfo.available_integral))
+        // console.log('可用酒水卡积分',Number(this.pointUserInfo.available_integral))
         if(Number(totalMoney) > Number(this.pointUserInfo.available_integral)){
-          // 积分不足
+          // 酒水卡积分不足
           this.pay_info.use_integral = Number(this.pointUserInfo.available_integral);
           this.pay_info.diff_money = (Number(totalMoney) - Number(this.pay_info.use_integral)).toFixed(2);
           this.pay_info.diff_money_pay = (Number(this.pay_info.diff_money) * Number(this.pointUserInfo.diff_rate) / 100).toFixed(2);
         }else{
-          // 积分充足
+          // 酒水卡积分充足
           this.pay_info.use_integral = Number(totalMoney);
           this.pay_info.diff_money_pay = this.pay_info.diff_money = 0;
         }
diff --git a/pages/users/online_payment/exchange/record.vue b/pages/users/online_payment/exchange/record.vue
index 896bde8..292b1d5 100644
--- a/pages/users/online_payment/exchange/record.vue
+++ b/pages/users/online_payment/exchange/record.vue
@@ -12,7 +12,8 @@
          </view>
          <view class="other-info">
            <view class="other-info-line">操作员：{{ item.staff_nickname || item.staff_uid }}</view>
-           <view class="other-info-line">使用积分：{{ item.use_integral }}</view>
+           <view class="other-info-line">扣除酒卡额度：{{ (item.total_money - item.diff_money_pay).toFixed(2) }}</view>
+           <view class="other-info-line">使用酒水卡积分：{{ item.use_integral }}</view>
            <view class="other-info-line" v-if="item.diff_money > 0">差价：{{ item.diff_money }}</view>
            <view class="other-info-line" v-if="item.diff_money_pay > 0">差价实付金额：{{ item.diff_money_pay }}</view>
          </view>
diff --git a/pages/users/online_payment/record/quota.vue b/pages/users/online_payment/record/quota.vue
index e35c0fb..1c5abac 100644
--- a/pages/users/online_payment/record/quota.vue
+++ b/pages/users/online_payment/record/quota.vue
@@ -9,13 +9,17 @@
         </view>
       </view>
     </view>
+    <!--转赠按钮-->
+    <view class="transfer-quota" @click="goMenuPage('/pages/users/online_payment/record/quota_transfer')">
+      <view class="transfer-text">转赠</view>
+    </view>
     <!--列表记录-->
     <view class="integral-list" v-if="Object.keys(list).length > 0">
       <view class="integral-content">
         <view class="block" v-for="(item,index) in list" :key="index">
           <view class="left-content">
             <view class="left-top">
-              {{ item.remark }}
+              <view class="left-remark">{{ item.remark }}</view>
               <view class="left-tag left-tag-released" v-if="item.change_type == 1">增加</view>
               <view class="left-tag left-tag-frozen" v-else>减少</view>
             </view>
@@ -81,6 +85,16 @@ export default{
         _this.allow_page = true;
       })
     },
+    // 页面跳转
+    goMenuPage(url) {
+      if (this.isLogin) {
+        uni.navigateTo({
+          url
+        })
+      } else {
+        this.openAuto()
+      }
+    },
   },
   // 触底监听
   onReachBottom() {
@@ -137,6 +151,27 @@ export default{
       }
     }
   }
+  // 转赠按钮
+  .transfer-quota{
+    text-align: center;
+    width: 100%;
+    height: 100rpx;
+    display: inline-flex;
+    flex-direction: row;
+    flex-wrap: nowrap;
+    align-items: center;
+    justify-content: center;
+    .transfer-text{
+      font-size: 35rpx !important;
+      color: #fff;
+      background-color: #e6a23c;
+      border-color: #e6a23c;
+      height: 60rpx;
+      width: 200rpx;
+      line-height: 60rpx;
+      border-radius: 80rpx;
+    }
+  }
   // 信息列表
   .integral-list{
     .integral-content{
@@ -158,20 +193,29 @@ export default{
           width: calc(100% - 200rpx);
 
           .left-top {
+            width: 100%;
             display: inline-flex;
             flex-direction: row;
             flex-wrap: nowrap;
             justify-content: flex-start;
             align-items: center;
-            font-size: 34rpx;
-            font-weight: bold;
-            color: #222427;
+            .left-remark{
+              font-size: 34rpx;
+              font-weight: bold;
+              color: #222427;
+              white-space: nowrap;
+              overflow: hidden;
+              text-overflow: ellipsis;
+              max-width: calc(100% - 90rpx);
+            }
             .left-tag {
               font-size: 24rpx;
               font-weight: unset;
               margin-left: 20rpx;
-              padding: 5rpx 15rpx;
+              padding: 5rpx 0;
               border-radius: 5rpx;
+              text-align: center;
+              width: 80rpx;
             }
             .left-tag-frozen{
               background: #fceaea;
diff --git a/pages/users/online_payment/record/quota_transfer.vue b/pages/users/online_payment/record/quota_transfer.vue
new file mode 100644
index 0000000..d2cc7e5
--- /dev/null
+++ b/pages/users/online_payment/record/quota_transfer.vue
@@ -0,0 +1,575 @@
+<template>
+  <view :style="viewColor">
+    <!--具体内容-->
+    <view class='content-box'>
+      <!-- 顶部内容 -->
+      <view class="top">
+        <view class="left">
+          <view class="name">接收用户：{{ (consume_info.nickname || consume_info.real_name || consume_info.uid) || '请选择接收用户' }}</view>
+          <view class="change-btn" @click="showConsumePopup" v-if="consume_search.default_consume_id <= 0">
+            {{ consume_info.uid > 0 ? '切换' : '选择' }}
+          </view>
+        </view>
+      </view>
+      <!-- 金额 -->
+      <view class="money">
+        <view class="top-bg-line"></view>
+        <view class="money-box">
+          <view class="title">转赠额度</view>
+          <view class="input-box">
+            <view class="unit">¥</view>
+            <input class="money-input" v-model.number="pay_info.transfer_num"  type='number' step="0.01" placeholder="0.00" />
+          </view>
+          <view class="info-box">
+            <view class="info-title">剩余可用额度</view>
+            <view class="info-value">{{ pointUserInfo.available }}</view>
+          </view>
+          <view class="info-box">
+            <view class="info-title">实际到账数量</view>
+            <view class="info-value">{{ pay_info.receipt_num }}</view>
+          </view>
+          <view class="info-box" v-if="pay_info.service_charge > 0">
+            <view class="info-title">手续费</view>
+            <view class="info-value">{{ pay_info.service_charge }}</view>
+          </view>
+        </view>
+      </view>
+      <!--提交按钮-->
+      <view class="pay-btn" v-if="pay_info.transfer_num > 0 && consume_info.uid > 0" @click="confirmPayment">确认赠送</view>
+      <view class="pay-btn not-btn" v-else>确认赠送</view>
+    </view>
+    <!--授权登录-->
+    <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
+    <!--接收用户选择-->
+    <uni-popup ref="selectedConsume" type="center">
+      <view class="point-content">
+        <view class="search-content">
+          <input class="money-input" v-model="consume_search.search_text" type='text' placeholder="UID/用户昵称/真实姓名/电话" />
+          <view class="search-btn" @click="getConsumeList">搜索</view>
+          <view class="close-btn" @click="consumeClosePopup">取消</view>
+        </view>
+        <view class="point-list">
+          <view class="point-box" v-for="(item,index) in consume_list" :key="index">
+            <view class="left">
+              <image class="image" :src="item.avatar || '/static/images/f.png'"></image>
+              <view class="point-info">
+                <view class="point-name">{{ item.nickname || item.real_name }}</view>
+                <view class="point-address">UID：{{ item.uid }}</view>
+              </view>
+            </view>
+            <view class="selected-btn" @click="selectedConsume(item)">选中</view>
+          </view>
+        </view>
+      </view>
+    </uni-popup>
+
+
+  </view>
+</template>
+
+<script>
+
+import { pointUserInfo,consumeList,quotaTransfer } from '@/api/exchange.js';
+import {mapGetters} from "vuex";
+import authorize from '@/components/Authorize';
+import emptyPage from '@/components/emptyPage.vue';
+
+const app = getApp();
+export default {
+  components: {
+    authorize,
+    emptyPage,
+  },
+  data() {
+    return {
+      // 登录相关
+      isAuto: false, //没有授权的不会自动授权
+      isShowAuth: false,//是否隐藏授权
+      pointUserInfo: {},
+      // 消费用户
+      consume_info: {},
+      consume_list: {},
+      consume_search: {
+        search_text: '',
+        default_consume_id: 0,
+      },
+      // 提交信息
+      pay_info: {
+        // 兑换信息
+        transfer_num: 0.00,// 转账数量
+        receipt_num: 0.00,// 实际到账
+        service_charge: 0.00,// 手续费
+      },
+    };
+  },
+  computed: {
+    ...mapGetters(['isLogin', 'uid', 'userInfo', 'viewColor'])
+  },
+  onLoad(options) {
+    // 判断：是否登录
+    if (!this.isLogin) {
+      // 未登录  授权登录
+      this.isAuto = true;
+      this.isShowAuth = true
+    }else{
+      // 已登录  获取信息
+      this.init();
+    }
+  },
+  onReachBottom: function () {},
+  watch: {
+    'pay_info.transfer_num': {
+      handler(val) {
+        let totalMoney = this.pay_info.transfer_num.toFixed(2);
+        // 判断转赠额度是否超出 超出则转赠额度=最大额度
+        if(Number(totalMoney) > Number(this.pointUserInfo.available)){
+          this.$util.Tips({
+            title: '转赠总额度不能超过剩余酒卡额度'
+          });
+          this.pay_info.transfer_num = Number(this.pointUserInfo.available);
+        }
+        // 计算手续费
+        let transferRate = Number(this.pointUserInfo.transfer_rate);
+        if(Number(transferRate) > 0){
+          this.pay_info.service_charge = ((Number(this.pay_info.transfer_num) * Number(transferRate)) / 100).toFixed(2)
+        }
+        // 实际到账
+        this.pay_info.receipt_num = (Number(this.pay_info.transfer_num) - Number(this.pay_info.service_charge)).toFixed(2)
+      },
+      deep: false
+    }
+  },
+  methods: {
+    // 授权回调
+    onLoadFun() {
+      if(this.isLogin){
+        this.isShowAuth = false;
+        this.init();
+      }
+    },
+    // 授权关闭
+    authColse(e) {
+      this.isShowAuth = e
+    },
+    // 授权成功 获取用户信息
+    init () {
+      let _this = this;
+      // 获取用户信息
+      this.getUserInfo();
+      this.showConsumePopup();
+    },
+    // 获取用户持有信息
+    getUserInfo(){
+      let _this = this;
+      pointUserInfo()
+          .then(res => {
+            _this.pointUserInfo = res.data || {};
+          })
+          .catch(err => {
+            this.$util.Tips({
+              title: err
+            });
+          });
+    },
+    // 兑换用户选择 - 显示弹框
+    showConsumePopup(){
+      if(Object.keys(this.consume_list).length <= 0) this.getConsumeList();
+      // 不存在默认选中  显示弹框
+      this.$refs.selectedConsume.open('center');
+    },
+    // 兑换用户选择 - 隐藏弹框
+    consumeClosePopup(){
+      this.$refs.selectedConsume.close();
+    },
+    // 兑换用户选择 - 获取列表
+    getConsumeList(){
+      let _this = this;
+      consumeList(this.consume_search)
+          .then(res => {
+            _this.consume_list = res.data || {};
+            // 判断：是否只有一个替换点-是则选中
+            if(Object.values(_this.consume_list).length == 1){
+              _this.selectedConsume(_this.consume_list[0]);
+            }
+            // 判断：是否存在默认选中提货点
+            else if(_this.consume_search.default_consume_id > 0){
+              _this.selectedConsume(_this.consume_list[0]);
+            }
+          })
+          .catch(err => {
+            this.$util.Tips({
+              title: err
+            });
+          });
+    },
+    // 兑换用户选择 - 选中
+    selectedConsume(item){
+      this.consume_info = item;
+      this.consumeClosePopup();
+    },
+    // 确认付款
+    confirmPayment(){
+      let _this = this;
+      let payInfo = Object.assign({},_this.pay_info);
+      payInfo.transfer_uid = _this.consume_info.uid;
+      quotaTransfer(payInfo).then(res => {
+        uni.hideLoading();
+        this.$util.Tips({
+          title: '操作成功！',
+          icon: 'success'
+        },{tab:3});
+      }).catch(err => {
+        uni.hideLoading();
+        this.$util.Tips({
+          title: err
+        });
+      });
+    },
+    // 跳转
+    goMenuPage(url) {
+      console.log(url)
+      if (this.isLogin) {
+        uni.navigateTo({
+          url
+        })
+      } else {
+        this.openAuto()
+      }
+    },
+
+  },
+}
+</script>
+
+<style scoped lang="scss">
+.content-box{
+  width: 100vw;
+  min-height: 100vh;
+  background-color: orange;
+  padding: 20rpx;
+  background: linear-gradient(to bottom, #1b79ff, #f6f6f6) no-repeat;
+  background-size: 100% 300rpx;
+  background-color: #f6f6f6;
+
+  // 公共内容
+  .box-title{
+    margin: 30rpx 0;
+    height: 50rpx;
+    line-height: 50rpx;
+    font-size: 28rpx;
+    padding-left: 20rpx;
+    font-weight: bold;
+    position: relative;
+  }
+  .box-title:after{
+    content: "";
+    position: absolute;
+    left: 0;
+    top: calc((50rpx - 30rpx) / 2);
+    width: 10rpx;
+    height: 30rpx;
+    background: #1777ff;
+  }
+  // 顶部内容
+  .top{
+    width: 100%;
+    height: 90rpx;
+    display: inline-flex;
+    flex-direction: row;
+    flex-wrap: nowrap;
+    justify-content: space-between;
+    align-items: center;
+
+    .left{
+      width: calc(100% - 150rpx);
+      display: inline-flex;
+      flex-direction: row;
+      flex-wrap: nowrap;
+      justify-content: flex-start;
+      align-items: center;
+      .image{
+        width: 70rpx;
+        height: 70rpx;
+        border-radius: 50%;
+        margin-right: 15rpx;
+      }
+      .name{
+        max-width: calc(100% - (70rpx + 15rpx + 80rpx + 15rpx));
+        font-size: 30rpx;
+        font-weight: bold;
+        color: #FFFFFF;
+      }
+      .change-btn{
+        width: 80rpx;
+        height: 40rpx;
+        text-align: center;
+        font-size: 24rpx;
+        border-radius: 40rpx;
+        display: inline-flex;
+        flex-direction: row;
+        flex-wrap: nowrap;
+        justify-content: center;
+        align-items: center;
+        background-color: #409eff;
+        color: #fff;
+        margin-left: 15rpx;
+      }
+    }
+    .right{
+      width: 140rpx;
+      height: 46rpx;
+      line-height: 44rpx;
+      border-radius: 45rpx;
+      text-align: center;
+      font-size: 26rpx;
+      border: 2rpx solid #ffffff;
+      color: #FFFFFF;
+    }
+  }
+  // 买单金额
+  .money{
+    position: relative;
+    padding: 15rpx;
+    .top-bg-line{
+      width: 100%;
+      background-color: #1256ad;
+      height: 20rpx;
+      border-radius: 50rpx;
+      position: absolute;
+      left: 0;
+      top: 0;
+    }
+    .money-box{
+      background: #FFFFFF;
+      position: relative;
+      width: 100%;
+      top: -5rpx;
+      border-radius: 15rpx;
+      padding: 20rpx;
+      box-shadow: 0px 3px 5px 0px #ececec;
+      .title{
+        height: 60rpx;
+        line-height: 60rpx;
+        font-size: 26rpx;
+        font-weight: bold;
+      }
+      .input-box{
+        height: 70rpx;
+        display: inline-flex;
+        flex-direction: row;
+        flex-wrap: nowrap;
+        justify-content: flex-start;
+        align-items: flex-end;
+        font-size: 50rpx;
+        font-weight: bold;
+        margin: 20rpx 0 30rpx 0;
+        .unit{
+          margin-right: 15rpx;
+        }
+        .money-input{
+          height: 70rpx;
+        }
+      }
+      .info-box{
+        width: 100%;
+        height: 60rpx;
+        display: inline-flex;
+        flex-direction: row;
+        flex-wrap: nowrap;
+        justify-content: space-between;
+        align-items: center;
+        .info-title{
+          font-size: 30rpx;
+          font-weight: bold;
+        }
+        .info-value{
+          font-size: 30rpx;
+        }
+      }
+    }
+  }
+  // 支付方式
+  .pay-type{
+
+    .box-content{
+      .pay-label:not(:last-child){
+        margin-bottom: 20rpx;
+      }
+      .pay-item{
+        height: 120rpx;
+        padding: 20rpx;
+        width: 100%;
+        border: 2rpx solid #d9dce4;
+        border-radius: 15rpx;
+        display: inline-flex;
+        flex-direction: row;
+        flex-wrap: nowrap;
+        align-items: center;
+        justify-content: space-around;
+        .left{
+          width: calc(100% - 80rpx);
+          display: inline-flex;
+          flex-direction: row;
+          flex-wrap: nowrap;
+          align-items: center;
+          justify-content: flex-start;
+          .animated{
+            width: 44rpx;
+            height: 44rpx;
+            border-radius: 50%;
+            text-align: center;
+            line-height: 44rpx;
+            background-color: #fe960f;
+            color: #fff;
+            font-size: 30rpx;
+            margin-right: 15rpx;
+          }
+          .icon-weixin2 {
+            background-color: #41b035;
+          }
+          .icon-icon34 {
+            background-color: #4295D5;
+          }
+          .pay-item-info{
+            .pay-name{
+              text-align: left;
+              border-right: 1px solid #eee;
+              justify-content: left;
+            }
+            .tip{
+              text-align: left;
+              font-size: 26rpx;
+              color: #aaa;
+            }
+          }
+        }
+        .right{
+          width: 80rpx;
+          display: inline-flex;
+          flex-direction: row;
+          flex-wrap: nowrap;
+          align-items: center;
+          justify-content: flex-end;
+        }
+      }
+    }
+  }
+  // 确认支付
+  .pay-btn{
+    width: calc(100% - (20rpx * 2));
+    background: #1777ff;
+    color: #FFFFFF;
+    border-radius: 15rpx;
+    font-size: 30rpx;
+    text-align: center;
+    height: 70rpx;
+    line-height: 70rpx;
+    position: absolute;
+    left: 20rpx;
+    bottom: 150rpx;
+  }
+  .not-btn{
+    background-color: #909399;
+    color: #fff;
+  }
+}
+.point-content{
+  background: #FFFFFF;
+  width: 90vw!important;
+  height: 90vh!important;
+  padding: 15rpx;
+  border-radius: 20rpx;
+
+  .search-content{
+    width: 100%;
+    height: 60rpx;
+    line-height: 60rpx;
+    display: inline-flex;
+    flex-direction: row;
+    flex-wrap: nowrap;
+    align-items: center;
+    justify-content: flex-start;
+    .money-input{
+      width: calc(100% - (100rpx * 2)) !important;
+      height: 60rpx;
+      line-height: 60rpx;
+    }
+    .search-btn{
+      width: 100rpx;
+      text-align: center;
+      font-size: 28rpx;
+      background-color: #409eff;
+      color: #fff;
+    }
+    .close-btn{
+      width: 100rpx;
+      text-align: center;
+      font-size: 28rpx;
+      background-color: #f56c6c;
+      color: #fff;
+    }
+  }
+  .point-list{
+    overflow: auto;
+    height: calc(100% - 60rpx);
+    .point-box{
+      display: inline-flex;
+      flex-direction: row;
+      flex-wrap: nowrap;
+      align-items: center;
+      justify-content: space-between;
+      padding: 20rpx 0;
+      width: 100%;
+      .left{
+        width: calc(100% - 110rpx);
+        display: inline-flex;
+        flex-direction: row;
+        flex-wrap: nowrap;
+        align-items: center;
+        justify-content: flex-start;
+        .image{
+          width: 70rpx;
+          height: 70rpx;
+          border-radius: 50%;
+          margin-right: 15rpx;
+        }
+        .point-info{
+          width: calc(100% - 90rpx);
+          .point-name{
+            height: 50rpx;
+            line-height: 50rpx;
+            font-size: 30rpx;
+            width: 100%;
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: ellipsis;
+          }
+          .point-address{
+            height: 40rpx;
+            line-height: 40rpx;
+            font-size: 26rpx;
+            color: #cccccc;
+            width: 100%;
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: ellipsis;
+          }
+        }
+      }
+      .selected-btn{
+        width: 100rpx;
+        height: 50rpx;
+        line-height: 50rpx;
+        text-align: center;
+        font-size: 28rpx;
+        background-color: #67c23a;
+        color: #fff;
+        border-radius: 50rpx;
+      }
+    }
+    .point-box:not(:last-child){
+      border: 2rpx solid #f6f6f6;
+    }
+  }
+}
+</style>
diff --git a/pages/users/online_payment/site/index.vue b/pages/users/online_payment/site/index.vue
index 308c873..276928d 100644
--- a/pages/users/online_payment/site/index.vue
+++ b/pages/users/online_payment/site/index.vue
@@ -30,7 +30,8 @@
           </view>
           <view class="other-info">
             <view class="other-info-line">消费用户：{{ item.nickname || item.uid }}</view>
-            <view class="other-info-line">使用积分：{{ item.use_integral }}</view>
+            <view class="other-info-line">扣除酒卡额度：{{ (item.total_money - item.diff_money_pay).toFixed(2) }}</view>
+            <view class="other-info-line">使用酒水卡积分：{{ item.use_integral }}</view>
             <view class="other-info-line" v-if="item.diff_money > 0">差价：{{ item.diff_money }}</view>
             <view class="other-info-line" v-if="item.diff_money_pay > 0">差价实付金额：{{ item.diff_money_pay }}</view>
           </view>