Merge branch 'develop' of http://123.57.20.168:4000/admin/ys-app into develop

src/pages/deviceAuth/deviceAuth.vue

@@ -407,7 +407,9 @@ const handleSubmit=()=>{
 .container .bg-h{
     background:url('@/static/images/PicLogoTxt2@2x.png') center bottom 10rpx no-repeat;
     background-size:487rpx 214rpx;
+    /* #ifdef APP-PLUS */
     width: 100vw;
+    /* #endif */
     height: calc(100vh - 110px) ;
     margin:0 auto;
 }

src/pages/login/login.vue

@@ -264,9 +264,9 @@ const submitForm = () => {
 
             // #ifdef H5
             //h5测试用 内网-sn123456
-            //公司外网 'f3fca83f-bf56-47f4-a98b-a602ed8bddee'
+            //公司外网 'f3fca83f-bf56-47f4-a98b-a602ed8bddee' 529a5543-6957-401e-b090-13df6dee5429
             //友晟外网 'b97527c8-2ad4-493c-a01c-5f9d0aabaff2' 
-            param.uniqCode = 'f3fca83f-bf56-47f4-a98b-a602ed8bddee';
+            param.uniqCode = 'b97527c8-2ad4-493c-a01c-5f9d0aabaff2';
             let res = await login(param);
             userStore.login(res);
             uni.switchTab({ url: '/pages/home/home' })
@@ -362,7 +362,9 @@ page{
 .login-con .bg-h{
     background:url('@/static/images/login-txt.png') center bottom 10rpx no-repeat;
     background-size:654rpx 121rpx;
+    /* #ifdef APP-PLUS */
     width: 100vw;
+    /* #endif */
     height: calc(100vh - 10px) ;
     margin:0 auto;
 }