liujq 3 years ago
parent
commit
a6ac58206f

+ 17 - 3
project.config.json

@@ -1,5 +1,5 @@
 {
-  "miniprogramRoot": "./dist",
+  "miniprogramRoot": "dist/",
   "projectname": "fpapp",
   "description": "fp",
   "appid": "wx91a710fad8c5eb22",
@@ -10,5 +10,19 @@
     "minified": false,
     "checkSiteMap": false
   },
-  "compileType": "miniprogram"
-}
+  "compileType": "miniprogram",
+  "condition": {
+    "plugin": {
+      "list": []
+    },
+    "game": {
+      "list": []
+    },
+    "gamePlugin": {
+      "list": []
+    },
+    "miniprogram": {
+      "list": []
+    }
+  }
+}

+ 1 - 1
src/app.jsx

@@ -167,7 +167,7 @@ class App extends Component {
       //   "provider": "wx76a9a06e5b4e693e"
       // },
       "live-player-plugin": {
-        "version": "1.3.2",
+        "version": "1.3.4",
         "provider": "wx2b03c6e691cd7370"
       }
     },

+ 1 - 1
src/assets/css/house-list.scss

@@ -42,7 +42,7 @@
     overflow: hidden;
     border-radius: 10px;
     position: relative;
-    .icon {
+    .vr-icon {
       position: absolute;
       left: 50%;
       top: 50%;

BIN
src/assets/img/icon_hp_2 - 副本.gif


BIN
src/assets/img/icon_hp_2.gif


BIN
src/assets/img/icon_hp_2s.gif


BIN
src/assets/img/icon_vr.png


+ 17 - 0
src/pages/index/index.jsx

@@ -521,6 +521,8 @@ class Index extends Component {
   // }
 
   renderHotRecommend () {
+    // const hpI1 = require('@img/icon_hp_1.png')
+    // const hpI2 = require('@img/icon_hp_2s.gif')
     const dictData = Taro.getStorageSync('dictData')
     const { hot2RowArr } = this.state
     const curItems = hot2RowArr.map((item, index) => {
@@ -536,6 +538,21 @@ class Index extends Component {
       })
       return (
         <Navigator url={'/pagesHouse/indexDtl?id=' + item.estate_id} className="ilh-item" key={index}>
+          {/* {
+            item.vr_key
+            ?
+            <View className="ilh-img">
+              <View className="vr-icon">
+                <Image src={hpI1} className="i i1" />
+                <Image src={hpI2} className="i i2" />
+              </View>
+              <Image src={item.vr_image} className="img" />
+            </View>
+            :
+            <View className="ilh-img">
+              <Image src={item.pri_image + '_xs'} className="img" />
+            </View>
+          } */}
           <View className="ilh-img">
             <Image src={item.pri_image + '_xs'} className="img" />
           </View>

+ 23 - 0
src/pages/index/index.scss

@@ -182,6 +182,29 @@ page {
       height: 136px;
       overflow: hidden;
       border-radius: 10px;
+      position: relative;
+      .vr-icon {
+        position: absolute;
+        left: 50%;
+        top: 50%;
+        width: 60px;
+        height: 60px;
+        margin-left: -30px;
+        margin-top: -30px;
+        .i {
+          position: absolute;
+          left: 0;
+          top: 0;
+          width: 60px;
+          height: 60px;
+          &.i1 {
+            z-index: 1;
+          }
+          &.i2 {
+            z-index: 1;
+          }
+        }
+      }
       .img {
         width: 208px;
         height: 136px;

+ 15 - 9
src/pagesHouse/index.jsx

@@ -853,8 +853,8 @@ class Index extends Component {
   }
 
   renderList () {
-    const hpI1 = require('@img/icon_hp_1.png')
-    const hpI2 = require('@img/icon_hp_2.gif')
+    // const hpI1 = require('@img/icon_hp_1.png')
+    // const hpI2 = require('@img/icon_hp_2s.gif')
     const { dataList } = this.state
     const dictData = Taro.getStorageSync('dictData')
     const curItems = dataList.map((item, index) => {
@@ -870,16 +870,22 @@ class Index extends Component {
       })
       return (
         <Navigator url={'/pagesHouse/indexDtl?id=' + item.id} className="lhl-item col-1" key={index}>
-          <View className="lhl-img">
-            {
-              item.vr_key
-              ?
-              <View className="icon">
+          {/* {
+            item.vr_key
+            ?
+            <View className="lhl-img">
+              <View className="vr-icon">
                 <Image src={hpI1} className="i i1" />
                 <Image src={hpI2} className="i i2" />
               </View>
-              : ''
-            }
+              <Image src={item.vr_image} className="img" />
+            </View>
+            :
+            <View className="lhl-img">
+              <Image src={item.pri_image + '_xs'} className="img" />
+            </View>
+          } */}
+          <View className="lhl-img">
             <Image src={item.pri_image + '_xs'} className="img" />
           </View>
           <View className="lhl-info">

+ 7 - 0
src/pagesHouse/indexDtl.jsx

@@ -532,6 +532,7 @@ class Index extends Component {
   renderProductType () {
     const { curObj } = this.state
     const aData = curObj.area_data || []
+    const vrIcon = require('@img/icon_vr.png')
     const dictData = Taro.getStorageSync('dictData')
     const ptObj = arrToObj(dictData.product_type)
     const htObj = arrToObj(dictData.house_type)
@@ -545,6 +546,7 @@ class Index extends Component {
               area: three.area + '㎡',
               ptName: ptObj[one.product_type_val],
               htName: htObj[two.house_type_val],
+              vr_key: three.vr_key,
             })
           })
         })
@@ -570,6 +572,11 @@ class Index extends Component {
                           <View className="bg"></View>
                           <View className="t">{item.area}({item.ptName})</View>
                         </View>
+                        {
+                          item.vr_key
+                          ? <Image className="vr-icon" src={vrIcon}/>
+                          : ''
+                        }
                       </View>
                       <View className="p2">{item.htName}</View>
                     </View>

+ 7 - 0
src/pagesHouse/indexDtl.scss

@@ -486,6 +486,13 @@ page {
       position: relative;
       border: 1PX solid #f2f2f2;
     }
+    .vr-icon {
+      position: absolute;
+      top: 10px;
+      left: 10px;
+      width: 60px;
+      height: 60px;
+    }
     .p1 {
       position: absolute;
       bottom: 0;

+ 17 - 0
src/pagesHouse/list.jsx

@@ -974,6 +974,8 @@ class Index extends Component {
   }
 
   renderList () {
+    // const hpI1 = require('@img/icon_hp_1.png')
+    // const hpI2 = require('@img/icon_hp_2s.gif')
     const { type } = this.$router.params
     const { dataList, isListEnd, isListLoading, isListEmpty } = this.state
     const dictData = Taro.getStorageSync('dictData')
@@ -995,6 +997,21 @@ class Index extends Component {
       const metro_line = item.metro_line || ''
       return (
         <View onClick={this.linkDtl.bind(this, item)} className="lhl-item col-1" key={index}>
+          {/* {
+            item.vr_key
+            ?
+            <View className="lhl-img">
+              <View className="vr-icon">
+                <Image src={hpI1} className="i i1" />
+                <Image src={hpI2} className="i i2" />
+              </View>
+              <Image src={item.vr_image} className="img" />
+            </View>
+            :
+            <View className="lhl-img">
+              <Image src={item.pri_image + '_xs'} className="img" />
+            </View>
+          } */}
           <View className="lhl-img">
             <Image src={item.pri_image + '_xs'} className="img" />
           </View>

+ 6 - 0
src/pagesHouse/produceType.jsx

@@ -75,6 +75,7 @@ class Index extends Component {
   renderInfo () {
     const dictData = Taro.getStorageSync('dictData')
     const hxIcon = require('@img/icon_hx.png')
+    const vrIcon = require('@img/icon_vr.png')
     const { curObj} = this.state
     const ptObj = arrToObj(dictData.product_type)
     const htObj = arrToObj(dictData.house_type)
@@ -111,6 +112,11 @@ class Index extends Component {
                                     <View className="bg"></View>
                                     <View className="t">查看大图</View>
                                   </View>
+                                  {
+                                    three.vr_key
+                                    ? <Image className="vr-icon" src={vrIcon}/>
+                                    : ''
+                                  }
                                 </View>
                                 <View className="sa-right">
                                   <View className="op">

+ 7 - 0
src/pagesHouse/produceType.scss

@@ -49,6 +49,13 @@
     text-align: center;
     position: relative;
     border-radius: 6px;
+    .vr-icon {
+      position: absolute;
+      left: 10px;
+      top: 10px;
+      width: 40px;
+      height: 40px;
+    }
     .img {
       width: 160px;
       height: 160px;