diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/credit.vue b/fuintCashierWeb/src/views/cashier/NewComponents/credit.vue
index 2027ca9c2..23a34518d 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/credit.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/credit.vue
@@ -1,4 +1,4 @@
-
+<!--挂账管理1new-->
 <template>
   <div class="app-center">
 <!--    查询-->
@@ -106,6 +106,7 @@
       </div>
       <div class="table-box">
         <el-table
+          border
           :data="creditUnitList"
           style="width: 100%">
           <el-table-column type="expand" >
@@ -1659,7 +1660,7 @@ import {getLodop} from "@/api/LodopFuncs";
   .top_new{
     display: flex;
     justify-content: space-between;
-
+    height: 64px;
     background: #fff;
     width: 98%;
     margin: 10px auto;
diff --git a/fuintCashierWeb/src/views/cashier/index.vue b/fuintCashierWeb/src/views/cashier/index.vue
index 6278249e3..44e6c336c 100644
--- a/fuintCashierWeb/src/views/cashier/index.vue
+++ b/fuintCashierWeb/src/views/cashier/index.vue
@@ -19,14 +19,14 @@
 <!--        <transition name="el-zoom-in-top">-->
         <el-collapse-transition>
 
-        <div v-if="isClick">
-            <div class="app-left-box"  @click="gocomponents(5,'/Integral')">
-              <div style="cursor: pointer;margin-left: 10px">积分商城</div>
-            </div>
-            <div class="app-left-box"  @click="gocomponents(5,'/IntegralOrder')">
-              <div style="cursor: pointer;margin-left: 10px">积分订单</div>
-            </div>
-          </div>
+<!--        <div v-if="isClick">-->
+<!--            <div class="app-left-box"  @click="gocomponents(5,'/Integral')">-->
+<!--              <div style="cursor: pointer;margin-left: 10px">积分商城</div>-->
+<!--            </div>-->
+<!--            <div class="app-left-box"  @click="gocomponents(5,'/IntegralOrder')">-->
+<!--              <div style="cursor: pointer;margin-left: 10px">积分订单</div>-->
+<!--            </div>-->
+<!--          </div>-->
         </el-collapse-transition>
       </div>
       <div class="app-left-box" @click="logout">
@@ -93,8 +93,9 @@ export default {
         {name:'会员',icon: 'el-icon-s-custom',path:'/Vip',index1:2},
         {name:'核销',icon: 'el-icon-s-check',path:'/WriteOff',index1:3},
         {name:'挂账管理',icon:'el-icon-s-claim',path:'/credit',index1:4},
-        {name:'积分',icon:'el-icon-s-data',path:'/Integral',index1:5},
+        {name:'积分商城',icon:'el-icon-s-data',path:'/Integral',index1:5},
         {name:'交班',icon: 'el-icon-s-flag',path:'/Handover',index1:6},
+
       ],
       tabarr2:[
         {name:'积分',icon:'el-icon-s-data',path:'/Integral'},
diff --git a/fuintCashierWeb/src/views/details/index.vue b/fuintCashierWeb/src/views/details/index.vue
index e39ade567..ad163c5b6 100644
--- a/fuintCashierWeb/src/views/details/index.vue
+++ b/fuintCashierWeb/src/views/details/index.vue
@@ -17,8 +17,8 @@
             <div class="s-size">生日 {{form.birthday || 'xxxxxxxxxxx'}}</div>
           </div>
         </div>
-        <el-button type="primary" plain round @click="subCard">子卡管理<i
-          class="el-icon-bank-card el-icon--right"></i></el-button>
+<!--        <el-button type="primary" plain round @click="subCard">子卡管理<i-->
+<!--          class="el-icon-bank-card el-icon&#45;&#45;right"></i></el-button>-->
       </div>
     </div>
     <div class="wit_boxs" :key="childComponentKey" >
@@ -78,271 +78,49 @@
               </div>
               <div style="width: 100%; display: flex; ">
                 <el-button type="primary" >会员注销</el-button>
-                <el-button type="primary" >会员充值</el-button>
+
+                <el-button type="primary" @click=" memberRecharge =! memberRecharge " >会员充值</el-button>
               </div>
             </div>
           </el-tab-pane>
-          <el-tab-pane label="油品订单" name="refuelOrder">
-            <oilOrder :key="childComponentKey" :pUserId="form.id"></oilOrder>
-          </el-tab-pane>
-          <el-tab-pane label="商品订单" name="shopOrder">
-            <goodsOrder :key="childComponentKey" :pUserId="form.id"></goodsOrder>
-          </el-tab-pane>
-          <el-tab-pane label="余额记录（电子储值卡/囤油卡消费、充值记录）" name="balanceRecord">
-            <balanceRecord :key="childComponentKey" :pUserId="form.id"></balanceRecord>
-          </el-tab-pane>
           <el-tab-pane label="积分记录" name="pointRecord">
             <pointsRecord :key="childComponentKey" :pUserId="form.id"></pointsRecord>
           </el-tab-pane>
-          <el-tab-pane label="卡券记录" name="cardList">
-            <couponList :key="childComponentKey" :pUserId="id"></couponList>
-          </el-tab-pane>
           <el-tab-pane label="成长值记录" name="growthValue">
             <growthValueRecord :key="childComponentKey" :pUserId="form.id"></growthValueRecord>
           </el-tab-pane>
-          <!-- <el-tab-pane label="加油金记录" name="refuelMoney"> -->
-          <!-- <refuelMoneyRecord :pUserId="form.id"></refuelMoneyRecord> -->
-          <!-- </el-tab-pane> -->
+          <el-tab-pane label="储值卡记录" name="chuzhika">
+            <storedCard :key="childComponentKey" :pUserId="form.id"></storedCard>
+          </el-tab-pane>
+          <el-tab-pane label="囤油卡记录" name="tuyouka">
+            <oilStorageCard :key="childComponentKey" :pUserId="form.id"></oilStorageCard>
+          </el-tab-pane>
+          <el-tab-pane label="油品消费记录" name="refuelOrder">
+            <oilOrder :key="childComponentKey" :pUserId="form.id"></oilOrder>
+          </el-tab-pane>
+          <el-tab-pane label="商品消费记录" name="shopOrder">
+            <goodsOrder :key="childComponentKey" :pUserId="form.id"></goodsOrder>
+          </el-tab-pane>
+          <el-tab-pane label="优惠券" name="cardList">
+            <couponList :key="childComponentKey" :pUserId="id"></couponList>
+          </el-tab-pane>
+
         </el-tabs>
 
     </div>
 
     <!--    会员充值-->
-    <el-dialog :close-on-click-modal="false" width="60%" :title="title" :visible.sync="openRecharge" append-to-body>
-      <template>
-        <el-tabs v-model="activeRecharge" type="card" @tab-click="handleClick">
-          <el-tab-pane label="电子储值卡" name="balance">
-            <div>
-              <el-row>
-                <el-col :span="1.5">
-                  <div style="height: 50px;line-height: 50px">充值金额</div>
-                </el-col>
-                <el-col :span="22">
-                  <div v-if="cardValueList.length>0"
-                       style="display: flex;margin: 13px 5px;box-sizing: border-box;flex-wrap: wrap; ">
-                    <div class="mon"
-                         v-for="(item,index) in cardValueList" :key="index"
-                         :class="activeKey === index ? 'select' : ''"
-                         @click="rechargeCard(index)">
-                      <div class="top1"><span class="amount1">{{ item.rechargeBalance }}</span>元</div>
-                      <div>赠送<span class="amount">{{ item.giftBalance }}</span>元</div>
-                    </div>
-                  </div>
-                  <div style="width: 30%;margin-left: 13px;margin-top: 8px;"
-                       :class="activeKey === cardValueList.length ? 'select' : ''"
-                       @click="rechargeCard(cardValueList.length,-1)">
-                    <el-input placeholder="请输入充值金额"
-                              size="medium"
-                              v-model="cardValueForm.amount"
-                              @input="valueAmoutChange(cardValueForm.amount)"
-                              oninput="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')"
-                    >
-                      <template slot="prepend">自定义</template>
-                      <template slot="append">元</template>
-                    </el-input>
-                  </div>
-                </el-col>
-              </el-row>
-              <el-row>
-                <el-col :span="24">
-                  <div style="display: flex;justify-content: space-between;margin: 20px 0">
-                    <div class="jine">
-                      <div class="zeng">赠送金额</div>
-                      <div>
-                        <el-input placeholder="0.00"
-                                  v-model="cardValueForm.giftBalance"
-                                  disabled>
-                          <template slot="append">元</template>
-                        </el-input>
-                        <span class="bom">赠送金额 自定义金额模式下将按照距离自定义金额最近的充值活动信息进行赠送</span>
-                      </div>
-                    </div>
-
-                    <div class="jine">
-                      <div class="zeng">赠送积分</div>
-                      <div>
-                        <el-input placeholder="0"
-                                  v-model="cardValueForm.points"
-                                  disabled>
-                          <template slot="append">积分</template>
-                        </el-input>
-                        <span
-                          class="bom">赠送积分 自定义金额模式下将按照距离自定义金额最近的充值活动信息进行赠送</span>
-                      </div>
-                    </div>
-
-                    <div class="jine">
-                      <div class="zeng">赠成长值</div>
-                      <div>
-                        <el-input placeholder="0"
-                                  v-model="cardValueForm.growthValue"
-                                  disabled>
-                          <template slot="append">成长值</template>
-                        </el-input>
-                         <span class="bom">赠送成长值 自定义金额模式下将按照距离自定义金额最近的充值活动信息进行赠送</span>
-                      </div>
-                    </div>
-
-                    <div class="jine">
-                      <div class="zeng" style="width: 30%">提成员工</div>
-                      <div>
-                        <el-input :readonly="true" placeholder="请选择提成员工" v-model="cardValueForm.realName">
-                          <el-button slot="append" @click="chooseStaff">选择员工</el-button>
-                        </el-input>
-<!--                        <span class="bom">仅系统储值档次支持提成员工选择、自定义充值金额匹配低一档次</span>-->
-                      </div>
-                    </div>
-                  </div>
-                </el-col>
-              </el-row>
-              <el-row>
-                <el-col :span="24">
-                  <div style="display: flex">
-                    <div style="width: 7%">充值备注</div>
-                    <el-input
-                      type="textarea"
-                      placeholder=""
-                      v-model="cardValueForm.remark"
-                      maxlength="255"
-                      show-word-limit
-                    >
-                    </el-input>
-                  </div>
-                </el-col>
-              </el-row>
-              <el-row>
-                <el-col :span="24">
-                  <div style="display: flex;margin: 20px 0">
-                    <div style="width: 7%">支付方式</div>
-                    <div>
-                      <el-radio v-for="dict in payList" v-model="cardValueForm.paymentType"
-                                v-if="dict.dictValue!='APPLET_CODE'"
-                                :key="dict.dictValue" :label="dict.dictValue" :value="dict.dictValue" border>
-                        {{ dict.dictLabel }}
-                      </el-radio>
-                    </div>
-                  </div>
-                </el-col>
-              </el-row>
-              <div style="margin: 20px 0;text-align: center">
-                <el-button type="primary" @click="confirm(1)">确认充值</el-button>
-                <el-button @click="cancel">取 消</el-button>
-              </div>
-            </div>
-          </el-tab-pane>
-          <el-tab-pane label="电子囤油卡" name="literCard">
-            <el-row>
-              <el-col :span="24">
-                <div style="display: flex">
-                  <div style="width: 7%;line-height: 40px">油品类型</div>
-                  <el-radio-group v-model="tabOilType" style="margin-bottom: 30px;">
-                    <el-radio-button v-for="(item,index) in oilTypeList" :label="item.oilType"
-                                     @click.native="tabOilTypeClick(item.oilType)">
-                      {{ item.type }}
-                    </el-radio-button>
-                  </el-radio-group>
-                </div>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="1.5">
-                <div style="height: 50px;line-height: 50px;">充值金额</div>
-              </el-col>
-              <el-col :span="22">
-                <div style="display: flex;margin: 20px 5px;box-sizing: border-box;flex-wrap: wrap;">
-                  <div class="mon2"
-                       v-for="(item,index) in cardFuelDieselList" :key="index"
-                       :class="activeKey === index ? 'select' : ''"
-                       @click="recharge(index)">
-<!--                    <div class="top1"><span class="amount1">{{ item.incomeLitres }}</span>L</div>-->
-                    <div>售价<span class="amount">{{ item.rechargeBalance }}</span>元</div>
-<!--                    <div>锁价<span class="amount">{{ item.lockupPrice }}</span>/升</div>-->
-                    <div>锁价<span class="amount">{{ item.lockPrice }}</span>/升</div>
-                  </div>
-                </div>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="24">
-                <div style="display: flex;margin: 20px 0">
-                  <div class="jine">
-                    <div class="zeng">赠送积分</div>
-                    <div>
-                      <el-input placeholder="0" disabled v-model="cardFuelDieselForm.points">
-                        <template slot="append">积分</template>
-                      </el-input>
-                      <span
-                        class="bom">升数卡充值不支持自定义积分,选择对应充值活动获得对应积分</span>
-                    </div>
-                  </div>
-                  <div style="display:flex;margin-left: 20px">
-                    <div style="line-height: 40px;width: 20%">提成员工</div>
-                    <div>
-                      <el-input :readonly="true" placeholder="请选择提成员工" v-model="cardFuelDieselForm.realName">
-                        <el-button slot="append" @click="chooseStaff">选择员工</el-button>
-                      </el-input>
-                    </div>
-                  </div>
-                </div>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="24">
-                <div style="display: flex">
-                  <div style="width: 7%">充值备注</div>
-                  <el-input
-                    type="textarea"
-                    placeholder=""
-                    v-model="rechargeDesc"
-                    maxlength="255"
-                    show-word-limit
-                  >
-                  </el-input>
-                </div>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="24">
-                <div style="display: flex;margin: 20px 0">
-                  <div style="width: 7%">支付方式</div>
-                  <div>
-                    <el-radio v-for="dict in payList" v-model="cardFuelDieselForm.paymentType"
-                              v-if="dict.dictValue!=='APPLET_CODE'"
-                              :key="dict.dictValue" :label="dict.dictValue" :value="dict.dictValue" border>{{ dict.dictLabel }}
-                    </el-radio>
-                  </div>
-                </div>
-              </el-col>
-            </el-row>
-            <div style="margin: 20px 0;text-align: center">
-              <el-button type="primary" @click="confirm(2)">确认充值</el-button>
-              <el-button @click="cancel">取 消</el-button>
-            </div>
-          </el-tab-pane>
-          <el-tab-pane label="礼品卡兑换电子电子储值卡余额" name="giftCard">
-            <el-form ref="form2" :model="form2" :rules="rules1" label-width="120px">
-              <el-row>
-                <el-col :span="24">
-                  <el-form-item label="卡号" prop="number" style="width: 500px">
-                    <el-input v-model="form2.number" placeholder="请输入卡号" maxlength="30" />
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row>
-                <el-col :span="24">
-                  <el-form-item label="卡密" prop="cardPassword" style="width: 500px">
-                    <el-input v-model="form2.cardPassword" placeholder="请输入卡密" maxlength="30" />
-                  </el-form-item>
-                </el-col>
-              </el-row>
-            </el-form>
-            <div style="margin: 20px 0;text-align: center">
-              <el-button type="primary" @click="confirm1()">确认充值</el-button>
-              <el-button @click="cancel">取 消</el-button>
-            </div>
-          </el-tab-pane>
-        </el-tabs>
-      </template>
+    <el-dialog
+      title="会员充值"
+      :visible.sync="memberRecharge"
+      width="910px"
+      center
+    >
+      <memberRecharge  ref="rechargeRef"></memberRecharge>
+      <span slot="footer" class="dialog-footer">
+             <el-button @click="memberRecharge = false">取 消</el-button>
+             <el-button type="primary" @click="rechargeConfirm()">确认充值</el-button>
+      </span>
     </el-dialog>
 
     <!--    选择员工-->
@@ -850,6 +628,9 @@ import SelectStaff from "@/components/local/selectStaff.vue";
 import balanceRecord from "@/views/details/userInfoOrder/balanceRecord.vue";
 import pointsRecord from "@/views/details/userInfoOrder/pointsRecord.vue";
 import oilOrder from "@/views/details/userInfoOrder/oilOrder.vue";
+import storedCard from "@/views/details/userInfoOrder/storedCard.vue";
+import oilStorageCard from "@/views/details/userInfoOrder/oilStorageCard.vue";
+
 import goodsOrder from "@/views/details/userInfoOrder/goodsOrder.vue";
 import couponList from "@/views/details/userInfoOrder/couponList.vue";
 import growthValueRecord from "@/views/details/userInfoOrder/growthValueRecord.vue";
@@ -881,9 +662,11 @@ import {getSysConfig} from "@/api/cashier/user/sysconfig";
 import {giftCardExchange} from "@/api/cashier/giftCard/giftcard";
 import {connectFlag, getLodop} from "@/api/LodopFuncs";
 import {getReturnCode, printCardValueReport, printFuelDieselReport, sendPrintIndex} from "@/api/print";
+import memberRecharge from "@/views/cashier/NewComponents/newHomeComponents/memberRecharge.vue";
 
 export default {
   components: {
+    memberRecharge,
     SelectStaff,
     oilOrder,
     goodsOrder,
@@ -893,6 +676,8 @@ export default {
     growthValueRecord,
     refuelMoneyRecord,
     cardValueChild,
+    storedCard,
+    oilStorageCard
   },
   computed: {
     item() {
@@ -902,6 +687,7 @@ export default {
   dicts: ['official', 'zhzt', 'zcrzdj', 'payment_type','pay_status'],
   data() {
     return {
+      memberRecharge:false,
       rechargeBalCard:false,
       rechargeOilCard:false,
       orderList:[],
diff --git a/fuintCashierWeb/src/views/details/userInfoOrder/oilStorageCard.vue b/fuintCashierWeb/src/views/details/userInfoOrder/oilStorageCard.vue
new file mode 100644
index 000000000..a55da7354
--- /dev/null
+++ b/fuintCashierWeb/src/views/details/userInfoOrder/oilStorageCard.vue
@@ -0,0 +1,129 @@
+<template>
+  <div>
+      <el-table ref="tables2" key="2" v-loading="loading" :data="fuelList">
+        <el-table-column align="center" label="所属油站" prop="storeName">
+          <template slot-scope="scope">
+            <span>{{store.name}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="油品类型" >
+          <template slot-scope="scope">
+            <span> {{scope.row.type?scope.row.type:' -- '}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="类型" align="center">
+          <template slot-scope="scope">
+            <el-tag type="danger" v-if="scope.row.changeType === '0'">消费</el-tag>
+            <el-tag type="success" v-else-if="scope.row.changeType === '1' ">充值</el-tag>
+            <el-tag type="success" v-else>--</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="变动升数" align="center" prop="oilBalance">
+          <template slot-scope="scope">
+            <span>{{scope.row.oilBalance?scope.row.oilBalance:"--"}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="变动之后升数" align="center" prop="afterOilChange">
+          <template slot-scope="scope">
+            <span>{{scope.row.afterOilChange?scope.row.afterOilChange:"--"}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="订单号" align="center" prop="orderNo"/>
+        <el-table-column label="描述" align="center" prop="fromType"/>
+        <el-table-column label="变动时间" align="center" prop="createTime"/>
+      </el-table>
+
+      <pagination
+        :total="fuelTotal"
+        :page.sync="queryFuelParams.page"
+        :limit.sync="queryFuelParams.pageSize"
+        @pagination="getFuelList"
+      />
+
+  </div>
+</template>
+
+<script>
+
+import {getCardRecordList, getFuelRecordList} from "@/api/cashier/userInfoOrder";
+import {listCardBalanceRecord, listCardOilRecord} from "@/api/cashier/balancecardrecord";
+import {ljStoreInfo} from "@/api/cashier/user/store";
+
+export default {
+  props:["pUserId"],
+  data(){
+    return {
+      tabPosition: 'giftCard',
+      userId:"",
+      loading:false,
+      list:[],
+      cardList:[],
+      fuelList:[],
+      cardTotal:0,
+      fuelTotal:0,
+      queryCardParams:{
+        page:1,
+        pageSize:10,
+      },
+      queryFuelParams:{
+        page:1,
+        pageSize:10,
+      },
+      store:{}
+    }
+  },
+  created() {
+    // this.userId = this.pUserId;
+    this.userId = this.$route.query.id;
+
+    this.getCardList()
+    this.getFuelList()
+    this.getStoreInfo()
+  },
+  methods:{
+    // 获取店铺信息
+    getStoreInfo(){
+      ljStoreInfo().then(res => {
+        this.store = res.data
+      })
+    },
+    changeCard(val){
+      console.log(val,this.tabPosition)
+    },
+    getCardList() {
+      this.loading = true
+      this.queryCardParams.userId = this.userId
+      getCardRecordList(this.queryCardParams).then(res=>{
+        if (res.code == 200) {
+          this.cardList = res.data.records
+          this.cardTotal = res.data.total
+          this.loading = false
+        }
+      })
+    },
+
+    getFuelList() {
+      this.loading = true
+      this.queryFuelParams.userId = this.userId
+      listCardOilRecord(this.queryFuelParams).then(res=>{
+        if (res.code == 200) {
+          this.fuelList = res.data.records
+          this.fuelTotal = res.data.total
+          this.loading = false
+        }
+      })
+      // getFuelRecordList(this.queryFuelParams).then(res=>{
+      //   if (res.code == 200) {
+      //     this.fuelList = res.data.records
+      //     this.fuelTotal = res.data.total
+      //     this.loading = false
+      //   }
+      // })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+
+</style>
diff --git a/fuintCashierWeb/src/views/details/userInfoOrder/storedCard.vue b/fuintCashierWeb/src/views/details/userInfoOrder/storedCard.vue
new file mode 100644
index 000000000..a08bd0ca0
--- /dev/null
+++ b/fuintCashierWeb/src/views/details/userInfoOrder/storedCard.vue
@@ -0,0 +1,127 @@
+<template>
+  <div>
+
+      <el-table key="1" ref="tables" v-loading="loading" :data="cardList">
+        <el-table-column align="center"  prop="storeName" label="所属油站"/>
+        <!-- <el-table-column prop="date" label="变动账户"/> -->
+        <el-table-column align="center"  prop="changeType" label="类型">
+          <template slot-scope="scope">
+            <el-tag v-if="scope.row.changeType == 0">消费</el-tag>
+            <el-tag type="success" v-else>充值</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column align="center"  label="详细信息">
+          <el-table-column align="center"  prop="balance" label="变动金额"/>
+          <el-table-column align="center" label="变动前余额">
+            <template slot-scope="scope">
+              <span v-if="scope.row.changeType == 0">{{ scope.row.afterTheChange?parseFloat(scope.row.afterTheChange + scope.row.balance).toFixed(2) : '/'}}</span>
+              <span v-else>{{ scope.row.afterTheChange?parseFloat(scope.row.afterTheChange - scope.row.balance).toFixed(2) : '/'}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column align="center"  prop="afterTheChange" label="变动后余额">
+            <template slot-scope="scope">
+              <span>{{ scope.row.afterTheChange?scope.row.afterTheChange : '/'}}</span>
+            </template>
+          </el-table-column>
+
+        </el-table-column>
+        <el-table-column align="center"  prop="orderNo" label="订单号"/>
+        <el-table-column align="center"  prop="fromType" label="描述"/>
+        <el-table-column align="center"  prop="createTime" label="变动时间"/>
+      </el-table>
+
+      <pagination
+        :total="cardTotal"
+        :page.sync="queryCardParams.page"
+        :limit.sync="queryCardParams.pageSize"
+        @pagination="getCardList"
+      />
+
+
+  </div>
+</template>
+
+<script>
+
+import {getCardRecordList, getFuelRecordList} from "@/api/cashier/userInfoOrder";
+import {listCardBalanceRecord, listCardOilRecord} from "@/api/cashier/balancecardrecord";
+import {ljStoreInfo} from "@/api/cashier/user/store";
+
+export default {
+  props:["pUserId"],
+  data(){
+    return {
+      tabPosition: 'giftCard',
+      userId:"",
+      loading:false,
+      list:[],
+      cardList:[],
+      fuelList:[],
+      cardTotal:0,
+      fuelTotal:0,
+      queryCardParams:{
+        page:1,
+        pageSize:10,
+      },
+      queryFuelParams:{
+        page:1,
+        pageSize:10,
+      },
+      store:{}
+    }
+  },
+  created() {
+    // this.userId = this.pUserId;
+    this.userId = this.$route.query.id;
+
+    this.getCardList()
+    this.getFuelList()
+    this.getStoreInfo()
+  },
+  methods:{
+    // 获取店铺信息
+    getStoreInfo(){
+      ljStoreInfo().then(res => {
+        this.store = res.data
+      })
+    },
+    changeCard(val){
+      console.log(val,this.tabPosition)
+    },
+    getCardList() {
+      this.loading = true
+      this.queryCardParams.userId = this.userId
+      getCardRecordList(this.queryCardParams).then(res=>{
+        if (res.code == 200) {
+          this.cardList = res.data.records
+          this.cardTotal = res.data.total
+          this.loading = false
+        }
+      })
+    },
+
+    getFuelList() {
+      this.loading = true
+      this.queryFuelParams.userId = this.userId
+      listCardOilRecord(this.queryFuelParams).then(res=>{
+        if (res.code == 200) {
+          this.fuelList = res.data.records
+          this.fuelTotal = res.data.total
+          this.loading = false
+        }
+      })
+      // getFuelRecordList(this.queryFuelParams).then(res=>{
+      //   if (res.code == 200) {
+      //     this.fuelList = res.data.records
+      //     this.fuelTotal = res.data.total
+      //     this.loading = false
+      //   }
+      // })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+
+</style>