From a5681acc1ee27fcdb464508865032ecb929bda9f Mon Sep 17 00:00:00 2001 From: xuhuajiao <13476289682@163.com> Date: Fri, 15 Apr 2022 11:36:22 +0800 Subject: [PATCH] login-bind-show --- common/iconfont.css | 119 ------------------------------ common/iconfont.ttf | Bin 5428 -> 0 bytes main.js | 2 +- manifest.json | 16 ++++ network/base.js | 14 ++++ network/http.js | 32 ++++++++ network/login.js | 19 +++++ pages.json | 24 +++--- pages/bind/bind.vue | 43 +++++++++-- pages/header.vue | 1 + pages/index/index.vue | 4 - pages/login/login.vue | 67 +++++++++++++++-- pages/show/show.vue | 49 +++++-------- pages/show/show2.vue | 1 - utils/common.js | 53 -------------- utils/global.js | 148 ++++++++++++++++++------------------- utils/music.js | 26 ------- utils/validate.js | 165 ++++++++++++++++++++++++++++++++++++++++++ 18 files changed, 445 insertions(+), 338 deletions(-) delete mode 100644 common/iconfont.css delete mode 100644 common/iconfont.ttf create mode 100644 network/base.js create mode 100644 network/http.js create mode 100644 network/login.js delete mode 100644 utils/common.js delete mode 100644 utils/music.js create mode 100644 utils/validate.js 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 e3cb31e1b5ed1a319d5e76a90036d3e135d4380a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5428 zcmd@YX>c3W`F(Gtm8G>TttIU$cC2F^ONkFzmSj7Qj}WJELSiSWaSpJFBiphpN0y8a zZ~`<2hS1U^(3x_yaiN`FWSY{>v|*+cT6)rUI!(e%fEG$GMrBfl&XlVq*1F%@l}QMs zGyLw_-@fmC?|a{S@4Mc&B0vZc$UNalc=L6;I(?t5Iz$MpMQY!U>*^zI^0g0O|0wqN z4^PA=AL@Osh7h_1;rV3x;OMs=N}CBW?j)pm%UB{lqFmhVMczLnG>sv_a-Khi_)`e0 z#wKRw65E&FLwT=be;}P5j#r)yoWl7&?1v}fbCVDx(>U(NzAqD>NZ7yH_FY26hjG2+ zWOjPygz%{eLYz1ZQG$Et=9lKl0RPSsKK#3k@_|RzC`jG&=xg~wTie@2FlY>~Oq)v> z!djeqn17eM2fIatYQrcVTbU#Yuk{(#f`5c8X?=a%Lc*kj&`)%A_mPrxd?rK6h%R0q zzZ{2jDj7%l`UoH&8wI3*wgy|zU`WFK#E5784E-(k@6%iO2Z;dAq{PS}^&_60qnk#^ zGdalZ)AT{Om&qN-#$;Z4C|gj6r6mJlaCyIge;=*!E5!d&7{`-e;?r^d9YXlGmg%}I z6ovanFCwH?7YoM=>wg-lY$vtYq6U#}AOqOvu?0eNG`DXFwTipn%vyYyMwq53VlE=# zJOfH+{3fKEQHnr{iItQP8?j?6l2YP8r!XN#K)0AC=>PUr%uWtl3g<6l+SP&icdh`; zD!I)%pq@z%`5B72bwK@-+%_GUwR7D%F#pZ<=%DdzM;rm|L2^5EVD`*m zmSBJuB)L!Oz&s+?s{>k<cBEN(ty9+9B2yk(^SbsWBE%_zDP^ zlz>L!DN#G-&i(7$TzlJS>aEmhTRZ)|Q7E#R!B8Enx@N-{IXG$mfIkgXiYv&b`SbGSPKrj`CK! zY2(hG4Z1{Kv`w<1yq+hRyt=w=+xzzwRYXu=Ma1)uVw+9IMg8^l{`>4-^VR$CpKzFY z@8SN#-GQ05mY~N$2$+6Kz{ERc53u8RKyyotmdtb5>>TWtrnmq z4l8hGE8VKi4IEpZtBE<2|IG&`Yf|8M7OR>!Tdii`P!LciNLA5QF(b0u#Q=ClH(5!1 zc*c)7Uyz-fs}!S+m5otK#s&wDvuz(A7(9CkZ5+jio4=B*b1Xg!6Qk&9EWVfS;LhM} zwvuIHs0x^jCEyY@Zz}kc=2K!U04}DzcGP+YL_ENAUsUh)dewQkLRqsb@kRS8`z-@I z*M?WPD%AP%KzVJQeanqo#1Q?{39I$<=IRyd3mdog_YQRz6~(r!-`4qw)&?kDQLTP^ z$x&YJSQ0-u(AqkHanAD0(!7Ci^Q0VuADFw!W?*h?GJ}MB2$}&m5^IKUt0Q7%ScC;w z5W|(CI)W|s)e)p)ALg$@U(n~V^IxX#RsTcV4pYz+Yz{Wd&9dog8oz(dnKNt7p4Hx0 zQ+&Q*nFIN7eawYRhq<4iy^X|6DoK#kXm((F22)gYme5MS5~7V_tOKHc7w@6X;BS2Y z&qQB#`=R31S4;ghay}_n`$TWd3r|yv{+s%0Oa9mH8lPC| ztC6`fWPVku_KTpBmYZ6p)~ze}gsy)#sl$s}(flo@#a2X%Gp81F+!c98OIMVn2K#k) z>>oTgIB-n!%>Kc#nUVO~*4DN0k=KTGWSIHpC7xr;-pif(0M~0H`&-trdu8dg;bzp6 z6Qcq>6=OGwf$If)p}S&iV_-Y{5yTNib(t>1{cgBNTxnWK>tscdFD|;{%oLrm zIcPYWLU(hhpz(c3s<{wDa@t@)qQ3ny+x+oEsH8~%!WwqZ1{CJm&M;C%@CW`m9T z30y{nXZac9OCMk>@OT>{x|c)%uKd|L8)YrI}VNU~oXw@Z@U z@St6KpIU>=6E^vSRQhF`B-wswcS*KtHn+x`f0NC8lD(=5lsB-0JdAwY!W*wsoU99Fm@B@EW5@)tx|7O6{gyG8YLWnh9`j)>Sd^`#XfNviJ>u7{Ur|FSV*gZpDrNu<~KE3HFLm+F2ScRUb2f1guQg z^PqvEZ550{0(h-J33y;V;0am*ZPf}9sRHoAZ4{*r2n2z)$m`we#$qb_t$c&>PsKgy zR{pJoiz{WYs$JXxmrK3A*uR1kOlp@BewX>xyI}=R3s9yM!`F3x;#T3BSOu5?bDW7D zQ+v80uX5cmulDp%+*gmbw|VZ5$Y)^nOtUKrL1R;_9ye(Nx$-=%J`acO_S;JvN$+m75z-#M~~=n*|v+|9rJQGAE)K1$y@ zvUrr6De&pJ7OPn!6Ngy^eE|%lSM62%`rvW3w+~LiM_4!^cw8VXJj$e^7nG7$n0IOq zeytR6_KSg|fK$A;$_qG$bfthB5U(!aM*OOZ6ma%c-Cn>gSeI-n-~vjV#K;5#ewmQ~ zxvPK!epQ_;;1n~}4+=Pk^k)mW0r3|KxDme`|6ag(q~{B`h3p1v0T)OBhBr*dvG>e}`n|}VB(o%qGp9Z@dgbih$UTKWXr(l1J}ekQ_><9_LE=ft1V z@Owdfv`e#qU*5<-fdc~=fyXPl2+Uvs0gAzjx2X;6fHyBVzzHtAcxC+Et|(r&c`7?Q z*&80Gj5}BlBJeADOVrMSpx@k6!O+1stHl3;)jc119DHH1rr5Xxt#F|N@rm~r& z&Qv^yqlXf86WOUm#&Sy{Gmi5Sc%3dxk0pi@sp+xV@!8_h_|R-RH9I_p%ktA>+1Y~$ t9+ykUBm9sy%dAZrL*d2xJbev8W6}lc6P7m { + 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 @@