Browse Source

修改首页bug

zhaojing 1 year ago
parent
commit
25d79df00f

+ 3 - 3
src/packagesEnv/pages/administration/chooseIdentity.wpy

@@ -102,7 +102,7 @@
         <div class="info">{{ userInfo.manageUserType==3?'行政管理员':'' }}</div>
         <image class="logo-icon"  src="{{h5StaticPath+'/page-bind-tenant/logo_icon.svg'}}"/>
       </div>
-      <image class="checked-icon"   src="{{h5StaticPath+'/page-bind-tenant/checked.svg'}}"/>
+      <image class="checked-icon"  src="{{h5StaticPath+'/page-bind-tenant/checked.svg'}}"/>
    </div>
 
    <div class="bind-btn-box">
@@ -138,8 +138,8 @@ wepy.page({
   },
   methods: {
     loginAdmin() {
-      //this.qrCodeId 
-      confirmLogin({ qrCodeId: 'd3d390917bd34372a479ba5ff27fc453'})
+      //
+      confirmLogin({ qrCodeId: this.qrCodeId })
         .then((res) => {
           if (res.result == 'success') {
             wx.navigateTo({

+ 11 - 8
src/packagesEnv/pages/administration/index.wpy

@@ -74,7 +74,7 @@
     <div class="aImageDiv">
       <image class="image" :src="h5StaticPath+'administration.png'" mode="widthFix" />
     </div>
-    <div class="aLink">行政端:sagacare.tenants.link</div>
+    <div class="aLink">行政端:amp.sagacloud.cn/sgadmin</div>
     <div class="aLink">用电脑打开上方行政端网址<span class="copy" @click="goto">复制网址</span></div>
   </div>
   <div class="bottom">
@@ -92,9 +92,7 @@ import eventHub from '@/common/eventHub';
 import { mapState } from '@wepy/x';
 import store from '@/store';
 import config from '@/config';
-import {
-  checkHasUserInfo,
-} from '@/service/user.js';
+import { checkHasUserInfo } from '@/service/user.js';
 
 wepy.page({
   store,
@@ -110,10 +108,15 @@ wepy.page({
     }),
   },
   methods: {
-    goto:function(){
-      wx.navigateTo({
-            url: `/packagesEnv/pages/administration/chooseIdentity`,
-          });
+    goto: function() {
+      wx.setClipboardData({
+        data: 'https://amp.sagacloud.cn/sgadmin',
+        success(res) {   
+        },
+      });
+      // wx.navigateTo({
+      //   url: `/packagesEnv/pages/administration/chooseIdentity`,
+      // });
     },
     scanQrcode: function() {
       wx.scanCode({

+ 6 - 6
src/packagesEnv/pages/home/index.wpy

@@ -52,7 +52,7 @@
     white-space: nowrap;
     margin-top: 27px;
     // padding: 0 20px;
-    overflow: hidden;
+    // overflow: hidden;
   }
   .scroll-view-item {
     position: relative;
@@ -117,8 +117,8 @@
     z-index: 2;
     white-space: nowrap;
     margin-top: 25px;
-    // padding: 0 20px;
-    overflow: hidden;
+    //  padding: 0 20px;
+    // overflow: hidden;
   }
   .scroll-view-item2 {
     display: inline-block;
@@ -180,7 +180,7 @@
       margin-right: 15rpx;
       float: left;
       background: #fff;
-      margin-bottom: 8px;
+      margin-bottom: 16px;
       padding-top: 12px;
       box-sizing: border-box;
       .menuImg {
@@ -237,7 +237,7 @@
   <div class="projectTitle"  @click="showProject"><span class="name">{{nowCompanyName}}</span><van-icon name="arrow-down" size="20"/></div>
   <div class="projectInfo">成为一家牛的让员工幸福的企业</div>
   <div class="weather"><image class="image" :src="h5StaticPath+weather.imgname"/><span class="value">{{weather.temperature}}℃</span><span class="text">{{weather.text}}</span></div>
-  <scroll-view scroll-x="true" class="scroll-view">
+  <scroll-view scroll-x="{{true}}"   show-scrollbar="{{false}}" class="scroll-view" enhanced>
     <view class="scroll-view-item">
       <div class="itemCont" v-if="reSpaceId"   @click="goEnv('homeShowEnv')">
         <div class="spaceName"><div class="name">{{ reSpaceName }}</div><span class="resident">常驻工区</span></div>
@@ -247,7 +247,7 @@
     </view>
     <view class="scroll-view-item"><div class="itemCont envirItem" @click="goToIntroduce('environment')">环境健康小知识<van-icon name="arrow" size="20"/></div></view>
   </scroll-view>  
-   <scroll-view scroll-x="true" class="scroll-view2">
+   <scroll-view scroll-x="{{true}}" class="scroll-view2"  show-scrollbar="{{false}}" enhanced>
     <view class="scroll-view-item2" v-if="showCard.openLight" @click="goEnv('openLamp')"><div class="title">开启照明</div><div class="info">快速启动</div><div class="imageDiv">
       <image class="image" :src="h5StaticPath+'lamb.png'"/>
     </div></view>