Merge branch '165' of uskycloud/usky-web-mobile into master

src/api/index/index.js

@@ -57,3 +57,12 @@ export function getFunctionalModuleStatistics(param) {
 //     data: data,
 //   });
 // }
+
+
+export function qrCodeSend(param) {
+  return request({
+    url: "/system/qrCodeSend",
+    method: "GET",
+    data: param,
+  });
+}

src/pages/business/mhxf/unitInfoCollection/index.vue

@@ -42,6 +42,9 @@
               <u-form-item label="产证" prop="birthCert" :borderBottom="true" @click="handleAction('产证')" required>
                 <u-input v-model="form.birthCert" placeholder="请选择产证" suffixIcon="arrow-right" suffixIconStyle="color: #909399" border="none" disabledColor="transparent" disabled />
               </u-form-item>
+              <u-form-item label="单位建筑面积" prop="buildArea" :borderBottom="true" required>
+                <u-input type="number" v-model="form.buildArea" placeholder="请输入单位建筑面积" suffixIcon="平方米" suffixIconStyle="color:#999999;font-size:15px" border="none" />
+              </u-form-item>
               <u-form-item label="消防安全责任人" prop="fireDutyName" :borderBottom="true">
                 <u-input v-model="form.fireDutyName" placeholder="请输入消防安全责任人" border="none" />
               </u-form-item>
@@ -54,9 +57,6 @@
               <u-form-item label="固定资产(万元）" prop="fixedAssets" :borderBottom="true">
                 <u-input type="number" v-model="form.fixedAssets" placeholder="请输入固定资产(万元）" suffixIcon="万元" suffixIconStyle="color:#999999;font-size:15px" border="none" />
               </u-form-item>
-              <u-form-item label="单位建筑面积" prop="buildArea" :borderBottom="true">
-                <u-input type="number" v-model="form.buildArea" placeholder="请输入单位建筑面积" suffixIcon="平方米" suffixIconStyle="color:#999999;font-size:15px" border="none" />
-              </u-form-item>
             </view>
           </view>
         </view>
@@ -627,6 +627,13 @@ const dataList = reactive({
         trigger: ["blur", "change"],
       },
     ],
+    buildArea: [
+      {
+        required: true,
+        message: "请输入单位建筑面积",
+        trigger: ["blur", "change"],
+      },
+    ],
 
     baseBuildList: [],
   },

src/pages/index.vue

@@ -162,7 +162,7 @@ import { ref, onMounted, inject, shallowRef, reactive, getCurrentInstance } from
 import useStores from "@/store/modules/user.js";
 import publicStore from "@/store/modules/public";
 
-import { scan_push, getHomePageData, getFunctionalModuleStatistics, getAppRouters } from "@/api/index";
+import { scan_push, getHomePageData, getFunctionalModuleStatistics, getAppRouters, qrCodeSend } from "@/api/index";
 
 const useStore = useStores();
 const publicStores = publicStore(); //全局公共Store
@@ -225,7 +225,7 @@ async function init() {
   window.location.href = BASE_URL + "Com/getPageAuthorization1";
 }
 
-//扫码
+//微信扫码
 function scanQRCode() {
   // scanCode();
   jwx.configWeiXin((jweixin) => {
@@ -245,11 +245,21 @@ function scanQRCode() {
   });
 }
 
+//APP扫码
 function scanCode() {
   uni.scanCode({
     scanType: ["qrCode"],
     success: (res) => {
-      console.log("扫码成功", res);
+      let list = JSON.parse(res.result);
+      uni.showToast({
+        title: "扫码成功",
+        icon: "none",
+      });
+      qrCodeSend({
+        qrCode: list.uid,
+        tenantId: useStore.$state.tenantId,
+        userName: useStore.$state.userName,
+      }).then((res) => {});
     },
     fail: (err) => {
       console.log("扫码失败", err);
@@ -274,7 +284,6 @@ async function getCodeResult(param = {}) {
 
 //获取地理位置
 function getLocation() {
-
   jwx.configWeiXin((jweixin) => {
     // 微信公众号获取位置
     jweixin.getLocation({
@@ -439,7 +448,14 @@ async function getHandleData(param = {}) {
 onNavigationBarButtonTap((e) => {
   if (e.float == "right") {
     // alert("你点击了扫一扫");
+
+    //#ifdef H5
     scanQRCode();
+    //#endif
+
+    //#ifdef APP-PLUS
+    scanCode();
+    //#endif
   } else {
     // alert("你点击了获取位置");
     // getLocation()

src/pages/login.vue

@@ -290,6 +290,8 @@ function getMobileTenantConfigApi(params) {
       bg.value = data.loginBackUrl;
       logo.value = data.loginLogo;
       uni.setStorageSync("homeTitle", data.loginTitle);
+
+      useStore.$state.tenantId = data.tenantId;
     }
   });
 }

src/store/modules/user.js

@@ -13,6 +13,7 @@ const useStores = defineStore("useStores", {
     roles: storage.get(constant.roles),
     permissions: storage.get(constant.permissions),
     userName: "",
+    tenantId:"",
   }),
   persist: {
     // 自定义数据持久化方式