diff --git a/fuintAdmin/src/views/staff/list.vue b/fuintAdmin/src/views/staff/list.vue
index 419df75f0..500b53a0c 100644
--- a/fuintAdmin/src/views/staff/list.vue
+++ b/fuintAdmin/src/views/staff/list.vue
@@ -61,24 +61,7 @@
         <el-table-column label="ID" align="center" prop="id" width="80" />
         <el-table-column label="姓名" align="center" prop="realName" />
         <el-table-column label="手机号" align="center" prop="mobile"  width="110"/>
-<!--        <el-table-column label="核销权限" align="center" prop="writeOff"/>-->
-<!--        <el-table-column label="特殊权限" align="center" prop="specialPrem">-->
-<!--          <template slot-scope="scope">-->
-<!--            <span>{{scope.row.specialPrem ? scope.row.specialPrem : "&#45;&#45;"}}</span>-->
-<!--          </template>-->
-<!--        </el-table-column>-->
-<!--        <el-table-column label="退款权限" align="center" prop="refund">-->
-<!--          <template slot-scope="scope">-->
-<!--            <dict-tag :options="dict.type.ywqx" :value="scope.row.refund"/>-->
-<!--          </template>-->
-<!--        </el-table-column>-->
-<!--        <el-table-column label="核销码" align="center" prop="writeOffCode">-->
-<!--          <template slot-scope="scope">-->
-<!--            <span @click="getQRcode(scope.row.writeOffCode,'woc')">-->
-<!--              <svg t="1701161298120" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4306" width="16" height="16"><path d="M384 64l-249.6 0c-51.2 0-89.6 41.6-89.6 89.6l0 227.2c0 51.2 41.6 89.6 89.6 89.6l249.6 0c51.2 0 89.6-41.6 89.6-89.6l0-227.2C473.6 105.6 435.2 64 384 64zM428.8 380.8c0 25.6-19.2 44.8-44.8 44.8l-249.6 0c-25.6 0-44.8-19.2-44.8-44.8l0-227.2c0-25.6 19.2-44.8 44.8-44.8l249.6 0c25.6 0 44.8 19.2 44.8 44.8L428.8 380.8z" p-id="4307"></path><path d="M192 192l134.4 0 0 134.4-134.4 0 0-134.4Z" p-id="4308"></path><path d="M377.6 544l-243.2 0c-48 0-86.4 38.4-86.4 89.6l0 220.8c0 48 38.4 89.6 86.4 89.6l243.2 0c48 0 86.4-38.4 86.4-89.6l0-220.8C467.2 582.4 425.6 544 377.6 544zM422.4 851.2c0 25.6-19.2 44.8-44.8 44.8l-243.2 0c-25.6 0-44.8-19.2-44.8-44.8l0-220.8c0-25.6 19.2-44.8 44.8-44.8l243.2 0c25.6 0 44.8 19.2 44.8 44.8L422.4 851.2z" p-id="4309"></path><path d="M192 668.8l131.2 0 0 131.2-131.2 0 0-131.2Z" p-id="4310"></path><path d="M633.6 470.4l249.6 0c51.2 0 89.6-41.6 89.6-89.6l0-227.2c0-51.2-41.6-89.6-89.6-89.6l-249.6 0c-51.2 0-89.6 41.6-89.6 89.6l0 227.2C544 432 585.6 470.4 633.6 470.4zM588.8 153.6c0-25.6 19.2-44.8 44.8-44.8l249.6 0c25.6 0 44.8 19.2 44.8 44.8l0 227.2c0 25.6-19.2 44.8-44.8 44.8l-249.6 0c-25.6 0-44.8-19.2-44.8-44.8L588.8 153.6z" p-id="4311"></path><path d="M700.8 192l134.4 0 0 134.4-134.4 0 0-134.4Z" p-id="4312"></path><path d="M572.8 716.8l137.6 0c12.8 0 22.4-9.6 22.4-22.4l0-137.6c0-12.8-9.6-22.4-22.4-22.4l-137.6 0c-12.8 0-22.4 9.6-22.4 22.4l0 137.6C550.4 707.2 560 716.8 572.8 716.8z" p-id="4313"></path><path d="M886.4 563.2l0 38.4c0 12.8 12.8 25.6 25.6 25.6l38.4 0c12.8 0 25.6-12.8 25.6-25.6l0-38.4c0-12.8-12.8-25.6-25.6-25.6l-38.4 0C899.2 537.6 886.4 547.2 886.4 563.2z" p-id="4314"></path><path d="M582.4 944l48 0c12.8 0 22.4-9.6 22.4-22.4l0-48c0-12.8-9.6-22.4-22.4-22.4l-48 0c-12.8 0-22.4 9.6-22.4 22.4l0 48C560 934.4 569.6 944 582.4 944z" p-id="4315"></path><path d="M944 704l-99.2 0c-16 0-28.8 12.8-28.8 28.8l0 44.8-48 0c-19.2 0-32 12.8-32 32l0 99.2c0 16 12.8 28.8 28.8 28.8l179.2 3.2c16 0 28.8-12.8 28.8-28.8l0-179.2C972.8 716.8 960 704 944 704z" p-id="4316"></path></svg>-->
-<!--            </span>-->
-<!--          </template>-->
-<!--        </el-table-column>-->
+
         <el-table-column label="员工码" align="center" prop="staffCode">
           <template slot-scope="scope">
             <span @click="getStaffQRcode(scope.row.id)">
