增加H5账号密码登录

pages/homePage/homePage.vue

@@ -40,15 +40,15 @@
         </view>
       </view>
     </view>
-    <view class="login" v-if="!workSchemeType && isApp">
-      <!-- #ifndef H5 -->
+    <!-- APP或H5账号密码登录页面 start -->
+    <view class="login" v-if="!workSchemeType && (isApp||isH5AndPwd)">
       <view class="title"> 转运系统登录 </view>
       <input class="login_input" v-model="username" placeholder="请输入用户名" />
       <input class="login_input" password v-model="password" placeholder="请输入密码" />
-      <input class="login_input" v-model="ip" placeholder="请输入域名或IP地址,如:http(s)://192.168.3.108" />
+      <input class="login_input" v-show="!isH5AndPwd" v-model="ip" placeholder="请输入域名或IP地址,如:http(s)://192.168.3.108" />
       <view class="page_item_btn" @click="login()"> 登录 </view>
-      <!-- #endif -->
     </view>
+    <!-- APP或H5账号密码登录页面 end -->
     <view class="botImg" v-if="online || (!online && online !== undefined && workSchemeType == 1)">
       <view class="img"></view>
     </view>
@@ -80,6 +80,8 @@
         online: undefined,
         // 是否是app
         isApp: false,
+        // 是否是H5,账号密码登录
+        isH5AndPwd: false,
         // 用户名
         username: "",
         // 密码
@@ -771,6 +773,15 @@
       stop(e) {
         e.preventDefault();
       },
+      //获取查询参数
+      GetQueryString(name) {
+        var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)");
+        var r = location.search.substr(1).match(reg);
+        if (r != null) {
+          return unescape(r[2]);
+        }
+        return null;
+      }
     },
     onHide() {
       this.zxzData = [];
@@ -818,37 +829,44 @@
       this.isApp = false;
       this.type = options.type || "";
       console.log(this.type);
-      this.subm();
+      if (this.GetQueryString('login') === '1') {
+        //H5页面账号密码登录
+        this.isH5AndPwd = true;
+        this.ip = location.origin;
+      } else {
+        this.isH5AndPwd = false;
+        this.subm();
+      }
       //#endif
       // #ifdef APP-PLUS
       this.isApp = true;
       // 通知权限 start
-      var main = plus.android.runtimeMainActivity();
-      var pkName = main.getPackageName();
-      var NotificationManagerCompat = plus.android.importClass(
-        "android.support.v4.app.NotificationManagerCompat"
-      );
-      var packageNames = NotificationManagerCompat.from(main);
-      console.log(JSON.stringify(packageNames));
-      if (packageNames.areNotificationsEnabled()) {
-        console.log("已开启通知权限");
-      } else {
-        uni.showModal({
-          title: "提示",
-          content: "请先打开APP通知权限",
-          showCancel: true,
-          success: function(res) {
-            if (res.confirm) {
-              var Intent = plus.android.importClass("android.content.Intent");
-              var intent = new Intent(
-                "android.settings.APP_NOTIFICATION_SETTINGS"
-              ); //可设置表中所有Action字段
-              intent.putExtra("android.provider.extra.APP_PACKAGE", pkName);
-              main.startActivity(intent);
-            }
-          },
-        });
-      }
+      // var main = plus.android.runtimeMainActivity();
+      // var pkName = main.getPackageName();
+      // var NotificationManagerCompat = plus.android.importClass(
+      //   "android.support.v4.app.NotificationManagerCompat"
+      // );
+      // var packageNames = NotificationManagerCompat.from(main);
+      // console.log(JSON.stringify(packageNames));
+      // if (packageNames.areNotificationsEnabled()) {
+      //   console.log("已开启通知权限");
+      // } else {
+      //   uni.showModal({
+      //     title: "提示",
+      //     content: "请先打开APP通知权限",
+      //     showCancel: true,
+      //     success: function(res) {
+      //       if (res.confirm) {
+      //         var Intent = plus.android.importClass("android.content.Intent");
+      //         var intent = new Intent(
+      //           "android.settings.APP_NOTIFICATION_SETTINGS"
+      //         ); //可设置表中所有Action字段
+      //         intent.putExtra("android.provider.extra.APP_PACKAGE", pkName);
+      //         main.startActivity(intent);
+      //       }
+      //     },
+      //   });
+      // }
       // 通知权限 end
       // #endif
     },