-
-
+
-
+
{
+ if(res.code == 200){
+ this.tableData = res.data.records
+ this.total = res.data.total;
+ }
+ })*/
this.oilList = []
oilName(this.queryParams.type).then(res=>{
this.oilList = res.data.records
console.log('我的油站' ,res)
})
+
},
getlist(){
this.queryParams.pageNo=this.pageNo
diff --git a/fuintAdmin/src/views/convenienceStore/goodsFile.vue b/fuintAdmin/src/views/convenienceStore/goodsFile.vue
index df3751b1f..f04e21e64 100644
--- a/fuintAdmin/src/views/convenienceStore/goodsFile.vue
+++ b/fuintAdmin/src/views/convenienceStore/goodsFile.vue
@@ -211,21 +211,21 @@
-
+
元
-
+
元
-
+
元
@@ -258,7 +258,7 @@
-
+
diff --git a/fuintAdmin/src/views/member/userInfo.vue b/fuintAdmin/src/views/member/userInfo.vue
index fbf9ffc42..7df24b14b 100644
--- a/fuintAdmin/src/views/member/userInfo.vue
+++ b/fuintAdmin/src/views/member/userInfo.vue
@@ -37,7 +37,7 @@
{{ form.consumeNum }}
- {{ form.refuelMoney ? form.refuelMoney : "--" }}
+ {{ allAmount || 0 }}
{{ form.createTime }}
@@ -105,7 +105,7 @@
@@ -797,6 +797,7 @@ import {
editCardValueChild,
listCardValueChild, listCardValueChildOrder
} from "@/api/staff/user/cardvaluechild";
+import {getOilOrderAllAmount} from "@/api/order/oilorder";
export default {
components: {
@@ -925,7 +926,10 @@ export default {
id: '',
// 会员信息
form: {},
+ refuelMoney:0,
form1: {},
+ // 加油总金额
+ allAmount:0,
// 店铺信息
store: '',
// 会员等级信息
@@ -975,6 +979,7 @@ export default {
this.getStore();
this.getCardList()
this.getOrderList()
+ this.getAllAmount()
},
methods: {
handleQuery(){
@@ -1054,7 +1059,6 @@ export default {
allFixingLevel().then(res => {
if (res.code == 200) {
this.fixingLevelList = res.data
- console.log(res.data)
}
})
},
@@ -1107,9 +1111,9 @@ export default {
await getCardValueListApi(quy).then(res => {
this.cardValueList = res.data.records;
this.cardValueList.sort((a, b) => a.rechargeBalance - b.rechargeBalance);
- console.log("this.grade.name",this.grade)
+ // console.log("this.grade.name",this.grade)
})
- console.log("this.cardValueList", this.grade)
+ // console.log("this.cardValueList", this.grade)
if (this.cardValueList.length > 0) {
// 过滤
@@ -1130,7 +1134,7 @@ export default {
// this.cardValueForm.amount = null
this.$set(this.cardValueForm, 'amount', data);
- console.log("data17.16", this.cardValueForm.amount)
+ // console.log("data17.16", this.cardValueForm.amount)
if (!data) {
this.cardValueForm.amount = ''
@@ -1241,7 +1245,7 @@ export default {
},
// 根据油品过滤查询存油卡
async tabOilTypeClick(data) {
- console.log("aaaaaaaaaaaaaa",data)
+ // console.log("aaaaaaaaaaaaaa",data)
await this.getCardFuelDieselList()
this.cardFuelDieselList = this.sourceCardFuelDieselList.filter(item => {
@@ -1253,7 +1257,7 @@ export default {
},
selectOilType(status, oilType) {
this.tabOilType = oilType;
- console.log("453",oilType)
+ // console.log("453",oilType)
this.tabOilTypeClick(oilType);
},
// 查询员工
@@ -1334,10 +1338,18 @@ export default {
// 获取会员详情
getUser(this.id).then(response => {
this.form = response.data;
- console.log(response.data)
+ if (response.data.refuelMoney){
+ let refuelMoney = JSON.parse(response.data.refuelMoney)
+ _this.refuelMoney = parseFloat(refuelMoney[0].refuelMoney)
+ }
this.getGrade(response.data.gradeId);
});
},
+ getAllAmount(){
+ getOilOrderAllAmount(this.id).then(res => {
+ this.allAmount = res.data
+ })
+ },
// 获取会员等级详情
getGrade(id) {
getUserGradeInfo(id).then(response => {
@@ -1352,7 +1364,7 @@ export default {
},
// 选择余额充值金额
rechargeCard(index, item) {
- console.log("index", index)
+ // console.log("index", index)
// this.cardValueForm.amount = null,
this.cardValueForm.rechargeType = 0
@@ -1406,7 +1418,7 @@ export default {
let file = {}
// 拿到金额
file = this.cardFuelDieselList[index]
- console.log("file",file)
+ // console.log("file",file)
this.cardFuelDieselForm.points = file.points
this.cardFuelDieselForm.rechargeBalance = file.rechargeBalance
this.cardFuelDieselForm.oilType = file.oilType
@@ -1488,12 +1500,12 @@ export default {
this.$message.error('请先扫码');
return
}
- console.log("cardFuelDieselForm",this.cardFuelDieselForm)
+ // console.log("cardFuelDieselForm",this.cardFuelDieselForm)
this.cardFuelDieselForm.mtUserId = userForm.id
this.cardFuelDieselForm.name = userForm.name
this.cardFuelDieselForm.mobile = userForm.mobile
this.cardFuelDieselForm.authCode = this.authCode
- console.log("this.cardFuelDieselForm",this.cardFuelDieselForm)
+ // console.log("this.cardFuelDieselForm",this.cardFuelDieselForm)
let id;
diff --git a/fuintAdmin/src/views/oilConfig/oilTank/list.vue b/fuintAdmin/src/views/oilConfig/oilTank/list.vue
index 2b34c9dda..a05009aab 100644
--- a/fuintAdmin/src/views/oilConfig/oilTank/list.vue
+++ b/fuintAdmin/src/views/oilConfig/oilTank/list.vue
@@ -93,7 +93,7 @@
-
+
-
+
{{tankForm.unit}}
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..537988303 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,13 @@ export function merchantInfo(id) {
url: '/api/merchantConfig/'+id,
method: 'get',
})
-}
\ No newline at end of file
+}
+
+// 根据id删除商户配置信息
+export function deleteMerchant(id) {
+ return request({
+ url: '/api/merchantConfig/'+id,
+ method: 'delete',
+ })
+}
+
diff --git a/fuintAdmin_zt/src/views/components/Service/payment.vue b/fuintAdmin_zt/src/views/components/Service/payment.vue
index 75fe90b7a..12248b710 100644
--- a/fuintAdmin_zt/src/views/components/Service/payment.vue
+++ b/fuintAdmin_zt/src/views/components/Service/payment.vue
@@ -38,7 +38,25 @@
当前使用中
商户编号: {{ item.mchntCd }}
- 备注: {{ item.remark ? item.remark : "--" }}
+
+
+ 备注: {{ item.remark ? item.remark : "--" }}
+
+
+ 修改
+ 删除
+
+