@@ -92,13 +75,7 @@
             <el-tag type="info" v-if="scope.row.status=='jy'">禁用</el-tag>
           </template>
         </el-table-column>
-<!--        <el-table-column label="公众号" align="center" prop="official">-->
-<!--          <template slot-scope="scope">-->
-<!--            <span v-if="scope.row.official">-->
-<!--              <dict-tag :options="dict.type.official" :value="scope.row.official"/>-->
-<!--            </span>-->
-<!--            <span v-else>&#45;&#45;</span>-->
-<!--          </template>-->
+
 <!--        </el-table-column>-->
         <el-table-column label="一键加油" align="center" prop="isRefuel">
           <template slot-scope="scope">
@@ -172,14 +149,7 @@
                   :label="item.dutyName"
                   :value="item.dutyId"
                 ></el-option>
-<!--                <el-option-->
-<!--                  v-for="dict in dict.type.staff_role"-->
-<!--                  :key="dict.value"-->
-<!--                  :label="dict.label"-->
-<!--                  :value="dict.value"-->
-<!--                />-->
-<!--                <el-option value="普通员工">普通员工</el-option>-->
-<!--                <el-option value="收银员">收银员</el-option>-->
+
               </el-select>
             </el-form-item>
           </el-col>
@@ -190,54 +160,18 @@
               <el-input v-model="form.password" type="password" placeholder="请输入登录密码" maxlength="30"/>
             </el-form-item>
           </el-col>
-<!--          <el-col :span="8">-->
-<!--            <el-form-item label="退款权限" prop="refund">-->
-<!--              <el-select v-model="form.refund" placeholder="请选择权限">-->
-<!--                <el-option-->
-<!--                  v-for="dict in dict.type.ywqx"-->
-<!--                  :key="dict.value"-->
-<!--                  :label="dict.label"-->
-<!--                  :value="dict.value"-->
-<!--                />-->
-<!--              </el-select>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-<!--          <el-col :span="8">-->
-<!--            <el-form-item label="退款密码" prop="refundPassword">-->
-<!--              <el-input v-model="form.refundPassword" type="password" placeholder="请输入退款密码" maxlength="30"/>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
+
         </el-row>
         <el-row>
