diff --git a/config/index.js b/config/index.js index 5367816..9e5d49a 100644 --- a/config/index.js +++ b/config/index.js @@ -26,7 +26,7 @@ module.exports = { assetsPublicPath: "/", proxyTable: { "/api": { - //target: "http://192.168.31.209:8084/", //设置你调用的接口域名和端口号 别忘了加http 本地 + target: "http://192.168.31.127:8084/", //设置你调用的接口域名和端口号 别忘了加http 本地 // target: "http://192.168.31.201:8084/", //设置你调用的接口域名和端口号 别忘了加http 本地 // target: "http://139.9.185.131:8098/", //设置你调用的接口域名和端口号 别忘了加http 天懿达正式 // target: "http://139.9.58.205:8084/", //设置你调用的接口域名和端口号 别忘了加http 天懿达正式华为云 @@ -34,7 +34,7 @@ module.exports = { // target: "http://139.9.185.131:8084/", //设置你调用的接口域名和端口号 别忘了加http 天懿达正式 // target: "http://192.168.31.209:8084/", //设置你调用的接口域名和端口号 别忘了加http 天懿达线上 - target: "https://www.decaisoft.com/preferential", //设置你调用的接口域名和端口号 别忘了加http 天懿达线上 + // target: "https://www.decaisoft.com/preferential", //设置你调用的接口域名和端口号 别忘了加http 天懿达线上 // target: 'http://124.71.99.140:8084/', //设置你调用的接口域名和端口号 别忘了加http 线上 // target: 'http://124.71.99.140:8081/', //设置你调用的接口域名和端口号 别忘了加http 测试 // target: 'https://www.decaisoft.com:8088/', //设置你调用的接口域名和端口号 别忘了加http 测试 @@ -46,7 +46,7 @@ module.exports = { } }, // Various Dev Server settingsss - host: "192.168.31.35", // can be overwritten by process.env.HOST + host: "192.168.31.194", // can be overwritten by process.env.HOST port: 3000, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined autoOpenBrowser: false, errorOverlay: true, diff --git a/src/api/eashier.js b/src/api/eashier.js index 007871f..3b617a7 100644 --- a/src/api/eashier.js +++ b/src/api/eashier.js @@ -1,6 +1,14 @@ import { service } from "../utils/service"; import { localPath } from "./api.js"; +export function succsee() { + return service({ + url: "/api" + "/demay/ssm/cash/success", + method: "get", + + }); +} + // 门店明细查询 平台端-门店管理-门店审核-门店明细查询 export function storeOne(params) { return service({ diff --git a/src/pages/eashier/collectionList/collectionList.vue b/src/pages/eashier/collectionList/collectionList.vue index 2695d4b..9768dfa 100644 --- a/src/pages/eashier/collectionList/collectionList.vue +++ b/src/pages/eashier/collectionList/collectionList.vue @@ -36,8 +36,8 @@
标准 - - + +
@@ -379,6 +379,7 @@ import { recAccountList, recTypeOne, selectOne, + succsee, } from "@/api/eashier.js"; import addmember from "@/components/member/edit/index"; import admin from "@/components/staffList/admin/index"; @@ -387,6 +388,7 @@ import staffsles from "@/components/staffList/staff/index"; import member from "@/components/member/index"; import selec from "@/components/store/select/index"; import Template from "../../discount-coupon/issue/components/template.vue"; + export default { components: { member, @@ -491,6 +493,8 @@ export default { }; }, methods: { + + close() { this.listDialogVisible = false; }, @@ -564,6 +568,19 @@ export default { if (v != 0) { this.getRecList(); } + + if(this.sessionStorageData.recDebt&&this.debtMoneys){ + this.$alert("存在欠款不允许升降级", "提示", { + confirmButtonText: "确定", + confirmButtonClass: "confirmbtnFalses", + type: "warning", + center: true, + callback: (action) => {}, + }); + this.liftType=0 + } + + }, openRec(number) { console.log(number); @@ -729,7 +746,22 @@ export default { //打开选择会员弹窗 openMember() { this.$refs.member.show(this.vip); + succsee().then((res) => { + if (res.code == "000000") { + this.$alert(res.message, "提示", { + confirmButtonText: "确定", + confirmButtonClass: "confirmbtnFalses", + type: "info", + center: true, + callback: (action) => {}, + }); + } else { + + } + }); }, + + //选中会员返回方法 memberData(v) { this.form.mobilePhone = v.mobilePhone; @@ -910,6 +942,7 @@ export default { }, openAddMember() { this.$refs.addmember.show("添加"); + console.log("a") }, memberAdd(v) { this.form.mobilePhone = v.mobilePhone;