diff --git a/common/iconfont.css b/common/iconfont.css
deleted file mode 100644
index a345b95..0000000
--- a/common/iconfont.css
+++ /dev/null
@@ -1,119 +0,0 @@
-@font-face {
- font-family: "iconfont"; /* Project id 3202838 */
- src: url('iconfont.woff2?t=1649236110191') format('woff2'),
- url('iconfont.woff?t=1649236110191') format('woff'),
- url('iconfont.ttf?t=1649236110191') format('truetype');
-}
-
-.iconfont {
- font-family: "iconfont" !important;
- font-size: 16px;
- font-style: normal;
- -webkit-font-smoothing: antialiased;
- -moz-osx-font-smoothing: grayscale;
-}
-
-.icon-a-Group1:before {
- content: "\e602";
-}
-
-.icon-a-xinzeng:before {
- content: "\e601";
-}
-
-.icon-jigouxinxi:before {
- content: "\e649";
-}
-
-.icon-quanxianguanli-fanbai:before {
- content: "\e64a";
-}
-
-.icon-guanbi1:before {
- content: "\e64b";
-}
-
-.icon-guanbi2:before {
- content: "\e64c";
-}
-
-.icon-quanxianguanli:before {
- content: "\e64d";
-}
-
-.icon-neirongguanli:before {
- content: "\e64e";
-}
-
-.icon-xuanze-moren:before {
- content: "\e64f";
-}
-
-.icon-wenjianjia:before {
- content: "\e650";
-}
-
-.icon-xuanze:before {
- content: "\e651";
-}
-
-.icon-shebeishuju:before {
- content: "\e652";
-}
-
-.icon-fabuliucheng:before {
- content: "\e653";
-}
-
-.icon-shouye:before {
- content: "\e654";
-}
-
-.icon-xiala2:before {
- content: "\e655";
-}
-
-.icon-bianji:before {
- content: "\e656";
-}
-
-.icon-xuanzhong:before {
- content: "\e657";
-}
-
-.icon-shouye-fanbai:before {
- content: "\e658";
-}
-
-.icon-shebeiguanli:before {
- content: "\e659";
-}
-
-.icon-xialaxuanze:before {
- content: "\e65a";
-}
-
-.icon-xiala1:before {
- content: "\e65b";
-}
-
-.icon-guanbi3:before {
- content: "\e65c";
-}
-
-.icon-neirongguanli-fanbai:before {
- content: "\e65d";
-}
-
-.icon-shebeiguanli-fanbai:before {
- content: "\e65e";
-}
-
-.icon-bangzhu:before {
- content: "\e647";
-}
-
-.icon-guanbi:before {
- content: "\e648";
-}
-
diff --git a/common/iconfont.ttf b/common/iconfont.ttf
deleted file mode 100644
index e3cb31e..0000000
Binary files a/common/iconfont.ttf and /dev/null differ
diff --git a/main.js b/main.js
index 86a91d2..56e6eeb 100644
--- a/main.js
+++ b/main.js
@@ -18,6 +18,6 @@ export function createApp() {
const app = createSSRApp(App)
return {
app
- }
+ }
}
// #endif
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 2b2ea62..0809783 100644
--- a/manifest.json
+++ b/manifest.json
@@ -104,6 +104,22 @@
"xxhdpi" : "C:/Users/xuhua/Desktop/画屏2/画屏/切图/bg.png"
}
}
+ },
+ "nativePlugins" : {
+ "Fvv-AutoStart" : {
+ "__plugin_info__" : {
+ "name" : "AutoStart",
+ "description" : "安卓开机自启动",
+ "platforms" : "Android",
+ "url" : "",
+ "android_package_name" : "",
+ "ios_bundle_id" : "",
+ "isCloud" : false,
+ "bought" : -1,
+ "pid" : "",
+ "parameters" : {}
+ }
+ }
}
},
/* 快应用特有相关 */
diff --git a/network/base.js b/network/base.js
new file mode 100644
index 0000000..a524f13
--- /dev/null
+++ b/network/base.js
@@ -0,0 +1,14 @@
+let baseURL = '';
+// 是否在控制台显示接口请求日志,本地环境启用,打包环境禁用
+let showHttpLog = false;
+// 测试环境
+// 刘力
+baseURL = 'http://192.168.99.103:7000';
+// 许镇
+// baseURL = 'http://192.168.99.84:7000';
+// 正式环境
+// baseURL = 'https://yxkadmin.aiyxlib.com';
+module.exports = {
+ baseURL: baseURL,
+ showHttpLog: showHttpLog
+};
\ No newline at end of file
diff --git a/network/http.js b/network/http.js
new file mode 100644
index 0000000..473370d
--- /dev/null
+++ b/network/http.js
@@ -0,0 +1,32 @@
+import {
+ baseURL
+} from './base.js'; //导入接口的前缀地址
+
+export const myRequest = (options) => {
+ return new Promise((resolve, reject) => {
+ uni.request({
+ url: baseURL + options.url, //接口地址：前缀+方法中传入的地址
+ method: options.method || 'GET', //请求方法：传入的方法或者默认是“GET”
+ data: options.data || {}, //传递参数：传入的参数或者默认传递空集合
+ headers: {
+ 'Authorization ': window.localStorage.getItem('token') //自定义请求头信息
+ },
+ success: (res) => {
+ //返回的数据（不固定，看后端接口，这里是做了一个判断，如果不为true，用uni.showToast方法提示获取数据失败)
+ // if (res.data.success != true) {
+ // return uni.showToast({
+ // title: '获取数据失败',
+ // icon: 'none'
+ // })
+ // }
+ // 如果不满足上述判断就输出数据
+ resolve(res);
+ },
+ // 这里的接口请求，如果出现问题就输出接口请求失败
+ fail: (err) => {
+ console.log(err);
+ reject(err);
+ }
+ });
+ });
+};
\ No newline at end of file
diff --git a/network/login.js b/network/login.js
new file mode 100644
index 0000000..9bd03c2
--- /dev/null
+++ b/network/login.js
@@ -0,0 +1,19 @@
+import {myRequest} from './http.js';
+
+// 登录
+export function login (config) {
+ return myRequest({
+ url:'/login',
+ method:'post',
+ data:config
+ });
+}
+
+// 授权绑定
+export function deviceBind (config) {
+ return myRequest({
+ url:'/deviceBind',
+ method:'post',
+ data:config
+ });
+}
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 53eefc4..3dd2247 100644
--- a/pages.json
+++ b/pages.json
@@ -1,10 +1,12 @@
{
"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
{
- "path" : "pages/show/show",
- "style": {
- "navigationBarTitleText": "数字新视窗"
- }
+ "path" : "pages/login/login",
+ "style" : {}
+ },
+ {
+ "path" : "pages/bind/bind",
+ "style" : {}
},
{
"path": "pages/index/index",
@@ -13,16 +15,10 @@
}
},
{
- "path" : "pages/login/login",
- "style" : {}
- },
- {
- "path" : "pages/bind/bind",
- "style" : {}
- },
- {
- "path" : "pages/show/show2",
- "style" : {}
+ "path" : "pages/show/show",
+ "style": {
+ "navigationBarTitleText": "数字新视窗"
+ }
}
],
"globalStyle": {
diff --git a/pages/bind/bind.vue b/pages/bind/bind.vue
index 2ce1d91..10302a9 100644
--- a/pages/bind/bind.vue
+++ b/pages/bind/bind.vue
@@ -11,17 +11,17 @@
设备名称：
-
+
-
+
选择设备方向
-
-
+
+
@@ -36,22 +36,42 @@