-<!--          <el-col :span="8" style="display: flex;margin-bottom: 20px">-->
-<!--            <template>-->
-<!--              <span style="margin-right: 10px">核销权限</span>-->
-<!--              <el-checkbox-group v-model="writeOff" ref="" @change="getCheckbox">-->
-<!--                <el-checkbox-->
-<!--                  v-for="dict in dict.type.write_off"-->
-<!--                  :key="dict.value"-->
-<!--                  :label="dict.label"-->
-<!--                  :value="dict.value"-->
-<!--                ></el-checkbox>-->
-<!--              </el-checkbox-group>-->
-<!--            </template>-->
-<!--          </el-col>-->
-<!--          <el-col :span="16" style="display: flex">-->
-<!--            <span style="margin-right: 10px">特殊权限</span>-->
-<!--            <el-checkbox-group v-model="specialPrem" @change="getCheckbox">-->
-<!--              <el-checkbox-->
-<!--                v-for="dict in dict.type.special_prem"-->
-<!--                :key="dict.value"-->
-<!--                :label="dict.label"-->
-<!--                :value="dict.value"-->
-<!--              ></el-checkbox>-->
-<!--            </el-checkbox-group>-->
-<!--          </el-col>-->
+
         </el-row>
-        <el-row>
-          <el-col :span="24" style="display: flex;margin-bottom: 10px">
+        <el-row :span="24">
+          <el-col :span="2" style="display: flex;margin-bottom: 10px">
             <span style="margin-right: 10px;width: 70px">审核权限</span>
-            <el-checkbox-group v-model="auditPrem" @change="getCheckbox">
+
+          </el-col>
+          <el-col :span="22" style="display: flex;margin-bottom: 10px">
+            <el-checkbox-group v-model="form.auditPrem" @change="getCheckbox">
               <el-checkbox
                 v-for="dict in dict.type.shqx"
                 :key="dict.value"
@@ -245,7 +179,10 @@
                 :value="dict.value"
               ></el-checkbox>
             </el-checkbox-group>
+
           </el-col>
+
+
         </el-row>
         <el-row>
           <el-col :span="8">
@@ -268,48 +205,7 @@
               </el-tooltip>
             </el-form-item>
           </el-col>
-<!--          <el-col :span="8">-->
-<!--            <el-form-item label="POS加油员" prop="pos">-->
-<!--              <el-select v-model="form.pos">-->
-<!--                <el-option-->
-<!--                  v-for="dict in dict.type.zhzt"-->
-<!--                  :key="dict.value"-->
-<!--                  :label="dict.label"-->
-<!--                  :value="dict.value"-->
-<!--                />-->
-<!--              </el-select>-->
-<!--              <br/>-->
-<!--              <el-tooltip-->
-<!--                class="item"-->
-<!--                effect="dark"-->
-<!--                placement="bottom">-->
-<!--                <div slot="content"> 启用后,当前账户登录POS端后油品收银必选加油员才可进行<br/>下步操作(需系统开启加油选择加油员功能) </div>-->
-<!--                <span>启用后,当前账户登录...</span>-->
-<!--              </el-tooltip>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-<!--          <el-col :span="8">-->
-<!--            <el-form-item label="交易统计" prop="transaction">-->
-<!--              <el-select v-model="form.transaction">-->
-<!--                <el-option-->
-<!--                  v-for="dict in dict.type.transaction"-->
-<!--                  :key="dict.value"-->
-<!--                  :label="dict.label"-->
-<!--                  :value="dict.value"-->
-<!--                />-->
-<!--              </el-select>-->
-<!--              <br/>-->
-<!--              <el-tooltip-->
-<!--                class="item"-->
-<!--                effect="dark"-->
-<!--                placement="bottom">-->
-<!--                <div slot="content"> 交易订单显示信息、终端支持:(PC、<br/>POS、小程序) </div>-->
-<!--                <span>交易订单显示信息...</span>-->
-<!--              </el-tooltip>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-<!--        </el-row>-->
-<!--        <el-row>-->
+
           <el-col :span="8">
             <el-form-item label="收款通知" prop="notice">
               <el-select v-model="form.notice">
@@ -330,206 +226,10 @@
               </el-tooltip>
             </el-form-item>
           </el-col>
