diff --git a/fuintAdmin/src/api/oilConfig/oilGuns.js b/fuintAdmin/src/api/oilConfig/oilGuns.js
index 24c33bb84..12c2b0b66 100644
--- a/fuintAdmin/src/api/oilConfig/oilGuns.js
+++ b/fuintAdmin/src/api/oilConfig/oilGuns.js
@@ -41,3 +41,20 @@ export function delGunApi(data) {
     params: data
   })
 }
+
+// 查询油罐信息
+export function getOilNumberGun() {
+  return request({
+    url: '/business/petrolStationManagement/oilGun/selectByNumberTGUn',
+    method: 'get',
+  })
+}
+
+// 查询所有油号
+export function oilNumbers() {
+  return request({
+    url: '/business/petrolStationManagement/oilNumber/getOilNumber',
+    method: 'get',
+    // data: data
+  })
+}
diff --git a/fuintAdmin/src/views/member/userInfoOrder/couponList.vue b/fuintAdmin/src/views/member/userInfoOrder/couponList.vue
index ece3650f8..105344b54 100644
--- a/fuintAdmin/src/views/member/userInfoOrder/couponList.vue
+++ b/fuintAdmin/src/views/member/userInfoOrder/couponList.vue
@@ -19,7 +19,11 @@
         </el-table-column>
         <el-table-column align="center" prop="fullDeduction" label="满减金额"/>
         <el-table-column align="center" prop="discountAmount" label="券面额"/>
-        <el-table-column align="center" prop="oilType" label="适用油品"/>
+        <el-table-column align="center" prop="oilType" label="适用油品">
+          <template slot-scope="scope">
+            <span>{{ getOilNames(oilNameList,scope.row.oilType) }}</span>
+          </template>
+        </el-table-column>
         <el-table-column align="center" prop="status" label="状态">
           <template slot-scope="scope">
             <el-tag v-if="scope.row.status == 0">未使用</el-tag>
@@ -52,6 +56,7 @@
 
 <script>
 import { getCardFavorableList } from "@/api/userInfoOrder.js";
