Selaa lähdekoodia

feat 会议室场景

anxiaoxia 1 vuosi sitten
vanhempi
commit
edb882e829

+ 5 - 13
src/packagesEnv/pages/officehome/Meeting/pop-meet-scene.wpy

@@ -1,19 +1,12 @@
 <style lang="less" scoped>
 .meet-popup {
     position: relative;
-    height: 580rpx;
+    height: 634rpx;
     width: 622rpx;
     text-align: center;
-    .meet_head {
-        width: 100%;
-        height: 90rpx;
-        background: #96f2e366;
-    }
     .meet_head_bg {
         width: 100%;
-        height: 150rpx;
-        border-radius: 0 0 50% 50%;
-        background: #96f2e366;
+        height: 360rpx;
     }
 
     .meet_body {
@@ -26,7 +19,6 @@
         }
     }
     .meet_content {
-        padding-top: 58rpx;
         padding-bottom: 16rpx;
         .meet-title {
             font-family: PingFang SC;
@@ -66,9 +58,9 @@
     <div
         class="meet-popup"
     >
-        <div class="meet_head">
+        <div class="meet_head_bg">
+            <image src="{{ h5StaticPath }}{{ sceneDetail.img }}"/>
         </div>
-        <div class="meet_head_bg"></div>
         <div class="meet_content">
             <span class="meet-title">切换至<span class="name">{{sceneDetail.name}}</span>场景</span>
         </div>
@@ -98,7 +90,7 @@ wepy.component({
     sceneDetail: Object
   },
   data: {
-
+    h5StaticPath: config.h5StaticPath + '/page-officehome/'
   },
   watch: {
     sceneDetail: {

+ 3 - 5
src/packagesEnv/pages/officehome/components/set-permanent.wpy

@@ -73,11 +73,11 @@
         <cover-view class="content">
             <cover-image
                 class="tip-image"
-                src="/static/set-permanent.png"
+                src="{{ h5StaticPath }}set-permanent.png"
             ></cover-image>
             <cover-view class="little-box">
                 <cover-view class="text">设为常驻 </cover-view>
-                <cover-image class="little-img" :src="h5StaticPath+'/page-officehome/arrow.svg'"></cover-image>
+                <cover-image class="little-img" :src="h5StaticPath+'/arrow.svg'"></cover-image>
             </cover-view>
         </cover-view>
 
@@ -93,9 +93,7 @@ import store from '@/store'
 wepy.component({
   store,
   data: {
-    h5StaticPath: config.h5StaticPath,
-    h5Origin: config.h5Origin,
-    showLink: `${config.h5Origin}/#/wx-external-link`
+    h5StaticPath: config.h5StaticPath + '/page-officehome/'
   },
   props: {
     data: Object,

+ 7 - 7
src/packagesEnv/pages/officehome/index.wpy

@@ -563,7 +563,7 @@ page {
                         <div class="upToSpace">
                             <image
                                 class="imgSt"
-                                src="/static/icon-double-arrow.svg"
+                                src="{{h5StaticPath}}icon-double-arrow.svg"
                             />
                             <span class="text">上滑进入空间</span>
                         </div>
@@ -981,10 +981,10 @@ page {
             </div>
         </div>
         <set-permanent
+            v-if="userControlSpace.isControlSpace === 3 && this.routeParams.from==='homeSetSpace'"
             :show="isShowPermanent"
             @component-permanent-panel-close="closePermanentPanel(false)"
         >
-
         </set-permanent>
     </div>
 
@@ -1029,7 +1029,7 @@ let initListSen = [
     id: 0,
     code: 'DISCUSSING',
     name: '讨论',
-    img: 'discuss.svg',
+    img: 'discuss.png',
     checked: true,
     textObj: [
       {
@@ -1042,7 +1042,7 @@ let initListSen = [
     id: 1,
     code: 'PROJECTING',
     name: '投影',
-    img: 'shadow2.svg',
+    img: 'shadow2.png',
     checked: false,
     textObj: [
       {
@@ -1055,7 +1055,7 @@ let initListSen = [
     id: 2,
     code: 'ADJOURNMENT',
     name: '散会',
-    img: 'beover.svg',
+    img: 'beover.png',
     checked: false,
     textObj: [
       {
@@ -1068,6 +1068,7 @@ let initListSen = [
 wepy.page({
   store,
   data: {
+    sceneShow: false,
     projectId: 'Pj1101080259',
     isShowPermanent: false,
     userControlSpace: {}, // 用户控制空间
@@ -1127,7 +1128,6 @@ wepy.page({
     headScene: '', // 头部文案
     headImg: '', // 头部背景图片
     options: { roomType: null, spaceId: 'Sp1101080259c4434730d12144ba890fe11f796d3143' }, // 本地数据
-    sceneDetail: null,
     popList: [],
         // 上班=ATWORK 讨论=DISCUSSING 投影=PROJECTING 散会=ADJOURNMENT 下班=OFFWORK
     meetingRoomSence: [
@@ -1355,7 +1355,7 @@ wepy.page({
       const resData = {
         'isControlSpace': 3, // 1-租户下无可控;2-租户有可控;3-用户有可控 4-当前空间为常驻空间
         'buildingId': 'string',
-        'spaceId': 'Sp1101080259308f5ed92e964bc1b029038dea962de4',
+        'spaceId': 'Sp1101080259c4434730d12144ba890fe11f796d3143',
         'spaceName': 'string',
         'floorId': 'string'
       }