-<!--          <el-col :span="8">-->
-<!--            <el-form-item label="指定油枪" prop="oilGunId" v-show="form.notice == 'zdyx'">-->
-<!--              <el-select v-model="form.oilGunId">-->
-<!--                <el-option-->
-<!--                  v-for="dict in dict.type.notice"-->
-<!--                  :key="dict.value"-->
-<!--                  :label="dict.label"-->
-<!--                  :value="dict.value"-->
-<!--                />-->
-<!--              </el-select>-->
-<!--              <br/>-->
-<!--              <el-tooltip-->
-<!--                class="item"-->
-<!--                effect="dark"-->
-<!--                placement="bottom">-->
-<!--                <div slot="content">多选,已选油枪号的交易将发送<br/>模板消息)</div>-->
-<!--                <span>多选,已选油枪号...</span>-->
-<!--              </el-tooltip>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-<!--          <el-col :span="8">-->
-<!--            <el-form-item label="时间范围" prop="timeFrame">-->
-<!--              <el-select v-model="form.timeFrame">-->
-<!--                <el-option-->
-<!--                  v-for="dict in dict.type.time_frame"-->
-<!--                  :key="dict.value"-->
-<!--                  :label="dict.label"-->
-<!--                  :value="dict.value"-->
-<!--                />-->
-<!--              </el-select>-->
-<!--              <br/>-->
-<!--              <el-tooltip-->
-<!--                class="item"-->
-<!--                effect="dark"-->
-<!--                placement="bottom">-->
-<!--                <div slot="content">当前账户下可查看交易的时间范围(PC、<br/>POS端)</div>-->
-<!--                <span>当前账户下可查看...</span>-->
-<!--              </el-tooltip>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
+
         </el-row>
