diff --git a/fuintAdmin/src/layout/components/TagsView/index.vue b/fuintAdmin/src/layout/components/TagsView/index.vue
index 85c27977d..7bc08c32e 100644
--- a/fuintAdmin/src/layout/components/TagsView/index.vue
+++ b/fuintAdmin/src/layout/components/TagsView/index.vue
@@ -56,6 +56,9 @@ export default {
     // }
   },
   watch: {
+    visitedViews(newdata) {
+      console.log("newdata",newdata)
+    },
     $route() {
       this.addTags()
       this.moveToCurrentTag()
@@ -88,6 +91,8 @@ export default {
     },
     isFirstView() {
       try {
+        console.log("isFirstView",this.selectedTag.fullPath)
+        console.log("isFirstView2",this.visitedViews[1].fullPath)
         return this.selectedTag.fullPath === this.visitedViews[1].fullPath || this.selectedTag.fullPath === '/index'
       } catch (err) {
         return false
diff --git a/fuintAdmin/src/router/index.js b/fuintAdmin/src/router/index.js
index 3a28994ea..9fafa9cd5 100644
--- a/fuintAdmin/src/router/index.js
+++ b/fuintAdmin/src/router/index.js
@@ -150,11 +150,13 @@ export const constantRoutes = [
     component: Layout,
     hidden: true,
     redirect: 'noredirect',
+    breadcrumb: false,
     children: [
       {
         path: '/purchase/details/:PpurchaseId/:PorderDate/:PapprovalStatus/:PorderNumber',
         component: () => import('@/views/convenienceStore/purchase/details'),
         name: 'purchase-details',
+
         props: true, // 启用路由参数作为组件的props
         meta: { title: '进货详情', icon: 'user' }
       },
@@ -166,10 +168,12 @@ export const constantRoutes = [
     component: Layout,
     hidden: true,
     redirect: 'noredirect',
+    breadcrumb: false,
     children: [
       {
         path: '/returns/details/:PreturnsId/:PorderDate/:PapprovalStatus/:PorderNumber',
         component: () => import('@/views/convenienceStore/returns/details'),
+
         name: 'returns-details',
         props: true, // 启用路由参数作为组件的props
         meta: { title: '退货详情', icon: 'user' }
@@ -204,7 +208,7 @@ export const constantRoutes = [
         component: () => import('@/views/convenienceStore/inventory/details'),
         name: 'inventory-details',
         props: true, // 启用路由参数作为组件的props
-        meta: { title: '退货详情', icon: 'user' }
+        meta: { title: '盘点详情', icon: 'user' }
       },
     ]
   },
diff --git a/fuintAdmin/src/views/convenienceStore/inventory/details.vue b/fuintAdmin/src/views/convenienceStore/inventory/details.vue
index d27dcc0fd..e3af01e00 100644
--- a/fuintAdmin/src/views/convenienceStore/inventory/details.vue
+++ b/fuintAdmin/src/views/convenienceStore/inventory/details.vue
@@ -498,9 +498,8 @@ export default {
           }
         })
         if(flag) {
-
           let getPurchaseByTankIdData
-          await getSalesByMtInventoryApi().then(res=>{
+          await getSalesByMtInventoryApi({goodsId:mul.id}).then(res=>{
             getPurchaseByTankIdData = res.data
           })
 
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/entity/Const.java b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/entity/Const.java
index fc1531ef8..c69471fc9 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/entity/Const.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/entity/Const.java
@@ -49,8 +49,8 @@ public class Const {
     public static String NOTIFY_PUBLIC_KEYS="MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCbBAl3xSB7YeUnze4yYZmnTeT7OtXZr0sP10TsDVRH2SY/VEjgS9KPmHMmVeKZT3+6xKsUvulgVyie46GGtZPrnoh+glF1gzsYAXJ7dvR/R5nYO5VvfwK/ChPFTiKhbTtO4OKtchgBZuqCbsemG+gFIiVJo37dY0Kg0zISmFHdOQIDAQAB";
 
     //异步通知(回调地址)
-//    public static String notify_url = "https://www.tuofeng.cc/oilAdmin/api/fyPay/notify";
-    public static String notify_url = "https://8q4f124343.yicp.fun/api/fyPay/notify";
+    public static String notify_url = "https://www.tuofeng.cc/oilAdmin/api/fyPay/notify";
+//    public static String notify_url = "https://8q4f124343.yicp.fun/api/fyPay/notify";
 
     //下单
     public static String fuiou_21_url = "https://fundwx.fuiou.com/preCreate";
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/mapper/xml/MtPurchaseDetailsMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/mapper/xml/MtPurchaseDetailsMapper.xml
index 21999b3b3..d122fbe83 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/mapper/xml/MtPurchaseDetailsMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/mapper/xml/MtPurchaseDetailsMapper.xml
@@ -182,14 +182,18 @@
             purchase_id = #{mtPurchaseDetails.purchaseId}
 
     </select>
-    <select id="getIncomingGoodsData" resultMap="MtPurchaseDetailsMap">
+    <select id="getIncomingGoodsData" resultType="com.fuint.business.convenienceSore.vo.MtPurchaseDetailsVO"
+            parameterType="java.lang.Integer">
         select opo.*,
-        op.update_time updateTime
+               op.update_time updateTime
         from mt_purchase_details opo
-        left join mt_purchase op ON opo.purchase_id = op.id
-        where op.status = 'qrts' and opo.goods_id = #{goodsId}
+                 left join mt_purchase op ON opo.purchase_id = op.id
+        where op.approval_status = 'qrts' and opo.goods_id = #{goodsId}
         order by op.update_time DESC limit 1
     </select>
+<!--        <select id="getIncomingGoodsData" resultMap="MtPurchaseDetailsMap">-->
+
+<!--    </select>-->
 
     <!--新增所有列-->
     <insert id="insert" keyProperty="id" useGeneratedKeys="true">
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/impl/MtPurchaseDetailsServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/impl/MtPurchaseDetailsServiceImpl.java
index b89fd374b..99149e201 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/impl/MtPurchaseDetailsServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/impl/MtPurchaseDetailsServiceImpl.java
@@ -172,7 +172,7 @@ public class MtPurchaseDetailsServiceImpl implements MtPurchaseDetailsService {
      */
     @Override
     public MtPurchaseDetails getIncomingGoodsData(Integer goodsId) {
-        mtPurchaseDetailsDao.getIncomingGoodsData(goodsId);
-        return null;
+        MtPurchaseDetailsVO incomingGoodsData = mtPurchaseDetailsDao.getIncomingGoodsData(goodsId);
+        return incomingGoodsData;
     }
 }
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/impl/MtPurchaseServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/impl/MtPurchaseServiceImpl.java
index c451207f1..24addcecd 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/impl/MtPurchaseServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/impl/MtPurchaseServiceImpl.java
@@ -27,6 +27,8 @@ import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.util.List;
 
+import static java.math.RoundingMode.HALF_DOWN;
+
 /**
  * 商品进货表(MtPurchase)表服务实现类
  *
@@ -217,7 +219,7 @@ public class MtPurchaseServiceImpl implements MtPurchaseService {
                     // 计算总库存
                     BigDecimal sumStock = stockBig.add(new BigDecimal(mtPurchaseDetailsVO.getQuantityPurchased().toString()));
 
-                    unitPrice = Double.parseDouble( sumBig.divide(sumStock).toString());
+                    unitPrice = Double.parseDouble( sumBig.divide(sumStock,2,HALF_DOWN).toString());
                 }
                 //获取原总价
                 mtPurchaseDetailsVO.setUnitPrice(unitPrice);
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/controller/LJStoreController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/controller/LJStoreController.java
index 7e84f9282..1258a5c55 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/controller/LJStoreController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/controller/LJStoreController.java
@@ -104,6 +104,11 @@ public class LJStoreController extends BaseController {
         return getSuccessResult(storeService.queryStoreByPosition(map));
     }
 
+    @GetMapping("/isRecharge")
+    public ResponseObject isRecharge(){
+        return getSuccessResult(false);
+    }
+
 //    /**
 //     * 修改等级规则信息
 //     * @param map
diff --git a/gasStation-uni/pages/index/index.vue b/gasStation-uni/pages/index/index.vue
index 9202c0407..88b2f33a8 100644
--- a/gasStation-uni/pages/index/index.vue
+++ b/gasStation-uni/pages/index/index.vue
@@ -53,7 +53,6 @@
 						</view>
 						<view class="jg-size">积分商城</view>
 					</view>
-					<view @click="isRecharge">.</view>
 
 				</view>
 				<!-- 金刚区结束 -->
@@ -275,6 +274,7 @@
 		},
 		onShow() {
 			this.isJoined()
+			this.isRecharge()
 			// this.getIndexBanner()
 		},
 		components: {
@@ -282,11 +282,16 @@
 		},
 		methods: {
 			isRecharge(){
-				if (this.isOpen){
-					this.isOpen = false;
-				}else{
-					this.isOpen = true
-				}
+				request({
+					url: 'business/storeInformation/store/isRecharge',
+					method: 'get',
+				}).then(res => {
+					if (res.data){
+						this.isOpen = true
+					}else{
+						this.isOpen = false
+					}
+				})
 			},
 			// 返回图片路径
 			getBannerUrl(url) {
diff --git a/gasStation-uni/static/imgs/Frame 25@2x.png b/gasStation-uni/static/imgs/Frame 25@2x.png
index 58cf446aa..07c7c97b3 100644
Binary files a/gasStation-uni/static/imgs/Frame 25@2x.png and b/gasStation-uni/static/imgs/Frame 25@2x.png differ
diff --git a/gasStation-uni/static/imgs/alipay.jpg b/gasStation-uni/static/imgs/alipay.jpg
new file mode 100644
index 000000000..5baacae00
Binary files /dev/null and b/gasStation-uni/static/imgs/alipay.jpg differ
diff --git a/gasStation-uni/static/imgs/bzhd.png b/gasStation-uni/static/imgs/bzhd.png
index 6d56f56e3..f49119d4c 100644
Binary files a/gasStation-uni/static/imgs/bzhd.png and b/gasStation-uni/static/imgs/bzhd.png differ
diff --git a/gasStation-uni/static/imgs/centerbj.png b/gasStation-uni/static/imgs/centerbj.png
index 9b0e58c41..e8b483e51 100644
Binary files a/gasStation-uni/static/imgs/centerbj.png and b/gasStation-uni/static/imgs/centerbj.png differ
diff --git a/gasStation-uni/static/imgs/chongzhi.png b/gasStation-uni/static/imgs/chongzhi.png
index 3c5a520e2..a9737ac32 100644
Binary files a/gasStation-uni/static/imgs/chongzhi.png and b/gasStation-uni/static/imgs/chongzhi.png differ
diff --git a/gasStation-uni/static/imgs/czjf.png b/gasStation-uni/static/imgs/czjf.png
index 80ceb8467..3b486365c 100644
Binary files a/gasStation-uni/static/imgs/czjf.png and b/gasStation-uni/static/imgs/czjf.png differ
diff --git a/gasStation-uni/static/imgs/diesel_oil.png b/gasStation-uni/static/imgs/diesel_oil.png
new file mode 100644
index 000000000..2668abb6d
Binary files /dev/null and b/gasStation-uni/static/imgs/diesel_oil.png differ
diff --git a/gasStation-uni/static/imgs/dljf.png b/gasStation-uni/static/imgs/dljf.png
index 3e5dea344..401384572 100644
Binary files a/gasStation-uni/static/imgs/dljf.png and b/gasStation-uni/static/imgs/dljf.png differ
diff --git a/gasStation-uni/static/imgs/dui.png b/gasStation-uni/static/imgs/dui.png
index f452a54b4..84ba79d7f 100644
Binary files a/gasStation-uni/static/imgs/dui.png and b/gasStation-uni/static/imgs/dui.png differ
diff --git a/gasStation-uni/static/imgs/fmbj.png b/gasStation-uni/static/imgs/fmbj.png
index a455f7b56..d56379e2f 100644
Binary files a/gasStation-uni/static/imgs/fmbj.png and b/gasStation-uni/static/imgs/fmbj.png differ
diff --git a/gasStation-uni/static/imgs/gasoline.png b/gasStation-uni/static/imgs/gasoline.png
new file mode 100644
index 000000000..0a60445ee
Binary files /dev/null and b/gasStation-uni/static/imgs/gasoline.png differ
diff --git a/gasStation-uni/static/imgs/haabbj.png b/gasStation-uni/static/imgs/haabbj.png
index 136c42a95..e83419426 100644
Binary files a/gasStation-uni/static/imgs/haabbj.png and b/gasStation-uni/static/imgs/haabbj.png differ
diff --git a/gasStation-uni/static/imgs/hbao.png b/gasStation-uni/static/imgs/hbao.png
index c871f8626..5b5706fe3 100644
Binary files a/gasStation-uni/static/imgs/hbao.png and b/gasStation-uni/static/imgs/hbao.png differ
diff --git a/gasStation-uni/static/imgs/hby.png b/gasStation-uni/static/imgs/hby.png
index 8f32b3adc..f08cd12de 100644
Binary files a/gasStation-uni/static/imgs/hby.png and b/gasStation-uni/static/imgs/hby.png differ
diff --git a/gasStation-uni/static/imgs/hd.png b/gasStation-uni/static/imgs/hd.png
index 55ac278f7..d08f7e396 100644
Binary files a/gasStation-uni/static/imgs/hd.png and b/gasStation-uni/static/imgs/hd.png differ
diff --git a/gasStation-uni/static/imgs/hdjf.png b/gasStation-uni/static/imgs/hdjf.png
index 293239625..c25bd3591 100644
Binary files a/gasStation-uni/static/imgs/hdjf.png and b/gasStation-uni/static/imgs/hdjf.png differ
diff --git a/gasStation-uni/static/imgs/home.png b/gasStation-uni/static/imgs/home.png
index a3b8e917f..28064b21c 100644
Binary files a/gasStation-uni/static/imgs/home.png and b/gasStation-uni/static/imgs/home.png differ
diff --git a/gasStation-uni/static/imgs/homex.png b/gasStation-uni/static/imgs/homex.png
index f882eeab1..2d0a2e6b8 100644
Binary files a/gasStation-uni/static/imgs/homex.png and b/gasStation-uni/static/imgs/homex.png differ
diff --git a/gasStation-uni/static/imgs/iconcar.png b/gasStation-uni/static/imgs/iconcar.png
index ef19b837a..169d29c7b 100644
Binary files a/gasStation-uni/static/imgs/iconcar.png and b/gasStation-uni/static/imgs/iconcar.png differ
diff --git a/gasStation-uni/static/imgs/jb.png b/gasStation-uni/static/imgs/jb.png
index be0faafdd..62be6a325 100644
Binary files a/gasStation-uni/static/imgs/jb.png and b/gasStation-uni/static/imgs/jb.png differ
diff --git a/gasStation-uni/static/imgs/jfsc.png b/gasStation-uni/static/imgs/jfsc.png
index 84b159214..22def6278 100644
Binary files a/gasStation-uni/static/imgs/jfsc.png and b/gasStation-uni/static/imgs/jfsc.png differ
diff --git a/gasStation-uni/static/imgs/jy.png b/gasStation-uni/static/imgs/jy.png
index 27d8d7201..16fc94d5f 100644
Binary files a/gasStation-uni/static/imgs/jy.png and b/gasStation-uni/static/imgs/jy.png differ
diff --git a/gasStation-uni/static/imgs/jyz.png b/gasStation-uni/static/imgs/jyz.png
index bfa6c2edd..4a19150b4 100644
Binary files a/gasStation-uni/static/imgs/jyz.png and b/gasStation-uni/static/imgs/jyz.png differ
diff --git a/gasStation-uni/static/imgs/jyzb.png b/gasStation-uni/static/imgs/jyzb.png
index 53da69709..2cec0b6ab 100644
Binary files a/gasStation-uni/static/imgs/jyzb.png and b/gasStation-uni/static/imgs/jyzb.png differ
diff --git a/gasStation-uni/static/imgs/mjyh.png b/gasStation-uni/static/imgs/mjyh.png
index b3e349f39..3e9fba350 100644
Binary files a/gasStation-uni/static/imgs/mjyh.png and b/gasStation-uni/static/imgs/mjyh.png differ
diff --git a/gasStation-uni/static/imgs/my.png b/gasStation-uni/static/imgs/my.png
index db070a33d..c85b622ed 100644
Binary files a/gasStation-uni/static/imgs/my.png and b/gasStation-uni/static/imgs/my.png differ
diff --git a/gasStation-uni/static/imgs/myx.png b/gasStation-uni/static/imgs/myx.png
index 110f90219..2b6a672a6 100644
Binary files a/gasStation-uni/static/imgs/myx.png and b/gasStation-uni/static/imgs/myx.png differ
diff --git a/gasStation-uni/static/imgs/natural_gas.png b/gasStation-uni/static/imgs/natural_gas.png
new file mode 100644
index 000000000..f6a5d12f6
Binary files /dev/null and b/gasStation-uni/static/imgs/natural_gas.png differ
diff --git a/gasStation-uni/static/imgs/oilCard.png b/gasStation-uni/static/imgs/oilCard.png
new file mode 100644
index 000000000..b4f56395d
Binary files /dev/null and b/gasStation-uni/static/imgs/oilCard.png differ
diff --git a/gasStation-uni/static/imgs/paymentSuccess.png b/gasStation-uni/static/imgs/paymentSuccess.png
new file mode 100644
index 000000000..34c742bfb
Binary files /dev/null and b/gasStation-uni/static/imgs/paymentSuccess.png differ
diff --git a/gasStation-uni/static/imgs/topbj.png b/gasStation-uni/static/imgs/topbj.png
index 30dfc3c6b..1a4d8ea96 100644
Binary files a/gasStation-uni/static/imgs/topbj.png and b/gasStation-uni/static/imgs/topbj.png differ
diff --git a/gasStation-uni/static/imgs/viprwm.png b/gasStation-uni/static/imgs/viprwm.png
index c3aa34898..1c82bb2fe 100644
Binary files a/gasStation-uni/static/imgs/viprwm.png and b/gasStation-uni/static/imgs/viprwm.png differ
diff --git a/gasStation-uni/static/imgs/vipxz.png b/gasStation-uni/static/imgs/vipxz.png
index a57df357a..58ae94fc2 100644
Binary files a/gasStation-uni/static/imgs/vipxz.png and b/gasStation-uni/static/imgs/vipxz.png differ
diff --git a/gasStation-uni/static/imgs/wechat.png b/gasStation-uni/static/imgs/wechat.png
new file mode 100644
index 000000000..3a642d473
Binary files /dev/null and b/gasStation-uni/static/imgs/wechat.png differ
diff --git a/gasStation-uni/static/imgs/xfyl.png b/gasStation-uni/static/imgs/xfyl.png
index 9757f1da1..f6d71b2e1 100644
Binary files a/gasStation-uni/static/imgs/xfyl.png and b/gasStation-uni/static/imgs/xfyl.png differ
diff --git a/gasStation-uni/static/imgs/xryl.png b/gasStation-uni/static/imgs/xryl.png
index 2ae6aae10..fcab2af78 100644
Binary files a/gasStation-uni/static/imgs/xryl.png and b/gasStation-uni/static/imgs/xryl.png differ
diff --git a/gasStation-uni/static/imgs/yhqbj.png b/gasStation-uni/static/imgs/yhqbj.png
index 1b53f3596..29c0b353f 100644
Binary files a/gasStation-uni/static/imgs/yhqbj.png and b/gasStation-uni/static/imgs/yhqbj.png differ
diff --git a/gasStation-uni/static/imgs/ykcz.png b/gasStation-uni/static/imgs/ykcz.png
index c575dca31..75efad152 100644
Binary files a/gasStation-uni/static/imgs/ykcz.png and b/gasStation-uni/static/imgs/ykcz.png differ
diff --git a/gasStation-uni/static/imgs/yqyl.png b/gasStation-uni/static/imgs/yqyl.png
index b2791a095..cf3a06524 100644
Binary files a/gasStation-uni/static/imgs/yqyl.png and b/gasStation-uni/static/imgs/yqyl.png differ
diff --git a/gasStation-uni/static/imgs/zkyx.png b/gasStation-uni/static/imgs/zkyx.png
index 0256026ee..5662aca3e 100644
Binary files a/gasStation-uni/static/imgs/zkyx.png and b/gasStation-uni/static/imgs/zkyx.png differ
diff --git a/gasStation-uni/static/imgs/zzxryl.png b/gasStation-uni/static/imgs/zzxryl.png
index f9c7a2a5e..56fd9f865 100644
Binary files a/gasStation-uni/static/imgs/zzxryl.png and b/gasStation-uni/static/imgs/zzxryl.png differ