diff --git a/api/common/index.js b/api/common/index.js
index e842bef..26fda5f 100644
--- a/api/common/index.js
+++ b/api/common/index.js
@@ -18,11 +18,10 @@ export function deviceTypeList(params) {
}
// 删除设备列表接口
-export function deviceUnbind(data) {
+export function deviceUnbind(id) {
return request({
- url: '/app/device/unBind',
+ url: `/app/device/unBind?id=${id}`,
method: 'DELETE',
- data: data,
})
}
// 重命名设备
diff --git a/pages/6170/deviceControl/index.vue b/pages/6170/deviceControl/index.vue
index 145b08b..6903fce 100644
--- a/pages/6170/deviceControl/index.vue
+++ b/pages/6170/deviceControl/index.vue
@@ -79,7 +79,7 @@
激光模式
-
+
diff --git a/pages/6170/editVideo/index.vue b/pages/6170/editVideo/index.vue
deleted file mode 100644
index fca7d0d..0000000
--- a/pages/6170/editVideo/index.vue
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 编辑视频
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pages/6170/operatingInstruct/index.vue b/pages/6170/operatingInstruct/index.vue
deleted file mode 100644
index 6690755..0000000
--- a/pages/6170/operatingInstruct/index.vue
+++ /dev/null
@@ -1,350 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pages/common/addBLE/addEquip.vue b/pages/common/addBLE/addEquip.vue
index 6f87957..d5b4a94 100644
--- a/pages/common/addBLE/addEquip.vue
+++ b/pages/common/addBLE/addEquip.vue
@@ -584,12 +584,10 @@
justify-content: center;
}
-
.openBlue .cancel {
border: 1px solid rgba(255, 255, 255, 1);
color: rgba(255, 255, 255, 1);
}
-
.openBlue .ok {
background-color: #BBE600;
color: #232323;
diff --git a/pages/common/index/index.vue b/pages/common/index/index.vue
index ba73163..68d2b5d 100644
--- a/pages/common/index/index.vue
+++ b/pages/common/index/index.vue
@@ -25,33 +25,7 @@
-
-
+ @click="handleSwipeClick($event, item, index)" class="device-card">
@@ -61,7 +62,7 @@
return {
showView: false,
//codebtn: '获取验证码',
- phone: '17671332251', //手机号码
+ phone: '13058067817', //手机号码
code: "123456", //验证码
agreed: false,
isCounting: false,
@@ -171,19 +172,15 @@
}
},
- // 打开具体协议
- openProtocol(type) {
- if (type === 'user') {
- // 跳转到用户协议页面
- uni.navigateTo({
- url: '/pages/protocol/user'
- })
- } else {
- // 跳转到隐私政策页面
- uni.navigateTo({
- url: '/pages/protocol/privacy'
- })
- }
+ // 跳转到协议页面
+ goToPage(type) {
+ const url = type === 'agreement' ?
+ '/pages/common/userAgreement/index' // 服务协议
+ :
+ '/pages/common/privacyAgreement/index'; // 隐私政策
+ uni.navigateTo({
+ url: url
+ });
},
// 不同意
diff --git a/unpackage/dist/dev/app-plus/static/images/delete-icon.png b/unpackage/dist/dev/app-plus/static/images/delete-icon.png
new file mode 100644
index 0000000..611fc9f
Binary files /dev/null and b/unpackage/dist/dev/app-plus/static/images/delete-icon.png differ
diff --git a/utils/request.js b/utils/request.js
index a891b42..fab8389 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -1,4 +1,4 @@
-const BASE_URL = 'http://192.168.2.23:8000';
+const BASE_URL = 'http://192.168.2.34:8000';
const request = (options) => {
console.log("options"+JSON.stringify(options))
return new Promise((resolve, reject) => {
@@ -40,5 +40,8 @@ const request = (options) => {
uni.request(config);
});
};
-
+// 导出基础URL以便其他地方使用
+export const baseURL = BASE_URL
+export const getToken = () => uni.getStorageSync('token') // 获取token的方法
+export const clientid =() => uni.getStorageSync('clientID');
export default request;
\ No newline at end of file