-<!--        <el-row>-->
-<!--          <el-col :span="8">-->
-<!--            <el-form-item label="交班模式" prop="handoverMode">-->
-<!--              <el-select v-model="form.handoverMode">-->
-<!--                <el-option-->
-<!--                  v-for="dict in dict.type.handover"-->
-<!--                  :key="dict.value"-->
-<!--                  :label="dict.label"-->
-<!--                  :value="dict.value"-->
-<!--                />-->
-<!--              </el-select>-->
-<!--              <br/>-->
-<!--              <span> 根据需求自行选择模式 </span>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-<!--          <el-col :span="8">-->
-<!--            <el-form-item label="交班权限" prop="handoverPrem">-->
-<!--              <el-select v-model="form.handoverPrem" placeholder="请选择所属店铺">-->
-<!--                <el-option-->
-<!--                  v-for="dict in dict.type.ywqx"-->
-<!--                  :key="dict.value"-->
-<!--                  :label="dict.label"-->
-<!--                  :value="dict.value"-->
-<!--                />-->
-<!--              </el-select>-->
-<!--              <br/>-->
-<!--              <el-tooltip-->
-<!--                class="item"-->
-<!--                effect="dark"-->
-<!--                placement="bottom">-->
-<!--                <div slot="content"> 若无权限,则无法查看交班统计信息和<br/>进行交班操作 </div>-->
-<!--                <span>若无权限,则无法查看...</span>-->
-<!--              </el-tooltip>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-<!--          <el-col :span="8">-->
-<!--            <el-form-item label="交班退出" prop="handoverOut">-->
-<!--              <el-select v-model="form.handoverOut">-->
-<!--                <el-option-->
-<!--                  v-for="dict in dict.type.handover_quit"-->
-<!--                  :key="dict.value"-->
-<!--                  :label="dict.label"-->
-<!--                  :value="dict.value"-->
-<!--                />-->
-<!--              </el-select>-->
-<!--              <br/>-->
-<!--              <el-tooltip-->
-<!--                class="item"-->
-<!--                effect="dark"-->
-<!--                placement="bottom">-->
-<!--                <div slot="content"> 进行交班处理后是否退出当前账户 </div>-->
-<!--                <span>进行交班处理后是否...</span>-->
-<!--              </el-tooltip>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-<!--        </el-row>-->
-<!--        <el-row>-->
-<!--          <el-col :span="8">-->
-<!--            <el-form-item label="交班记录" prop="record">-->
-<!--              <el-select v-model="form.record">-->
-<!--                <el-option-->
-<!--                  v-for="dict in dict.type.jbjl"-->
-<!--                  :key="dict.value"-->
-<!--                  :label="dict.label"-->
-<!--                  :value="dict.value"-->
-<!--                />-->
-<!--              </el-select>-->
-<!--              <br/>-->
-<!--              <el-tooltip-->
-<!--                class="item"-->
-<!--                effect="dark"-->
-<!--                placement="bottom">-->
-<!--                <div slot="content"> 全部记录:查看所有员工交班记录,名下<br/>记录:员工自己名下记录(需有交班权限才可查看),<br/>禁用权限:无权限查看交班记录,记录为空 </div>-->
-<!--                <span>全部记录:查看所有...</span>-->
-<!--              </el-tooltip>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-<!--          <el-col :span="8">-->
-<!--            <el-form-item label="交班商户号" prop="merchantStatus">-->
-<!--              <el-select v-model="form.merchantStatus">-->
-<!--                <el-option-->
-<!--                  v-for="dict in dict.type.zhzt"-->
-<!--                  :key="dict.value"-->
-<!--                  :label="dict.label"-->
-<!--                  :value="dict.value"-->
-<!--                />-->
-<!--              </el-select>-->
-<!--              <br/>-->
-<!--              <el-tooltip-->
-<!--                class="item"-->
-<!--                effect="dark"-->
-<!--                placement="bottom">-->
-<!--                <div slot="content"> 交班信息是否显示商户号统计信息,禁<br/>用后当前员工则无商户号统计信息 </div>-->
-<!--                <span>交班信息是否显示商...</span>-->
-<!--              </el-tooltip>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-<!--          <el-col :span="8">-->
-<!--            <el-form-item label="员工筛选" prop="screen">-->
-<!--              <el-select v-model="form.screen">-->
-<!--                <el-option-->
-<!--                  v-for="dict in dict.type.zhzt"-->
-<!--                  :key="dict.value"-->
-<!--                  :label="dict.label"-->
-<!--                  :value="dict.value"-->
-<!--                />-->
-<!--              </el-select>-->
-<!--              <br/>-->
-<!--              <el-tooltip-->
-<!--                class="item"-->
-<!--                effect="dark"-->
-<!--                placement="bottom">-->
-<!--                <div slot="content"> 交易信息是否可以筛选员工进行查<br/>询,启用后可筛选、则反之 </div>-->
-<!--                <span>交易信息是否可以...</span>-->
-<!--              </el-tooltip>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-<!--        </el-row>-->
+
         <el-row>
-<!--          <el-col :span="8">-->
-<!--            <el-form-item label="POS权限" prop="posPrem">-->
-<!--              <div class="block">-->
-<!--                <el-cascader-->
-<!--                  v-model="posPrem"-->
-<!--                  :options="posOptions"-->
-<!--                  :props="props"-->
-<!--                  @change="handleNodeClick1"-->
-<!--                  clearable></el-cascader>-->
-<!--                <br/>-->
-<!--                <el-tooltip-->
-<!--                  class="item"-->
-<!--                  effect="dark"-->
-<!--                  placement="bottom">-->
-<!--                  <div slot="content"> POS手持机中功能对应操作权限 </div>-->
-<!--                  <span>POS手持机中...</span>-->
-<!--                </el-tooltip>-->
-<!--              </div>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-<!--          <el-col :span="8">-->
-<!--            <el-form-item label="小程序权限" prop="appletPrem">-->
-<!--              <div class="block">-->
-<!--                <el-cascader-->
-<!--                  v-model="appletPrem"-->
-<!--                  :options="appletOptions"-->
-<!--                  :props="props"-->
-<!--                  @change="handleNodeClick2"-->
-<!--                  clearable></el-cascader>-->
-<!--                <br/>-->
-<!--                <el-tooltip-->
-<!--                  class="item"-->
-<!--                  effect="dark"-->
-<!--                  placement="bottom">-->
-<!--                  <div slot="content"> 小程序管理端功能对应操作权限 </div>-->
-<!--                  <span>小程序管理端功能...</span>-->
-<!--                </el-tooltip>-->
-<!--              </div>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
           <el-col :span="8">
             <el-form-item label="账户状态" prop="status">
               <el-select v-model="form.status">
