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

src/components/CollectList/MyCollect/index.jsx

@@ -33,7 +33,7 @@ export default (props) => {
   return (
     <View>
       {
-        targetType === "shop_package" && (
+        targetType === "shop" && (
           <view class='wrapper'>
             <view class='left-complete-one'   >
               <image className='left-image-1' src={ProCard_hot} style={{ display: item.targetType === 'shop_package' ? '' : 'none' }} ></image>
@@ -61,7 +61,7 @@ export default (props) => {
               </view>
             </view>
             <view class='right-complete-two'>
-              <view className='right-content' onClick={() => { Taro.navigateTo({ url: `/pages/details/foodDetails/foodDetails?id=${item.shopId}` }); }}>
+              <view className='right-content' onClick={() => { Taro.navigateTo({ url: `/pages/details/foodDetails/foodDetails?id=${item.targetId}` }); }}>
                 {/* <view className='right-number'>×1</view> */}
                 <image className='right-image' src={SeeDetails} />
                 <view className='right-title'>查看详情</view>
@@ -72,7 +72,7 @@ export default (props) => {
       }
       <View>
         {
-          targetType !== "shop_package" && (
+          targetType !== "shop" && (
             <view class='wrapper-tourist'>
               <view class='left-complete-one'   >
                 <view className='title-image'>

src/pages/index/tabs/Mine.jsx

@@ -1,7 +1,5 @@
-
 import { useState, useEffect } from 'react'
 import Taro from '@tarojs/taro'
-import { Slot } from '@tarojs/components'
 import AuthPage from '@/components/AuthPage'
 import boy from '@/assets/icons/UserCenter/boy.png'
 import girl from '@/assets/icons/UserCenter/girl.png'
@@ -15,9 +13,8 @@ import collect from '@/assets/icons/UserCenter/collect.png'
 import Rules from '@/assets/icons/UserCenter/Rules.png'
 import DefaultImage from '@/assets/icons/UserCenter/DefaultImage.png'
 import cutoverUser from '@/assets/icons/UserCenter/cutoverUser.png'
-import { PaysOrder, getMineOrder } from '@/services/payOrder' //创建订单
+import {  getMineOrder } from '@/services/payOrder' //创建订单
 import ToggleRole from '@/components/toggleRole/ToggleRole'
-
 import { useModel } from '@/store'
 import './MineCss/style.less'
 
@@ -105,7 +102,6 @@ export default (props) => {
     Taro.navigateTo({ url: '/pages/MineUserAll/Rules/index' })
   }
 
-  //#endregion
 
   return !person.phone ? <AuthPage /> : (
     <scroll-view scroll-y style='height: 100%;' >