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

config/dev.js

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

project.tt.json

@@ -1,9 +0,0 @@
-{
-  "miniprogramRoot": "./",
-  "projectname": "miniapp",
-  "appid": "touristappid",
-  "setting": {
-    "es6": false,
-    "minified": false
-  }
-}

src/components/BossCard/index.jsx

@@ -3,6 +3,7 @@ import { View, Text } from '@tarojs/components'
 import Pay from '@/assets/icons/GuideCheck/Pay_logo.png'
 import { getQueryString } from '@/utils/index'
 import CouponCard from '@/components/CouponCard'
+import { compressImage } from '@/utils'
 import Location from '@/components/Location'
 import SaveIcon from '@/components/SaveIcon'
 
@@ -32,7 +33,7 @@ export default (props) => {
       <CouponMedia onClick={goFood}>
         <CouponMedia.Header
           cashback={item.cashback}
-          image={item.poster}
+          image={compressImage(item.poster)}
           badge='food'
         />
         <CouponMedia.Body star={st}>

src/components/CollectList/MyCollect/index.jsx

@@ -4,6 +4,7 @@ import formatPrice from "@/utils/formatPrice";
 import SeeDetails from '@/assets/icons/GuideCheck/SeeDetails.png'
 import baozan from '@/assets/icons/housemantj/bgood.png'
 import CouponCard from '@/components/CouponCard'
+import { compressImage } from '@/utils'
 import Location from '@/components/Location'
 import './style.less'
 
@@ -34,7 +35,7 @@ export default (props) => {
                 <CouponMedia>
                   <CouponMedia.Header
                     cashback={item.cashback}
-                    image={item.poster}
+                    image={compressImage(item.poster)}
                     badge='food'
                   />
                   <CouponMedia.Body star={star}>
@@ -60,7 +61,7 @@ export default (props) => {
               <CouponCard action={PayAction}>
                 <CouponMedia>
                   <CouponMedia.Header
-                    image={item.poster}
+                    image={compressImage(item.poster)}
                     badge={targetType}
                   />
                   <CouponMedia.Body >

src/components/CompoentsOrder/AlreadyUsed/index.jsx

@@ -4,6 +4,7 @@ import { View } from '@tarojs/components'
 import starOn from '@/assets/icons/GuideCheck/starOn.png'
 import starOff from '@/assets/icons/GuideCheck/starOff.png'
 import formatTime from '@/utils/formatTime'
+import { compressImage } from '@/utils'
 import food from '@/assets/icons/ProCard/food.png'
 import Popup from '@/components/Popup'
 import { saveEvaluate } from '@/services/mine'
@@ -73,7 +74,7 @@ export default (props) => {
         </View>
         <View className='v2'>
           <View className='title-image' >
-            <image className='image-1' mode='scaleToFill' src={item.poster || []}></image>
+            <image className='image-1' mode='scaleToFill' src={compressImage(item.poster) || []}></image>
             <image className='image-2' src={food}></image>
           </View>
           <View className='title-content'>

src/components/CompoentsOrder/OrderCard/index.jsx

@@ -1,8 +1,11 @@
 import Taro from "@tarojs/taro";
 import { View, Text } from '@tarojs/components'
+import { compressImage } from '@/utils'
+import { parseQueryString } from '@/utils/index'
 import formatTime from "@/utils/formatTime";
 import SlideView from '@/components/SlideView';
 import CouponCard from '@/components/CouponCard'
+import { getQrcode } from '@/services/miniapp'
 import QRcode from "@/assets/icons/UserCenter/QRcode.png";
 import refund from "@/assets/icons/GuideCheck/refund.png";
 import Cancel from "@/assets/icons/UserCenter/Cancel.png";
@@ -34,9 +37,21 @@ export default (props) => {
       onlyFromCamera: true,
       success: (res) => {
         if (res.path) {
-          Taro.navigateTo({
-            url: `/${res.path}&subOrderId=${item.subOrderId}`,
-          });
+          getQrcode(parseQueryString(res.path.split('?')[1]).scene).then((res2) => {
+            const maid = res2.scene.split('=')[1].split('&')[0] //二维码的商铺id
+            if (maid == item.shopId) {
+              Taro.navigateTo({
+                url: `/${res.path}&subOrderId=${item.subOrderId}`,
+              });
+            } else {
+              Taro.showToast({
+                title: "非套餐对应店铺二维码",
+                icon: "none",
+                duration: 2000,
+              });
+            }
+          })
+
         } else {
           Taro.showToast({
             title: "非当前小程序生成二维码",
@@ -71,27 +86,27 @@ export default (props) => {
   //                 item.isVerified == true && item.isEvaluated > 0 ? <Action.Image image={Evaluated} /> ://已评价
   //                   item.isVerified == true ? <Action.Icon icon={Evaluation} text='评价' onClick={() => evaluation(item)} /> : null//待评价
 
-  let PayAction=null
-  if (kkp=='1') {//空卡片用于售后详情页面
-    PayAction=null
-  }else if (sh=='1') {//售后页面卡片
-     PayAction=<Action.Icon icon={Refund} text='售后/退款' onClick={() => handleRefund(item)} />
-  }else if (item.status===0) {//待支付
-     PayAction=<Action.Icon icon={Pay} text='支付' onClick={handleDetail} />
-  }else if (item.status === 1 && item.isVerified == false) {//待核销
-     PayAction=<Action.Icon icon={QRcode} text='扫码核销' onClick={() => onWriteOff(item)} />
-  }else if (item.status === 2 && item.isVerified == false) {//已退费
-     PayAction=<Action.Image image={refund} />
-  }else if (item.status === 7 && item.isVerified == false) {//已取消
-     PayAction=<Action.Image image={Cancel} />
-  }else if(item.status === 9){//已过期
-     PayAction=<Action.Image image={Null} />
-  }else if (item.isVerified == true && item.isEvaluated > 0) {//已评价
-     PayAction=<Action.Image image={Evaluated} />
-  }else if (item.isVerified == true) {//待评价
-     PayAction=<Action.Icon icon={Evaluation} text='评价' onClick={() => evaluation(item)} />
-  }else{
-    PayAction=null
+  let PayAction = null
+  if (kkp == '1') {//空卡片用于售后详情页面
+    PayAction = null
+  } else if (sh == '1') {//售后页面卡片
+    PayAction = <Action.Icon icon={Refund} text='售后/退款' onClick={() => handleRefund(item)} />
+  } else if (item.status === 0) {//待支付
+    PayAction = <Action.Icon icon={Pay} text='支付' onClick={handleDetail} />
+  } else if (item.status === 1 && item.isVerified == false) {//待核销
+    PayAction = <Action.Icon icon={QRcode} text='扫码核销' onClick={() => onWriteOff(item)} />
+  } else if (item.status === 2 && item.isVerified == false) {//已退费
+    PayAction = <Action.Image image={refund} />
+  } else if (item.status === 7 && item.isVerified == false) {//已取消
+    PayAction = <Action.Image image={Cancel} />
+  } else if (item.status === 9) {//已过期
+    PayAction = <Action.Image image={Null} />
+  } else if (item.isVerified == true && item.isEvaluated > 0) {//已评价
+    PayAction = <Action.Image image={Evaluated} />
+  } else if (item.isVerified == true) {//待评价
+    PayAction = <Action.Icon icon={Evaluation} text='评价' onClick={() => evaluation(item)} />
+  } else {
+    PayAction = null
   }
 
   return (
@@ -103,11 +118,11 @@ export default (props) => {
       {
         //待支付可以左滑删除
         item.status === 0 ? <SlideView del onDelete={() => handeDelete(item)} >
-          <CouponCard onClick={() => { Taro.navigateTo({ url: `/pages/details/foodDetails/foodDetails?id=${item.shopId}` })}} action={PayAction}>
+          <CouponCard onClick={() => { Taro.navigateTo({ url: `/pages/details/foodDetails/foodDetails?id=${item.shopId}` }) }} action={PayAction}>
             <CouponMedia>
               <CouponMedia.Header
                 cashback={item.cashback}
-                image={item.poster}
+                image={compressImage(item.poster)}
                 badge='food'
               />
               <CouponMedia.Body star={kkp == '1' ? 'ss' : item.score}>
@@ -137,11 +152,11 @@ export default (props) => {
           </CouponCard>
         </SlideView>
           :
-          <CouponCard onClick={() => { Taro.navigateTo({ url: `/pages/details/foodDetails/foodDetails?id=${item.shopId}` })}} action={PayAction} >
+          <CouponCard onClick={() => { Taro.navigateTo({ url: `/pages/details/foodDetails/foodDetails?id=${item.shopId}` }) }} action={PayAction} >
             <CouponMedia>
               <CouponMedia.Header
                 cashback={item.cashback}
-                image={item.poster}
+                image={compressImage(item.poster)}
                 badge='food'
               />
               <CouponMedia.Body star={kkp == '1' ? 'ss' : item.score}>

src/components/MoreGuide/index.jsx

@@ -1,19 +1,15 @@
 import { Video } from '@tarojs/components';
+import { compressImage } from '@/utils'
 import './style.less'
 
 export default (props) => {
   const { item } = props
   return (
-
     <>
-
       {
-
         item.contentType == 'image' ?
-
-          <image src={item.content} mode='widthFix' style={{ width: '100%' }} className='image-content' /> :
+          <image src={compressImage(item.content)} mode='widthFix' style={{ width: '100%' }} className='image-content' /> :
           item.contentType == 'text' ?
-
             <view style={{ marginBottom: '5px' }}>
               <view className='storezn'>{item.content}</view>
             </view>
@@ -24,9 +20,6 @@ export default (props) => {
               loop={false}
               muted={false} style={{ width: "100%", height: '200px' }} src={item.content}></Video>
       }
-
     </>
   )
-}
-
-
+}

src/components/OrderMolded/index.jsx

@@ -1,10 +1,9 @@
 import { useState } from 'react'
 
 import { Button, Radio, View } from '@tarojs/components'
-import PayOrderCard from '@/components/PayOrderCard'
 import formatTimes from '@/utils/formatTime'
+import { compressImage } from '@/utils'
 import food from '@/assets/icons/ProCard/food.png'
-import ProCard_hot from '@/assets/icons/ProCard/ProCard_hot.png'
 import './style.less'
 
 export default (props) => {
@@ -15,7 +14,7 @@ export default (props) => {
       <view class='left-complete-one-cardOrder'>
         <View className='left-viewText-payOrder'>返现￥{(item.cashback / 100).toFixed(2)}</View>
         <view className='title-image-cardOrder'>
-          <image className='image-1-cardOrder' mode='scaleToFill' src={item.poster}></image>
+          <image className='image-1-cardOrder' mode='scaleToFill' src={compressImage(item.poster)}></image>
           <image className='image-2-cardOrder' src={food}></image>
         </view>
         <view className='title-content-cardOrder'>

src/components/PayOrderCard/index.jsx

@@ -1,7 +1,8 @@
 import formatTimes from '@/utils/formatTime'
 import { useState, useEffect } from 'react'
-import { Button, Radio, Input } from '@tarojs/components'
+import { Input } from '@tarojs/components'
 import food from '@/assets/icons/ProCard/food.png'
+import { compressImage } from '@/utils'
 import ProCard_hot from '@/assets/icons/ProCard/ProCard_hot.png'
 import OrderMolded from '@/components/OrderMolded'
 import Popup from '@/components/Popup'
@@ -90,7 +91,7 @@ export default (props) => {
               返现￥{(item.cashback / 100).toFixed(2)}
             </view>
             <view className='title-image'>
-              <image className='image-1' mode='scaleToFill' src={item.poster}></image>
+              <image className='image-1' mode='scaleToFill' src={compressImage(item.poster)}></image>
               <image className='image-2' src={food}></image>
             </view>
             <view className='title-content'>

src/components/ShopUnused/index.jsx

@@ -1,5 +1,7 @@
 import Taro from '@tarojs/taro'
 import { useState, useEffect } from 'react'
+import { compressImage } from '@/utils'
+
 import formatTimes from '@/utils/formatTime'
 
 
@@ -22,7 +24,7 @@ export default (props) => {
         <view className='orderTime'>下单日期：{formatTimes(item.orderDate, 'yyyy-MM-dd hh:mm')}</view>
       </view>
       <view className='order'>
-        <image className='orderImg' src={item.poster} mode='aspectFit' />
+        <image className='orderImg' src={compressImage(item.poster)} mode='aspectFit' />
         <view className='orderRight'>
           <view className='foodName'>{item.description}</view>
 

src/components/ShopUsed/index.jsx

@@ -1,6 +1,7 @@
 import Taro from '@tarojs/taro'
 import { setGetVerifiedOrder } from '@/services/shopBoss'
 import { View, Text, Image } from '@tarojs/components'
+import { compressImage } from '@/utils'
 import { useState } from 'react'
 import formatTimes from '@/utils/formatTime'
 import './style.less'
@@ -36,14 +37,12 @@ export default (props) => {
         <View className='orderTime'>下单日期：{formatTimes(item.orderDate, 'yyyy-MM-dd hh:mm') || ''}</View>
       </View>
       <View className='order'>
-        <Image className='orderImg' src={item.poster} mode='aspectFit' />
+        <Image className='orderImg' src={compressImage(item.poster)} mode='aspectFit' />
         <View className='orderRight'>
           <View className='foodName'>{item.description}</View>
           <View className='price'>合计金额：￥<Text style={{ fontSize: '24rpx' }}>{((item.actualPrice / 100) - (item.cashback / 100) - (item.commissionCharge / 100)).toFixed(2)}</Text>元 <Text className='pnum'>数量：<Text>1</Text>张</Text> </View>
         </View>
-
         <View className='veri_Date' > 核销时间：{formatTimes(item.verifiedDate, 'yyyy-MM-dd hh:mm')}</View>
-
         <View className='line' />
         <View className='phone'>客户手机：<Text>{item.phone.replace(/^(\d{3})\d{4}(\d+)/, "$1****$2") || ''}</Text>
           {

src/components/Spin/SpinBox.jsx

@@ -7,7 +7,7 @@ import './style.less'
 const Loading = (props) => {
   const { loading, size = '64rpx', ...leftProps } = props
 
-  const cls = ['loading-box', loading? 'active' : undefined].filter(Boolean).join(' ')
+  const cls = ['loading-box', loading ? 'active' : undefined].filter(Boolean).join(' ')
 
   return (
     <View className={cls}>

src/components/foodCards/foodCards.jsx

@@ -2,6 +2,7 @@ import Taro from '@tarojs/taro'
 import { View, Text } from '@tarojs/components'
 import CouponCard from '@/components/CouponCard'
 import Location from '@/components/Location'
+import { compressImage } from '@/utils'
 import SaveIcon from '@/components/SaveIcon'
 import Pay from '@/assets/icons/housemantj/pay.png'
 import './style.less'
@@ -27,7 +28,7 @@ export default (props) => {
         <CouponMedia onClick={goshop ? '' : goFood}>
           <CouponMedia.Header
             cashback={item.cashback}
-            image={item.poster}
+            image={compressImage(item.poster)}
             badge='food'
           />
           <CouponMedia.Body star={st}>

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

@@ -3,6 +3,7 @@ import Taro from '@tarojs/taro';
 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 SlideView from '@/components/SlideView';
 import './style.less'
 
@@ -96,7 +97,7 @@ export default (props) => {
         item.contentType == 'image' ?
           <View>
             <SlideView del onDelete={handelDelete}>
-              <Image src={eimg} mode='widthFix' style={{ width: '100%', display: 'block' }} onClick={handerChange} />
+              <Image src={compressImage(eimg)} mode='widthFix' style={{ width: '100%', display: 'block' }} onClick={handerChange} />
             </SlideView>
           </View>
           :

src/pages/PayOrder/Card/index.jsx

@@ -1,9 +1,7 @@
 import formatTime from "@/utils/formatTime";
-import { useState, useEffect } from "react";
-
+import { compressImage } from '@/utils'
 import formatPrice from "@/utils/formatPrice";
 import food from "@/assets/icons/ProCard/food.png";
-
 import './style.less'
 
 
@@ -19,7 +17,7 @@ export default (props) => {
           <image
             className='image-1-payOrder'
             mode='scaleToFill'
-            src={item.poster}
+            src={compressImage(item.poster)}
           ></image>
           <image className='image-2-payOrder' src={food}></image>
         </view>

src/pages/TobeShop/Card/index.jsx

@@ -4,6 +4,7 @@ import formatTime from "@/utils/formatTime";
 import CouponCard from '@/components/CouponCard'
 import Check_OK from "@/assets/icons/UserCenter/Check_OK.png";
 import Check_NO from "@/assets/icons/UserCenter/Check_NO.png";
+import { compressImage } from '@/utils'
 import './style.less'
 
 const CouponMedia = CouponCard.Media
@@ -17,7 +18,7 @@ export default (props) => {
       <CouponMedia>
         <CouponMedia.Header
           cashback={item.cashback}
-          image={item.poster}
+          image={compressImage(item.poster)}
           badge='food'
         />
         <CouponMedia.Body star='ss'>

src/pages/details/components/Extend/extend.jsx

@@ -1,4 +1,5 @@
 import { Video } from '@tarojs/components';
+import { compressImage } from '@/utils'
 import './extend.less'
 
 export default (props) => {
@@ -7,7 +8,7 @@ export default (props) => {
     <view className='cardext'>
     {
       item.contentType == 'image' ?
-        <image src={item.content} mode='widthFix' style={{ width: '100%'}} /> :
+        <image src={compressImage(item.content)} mode='widthFix' style={{ width: '100%'}} /> :
         item.contentType == 'text' ?
           <view className='storezn'>{item.content}</view> :
           <Video

src/pages/details/foodDetails/foodDetails.jsx

@@ -9,6 +9,7 @@ import {
 import { getVerifyTargetList } from "@/services/payOrder";
 import { useState, useEffect, useRef } from "react";
 import { Button, Swiper, SwiperItem, View } from "@tarojs/components";
+import { compressImage } from '@/utils'
 import Star from "@/components/Star/Star.jsx";
 import NoData from '@/components/NoData'
 import Cards from "@/components/foodCards/foodCards.jsx";
@@ -145,7 +146,7 @@ export default withLayout((props) => {
               >
                 {imglist.map((item, inx) => (
                   <SwiperItem key={inx}>
-                    <image src={item.url} mode='aspectFit' className='storeImage' />
+                    <image src={compressImage(item.url)} mode='aspectFit' className='storeImage' />
                   </SwiperItem>
                 ))}
               </Swiper>

src/pages/details/mjDetails/sceneryDetails.jsx

@@ -3,7 +3,7 @@ import ax from '@/assets/icons/housemantj/onlove.png'
 import dw from '@/assets/icons/housemantj/loc-o.png'
 import titlejd from '@/assets/icons/housemantj/goodTourist.png'
 import titlems from '@/assets/icons/housemantj/goodFood.png'
-import showMore from '@/assets/icons/housemantj/setMore.png'
+import { compressImage } from '@/utils'
 import share from '@/assets/icons/housemantj/touristShare.png'
 import good from '@/assets/icons/housemantj/touristGood.png'
 import baozan from '@/assets/icons/housemantj/bgood.png'
@@ -106,7 +106,7 @@ export default withLayout((props) => {
               {
                 imglist.map((item) =>(
                   <SwiperItem>
-                    <image src={item.url} mode='aspectFit' className='storeImage' />
+                    <image src={compressImage(item.url)} mode='aspectFit' className='storeImage' />
                     </SwiperItem>
                 ))}
               </Swiper>

src/pages/index/tabs/Recommend.jsx

@@ -57,6 +57,7 @@ export default (props) => {
   }
 
 
+
   useEffect(() => {
     //查询分类标签表
     getIndexType({ pageSize: 20 }).then((res) => {

src/shop/components/Sparead/spreadMoney.jsx

@@ -53,48 +53,47 @@ export default (props) => {
 
   return (
     <view>
-      <ToggleRole showCutover={showCutover} maskClosable={showCutover} onClose={onClose} role='shop' />
 
       <view style={{ padding: '0 15px 0 15px', height: '100%' }}>
-        <scroll-view scrollY style={{ height: 'calc(100vh - 120px)' }}>
+        <ToggleRole showCutover={showCutover} maskClosable={showCutover} onClose={onClose} role='shop' />
 
-          <view className='storexx'>
+        <view className='storexx'>
 
-            <view className='storeName'>店名：<Picker style={{ display: 'inline-block' }} placeholder="请选择商铺" value={shop?.shopId} kv={['shopName', 'shopId']} dicts={shopList} onChange={handleHotelChange} /></view>
-            <view onClick={ShowMoldeOn} className='User-info-cutover'>
-              <image className='User-info-cutover-image' src={cutoverUser} />
-            </view>
-            <view className='tip'>（计算收入以核销为准）</view>
-            <view className='money'>
-              <view className='sleft'>
-                <view className='lword'>全年推广收入（税前）</view>
-                <view className='yearMoney'>
-                  <text>{isyear ? (shopMoney?.totalCharges / 100).toFixed(2) : '******'}</text>元
-                  <image className='micon' src={isyear ? eyes : ceyes} onClick={handleYear} />
-                </view>
+          <view className='storeName'>店名：<Picker style={{ display: 'inline-block' }} placeholder="请选择商铺" value={shop?.shopId} kv={['shopName', 'shopId']} dicts={shopList} onChange={handleHotelChange} /></view>
+          <view onClick={ShowMoldeOn} className='User-info-cutover'>
+            <image className='User-info-cutover-image' src={cutoverUser} />
+          </view>
+          <view className='tip'>（计算收入以核销为准）</view>
+          <view className='money'>
+            <view className='sleft'>
+              <view className='lword'>全年推广收入（税前）</view>
+              <view className='yearMoney'>
+                <text>{isyear ? (shopMoney?.totalCharges / 100).toFixed(2) : '******'}</text>元
+                <image className='micon' src={isyear ? eyes : ceyes} onClick={handleYear} />
               </view>
-              <view className='line' />
-              <view className='sright'>
-                <view className='rword'>当月推广收入（税前）</view>
-                <view className='monthMoney'>
-                  <text>{isMomth ? (shopMoney?.currentCharges / 100).toFixed(2) : '******'}</text>元
-                  <image className='micon2' src={isMomth ? eyes : ceyes} onClick={handleMonth}></image>
-                </view></view>
             </view>
-
+            <view className='line' />
+            <view className='sright'>
+              <view className='rword'>当月推广收入（税前）</view>
+              <view className='monthMoney'>
+                <text>{isMomth ? (shopMoney?.currentCharges / 100).toFixed(2) : '******'}</text>元
+                <image className='micon2' src={isMomth ? eyes : ceyes} onClick={handleMonth}></image>
+              </view></view>
           </view>
 
+        </view>
+
+
+        <view className='title'>推广收入记录</view>
 
-          <view className='title'>推广收入记录</view>
-          <List
-            style={{ height: 'calc(100% - 145px)' }}
-            request={reqestAPI}
-            params={queryParams}
-            noData={<NoData />}
-            render={({ item, index }) => <ShopCommission key={(index)} item={item} />}
-          >
-          </List>
-        </scroll-view>
+        <List
+          style={{ height: 'calc(100% - 145px)' }}
+          request={reqestAPI}
+          params={queryParams}
+          noData={<NoData />}
+          render={({ item, index }) => <ShopCommission key={(index)} item={item} />}
+        >
+        </List>
 
       </view>