@@ -808,7 +508,7 @@ export default {
     getCheckbox(){
       this.form.writeOff = this.writeOff.toString();
       this.form.specialPrem = this.specialPrem.toString();
-      this.form.auditPrem = this.auditPrem.toString();
+      this.form.auditPrem = this.form.auditPrem.toString();
     },
     // 页面跳转
     toTarget(url) {
@@ -884,7 +584,7 @@ export default {
       this.posPrem = '';
       this.appletPrem = '';
       this.writeOff = [];
-      this.auditPrem = [];
+      this.form.auditPrem = [];
       this.form = {
         id:'', userId:'', mobile:'', realName:'', wechat:'', merchantId:'', storeId:'', auditedStatus:'A',
         auditedTime:'', description:'', isRefuel:'yc', handoverMode:'dqmdtyjb', handoverPrem:'yqx', handoverOut:'jbtc', record:'qbjl',
@@ -950,8 +650,8 @@ export default {
         this.form.refundPassword = '123456'
         this.open = true;
         this.title = "编辑员工信息";
-        if (this.auditPrem.length > 0){
-          this.auditPrem = this.form.auditPrem.split(",");
+        if (this.form.auditPrem.length > 0){
+          this.form.auditPrem = this.form.auditPrem.split(",");
         }
         if (this.writeOff.length > 0){
           this.writeOff = this.form.writeOff.split(",");
diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue
index 61de8b0cc..ba67c7846 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue
@@ -196,13 +196,13 @@
           <div class="wrap-box" v-for="item in payList"
                :key="item.dictValue"
                :value="item.dictValue"
-               :class="{ 'wrap-box2': item.dictValue === map.payType }"
+               :class="{ 'wrap-box2': item.dictValue == typeIdex }"
                @click="payMethod(item.dictValue)">
             <span>{{ item.dictLabel }}</span>
           </div>
           <div class="wrap-box" value="credit"
-               :class="{ 'wrap-box2': 'credit' === map.payType }" >
-            <span @click="addCredits">挂账</span>
+               :class="{ 'wrap-box2': '798' == typeIdex }" >
+            <span @click="addCredits('798')">挂账</span>
           </div>
         </div>
         <div class="center-left-bottom">
@@ -246,30 +246,9 @@
                   <img src="../../../assets/images/jya.png" style="width: 18px;height: 18px;">
                   <span style="font-size: 12px">{{ item.tankName }}</span>
                 </div>
-<!--                <div style="display: flex;justify-content: space-between">-->
-<!--                  <span>-->
-<!--                    <svg t="1700561564710" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9686" width="16" height="16"><path d="M661.8 868.4V455.8h27.9c15.3-0.1 27.8 12.3 27.9 27.6V746c-0.1 67.5 54.5 122.3 121.9 122.4S961.9 813.9 962 746.5V241.6c0.1-25.4-10.1-49.8-28.3-67.5l-99.4-98.5c-18-18-47.2-18-65.2 0s-18 47.2 0 65.2l64.3 64.8-47.7 49.5c-15.8 16-15.8 41.6 0 57.6 7.4 7.8 17.6 12.2 28.3 12.1h54v422.1c0 15.4-12.5 27.9-27.9 27.9-15.4 0-27.9-12.5-27.9-27.9V484.1c0.1-67.3-54.3-121.8-121.6-121.9H662.3v-225c-0.1-41.5-33.7-75.1-75.1-75.1H193.4c-41.5 0.1-75.1 33.7-75.1 75.1v731.2h-9.4c-25.8 0-46.8 21-46.8 46.8C62 941 83 962 108.8 962h562.5c25.8 0 46.8-20.9 46.8-46.8 0-25.8-20.9-46.8-46.8-46.8h-9.5zM253.2 155.6h273.6c22.8 0 41.3 18.4 41.4 41.2v199.1c0 22.8-18.4 41.3-41.2 41.4H253.2c-22.8 0-41.3-18.4-41.4-41.2V197c0-22.8 18.4-41.3 41.2-41.4h0.2z" fill="#FFFFFF" p-id="9687"></path></svg>-->
-<!--                  </span>-->
-<!--                  <span>-->
-<!--                    <svg t="1700561410052" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5197" width="16" height="16"><path d="M365.714286 365.714286h109.714285v365.714285H365.714286V365.714286z m182.857143 0H658.285714v365.714285H548.571429V365.714286z m329.142857-36.571429v438.857143A182.857143 182.857143 0 0 1 694.857143 950.857143h-365.714286A182.857143 182.857143 0 0 1 146.285714 768v-438.857143h109.714286v416.256c0 45.129143 47.104 95.744 93.037714 95.744h326.217143c57.563429 0 92.745143-52.370286 92.745143-95.744V329.142857H877.714286zM676.571429 146.285714h182.857142a54.857143 54.857143 0 0 1 54.857143 54.857143v54.857143h-804.571428v-54.857143A54.857143 54.857143 0 0 1 164.571429 146.285714h182.857142l38.4-51.2a54.857143 54.857143 0 0 1 43.885715-21.942857h164.571428a54.857143 54.857143 0 0 1 43.885715 21.942857l38.4 51.2z" fill="#FFFFFF" p-id="5198"></path></svg>-->
-<!--                  </span>-->
-<!--                </div>-->
-              </div>
-<!--              点击之后样式测试-->
-<!--              <div class="after-box">-->
-<!--                <div>11</div>-->
 
-<!--                <div class="of-title" >1号枪</div>-->
-<!--                <div style="display: flex;justify-content: space-between">-->
-<!--&lt;!&ndash;                  <img src="../../../assets/images/jya.png" style="width: 18px;height: 18px;">&ndash;&gt;-->
-<!--                  <span>-->
-<!--                    <svg t="1700561564710" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9686" width="16" height="16"><path d="M661.8 868.4V455.8h27.9c15.3-0.1 27.8 12.3 27.9 27.6V746c-0.1 67.5 54.5 122.3 121.9 122.4S961.9 813.9 962 746.5V241.6c0.1-25.4-10.1-49.8-28.3-67.5l-99.4-98.5c-18-18-47.2-18-65.2 0s-18 47.2 0 65.2l64.3 64.8-47.7 49.5c-15.8 16-15.8 41.6 0 57.6 7.4 7.8 17.6 12.2 28.3 12.1h54v422.1c0 15.4-12.5 27.9-27.9 27.9-15.4 0-27.9-12.5-27.9-27.9V484.1c0.1-67.3-54.3-121.8-121.6-121.9H662.3v-225c-0.1-41.5-33.7-75.1-75.1-75.1H193.4c-41.5 0.1-75.1 33.7-75.1 75.1v731.2h-9.4c-25.8 0-46.8 21-46.8 46.8C62 941 83 962 108.8 962h562.5c25.8 0 46.8-20.9 46.8-46.8 0-25.8-20.9-46.8-46.8-46.8h-9.5zM253.2 155.6h273.6c22.8 0 41.3 18.4 41.4 41.2v199.1c0 22.8-18.4 41.3-41.2 41.4H253.2c-22.8 0-41.3-18.4-41.4-41.2V197c0-22.8 18.4-41.3 41.2-41.4h0.2z" fill="#FFFFFF" p-id="9687"></path></svg>-->
-<!--                  </span>-->
-<!--                  <span>-->
-<!--                    <svg t="1700561410052" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5197" width="16" height="16"><path d="M365.714286 365.714286h109.714285v365.714285H365.714286V365.714286z m182.857143 0H658.285714v365.714285H548.571429V365.714286z m329.142857-36.571429v438.857143A182.857143 182.857143 0 0 1 694.857143 950.857143h-365.714286A182.857143 182.857143 0 0 1 146.285714 768v-438.857143h109.714286v416.256c0 45.129143 47.104 95.744 93.037714 95.744h326.217143c57.563429 0 92.745143-52.370286 92.745143-95.744V329.142857H877.714286zM676.571429 146.285714h182.857142a54.857143 54.857143 0 0 1 54.857143 54.857143v54.857143h-804.571428v-54.857143A54.857143 54.857143 0 0 1 164.571429 146.285714h182.857142l38.4-51.2a54.857143 54.857143 0 0 1 43.885715-21.942857h164.571428a54.857143 54.857143 0 0 1 43.885715 21.942857l38.4 51.2z" fill="#FFFFFF" p-id="5198"></path></svg>-->
-<!--                  </span>-->
-<!--                </div>-->
-<!--              </div>-->
+              </div>
+
             </div>
           </div>
 
@@ -307,21 +286,7 @@
                 </div>
               </template>
             </el-autocomplete>
-<!--            <el-select v-model="goods" filterable-->
-<!--                       style="width: 95%;font-size: 20px;"-->
-<!--                       @change="changeGoods"-->
-<!--                       @keydown.enter.native="queryGoods"-->
-<!--                       clearable-->
-<!--                       placeholder="请输入商品名称，商品关键词">-->
-<!--              <el-option-->
-<!--                v-for="item in goodsList"-->
-<!--                :key="item.id"-->
-<!--                :label="item.name"-->
-<!--                :value="item.id">-->
-<!--                <span style="float: left">{{ item.name }}</span>-->
-<!--                <span style="float: right; color: #8492a6; font-size: 13px">{{ item.retailPrice }}</span>-->
-<!--              </el-option>-->
-<!--            </el-select>-->
+
           </template>
         </div>
         <div class="center-top-data">
@@ -1115,7 +1080,8 @@
         return name;
       },
       // 挂账
-      addCredits(){
+      addCredits(type){
+        this.typeIdex = type
         this.map.payType = "credit"
         this.dialogVisibleCredit = true
         this.form1.amount = this.oilAmount + this.goodsAmount
@@ -2723,6 +2689,7 @@
           goodsNum:0,
           // 会员消费金额（储值卡需要减少的金额）
           consumeAmount:0,
+          typeIdex:'',
         };
       },
       updateRefuelMoney(){
@@ -2777,6 +2744,7 @@
       },
       // 支付方式
       payMethod(payType){
+        this.typeIdex = payType
         this.map.payType = payType;
         this.payType = payType;
       },
@@ -3099,6 +3067,7 @@
     align-items: center;
     justify-content: center;
     margin-bottom: 10px;
+    cursor: pointer;
 
   }
   .wrap-box2{
diff --git a/gasStation-uni/pagesMy/Coupons/Coupons.vue b/gasStation-uni/pagesMy/Coupons/Coupons.vue
index 62c81b9b9..ec1f0ae93 100644
--- a/gasStation-uni/pagesMy/Coupons/Coupons.vue
+++ b/gasStation-uni/pagesMy/Coupons/Coupons.vue
@@ -28,7 +28,7 @@
 					<view class="title">{{item.couponName}}</view>
 					<view class="hui-size">{{item.couponContent}}</view>
 					<view class="dis-bt">
-						<view class="hui-size">有效期：{{item.createTime || ''}}</view>
+						<view class="hui-size">有效期：{{item.endTime || ''}}</view>
 						<view class="anniu" v-if="item.couponType == '优惠券'"
 							@click="goRecharge(item.id,item.cardRecordId)">
 							<text>立即使用</text>