shop

config/dev.js

@@ -3,14 +3,14 @@ module.exports = {
     NODE_ENV: '"development"'
   },
   defineConstants: {
-		// HOST: '"http://47.101.36.130:8085"',//测试
+    // HOST: '"http://47.101.36.130:8085"',//测试
     // WSS_HOST: '"wss://47.101.36.130:8085"',
     // HOST: '"https://dev.jinchengjiaye.com"',//测试
     // WSS_HOST: '"wss://dev.jinchengjiaye.com"',
     // HOST: '"https://lt.pawoma.cn"',
     // WSS_HOST: '"wss://lt.pawoma.cn"',
-    HOST: '"http://192.168.0.84:8080"',
-    WSS_HOST: '"ws://192.168.0.84:8080"',
+    HOST: '"http://192.168.0.172:8080"',
+    WSS_HOST: '"ws://192.168.0.172:8080"',
   },
   weapp: {},
   h5: {}

src/actions/shop.js

@@ -20,15 +20,7 @@ import {
 import { createAction } from '@utils/redux'
 
 
-/**
- * 商品列表
- * @param {*} payload
- */
-export const dispatchGoodsList = payload => createAction({
-  url: API_GOODS_LIST,
-  type: GOODS_LIST,
-  payload
-})
+
 
 
 
@@ -50,7 +42,7 @@ export const dispatchGoodsDetail = id => createAction({
 export const dispatchGoodsExchange = id => createAction({
   url: `${API_GOODS_EXCHANGE}/${id}`,
   type: GOODS_EXCHANGE,
-  method:'POST'
+  method: 'POST'
 })
 
 
@@ -80,7 +72,7 @@ export const dispatchPointsRecords = payload => createAction({
  * @param {*} payload
  */
 export const dispatchPointsRule = payload => createAction({
-  url:  API_POINTS_RULE,
+  url: API_POINTS_RULE,
   type: POINTS_RULE,
   payload
 })
@@ -90,8 +82,8 @@ export const dispatchPointsRule = payload => createAction({
  * @param {*} payload
  */
 export const dispatchPointsAddress = payload => createAction({
-  url:  `${API_POINTS_ADRESS}`,
-  type:POINTS_ADRESS,
+  url: `${API_POINTS_ADRESS}`,
+  type: POINTS_ADRESS,
   payload,
-  method:'PUT'
+  method: 'PUT'
 })

src/app.js

@@ -40,11 +40,11 @@ class App extends Component {
       }
     },
     pages: [
+      'pages/shop/index',
       'pages/project/index',
       'pages/person/index',
       'pages/activity/activity',
       'pages/person/profile/index',
-      'pages/shop/index',
       'pages/project/detail/index',
       'pages/activity/assemblePage',
       'pages/activity/assistancePage',

src/constants/api.js

@@ -49,6 +49,7 @@ export const API_ACTIVITY_GROUP = resolvePath('helpActivityAndGroup')
 
 // shop
 export const API_GOODS_LIST = resolvePath('goods')
+export const API_GOODS_BUILDING = resolvePath('goodsToBuilding')
 export const API_GOODS_EXCHANGE = resolvePath('goods/exchange')
 export const API_GOODS_EXCHANGE_RECORDS = resolvePath('taPointsExchange')
 export const API_POINTS_RECORDS = resolvePath('taPointsRecords')

src/pages/shop/index.js

@@ -9,6 +9,7 @@ import Banner from './banner'
 import ready from '@utils/ready'
 // import { ROLE_CODE } from '@constants/user'
 import { queryBanners } from '@services/common'
+import { getGoodsBuilding, getGoodsList } from '@services/item'
 import { connect } from '@tarojs/redux'
 import * as actions from '@actions/shop'
 // import { queryUserInfo, doUserSignin } from '@services/user'
@@ -32,14 +33,17 @@ export default class Shop extends Component {
       'https://estateagents.oss-cn-shanghai.aliyuncs.com/images/banner/5.jpg'
     ],
     user: {},
-    cityName: ''
+    cityName: '',
+    goodsBuilding: [],
+    goodsList: [],
   }
 
   componentDidShow() {
     Taro.showLoading()
     ready.queue(() => {
       this.loadBannerList()
-      this.loadList()
+      this.loadGoodsBuilding()
+
       //    this.loadCity()
       // this.loadUserInfo()
     })
@@ -86,22 +90,65 @@ export default class Shop extends Component {
     })
   }
 
-  onSearch(val) {
-    // App.zhuge.track('搜索商品', {
-    //   '商品名称': val
-    // })
-    this.setState({
-      keywords: val,
-    }, this.loadList)
-  }
+  // onSearch(val) {
+  //   // App.zhuge.track('搜索商品', {
+  //   //   '商品名称': val
+  //   // })
+  //   this.setState({
+  //     keywords: val,
+  //   }, this.loadList)
+  // }
 
   loadList() {
-    // const payload = { buildingId: '369b7d7e5bc6e6b91f2e8f5e775035e2' }
+
     Taro.showLoading()
-    this.props.dispatchGoodsList().then(res => {
+    const params = {
+      pageNum: '1',
+      pageSize: '9999',
+      buildingId: this.state.goodsBuilding[0].buildingId
+    }
+    console.log(params, "params")
+    getGoodsList(params).then(res => {
+      this.setState({
+        goodsList: res.records || []
+      })
       Taro.hideLoading()
     })
   }
+  loadGoodsBuilding() {
+    getGoodsBuilding().then(res => {
+
+      res.map(item => {
+        item.title = item.buildingName
+
+      })
+      this.setState({
+        goodsBuilding: res || []
+
+      }, () => {
+        this.loadList()
+      }
+      )
+    })
+  }
+
+  handleClick(value) {
+
+    const payload = {
+      pageNum: '1',
+      pageSize: '9999',
+      buildingId: this.state.goodsBuilding[value].buildingId
+    }
+    getGoodsList(payload).then(res => {
+      this.setState({
+        goodsList: res.records || []
+      })
+      console.log(res, "9999999999999999999999")
+    })
+    this.setState({
+      current: value
+    })
+  }
 
   onViewDetail(item) {
     Taro.navigateTo({
@@ -155,48 +202,67 @@ export default class Shop extends Component {
     current: 0,
   }
 
-  handleClick(value) {
-    this.setState({
-      current: value
-    })
-  }
+
 
   renderGoods() {
     const { goods: { records = [] } } = this.props
+    const { goodsList, goodsBuilding, current } = this.state
 
     return (
 
+
+
       <View className="list__wrap">
-        <AtTabs current={this.state.current} tabList={[{ title: '热门活动' }, { title: '最新资讯' }]} onClick={this.handleClick.bind(this)}>
-          <AtTabsPane current={this.state.current} index={0} >
-            <View >
-
-              {
-                records.map(item => (
-                  <View className="item" key={item.goodsId} onClick={this.onViewDetail.bind(this, item)}>
-                    <Image className="item__img" src={item.imgUrl} />
-                    <View className="item__title">{item.goodsName}</View>
-                    <View className="item__des">
-                      <View>
-                        剩余数量{item.inventory}
-                      </View>
-                      <View >
-                        <Text className="item__jifen">{item.pointPrice}</Text>积分
-                </View>
+        {
+
+          goodsBuilding && goodsBuilding.length < 2 &&
+          <View>
+            <View className="hot_title">热门商品</View>
+            {
+              goodsList.map(item => (
+                <View className="item" key={item.goodsId} onClick={this.onViewDetail.bind(this, item)}>
+                  <Image className="item__img" src={item.imgUrl} />
+                  <View className="item__title">{item.goodsName}</View>
+                  <View className="item__des">
+                    <View>
+                      剩余数量{item.inventory}
                     </View>
-
+                    <View >
+                      <Text className="item__jifen">{item.pointPrice}</Text>积分
+                </View>
                   </View>
-                ))
-              }
-
-            </View>
-          </AtTabsPane>
-          <AtTabsPane current={this.state.current} index={1}>
-            <View >
-              123
+                </View>
+              ))
+            }
           </View>
-          </AtTabsPane>
-        </AtTabs>
+        }
+        {
+          goodsBuilding && goodsBuilding.length > 2 &&
+          <AtTabs current={current} tabList={goodsBuilding} onClick={this.handleClick.bind(this)}>
+            <AtTabsPane current={current}  >
+              <View>
+                {
+                  goodsList.map(item => (
+                    <View className="item" key={item.goodsId} onClick={this.onViewDetail.bind(this, item)}>
+                      <Image className="item__img" src={item.imgUrl} />
+                      <View className="item__title">{item.goodsName}</View>
+                      <View className="item__des">
+                        <View>
+                          剩余数量{item.inventory}
+                        </View>
+                        <View >
+                          <Text className="item__jifen">{item.pointPrice}</Text>积分
+                </View>
+                      </View>
+
+                    </View>
+                  ))
+                }
+
+              </View>
+            </AtTabsPane>
+          </AtTabs>
+        }
       </View>
 
 
@@ -247,7 +313,7 @@ export default class Shop extends Component {
           </View>
 
 
-          {/* <View className="hot_title">热门商品</View> */}
+
           <Banner list={this.state.bannerList} indicatorDots={false}></Banner>
 
           {this.renderGoods()}

src/pages/shop/index.scss

@@ -143,7 +143,7 @@
 .list__wrap {
   margin-top: 20px;
   overflow: hidden;
-  padding: 20px 30px;
+  padding: 20px;
   background-color: #fff;
   .at-tabs__item{
     display: block;
@@ -164,9 +164,10 @@
 
   .item {
     background: white;
-    width: 320px;
+    width: 335px;
     position: relative;
-    margin: 15px 0;
+    display: inline-block;
+    margin: 15px 10px;
     height: 440px;
     box-shadow:0px 6px 10px 0px rgba(0,0,0,0.12);
     border-radius:12px;

src/services/item.js

@@ -7,6 +7,8 @@ import {
   API_ITEMS_SHARE,
   API_ITEMS_TYPE,
   API_PROJECT_FAVOR,
+  API_GOODS_BUILDING,
+  API_GOODS_LIST
 } from '@constants/api'
 
 /**
@@ -14,6 +16,21 @@ import {
  * @param {*} payload 
  */
 export const getItemList = payload => fetch({ url: API_ITEMS_LIST, payload })
+/**
+ * 获取楼盘商品列表
+ * @param {*} payload 
+ */
+export const getGoodsBuilding = payload => fetch({ url: API_GOODS_BUILDING, payload })
+/**
+ * 获取楼盘商品列表
+ * @param {*} payload 
+ */
+export const getGoodsList = payload => fetch({ url: API_GOODS_LIST, payload })
+/**
+ * 商品列表
+ * @param {*} payload
+ */
+
 
 /**
  * 获取项目详情