diff --git a/api/api.js b/api/api.js
index 1ede55d..cedfe52 100644
--- a/api/api.js
+++ b/api/api.js
@@ -95,7 +95,7 @@ export const getCommodityShop = (data)=>reqs(`shop/device-commodity/list`,data,"
//售货机商品出货
export const getexChange=(data)=>reqs(`shop/device-commodity/commodity-exchange`,data,"POST")
//获取积分明细
-export const getCardUpdateInfo=(data)=>requests(`mobile/order/cardUpdateInfo`,data,"GET")
+export const getCardUpdateInfo=(data)=>requests(`mobile/order/pointsInfo`,data,"GET")
//使用优惠券
export const getyouHui=(data)=>requests(`mobile/coupon/useCoupon`,data,"GET")
//获取停车场优惠券
diff --git a/common/baseurl.js b/common/baseurl.js
index 706f892..020a12f 100644
--- a/common/baseurl.js
+++ b/common/baseurl.js
@@ -4,8 +4,9 @@
//基础地址
// export const BASE_URL = 'https://h5.zhenpin.yhd.la/'
// export const BASE_URL = 'https://h3.zhenpin.yhd.la/'
-export const BASE_URL = 'https://h5.zhenpin.yhd.la/'
+export const BASE_URL = 'https://h3.zhenpin.yhd.la/'
export const BASE_URLS = 'http://47.97.35.139:19260/'
+export const BASE_URLSS = 'http://47.97.35.139:19270/'
//微信appid
export const appid = 'wxc5f11d5f96fbd989'
//微信appsecret
diff --git a/components/chepai/chepai.vue b/components/chepai/chepai.vue
index d90f6a0..d3ac3b5 100644
--- a/components/chepai/chepai.vue
+++ b/components/chepai/chepai.vue
@@ -19,10 +19,10 @@
- 
微信昵称
+ {{wxname ? wxname : '元芳'}}
- 12312341234
+ {{tel ? tel :'暂无手机号码'}}
点击绑定爱车
@@ -73,6 +73,12 @@
const actives = ref(100)
const props = defineProps(['chuanzi'])
const emit = defineEmits(['numString'])
+ const wxname = ref()
+ const wxImg = ref()
+ const tel = ref()
+ wxname.value=uni.getStorageSync('wxname')
+ wxImg.value=uni.getStorageSync('wxImg')
+ tel.value = uni.getStorageSync('phoneNumber')
const c = ref(1)
const d = ref(1)
const e = ref(1)
diff --git a/components/explain/explain.vue b/components/explain/explain.vue
index 5e2b540..5a42291 100644
--- a/components/explain/explain.vue
+++ b/components/explain/explain.vue
@@ -4,19 +4,32 @@
- 次卡说明
+ 使用说明
-
- 说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明
- 说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明
- 说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明
- 说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明
- 说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明
- 说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明
- 说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明
- 说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明说明
-
+
+
+ 1.购卡或充值后可进行自助洗车，支付后当天立即生效，可即时使用。
+
+
+ 2.购卡享优惠，按次进行，用一次扣一次，扫码后选择【使用次卡】方式进行洗车。次卡有有效期，一般在有效期能都用完，请在有效期内使用。
+
+
+ 3.充值送好礼，充值会有相应的现金赠送，赠送部分只能用于洗车不能兑现。扫码后选择【使用套餐】，选相应套餐后用账户余额进行支付。充值的金额可以【我的】【账户余额】中看到，长期有效；充值的余额确认不再使用时可联系客服进行退费（不含充值时赠送的金额）。
+
+
+ 4.用户支付的次卡或账户余额仅供本人合规合法发使用，禁止用于商业或其他目的，如有发现违规违法行为，平台官方有权对违规账号封号处理。
+
+
+ 5.在您成功支付或开始洗车后，表明您已预知洗车过程中的各种常识和安全问题，系统不对您洗车过程中车辆和人员的各类问题包括安全问题负责，您需要安全合规操作。
+
+
+ 6.平台保留对相关条款的解释权，并将一如既往的为各位车主提供贴心周到的服务。
+
+
+ 7.任何问题，可到【我的】页面，点击下方的客服，通过电话或在线的方式获得帮助。
+
+
我知道了
@@ -69,8 +82,8 @@ const btns = ()=>{
// background-color: red;
.txt {
- display: block;
width: 100%;
+ line-height: 30rpx;
font-size: 26rpx;
word-wrap: break-word;
}
@@ -78,7 +91,8 @@ const btns = ()=>{
.explain-btn{
width: 300rpx;
height: 70rpx;
- background-color: #d9001b;
+ background: linear-gradient(135deg, #4D97FF 0%, #3377FF 100%), linear-gradient(276deg, #1C9FF7 0%, #1275F7 100%);
+ box-shadow: 0rpx 8rpx 18rpx 0rpx rgba(5, 128, 255, 0.2);
text-align: center;
position: relative;
margin-left: 50%;
diff --git a/components/tabbar/tabbar.vue b/components/tabbar/tabbar.vue
index 6639ea6..bd39751 100644
--- a/components/tabbar/tabbar.vue
+++ b/components/tabbar/tabbar.vue
@@ -109,13 +109,14 @@
.images {
width: 100%;
height: 100%;
+ margin-top: 26rpx;
}
}
.txt {
box-sizing: border-box;
- padding-top: 5rpx;
+ padding-top: 35rpx;
width: 100%;
height: 20rpx;
text-align: center;
diff --git a/pages/addValidate/addValidate.vue b/pages/addValidate/addValidate.vue
index 1a3ef61..fd5aba8 100644
--- a/pages/addValidate/addValidate.vue
+++ b/pages/addValidate/addValidate.vue
@@ -1,7 +1,7 @@
- 
+ 
绑定车辆
diff --git a/pages/balance/balance.vue b/pages/balance/balance.vue
index 557e48b..37d7811 100644
--- a/pages/balance/balance.vue
+++ b/pages/balance/balance.vue
@@ -65,7 +65,7 @@
订单编号：{{items.orderId}}
-{{items.useAmount}}
- ￥{{items.amount+items.getAmount}}
+ ￥{{(items.amount+items.giveAmount).toFixed(2)}}
@@ -101,101 +101,8 @@
const demos = ref([])
const remo = () => {
headerindex.value = 1
- if (headerindex.value === 1) {
- demos.value=[]
- demos.value = [{
- id: 1,
- title: "本月",
- sumPrice: 30,
- sumNum: 15,
- arrys: [{
- id: 1,
- orderId: 'xxxxxxxxxxxx',
- ciKaTitle: "充30送5套餐",
- price: 300,
- oldDate: "2024-05-09 11:56:40",
- newDate: "024-05-09"
- }, {
- id: 2,
- orderId: 'xxxxxxxxxxxx',
- ciKaTitle: "充30送5套餐",
- price: 300,
- oldDate: "2024-05-09 11:56:40",
- newDate: "024-05-09"
- }, {
- id: 3,
- orderId: 'xxxxxxxxxxxx',
- ciKaTitle: "充30送5套餐",
- price: 30,
- oldDate: "2024-05-09 11:56:40",
- newDate: "024-05-09"
- }]
- }, {
- id: 2,
- title: "2024年4月",
- sumPrice: 30,
- sumNum: 15,
- arrys: [{
- id: 1,
- orderId: 'xxxxxxxxxxxx',
- ciKaTitle: "充30送5套餐",
- price: 30,
- oldDate: "2024-05-09 11:56:40",
- newDate: "024-05-09"
- }, {
- id: 2,
- orderId: 'xxxxxxxxxxxx',
- ciKaTitle: "充30送5套餐",
- price: 30,
- oldDate: "2024-05-09 11:56:40",
- newDate: "024-05-09"
- }, {
- id: 3,
- orderId: 'xxxxxxxxxxxx',
- ciKaTitle: "充30送5套餐",
- price: 30,
- oldDate: "2024-05-09 11:56:40",
- newDate: "024-05-09"
- }]
- },
- {
- id: 3,
- title: "2024年3月",
- sumPrice: 30,
- sumNum: 15,
- arrys: [{
- id: 1,
- orderId: 'xxxxxxxxxxxx',
- ciKaTitle: "充30送5套餐",
- price: 30,
- oldDate: "2024-05-09 11:56:40",
- newDate: "024-05-09"
- }, {
- id: 2,
- orderId: 'xxxxxxxxxxxx',
- ciKaTitle: "充30送5套餐",
- price: 30,
- oldDate: "2024-05-09 11:56:40",
- newDate: "024-05-09"
- }, {
- id: 3,
- orderId: 'xxxxxxxxxxxx',
- ciKaTitle: "充30送5套餐",
- price: 30,
- oldDate: "2024-05-09 11:56:40",
- newDate: "024-05-09"
- }]
- }
- ]
- }else{
- uni.showToast({
- icon:"none",
- title:"网络错误,请重新进入"
- })
- }
-
}
- remo();
+ remo();
const add = () => {
headerindex.value = 2
if(headerindex.value===2){
diff --git a/pages/handle/handle.vue b/pages/handle/handle.vue
index 350d648..0d134c7 100644
--- a/pages/handle/handle.vue
+++ b/pages/handle/handle.vue
@@ -24,18 +24,18 @@
{{item.networkName}}
- 
{{item.gongli}}km
- 
+
{{item.networkArea}}
-
营业时间：00:00-23:59
@@ -104,12 +104,12 @@
l.getNetworks()
console.log(netWorkList);
const active = ref(1)
- const titles = ref("附近门点")
+ const titles = ref("附近门店")
const color = ref("#ffffff")
const demo = ref([0,1,2,3,4,5])
const networkIndex = ref(0)
onLoad(() => {
- titles.value = "附近门点"
+ titles.value = "附近门店"
color.value = "#ffffff"
})
const promptbgk = ref(0)
@@ -228,8 +228,8 @@
.i {
width: 184rpx;
- height: 184rpx;
- margin-left: 30rpx;
+ height: 164rpx;
+ margin-left: 36rpx;
border-radius: 10rpx;
}
@@ -250,7 +250,7 @@
padding-right: 30rpx;
.title-right {
- width: 120rpx;
+ width: 160rpx;
height: 42rpx;
display: flex;
align-items: center;
@@ -261,6 +261,8 @@
width: 28rpx;
height: 28rpx;
margin-right: 10rpx;
+ position: relative;
+ z-index: 100;
}
}
}
diff --git a/pages/implement/implement.vue b/pages/implement/implement.vue
index 1dba8d5..f33d90f 100644
--- a/pages/implement/implement.vue
+++ b/pages/implement/implement.vue
@@ -28,7 +28,8 @@
- {{item.minute}}分钟
+ {{item.minute}}分钟
+ 不限时套餐
￥{{item.amount}}
￥{{item.amount}}
@@ -105,7 +106,7 @@
\ No newline at end of file
diff --git a/pages/recharge/recharge.vue b/pages/recharge/recharge.vue
index d165ca6..9cc2459 100644
--- a/pages/recharge/recharge.vue
+++ b/pages/recharge/recharge.vue
@@ -458,9 +458,10 @@
.charge-btnPlay {
position: fixed;
- bottom: 0rpx;
- width: 100%;
+ width: 90%;
height: 100rpx;
+ transform: translateX(-50%);
+ margin-left: 50%;
background: linear-gradient(276deg, #1C9FF7 0%, #1275F7 100%);
box-shadow: 0rpx 8rpx 18rpx 0rpx rgba(5, 128, 255, 0.2);
border-radius: 50rpx;
@@ -470,6 +471,7 @@
line-height: 100rpx;
font-size: 30rpx;
color: white;
+ margin-bottom: 80rpx;
}
}
diff --git a/pages/rechargeNetwork/rechargeNetwork.vue b/pages/rechargeNetwork/rechargeNetwork.vue
index afdefce..2ee3121 100644
--- a/pages/rechargeNetwork/rechargeNetwork.vue
+++ b/pages/rechargeNetwork/rechargeNetwork.vue
@@ -24,18 +24,18 @@
{{item.networkName}}
-
{{item.gongli}}km
-
+
{{item.networkArea}}
-
营业时间：00:00-23:59
@@ -99,13 +99,13 @@
} = storeToRefs(l)
l.getNetworks()
console.log(netWorkList);
- const titles = ref('附近洗车点')
+ const titles = ref('附近门店')
const bgcolor = ref('#aaa')
const color = ref('#000')
const demo = ref([0,1,2,3,4,5])
const networkIndex = ref(0)
onLoad(() => {
- titles.value = '附近洗车点'
+ titles.value = '附近门店'
bgcolor.value = '#fff'
color.value = '#000'
})
@@ -225,8 +225,8 @@
.i {
width: 184rpx;
- height: 184rpx;
- margin-left: 30rpx;
+ height: 164rpx;
+ margin-left: 36rpx;
border-radius: 10rpx;
}
@@ -246,7 +246,7 @@
box-sizing: border-box;
padding-right: 30rpx;
.title-right {
- width: 120rpx;
+ width: 160rpx;
height: 42rpx;
display: flex;
align-items: center;
diff --git a/pages/secondaryCard/secondaryCard.vue b/pages/secondaryCard/secondaryCard.vue
index 3450aec..4407011 100644
--- a/pages/secondaryCard/secondaryCard.vue
+++ b/pages/secondaryCard/secondaryCard.vue
@@ -40,7 +40,7 @@
生效中,有效期至 {{item.endTime}}
-
+
使用
@@ -85,6 +85,10 @@
} from 'vue'
import {getCard} from '../../stor/getCard/getCard.js'
import { storeToRefs } from 'pinia';
+ import {
+ home
+ } from '../../stor/home/home.js'
+ const h = home()
const c = getCard()
const {cardDataValidCards,cardDataInvalidCards} = storeToRefs(c)
c.getCards()
@@ -99,6 +103,9 @@
headerindex.value = 2
}
const demo = ref([0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10])
+ const goSencd = ()=>{
+ h.scanQrcode()
+ }