feats

config/prod.js

@@ -3,7 +3,7 @@ module.exports = {
     NODE_ENV: '"production"'
   },
   defineConstants: {
-    HOST: '"https://sgl-v2-test.njyunzhi.com"',
+    HOST: '"https://sgl-v2.njyunzhi.com"',
     OSS: '"yz-shigongli.oss-accelerate.aliyuncs.com"',
   },
   mini: {},

project.config.json

@@ -2,7 +2,7 @@
   "miniprogramRoot": "./dist",
   "projectname": "miniapp",
   "description": "十公里",
-  "appid": "wx835627a9b9b3932a",
+  "appid": "wx06a7372d48d56843",
   "setting": {
     "urlCheck": true,
     "es6": false,

src/app.less

@@ -10,12 +10,12 @@
     flex: none;
   }
 
-  .index-tabber {
+  .index-tabbar {
     flex: none;
   }
 
   .index-container {
-    flex: auto;
+    flex: 1;
     overflow: hidden;
     position: relative;
   }

src/components/CouponCard/Media/Header.jsx

@@ -1,37 +1,17 @@
-import React, { useEffect, useState } from 'react'
+import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import Taro from '@tarojs/taro'
-import { View, Image } from '@tarojs/components'
+import { View, Image, Canvas } from '@tarojs/components'
 import BadgeTag from '@/components/BadgeTag'
 import Cashback from '../Cashback'
 import './style.less'
+import { random } from '@/utils'
 
 export default (props) => {
   const { cashback, badge, image } = props
 
   const enableCashback = cashback !== undefined && cashback !== null
 
-  // // 为了解决苹果手机上图片不显示问题
-  // const [imgUrl, setImgUrl] = useState()
-  // useEffect(() => {
-  //   if (image) {
-  //     Taro.downloadFile({
-  //       url: image,
-  //       success: res => setImgUrl(res.tempFilePath),
-  //       fail: err => {
-  //         console.error(err)
-  //         setImgUrl(image)
-  //       }
-  //     })
-  //   } else {
-  //     setImgUrl()
-  //   }
-  // }, [image])
-  // const handleError = (e) => {
-  //   console.error('-------image----->', image)
-  //   console.error(e)
-  // }
-
-  const backImage = {
+  const backStyle = {
     background: `url('${image}') no-repeat`,
     backgroundSize: '100%',
   }
@@ -41,8 +21,7 @@ export default (props) => {
       {enableCashback && <Cashback money={cashback} style={{ marginTop: '-10px' }} />}
       <View className='coupun-media_thumb'>
         <BadgeTag type={badge} />
-        {/* <Image src={image} webp mode='widthFix'onError={handleError} /> */}
-        <View className='image' style={backImage}></View>
+        <View className='image' style={backStyle}></View>
       </View>
     </View>
   )

src/components/CouponCard/Media/style.less

@@ -19,9 +19,12 @@
     overflow: hidden;
 
     & > .image {
-      width: 100%;
-      height: 100%;
+      width: 144px;
+      height: 144px;
       display: block;
+      border-radius: 24px;
+      will-change: opacity;
+      opacity: 1;
     }
   }
 

src/components/List/index.jsx

@@ -4,6 +4,8 @@ import { ScrollView } from '@tarojs/components';
 import Taro from '@tarojs/taro';
 import { random } from '@/utils';
 
+import './style.less'
+
 export default React.forwardRef((props, ref) => {
   const {
     render,

src/components/List/style.less

@@ -0,0 +1,4 @@
+.list-view {
+  position: relative;
+  z-index: 20;
+}

src/components/tip/index.less

@@ -1,7 +1,7 @@
 .tip{
   padding:23px 0 22px 31px;
   height: 70px;
-  flex: none;
+  // flex: none;
   .tipicon{
     width: 17px;
     height: 19px;

src/hotel/pages/components/Extend/index.jsx

@@ -4,6 +4,7 @@ import Popup from '@/components/Popup'
 import { View, Image, Textarea, Label, Button, Video } from '@tarojs/components';
 import { update, deleteExtend } from '@/services/landlord'
 import { compressImage } from '@/utils'
+import { uploadFile } from '@/utils/request';
 import SlideView from '@/components/SlideView';
 import './style.less'
 
@@ -14,12 +15,14 @@ export default (props) => {
     Taro.chooseImage({
       count: 1,
       success: function (res) {
-        seteImg(res.tempFilePaths[0])
-        const date = {
-          content: res.tempFilePaths[0],
-          contentType: 'image'
-        }
-        update(item.extId, { ...item, ...date })
+        uploadFile(res.tempFilePaths[0]).then((res2) => {
+          seteImg(res2)
+          const date = {
+            content: res2,
+            contentType: 'image'
+          }
+          update(item.extId, { ...item, ...date })
+        })
       }
     })
   }
@@ -59,17 +62,17 @@ export default (props) => {
     return newstr;
   }
   const handelEdit = () => {
-    var content = document.getElementById('content').value
+    // var content = document.getElementById('content').value
 
-    content = content.replace(/\n/g, '');
-    if (javaTrim(content) == '') {
-      Taro.showToast({
-        title: '您还没有添加文字哦',
-        icon: 'none'
-      })
-      return;
-    }
-    setContent(content)
+    // content = content.replace(/\n/g, '');
+    // if (javaTrim(content) == '') {
+    //   Taro.showToast({
+    //     title: '您还没有添加文字哦',
+    //     icon: 'none'
+    //   })
+    //   return;
+    // }
+    // setContent(content)
     const date = {
       content,
       contentType: 'text'
@@ -85,7 +88,7 @@ export default (props) => {
             <View className='rzline' /><Label className='srl mg'>修改文字</Label><View className='rzline' />
           </View>
           <View>
-            <Textarea className='storezn' value={content} id='content' />
+            <Textarea className='storezn' value={content} id='content' onInput={e => setContent(e.detail.value)} />
           </View>
           <View>
             <Button className='cancel' onClick={onClose}>取消</Button>

src/pages/index/tabs/Recommend.jsx

@@ -11,7 +11,7 @@ import Card from '../components/Card'
 import './less/Recommend.less'
 import { OfficialAccount } from '@tarojs/components'
 
-const listStyle = { height: '100%' }
+const listStyle = { height: 'calc(100% - 145px)' }
 
 export default (props) => {
   const { router, person, location } = props
@@ -76,7 +76,7 @@ export default (props) => {
   // })
 
   return (
-    <view style={{ height: '100%', overflow: 'hidden', display: 'flex', flexDirection: 'column' }}>
+    <>
       <OfficialAccount>s21</OfficialAccount>
       <view className='search' onClick={onSearch} >
         <input className='searchInput' disabled />
@@ -103,7 +103,7 @@ export default (props) => {
           </mp-tabs>
         </scroll-view>
       </view>
-      <view className={listClass} style={{ flex: 'auto', height: '100%', overflow: 'hidden' }}>
+      
         <List
           ref={listRef}
           style={listStyle}
@@ -120,7 +120,7 @@ export default (props) => {
             />
           </view>
         </List>
-      </view>
-    </view>
+      
+    </>
   )
 }

src/pages/index/tabs/less/Recommend.less

@@ -1,7 +1,7 @@
 .search{
     padding: 10px 30px 0 30px;
     position: relative;
-    flex: none;
+    // flex: none;
     .searchInput{    
         height: 68px;
         background: #F8F8F8;
@@ -38,7 +38,7 @@
 .index-tabs {
   padding-left: 95px;
   position: relative;
-  flex: none;
+  // flex: none;
   .position{
     position: absolute;
     left: 36px;