静态页面

project.config.json

@@ -5,30 +5,30 @@
 	"appid": "wx1d9348230d6a0da6",
 	"setting": {
 		"urlCheck": false,
-		"scopeDataCheck": false,
-		"coverView": true,
 		"es6": false,
+		"enhance": false,
 		"postcss": false,
-		"compileHotReLoad": false,
 		"preloadBackgroundData": false,
 		"minified": false,
-		"autoAudits": false,
 		"newFeature": true,
-		"uglifyFileName": false,
-		"uploadWithSourceMap": true,
-		"useIsolateContext": true,
+		"coverView": true,
 		"nodeModules": false,
-		"enhance": false,
-		"useCompilerModule": true,
-		"userConfirmedUseCompilerModuleSwitch": false,
+		"autoAudits": false,
 		"showShadowRootInWxmlPanel": true,
+		"scopeDataCheck": false,
+		"uglifyFileName": false,
 		"checkInvalidKey": true,
 		"checkSiteMap": true,
+		"uploadWithSourceMap": true,
+		"compileHotReLoad": false,
 		"babelSetting": {
 			"ignore": [],
 			"disablePlugins": [],
 			"outputPath": ""
-		}
+		},
+		"useIsolateContext": true,
+		"useCompilerModule": false,
+		"userConfirmedUseCompilerModuleSwitch": false
 	},
 	"compileType": "miniprogram",
 	"simulatorType": "wechat",

src/constants/api.js

@@ -31,6 +31,7 @@ export const API_QUERY_DOCUMENTVERIFY = resolvePath('documentVerify')
 
 export const API_QUERY_DOCUMENTVERIFY_list = resolvePath('documentVerify/list')
 export const API_QUERY_TADRAINGE = resolvePath('taDrainage')
+export const API_USER_LEVEL = resolvePath('person-level')
 
 
 // chat
@@ -239,3 +240,4 @@ export const API_TEMPLATE_TYPE = resolvePath('template/of/')
 // 商家
 export const API_STORE_LIST = resolvePath('shop')
 export const API_STORE_TYPE_LIST = resolvePath('shop-type')
+export const API_STORE_DETAIL = resolvePath('shop')

src/pages/activity/assemblePage.js

@@ -120,7 +120,7 @@ export default class Index extends Component {
           }
         </View>
         <View>
-          <Image className='Logo' mode='widthFix' src={require('@/assets/img/logo.png')}></Image>
+          <Image className='Logo' mode='widthFix' src={require('@/assets/img/logo1.png')}></Image>
         </View>
       </ListView>
     );

src/pages/activity/assistancePage.js

@@ -120,7 +120,7 @@ export default class Index extends Component {
           }
         </View>
         <View>
-          <Image className='Logo' mode='widthFix' src={require('@/assets/img/logo.png')}></Image>
+          <Image className='Logo' mode='widthFix' src={require('@/assets/img/logo1.png')}></Image>
         </View>
       </ListView>
     );

src/pages/activity/detail/assemble.js

@@ -28,7 +28,7 @@ import * as noticeType from '@/constants/common.js'
 import { report as reportCustomer } from '@/utils/customer'
 import { share as shareSavePoint } from '@/utils/shareSavePoint'
 
-const waitImg = require('@/assets/helpgroup/wait.png')
+const waitImg = require('@/assets/img/icon26.png')
 const memberImg = require('@/assets/helpgroup/group/member.png')
 const successImg = 'https://njcj.oss-cn-shanghai.aliyuncs.com/miniapp/images/helpgroup/group/success.png'
 const failImg = 'https://njcj.oss-cn-shanghai.aliyuncs.com/miniapp/images/helpgroup/group/fail.png'

src/pages/activity/detail/assistance.js

@@ -32,7 +32,7 @@ import { share as shareSavePoint } from '@/utils/shareSavePoint'
 const successImg = 'https://njcj.oss-cn-shanghai.aliyuncs.com/miniapp/images/helpgroup/help/success2.png'
 const failImg = 'https://njcj.oss-cn-shanghai.aliyuncs.com/miniapp/images/helpgroup/help/help%20failure.png'
 const quoteImg = 'https://njcj.oss-cn-shanghai.aliyuncs.com/miniapp/images/quota.png';
