diff --git a/fuintAdmin/src/views/power/payment/index.vue b/fuintAdmin/src/views/power/payment/index.vue
index db16d294e..f4b1cf33e 100644
--- a/fuintAdmin/src/views/power/payment/index.vue
+++ b/fuintAdmin/src/views/power/payment/index.vue
@@ -291,6 +291,8 @@ export default {
               this.$modal.msgSuccess("添加成功");
               this.getList()
               this.dialogVisible = false
+            }else {
+              this.$modal.msgError("添加失败，此通道暂未配置");
             }
           })
         }
diff --git a/fuintAdmin_zt/src/api/login.js b/fuintAdmin_zt/src/api/login.js
index fca43c04c..11b9aa9ad 100644
--- a/fuintAdmin_zt/src/api/login.js
+++ b/fuintAdmin_zt/src/api/login.js
@@ -26,6 +26,15 @@ export function getInfo() {
   })
 }
 
+// 获取手机验证码
+export function gettelcode(data) {
+  return request({
+    url: 'backendApi/login/sendMsg',
+    method: 'post',
+    data:data
+  })
+}
+
 // 退出方法
 export function logout() {
   return request({
diff --git a/fuintAdmin_zt/src/api/payConfig/merchantconfig.js b/fuintAdmin_zt/src/api/payConfig/merchantconfig.js
index c65cbc22d..0006b2d5e 100644
--- a/fuintAdmin_zt/src/api/payConfig/merchantconfig.js
+++ b/fuintAdmin_zt/src/api/payConfig/merchantconfig.js
@@ -28,6 +28,15 @@ export function editMerchant(data) {
   })
 }
 
+// 修改商户备注信息
+export function editMerchantRemark(data) {
+  return request({
+    url: '/api/merchantConfig/edit',
+    method: 'post',
+    data: data,
+  })
+}
+
 
 // 添加商户使用状态
 export function addMerchantApi(data) {
@@ -44,4 +53,4 @@ export function merchantInfo(id) {
     url: '/api/merchantConfig/'+id,
     method: 'get',
   })
-}
\ No newline at end of file
+}
diff --git a/fuintAdmin_zt/src/views/components/Service/payment.vue b/fuintAdmin_zt/src/views/components/Service/payment.vue
index 75fe90b7a..fb786cc8d 100644
--- a/fuintAdmin_zt/src/views/components/Service/payment.vue
+++ b/fuintAdmin_zt/src/views/components/Service/payment.vue
@@ -38,7 +38,23 @@
           <el-tag v-else effect="dark" type="success" style="float: right">当前使用中</el-tag>
         </div>
         <div>商户编号: {{ item.mchntCd }}</div>
-        <div>备注: <span style="color: #00afff;margin-left: 3px" @click="editRemark(item.id)">{{ item.remark ? item.remark : "--" }}</span></div>
+        <div style="margin-top: 5px">
+          备注: <span style="color: #00afff;margin-left: 3px" @click="editRemark(item.id)">{{ item.remark ? item.remark : "--" }}</span>
+          <span style="margin-left: 150px">
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-edit"
+              @click="handleUpdate(item)"
+            >修改</el-button>
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-delete"
+              @click="handleDelete(item)"
+            >删除</el-button>
+          </span>
+        </div>
       </el-card>
     </div>
     <el-divider></el-divider>
