diff --git a/.stylelintrc.json b/.stylelintrc.json
index d2921e2..7f13d40 100644
--- a/.stylelintrc.json
+++ b/.stylelintrc.json
@@ -29,6 +29,7 @@
"selector-class-pattern": null,
"keyframes-name-pattern": null,
"unit-no-unknown": null,
+ "import-notation": null,
"selector-type-no-unknown": [
true,
{
diff --git a/pages.json b/pages.json
index 34f4479..a380bf2 100644
--- a/pages.json
+++ b/pages.json
@@ -8,6 +8,18 @@
}
},
"subPackages": [
+ {
+ "root": "pages/addDeviceForWiFi",
+ "pages": [
+ {
+ "path": "distributionNetwork",
+ "style": {
+ "navigationBarTitleText": "WiFi配网",
+ "disableScroll": true
+ }
+ }
+ ]
+ },
{
"root": "pages/addDeviceForBluetooth",
"pages": [
@@ -103,6 +115,13 @@
"navigationBarTitleText": "有效期",
"disableScroll": true
}
+ },
+ {
+ "path": "selectDeviceType",
+ "style": {
+ "navigationBarTitleText": "选择设备类型",
+ "disableScroll": true
+ }
}
]
},
diff --git a/pages/addDeviceForBluetooth/addLockGuid.vue b/pages/addDeviceForBluetooth/addLockGuid.vue
index 544c149..1f0c932 100644
--- a/pages/addDeviceForBluetooth/addLockGuid.vue
+++ b/pages/addDeviceForBluetooth/addLockGuid.vue
@@ -11,43 +11,46 @@
-
diff --git a/pages/addDeviceForBluetooth/bindLock.vue b/pages/addDeviceForBluetooth/bindLock.vue
index 6489ef5..ec9e586 100644
--- a/pages/addDeviceForBluetooth/bindLock.vue
+++ b/pages/addDeviceForBluetooth/bindLock.vue
@@ -144,7 +144,7 @@
this.getLockList(this.lockSearch)
setTimeout(() => {
uni.hideLoading()
- this.backAndToast('添加成功')
+ this.backAndToast('添加成功', 2)
}, 1000)
} else {
uni.hideLoading()
@@ -166,21 +166,21 @@
diff --git a/pages/addDeviceForWiFi/distributionNetwork.vue b/pages/addDeviceForWiFi/distributionNetwork.vue
new file mode 100644
index 0000000..b9e8667
--- /dev/null
+++ b/pages/addDeviceForWiFi/distributionNetwork.vue
@@ -0,0 +1,150 @@
+
+
+
+
+
+
+
+
+
+
+ 请选择WiFi并输入密码
+
+
+
+ WiFi
+ {{ wifiList[wifiIndex].SSID }}
+
+
+
+
+
+
+
+ 密码
+
+
+
+
+
+
+ 下一步
+
+
+
+
+
+
+
diff --git a/pages/main/home.vue b/pages/main/home.vue
index bd9f770..6ea56dc 100644
--- a/pages/main/home.vue
+++ b/pages/main/home.vue
@@ -531,7 +531,7 @@
},
async toSearchDevice() {
this.routeJump({
- name: 'addLockGuid'
+ name: 'selectDeviceType'
})
},
async toLockDetail(lock) {
diff --git a/pages/others/selectDeviceType.vue b/pages/others/selectDeviceType.vue
new file mode 100644
index 0000000..78b26fd
--- /dev/null
+++ b/pages/others/selectDeviceType.vue
@@ -0,0 +1,39 @@
+
+
+
+
+ 蓝牙锁
+
+
+
+
+ WiFi锁
+
+
+
+
+
+
+
+
diff --git a/stores/basic.js b/stores/basic.js
index 0a3ab1f..6973f2b 100644
--- a/stores/basic.js
+++ b/stores/basic.js
@@ -381,6 +381,16 @@ const pages = [
name: 'passageMode',
path: '/pages/settingForBluetooth/passageMode',
tabBar: false
+ },
+ {
+ name: 'selectDeviceType',
+ path: '/pages/others/selectDeviceType',
+ tabBar: false
+ },
+ {
+ name: 'distributionNetwork',
+ path: '/pages/addDeviceForWiFi/distributionNetwork',
+ tabBar: false
}
]
diff --git a/uni.scss b/uni.scss
index 642511a..48db093 100644
--- a/uni.scss
+++ b/uni.scss
@@ -1,5 +1,5 @@
/* uni.scss */
-@import 'uview-plus/theme.scss';
+@import 'uview-plus/theme';
/**
* 这里是uni-app内置的常用样式变量
@@ -24,32 +24,32 @@ $uni-color-warning: #f0ad4e;
$uni-color-error: #dd524d;
/* 文字基本颜色 */
-$uni-text-color:#333;//基本色
-$uni-text-color-inverse:#fff;//反色
-$uni-text-color-grey:#999;//辅助灰色,如加载更多的提示信息
+$uni-text-color: #333; //基本色
+$uni-text-color-inverse: #fff; //反色
+$uni-text-color-grey: #999; //辅助灰色,如加载更多的提示信息
$uni-text-color-placeholder: #808080;
-$uni-text-color-disable:#c0c0c0;
+$uni-text-color-disable: #c0c0c0;
/* 背景颜色 */
-$uni-bg-color:#ffffff;
-$uni-bg-color-grey:#f3f3f3;
-$uni-bg-color-hover:#f1f1f1;//点击状态颜色
-$uni-bg-color-mask:rgba(0, 0, 0, 0.4);//遮罩颜色
+$uni-bg-color: #ffffff;
+$uni-bg-color-grey: #f3f3f3;
+$uni-bg-color-hover: #f1f1f1; //点击状态颜色
+$uni-bg-color-mask: rgba(0, 0, 0, 0.4); //遮罩颜色
/* 边框颜色 */
-$uni-border-color:#c8c7cc;
+$uni-border-color: #c8c7cc;
/* 尺寸变量 */
/* 文字尺寸 */
-$uni-font-size-sm:12px;
-$uni-font-size-base:14px;
-$uni-font-size-lg:16px;
+$uni-font-size-sm: 12px;
+$uni-font-size-base: 14px;
+$uni-font-size-lg: 16px;
/* 图片尺寸 */
-$uni-img-size-sm:20px;
-$uni-img-size-base:26px;
-$uni-img-size-lg:40px;
+$uni-img-size-sm: 20px;
+$uni-img-size-base: 26px;
+$uni-img-size-lg: 40px;
/* Border Radius */
$uni-border-radius-sm: 2px;
@@ -71,9 +71,9 @@ $uni-spacing-col-lg: 12px;
$uni-opacity-disabled: 0.3; // 组件禁用态的透明度
/* 文章场景相关 */
-$uni-color-title: #2C405A; // 文章标题颜色
-$uni-font-size-title:20px;
+$uni-color-title: #2c405a; // 文章标题颜色
+$uni-font-size-title: 20px;
$uni-color-subtitle: #555555; // 二级标题颜色
-$uni-font-size-subtitle:26px;
-$uni-color-paragraph: #3F536E; // 文章段落颜色
-$uni-font-size-paragraph:15px;
+$uni-font-size-subtitle: 26px;
+$uni-color-paragraph: #3f536e; // 文章段落颜色
+$uni-font-size-paragraph: 15px;