-const waitImg = require('@/assets/helpgroup/wait.png')
+const waitImg = require('@/assets/img/icon26.png')
 
 // 活动状态
 const ActBeforeStart = 0;

src/pages/activity/myActivity.js

@@ -144,7 +144,7 @@ export default class Index extends Component {
               // </ActivityItem>
             ))
           }
-          <Image mode="widthFix" className='Logo' src={require('@/assets/img/logo.png')}></Image>
+          <Image mode="widthFix" className='Logo' src={require('@/assets/img/logo1.png')}></Image>
         </View>
       </ListView>
     );

src/pages/dichan/index.js

@@ -5,7 +5,9 @@ import { getItemList } from '@/services/item'
 import ready from '@/utils/ready'
 import { connect } from '@tarojs/redux'
 
-@connect(({ city }) => ({ ...city }))
+@connect(
+  state => ({ ...state.userInfo })
+)
 export default class Index extends Component {
   config = {
     navigationBarTitleText: '地产'
@@ -17,6 +19,7 @@ export default class Index extends Component {
   }
   componentWillMount () {
     ready.queue(async () => {
+      console.log(userInfo, `-----------------------11111111111111111111111`)
       const { records: list } = await this.loadList(1, 10)
       this.setState({
         PageList: list

src/pages/league/detail.js

@@ -1,20 +1,119 @@
-import { View } from '@tarojs/components'
 import { Component } from '@tarojs/taro'
 import './index.scss'
+import { GetShopDetail } from '@/services/shop'
+import ready from '@/utils/ready'
 
 export default class Index extends Component {
   config = {
-    navigationBarTitleText: '商家名称'
+    navigationBarTitleText: '商家详情'
   }
   state = {
+    DetailInfo: null
+  }
+  componentWillMount () {
+    ready.queue(() => {
+      GetShopDetail({ id: this.$router.params.id }).then((res) => {
+        this.setState({
+          DetailInfo: { ...res, tags: res.tags.split(',') || [] } || null
+        })
+        Taro.setNavigationBarTitle({ title: res.shopName })
+      })
+    })
+  }
+  OpenMap () {
+    const coord = this.state.DetailInfo.lngLat.split(',')
+    const latitude = parseFloat(coord[1])
+    const longitude = parseFloat(coord[0])
+    Taro.openLocation({
+      latitude,
+      longitude,
+      name: this.state.DetailInfo.shopName,
+      address: this.state.DetailInfo.address,
+      scale: 18
+    })
+  }
+  CallShop () {
+    Taro.makePhoneCall({
+      phoneNumber: this.state.DetailInfo.phone
+    })
   }
   render () {
-    const { } = this.state
+    const { DetailInfo } = this.state
     return (
-      <View className='Page'>
-
-        商家详情
-
+      <View className='Page ShopDetailPage'>
+        {
+          DetailInfo !== null &&
+          <View>
+            <Image mode='widthFix' src={DetailInfo.shopLogo}></Image>
+            <View className='ShopInfo'>
+              <Text>{DetailInfo.shopName}</Text>
+              <View className='Tag flex-h'>
+                <View className='flex-item'>
+                  <Text>
+                    {
+                      DetailInfo.tags.map((item) => (
+                        item + ' '
+                      ))
+                    }
+                  </Text>
+                </View>
+                {
+                  DetailInfo.score - 0 > 0 ?
+                    <Image mode='widthFix' src={require('@/assets/img/icon6.png')} />
+                    :
+                    <Image mode='widthFix' src={require('@/assets/img/icon7.png')} />
+                }
+                {
+                  DetailInfo.score - 0 > 1 ?
+                    <Image mode='widthFix' src={require('@/assets/img/icon6.png')} />
+                    :
+                    <Image mode='widthFix' src={require('@/assets/img/icon7.png')} />
+                }
+                {
+                  DetailInfo.score - 0 > 2 ?
+                    <Image mode='widthFix' src={require('@/assets/img/icon6.png')} />
+                    :
+                    <Image mode='widthFix' src={require('@/assets/img/icon7.png')} />
+                }
+                {
+                  DetailInfo.score - 0 > 3 ?
+                    <Image mode='widthFix' src={require('@/assets/img/icon6.png')} />
+                    :
+                    <Image mode='widthFix' src={require('@/assets/img/icon7.png')} />
+                }
+                {
+                  DetailInfo.score - 0 > 4 ?
+                    <Image mode='widthFix' src={require('@/assets/img/icon6.png')} />
+                    :
+                    <Image mode='widthFix' src={require('@/assets/img/icon7.png')} />
+                }
+                <Text className='Score'>￥{DetailInfo.costAvg || 0}/人</Text>
+              </View>
+              <View className='Address flex-h'>
+                <View className='flex-item'>
+                  <Text>地址：{DetailInfo.address}</Text>
+                </View>
+                <View className='ToMap' onClick={this.OpenMap}>地图导航</View>
+                <Image mode='widthFix' src={require('@/assets/img/more.png')} />
+              </View>
+              <View className='Phone flex-h' onClick={this.CallShop}>
+                <View className='flex-item'>
+                  <Text>电话：{DetailInfo.phone}</Text>
+                </View>
+                <Image mode='widthFix' src={require('@/assets/img/icon13.png')} />
+              </View>
+            </View>
+            <View className='Line'></View>
+            <View className='DescTop'>
+              <Text>商户信息</Text>
+              <View></View>
+            </View>
+            <Image mode='widthFix' src={DetailInfo.shopDesc}></Image>
+            <View className='ShopPhone'>
+              <Text onClick={this.CallShop}>联系商家</Text>
+            </View>
+          </View>
+        }
       </View>
     )
   }

src/pages/league/index.scss

@@ -404,3 +404,162 @@
     }
   }
 }
+
+.ShopDetailPage {
+  width: 100%;
+  position: relative;
+  overflow: hidden;
+  min-height: 100vh;
+  > view {
+    width: 100%;
+    position: relative;
+    overflow: hidden;
+    padding: 0;
+    > image {
+      width: 100%;
+      display: block;
+      height: auto;
+    }
+    > .ShopInfo {
+      padding: 30px;
+      position: relative;
+      overflow: hidden;
+      background: #fff;
+      > text {
+        display: block;
+        width: 100%;
+        font-size: 32px;
+        color: #333;
+        font-weight: bold;
+        line-height: 40px;
+      }
+      > view {
+        margin-top: 10px;
+      }
+      > .Tag {
+        align-items: center;
+        > .flex-item {
+          position: relative;
+          overflow: hidden;
+          margin-right: 10px;
+          > text {
+            width: 100%;
+            display: block;
+            font-size: 28px;
+            color: #999;
+            line-height: 40px;
+            overflow: hidden;
+            text-overflow: ellipsis;
+          }
+        }
+        > image {
+          display: inline-block;
+          vertical-align: middle;
+          width: 14px;
+          height: auto;
+          margin-right: 6px;
+        }
+        > .Score {
+          font-size: 30px;
+          color: #fdac2e;
+        }
+      }
+      > .Address {
+        align-items: center;
+        > .flex-item {
+          position: relative;
+          overflow: hidden;
+          margin-right: 10px;
+          > text {
+            display: block;
+            width: 100%;
+            font-size: 24px;
+            line-height: 40px;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            color: #333;
+          }
+        }
+        > .ToMap {
+          font-size: 24;
+          color: #666;
+        }
+        > image {
+          width: 12px;
+          height: auto;
+          margin-left: 10px;
+        }
+      }
+      > .Phone {
+        align-items: center;
+        > .flex-item {
+          position: relative;
+          overflow: hidden;
+          margin-right: 10px;
+          > text {
+            display: block;
+            width: 100%;
+            font-size: 24px;
+            line-height: 40px;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            color: #333;
+          }
+        }
+        > image {
+          width: 21px;
+          height: auto;
+          margin-left: 10px;
+        }
+      }
+    }
+    > .Line {
+      width: 100%;
+      height: 30px;
+      background: #f8f8f8;
+    }
+    > .DescTop {
+      width: 100%;
+      position: relative;
+      overflow: hidden;
+      font-size: 0;
+      text-align: center;
+      margin-top: 10px;
+      > view {
+        position: absolute;
+        left: 30px;
+        right: 30px;
+        z-index: 1;
+        height: 2px;
+        color: #f8f8f8;
+        top: 50%;
+        transform: translateY(-50%);
+        -webkit-transform: translateY(-50%);
+      }
+      > text {
+        display: inline-block;
+        position: relative;
+        z-index: 2;
+        background: #fff;
+        font-size: 28px;
+        line-height: 80px;
+        padding: 0 40px;
+      }
+    }
+    > .ShopPhone {
+      padding: 30px;
+      position: relative;
+      overflow: hidden;
+      > text {
+        width: 100%;
+        display: block;
+        font-size: 32px;
+        color: #fff;
+        line-height: 92px;
+        border-radius: 8px;
+        background: #1bc5d4;
+        text-align: center;
+      }
+    }
+  }
+}

src/pages/league/item.js

@@ -36,11 +36,36 @@ export default class Index extends Component {
               }
             </View>
             <View className='Score'>
-              <Image mode='widthFix' src={require('@/assets/img/icon6.png')} />
-              <Image mode='widthFix' src={require('@/assets/img/icon6.png')} />
-              <Image mode='widthFix' src={require('@/assets/img/icon6.png')} />
-              <Image mode='widthFix' src={require('@/assets/img/icon6.png')} />
-              <Image mode='widthFix' src={require('@/assets/img/icon6.png')} />
+              {
+                item.score - 0 > 0 ?
+                  <Image mode='widthFix' src={require('@/assets/img/icon6.png')} />
+                  :
+                  <Image mode='widthFix' src={require('@/assets/img/icon7.png')} />
+              }
+              {
+                item.score - 0 > 1 ?
+                  <Image mode='widthFix' src={require('@/assets/img/icon6.png')} />
+                  :
+                  <Image mode='widthFix' src={require('@/assets/img/icon7.png')} />
+              }
+              {
+                item.score - 0 > 2 ?
+                  <Image mode='widthFix' src={require('@/assets/img/icon6.png')} />
+                  :
+                  <Image mode='widthFix' src={require('@/assets/img/icon7.png')} />
+              }
+              {
+                item.score - 0 > 3 ?
+                  <Image mode='widthFix' src={require('@/assets/img/icon6.png')} />
+                  :
+                  <Image mode='widthFix' src={require('@/assets/img/icon7.png')} />
+              }
+              {
+                item.score - 0 > 4 ?
+                  <Image mode='widthFix' src={require('@/assets/img/icon6.png')} />
+                  :
+                  <Image mode='widthFix' src={require('@/assets/img/icon7.png')} />
+              }
               <Text>￥{item.costAvg || 0}/人</Text>
             </View>
             <View className='flex-h'>

src/pages/person/index.js

@@ -2,6 +2,7 @@ import Taro, { Component } from '@tarojs/taro';
 import './index.scss'
 import { ROLE_CODE } from '@/constants/user'
 import { queryUserInfo, doUserSignin } from '@/services/user'
+import { GetUserLevel } from '@/services/person'
 import { connect } from '@tarojs/redux'
 import Notice from '@/components/Notice'
 import { getCodeMessage, putRegisterConsultant } from '@/services/getCode'
@@ -39,6 +40,7 @@ export default class Person extends Component {
     roleName: '普通用户',
     pageVisible: false,
     loading: true,
+    UserLevelIcon: null,
     UserMenus: [
       [
         {
@@ -123,12 +125,12 @@ export default class Person extends Component {
     Taro.showLoading()
     this.loadUserInfo()
     Taro.hideLoading()
-    console.log(this.props, "wwwwwwwwwwwwwwwwww")
   }
 
   loadUserInfo () {
     queryUserInfo().then(users => {
       const [roleSetting, roleName] = this.getRoleName(users.personType)
+      console.log(users, `---------------------------------------------`)
       this.setState({
         users,
         phone: users.phone,
@@ -138,6 +140,15 @@ export default class Person extends Component {
         roleName,
         ...roleSetting,
       })
+      GetUserLevel({ pageNum: 1, pageSize: 10000 }).then((res) => {
+        res.records.map((item) => {
+          if (users.points - 0 >= item.pointRule.split(',')[0] && users.points - 0 <= item.pointRule.split(',')[1]) {
+            this.setState({
+              UserLevelIcon: item.levelIcon
+            })
+          }
+        })
+      })
     })
   }
 
@@ -308,7 +319,7 @@ export default class Person extends Component {
   }
 
   renderDetail () {
-    const { users, menus, roleName, UserMenus } = this.state
+    const { users, menus, roleName, UserMenus, UserLevelIcon } = this.state
     const { user: { userInfo: { person: { avatarurl, org: { waterMark } = {} }, miniApp: { name } } } } = this.props
 
     // const showQRCode = user.personType === ROLE_CODE['CONSULTANT'] || ROLE_CODE['ESTATE_AGENT'] || ROLE_CODE['CHANNEL_AGENT']
@@ -331,12 +342,10 @@ export default class Person extends Component {
               <View className="info-text" onClick={this.goPersonDetail}>
                 <View className="UserName">
                   <Text>{users.name ? users.name : users.nickname}</Text>
-                  <Image src={require('@/assets/img/userlevel1.png')} mode='widthFix'></Image>
-                  <Image src={require('@/assets/img/userlevel2.png')} mode='widthFix'></Image>
-                  <Image src={require('@/assets/img/userlevel3.png')} mode='widthFix'></Image>
-                  <Image src={require('@/assets/img/userlevel4.png')} mode='widthFix'></Image>
-                  <Image src={require('@/assets/img/userlevel5.png')} mode='widthFix'></Image>
-                  <Image src={require('@/assets/img/userlevel6.png')} mode='widthFix'></Image>
+                  {
+                    UserLevelIcon !== null &&
+                    <Image src={UserLevelIcon} mode='widthFix'></Image>
+                  }
                 </View>
                 <View className="info-text__intro" style='color: #666;'>积分 {users.points || 0}</View>
               </View>

src/pages/person/myShare/index.js

@@ -140,7 +140,7 @@ export default class Person extends Taro.Component {
             ))
           }
         </View>
-        <Image mode="widthFix" className='Logo' src={require('@/assets/img/logo.png')}></Image>
+        <Image mode="widthFix" className='Logo' src={require('@/assets/img/logo1.png')}></Image>
       </ListView>
     )
   }

src/services/person.js

@@ -14,10 +14,17 @@ import {
   API_MORE_ACTIVITY,
   API_SHARE_LIST,
   API_SHARE_INFOLIST,
-  API_BIND_CUSTOMER
+  API_BIND_CUSTOMER,
+  API_USER_LEVEL
 } from '@/constants/api'
 
 
+/**
+ * 获取用户积分等级
+ * @param {*} type
+ */
+export const GetUserLevel = (type, payload) => fetch({ url: `${API_USER_LEVEL}`, payload })
+
 /**
  * 获取客户分析性别数据
  * @param {*} type

src/services/shop.js

@@ -1,7 +1,8 @@
 import { fetch } from "@/utils/request";
 import {
   API_STORE_LIST,
-  API_STORE_TYPE_LIST
+  API_STORE_TYPE_LIST,
+  API_STORE_DETAIL
 } from "@/constants/api";
 
 /**
@@ -15,3 +16,6 @@ export const GetShopList = payload =>
 export const GetShopTypeList = payload =>
   fetch({ url: API_STORE_TYPE_LIST, payload, method: "GET" });
 
+export const GetShopDetail = payload =>
+  fetch({ url: `${API_STORE_DETAIL}/${payload.id}`, method: 'get' });
+