+import {oilNumbers} from "@/api/oilConfig/oilGuns";
 
 export default {
   props:["pUserId"],
@@ -66,7 +71,8 @@ export default {
         status: 0,
         page:1,
         pageSize:10,
-      }
+      },
+      oilNameList:[],
     }
   },
   created() {
@@ -74,9 +80,35 @@ export default {
     this.userId = this.$route.query.id;
 
     this.getList()
+    this.getOilName()
   },
   methods:{
-    
+    getOilNames(list,oilIds){
+      let name = "";
+      let oilNames = []
+      let oilId = oilIds.split(",")
+      list.forEach(item => {
+        oilId.forEach(i => {
+          if (item.oilName == i){
+            oilNames.push(item.oilNames)
+          }
+        })
+      })
+      let arr = []
+      for (let i = 0;i<oilNames.length;i++){
+        if (arr.indexOf(oilNames[i])==-1){
+          arr.push(oilNames[i])
+          name += oilNames[i]+","
+        }
+      }
+      return name;
+    },
+    getOilName(){
+      oilNumbers().then(res => {
+        console.log(res)
+        this.oilNameList = res.data
+      })
+    },
     getList(){
       this.loading = true
 
diff --git a/fuintAdmin/src/views/member/userInfoOrder/goodsOrder.vue b/fuintAdmin/src/views/member/userInfoOrder/goodsOrder.vue
index d6df0677e..419068aa3 100644
--- a/fuintAdmin/src/views/member/userInfoOrder/goodsOrder.vue
+++ b/fuintAdmin/src/views/member/userInfoOrder/goodsOrder.vue
@@ -1,7 +1,11 @@
 <template>
   <div>
     <el-table ref="tables" v-loading="loading" :data="list">
-      <el-table-column label="所属油站" prop="storeName" align="center"/>
+      <el-table-column label="所属油站" prop="storeName" align="center">
+        <template slot-scope="scope">
+          <span>{{store.name}}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="订单时间"  prop="createTime" align="center"/>
       <el-table-column label="订单金额" align="center" prop="amount"/>
       <el-table-column label="商品数量" align="center" prop="goodsNum" />
@@ -31,6 +35,8 @@
 
 <script>
 import { getMtOrderList } from "@/api/userInfoOrder.js";
+import {listOrder} from "@/api/order/order";
+import {ljStoreInfo} from "@/api/staff/store";
 
 export default {
   props:["pUserId"],
@@ -43,7 +49,9 @@ export default {
       queryParams:{
         page:1,
         pageSize:10,
-      }
+        userId:this.pUserId,
+      },
+      store:{},
     }
   },
   created() {
@@ -51,12 +59,19 @@ export default {
     this.userId = this.$route.query.id;
 
     this.getList()
+    this.getStoreInfo()
   },
   methods:{
+    // 获取店铺信息
+    getStoreInfo(){
+      ljStoreInfo().then(res => {
+        this.store = res.data
+      })
+    },
     getList(){
       this.loading = true
       this.queryParams.userId = this.userId
-      getMtOrderList(this.queryParams).then(res=>{
+      listOrder(this.queryParams).then(res=>{
         if (res.code == 200) {
           this.list = res.data.records
           this.total = res.data.total
diff --git a/fuintAdmin/src/views/member/userInfoOrder/oilOrder.vue b/fuintAdmin/src/views/member/userInfoOrder/oilOrder.vue
index 4c83d951e..ed47f81bc 100644
--- a/fuintAdmin/src/views/member/userInfoOrder/oilOrder.vue
+++ b/fuintAdmin/src/views/member/userInfoOrder/oilOrder.vue
@@ -7,12 +7,12 @@
         <template slot-scope="scope">
           <span v-if="scope.row.terminal == 'applet'">小程序</span>
           <span v-else>{{ scope.row.terminal }}</span>
-          
+
         </template>
       </el-table-column>
       <el-table-column label="油品/油枪" align="center" prop="name" >
         <template slot-scope="scope">
-           {{ scope.row.oilGunNum }}/{{ scope.row.oilName }}
+           {{ scope.row.oilName }}/{{ getName1(oilGunList,scope.row.oilGunNum) }}
         </template>
       </el-table-column>
 
@@ -21,11 +21,11 @@
       <el-table-column label="实付金额" align="center" prop="payAmount"/>
       <el-table-column label="付款类型" align="center" prop="payType">
         <template slot-scope="scope">
-          <span v-if="scope.row.payType == 'CASH'">现金支付</span>
-          <span v-else-if="scope.row.payType == 'WECHAT'">微信支付</span>
-          <span v-else-if="scope.row.payType == 'ALIPAY'">支付宝支付</span>
-          <span v-else>{{ scope.row.payType }}</span>
-          
+<!--          <span v-if="scope.row.payType == 'CASH'">现金支付</span>-->
+<!--          <span v-else-if="scope.row.payType == 'WECHAT'">微信支付</span>-->
+<!--          <span v-else-if="scope.row.payType == 'ALIPAY'">支付宝支付</span>-->
+<!--          <span v-else>{{ scope.row.payType }}</span>-->
+          <dict-tag :options="dict.type.payment_type" :value="scope.row.payType"/>
         </template>
       </el-table-column>
       <el-table-column label="订单号" align="center" prop="orderNo" width="220px"/>
@@ -43,9 +43,11 @@
 
 <script>
 import { getOilOrderList } from "@/api/userInfoOrder.js";
+import {getOilNumberGun} from "@/api/oilConfig/oilGuns";
 
 export default {
   props:["pUserId"],
+  dicts: ['payment_type'],
   data(){
     return {
       userId:"",
@@ -55,7 +57,9 @@ export default {
       queryParams:{
         page:1,
         pageSize:10,
-      }
+      },
+      // 油枪列表
+      oilGunList:[],
     }
   },
   created() {
@@ -63,8 +67,34 @@ export default {
     this.userId = this.$route.query.id;
 
     this.getList()
+    this.getOilGunList();
   },
   methods:{
+    // 获取油枪信息
+    getOilGunList(){
+      getOilNumberGun().then(res => {
+        res.data.forEach(item => {
+          if (item.oilGunList.length>0){
+            item.oilGunList.forEach(i => {
+              i.oilName = item.oilName
+              this.oilGunList.push(i)
+            })
+          }
+        })
+      })
+    },
+    // 获取油枪名称
+    getName1(oilNameList,id){
+      let name = ""
+      if(oilNameList!=null && oilNameList!=""){
+        oilNameList.forEach(item => {
+          if (item.id == id){
+            name = item.gunName;
+          }
+        })
+      }
+      return name;
+    },
     getList(){
       this.loading = true
       this.queryParams.userId = this.userId
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/mapper/xml/CardFavorableRecordMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/mapper/xml/CardFavorableRecordMapper.xml
index b77d312e3..4dbc24884 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/mapper/xml/CardFavorableRecordMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/mapper/xml/CardFavorableRecordMapper.xml
@@ -48,7 +48,7 @@
             <if test="cardFavorableRecord.mtUserId != null">
                 and cfr.mt_user_id = #{cardFavorableRecord.mtUserId}
             </if>
-            <if test="cardFavorableRecord.status != null">
+            <if test="cardFavorableRecord.status != null and cardFavorableRecord.status != ''">
              and cfr.status = #{cardFavorableRecord.status}
             </if>
         </where>
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/LJOrderMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/LJOrderMapper.xml
index f849ee196..e61fdb9f3 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/LJOrderMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/LJOrderMapper.xml
@@ -12,6 +12,9 @@
             <if test="order.staffId != null and order.staffId != ''">
                 and staff_id = #{order.staffId}
             </if>
+            <if test="order.userId != null and order.userId != ''">
+                and user_id = #{order.userId}
+            </if>
             <if test="order.payType != null and order.payType != ''">
                 and pay_type = #{order.payType}
             </if>
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml
index 192df7fff..6973c2dd6 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml
@@ -105,6 +105,7 @@
             <if test="order.storeId != null">
                 and store_id = #{order.storeId}
             </if>
+            order by pay_time desc
         </where>
     </select>
 
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/service/impl/LJStoreServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/service/impl/LJStoreServiceImpl.java
index 397691d40..03ac7847a 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/service/impl/LJStoreServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/service/impl/LJStoreServiceImpl.java
@@ -62,7 +62,7 @@ public class LJStoreServiceImpl extends ServiceImpl<LJStoreMapper, LJStore> impl
 //        经度
         Double lon = Double.valueOf(map.get("lon"));
         Double lat = Double.valueOf(map.get("lat"));
-        Integer storeId = Integer.valueOf(map.get("storeId"));
+        String storeId = map.get("storeId");
         LJStore ljStore = new LJStore();
         Double distance = 0.0;
         double earthRadius = 6371; // 地球半径，单位为公里
@@ -104,7 +104,7 @@ public class LJStoreServiceImpl extends ServiceImpl<LJStoreMapper, LJStore> impl
             }
             distance = min;
         }else {
-            LJStore store = this.selectStoreByStoreId(storeId);
+            LJStore store = this.selectStoreByStoreId(Integer.valueOf(storeId));
             double dLat = Math.toRadians(Double.parseDouble(store.getLatitude()) - lat);
             double dLon = Math.toRadians(Double.parseDouble(store.getLongitude()) - lon);
 
diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue
index 0132c2a8d..d1a34e509 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue
@@ -196,13 +196,13 @@
           <div class="wrap-box" v-for="item in payList"
                :key="item.dictValue"
                :value="item.dictValue"
-               :class="{ 'wrap-box2': item.dictValue == typeIdex }"
+               :class="{ 'wrap-box2': item.dictValue == payType }"
                @click="payMethod(item.dictValue)">
             <span>{{ item.dictLabel }}</span>
           </div>
           <div class="wrap-box" value="credit"
-               :class="{ 'wrap-box2': '798' == typeIdex }" >
-            <span @click="addCredits('798')">挂账</span>
+               :class="{ 'wrap-box2': 'credit' == payType }" >
+            <span @click="addCredits('credit')">挂账</span>
           </div>
         </div>
         <div class="center-left-bottom">
@@ -925,6 +925,7 @@
         couponIds:[],
         // 使用的优惠券id
         useCouponIds:"",
+        payType:"WECHAT",
         map:{
           allAmount:0,
           // 用户支付条码信息
@@ -1083,6 +1084,7 @@
       addCredits(type){
         this.typeIdex = type
         this.map.payType = "credit"
+        this.payType = "credit"
         this.dialogVisibleCredit = true
         this.form1.amount = this.oilAmount + this.goodsAmount
       },
@@ -2736,7 +2738,49 @@
         },500)
       },
       handClose(){
-        this.resetting1()
+        // this.resetting1()
+        this.authCode = "";
+        this.userNo = ""
+        this.map = {
+          allAmount:0,
+          // 用户支付条码信息
+          authCode:'',
+          // 油品订单
+          oilOrder:"",
+          // 商品订单
+          goodsOrder:"",
+          // 支付方式
+          payType:"WECHAT",
+          // 油品订单金额
+          oilAmount:0,
+          // 商品订单金额
+          goodsAmount:0,
+          // 油品实付金额
+          oilActualPay:0,
+          // 商品实付金额
+          goodsActualPay:0,
+          // 付款用户
+          payUser:"",
+          // 油品优惠金额
+          oilDiscount:0,
+          // 商品优惠金额
+          goodsDiscount:0,
+          // 优惠券id
+          couponId:"",
+          // 提成金额
+          commissionAmount:0,
+          // 使用积分数量
+          usePoint:0,
+          // 积分金额
+          pointAmount:0,
+          // 终端
+          terminal:"PC",
+          // 商品数量
+          goodsNum:0,
+          // 会员消费金额（储值卡需要减少的金额）
+          consumeAmount:0,
+          typeIdex:'',
+        };
         this.member = {};
         this.isPaySuccess = false;
         this.isPay = false;
diff --git a/fuintCashierWeb/src/views/details/userInfoOrder/couponList.vue b/fuintCashierWeb/src/views/details/userInfoOrder/couponList.vue
index f48805fdf..35ee17d52 100644
--- a/fuintCashierWeb/src/views/details/userInfoOrder/couponList.vue
+++ b/fuintCashierWeb/src/views/details/userInfoOrder/couponList.vue
@@ -19,7 +19,11 @@
         </el-table-column>
         <el-table-column align="center" prop="fullDeduction" label="满减金额"/>
         <el-table-column align="center" prop="discountAmount" label="券面额"/>
-        <el-table-column align="center" prop="oilType" label="适用油品"/>
+        <el-table-column align="center" prop="oilType" label="适用油品">
+          <template slot-scope="scope">
+            <span>{{ getOilNames(oilNameList,scope.row.oilType) }}</span>
+          </template>
+        </el-table-column>
         <el-table-column align="center" prop="status" label="状态">
           <template slot-scope="scope">
             <el-tag v-if="scope.row.status == 0">未使用</el-tag>
@@ -52,6 +56,7 @@
 
 <script>
 import { getCardFavorableList } from "@/api/cashier/userInfoOrder";
+import {oilNumbers} from "@/api/cashier/oilnumber";
 
 export default {
   props:["pUserId"],
@@ -66,7 +71,8 @@ export default {
         status: 0,
         page:1,
         pageSize:10,
-      }
+      },
+      oilNameList:[]
     }
   },
   created() {
@@ -74,9 +80,35 @@ export default {
     this.userId = this.$route.query.id;
 
     this.getList()
+    this.getOilName()
   },
   methods:{
-
+    getOilNames(list,oilIds){
+      let name = "";
+      let oilNames = []
+      let oilId = oilIds.split(",")
+      list.forEach(item => {
+        oilId.forEach(i => {
+          if (item.oilName == i){
+            oilNames.push(item.oilNames)
+          }
+        })
+      })
+      let arr = []
+      for (let i = 0;i<oilNames.length;i++){
+        if (arr.indexOf(oilNames[i])==-1){
+          arr.push(oilNames[i])
+          name += oilNames[i]+","
+        }
+      }
+      return name;
+    },
+    getOilName(){
+      oilNumbers().then(res => {
+        console.log(res)
+        this.oilNameList = res.data
+      })
+    },
     getList(){
       this.loading = true
 
diff --git a/fuintCashierWeb/src/views/details/userInfoOrder/goodsOrder.vue b/fuintCashierWeb/src/views/details/userInfoOrder/goodsOrder.vue
index c949e2077..d6c819ec2 100644
--- a/fuintCashierWeb/src/views/details/userInfoOrder/goodsOrder.vue
+++ b/fuintCashierWeb/src/views/details/userInfoOrder/goodsOrder.vue
@@ -1,7 +1,11 @@
 <template>
   <div>
     <el-table ref="tables" v-loading="loading" :data="list">
-      <el-table-column label="所属油站" prop="storeName" align="center"/>
+      <el-table-column label="所属油站" prop="storeName" align="center">
+        <template slot-scope="scope">
+          <span>{{store.name}}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="订单时间"  prop="createTime" align="center"/>
       <el-table-column label="订单金额" align="center" prop="amount"/>
       <el-table-column label="商品数量" align="center" prop="goodsNum" />
@@ -31,6 +35,8 @@
 
 <script>
 import { getMtOrderList } from "@/api/cashier/userInfoOrder.js";
+import {ljStoreInfo} from "@/api/cashier/user/store";
+import {listOrder} from "@/api/cashier/goodsorder";
 
 export default {
   props:["pUserId"],
@@ -43,7 +49,8 @@ export default {
       queryParams:{
         page:1,
         pageSize:10,
-      }
+      },
+      store:{},
     }
   },
   created() {
@@ -51,12 +58,19 @@ export default {
     this.userId = this.$route.query.id;
 
     this.getList()
+    this.getStoreInfo()
   },
   methods:{
+    // 获取店铺信息
+    getStoreInfo(){
+      ljStoreInfo().then(res => {
+        this.store = res.data
+      })
+    },
     getList(){
       this.loading = true
       this.queryParams.userId = this.userId
-      getMtOrderList(this.queryParams).then(res=>{
+      listOrder(this.queryParams).then(res=>{
         if (res.code == 200) {
           this.list = res.data.records
           this.total = res.data.total
diff --git a/fuintCashierWeb/src/views/details/userInfoOrder/oilOrder.vue b/fuintCashierWeb/src/views/details/userInfoOrder/oilOrder.vue
index 3aa6cc6d2..2f21ea054 100644
--- a/fuintCashierWeb/src/views/details/userInfoOrder/oilOrder.vue
+++ b/fuintCashierWeb/src/views/details/userInfoOrder/oilOrder.vue
@@ -12,7 +12,7 @@
       </el-table-column>
       <el-table-column label="油品/油枪" align="center" prop="name" >
         <template slot-scope="scope">
-           {{ scope.row.oilGunNum }}/{{ scope.row.oilName }}
+          {{ scope.row.oilName }}/{{ getName1(oilGunList,scope.row.oilGunNum) }}
         </template>
       </el-table-column>
 
@@ -21,11 +21,11 @@
       <el-table-column label="实付金额" align="center" prop="payAmount"/>
       <el-table-column label="付款类型" align="center" prop="payType">
         <template slot-scope="scope">
-          <span v-if="scope.row.payType == 'CASH'">现金支付</span>
-          <span v-else-if="scope.row.payType == 'WECHAT'">微信支付</span>
-          <span v-else-if="scope.row.payType == 'ALIPAY'">支付宝支付</span>
-          <span v-else>{{ scope.row.payType }}</span>
-
+<!--          <span v-if="scope.row.payType == 'CASH'">现金支付</span>-->
+<!--          <span v-else-if="scope.row.payType == 'WECHAT'">微信支付</span>-->
+<!--          <span v-else-if="scope.row.payType == 'ALIPAY'">支付宝支付</span>-->
+<!--          <span v-else>{{ scope.row.payType }}</span>-->
+          <span>{{getName(payTypeList,scope.row.payType)}}</span>
         </template>
       </el-table-column>
       <el-table-column label="订单号" align="center" prop="orderNo" width="220px"/>
@@ -43,6 +43,8 @@
 
 <script>
 import { getOilOrderList } from "@/api/cashier/userInfoOrder.js";
+import {getOilNumberGun} from "@/api/cashier/oilGuns";
+import {getDicts} from "@/api/dict/data";
 
 export default {
   props:["pUserId"],
@@ -55,7 +57,10 @@ export default {
       queryParams:{
         page:1,
         pageSize:10,
-      }
+      },
+      // 油枪列表
+      oilGunList:[],
+      payTypeList:[],
     }
   },
   created() {
@@ -63,8 +68,50 @@ export default {
     this.userId = this.$route.query.id;
 
     this.getList()
+    this.getOilGunList();
+    this.getPayType();
   },
   methods:{
+    getName(list,id){
+      let name = ""
+      list.forEach(item => {
+        if (item.dictValue = id){
+          name = item.dictLabel
+        }
+      })
+      return name
+    },
+    getPayType(){
+      getDicts("payment_type").then(res => {
+        this.payTypeList = res.data
+        console.log(res)
+      })
+    },
+    // 获取油枪信息
+    getOilGunList(){
+      getOilNumberGun().then(res => {
+        res.data.forEach(item => {
+          if (item.oilGunList.length>0){
+            item.oilGunList.forEach(i => {
+              i.oilName = item.oilName
+              this.oilGunList.push(i)
+            })
+          }
+        })
+      })
+    },
+    // 获取油枪名称
+    getName1(oilNameList,id){
+      let name = ""
+      if(oilNameList!=null && oilNameList!=""){
+        oilNameList.forEach(item => {
+          if (item.id == id){
+            name = item.gunName;
+          }
+        })
+      }
+      return name;
+    },
     getList(){
       this.loading = true
       this.queryParams.userId = this.userId
diff --git a/gasStation-uni/pages.json b/gasStation-uni/pages.json
index 51effa40e..a96fa8f16 100644
--- a/gasStation-uni/pages.json
+++ b/gasStation-uni/pages.json
@@ -158,6 +158,13 @@
 						"navigationBarTitleText": "支付完成页",
 						"navigationStyle": "custom"
 					}
+				},
+				{
+					"path": "pagesAddress/index",
+					"style": {
+						"navigationBarTitleText": "搜索地址页",
+						"navigationStyle": "custom"
+					}
 				}
 			]
 		},
diff --git a/gasStation-uni/pages/index/index.vue b/gasStation-uni/pages/index/index.vue
index 5c34b8ad1..69cf9369f 100644
--- a/gasStation-uni/pages/index/index.vue
+++ b/gasStation-uni/pages/index/index.vue
@@ -81,8 +81,11 @@
 			<view class="station">
 				<view class="station-box">
 
-					<view class="station-title">
+					<view class="station-title" style="display: flex;justify-content: space-between;">
 						{{store.name}}{{store.description ? "("+store.description+")" : ""}}
+						<view class="" @click="goChooseAddress" style="width: 22%;font-size: 14px;font-weight: 400;">
+							<view>切换位置 <uni-icons type="right" color="#304fff" size="16"></uni-icons> </view>
+						</view>
 					</view><!--顺通石化加油站(工业南路站)-->
 					<view style="display: flex;">
 						<view class="bule-icon" v-if="welfare.length!=0" v-for="(item,index) in welfare" :key="index">
@@ -388,16 +391,19 @@
 					// 谷歌使用wgs84  其他使用gcj02
 					type: 'gcj02', // 使用国测局坐标系
 					success: function(res) {
-						_this.longitude = res.longitude;
-						_this.latitude = res.latitude
-						// console.log('经度: ' + res.longitude);
-						// console.log('纬度: ' + res.latitude);
+						if (_this.longitude=="" && _this.latitude =="") {
+								
+							_this.longitude = res.longitude;
+							_this.latitude = res.latitude
+						}
+						console.log('经度: ' + _this.longitude);
+						console.log('纬度: ' + _this.latitude);
 						request({
 							url: 'business/storeInformation/store/recentlyStore',
 							method: 'post',
 							data: {
-								"lon": res.longitude,
-								"lat": res.latitude,
+								"lon": _this.longitude,
+								"lat": _this.latitude,
 								"storeId":storeId
 							},
 						}).then((response) => {
@@ -446,7 +452,7 @@
 				}).then((res) => {
 					if (res.code == 200) {
 						this.oilTypeList = res.data.records
-						console.log("aaabbb", this.oilTypeList)
+						// console.log("aaabbb", this.oilTypeList)
 						if (this.oilTypeList.length > 0) {
 							this.oilInfo.oilName = this.oilTypeList[0].oilName,
 								this.oilInfo.oilPrice = this.oilTypeList[0].oilPrice,
@@ -502,6 +508,22 @@
 					url: '/pages/refuel/refuel'
 				})
 			},
+			goChooseAddress() {
+				uni.chooseLocation({
+					success: ({
+						name,
+						address,
+						latitude,
+						longitude
+					}) => { // 选择位置完成后的处理 
+						// this.addressName = address;
+						console.log(name,address,latitude,longitude);
+						this.longitude = longitude;
+						this.latitude = latitude;
+						this.getAddress()
+					},
+				});
+			},
 			goMall() {
 				uni.navigateTo({
 					url: '/pagesHome/PointsMall/PointsMall'