flx

src/pages/TobeShop/index.jsx

@@ -21,7 +21,7 @@ import formatTime from '@/utils/formatTime'
 import "./style.less";
 
 export default withLayout((props) => {
-  const { router, person } = props;
+  const { router, person, location } = props;
   const { id, subOrderId } = props.router.params;
   const [showDialog, setShowDialog] = useState(false);
   //核销
@@ -34,7 +34,7 @@ export default withLayout((props) => {
 
 
   const getShop = () => {
-    getShopDetail(id).then(e => {
+    getShopDetail(id, { location: location }).then(e => {
       setShopContent(e)
 
     })
@@ -106,92 +106,92 @@ export default withLayout((props) => {
   };
 
   return (
-    <view className="shop-Eat">
-      <CustomNav title="到店核销" />
+    <view className='shop-Eat'>
+      <CustomNav title='到店核销' />
       <Popup show={showDialog} maskClosable={false}>
-        <view className="Consumption-Now">您即将核销1张套餐券！</view>
-        <text className="Consumption-text">核销后套餐券不退不换</text>
-        <text className="Consumption-text">请核对无误后再点击确认！</text>
-        <view className="buy-button-box">
-          <button className="button-Cancel" onClick={ButtonCancel}>
+        <view className='Consumption-Now'>您即将核销1张套餐券！</view>
+        <text className='Consumption-text'>核销后套餐券不退不换</text>
+        <text className='Consumption-text'>请核对无误后再点击确认！</text>
+        <view className='buy-button-box'>
+          <button className='button-Cancel' onClick={ButtonCancel}>
             取消
           </button>
-          <button className="button-OK" onClick={ButtonOK}>
+          <button className='button-OK' onClick={ButtonOK}>
             确定
           </button>
         </view>
       </Popup>
       <Popup show={Consumption} maskClosable={false}>
-        <view className="Perfection-image-view">
-          <image src={Perfection} className="Perfection-image" />
+        <view className='Perfection-image-view'>
+          <image src={Perfection} className='Perfection-image' />
         </view>
         <text>核销完成！请与店铺确认！</text>
-        <view className="buy-button-box">
-          <button className="button-OK" onClick={PerfectionOK}>
+        <view className='buy-button-box'>
+          <button className='button-OK' onClick={PerfectionOK}>
             完成
           </button>
         </view>
       </Popup>
       <view>
-        <view className="position-header">
-          <image className="position-LocationBig" src={LocationBig} />
-          <text cla="position-LocationBig-text">
+        <view className='position-header'>
+          <image className='position-LocationBig' src={LocationBig} />
+          <text cla='position-LocationBig-text'>
             当前所在店铺：{shopContent?.shopName || []}
           </text>
         </view>
-        <view className="shop-image">
+        <view className='shop-image'>
           <image
-            mode="scaleToFill"
-            className="shop-title-image-cup"
+            mode='scaleToFill'
+            className='shop-title-image-cup'
             src={BlackSpot}
           />
-          <text className="shop-title-title">请选择你要核销的套餐</text>
+          <text className='shop-title-title'>请选择你要核销的套餐</text>
         </view>
         <view>
           {(list || []).map((item) => {
 
             return (
-              <view class="wrapper" key={item.verifyNo} onClick={() => setChecked(item.verifyNo)}>
-                <view class="left-complete-one">
-                  <view className="Check_OK-box">
-                    <image className="Check_OK-image" src={item.verifyNo == checked ? Check_OK : Check_NO} />
+              <view class='wrapper' key={item.verifyNo} onClick={() => setChecked(item.verifyNo)}>
+                <view class='left-complete-one'>
+                  <view className='Check_OK-box'>
+                    <image className='Check_OK-image' src={item.verifyNo == checked ? Check_OK : Check_NO} />
                   </view>
-                  <image className="left-image-1" src={ProCard_hot}></image>
-                  <view className="left-viewText">返现￥{item.cashback}</view>
-                  <view className="title-image">
+                  <image className='left-image-1' src={ProCard_hot}></image>
+                  <view className='left-viewText'>返现￥{item.cashback}</view>
+                  <view className='title-image'>
                     <image
-                      className="image-1"
-                      mode="scaleToFill"
+                      className='image-1'
+                      mode='scaleToFill'
                       src={item.poster}
                     ></image>
-                    <image className="image-2" src={food}></image>
+                    <image className='image-2' src={food}></image>
                   </view>
-                  <view className="title-content">
-                    <view className="Pro-title">
-                      <view className="title-text">
+                  <view className='title-content'>
+                    <view className='Pro-title'>
+                      <view className='title-text'>
                         {item.description}
-                        <text className="title-money-2">数量：1张</text>
+                        <text className='title-money-2'>数量：1张</text>
                       </view>
                     </view>
-                    <text className="title-money">
-                      ￥{formatPrice(item.actualPrice)}元<text className="title-money-2">门市价{formatPrice(item.standPrice)}元</text>
+                    <text className='title-money'>
+                      ￥{formatPrice(item.actualPrice)}元<text className='title-money-2'>门市价{formatPrice(item.standPrice)}元</text>
                     </text>
-                    <view className="title-time">
+                    <view className='title-time'>
                       有效期：{formatTime(item?.createDate, "yyyy/MM/dd")}-
                       {formatTime(item?.expireDate, "yyyy/MM/dd")}
                     </view>
                   </view>
                 </view>
-                <view class="right-complete-two">
-                  <view className="right-content"></view>
+                <view class='right-complete-two'>
+                  <view className='right-content'></view>
                 </view>
               </view>
             );
           })}
         </view>
 
-        <view className="button-info">
-          <Button className="button-box" disabled={!checked} onClick={ShowMoldeOn}>
+        <view className='button-info'>
+          <Button className='button-box' disabled={!checked} onClick={ShowMoldeOn}>
             确定核销
           </Button>
         </view>

src/pages/TobeShop/style.less

@@ -141,7 +141,7 @@
         width: 145px;
         height: 44px;
         position: absolute;
-        margin-left: 88px;
+        margin-left: 85px;
         top: 22px;
       }
       .left-viewText {