flx

.vscode/launch.json

@@ -2,14 +2,17 @@
     // 使用 IntelliSense 了解相关属性。 
     // 悬停以查看现有属性的描述。
     // 欲了解更多信息，请访问: https://go.microsoft.com/fwlink/?linkid=830387
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "type": "pwa-chrome",
+    
+        "version": "0.2.0",
+        "configurations": [
+          {
+            "type": "pwa-msedge",
             "request": "launch",
-            "name": "Launch Chrome against localhost",
+            "name": "Launch Microsoft Edge and open the Edge DevTools",
             "url": "http://localhost:8080",
             "webRoot": "${workspaceFolder}"
-        }
-    ]
+          }
+        ]
+      
+    
 }

ad

@@ -1,261 +0,0 @@
-commit 67fe9bd4260dfa536992b2c435352541536f4c1e (HEAD -> dev, origin/dev)
-Author: 吃个甘蔗嚼一年 <oncwnuCPQ6kimzTDqDGNXpXo_CFQ@git.weixin.qq.com>
-Date:   Thu Sep 2 17:14:18 2021 +0800
-
-    great
-
-commit dbeb0756f397ff11410ccd8848430c098664528b
-Author: 吃个甘蔗嚼一年 <oncwnuCPQ6kimzTDqDGNXpXo_CFQ@git.weixin.qq.com>
-Date:   Tue Aug 31 12:40:11 2021 +0800
-
-    Great upload
-
-commit ef783233934388b872688af72d07fa337a2fd533
-Author: 吃个甘蔗嚼一年 <oncwnuCPQ6kimzTDqDGNXpXo_CFQ@git.weixin.qq.com>
-Date:   Tue Aug 31 09:05:55 2021 +0800
-
-    Great upload
-
-commit b10eddc6c4e443aec9d098e97a5650512ca922a3
-Author: 吃个甘蔗嚼一年 <oncwnuCPQ6kimzTDqDGNXpXo_CFQ@git.weixin.qq.com>
-Date:   Mon Aug 30 19:03:30 2021 +0800
-
-    Great upload
-
-commit ee1ac7da8c936bf626a4aed5a1614c02594f6691
-Merge: 2f6a1ba e686091
-Author: 吃个甘蔗嚼一年 <oncwnuCPQ6kimzTDqDGNXpXo_CFQ@git.weixin.qq.com>
-Date:   Sun Aug 29 13:40:43 2021 +0800
-
-    Mine
-
-commit 2f6a1baeafab16174dd0a5fe02ec0941e8b658d3
-Author: 吃个甘蔗嚼一年 <oncwnuCPQ6kimzTDqDGNXpXo_CFQ@git.weixin.qq.com>
-Date:   Sun Aug 29 13:39:26 2021 +0800
-
-    mine
-
-commit e6860916b59693c3849f5118ebd6892aa245d324
-Author: lizhiwei <lizhiwei@123.com>
-Date:   Sat Aug 28 17:13:06 2021 +0800
-
-    小程序角色切换功能
-
-commit 7c21dfd537ea09b2266be6d043fb42020e472575
-Author: 吃个甘蔗嚼一年 <oncwnuCPQ6kimzTDqDGNXpXo_CFQ@git.weixin.qq.com>
-Date:   Fri Aug 27 16:30:04 2021 +0800
-
-    切换账户
-
-commit 9ef048a18dd15919f82a7b6f6138a5503bc8eb09
-Author: lizhiwei <lizhiwei@123.com>
-Date:   Fri Aug 27 16:28:21 2021 +0800
-
-    小程序联系我们功能实现
-
-commit 7f8342d0dc411e267da70229c9f945137e5eda93
-Merge: 0150a0d fd05c2a
-Author: lizhiwei <lizhiwei@123.com>
-Date:   Fri Aug 27 14:30:30 2021 +0800
-
-    Merge branch 'dev' of http://git.ycjcjy.com/shigongli/miniapp-v2 into dev
-
-commit 0150a0da4461943e6f87cb0cf67fc8b79342afec
-Author: lizhiwei <lizhiwei@123.com>
-Date:   Fri Aug 27 14:27:02 2021 +0800
-
-    小程序增加withLayout
-
-commit fd05c2a2cb691086469b0fe9ee358df3fea472c0
-Author: 吃个甘蔗嚼一年 <oncwnuCPQ6kimzTDqDGNXpXo_CFQ@git.weixin.qq.com>
-Date:   Fri Aug 27 14:25:47 2021 +0800
-
-    1
-
-commit ee4c3f97c20213301289f666e762131dbb2a536f
-Author: yansen <zhangyansen8769@dingtalk.com>
-Date:   Fri Aug 27 10:37:30 2021 +0800
-
-    feats
-
-commit 9003d5fceccd584c4dd48a55f14e731f5f4239f1
-Author: yansen <zhangyansen8769@dingtalk.com>
-Date:   Thu Aug 26 22:12:53 2021 +0800
-
-    feats
-
-commit 7dd5c011ecf2e147431d383c7fa17c55abda271c
-Author: yansen <zhangyansen8769@dingtalk.com>
-Date:   Thu Aug 26 21:19:12 2021 +0800
-
-    feats\
-
-commit 129acdfdee1da25b775e968eb3c573ad67755517
-Author: yansen <zhangyansen8769@dingtalk.com>
-Date:   Thu Aug 26 19:51:11 2021 +0800
-
-    feats
-
-commit d87cd283052c40bd9613e28b509c79568d53e744
-Author: yansen <zhangyansen8769@dingtalk.com>
-Date:   Thu Aug 26 19:26:16 2021 +0800
-
-    feats
-
-commit 392597d00001fe81219c0ca6f608fd622a9c1239
-Author: Your Name <you@example.com>
-Date:   Thu Aug 26 00:29:44 2021 +0800
-
-    feats
-
-commit 6ae348d549bee56657b8dce6f353b7248c1ff866
-Author: yansen <zhangyansen8769@dingtalk.com>
-Date:   Wed Aug 25 23:13:02 2021 +0800
-
-    feats
-
-commit 5dba1157bea174121d2d631b1fd3cc8931313a19
-Author: lizhiwei <lizhiwei@123.com>
-Date:   Wed Aug 25 16:19:39 2021 +0800
-
-    services添加相应模块接口
-
-commit 5b55acf8b0ce73e0e659c979e7dc99308cf29797
-Author: lizhiwei <lizhiwei@123.com>
-Date:   Mon Aug 23 17:32:50 2021 +0800
-
-    小程序端服务增加
-
-commit ed2fbfc2c36c531b1079e8d4f7b9c7c083719990
-Author: lizhiwei <lizhiwei@123.com>
-Date:   Fri Aug 20 13:47:17 2021 +0800
-
-    开始搞后台加油
-
-commit 68e48ac2bff4e4965488d5d13fb3c6e20a9002f4
-Merge: c6e9c0b 6cb203f
-Author: 吃个甘蔗嚼一年 <oncwnuCPQ6kimzTDqDGNXpXo_CFQ@git.weixin.qq.com>
-Date:   Fri Aug 20 09:52:01 2021 +0800
-
-    Merge branch 'dev' of http://git.ycjcjy.com/shigongli/miniapp-v2 into dev
-
-commit c6e9c0b407b0eaf283e51a33c8d4094e2d3b486b
-Author: 吃个甘蔗嚼一年 <oncwnuCPQ6kimzTDqDGNXpXo_CFQ@git.weixin.qq.com>
-Date:   Fri Aug 20 09:50:51 2021 +0800
-
-    tday
-
-commit 6cb203f6e477fd847e0f98e0a1f1f8ba79a3730c
-Author: lizhiwei <lizhiwei@123.com>
-Date:   Fri Aug 20 09:10:32 2021 +0800
-
-    房东端tab
-
-commit ccda14a02d9cb3b789e6488b408ecaa61dc424e8
-Author: lizhiwei <lizhiwei@123.com>
-Date:   Fri Aug 20 08:21:50 2021 +0800
-
-    自定义tabs
-
-commit 6b4630c5c48361a584af54bfe6362d53e66caf0b
-Author: lizhiwei <lizhiwei@123.com>
-Date:   Thu Aug 19 19:55:35 2021 +0800
-
-    ..
-
-commit 2809ce41aacc514c07c36a34e71ea03c86f26e82
-Merge: dc7741b 3e191d3
-Author: lizhiwei <lizhiwei@123.com>
-Date:   Thu Aug 19 18:03:47 2021 +0800
-
-    merge
-
-commit dc7741b206259207beca34be6a597e1704fb388e
-Author: lizhiwei <lizhiwei@123.com>
-Date:   Thu Aug 19 18:01:17 2021 +0800
-
-    eats
-
-commit 3e191d3d8eb3da7dd978eef672b1e51ea97755e5
-Author: 吃个甘蔗嚼一年 <oncwnuCPQ6kimzTDqDGNXpXo_CFQ@git.weixin.qq.com>
-Date:   Thu Aug 19 17:54:20 2021 +0800
-
-    个人中心
-
-commit 798614afb520201b215f33675918077f7a549cf3
-Author: 吃个甘蔗嚼一年 <oncwnuCPQ6kimzTDqDGNXpXo_CFQ@git.weixin.qq.com>
-Date:   Thu Aug 19 17:53:58 2021 +0800
-
-    个人中心 入住指引 支付订单
-
-commit 9a5779097d2f6641139b7be5e7a8b1d6e39253e3
-Author: lizhiwei <lizhiwei@123.com>
-Date:   Thu Aug 19 17:33:58 2021 +0800
-
-    改距离
-
-commit ca85cb12505dfb5acfe7c40b85fb09176d130ca2
-Author: lizhiwei <lizhiwei@123.com>
-Date:   Thu Aug 19 13:46:16 2021 +0800
-
-    1
-
-commit 853665134ddac57b9b7ff2c238bce0e368bcf6ff
-Author: lizhiwei <lizhiwei@123.com>
-Date:   Thu Aug 19 13:40:56 2021 +0800
-
-    新增房东端店主端一键登录房东推荐
-
-commit 2fe0f066d70c7af2c9d6c009628fec3808f8f88c
-Author: baozhangchao <baozhangchao@123>
-Date:   Sun Aug 15 21:45:31 2021 +0800
-
-    card
-
-commit eb247e9cdaf9c733cfa6326e024d49bb20b2713d
-Author: 吃个甘蔗嚼一年 <oncwnuCPQ6kimzTDqDGNXpXo_CFQ@git.weixin.qq.com>
-Date:   Fri Aug 13 19:00:41 2021 +0800
-
-    入住指引
-
-commit 4f690982eee37bb753c8d42f0a8572ae539e8401
-Author: lizhiwei <lizhiwei@123.com>
-Date:   Wed Aug 11 15:47:51 2021 +0800
-
-    feats
-
-commit 1159e62c9489c7a627d17d9ae7a1d7339d56fa58
-Author: yansen <zhangyansen8769@dingtalk.com>
-Date:   Wed Aug 11 14:46:21 2021 +0800
-
-    feats
-
-commit 18c50aaf968578ffcd90b89e3596d7f4f7929364
-Author: yansen <zhangyansen8769@dingtalk.com>
-Date:   Wed Aug 11 14:44:45 2021 +0800
-
-    feats
-
-commit 72ea903bacff9467eec8ffe6dbbdb6ea728cd73e
-Author: yansen <zhangyansen8769@dingtalk.com>
-Date:   Wed Aug 11 14:34:10 2021 +0800
-
-    feats
-
-commit e630881ecf4dd59b767634e848c7894664a8c301
-Author: Your Name <you@example.com>
-Date:   Wed Aug 11 02:25:30 2021 +0800
-
-    feats
-
-commit 8be7ee61c955934320dd3623c46a73c4d52e7c09
-Author: Your Name <you@example.com>
-Date:   Wed Aug 11 01:45:40 2021 +0800
-
-    feats
-
-commit 01e91de24d1f593f1b3e575cffb6c3cb0ddf2f7d (origin/master, origin/HEAD, master)
-Author: Your Name <you@example.com>
-Date:   Tue Aug 10 00:19:07 2021 +0800
-
-    first

