diff --git a/apis/apis.js b/apis/apis.js index 23e848d..5c369a8 100644 --- a/apis/apis.js +++ b/apis/apis.js @@ -777,6 +777,14 @@ const rfidBinding = { header ); }, + async bindRfidClose(data = {}, header = {}) { + return await Http.post( + HttpConfig.basePath, + HttpConfig.serviceUrl.rfidBinding.bindRfidClose, + data, + header + ); + }, }; const qrcodeBinding = { diff --git a/apis/http.js b/apis/http.js index 00d991d..4cfb0b6 100644 --- a/apis/http.js +++ b/apis/http.js @@ -18,7 +18,7 @@ class HttpConfig { // baseUrl = "https://z.csgmall.com.cn/gl" // baseUrl = "http://192.168.2.160:39080" // 梁超 // baseUrl = "http://192.168.2.218:39080" // 福 - target = "http://192.168.2.158:49080"; // 开发阶段后台ip + target = "http://192.168.0.56:21627/dev-api"; // 开发阶段后台ip // #endif // 基地址 (部署时使用 需要加 dev-api) // authPath = `${this.baseUrl}/dev-api/auth` @@ -176,6 +176,7 @@ class HttpConfig { }, rfidBinding: { bindRfid: "/leaseOutDetails/bindMachineByRfid", // rifd绑定 + bindRfidClose: "/leaseOutDetails/delMachineByRfid", // rifd解绑 }, qrcodeBinding: { bindQrcode: "/leaseOutDetails/bindMachineByQrCode", // 二维码绑定 diff --git a/pages.json b/pages.json index 1397da8..ffe6a44 100644 --- a/pages.json +++ b/pages.json @@ -404,6 +404,13 @@ "navigationBarTitleText": "RFID绑定" } }, + { + "path": "pages/rfidBindingClose/rfidBindingClose", + "style": { + "navigationBarTitleText": "RFID绑定" + } + }, + { "path": "pages/qrcodeBinding/qrcodeBinding", "style": { diff --git a/pages/rfidBindingClose/rfidBindingClose.vue b/pages/rfidBindingClose/rfidBindingClose.vue new file mode 100644 index 0000000..fe65d4b --- /dev/null +++ b/pages/rfidBindingClose/rfidBindingClose.vue @@ -0,0 +1,599 @@ + + + + + diff --git a/pages/workSpace/workSpace.vue b/pages/workSpace/workSpace.vue index e999be4..b5f3e82 100644 --- a/pages/workSpace/workSpace.vue +++ b/pages/workSpace/workSpace.vue @@ -101,6 +101,18 @@ url: "rfidBinding", isShow: "newPurchase:tools:rfid:bind", }, + { + name: "RFID解绑", + pic: "/static/rfidBinding.png", + url: "rfidBindingClose", + isShow: "*:*:*", + }, + { + name: "RFID解绑", + pic: "/static/rfidBinding.png", + url: "rfidBindingClose", + isShow: "newPurchase:tools:rfid:bind", + }, { name: "二维码绑定", pic: "/static/qrcodeBinding.png", @@ -232,6 +244,7 @@ }, }); } else { + console.log("跳转", path); uni.navigateTo({ url: `/pages/${path}/${path}`, }); diff --git a/router.js b/router.js index c6fa206..971eea6 100644 --- a/router.js +++ b/router.js @@ -399,6 +399,13 @@ const router = createRouter({ needAuth: "true", }, }, + { + path: "/pages/rfidBindingClose/rfidBindingClose", + name: "rfidBinding", + meta: { + needAuth: "true", + }, + }, { path: "/pages/qrcodeBinding/qrcodeBinding", name: "qrcodeBinding",