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

src/components/foodCards/foodCards.jsx

@@ -51,7 +51,7 @@ export default (props) => {
             </view>
             <view className='address'>
               <image className='dw' src={wz} />
-              <text className='wz'>{det.areaName=='南京市'?det.areaName:item.areaPName+'/'+det.areaName}</text>
+              <text className='wz'>{det.areaName=='南京市'?det.areaName:det.areaPName+'/'+det.areaName}</text>
               <view style={{ display: 'inline-block' }} onClick={toggleSave}>
                 <image className='star' src={isSaved > 0 ? ax : good}></image>
                 <text className='collection'>{isSaved > 0 ? '已收藏' : '加入收藏'}</text>

src/pages/MineUserAll/RefundMoney/CheckRefund/index.jsx

@@ -80,10 +80,14 @@ export default withLayout((props) => {
 
 
   const onRefund = () => {
+    Taro.showLoading({
+      title: '退款中',
+    })
     refund(id, {
       refundDecription: checkeds?.map(x => options.filter(y => y.key == x)[0]?.title).join(';'),
       refundReason: explain,
     }).then((res) => {
+      Taro.hideLoading();
       Taro.navigateBack({ delta: 1 })
       Taro.showToast({
         title: "退款成功",

src/pages/TobeShop/index.jsx

@@ -82,6 +82,7 @@ export default withLayout((props) => {
         Taro.hideLoading()
         setShowDialog(false);
         setConsumption(true);
+        Taro.navigateTo({ url: '/pages/MineUserAll/AllOrder/index?tabJump=3' })
       }).catch(e => {
         Taro.hideLoading()
         setShowDialog(false);

src/pages/details/foodDetails/foodDetails.jsx

@@ -40,7 +40,7 @@ export default withLayout((props) => {
   }, [id, subOrderId]);
 
   useEffect(() => {
-    if (id && scene) {
+    if (id && scene&&!subOrderId) {
       getVerifyTargetList({
         shopId: id,
         isMine: true,