From 0b4359a2e507d9d90f50462da651945265911a12 Mon Sep 17 00:00:00 2001
From: wangh <9483>
Date: Thu, 14 Dec 2023 13:38:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=AD=BE=E5=88=B0?=
=?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
gasStation-uni/pages/index/index.vue | 3 +-
gasStation-uni/pagesHome/order/order.vue | 6 ++--
gasStation-uni/pagesMy/integral/integral.vue | 29 +++++++++++++-------
3 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/gasStation-uni/pages/index/index.vue b/gasStation-uni/pages/index/index.vue
index e1cc543a1..acc49d624 100644
--- a/gasStation-uni/pages/index/index.vue
+++ b/gasStation-uni/pages/index/index.vue
@@ -190,7 +190,6 @@
tabbar
},
methods: {
- // t
isExistStoreId() {
if (uni.getStorageSync("inviteStoreId") != "") {
this.getStore(uni.getStorageSync("inviteStoreId"));
@@ -649,4 +648,4 @@
}
-</style>
+</style>
\ No newline at end of file
diff --git a/gasStation-uni/pagesHome/order/order.vue b/gasStation-uni/pagesHome/order/order.vue
index a132152a0..46db804c9 100644
--- a/gasStation-uni/pagesHome/order/order.vue
+++ b/gasStation-uni/pagesHome/order/order.vue
@@ -28,7 +28,7 @@
</view>
<view class="">
- <uni-icons type="right" size="20"></uni-icons>
+ <!-- <uni-icons type="right" size="20"></uni-icons> -->
</view>
</view>
<view class="box-bai" v-if="qhindex == 1" @click="goAdd()">
@@ -111,7 +111,7 @@
<script>
import config from '@/config'
import request from '../../utils/request'
- /* import BigNumber from 'bignumber.js'; */
+ import BigNumber from 'bignumber.js';
export default {
@@ -562,4 +562,4 @@
border-radius: 4px;
background: #1678ff;
}
-</style>
+</style>
\ No newline at end of file
diff --git a/gasStation-uni/pagesMy/integral/integral.vue b/gasStation-uni/pagesMy/integral/integral.vue
index ad8401eb0..ab2295e8a 100644
--- a/gasStation-uni/pagesMy/integral/integral.vue
+++ b/gasStation-uni/pagesMy/integral/integral.vue
@@ -91,9 +91,17 @@
})
},
// 去加油
- comeOn() {},
+ comeOn() {
+ uni.navigateTo({
+ url: '/pages/refuel/refuel'
+ })
+ },
// 去充值
- recharge() {},
+ recharge() {
+ uni.navigateTo({
+ url: '/pagesHome/oilRecharge/oilRecharge'
+ })
+ },
goback() {
uni.navigateBack()
@@ -105,18 +113,18 @@
url: 'business/integral/integralSettings/todayIsSignIn',
method: 'get',
params: {
- storeId: this.storeId
+ storeId: this.storeId,
+ chainStoreId: this.chainStoreId
}
}).then((res) => {
if (res.code == 200) {
- if (res.data != 0) {
- this.flag = false
- } else if (
- res.data == -2
- ) {
+ if (res.data == 0) {
this.flag = true
+ } else if (res.data == -2) {
+ this.flag = false
this.flag2 = true
} else {
+ this.flag = false
this.flag2 = false
}
@@ -126,7 +134,8 @@
// 先查询今天是否签到过
sign() {
let integralSettings = {
- storeId: this.storeId
+ storeId: this.storeId,
+ chainStoreId: this.chainStoreId
}
request({
url: 'business/integral/integralSettings/signInFunction',
@@ -136,7 +145,7 @@
if (res.code == 200) {
// 签到成功
uni.showToast({
- title: '标题',
+ title: '签到成功',
duration: 2000
});
this.getUserInfoList();