src/components/foodCards/foodCards.jsx

@@ -1,14 +1,14 @@
+import useSave from "@/utils/hooks/useSave"
+import Taro from "@tarojs/taro"
+import { getShopDetail, getShopcity } from '@/services/home'
+import { useState, useEffect } from 'react'
 import Star from '@/components/Star/Star.jsx'
-import Taro from '@tarojs/taro'
 import pay from '@/assets/icons/housemantj/pay.png'
 import msTip from '@/assets/icons/housemantj/foodtip.png'
 import wz from '@/assets/icons/housemantj/location.png'
 import hongxin from '@/assets/icons/housemantj/已收藏.png'
 import baixin from '@/assets/icons/housemantj/收藏.png'
 import './style.less'
-import useSave from "@/utils/hooks/useSave"
-import { getShopDetail, getShopcity } from '@/services/home'
-import { useState, useEffect } from 'react'
 
 
 
@@ -19,6 +19,12 @@ export default (props) => {
   const [city, setCity] = useState({})
   const [detail, setDetail] = useState({})
 
+  const goToPay = () => {
+    Taro.navigateTo({
+      url: `/pages/PayOrder/index?packageId=${item.packageId}&shopId=${item.shopId}`,
+    })
+  }
+
   useEffect(() => {
     getShopDetail(item.shopId).then((res) => {
       setDetail(res)
@@ -30,45 +36,44 @@ export default (props) => {
   const star = parseFloat(((detail.sweetScore + detail.environmentScore + detail.serviceScore) / 3).toFixed(1));
 
   return (
-      <view className='foodCard'>
-        <view className='fCleft'>
-          <view className='backMoney'>
-            返现￥{item.cashback/100}
-          </view>
-          <view className='appraise'>
-            <Star star={star} />
-            <text className='storezf'>{star}</text>
+    <view className='foodCard'>
+      <view className='fCleft'>
+        <view className='backMoney'>
+          返现￥{item.cashback / 100}
+        </view>
+        <view className='appraise'>
+          <Star star={star} />
+          <text className='storezf'>{star}</text>
+        </view>
+        <view>
+          <view className='contentImg'>
+            <image src={item.poster} className='img1'></image>
+            <image src={msTip} className='mstip'></image>
           </view>
-          <view>
-            <view className='contentImg'>
-              <image src={item.poster} className='img1'></image>
-              <image src={msTip} className='mstip'></image>
+          <view className='neirong'>
+            <view className='textword'>{(item.description).toString().length > 25 ? (item.description).substring(0, 25) + '...' : (item.description)}</view>
+            <view className='jiage'>
+              <text className='rmb' >￥&nbsp;&nbsp;</text>
+              <text className='p1'><text className='price' >{item.actualPrice / 100}</text>元&nbsp;&nbsp;</text>
+              <text className='p2'>门市价<text className='oldprice' >{item.standardPrice / 100}</text>元</text>
             </view>
-            <view className='neirong'>
-              <view className='textword'>{(item.description).toString().length>25?(item.description).substring(0, 25)+'...':(item.description)}</view>
-              <view className='jiage'>
-                <text className='rmb' >￥&nbsp;&nbsp;</text>
-                <text className='p1'><text className='price' >{item.actualPrice/100}</text>元&nbsp;&nbsp;</text>
-                <text className='p2'>门市价<text className='oldprice' >{item.standardPrice/100}</text>元</text>
-              </view>
-              <view className='address'>
-                <image className='dw' src={wz} />
-                <text className='wz'>{city.areaPName}/{city.areaName}</text>
-                <view style={{display:'inline-block'}} onClick={toggleSave}>
-                <image className='star' src={isSaved>0?hongxin:baixin}></image>
-                <text className='collection'>{isSaved>0?'已收藏':'加入收藏'}</text>
-              </view>
+            <view className='address'>
+              <image className='dw' src={wz} />
+              <text className='wz'>{city.areaPName}/{city.areaName}</text>
+              <view style={{ display: 'inline-block' }} onClick={toggleSave}>
+                <image className='star' src={isSaved > 0 ? hongxin : baixin}></image>
+                <text className='collection'>{isSaved > 0 ? '已收藏' : '加入收藏'}</text>
               </view>
             </view>
           </view>
         </view>
       </view>
-      <view className='fCright' onClick={() => Detail()} >
+      <view className='fCright' onClick={() => { goToPay() }}>
         <image src={pay} />
         <view>支付</view>
       </view>
       <view className='columnLine'></view>
-    </view >
+    </view>
 
   )
 }

src/pages/PayOrder/index.jsx

@@ -14,13 +14,15 @@ import './style.less'
 
 export default withLayout((props) => {
   const { router, person } = props
-  const { id, shopId } = props.router.params
+  const { id, shopId, packageId } = props.router.params
   const [shopPackage, setShopPackage] = useState([])
   const [buttonDisabled, setButtonDisabled] = useState(true)
   const [totalCost, setTotalCost] = useState(0)
   const [cashBack, setCashBack] = useState(0)
   const [realPrice, setRealPrice] = useState(0)
 
+  console.log('----------shopId-------', props, shopId, id);
+
   const handelButton = () => {
     setButtonDisabled(false)
   }
@@ -33,7 +35,6 @@ export default withLayout((props) => {
 
   const handeList = () => {
     shopPackage.map((item) => {
-      console.log("🚀 ~ file: index.jsx ~ line 34 ~ shopPackage.map ~ item", item)
       //总价
       let CostSum = (item.actualPrice / 100) * (item.BuyNumber || 1)
       setTotalCost(totalCost + CostSum)
@@ -53,7 +54,7 @@ export default withLayout((props) => {
   useEffect(() => {
 
 
-    getShopPackage(shopId, { packageId: id }).then((res) => {
+    getShopPackage(shopId, { packageId: packageId }).then((res) => {
       const itemShop = res.records
       setShopPackage(itemShop)
     })