@@ -268,6 +284,16 @@ export default {
     this.getList();
   },
   methods:{
+    handleUpdate(data){
+      merchantInfo(data.id).then(res => {
+        this.title = "商户信息"
+        this.dialogVisible = true
+        this.form1 = res.data
+      })
+    },
+    handleDelete(data){
+
+    },
     // 修改商户备注信息
     submitRemark(){
       editMerchantRemark(this.merchantConfig).then(res => {
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/controller/MerchantConfigController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/controller/MerchantConfigController.java
index 3432f704c..71e202956 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/controller/MerchantConfigController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/controller/MerchantConfigController.java
@@ -66,8 +66,9 @@ public class MerchantConfigController extends BaseController {
     public ResponseObject selectMerchant(@PathVariable Integer id){
         return getSuccessResult(merchantConfigService.selectMerchById(id));
     }
+
     /**
-     * 修改商户备注信息
+     * 修改商户信息
      * @param merchantConfig
      * @return
      */
@@ -75,4 +76,14 @@ public class MerchantConfigController extends BaseController {
     public ResponseObject editMerchantRemark(@RequestBody MerchantConfig merchantConfig){
         return getSuccessResult(merchantConfigService.updateMerchRemark(merchantConfig));
     }
+
+    /**
+     * 删除商户信息
+     * @param id
+     * @return
+     */
+    @DeleteMapping("{id}")
+    public ResponseObject delete(@PathVariable Integer id){
+        return getSuccessResult(merchantConfigService.deleteMerch(id));
+    }
 }
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/MerchantConfigService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/MerchantConfigService.java
index e32487b6b..e87aa2999 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/MerchantConfigService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/MerchantConfigService.java
@@ -90,4 +90,11 @@ public interface MerchantConfigService extends IService<MerchantConfig> {
      * @return
      */
     public int insertMerch(MerchantConfig merchantConfig);
+
+    /**
+     * 根据id删除配置信息
+     * @param id
+     * @return
+     */
+    public int deleteMerch(Integer id);
 }
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/FyPayServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/FyPayServiceImpl.java
index 31bb09987..20ef2f6c0 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/FyPayServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/FyPayServiceImpl.java
@@ -145,7 +145,7 @@ public class FyPayServiceImpl implements FyPayService {
 
             ReceiveParameter receiveParameter = new ReceiveParameter();
             receiveParameter.setOrderNo(orderNo);
-            receiveParameter.setGoodsMoney(allAmount*100);
+            receiveParameter.setGoodsMoney(allAmount/100);
             receiveParameter.setStoreId(storeId1);
             receiveParameter.setPayType(payType);
 
@@ -381,7 +381,9 @@ public class FyPayServiceImpl implements FyPayService {
                     receiveParameter.setContent("积分订单");
                 }
 
-                this.insertAllOrderInfo(receiveParameter,payStatus);
+                if (!reqMap.get("trans_stat").equals("USERPAYING")){
+                    this.insertAllOrderInfo(receiveParameter,payStatus);
+                }
             }
         }catch (Exception e){
             log.error(e.getMessage());
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/MerchantConfigServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/MerchantConfigServiceImpl.java
index b1f09d808..c50b65c14 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/MerchantConfigServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/MerchantConfigServiceImpl.java
@@ -99,10 +99,9 @@ public class MerchantConfigServiceImpl extends ServiceImpl<MerchantConfigMapper,
 
     @Override
     public int updateMerchStatus(MerchantConfig merchantConfig) {
-        AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
         QueryWrapper queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("is_use",1);
-        queryWrapper.eq("store_id",nowAccountInfo.getStoreId());
+        queryWrapper.eq("store_id",merchantConfig.getStoreId());
         List<MerchantConfig> list = baseMapper.selectList(queryWrapper);
         for (MerchantConfig config : list) {
             config.setIsUse("0");
@@ -149,6 +148,7 @@ public class MerchantConfigServiceImpl extends ServiceImpl<MerchantConfigMapper,
             merchantConfig.setPrivateKey(FuYouPublicMerchant.privateKey);
         }else {
             row = 0;
+            return row;
         }
         merchantConfig.setAppid(FuYouPublicMerchant.appid);
         merchantConfig.setAlipayAppid(FuYouPublicMerchant.alipayAppid);
@@ -163,4 +163,9 @@ public class MerchantConfigServiceImpl extends ServiceImpl<MerchantConfigMapper,
         row = baseMapper.insert(merchantConfig);
         return row;
     }
+
+    @Override
+    public int deleteMerch(Integer id) {
+        return baseMapper.deleteById(id);
+    }
 }
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/OilOrderMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/OilOrderMapper.java
index e6bba68d5..231041a00 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/OilOrderMapper.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/OilOrderMapper.java
@@ -45,7 +45,7 @@ public interface OilOrderMapper extends BaseMapper<OilOrder> {
      * @param orderNo
      * @return
      */
-    public List<OilOrderVo> selectOilOrderByOrderNo(@Param("orderNo") String orderNo);
+    public List<OilOrderVo> selectOilOrderByOrderNo(@Param("orderNo") String orderNo,@Param("storeId") Integer storeId);
 
     public Map<String, String> orderAmountStatistics(@Param("startTime") String startTime,@Param("endTime")  String endTime,@Param("storeId")  Integer storeId);
 
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml
index 78d808298..667d1b20b 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml
@@ -45,9 +45,10 @@
     <select id="selectOilOrderByOrderNo" resultType="com.fuint.business.order.vo.OilOrderVo"
             parameterType="string">
         select oil.*,onu.oil_price from oil_order oil
-            inner join oil_number onu on oil.oils = onu.oil_name
+            left join oil_number onu on oil.oils = onu.oil_name
         <where>
             oil.order_no like concat(#{orderNo}, '%')
+            and onu.store_id = #{storeId}
         </where>
     </select>
 
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/ReturnRecordMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/ReturnRecordMapper.xml
index 372d14fda..9321e7e98 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/ReturnRecordMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/ReturnRecordMapper.xml
@@ -12,6 +12,7 @@
         <include refid="selectReturnRecord"></include>
         <where>
             rd.hang_bill_id = #{returnRecord.hangBillId}
+            order by pay_time desc
         </where>
     </select>
 <!--    <select id="selectHangBillById" resultType="com.fuint.business.order.vo.HangBillVo" parameterType="int">-->
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/HangBillServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/HangBillServiceImpl.java
index 288769aff..2f4ec1225 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/HangBillServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/HangBillServiceImpl.java
@@ -11,10 +11,12 @@ import com.fuint.api.fuyou.entity.MerchantConfig;
 import com.fuint.api.fuyou.service.FyPayService;
 import com.fuint.api.fuyou.service.MerchantConfigService;
 import com.fuint.api.fuyou.service.OilConfigService;
+import com.fuint.business.order.entity.AllOrderInfo;
 import com.fuint.business.order.entity.CreditUnit;
 import com.fuint.business.order.entity.HangBill;
 import com.fuint.business.order.entity.ReturnRecord;
 import com.fuint.business.order.mapper.HangBillMapper;
+import com.fuint.business.order.service.AllOrderInfoService;
 import com.fuint.business.order.service.CreditUnitService;
 import com.fuint.business.order.service.HangBillService;
 import com.fuint.business.order.service.ReturnRecordService;
@@ -209,6 +211,7 @@ public class HangBillServiceImpl extends ServiceImpl<HangBillMapper, HangBill> i
                 returnRecord.setPayTime(new Date());
                 Double amount = Double.valueOf(jsonObject.get("repaidAmount").toString());
                 this.updateHangBill(returnRecord.getHangBillId(), amount);
+                this.insertAllOrderInfo(orderNo,(Integer) jsonObject.get("storeId"),Double.valueOf(jsonObject.get("repaidAmount").toString()),map.get("payType"),(Integer) jsonObject.get("creditUnitId"),"PC");
             }else {
                 returnRecord.setCollectAmount(Double.valueOf(jsonObject.get("repaidAmount").toString()));
                 returnRecord.setReturnType("0");
@@ -222,6 +225,26 @@ public class HangBillServiceImpl extends ServiceImpl<HangBillMapper, HangBill> i
         return orderNo;
     }
 
+    @Autowired
+    private AllOrderInfoService allOrderInfoService;
+
+    /**
+     * 添加所有订单信息
+     */
+    private void insertAllOrderInfo(String orderNo,Integer storeId,Double goodsMoney,String payType,Integer userId,String payChannel){
+        AllOrderInfo allOrderInfo = new AllOrderInfo();
+        allOrderInfo.setOrderNo(orderNo);
+        allOrderInfo.setType("7");
+        allOrderInfo.setStoreId(storeId);
+        allOrderInfo.setGoodsMoney(goodsMoney);
+        allOrderInfo.setPayType(payType);
+        allOrderInfo.setUserId(userId);
+        allOrderInfo.setPayChannel(payChannel);
+        allOrderInfo.setStatus("paid");
+        allOrderInfo.setContent("挂账订单");
+        allOrderInfoService.insertAllOrderInfo(allOrderInfo);
+    }
+
     @Override
     public int updateHangBills(HangBill hangBill, Double repaidAmount,String status) {
         HangBill hangBill1 = this.updateStatus(hangBill, repaidAmount);
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java
index ce8615200..4712dd8d6 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java
@@ -151,7 +151,8 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
 
     @Override
     public List<OilOrderVo> queryOilOrderByOrderNo(String orderNo) {
-        List<OilOrderVo> oilOrderVos = baseMapper.selectOilOrderByOrderNo(orderNo);
+        AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+        List<OilOrderVo> oilOrderVos = baseMapper.selectOilOrderByOrderNo(orderNo,nowAccountInfo.getStoreId());
         return oilOrderVos;
     }
 
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/controller/OilGunController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/controller/OilGunController.java
index acad763c0..3660ca759 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/controller/OilGunController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/controller/OilGunController.java
@@ -115,5 +115,14 @@ public class OilGunController extends BaseController {
     public ResponseObject queryGunList(@PathVariable Integer numberId){
         return getSuccessResult(oilGunService.selectOilGunByNumberId(numberId));
     }
+
+    /**
+     * 查询当前店铺所有油枪列表信息
+     * @return
+     */
+    @GetMapping("/queryOilGunList")
+    public ResponseObject selectGunList(){
+        return getSuccessResult(oilGunService.selectOilGuns());
+    }
 }
 
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/controller/OilNumberController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/controller/OilNumberController.java
index b33e6b82c..ce9a0e96f 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/controller/OilNumberController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/controller/OilNumberController.java
@@ -129,6 +129,15 @@ public class OilNumberController extends BaseController {
         return getSuccessResult(oilPresetPricesService.selectOilNumberNameByStoreId(storeId));
     }
 
+    /**
+     * 根据店铺id查询油号信息
+     * @return
+     */
+    @GetMapping("/getOilNumber")
+    public ResponseObject queryOilNumbers(){
+        return getSuccessResult(oilPresetPricesService.selectOilNumberNameByStoreId(null));
+    }
+
 
 }
 
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/service/OilGunService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/service/OilGunService.java
index 0d1a20425..4ee679a44 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/service/OilGunService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/service/OilGunService.java
@@ -67,4 +67,10 @@ public interface OilGunService {
      * @return
      */
     List<OilGun> selectOilGunByNumberId(Integer numberId);
+
+    /**
+     * 根据油号id查询油枪列表信息
+     * @return
+     */
+    List<OilGun> selectOilGuns();
 }
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/service/impl/OilGunServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/service/impl/OilGunServiceImpl.java
index 582087b30..f0ff6aecd 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/service/impl/OilGunServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/service/impl/OilGunServiceImpl.java
@@ -140,7 +140,17 @@ public class OilGunServiceImpl implements OilGunService {
     public List<OilGun> selectOilGunByNumberId(Integer numberId) {
         QueryWrapper queryWrapper = new QueryWrapper();
         queryWrapper.eq("number_id",numberId);
+        queryWrapper.eq("status","启用");
         List<OilGun> list = oilGunDao.selectList(queryWrapper);
         return list;
     }
+
+    @Override
+    public List<OilGun> selectOilGuns() {
+        AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+        QueryWrapper queryWrapper = new QueryWrapper();
+        queryWrapper.eq("store_id",nowAccountInfo.getStoreId());
+        queryWrapper.eq("status","启用");
+        return oilGunDao.selectList(queryWrapper);
+    }
 }
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/service/impl/OilNumberServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/service/impl/OilNumberServiceImpl.java
index 244de6c25..7b44e8914 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/service/impl/OilNumberServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/service/impl/OilNumberServiceImpl.java
@@ -96,6 +96,10 @@ public class OilNumberServiceImpl extends ServiceImpl<OilNumberMapper, OilNumber
 
     @Override
     public List<OilNumberNameVo> selectOilNumberNameByStoreId(Integer storeId) {
+        if (storeId==null){
+            AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+            storeId = nowAccountInfo.getStoreId();
+        }
         return baseMapper.selectOilNumberNameByStoreId(storeId);
     }
 
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserServiceImpl.java
index 7e05bf5d6..c08df71c7 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserServiceImpl.java
@@ -165,8 +165,10 @@ public class LJUserServiceImpl extends ServiceImpl<LJUserMapper, LJUser> impleme
         LJUserVo ljUserVo = new LJUserVo();
         if (ObjectUtil.isNotEmpty(store)){
             ljUserVo = baseMapper.selectUserByMobileAndChantStoreId(mobile,store.getChainStoreId());
+            if (ObjectUtil.isNotEmpty(ljUserVo)){
+                ljUserVo.setStoreId(store.getId());
+            }
         }
-        ljUserVo.setStoreId(store.getId());
         return ljUserVo;
     }
 
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/common/shiroConfig/ShiroConfig.java b/fuintBackend/fuint-application/src/main/java/com/fuint/common/shiroConfig/ShiroConfig.java
index 885765461..00392f9b6 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/common/shiroConfig/ShiroConfig.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/common/shiroConfig/ShiroConfig.java
@@ -35,6 +35,8 @@ public class ShiroConfig {
         filterMap.put("/clientApi/captcha/getCode","anon");
         filterMap.put("/clientApi/sign/**","anon");
         filterMap.put("/backendApi/login/loginByPhone","anon");
+        filterMap.put("/backendApi/login/getInfo","anon");
+        filterMap.put("/backendApi/login/logout","anon");
         /*filterMap.put("/business/largeSscreen","anon");
         filterMap.put("/business/largeSscreen/goods","anon");
         filterMap.put("/business/largeSscreen/staff","anon");
diff --git a/fuintCashierWeb/src/api/cashier/oilGuns.js b/fuintCashierWeb/src/api/cashier/oilGuns.js
index 90ff565a1..a5110d209 100644
--- a/fuintCashierWeb/src/api/cashier/oilGuns.js
+++ b/fuintCashierWeb/src/api/cashier/oilGuns.js
@@ -16,3 +16,27 @@ export function getOilTank(id) {
     method: 'get',
   })
 }
+
+// 查询油罐信息
+export function getOilGunInfo(numberId) {
+  return request({
+    url: '/business/petrolStationManagement/oilGun/queryGunList/'+numberId,
+    method: 'get',
+  })
+}
+
+// 查询油罐信息
+export function getOilGuns() {
+  return request({
+    url: '/business/petrolStationManagement/oilGun/queryOilGunList',
+    method: 'get',
+  })
+}
+
+// 查询油罐信息
+export function getOilNumberGun() {
+  return request({
+    url: '/business/petrolStationManagement/oilGun/selectByNumberTGUn',
+    method: 'get',
+  })
+}
diff --git a/fuintCashierWeb/src/api/cashier/oilnumber.js b/fuintCashierWeb/src/api/cashier/oilnumber.js
index a3c253db1..f277d87ac 100644
--- a/fuintCashierWeb/src/api/cashier/oilnumber.js
+++ b/fuintCashierWeb/src/api/cashier/oilnumber.js
@@ -17,3 +17,13 @@ export function oilNumberList() {
     // data: data
   })
 }
+
+
+// 查询所有油号
+export function oilNumbers() {
+  return request({
+    url: '/business/petrolStationManagement/oilNumber/getOilNumber',
+    method: 'get',
+    // data: data
+  })
+}
diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/Integral.vue b/fuintCashierWeb/src/views/cashier/NewComponents/Integral.vue
index fe9421891..f2fdd99d9 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/Integral.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/Integral.vue
@@ -15,7 +15,7 @@
                  background-color: rgb(67,119,204)">
                 <div>
                   <template>
-                    <img v-if="member.avatar" class="list-avatar" :src="member.avatar">
+                    <img v-if="member.avatar" class="list-avatar" :src="baseUrl + member.avatar">
                     <img v-else class="list-avatar" src="@/assets/images/avatar.png">
                   </template>
                 </div>
@@ -218,12 +218,12 @@
         title="请选择会员"
         :visible.sync="dialogVisibleMember"
         :close-on-click-modal="false">
-        <div class="wrap-wrap">
+        <div class="wrap-wrap" style="height:700px;overflow-y: scroll;">
           <el-table ref="tables" :data="memberList">
             <el-table-column label="ID" align="center" prop="id" width="80" />
             <el-table-column label="头像" align="center" width="70">
               <template slot-scope="scope">
-                <img v-if="scope.row.avatar" class="list-avatar" :src="scope.row.avatar">
+                <img v-if="scope.row.avatar" class="list-avatar" :src="baseUrl + scope.row.avatar">
                 <img v-else class="list-avatar" src="@/assets/images/avatar.png">
               </template>
             </el-table-column>
@@ -408,6 +408,7 @@ import {getUserInfoMobile, getUserVoMobile, getUserVoName} from "@/api/cashier/u
       dict: [],
       data(){
           return{
+            baseUrl:process.env.VUE_APP_BASE_API,
             shoppingCart:[],
             giftList:'',
             giftCategoryList:'',
@@ -573,7 +574,7 @@ import {getUserInfoMobile, getUserVoMobile, getUserVoName} from "@/api/cashier/u
             })
           }else {
             getUserVoName({name:this.userNo}).then( response => {
-              this.memberList = response.data
+              this.memberList = response.data.userVo
             })
             this.dialogVisibleMember = true;
           }
@@ -623,6 +624,7 @@ import {getUserInfoMobile, getUserVoMobile, getUserVoName} from "@/api/cashier/u
           this.allAmout=0
           this.allMoneyRatio=0
           this.paymentType = ''
+          this.resetMember()
         },
         // 打开购物车
         shoppingCartMethod() {
@@ -888,7 +890,7 @@ import {getUserInfoMobile, getUserVoMobile, getUserVoName} from "@/api/cashier/u
 
           }
           this.paymentType = ''
-
+          this.reset()
         },
         // 清楚数据
         handClose(){
@@ -1149,7 +1151,7 @@ import {getUserInfoMobile, getUserVoMobile, getUserVoName} from "@/api/cashier/u
   }
 
   .wrap-box2{
-    background: #36b713 !important;
+    background: #30a1ff !important;
     color: white;
     //width: 100%;
     //height: 100%;
diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/credit.vue b/fuintCashierWeb/src/views/cashier/NewComponents/credit.vue
index b0370ece4..24479a57c 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/credit.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/credit.vue
@@ -139,7 +139,7 @@
                 </el-form>
               </template>
             </el-table-column>
-            <el-table-column prop="orderNo" label="单据号" width="200"></el-table-column>
+            <el-table-column prop="orderNo" label="单据号" width="220"></el-table-column>
             <el-table-column label="挂账单位">
               <el-table-column prop="unitName" label="单位名称"> </el-table-column>
               <el-table-column prop="personCredit" label="挂账人"> </el-table-column>
diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue
index 6273fd73e..c6b6136ee 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue
@@ -196,10 +196,12 @@
           <div class="wrap-box" v-for="item in payList"
                :key="item.dictValue"
                :value="item.dictValue"
+               :class="{ 'wrap-box2': item.dictValue === map.payType }"
                @click="payMethod(item.dictValue)">
             <span>{{ item.dictLabel }}</span>
           </div>
-          <div class="wrap-box" >
+          <div class="wrap-box" value="credit"
+               :class="{ 'wrap-box2': 'credit' === map.payType }" >
             <span @click="addCredits">挂账</span>
           </div>
         </div>
@@ -1114,6 +1116,7 @@
       },
       // 挂账
       addCredits(){
+        this.map.payType = "credit"
         this.dialogVisibleCredit = true
         this.form1.amount = this.oilAmount + this.goodsAmount
       },
@@ -2237,6 +2240,7 @@
       chooseStaff(data){
         this.staff = data;
         this.map.staffId = this.staff.id;
+        this.dialogVisible = false
       },
       // 删除商品列表信息
       delGoods(index){
@@ -2553,7 +2557,7 @@
           this.gunList.forEach(item => {
             if (item.id==data.id){
               this.form.id = item.id
-              this.form.gunName = item.gunName
+              this.form.gunName = item.id
             }
           })
         })
@@ -3083,6 +3087,20 @@
     margin-bottom: 10px;
 
   }
+  .wrap-box2{
+    background: #30a1ff !important;
+    color: white;
+    //width: 100%;
+    //height: 100%;
+    //border-radius: 8px;
+    //height: 80px;
+    //display: flex;
+    //align-items: center;
+    //justify-content: center;
+    //border: 1px solid #20b400;
+    //cursor: pointer;
+    //color: #20b400;
+  }
   .wrap-box :hover{
     /*background: #00afff !important;*/
     width: 100%;
diff --git a/fuintCashierWeb/src/views/cashier/index.vue b/fuintCashierWeb/src/views/cashier/index.vue
index 4c80e0f82..da62b9949 100644
--- a/fuintCashierWeb/src/views/cashier/index.vue
+++ b/fuintCashierWeb/src/views/cashier/index.vue
@@ -203,9 +203,9 @@
 <!--    <Handover v-if="leftindex == 7"></Handover>-->
     <router-view/>
 
-    <div style="width: 100%;padding:200px " v-if="leftindex != 0 && leftindex != 1 && leftindex != 2  && leftindex != 3  && leftindex != 4 && leftindex != 5 && leftindex != 6 && leftindex != 7  && leftindex != 9">
-      <el-empty  description="暂未开发"></el-empty>
-    </div>
+<!--    <div style="width: 100%;padding:200px " v-if="leftindex != 0 && leftindex != 1 && leftindex != 2  && leftindex != 3  && leftindex != 4 && leftindex != 5 && leftindex != 6 && leftindex != 7  && leftindex != 9">-->
+<!--      <el-empty  description="暂未开发"></el-empty>-->
+<!--    </div>-->
 
 
 
diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue b/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue
index 2ad8f1b49..8682bd074 100644
--- a/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue
+++ b/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue
@@ -2,18 +2,6 @@
 <template>
   <div>
     <el-card class="box-card">
-<!--      <div style="display: flex;">-->
-<!--        <div class="top-app-sou">-->
-<!--          <el-form :label-position="labelPosition" label-width="40px" :model="formLabelAlign">-->
-<!--            <el-form-item label="名称">-->
-<!--              <el-input v-model="formLabelAlign.name" placeholder="请输入要搜索的内容"></el-input>-->
-<!--            </el-form-item>-->
-<!--          </el-form>-->
-<!--        </div>-->
-<!--        <div style="margin-left: 10px">-->
-<!--          <el-button type="primary" icon="el-icon-search">搜索</el-button>-->
-<!--        </div>-->
-<!--      </div>-->
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
         <el-form-item label="交易员工" prop="staffId">
           <el-select
@@ -28,7 +16,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="订单号">
-          <el-input v-model="queryParams.orderNo" placeholder="订单号、官方单号检索"></el-input>
+          <el-input v-model="queryParams.orderNo" clearable placeholder="订单号、官方单号检索"></el-input>
         </el-form-item>
         <el-form-item label="交易时间">
           <el-date-picker
@@ -104,31 +92,24 @@
               </el-form>
             </template>
           </el-table-column>
-          <el-table-column prop="orderNo" label="订单号" width="180"> </el-table-column>
+          <el-table-column prop="orderNo" label="订单号" width="220"> </el-table-column>
           <el-table-column prop="amount" label="订单金额"> </el-table-column>
-          <el-table-column
-            prop="payAmount"
-            label="实付金额">
-          </el-table-column>
+          <el-table-column prop="payAmount" label="实付金额"> </el-table-column>
           <el-table-column label="订单金额组成">
-            <el-table-column
-              prop="oilOrderAmount"
-              label="油品金额">
+            <el-table-column prop="oilOrderAmount" label="油品金额">
+              <template slot-scope="scope">
+                <span>{{scope.row.oilOrderAmount ? scope.row.oilOrderAmount : '0'}}</span>
+              </template>
             </el-table-column>
-            <el-table-column
-              prop="goodsOrderAmount"
-              label="商品金额">
+            <el-table-column prop="goodsOrderAmount" label="商品金额">
+              <template slot-scope="scope">
+                <span>{{scope.row.goodsOrderAmount ? scope.row.goodsOrderAmount : '0'}}</span>
+              </template>
             </el-table-column>
           </el-table-column>
 
-          <el-table-column
-            prop="payUser"
-            label="付款用户">
-          </el-table-column>
-
-          <el-table-column
-            prop="status"
-            label="状态">
+          <el-table-column prop="payUser" label="付款用户"> </el-table-column>
+          <el-table-column prop="status" label="状态">
             <template slot-scope="scope">
               <el-tag v-if="scope.row.status == 'unpaid'">未支付</el-tag>
               <el-tag type="success" v-else-if="scope.row.status == 'paid'">已支付</el-tag>
@@ -208,7 +189,7 @@
               </el-table-column>
               <el-table-column label="油号油枪" align="center" prop="terminal">
                 <template slot-scope="scope">
-                  <span>{{ getName(oilNameList,scope.row.oils) }}/{{ scope.row.oilGunNum }}号枪</span>
+                  <span>{{ getName(oilNameList,scope.row.oils) }}/{{ scope.row.oilGunNum }}</span>
                 </template>
               </el-table-column>
               <el-table-column label="加油升数" align="center" prop="oilNum" >
diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/order_Oil.vue b/fuintCashierWeb/src/views/cashier/orderComponents/order_Oil.vue
index a341a58cd..7cd0367d1 100644
--- a/fuintCashierWeb/src/views/cashier/orderComponents/order_Oil.vue
+++ b/fuintCashierWeb/src/views/cashier/orderComponents/order_Oil.vue
@@ -45,7 +45,7 @@
               </el-select>
             </el-form-item>
             <el-form-item label="手机号">
-              <el-input v-model="queryParams.payUser" placeholder="请输入手机号"></el-input>
+              <el-input v-model="queryParams.payUser" clearable placeholder="请输入手机号"></el-input>
             </el-form-item>
             <el-form-item label="油枪号" prop="oilGunNum">
               <el-select
@@ -54,17 +54,17 @@
                 clearable
                 placeholder="全部"
               >
-                <el-option v-for="item in oilNumList"
+                <el-option v-for="item in oilGunList"
                            :key="item.id"
-                           :label="item.oilGunNum"
+                           :label="item.gunName"
                            :value="item.id">
-                  <span style="float: left">{{ getName(oilNameList,item.oilName) }}</span>
-                  <span style="float: right; color: #8492a6; font-size: 13px">{{ item.oilGunNum }}号枪</span>
+                  <span style="float: left">{{ item.oilName }}</span>
+                  <span style="float: right; color: #8492a6; font-size: 13px">{{ item.gunName }}</span>
                 </el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="订单号">
-              <el-input v-model="queryParams.orderNo" placeholder="订单号、官方单号检索"></el-input>
+              <el-input v-model="queryParams.orderNo" clearable placeholder="订单号、官方单号检索"></el-input>
             </el-form-item>
             <el-form-item label="交易时间">
               <el-date-picker
@@ -166,47 +166,26 @@
               <span>{{ getVal(terminalList,props.row.terminal) }}</span>
             </template>
           </el-table-column>
-          <el-table-column
-            prop="orderNo"
-            label="订单号"
-            width="200">
-          </el-table-column>
+          <el-table-column prop="orderNo" label="订单号" width="220"> </el-table-column>
           <el-table-column label="订单信息" align="center">
-            <el-table-column
-              prop="oilGunNum"
-              label="油品/油枪" align="center"
-              width="120">
+            <el-table-column prop="oilGunNum" label="油品/油枪" align="center" width="120">
               <template slot-scope="props">
-                <span>{{ getName(oilNameList,props.row.oils) }}/{{ props.row.oilGunNum }}</span>
+                <span>{{ getName(oilNameList,props.row.oils) }}/{{ getName1(oilGunList,props.row.oilGunNum) }}</span>
               </template>
             </el-table-column>
-            <el-table-column
-              prop="orderAmount"
-              label="订单金额" align="center"
-              width="120">
-            </el-table-column>
-            <el-table-column
-              prop="discountAmount"
-              label="优惠金额" align="center"
-              width="120">
-            </el-table-column>
+            <el-table-column prop="orderAmount" label="订单金额" align="center" width="120">  </el-table-column>
+            <el-table-column prop="discountAmount" label="优惠金额" align="center" width="120">  </el-table-column>
 
           </el-table-column>
           <el-table-column label="付款信息" align="center">
-            <el-table-column
-              prop="payAmount"
-              label="实付金额" align="center"
-              width="120">
+            <el-table-column prop="payAmount" label="实付金额" align="center" width="120"> </el-table-column>
+            <el-table-column prop="payUser" label="付款用户" align="center" > </el-table-column>
+            <el-table-column prop="payType" label="付款方式" align="center" width="120">
+              <template slot-scope="scope">
+                <span>{{getType(payList,scope.row.payType)}}</span>
+              </template>
             </el-table-column>
-            <el-table-column
-              prop="payUser"
-              label="付款用户" align="center"
-              width="120">
-            </el-table-column>
-            <el-table-column
-              prop="orderStatus"
-              label="付款状态" align="center"
-              width="120">
+            <el-table-column prop="orderStatus" label="付款状态" align="center" width="120">
               <template slot-scope="scope">
                 <el-tag v-if="scope.row.orderStatus == 'unpaid'">未支付</el-tag>
                 <el-tag type="success" v-else-if="scope.row.orderStatus == 'paid'">已支付</el-tag>
@@ -214,11 +193,7 @@
               </template>
             </el-table-column>
           </el-table-column>
-          <el-table-column
-            prop="invoicing"
-            label="开票标识" align="center"
-            width="220">
-          </el-table-column>
+          <el-table-column prop="invoicing" label="开票标识" align="center" > </el-table-column>
 
             <el-table-column label="交易时间" align="center" width="160" prop="payTime">
               <template slot-scope="scope">
@@ -228,7 +203,6 @@
 
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
             <template slot-scope="scope">
-<!--              <el-button size="mini" type="text" icon="el-icon-edit" >更多操作</el-button>-->
               <el-button style="width: 60px" size="mini"
                          @click="patchwork(scope.row)"
                          type="primary" plain round>补打</el-button>
@@ -289,6 +263,8 @@
   import {getOilNameList, getOilNumGun } from "@/api/cashier/oilnumgun";
   import {listOilOrder, oilOrderInfo, orderStatisticsApi} from "@/api/cashier/oilorder";
   import {getUser} from "@/api/cashier/user/user";
+  import {oilNumberList, oilNumbers} from "@/api/cashier/oilnumber";
+  import {getOilGuns, getOilNumberGun} from "@/api/cashier/oilGuns";
 
   export default {
     name: "order_Cashier",
@@ -313,12 +289,15 @@
         dateRange: [],
         // 油品订单列表
         oilOrderList:[],
+        payTypeList:[],
         // 查询参数
         queryParams: {
           page: 1,
           pageSize: 10,
         },
         total:0,
+        // 油枪列表
+        oilGunList:[],
 
         orderStatistics: {
           numberOfOilPens:'0',
@@ -336,8 +315,29 @@
       this.getStaffList();
       this.getOrderStatistics();
       this.getList();
+      this.getPayType();
+      this.getOilGunList();
     },
     methods:{
+      // 获取油枪信息
+      getOilGunList(){
+        getOilNumberGun().then(res => {
+          console.log(res)
+          res.data.forEach(item => {
+            if (item.oilGunList.length>0){
+              item.oilGunList.forEach(i => {
+                i.oilName = item.oilName
+                this.oilGunList.push(i)
+              })
+            }
+          })
+        })
+      },
+      getPayType(){
+        getDicts("payment_type").then(res => {
+          this.payTypeList = res.data
+        })
+      },
       // 订单统计
       getOrderStatistics() {
         orderStatisticsApi().then(res=>{
@@ -370,6 +370,15 @@
         })
         return name;
       },
+      getType(list,val){
+        let name = "";
+        list.forEach(item => {
+          if (item.dictValue == val){
+            name = item.dictLabel
+          }
+        })
+        return name;
+      },
       // 根据id查询会员信息
       async queryUser(id){
         let result = "";
@@ -428,8 +437,8 @@
         getOilNameList().then( response => {
           this.oilNameList = response.data;
         })
-        getOilNumGun({oilNum : "全部"}).then( response => {
-          this.oilNumList = response.data
+        oilNumbers().then(response => {
+          this.oilNumList = response.data;
         })
       },
       // 获取油号名称
@@ -446,6 +455,19 @@
         }
         return name;
       },
+      // 获取油枪名称
+      getName1(oilNameList,id){
+        let name = ""
+        let _this = this;
+        if(oilNameList!=null && oilNameList!=""){
+          oilNameList.forEach(item => {
+            if (item.id == id){
+              name = item.gunName;
+            }
+          })
+        }
+        return name;
+      },
     }
   }
 </script>
diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/order_Unpaid.vue b/fuintCashierWeb/src/views/cashier/orderComponents/order_Unpaid.vue
index bdc5eae0e..fab9f847a 100644
--- a/fuintCashierWeb/src/views/cashier/orderComponents/order_Unpaid.vue
+++ b/fuintCashierWeb/src/views/cashier/orderComponents/order_Unpaid.vue
@@ -41,7 +41,7 @@
 <!--          </el-select>-->
 <!--        </el-form-item>-->
         <el-form-item label="手机号">
-          <el-input v-model="queryParams.payUser" placeholder="请输入手机号"></el-input>
+          <el-input v-model="queryParams.payUser" clearable placeholder="请输入手机号"></el-input>
         </el-form-item>
         <el-form-item label="油枪号" prop="oilGunNum">
           <el-select
@@ -50,17 +50,17 @@
             clearable
             placeholder="全部"
           >
-            <el-option v-for="item in oilNumList"
+            <el-option v-for="item in oilGunList"
                        :key="item.id"
-                       :label="item.oilGunNum"
+                       :label="item.gunName"
                        :value="item.id">
-              <span style="float: left">{{ getName(oilNameList,item.oilName) }}</span>
-              <span style="float: right; color: #8492a6; font-size: 13px">{{ item.oilGunNum }}号枪</span>
+              <span style="float: left">{{ item.oilName }}</span>
+              <span style="float: right; color: #8492a6; font-size: 13px">{{ item.gunName }}号枪</span>
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="订单号">
-          <el-input v-model="queryParams.orderNo" placeholder="订单号、官方单号检索"></el-input>
+          <el-input v-model="queryParams.orderNo" clearable placeholder="订单号、官方单号检索"></el-input>
         </el-form-item>
 <!--        <el-form-item label="交易时间">-->
 <!--          <el-date-picker-->
@@ -148,7 +148,7 @@
           <el-table-column prop="terminal" label="终端" align="center" width="80"></el-table-column>
           <el-table-column prop="oils" label="油品/油枪" align="center">
             <template slot-scope="props">
-              <span>{{ getName(oilNameList,props.row.oils) }}/{{ props.row.oilGunNum }}号枪</span>
+              <span>{{ getName(oilNameList,props.row.oils) }}/{{ getName1(oilGunList,props.row.oilGunNum) }}</span>
             </template>
           </el-table-column>
           <el-table-column label="订单信息" align="center">
@@ -209,6 +209,7 @@
   import {getDicts} from "@/api/dict/data";
   import {getOilNameList, getOilNumGun} from "@/api/cashier/oilnumgun";
   import {queryStaffs} from "@/api/cashier/staff";
+  import {getOilNumberGun} from "@/api/cashier/oilGuns";
 
   export default {
     name: "order_Cashier",
@@ -249,15 +250,44 @@
           wechat:'0',
           alipay:'0',
           cash:'0',
-        }
+        },
+        oilGunList:[],
       }
     },
     created() {
       this.getList();
       this.getOrderStatistics();
       this.getPayList();
+      this.getOilGunList();
     },
     methods:{
+      // 获取油枪信息
+      getOilGunList(){
+        getOilNumberGun().then(res => {
+          console.log(res)
+          res.data.forEach(item => {
+            if (item.oilGunList.length>0){
+              item.oilGunList.forEach(i => {
+                i.oilName = item.oilName
+                this.oilGunList.push(i)
+              })
+            }
+          })
+        })
+      },
+      // 获取油枪名称
+      getName1(oilNameList,id){
+        let name = ""
+        let _this = this;
+        if(oilNameList!=null && oilNameList!=""){
+          oilNameList.forEach(item => {
+            if (item.id == id){
+              name = item.gunName;
+            }
+          })
+        }
+        return name;
+      },
       // 获取订单统计信息
 
       getOrderStatistics() {
diff --git a/gasStation-uni/config.js b/gasStation-uni/config.js
index a8e4a127c..1b9f11cf4 100644
--- a/gasStation-uni/config.js
+++ b/gasStation-uni/config.js
@@ -3,7 +3,7 @@ module.exports = {
 	// baseUrl: 'https://vue.ruoyi.vip/prod-api',
 	// baseUrl: 'http://192.168.0.196:8081/',
 	// baseUrl: 'http://192.168.1.4:8080/',
-	baseUrl: 'http://192.168.0.178:8008/',
+	baseUrl: 'http://192.168.0.138:8008/',
 
 	// baseUrl: 'http://192.168.1.5:8002/cdJdc',
 
@@ -30,4 +30,4 @@ module.exports = {
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/gasStation-uni/pagesLogin/login/login.vue b/gasStation-uni/pagesLogin/login/login.vue
index 106e68f2e..05675eb60 100644
--- a/gasStation-uni/pagesLogin/login/login.vue
+++ b/gasStation-uni/pagesLogin/login/login.vue
@@ -71,7 +71,7 @@
 								authCode: authCode,
 								storeId: 0,
 								staffId: "",
-								phone: "16548796325",
+								phone: "18457621459",
 							},
 						}).then((resp) => {
 							console.log(resp)
@@ -347,4 +347,4 @@
 		border: 1px solid #0078FF;
 		color: white;
 	}
-</style>
\ No newline at end of file
+</style>