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

src/pages/index.vue

@@ -1,15 +1,12 @@
 <template>
   <u-navbar :autoBack="false" :placeholder="true" :safeAreaInsetTop="true" :bgColor="proxy.$settingStore.themeColor.color">
     <template #left>
-      <view class="u-navbar__content__left__item">
-        <view class="u-navbar__content__left__item__title">应用中心</view>
-      </view>
-      <!-- <view class="u-navbar__content__left__item" v-if="tenantIdList.length == 1">
+      <view class="u-navbar__content__left__item" v-if="tenantIdList.length == 1">
         <view class="u-navbar__content__left__item__title">应用中心</view>
       </view>
       <view v-if="tenantIdList.length > 1 && accountState">
         <image class="unit-change" src="@/static/images/index/unitChange.png" @click="showLeftStateClick()"></image>
-      </view>  -->
+      </view>
     </template>
     <template #center>
       <view class="u-navbar__content__left__item"> </view>
@@ -105,7 +102,7 @@
         <image class="list-image" src="@/static/images/index/unit.png" v-if="item.id != useStore.tenantId"></image>
         <text class="list-name">{{ item.tenantName }}</text>
         <image class="list-right" src="@/static/images/index/right.png" v-if="item.id == useStore.tenantId"></image>
-        <text class="list-state">默认企业</text>
+        <!-- <text class="list-state">默认企业</text> -->
       </view>
     </view>
   </uni-drawer>

src/pages/login.vue

@@ -17,7 +17,7 @@
       </view>
 
       <view class="middle-input" v-if="switchText == '验证码登录'">
-        <u-input v-model="phone" prefixIcon="phone" placeholder="请输入手机号" :maxlength="11" :adjustPosition="false" />
+        <u-input type="number" v-model="phone" prefixIcon="phone" placeholder="请输入手机号" :maxlength="11" :adjustPosition="false" />
         <u-input v-model="verify" prefixIcon="email" placeholder="请输入验证码" :maxlength="6" :adjustPosition="false">
           <template #suffix>
             <button class="verify" @click="getVerifyCode">{{ !useStore.codeTime ? "获取验证码" : useStore.codeTime + "s" }}</button>

src/pages/mine.vue

@@ -74,7 +74,12 @@
             <view class="list-cell list-cell-arrow" @click="handleToUpgrade" v-if="proxy.$common.isVisible()">
               <view class="menu-item">
                 <view class="iconfont oaIcon-jianchagengxin menu-item-icon"></view>
+                <!-- #ifdef  MP-WEIXIN -->
+                <view>查看版本号</view>
+                <!--#endif-->
+                <!-- #ifndef  MP-WEIXIN -->
                 <view>检查更新</view>
+                <!--#endif-->
               </view>
             </view>
             <view class="list-cell list-cell-arrow" @click="proxy.$tab.navigateTo(`/pages/mine/secure/loginLog/index`)">
@@ -228,7 +233,6 @@ function handleToUpgrade() {
     },
   });
 }
-
 /**
  * @推送设置
  */

src/store/modules/setting.js

@@ -325,8 +325,14 @@ const settingStores = defineStore("storage-setting", {
                 data.appKey = platform === "android" ? "625265d978931967076754b784b676fe" : "625265d978931967076754b784b676fe"
             }
 
-            modal.loading("加载中");
-            checkUpdates(data)
+            // #ifdef MP-WEIXIN 
+                //用于正式环境
+                const accountInfo = uni.getAccountInfoSync();
+                modal.msg(accountInfo.miniProgram.version);
+            // #endif
+            // #ifndef  MP-WEIXIN
+                modal.loading("加载中");
+                checkUpdates(data)
                 .then((res) => {
                     if (res.code == 0 && res.data.buildHaveNewVersion == true) {
                         //安卓手机弹窗升级
@@ -349,6 +355,9 @@ const settingStores = defineStore("storage-setting", {
                 }).catch((err) => {
                     modal.closeLoading();
                 });
+            // #endif
+             
+            
         },
 
         /**