吃个甘蔗嚼一年 3 年之前
父節點
當前提交
2afb7b7996
共有 2 個文件被更改,包括 43 次插入43 次删除
  1. 42
    42
      src/pages/TobeShop/index.jsx
  2. 1
    1
      src/pages/TobeShop/style.less

+ 42
- 42
src/pages/TobeShop/index.jsx 查看文件

21
 import "./style.less";
21
 import "./style.less";
22
 
22
 
23
 export default withLayout((props) => {
23
 export default withLayout((props) => {
24
-  const { router, person } = props;
24
+  const { router, person, location } = props;
25
   const { id, subOrderId } = props.router.params;
25
   const { id, subOrderId } = props.router.params;
26
   const [showDialog, setShowDialog] = useState(false);
26
   const [showDialog, setShowDialog] = useState(false);
27
   //核销
27
   //核销
34
 
34
 
35
 
35
 
36
   const getShop = () => {
36
   const getShop = () => {
37
-    getShopDetail(id).then(e => {
37
+    getShopDetail(id, { location: location }).then(e => {
38
       setShopContent(e)
38
       setShopContent(e)
39
 
39
 
40
     })
40
     })
106
   };
106
   };
107
 
107
 
108
   return (
108
   return (
109
-    <view className="shop-Eat">
110
-      <CustomNav title="到店核销" />
109
+    <view className='shop-Eat'>
110
+      <CustomNav title='到店核销' />
111
       <Popup show={showDialog} maskClosable={false}>
111
       <Popup show={showDialog} maskClosable={false}>
112
-        <view className="Consumption-Now">您即将核销1张套餐券!</view>
113
-        <text className="Consumption-text">核销后套餐券不退不换</text>
114
-        <text className="Consumption-text">请核对无误后再点击确认!</text>
115
-        <view className="buy-button-box">
116
-          <button className="button-Cancel" onClick={ButtonCancel}>
112
+        <view className='Consumption-Now'>您即将核销1张套餐券!</view>
113
+        <text className='Consumption-text'>核销后套餐券不退不换</text>
114
+        <text className='Consumption-text'>请核对无误后再点击确认!</text>
115
+        <view className='buy-button-box'>
116
+          <button className='button-Cancel' onClick={ButtonCancel}>
117
             取消
117
             取消
118
           </button>
118
           </button>
119
-          <button className="button-OK" onClick={ButtonOK}>
119
+          <button className='button-OK' onClick={ButtonOK}>
120
             确定
120
             确定
121
           </button>
121
           </button>
122
         </view>
122
         </view>
123
       </Popup>
123
       </Popup>
124
       <Popup show={Consumption} maskClosable={false}>
124
       <Popup show={Consumption} maskClosable={false}>
125
-        <view className="Perfection-image-view">
126
-          <image src={Perfection} className="Perfection-image" />
125
+        <view className='Perfection-image-view'>
126
+          <image src={Perfection} className='Perfection-image' />
127
         </view>
127
         </view>
128
         <text>核销完成!请与店铺确认!</text>
128
         <text>核销完成!请与店铺确认!</text>
129
-        <view className="buy-button-box">
130
-          <button className="button-OK" onClick={PerfectionOK}>
129
+        <view className='buy-button-box'>
130
+          <button className='button-OK' onClick={PerfectionOK}>
131
             完成
131
             完成
132
           </button>
132
           </button>
133
         </view>
133
         </view>
134
       </Popup>
134
       </Popup>
135
       <view>
135
       <view>
136
-        <view className="position-header">
137
-          <image className="position-LocationBig" src={LocationBig} />
138
-          <text cla="position-LocationBig-text">
136
+        <view className='position-header'>
137
+          <image className='position-LocationBig' src={LocationBig} />
138
+          <text cla='position-LocationBig-text'>
139
             当前所在店铺:{shopContent?.shopName || []}
139
             当前所在店铺:{shopContent?.shopName || []}
140
           </text>
140
           </text>
141
         </view>
141
         </view>
142
-        <view className="shop-image">
142
+        <view className='shop-image'>
143
           <image
143
           <image
144
-            mode="scaleToFill"
145
-            className="shop-title-image-cup"
144
+            mode='scaleToFill'
145
+            className='shop-title-image-cup'
146
             src={BlackSpot}
146
             src={BlackSpot}
147
           />
147
           />
148
-          <text className="shop-title-title">请选择你要核销的套餐</text>
148
+          <text className='shop-title-title'>请选择你要核销的套餐</text>
149
         </view>
149
         </view>
150
         <view>
150
         <view>
151
           {(list || []).map((item) => {
151
           {(list || []).map((item) => {
152
 
152
 
153
             return (
153
             return (
154
-              <view class="wrapper" key={item.verifyNo} onClick={() => setChecked(item.verifyNo)}>
155
-                <view class="left-complete-one">
156
-                  <view className="Check_OK-box">
157
-                    <image className="Check_OK-image" src={item.verifyNo == checked ? Check_OK : Check_NO} />
154
+              <view class='wrapper' key={item.verifyNo} onClick={() => setChecked(item.verifyNo)}>
155
+                <view class='left-complete-one'>
156
+                  <view className='Check_OK-box'>
157
+                    <image className='Check_OK-image' src={item.verifyNo == checked ? Check_OK : Check_NO} />
158
                   </view>
158
                   </view>
159
-                  <image className="left-image-1" src={ProCard_hot}></image>
160
-                  <view className="left-viewText">返现¥{item.cashback}</view>
161
-                  <view className="title-image">
159
+                  <image className='left-image-1' src={ProCard_hot}></image>
160
+                  <view className='left-viewText'>返现¥{item.cashback}</view>
161
+                  <view className='title-image'>
162
                     <image
162
                     <image
163
-                      className="image-1"
164
-                      mode="scaleToFill"
163
+                      className='image-1'
164
+                      mode='scaleToFill'
165
                       src={item.poster}
165
                       src={item.poster}
166
                     ></image>
166
                     ></image>
167
-                    <image className="image-2" src={food}></image>
167
+                    <image className='image-2' src={food}></image>
168
                   </view>
168
                   </view>
169
-                  <view className="title-content">
170
-                    <view className="Pro-title">
171
-                      <view className="title-text">
169
+                  <view className='title-content'>
170
+                    <view className='Pro-title'>
171
+                      <view className='title-text'>
172
                         {item.description}
172
                         {item.description}
173
-                        <text className="title-money-2">数量:1张</text>
173
+                        <text className='title-money-2'>数量:1张</text>
174
                       </view>
174
                       </view>
175
                     </view>
175
                     </view>
176
-                    <text className="title-money">
177
-                      ¥{formatPrice(item.actualPrice)}元<text className="title-money-2">门市价{formatPrice(item.standPrice)}元</text>
176
+                    <text className='title-money'>
177
+                      ¥{formatPrice(item.actualPrice)}元<text className='title-money-2'>门市价{formatPrice(item.standPrice)}元</text>
178
                     </text>
178
                     </text>
179
-                    <view className="title-time">
179
+                    <view className='title-time'>
180
                       有效期:{formatTime(item?.createDate, "yyyy/MM/dd")}-
180
                       有效期:{formatTime(item?.createDate, "yyyy/MM/dd")}-
181
                       {formatTime(item?.expireDate, "yyyy/MM/dd")}
181
                       {formatTime(item?.expireDate, "yyyy/MM/dd")}
182
                     </view>
182
                     </view>
183
                   </view>
183
                   </view>
184
                 </view>
184
                 </view>
185
-                <view class="right-complete-two">
186
-                  <view className="right-content"></view>
185
+                <view class='right-complete-two'>
186
+                  <view className='right-content'></view>
187
                 </view>
187
                 </view>
188
               </view>
188
               </view>
189
             );
189
             );
190
           })}
190
           })}
191
         </view>
191
         </view>
192
 
192
 
193
-        <view className="button-info">
194
-          <Button className="button-box" disabled={!checked} onClick={ShowMoldeOn}>
193
+        <view className='button-info'>
194
+          <Button className='button-box' disabled={!checked} onClick={ShowMoldeOn}>
195
             确定核销
195
             确定核销
196
           </Button>
196
           </Button>
197
         </view>
197
         </view>

+ 1
- 1
src/pages/TobeShop/style.less 查看文件

141
         width: 145px;
141
         width: 145px;
142
         height: 44px;
142
         height: 44px;
143
         position: absolute;
143
         position: absolute;
144
-        margin-left: 88px;
144
+        margin-left: 85px;
145
         top: 22px;
145
         top: 22px;
146
       }
146
       }
147
       .left-viewText {
147
       .left-viewText {