Commit 456896f7 authored by 秦威威's avatar 秦威威

最新版

parent 98d6c7a7
......@@ -126,15 +126,20 @@ export default {
return true;
},
checkLoginExpired(res) {
uni.setStorageSync("token", "");
console.log(res, 'aaaaaaaa');
// uni.showToast({
// title: '请先登录',
// icon: "none"
// })
uni.navigateTo({
uni.clearStorageSync();
uni.hideLoading()
uni.showModal({
title: '提示',
content: '请先登录',
success(res) {
console.log(res)
if (res.confirm) {
uni.redirectTo({
url: '/pages/login/login'
});
})
}
}
})
return true;
},
//封装日志打印函数
......
This diff is collapsed.
......@@ -2,7 +2,6 @@
<view class="car-info mg-lr-24">
<view class="car-type-num u-f u-f-jcsb u-f-aic mg-bot-24" @click="goPage">
<text class="light-gray fs28 fw400">车辆型号</text>
<!-- <text class="right-arrow"></text> -->
<image class="big_gray_right_arrow" src="../../static/common/big_gray_right_arrow.png" mode=""></image>
</view>
......@@ -116,7 +115,7 @@
data.vehicleMileage = this.vehicleMileage
// data.vehicleBrandId = this.vehicleBrandId
if(!this.plateNo) {
if (!this.plateNo) {
uni.showToast({
title: "请输入车牌号"
})
......
......@@ -4,7 +4,7 @@
<view class="car-brand-list">
<view>
<view class="car-brand u-f u-f-jcfs u-f-aic">
<image :src="carData.logo" class="mg-right-20"></image>
<image :src="carData.logo" class="mg-right-20" mode="widthFix"></image>
<text>{{carData.name}}</text>
</view>
<view class="fw400 fs26 light-black u-f u-f-jcfs u-f-aic" style="padding: 18rpx 0"
......@@ -245,8 +245,8 @@
margin-bottom: 74rpx;
image {
width: 108rpx;
height: 80rpx;
width: 100rpx;
height: auto;
}
}
......
<template>
<view style="display: flex;flex-direction: column;height:100vh;box-sizing: border-box;">
<u-navbar placeholder title="门店列表" leftIconSize='0' :bgColor="bgColor" :fixed="true">
<u-navbar placeholder title="门店" leftIconSize='0' :bgColor="bgColor" :fixed="true">
</u-navbar>
<view class="top-bgc"></view>
......@@ -16,13 +16,14 @@
<input confirm-type="search" class="nav-bar-input" v-model="searchText" type="text" placeholder="搜索"
@confirm="searchAction" />
</view>
<view v-if="!ishide">
<up-dropdown :duration="0" v-if="operateMenu.length" height="20">
<up-dropdown-item v-model="value1" :title="operateMenuTitle" :options="operateMenu"
@change="checkOperte"></up-dropdown-item>
<up-dropdown-item v-model="value2" :title="optionsTitle?optionsTitle:options[0].label"
:options="options" @change="checkGood"></up-dropdown-item>
</up-dropdown>
</view>
</view>
<view style="flex: 1;overflow-y: auto;margin-top: 20rpx;">
......@@ -95,6 +96,7 @@
},
data() {
return {
ishide: false,
value1: 1,
value2: 1,
options: [{
......@@ -170,9 +172,17 @@
getList(flag) {
console.log(uni.getStorageSync('curcity'));
var location = uni.getStorageSync('curcity')
// 获取当前时间的时间戳
let currentTime = new Date().getTime();
//monthIndex 是从 0 开始计数的
let time = new Date(2025, 7, 7, 23, 59, 59, 999).getTime();
console.log(currentTime);
console.log(time);
console.log(currentTime < time);
this.ishide = currentTime < time ? true : false
this.$http.post("/api/client/store/list", {
pageNum: this.pageNum,
pageSize: '20',
pageSize: this.ishide ? '1' : '20',
field: this.searchText,
storeTypeId: this.activeOperateMenu,
sortType: this.activeShopGood,
......
......@@ -143,7 +143,6 @@
title: '正在创建订单...',
mask: true
})
// 创建订单
let res = await this.$http.post('/api/client/order/createOrder', data, {
token: true,
......
......@@ -94,8 +94,8 @@
</view>
</view>
<view class="light-black">
<input disabled="true" v-model="FormData.vehicleInformation" class="uni-input my-input"
placeholder="请输入车辆型号" />
<text class="uni-input"
style="text-align: right;">{{FormData.vehicleInformation||'请输入车辆型号'}}</text>
</view>
</view>
<view class="form-input u-f u-f-jcsb u-f-aic fs28"
......@@ -115,7 +115,6 @@
</view>
</view>
<!-- <view class="height-box"></view> -->
<view class="fix-bot">
<view class="content u-f u-f-jcsb u-f-aic">
<view class="btn line-gradient-btn" @click="submitForm">
......@@ -290,7 +289,7 @@
this.cusServicePhonePhone = data
this.cusServicePhoneType = type
this.iscontentInfo = true
this.contentInfo =`我们已获取您的定位信息,会根据当前地址联系您【${this.formattedAddresses.recommend}】`
this.contentInfo = `我们已获取您的定位信息,会根据当前地址联系您【${this.formattedAddresses.recommend}】`
},
confirmOpen() {
......@@ -460,11 +459,11 @@
storeTypeId: this.FormData.carID || 4
}).then((res) => {
this.shopGood = res.data.data
console.log(this.activeShopGood,'this.activeShopGood');
console.log(this.activeShopGood, 'this.activeShopGood');
// if (this.activeShopGood == 1) {
console.log('this.actList', this.actList);
console.log('this.shopGood', this.shopGood);
if(this.shopGood.length){
if (this.shopGood.length) {
this.actList = this.shopGood[1].children
this.serviceTypeId = this.actList && this.actList[0].id
this.serviceTypeName = this.actList && this.actList[0].name
......@@ -669,6 +668,7 @@
.requeyCheck {
display: flex;
align-items: flex-start;
width: 140rpx;
image {
margin-left: -15rpx;
......
......@@ -509,7 +509,7 @@
this.storeId = option.storeId
this.getLocation()
const token = uni.getStorageSync('token')
if (!token) {
if (!token && option.share != null) {
//沒有登录 先登录
uni.navigateTo({
url: '/pages/login/login?share=1'
......
......@@ -4,7 +4,8 @@
<view v-if="status==1">
<view class="white-bg-wrap u-f-aic u-f-jcc mg-bot-26">
<view class="u-f u-f-fdc u-f-jcc u-f-aic">
<image style="height: 114rpx;width:114rpx;" src="../.././static/common/refuse.png" class="mg-bot-38"></image>
<image style="height: 114rpx;width:114rpx;" src="../.././static/common/refuse.png"
class="mg-bot-38"></image>
<text class="fs28 light-black fw400 mg-bot-26">正在退款中...</text>
<view class="fs24 light-black fw400">我们会已最快的速度完成退款,请等待</view>
</view>
......@@ -14,11 +15,11 @@
<view class="u-f u-f-jcsb u-f-aic mg-bot-20">
<view style="flex: 1">
<image class="border-radius-9 mg-right-10" :src="shopSureBillInfo.goodsImage"
style="width: 128rpx;height: 128rpx;"
:mode="'widthFix'"></image>
style="width: 128rpx;height: 128rpx;" :mode="'widthFix'"></image>
</view>
<view class="u-f u-f-fdc" style="flex: 4">
<view class="fs28 light-black fw400 mg-bot-10 two-line-ellipsis">{{shopSureBillInfo.goodsName}}</view>
<view class="fs28 light-black fw400 mg-bot-10 two-line-ellipsis">{{shopSureBillInfo.goodsName}}
</view>
<view class="mg-bot-10 u-f u-f-aic u-f-jcfs">
<text class="light-gray fs24 mg-right-8">{{shopSureBillInfo.goodsSpecification}}</text>
</view>
......@@ -44,7 +45,7 @@
<text class="light-black">退款总额</text>
<view class="main-color">
<text class="fs24"></text>
<text class="fs32">{{shopSureBillInfo.goodsPrice}}</text>
<text class="fs32">{{shopSureBillInfo.actualAmount}}</text>
</view>
</view>
</view>
......@@ -69,11 +70,11 @@
<view class="u-f u-f-jcsb u-f-aic mg-bot-20">
<view style="flex: 1">
<image class="border-radius-9 mg-right-10" :src="shopSureBillInfo.goodsImage"
style="width: 128rpx;height: 128rpx;"
:mode="'widthFix'"></image>
style="width: 128rpx;height: 128rpx;" :mode="'widthFix'"></image>
</view>
<view class="u-f u-f-fdc" style="flex: 4">
<view class="fs28 light-black fw400 mg-bot-10 two-line-ellipsis">{{shopSureBillInfo.goodsName}}</view>
<view class="fs28 light-black fw400 mg-bot-10 two-line-ellipsis">{{shopSureBillInfo.goodsName}}
</view>
<view class="mg-bot-10 u-f u-f-aic u-f-jcfs">
<text class="light-gray fs24 mg-right-8">{{shopSureBillInfo.goodsSpecification}}</text>
</view>
......@@ -107,11 +108,11 @@
<view class="u-f u-f-jcsb u-f-aic mg-bot-20">
<view style="flex: 1">
<image class="border-radius-9 mg-right-10" :src="shopSureBillInfo.goodsImage"
style="width: 128rpx;height: 128rpx;"
:mode="'widthFix'"></image>
style="width: 128rpx;height: 128rpx;" :mode="'widthFix'"></image>
</view>
<view class="u-f u-f-fdc" style="flex: 4">
<view class="fs28 light-black fw400 mg-bot-10 two-line-ellipsis">{{shopSureBillInfo.goodsName}}</view>
<view class="fs28 light-black fw400 mg-bot-10 two-line-ellipsis">{{shopSureBillInfo.goodsName}}
</view>
<view class="mg-bot-10 u-f u-f-aic u-f-jcfs">
<text class="light-gray fs24 mg-right-8">{{shopSureBillInfo.goodsSpecification}}</text>
</view>
......@@ -146,11 +147,11 @@
<view class="u-f u-f-jcsb u-f-aic mg-bot-20">
<view style="flex: 1">
<image class="border-radius-9 mg-right-10" :src="shopSureBillInfo.goodsImage"
style="width: 128rpx;height: 128rpx;"
:mode="'widthFix'"></image>
style="width: 128rpx;height: 128rpx;" :mode="'widthFix'"></image>
</view>
<view class="u-f u-f-fdc" style="flex: 4">
<view class="fs28 light-black fw400 mg-bot-10 two-line-ellipsis">{{shopSureBillInfo.goodsName}}</view>
<view class="fs28 light-black fw400 mg-bot-10 two-line-ellipsis">{{shopSureBillInfo.goodsName}}
</view>
<view class="mg-bot-10 u-f u-f-aic u-f-jcfs">
<text class="light-gray fs24 mg-right-8">{{shopSureBillInfo.goodsSpecification}}</text>
</view>
......@@ -200,7 +201,7 @@
},
onNavigationBarButtonTap(e) {
console.log(e);
if (e.index===0) {
if (e.index === 0) {
this.goToOrderCenter()
}
// e的返回格式为json对象:{"text":"测试","index":0}
......@@ -238,7 +239,7 @@
color: #ffffff;
text-align: center;
padding: 22rpx 0;
background: linear-gradient( 90deg, #FF4502 0%, #FF8903 100%);
background: linear-gradient(90deg, #FF4502 0%, #FF8903 100%);
border-radius: 41rpx 41rpx 41rpx 41rpx;
}
......@@ -248,17 +249,21 @@
.good-recomend {
margin-top: 70rpx;
.gr-title {
margin-bottom: 26rpx;
.left-line {
width: 165rpx;
height: 4rpx;
// background: url(../.././static/left-line.png) no-repeat center center;
}
.center-title {
color: #FF4502;
margin-right: 16rpx;
}
.right-line {
width: 165rpx;
height: 4rpx;
......@@ -267,27 +272,34 @@
}
}
.product-list {
margin: 0 24rpx;
.product-wrap {
width: calc(50% - 22rpx);
margin-bottom: 20rpx;
margin-right: 22rpx;
&:nth-child(2n) {
margin-right: 0;
}
.product-card {
flex: 1;
border-radius: 18rpx;
background-color: #ffffff;
.pc-image {
width: 100%;
height: 340rpx;
}
.pc-desc {
color: #333333;
height: 74rpx;
}
.pc-price {
margin-top: 10rpx;
color: #FF4502;
......
......@@ -56,8 +56,8 @@
v-model="applyContent" />
</view>
<view class="u-f u-f-aic u-f-jcc mg-bot-250">
<u-upload width="150rpx" height="150rpx" :fileList="fileList" @afterRead="afterRead" @delete="deletePic" name="1" multiple
:maxCount="10" :previewFullImage="true"></u-upload>
<u-upload width="150rpx" height="150rpx" :fileList="fileList" @afterRead="afterRead" @delete="deletePic"
name="1" multiple :maxCount="10" :previewFullImage="true"></u-upload>
</view>
</view>
......@@ -146,11 +146,12 @@
})
for (let i = 0; i < lists.length; i++) {
const result = await this.uploadFilePromise(lists[i].url)
console.log('LMG', result)
let item = this[`fileList`][fileListLen]
this[`fileList`].splice(fileListLen, 1, Object.assign(item, {
status: 'success',
message: '',
url: result.url
url: result
}))
fileListLen++
}
......@@ -184,8 +185,8 @@
try {
// 解析返回的数据
const data = JSON.parse(res.data);
if (data && data.data && data.data.url && data.data.url[0]) {
resolve(data.data.url[0]);
if (data.data.url != null) {
resolve(data.data.url);
} else {
reject(new Error('Invalid response format'));
}
......@@ -204,7 +205,7 @@
submitFeedback() {
let feedbackImage = []
this.fileList.map(item => {
feedbackImage.push(item.thumb)
feedbackImage.push(item.url)
})
// if (this.refundType=='请选择') {
......@@ -245,9 +246,8 @@
requestRefundType: this.refundType
})
}
uni.showLoading()
console.log('LMG', data)
this.$http.post('/api/client/order/requestRefund', data).then(res => {
uni.showToast({
icon: 'none',
......
......@@ -383,7 +383,7 @@
// 扫码进入的情况下调用下方函数
// option.share && this.goToSelfQuickBuy()
const token = uni.getStorageSync('token')
if (!token) {
if (!token && option.share != null) {
//沒有登录 先登录
uni.navigateTo({
url: '/pages/login/login?share=1'
......
......@@ -164,7 +164,7 @@
this.key = opt.key
this.handleScanCodeCarWash()
const token = uni.getStorageSync('token')
if (!token) {
if (!token && option.share != null) {
//沒有登录 先登录
uni.navigateTo({
url: '/pages/login/login?share=1'
......
......@@ -566,7 +566,7 @@
this.getStoreGoodDetail()
this.getReviewsList()
const token = uni.getStorageSync('token')
if (!token) {
if (!token && option.share != null) {
//沒有登录 先登录
uni.navigateTo({
url: '/pages/login/login?share=1'
......
......@@ -25,7 +25,8 @@
<image src="../.././static/common/shop_car.png" style="width: 100%;height: 100%;"></image>
</view> -->
<view class="swiper-num fw400 fs28" v-if="goodsDetail.goodsImageList">
{{current + 1}}/{{goodsDetail.goodsImageList.length ? goodsDetail.goodsImageList.length : 0}}</view>
{{current + 1}}/{{goodsDetail.goodsImageList.length ? goodsDetail.goodsImageList.length : 0}}
</view>
</view>
<view class="content-detail">
......@@ -41,7 +42,7 @@
<text>{{goodsDetail.goodsOriginalPrice}}</text>
</view>
</view>
<button open-type="share" class="u-f u-f-fdc u-f-jcc shareBtn" >
<button open-type="share" class="u-f u-f-fdc u-f-jcc shareBtn">
<image class="share-icon" :mode="'widthFix'" src="../.././static/common/share.png">
</image>
<text class="main-color fs22 fw400">分享</text>
......@@ -303,7 +304,7 @@
this.getCustomerService() // 获取客服信息
const token = uni.getStorageSync('token')
if (!token) {
if (!token && option.share != null) {
//沒有登录 先登录
uni.navigateTo({
url: '/pages/login/login?share=1'
......@@ -316,7 +317,7 @@
return {
title: '蚂蚁车生活', // 分享出去的标题
path: '/pagesF/oil-quan-detail/oil-quan-detail?id=' + this.goodsId + '&storeId=' + this
.storeId + '&share=1'// 分享出去的页面路径
.storeId + '&share=1' // 分享出去的页面路径
}
},
onShareTimeline() {
......
<template>
<view class="VehicleConditionReportIndex">
<u-navbar title="车况报告" leftIconColor="#000" rightIcon='../../static/common/white_left_arrrow.png' placeholder
leftIconSize='38rpx' autoBack="true">
</u-navbar>
<view class="content">
<view class="ConTitle">
您的爱车
</view>
<view class="myCar">
<view class="msgItem" v-for="(item,index) in myCarmsgList">
<view class="label">
{{item.label}}
</view>
<view class="name">
{{item.name}}
</view>
</view>
</view>
<view class="ConTitle">
保养状况
</view>
<view class="maintenanceStatus">
<view class="maintenanceStatusItem" v-for="(item,index) in maintenanceList">
<view class="label">
{{item.label}}
</view>
<view class="dispense" v-if="index==2">
{{item.name}}
</view>
<view class="name" v-else>
{{item.name}}
</view>
</view>
</view>
<view class="ConTitle">
保养提示
</view>
<view class="maintenanceHint">
{{hint}}
</view>
<view class="maintenancerecord">
保养记录
</view>
</view>
</view>
</template>
<script>
export default {
data() {
return {
myCarmsgList: [{
label: "车辆品牌",
name: ""
}, {
label: "车辆型号",
name: ""
}, {
label: "车辆牌照",
name: ""
}, {
label: "上路时间",
name: ""
}, ],
maintenanceList: [{
label: "车辆最近保养日期",
name: ""
}, {
label: "建议保养日期",
name: "2024-05-06"
}, {
label: "无需保养",
name: ""
}, ],
hint: "",
}
},
onShow() {
this.getVehicleConditionReportData()
},
methods: {
getVehicleConditionReportData() {
this.$http.get('/api/client/maintain/vehicleConditionReport').then((res) => {
this.myCarmsgList[0].name = res.data.data.vehicleBrand
this.myCarmsgList[1].name = res.data.data.vehicleModel
this.myCarmsgList[2].name = res.data.data.plateNo
this.myCarmsgList[3].name = res.data.data.startTime
this.maintenanceList[0].name = res.data.data.maintainDate
this.maintenanceList[1].name = res.data.data.suggestedMainDate
this.maintenanceList[2].name = res.data.data.maintainStatus
this.hint = res.data.data.maintainReminder
console.log(res.data.data);
})
},
}
}
</script>
<style lang="scss">
.VehicleConditionReportIndex {
background-color: #fafbff;
min-height: 100vh;
padding-top: 30rpx;
box-sizing: border-box;
.content {
width: 702rpx;
margin: auto;
overflow: hidden;
.ConTitle {
margin-top: 30rpx;
margin-bottom: 16rpx;
padding-left: 12rpx;
font-weight: 400;
font-size: 28rpx;
color: #333333;
border-left: 6rpx #FF4502 solid;
}
.myCar {
padding: 30rpx 20rpx;
width: 702rpx;
height: 305rpx;
background: #FFFFFF;
border-radius: 18rpx 18rpx 18rpx 18rpx;
box-sizing: border-box;
.msgItem {
display: flex;
margin-bottom: 31rpx;
align-items: center;
&:last-child {
margin-bottom: 0;
}
}
}
.maintenanceStatus {
padding: 30rpx 20rpx;
box-sizing: border-box;
width: 702rpx;
height: 245rpx;
background: #FFFFFF;
border-radius: 18rpx 18rpx 18rpx 18rpx;
.maintenanceStatusItem {
display: flex;
margin-bottom: 31rpx;
align-items: center;
.dispense {
display: flex;
align-items: center;
justify-content: center;
margin-left: auto;
padding: 8rpx 10rpx;
width: 131rpx;
height: 41rpx;
background: #008636;
border-radius: 5rpx 5rpx 5rpx 5rpx;
font-weight: 400;
font-size: 26rpx;
color: #FFFFFF;
}
&:last-child {
margin-bottom: 0;
}
}
}
.maintenanceHint {
display: flex;
align-items: center;
justify-content: center;
padding: 20rpx 20rpx;
box-sizing: border-box;
width: 702rpx;
// height: 96rpx;
background: #FFFFFF;
border-radius: 18rpx 18rpx 18rpx 18rpx;
font-weight: 400;
font-size: 28rpx;
color: #333333;
}
.maintenancerecord {
display: flex;
align-items: center;
justify-content: center;
margin: auto;
margin-top: 110rpx;
width: 702rpx;
height: 80rpx;
background: linear-gradient(90deg, #FF4502 0%, #FF8903 100%);
border-radius: 41rpx 41rpx 41rpx 41rpx;
font-weight: 400;
font-size: 28rpx;
color: #FFFFFF;
}
.label {
font-weight: 400;
font-size: 28rpx;
color: #999999;
}
.name {
margin-left: auto;
text-align: end;
font-weight: 400;
font-size: 28rpx;
color: #333333;
}
}
}
</style>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment