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

.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}"
-        }
-    ]
+          }
+        ]
+      
+    
 }

package.json

@@ -42,6 +42,7 @@
     "@tarojs/runtime": "3.3.2",
     "@tarojs/taro": "3.3.2",
     "@zjxpcyc/react-tiny-store": "^1.0.0",
+    "moment": "^2.29.1",
     "react": "^17.0.0",
     "react-dom": "^17.0.0"
   },

src/components/CompoentsOrder/AlreadyExpired/index.jsx

@@ -39,7 +39,7 @@ export default (props) => {
             <view className='card-box-star'>
               {
                 scoreList.map((_, index) => {
-                  console.log(index)
+
                   const src = (index + '0.1') < score ? starOn : starOff
                   return (
                     <image className='card-star-image' key={index} src={src} />
@@ -78,7 +78,7 @@ export default (props) => {
             <view className='card-box-star'>
               {
                 scoreList.map((_, index) => {
-                  console.log(index)
+
                   const src = (index + '0.1') < score ? starOn : starOff
                   return (
                     <image className='card-star-image' key={index} src={src} />

src/components/CompoentsOrder/AlreadyUsed/index.jsx

@@ -48,7 +48,7 @@ export default (props) => {
               <text className='card-box-star-text' onClick={Nuberr} >口味：</text>
               {
                 scoreList.map((_, index) => {
-                  console.log(index)
+
                   const src = (index + `${CollectNub}`) < score ? starOn : starOff
                   return (
                     <image className='card-star-image' key={index} src={src} onClick={Nuberr} />
@@ -60,7 +60,7 @@ export default (props) => {
               <text className='card-box-star-text' onClick={Nuberr} >环境：</text>
               {
                 scoreList.map((_, index) => {
-                  console.log(index)
+
                   const src = (index + `${CollectNub}`) < score ? starOn : starOff
                   return (
                     <image className='card-star-image' key={index} src={src} onClick={Nuberr} />
@@ -72,7 +72,7 @@ export default (props) => {
               <text className='card-box-star-text' onClick={Nuberr} >服务：</text>
               {
                 scoreList.map((_, index) => {
-                  console.log(index)
+
                   const src = (index + `${CollectNub}`) < score ? starOn : starOff
                   return (
                     <image className='card-star-image' key={index} src={src} onClick={Nuberr} />
@@ -100,7 +100,7 @@ export default (props) => {
             <view className='card-box-star'>
               {
                 scoreList.map((_, index) => {
-                  console.log(index)
+
                   const src = (index + '0.1') < score ? starOn : starOff
                   return (
                     <image className='card-star-image' key={index} src={src} />
@@ -141,7 +141,7 @@ export default (props) => {
             <view className='card-box-star'>
               {
                 scoreList.map((_, index) => {
-                  console.log(index)
+
                   const src = (index + '0.1') < score ? starOn : starOff
                   return (
                     <image className='card-star-image' key={index} src={src} />

src/components/CompoentsOrder/complete/index.jsx

@@ -34,7 +34,7 @@ export default (props) => {
             <view className='card-box-star'>
               {
                 scoreList.map((_, index) => {
-                  console.log(index)
+
                   const src = (index + '0.1') < score ? starOn : starOff
                   return (
                     <image className='card-star-image' key={index} src={src} />
@@ -129,7 +129,7 @@ export default (props) => {
             <view className='card-box-star'>
               {
                 scoreList.map((_, index) => {
-                  console.log(index)
+
                   const src = (index + '0.1') < score ? starOn : starOff
                   return (
                     <image className='card-star-image' key={index} src={src} />

src/components/OrderMolded/index.jsx

@@ -1,32 +1,35 @@
 import { useState } from 'react'
 import image from '@/assets/icons/ProCard/8kb.jpg'
 import { Button, Radio } from '@tarojs/components'
-
+import PayOrderCard from '@/components/PayOrderCard'
+import moment from 'moment'
 import food from '@/assets/icons/ProCard/food.png'
 import ProCard_hot from '@/assets/icons/ProCard/ProCard_hot.png'
 import './style.less'
 
 export default (props) => {
+  const { item } = props
 
   return (
     <view class='wrapper-box'>
       <view class='left-complete-one'>
         <image className='left-image-1' src={ProCard_hot}></image>
         <view className='left-viewText'>
-          返现￥16.00
+          返现￥{item.cashback / 100}
         </view>
         <view className='title-image'>
-          <image className='image-1' mode='scaleToFill' src={image}></image>
+          <image className='image-1' mode='scaleToFill' src={item.poster}></image>
           <image className='image-2' src={food}></image>
         </view>
         <view className='title-content'>
           <view className='Pro-title'>
-            <view className='title-text'>【橘里橘气咖啡店】新鲜出炉啦!</view>
+            <view className='title-text'>{item.description}</view>
           </view>
-          <text className='title-money' >￥6990元</text>
-          <view className='title-time' >有效期：2021/06/21-2021/12/31</view>
+          <text className='title-money' >￥{item.actualPrice / 100}元</text>
+          <view className='title-time' >有效期：<text>{moment(item.startTimeal).format('YYYY/MM/DD')}</text> - <text>{moment(item.endTime).format('YYYY/MM/DD')}</text></view>
         </view>
       </view>
     </view>
+    // </view >
   )
 }

src/components/PayOrderCard/index.jsx

@@ -0,0 +1,121 @@
+import withLayout from '@/layouts'
+import useSave from "@/utils/hooks/useSave"
+import image from '@/assets/icons/ProCard/8kb.jpg'
+import AuthPage from '@/components/AuthPage'
+import moment from 'moment'
+import { useState, useEffect } from 'react'
+import { Button, Radio, Input } from '@tarojs/components'
+import food from '@/assets/icons/ProCard/food.png'
+import ProCard_hot from '@/assets/icons/ProCard/ProCard_hot.png'
+import OrderMolded from '@/components/OrderMolded'
+import Popup from '@/components/Popup'
+
+
+
+import './style.less'
+
+export default (props) => {
+  const { item, onShopContent, onShopNumber } = props
+  const [showDialog, setShowDialog] = useState(false)
+  const [BuyNumber, setBuyNumber] = useState(1)
+  const [DisabledBool, setDisabledBool] = useState(false)
+
+
+
+  const ShowMoldeOn = () => {
+    setShowDialog(true)
+  }
+  const ButtonCancel = () => {
+    setShowDialog(false)
+    setBuyNumber(1)
+  }
+  const ButtonOK = (e) => {
+    setShowDialog(false)
+    const itemList = [{ ...item }]
+    const itemListNumber = itemList.map(x => {
+      return { ...x, BuyNumber: BuyNumber }
+    })
+    const handeItemList = itemListNumber.map(shoPnumber => {
+      onShopContent(shoPnumber)
+    })
+    onShopNumber()
+    // console.log("🚀 ~ file: index.jsx ~ line 38 ~ ButtonOK ~ handeItemList", handeItemList)
+
+
+  }
+  const NumberAdd = () => {
+    setBuyNumber(BuyNumber + 1)
+
+  }
+
+  const NumberCut = () => {
+    setBuyNumber(BuyNumber - 1)
+
+  }
+
+  const onInput = (e) => {
+    let values = e.detail.value
+    setBuyNumber(values - 0)
+
+
+  }
+
+
+  useEffect(() => {
+    if (BuyNumber < 2) {
+      setDisabledBool(true)
+
+    } else {
+      setDisabledBool(false)
+
+    }
+
+  }, [BuyNumber])
+
+  return (
+
+    <view class='container'>
+      <Popup show={showDialog} maskClosable={false}>
+        <OrderMolded item={item} />
+        <view className='item-center-Number' >
+          <view className='buy-num-minus' disabled={DisabledBool} onClick={NumberCut} > - </view>
+          <Input className='buy-num-input' type='number' min={1} onInput={onInput} value={BuyNumber} />
+          <view className='buy-num-add' onClick={NumberAdd} >+</view>
+        </view>
+        <view className='buy-button-box' >
+          <button className='button-Cancel' onClick={ButtonCancel} >取消</button>
+          <button className='button-OK' onClick={ButtonOK} >确定</button>
+        </view>
+      </Popup>
+      <view class='coupon-list'>
+        <view class='wrapper'>
+          <view class='left-complete-one'>
+            <image className='left-image-1' src={ProCard_hot}></image>
+            <view className='left-viewText'>
+              返现￥{item.cashback / 100}
+            </view>
+            <view className='title-image'>
+              <image className='image-1' mode='scaleToFill' src={item.poster}></image>
+              <image className='image-2' src={food}></image>
+            </view>
+            <view className='title-content'>
+              <view className='Pro-title'>
+                <view className='title-text'>{item.description}</view>
+              </view>
+              <text className='title-money' >￥{item.actualPrice / 100}<text className='title-money-2'>{item.standardPrice / 100}</text></text>
+              <view className='title-time' >有效期：<text>{moment(item.startTimeal).format('YYYY/MM/DD')}</text> - <text>{moment(item.endTime).format('YYYY/MM/DD')}</text></view>
+            </view>
+          </view>
+          <view class='right-complete-two' onClick={ShowMoldeOn} >
+            <view className='right-content'>
+              <view className='right-number'>×{BuyNumber}</view>
+              <view className='right-title'>数量</view>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+
+
+  )
+}

src/components/PayOrderCard/style.less

@@ -0,0 +1,299 @@
+@whiteColor: #fff;
+@Image-ProCard_hot: "../../assets/icons/ProCard/ProCard_hot.png";
+.container {
+  width: 100%;
+  .item-center-Number {
+    width: 100%;
+    margin-top: 30px;
+    .buy-num-minus {
+      display: inline-block;
+      width: 60px;
+      height: 60px;
+      background: #ffffff;
+      border: 1px solid #999999;
+      border-radius: 8px 0px 0px 8px;
+    }
+    .buy-num-input {
+      display: inline-block;
+      width: 90px;
+      height: 60px;
+      font-size: 28px;
+      font-weight: 400;
+      color: #202020;
+      background: #ffffff;
+      border: 1px solid #999999;
+      position: relative;
+      top: 26px;
+    }
+    .buy-num-add {
+      display: inline-block;
+
+      width: 60px;
+      height: 60px;
+      background: #ffffff;
+      border: 1px solid #999999;
+      border-radius: 0px 8px 8px 0px;
+    }
+  }
+  .buy-button-box {
+    width: 100%;
+    margin: 40px 0 0 0;
+
+    .button-Cancel {
+      display: inline-block;
+      width: 236px;
+      height: 78px;
+      border: 2px solid #274291;
+      font-size: 30px;
+      font-weight: bold;
+      color: #274291;
+      border-radius: 12px;
+      margin-right: 80px;
+    }
+    .button-OK {
+      display: inline-block;
+
+      width: 236px;
+      height: 78px;
+      background: #274291;
+      border-radius: 12px;
+      font-size: 30px;
+      font-weight: bold;
+      color: #ffffff;
+    }
+  }
+  .wrapper {
+    display: flex;
+    position: relative;
+    // margin-top: 600px;
+    margin: 30px auto;
+    width: 700px;
+
+    // box-shadow: 0px 8px 38px 0px rgba(0, 0, 0, 0.12);
+    // filter: drop-shadow(5px 8px 6px rgb(202, 202, 202));
+    filter: drop-shadow(0 0 0.9rem rgba(0, 0, 0, 0.12));
+
+    .left-complete-one {
+      padding-top: 87px;
+      padding-bottom: 43px;
+      position: relative;
+      display: flex;
+      background: @whiteColor;
+      background: radial-gradient(
+            circle at top right,
+            transparent 15px,
+            @whiteColor 0
+          )
+          top right,
+        radial-gradient(circle at bottom right, transparent 15px, @whiteColor 0)
+          bottom right;
+      background-size: 100% 60%;
+      background-repeat: no-repeat;
+
+      width: 573px;
+      border-radius: 15px 0px 0px 15px;
+      // border-radius: 12px;
+
+      align-items: center;
+      .left-image-1 {
+        width: 145px;
+        height: 44px;
+        position: absolute;
+        top: 22px;
+      }
+      .left-viewText {
+        // background-image: url(@Image-ProCard_hot);
+        // width: 287px;
+        width: auto;
+        height: 44.3px;
+        position: absolute;
+        left: 1px;
+        top: 28px;
+        font-size: 24px;
+        color: @whiteColor;
+        font-weight: 600;
+      }
+      //图片
+      .title-image {
+        width: 145px;
+        margin-left: 20px;
+        border-radius: 24px;
+        overflow: hidden;
+        position: relative;
+        .image-1 {
+          width: 100%;
+          height: 145px;
+        }
+        .image-2 {
+          width: 89px;
+          height: 34px;
+          position: absolute;
+          left: 0;
+          top: 0;
+        }
+      }
+      // 商品标题
+      .title-content {
+        // padding: 84px 0 56px 20px;
+        padding-left: 18px;
+
+        .Pro-title {
+          .title-text {
+            width: 375px;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            display: -webkit-box; //必须要
+            -webkit-line-clamp: 1;
+            -webkit-box-orient: vertical;
+            word-break: break-all; /* 多出文本省略号代替 */
+            text-align: left;
+            font-size: 24px;
+            padding-bottom: 10px;
+          }
+        }
+        .title-money {
+          padding-top: 34px;
+          font-size: 24px;
+          // color: red;
+          font-weight: 800;
+        }
+        .title-money-2 {
+          font-size: 18px;
+          color: #666;
+          padding-left: 10px;
+          text-decoration: line-through;
+        }
+
+        .title-time {
+          font-size: 24px;
+          padding-top: 20px;
+          color: #c0c8d3;
+        }
+      }
+    }
+  }
+
+  .right-complete-two {
+    background: @whiteColor;
+    background: radial-gradient(
+          circle at top left,
+          transparent 15px,
+          @whiteColor 0
+        )
+        top left,
+      radial-gradient(circle at bottom left, transparent 15px, @whiteColor 0)
+        bottom left;
+    background-size: 100% 60%;
+    background-repeat: no-repeat;
+    width: 129px;
+    border-radius: 0 15px 15px 0;
+    position: relative;
+    //右面部分
+    .right-content {
+      // width: 100px;
+      // height: 80px;
+      position: absolute;
+      top: 50%;
+      left: 50%;
+      transform: translate(-50%, -50%);
+      // border: 1px solid red;
+
+      .right-number {
+        width: 40px;
+        font-size: 20px;
+        border-radius: 4px;
+        border: 2px solid #999;
+        margin: auto;
+        text-align: center;
+      }
+
+      .right-title {
+        font-weight: 700;
+        font-size: 24px;
+        padding-top: 20px;
+        text-align: center;
+      }
+    }
+  }
+  //线条
+  .right-complete-two::after {
+    content: "";
+    position: absolute;
+    top: 15px;
+    margin: 26px auto;
+    height: 70%;
+    border-left: 1px dashed #595959;
+  }
+
+  .view-button {
+
+    position: fixed;
+    bottom: 0px;
+
+    .Card-number-box {
+      .Card-number {
+        width: 100%;
+        height: 96px;
+        background-color: @whiteColor;
+      }
+      .Card-user {
+        width: 100%;
+        height: 96px;
+        background-color: @whiteColor;
+      }
+    }
+    .button-box-button-box {
+      position: relative;
+      .button-text-image {
+        width: 144;
+        height: 45px;
+        position: absolute;
+        top: -35px;
+        left: 267px;
+        right: 305px;
+        z-index: 1;
+        .button-text-money-hot {
+          position: absolute;
+          width: 144px;
+          height: 43px;
+          line-height: 43px;
+          font-size: 24px;
+          font-weight: bold;
+          color: @whiteColor;
+        }
+        .button-image {
+          width: 143px;
+          height: 43px;
+        }
+        .button-text-money {
+          position: absolute;
+          margin-top: -8;
+          width: 157px;
+          font-size: 18px;
+          font-weight: 400;
+          text-decoration: line-through;
+          color: @whiteColor;
+        }
+      }
+      .button-box-one {
+        font-size: 30px;
+        line-height: 92px;
+        margin-top: 3em;
+        background-color: #274190;
+        border-radius: 12px;
+        width: 690px;
+        height: 92px;
+        color: @whiteColor;
+        // position: absolute;
+        bottom: 40px;
+        right: 0;
+        left: 0;
+        .button-text-one {
+          right: 133px;
+          font-size: 30px;
+          padding-left: 220px;
+        }
+      }
+    }
+  }
+}

src/components/foodCards/foodCards.jsx

@@ -1,3 +1,7 @@
+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 pay from '@/assets/icons/housemantj/pay.png'
 import msTip from '@/assets/icons/housemantj/foodtip.png'
@@ -5,68 +9,71 @@ 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'
 
 
 
 //套餐卡片
 export default (props) => {
   const { item } = props
-  const [isSaved, toggleSave] = useSave(item.isSaved,'shop_package', item.packageId)
-  const [city,setCity]=useState({})
-  const [detail,setDetail]=useState({})
+  const [isSaved, toggleSave] = useSave(item.isSaved, 'shop_package', item.packageId)
+  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)
-    getShopcity(res.cityId).then((res2)=>{
-      setCity(res2)
+    getShopDetail(item.shopId).then((res) => {
+      setDetail(res)
+      getShopcity(res.cityId).then((res2) => {
+        setCity(res2)
+      })
     })
-  })
-}, [])
-const star=parseFloat(((detail.sweetScore+detail.environmentScore+detail.serviceScore)/3).toFixed(1)); 
+  }, [])
+  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 className='fCright'>
-          <image src={pay} />
-          <view>支付</view>
-        </view>
-        <view className='columnLine'></view>
       </view>
-    
+      <view className='fCright' onClick={() => { goToPay() }}>
+        <image src={pay} />
+        <view>支付</view>
+      </view>
+      <view className='columnLine'></view>
+    </view>
+
   )
 }

src/pages/MineUserAll/Collect/index.jsx

@@ -49,7 +49,7 @@ export default withLayout((props) => {
           <view className='card-box-star'>
             {
               scoreList.map((_, index) => {
-                console.log(index)
+
                 const src = (index + '0.1') < score ? starOn : starOff
                 return (
                   <image className='card-star-image' key={index} src={src} />
@@ -92,7 +92,7 @@ export default withLayout((props) => {
           <view className='card-box-star'>
             {
               scoreList.map((_, index) => {
-                console.log(index)
+
                 const src = (index + '0.1') < score ? starOn : starOff
                 return (
                   <image className='card-star-image' key={index} src={src} />

src/pages/MineUserAll/RefundMoney/index.jsx

@@ -40,7 +40,7 @@ export default withLayout((props) => {
           <view className='card-box-star'>
             {
               scoreList.map((_, index) => {
-                console.log(index)
+
                 const src = (index + '0.1') < score ? starOn : starOff
                 return (
                   <image className='card-star-image' key={index} src={src} />
@@ -80,7 +80,7 @@ export default withLayout((props) => {
           <view className='card-box-star'>
             {
               scoreList.map((_, index) => {
-                console.log(index)
+
                 const src = (index + '0.1') < score ? starOn : starOff
                 return (
                   <image className='card-star-image' key={index} src={src} />

src/pages/PayOrder/index.jsx

@@ -1,178 +1,140 @@
 import withLayout from '@/layouts'
 import image from '@/assets/icons/ProCard/8kb.jpg'
-import { useState, useEffect } from 'react'
+import AuthPage from '@/components/AuthPage'
+import Taro from '@tarojs/taro'
+import { useState, useEffect, useRef } from 'react'
 import { Button, Radio, Input } from '@tarojs/components'
-
 import food from '@/assets/icons/ProCard/food.png'
 import ProCard_hot from '@/assets/icons/ProCard/ProCard_hot.png'
 import CustomNav from '@/components/CustomNav'
-import OrderMolded from '@/components/OrderMolded'
-import Popup from '@/components/Popup'
-
+import PayOrderCard from '@/components/PayOrderCard'
+import { PaysOrder, getMineOrder } from '@/services/payOrder' //创建订单
+import { getShopPackage, } from '@/services/home'
 import './style.less'
 
 export default withLayout((props) => {
   const { router, person } = props
+  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)
 
-  const [showDialog, setShowDialog] = useState(false)
-
-  const [BuyNumber, setBuyNumber] = useState(1)
-  const [DisabledBool, setDisabledBool] = useState(false)
+  console.log('----------shopId-------', props, shopId, id);
 
-  const ShowMoldeOn = () => {
-    setShowDialog(true)
+  const handelButton = () => {
+    setButtonDisabled(false)
   }
-  const ButtonCancel = () => {
-    setShowDialog(false)
+
+  const goRules = () => {
+    Taro.navigateTo({ url: `/pages/MineUserAll/Rules/index` })
+
   }
-  const ButtonOK = (e) => {
-    setShowDialog(false)
 
+
+  const handeList = () => {
+    shopPackage.map((item) => {
+      //总价
+      let CostSum = (item.actualPrice / 100) * (item.BuyNumber || 1)
+      setTotalCost(totalCost + CostSum)
+      //返现价
+      let backSum = (item.cashback / 100) * (item.BuyNumber || 1)
+      setCashBack(cashBack + backSum)
+      //实际价
+      let PriceSum = (item.standardPrice / 100) * (item.BuyNumber || 1)
+      setRealPrice(realPrice + PriceSum)
+
+    })
   }
 
 
 
-  const NumberAdd = () => {
-    setBuyNumber(BuyNumber + 1)
-    console.log(BuyNumber);
 
-  }
+  useEffect(() => {
 
-  const NumberCut = () => {
-    setBuyNumber(BuyNumber - 1)
-    console.log(BuyNumber);
 
-  }
+    getShopPackage(shopId, { packageId: packageId }).then((res) => {
+      const itemShop = res.records
+      setShopPackage(itemShop)
+    })
 
-  const onInput = (e) => {
-    let values = e.detail.value
-    setBuyNumber(values - 0)
 
+  }, [])
 
+
+
+
+
+  const shopContent = (item) => {
+    const lst = shopPackage.map((pack) => {
+      if (pack.packageId === item.packageId) {
+        return item
+      } else {
+        return pack
+      }
+    })
+
+    setShopPackage(lst)
   }
 
-  useEffect(() => {
-    if (BuyNumber < 2) {
-      setDisabledBool(true)
+  const submit = (data) => {
+    PaysOrder(data, {
+      amount: 2,
+      itemId: id,
+      price: totalCost
+
+    }).then((res) => {
+      console.log("🚀 ~ file: index.jsx ~ line 33 ~ submit ~ res", res)
+
+      Taro.requestPayment({
+        timeStamp: '',
+        nonceStr: '',
+        package: '',
+        signType: 'MD5',
+        paySign: '',
+        success: val => {
+          console.log(val);
+        },
+        fail: err => {
+
+        }
 
-    } else {
-      setDisabledBool(false)
+      })
+
+    }).catch(err => {
+      console.log("🚀 ~ -------------支付错误------------", err)
+
+    });
+  }
 
-    }
-  }, [BuyNumber])
 
-  return (
+
+  return !person.phone ? <AuthPage /> : (
 
     <view class='container'>
       <CustomNav title='订单' />
-      <Popup show={showDialog} maskClosable={false}>
-        <OrderMolded />
-        <view className='item-center-Number' >
-          <view className='buy-num-minus' disabled={DisabledBool} onClick={NumberCut} >-</view>
-          <Input className='buy-num-input' type="number" min="1" onInput={onInput} value={BuyNumber} />
-          <view className='buy-num-add' onClick={NumberAdd} >+</view>
-        </view>
-        <view className='buy-button-box' >
-          <button className='button-Cancel' onClick={ButtonCancel} >取消</button>
-          <button className='button-OK' onClick={ButtonOK} >确定</button>
-        </view>
-      </Popup>
-      <view class='coupon-list'>
-        <view class='wrapper'>
-          <view class='left-complete-one'>
-            <image className='left-image-1' src={ProCard_hot}></image>
-            <view className='left-viewText'>
-              返现￥16.00
-            </view>
-            <view className='title-image'>
-              <image className='image-1' mode='scaleToFill' src={image}></image>
-              <image className='image-2' src={food}></image>
-            </view>
-            <view className='title-content'>
-              <view className='Pro-title'>
-                <view className='title-text'>【橘里橘气咖啡店】新鲜出炉啦!</view>
-              </view>
-              <text className='title-money' >￥6990元<text className='title-money-2'>门市价78元</text></text>
-              <view className='title-time' >有效期：2021/06/21-2021/12/31</view>
-            </view>
-          </view>
-          <view class='right-complete-two' onClick={ShowMoldeOn} >
-            <view className='right-content'>
-              <view className='right-number'>×{BuyNumber}</view>
-              <view className='right-title'>数量</view>
-            </view>
-          </view>
-        </view>
-        <view class='wrapper'>
-          <view class='left-complete-one'>
-            <image className='left-image-1' src={ProCard_hot}></image>
-            <view className='left-viewText'>
-              返现￥16.00
-            </view>
-            <view className='title-image'>
-              <image className='image-1' mode='scaleToFill' src={image}></image>
-              <image className='image-2' src={food}></image>
-            </view>
-            <view className='title-content'>
-              <view className='Pro-title'>
-                <view className='title-text'>【橘里橘气咖啡店】新鲜出炉啦!</view>
-              </view>
-              <text className='title-money' >￥6990元<text className='title-money-2'>门市价78元</text></text>
-              <view className='title-time' >有效期：2021/06/21-2021/12/31</view>
-            </view>
-          </view>
-          <view class='right-complete-two'>
-            <view className='right-content'>
-              <view className='right-number'>×1</view>
-              <view className='right-title'>数量</view>
-            </view>
-          </view>
-        </view>
+      {
+        shopPackage?.map((item, index) => <PayOrderCard onShopContent={shopContent} onShopNumber={handeList} key={(index)} item={item} />)
+      }
 
-        <view class='wrapper'>
-          <view class='left-complete-one'>
-            <image className='left-image-1' src={ProCard_hot}></image>
-            <view className='left-viewText'>
-              返现￥16.00
-            </view>
-            <view className='title-image'>
-              <image className='image-1' mode='scaleToFill' src={image}></image>
-              <image className='image-2' src={food}></image>
-            </view>
-            <view className='title-content'>
-              <view className='Pro-title'>
-                <view className='title-text'>【橘里橘气咖啡店】新鲜出炉啦!</view>
-              </view>
-              <text className='title-money' >￥6990元<text className='title-money-2'>门市价78元</text></text>
-              <view className='title-time' >有效期：2021/06/21-2021/12/31</view>
-            </view>
-          </view>
-          <view class='right-complete-two'>
-            <view className='right-content'>
-              <view className='right-number'>×1</view>
-              <view className='right-title'>数量</view>
-            </view>
-          </view>
-        </view>
-
-      </view>
       <view className='view-button'>
         <view className='Card-number-box'>
           <view className='Card-number'>
             <text style='left:29px;position: absolute; padding-top:20px'>手机号码:</text>
-            <text style='right:29px;position: absolute;padding-top:20px'>16161312125</text>
+            <text style='right:29px;position: absolute;padding-top:20px'>{person.phone}</text>
           </view>
           <view className='Card-user'>
-            <Radio style='padding-left:20px; position: relative; top:24px;' value='我已阅读知晓并同意' >我已阅读知晓并同意 <text style='color:#274190;text-decoration:underline;font-weight:400'>《平台用户服务协议》</text></Radio>
+            <Radio onClick={handelButton} style='padding-left:20px; position: relative; top:24px;' value='我已阅读知晓并同意' >我已阅读知晓并同意 <text style='color:#274190;text-decoration:underline;font-weight:400' onClick={goRules} >《平台用户服务协议》</text></Radio>
           </view>
         </view>
         <view className='button-box-button-box'>
           <view className='button-text-image' >
-            <text className='button-text-money-hot'>返现￥2.18</text>
-            <image className='button-image' src={ProCard_hot}>123123</image>
-            <view className='button-text-money'>门店市面价：230元</view>
+            <text className='button-text-money-hot'>返现￥{cashBack}</text>
+            <image className='button-image' src={ProCard_hot}></image>
+            <view className='button-text-money'>门店市面价：{realPrice / 100}元</view>
           </view>
-          <Button className='button-box-one'>￥170元 <text className='button-text-one'>支付订单</text> </Button>
+          <Button onClick={submit} disabled={buttonDisabled} className='button-box-one'>￥{totalCost}元 <text className='button-text-one'>支付订单</text> </Button>
         </view>
 
       </view>
@@ -180,4 +142,6 @@ export default withLayout((props) => {
 
 
   )
+
 })
+

src/pages/PayOrder/style.less

@@ -23,7 +23,7 @@
       background: #ffffff;
       border: 1px solid #999999;
       position: relative;
-      top: 30px;
+      top: 26px;
     }
     .buy-num-add {
       display: inline-block;
@@ -226,9 +226,9 @@
   }
 
   .view-button {
-    // width: 100%;
-    // height: 150px;
-    position: relative;
+
+    position: fixed;
+    bottom: 0px;
 
     .Card-number-box {
       .Card-number {

src/pages/details/foodDetails/foodDetails.jsx

@@ -1,7 +1,7 @@
 import CustomNav from '@/components/CustomNav'
 import withLayout from '@/layouts'
-import {getShopDetail,getShopPackage,getExtendContent} from '@/services/home'
-import { useState,useEffect } from 'react'
+import { getShopDetail, getShopPackage, getExtendContent } from '@/services/home'
+import { useState, useEffect } from 'react'
 import { Swiper, SwiperItem } from '@tarojs/components';
 import Star from '@/components/Star/Star.jsx'
 import Cards from '@/components/foodCards/foodCards.jsx'
@@ -24,93 +24,93 @@ import { useRef } from 'react';
 
 export default withLayout((props) => {
   const { router, person } = props
-  const {id}=props.router.params
+  const { id } = props.router.params
   //商铺基础信息
-  const [detail,setDetail]=useState({})
+  const [detail, setDetail] = useState({})
   //商铺套餐
-  const [spackage,setPackage]=useState([])
+  const [spackage, setPackage] = useState([])
   //banner图集数组
-  const [imglist,setimglist]=useState([])
+  const [imglist, setimglist] = useState([])
   const [index, setIndex] = useState(0)
   const handchange = (e) => {
     setIndex(e.detail.current)
   }
-  
+
   const [isSaved, toggleSave] = useSave(detail.isSaved, 'shop', id)
   const [isLike, toggleLike] = useLike(detail.isLike, 'shop', id)
 
   //当前套餐总数
-  const [newpgNum,setNewpgNum]=useState(0)
+  const [newpgNum, setNewpgNum] = useState(0)
   //全部套餐个数
-  const [AllpgNum,setAllpgNum]=useState(0)
+  const [AllpgNum, setAllpgNum] = useState(0)
   //套餐当前页数
-  const [page,setpage]=useState(2)
-  const pgMore=()=>{
-    setpage(page+1)
-    getShopPackage(id,{pageNum:page}).then((res)=>{
-      setPackage([...spackage,...res.records])
-      setNewpgNum(newpgNum+res.records.length)
+  const [page, setpage] = useState(2)
+  const pgMore = () => {
+    setpage(page + 1)
+    getShopPackage(id, { pageNum: page }).then((res) => {
+      setPackage([...spackage, ...res.records])
+      setNewpgNum(newpgNum + res.records.length)
     })
   }
   //本店指南
-  const [extend,setExtend]=useState([])
+  const [extend, setExtend] = useState([])
 
   //当前指南总数
-  const [newextNum,setNewextNum]=useState(0)
+  const [newextNum, setNewextNum] = useState(0)
   //全部指南个数
-  const [AllextNum,setAllextNum]=useState(0)
+  const [AllextNum, setAllextNum] = useState(0)
   //指南当前页数
-  const [epage,setepage]=useState(2)
-  const extendMore=()=>{
-    setepage(epage+1)
-    getExtendContent('shop',id,{pageNum:epage}).then((res)=>{
-      setExtend([...extend,...res.records])
-      setNewextNum(newextNum+res.records.length)
+  const [epage, setepage] = useState(2)
+  const extendMore = () => {
+    setepage(epage + 1)
+    getExtendContent('shop', id, { pageNum: epage }).then((res) => {
+      setExtend([...extend, ...res.records])
+      setNewextNum(newextNum + res.records.length)
     })
   }
-  const toShare=()=>{
+  const toShare = () => {
     console.log(222222222222)
     onShareAppMessage()
   }
-  const openMap=()=>{
-     Taro.openLocation({
-              longitude: log.current - 0,
-              latitude: lat.current - 0,
-              name: detail.shopName,
-              address:detail.address,
-              scale: 12,
-            })
+  const openMap = () => {
+    Taro.openLocation({
+      longitude: log.current - 0,
+      latitude: lat.current - 0,
+      name: detail.shopName,
+      address: detail.address,
+      scale: 12,
+    })
   }
-  const log=useRef('')
-  const lat=useRef('')
+  const log = useRef('')
+  const lat = useRef('')
 
-  useEffect(()=>{
-    getShopDetail(id).then((res)=>{
+  useEffect(() => {
+    getShopDetail(id).then((res) => {
       setDetail(res)
-      log.current=(res.locaton).toString().split(',')[0]
-      lat.current=(res.locaton).toString().split(',')[1]
-      setimglist(res.imageList||[])
+      log.current = (res.locaton).toString().split(',')[0]
+      lat.current = (res.locaton).toString().split(',')[1]
+      setimglist(res.imageList || [])
     })
-    getShopPackage(id).then((res)=>{
-      setPackage(res.records||[])
+    getShopPackage(id).then((res) => {
+      setPackage(res.records || [])
       setNewpgNum(res.records.length)
       setAllpgNum(res.total)
     })
-    getExtendContent('shop',id).then((res)=>{
-      setExtend(res.records||[])
+    getExtendContent('shop', id).then((res) => {
+      setExtend(res.records || [])
       setAllextNum(res.total)
       setNewextNum(res.records.length)
     })
-  },[])
-  const star=parseFloat(((detail.sweetScore+detail.environmentScore+detail.serviceScore)/3).toFixed(1)); 
-return (
+  }, [])
+  const star = parseFloat(((detail.sweetScore + detail.environmentScore + detail.serviceScore) / 3).toFixed(1));
+  return (
     <view className='page-index'>
       <view className='index-navbar'>
         <CustomNav title='十公里' />
       </view>
-      <view style={{overflow: 'auto', padding: '0 30rpx', background: '#F8F8F8' }}>
-        <scroll-view scroll-y="true" scroll-view='true' bindscrolltoupper="upper" bindscrolltolower="lower" bindscroll="scroll">
-          <view className='storeDetails'>           
+      <view style={{ overflow: 'auto', padding: '0 30rpx', background: '#F8F8F8' }}>
+        <scroll-view scroll-y='true' scroll-view='true' bindscrolltoupper='upper' bindscrolltolower='lower' bindscroll='scroll'>
+          <view className='storeDetails'>
             <Swiper
               className='.swiper'
               circular
@@ -122,27 +122,27 @@ return (
                   <SwiperItem>
                     <image src={item.url} className='storeImage' >
                       <view className='tpPage'>
-                      <text>{index + 1}/{imglist.length}</text>
+                        <text>{index + 1}/{imglist.length}</text>
                       </view>
                     </image>
                   </SwiperItem>
                 )
               }
-            </Swiper>                        
+            </Swiper>
             <view className='storeJs'>
               <view style={{ overflow: 'hidden' }}>
-                  <view className='storeName'>{detail.shopName}</view>
-                  <view className='sprice'>
-                    <text className='t1'>￥</text>
-                    {detail.averagePrice/100}/人                
-                    <view className='bzRight'>
-                      <image src={ax} style={{ width: '15px', height: '15px', marginRight: '11rpx', marginBottom: '-2px' }} />
+                <view className='storeName'>{detail.shopName}</view>
+                <view className='sprice'>
+                  <text className='t1'>￥</text>
+                  {detail.averagePrice / 100}/人
+                  <view className='bzRight'>
+                    <image src={ax} style={{ width: '15px', height: '15px', marginRight: '11rpx', marginBottom: '-2px' }} />
                     爆赞{detail.likeNum}</view>
-                  </view>
+                </view>
               </view>
               <view className='appraise'>
-                <Star star={star}/>{star}
-                <view style={{float:'right',marginTop:'5px'}}>
+                <Star star={star} />{star}
+                <view style={{ float: 'right', marginTop: '5px' }}>
                   <text className='comment'>点评：</text>
                   <text className='t1'>口味：{detail.sweetScore}</text>
                   <text className='t1'>环境：{detail.environmentScore}</text>
@@ -152,36 +152,36 @@ return (
               <view className='yysj'>
                 <image src={yysj} className='yysjImg' />营业时间：{detail.businessHours}
               </view>
-              <view className='dpPosition' onClick={openMap}> 
+              <view className='dpPosition' onClick={openMap}>
                 <image src={dw} className='dwTip' />
                 <view>
-                  {detail.address}<image src={zhuandao} className='zhuandao'/>
+                  {detail.address}<image src={zhuandao} className='zhuandao' />
                 </view>
               </view>
             </view>
           </view>
-          <view style={{ position: 'relative',display:spackage==''?'none':''}}>
+          <view style={{ position: 'relative', display: spackage == '' ? 'none' : '' }}>
             <view className='title'>
-              <image src={titlezs}/><text>返现套餐</text>
-            </view>            
-            {spackage?.map((item)=><Cards star={star} item={item}/>)}            
-            <view className='showMore' style={{display:newpgNum==AllpgNum?'none':''}} onClick={pgMore}>
+              <image src={titlezs} /><text>返现套餐</text>
+            </view>
+            {spackage?.map((item) => <Cards star={star} item={item} />)}
+            <view className='showMore' style={{ display: newpgNum == AllpgNum ? 'none' : '' }} onClick={pgMore}>
               <view>查看更多</view>
               <image src={showMore} className='moreTip' />
             </view>
           </view>
-          <view style={{ position: 'relative',display:extend==''?'none':'' }}>
+          <view style={{ position: 'relative', display: extend == '' ? 'none' : '' }}>
             <view className='title'>
-              <image src={titlezs}/>
+              <image src={titlezs} />
               <text>本店指南</text>
             </view>
-            {extend?.map((item)=><Extend item={item} />)}
-            <view className='showMore' style={{display:newextNum==AllextNum?'none':''}} onClick={extendMore}>
+            {extend?.map((item) => <Extend item={item} />)}
+            <view className='showMore' style={{ display: newextNum == AllextNum ? 'none' : '' }} onClick={extendMore}>
               <view>查看更多</view>
               <image src={showMore} className='moreTip' />
             </view>
           </view>
-           <view className='botton' style={{display:newextNum==AllextNum?'':'none'}}>已经到底了~</view>
+          <view className='botton' style={{ display: newextNum == AllextNum ? '' : 'none' }}>已经到底了~</view>
         </scroll-view>
       </view>
       <view className='bottomTab'>

src/pages/index/tabs/Mine.jsx

@@ -1,5 +1,5 @@
 
-import { useState } from 'react'
+import { useState, useEffect } from 'react'
 import Taro from '@tarojs/taro'
 import { Slot } from '@tarojs/components'
 import AuthPage from '@/components/AuthPage'
@@ -16,6 +16,8 @@ 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 SwitchSelect from '@/components/SwitchSelect'
+import { PaysOrder, getMineOrder } from '@/services/payOrder' //创建订单
+
 import { useModel } from '@/store'
 import './MineCss/style.less'
 import  ToggleRoul  from  '@/components/toggleRoul/ToggleRoul'
@@ -30,8 +32,9 @@ export default (props) => {
   const { getAvatar } = useModel('person')
   const [showCutover, setShowCutover] = useState(false)
   const hasAvatar = !!person.avatar
-  // const hidePhone = person.phone.replace(/^(\d{3})\d{4}(\d+)/, "$1****$2")
-  // console.log("🚀 ~ file: Mine.jsx ~ line 31 ~ hidePhone", hidePhone)
+  const [orderNum, setOrderNum] = useState([])
+  console.log("🚀 ~ file: Mine.jsx ~ line 34 ~ orderNum", orderNum)
+
 
   const ShowMoldeOn = () => {
     setShowCutover(true)
@@ -40,6 +43,13 @@ export default (props) => {
     setShowCutover(false)
   }
 
+  useEffect(() => {
+    getMineOrder().then(res => setOrderNum(res))
+
+  }, [])
+
+
+
   // 通过getUserProfile获取微信用户信息
   const handleGetUserProfile = () => {
     if (hasAvatar) return;
@@ -128,12 +138,12 @@ export default (props) => {
             <view className='buy-list-Paybox' onClick={handleTobePaid} >
               <image className='buy-list-PayLogo' src={awaitPay} />
               <view className='buy-list-goPay'>待支付</view>
-              <view className='buy-list-OrderNumber'>2笔订单</view>
+              <view className='buy-list-OrderNumber'>{orderNum?.unPayNum}笔订单</view>
             </view>
             <view className='buy-list-Paybox ' onClick={handleTobeWritten} >
               <image className='buy-list-PayLogo' src={ToShop} />
               <view className='buy-list-goPay'>待核销</view>
-              <view className='buy-list-OrderNumber'>1个订单</view>
+              <view className='buy-list-OrderNumber'>{orderNum?.unVerifiedNum}个订单</view>
             </view>
             <view className='buy-list-Paybox ' onClick={handleAllOrder} >
               <image className='buy-list-PayLogo' src={AllOrder} />
@@ -143,7 +153,7 @@ export default (props) => {
             <view className='buy-list-Paybox ' onClick={handleRefund} >
               <image className='buy-list-PayLogo' src={Refund} />
               <view className='buy-list-goPay'>退款/售后</view>
-              <view className='buy-list-OrderNumber'>2笔订单</view>
+              <view className='buy-list-OrderNumber'>{orderNum?.refundNum}笔订单</view>
             </view>
           </view>
           <view className='Badge-box'>

src/services/payOrder.js

@@ -1,4 +1,13 @@
 //支付订单模块
 import request from '@/utils/request'
 //套餐订单列表用哪个接口
+
+export const getMineOrder = () => request('/orderSub/summary/mine',)
+
+
+
+export const PaysOrder = (data) => request('/order', { data, method: 'post' })
+
+
+
 //订单详情，订单修改数量