Merge branch 'dev' of http://git.ycjcjy.com/shigongli/miniapp-v2 into dev

src/components/CollectList/MyCollect/index.jsx

@@ -17,6 +17,8 @@ export default (props) => {
   const targetType = item.targetType
   const star = parseFloat(((item.sweetScore + item.environmentScore + item.serviceScore) / 3).toFixed(1));
 
+
+
   const handleDetail = () => {
     targetType == "shop_package" ? Taro.navigateTo({ url: `/pages/details/foodDetails/foodDetails?id=${item.shopId}` })
       : targetType == "tourist" ? Taro.navigateTo({ url: `/pages/details/mjDetails/sceneryDetails?id=${item.targetId}` })

src/components/CouponCard/Media/style.less

@@ -1,7 +1,5 @@
-
 .coupun-media {
   display: flex;
-
   &_header {
     flex: none;
     box-sizing: border-box;

src/pages/index/tabs/Mine.jsx

@@ -50,6 +50,7 @@ export default (props) => {
       lang: 'zh_CN',
       desc: "获取你的昵称、头像、地区及性别",
       success: (res) => {
+        console.log("🚀 ~ file: Mine.jsx ~ line 53 ~ handleGetUserProfile ~ res", res)
         const data = {
           ...res,
           sessionKey,
@@ -116,7 +117,7 @@ export default (props) => {
           <view className='User-info-all'>
             <view onClick={handleGetUserProfile} className='User-name'>{hasAvatar ? person.nickName : '点击授权头像'}</view>
             <view className='User-phone'>{person.phone.replace(/^(\d{3})\d{4}(\d+)/, "$1****$2") || ''}</view>
-            <image className='User-sex' src={person.sex === 1 ? boy : girl} />
+            {/* <image className='User-sex' src={person.sex === 1 ? boy : girl} /> */}
           </view>
           {/* 切换身份 */}
           <view onClick={ShowMoldeOn} className='User-info-cutover'>

src/pages/index/tabs/Recommend.jsx

@@ -75,7 +75,7 @@ export default (props) => {
   // })
 
   return (
-    <view style={{ height: '100%', overflow: 'hidden', display: 'flex',   flexDirection:'column' }}>
+    <view style={{ height: '100%', overflow: 'hidden', display: 'flex', flexDirection: 'column' }}>
       <view className='search' onClick={onSearch} >
         <input className='searchInput' disabled />
         <image className='searchicon' src={iconsearch} />