Browse Source

Merge branch 'master' of http://39.106.8.246:3003/sagacloud/sagacloud-sagacare-weChat

anxiaoxia 1 year ago
parent
commit
270c223f55

+ 1 - 1
project.private.config.json

@@ -14,7 +14,7 @@
       "list": [
         {
           "name": "",
-          "pathName": "pages/bindTenant/index",
+          "pathName": "pages/auth/index",
           "query": "",
           "launchMode": "default",
           "scene": null

+ 7 - 7
src/common/request.js

@@ -171,13 +171,13 @@ export default function (info) {
         });
         if (!isNotShowErrorToast) {
           // 防止有loading的时候toast 闪现,故用settimout 来延迟,让reject函数先hideLoading ,再toast
-          setTimeout(() => {
-            wx.showToast({
-              title: `网络异常,请稍后重试`,
-              icon: 'none',
-              duration: 5000
-            })
-          }, 0);
+          // setTimeout(() => {
+          //   wx.showToast({
+          //     title: `网络异常,请稍后重试`,
+          //     icon: 'none',
+          //     duration: 5000
+          //   })
+          // }, 0);
         } else {
           console.log(`微信接口request调用失败:${JSON.stringify(res)}`)
         }

+ 1 - 0
src/packagesEnv/pages/search/index.wpy

@@ -228,6 +228,7 @@ page {
           <view class="content-item" 
           :key="index"
           @click.stop="checkSpace(item)"
+          v-if="index<10"
           v-for="(item,index) in histroyData">
           <image v-if="item.typeName=='会议室'" src="{{h5StaticPath+'metting-icon.svg'}}" alt=""/>
           <image v-else-if="item.name" src="{{h5StaticPath+'person-icon.svg'}}" alt=""/>

+ 1 - 1
src/pages/auth/index.wpy

@@ -80,7 +80,7 @@
    <!-- bindgetphonenumber="phonenumberAuth" -->
    <div class="bind-btn-tip">确保是入职公司使用的手机号</div>
   </div>
-  <button class="home-btn" @click="goHome">首页</button>
+  <!-- <button class="home-btn" @click="goHome">首页</button> -->
  </div>
 </template>
 

+ 2 - 4
src/service/user.js

@@ -31,15 +31,13 @@ function checkHasUserInfo() {
   }, 600000)
 }
 
-
-
 // 登录
-function wxLogin(type) {
+function wxLogin (type) {
   console.log("执行了登录")
   // type=1 如果type未激活和作废不需要跳转到登录页面
   return new Promise((resolve, reject) => {
     wx.login({
-      success(wxLoginRes) {
+      success (wxLoginRes) {
         const jsCode = wxLoginRes.code;
         console.log(utils)
         const appId = utils.getAppId();