Augcl
/
pet-front
1
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 0 Wiki Activity
Browse Source

fix: 修复订单详情页宠物信息跳转和字段命名问题 

- 修正宠物信息跳转链接使用错误的orderId字段
- 统一清洁要求相关字段命名(catLitter->litterBox, urinePad->peePad)
- 调整步骤条激活状态文字颜色为白色
- 移除未使用的steps-custom.scss引用
master
前端-胡立永 1 month ago
parent
def46ebbf2
commit
77b1ff244b
3 changed files with 60 additions and 58 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +57
    -55
      otherPages/myOrdersManage/service/detail.vue
  2. +1
    -1
      otherPages/orderTakingManage/detail/index.vue
  3. +2
    -2
      utils/getUrl.js

+ 57
- 55
otherPages/myOrdersManage/service/detail.vue View File

@ -5,11 +5,11 @@
<view style="margin: 32rpx 0;">
<up-steps :current="currentStep" activeColor="#FFA042" inactiveColor="#E5E5E5" class="up-steps-custom">
<up-steps-item title="喂养要求"
:titleStyle="{fontSize: '32rpx', fontWeight: 'bold', color: currentStep === 0 ? '#FFA042' : '#999999'}"></up-steps-item>
:titleStyle="{fontSize: '32rpx', fontWeight: 'bold', color: currentStep === 0 ? '#fff' : '#999999'}"></up-steps-item>
<up-steps-item title="清洁要求"
:titleStyle="{fontSize: '32rpx', fontWeight: 'bold', color: currentStep === 1 ? '#FFA042' : '#999999'}"></up-steps-item>
:titleStyle="{fontSize: '32rpx', fontWeight: 'bold', color: currentStep === 1 ? '#fff' : '#999999'}"></up-steps-item>
<up-steps-item title="附加服务"
:titleStyle="{fontSize: '32rpx', fontWeight: 'bold', color: currentStep === 2 ? '#FFA042' : '#999999'}"></up-steps-item>
:titleStyle="{fontSize: '32rpx', fontWeight: 'bold', color: currentStep === 2 ? '#fff' : '#999999'}"></up-steps-item>
</up-steps>
</view>
@ -319,7 +319,8 @@
<view v-if="currentStep === 1">
<view class="top box-size" :style="{borderRadius:'16rpx'}">
<view class="form-title">
您需要的清洁内容 </view>
您需要的清洁内容
</view>
<!-- <view class="empty-state-full">
<up-icon name="info-circle" size="60rpx" color="#999999"></up-icon>
<text class="empty-text-full">暂无清洁内容</text>
@ -332,10 +333,10 @@
猫砂摆放位置
</view>
<view class="img mt20">
<template v-if="handleImageUrl(detail.catLitterLocation).length > 0">
<template v-if="handleImageUrl(detail.litterBoxLocation).length > 0">
<u-image class="img" :src="item" mode="aspectFill" width="173rpx" height="230rpx"
@click="previewImage(item)"
v-for="(item, index) in handleImageUrl(detail.catLitterLocation)"
v-for="(item, index) in handleImageUrl(detail.litterBoxLocation)"
:key="index"></u-image>
</template>
<view v-else class="empty-state">
@ -347,12 +348,12 @@
<view :style="{color:'#999999'}">猫砂更换频率</view>
<view class="level">
<view class="input_ mr10">
<input type="text" disabled :value="detail.catLitterChangeFrequencyDays"
<input type="text" disabled :value="detail.litterBoxChangeFrequencyDays"
:style="{width:'80rpx',height:'50rpx',fontSize:'30rpx'}">
</view>
<view>天</view>
<view class="input_ mr10">
<input type="text" disabled :value="detail.catLitterChangeFrequencyTimes"
<input type="text" disabled :value="detail.litterBoxChangeFrequencyTimes"
:style="{width:'80rpx',height:'50rpx',fontSize:'30rpx'}">
</view>
<view>次</view>
@ -362,7 +363,7 @@
备注信息
</view>
<view class="notes mt16 box-size ml--15" :style="{borderRadius:'16rpx'}">
<input type="text" :value="detail.catLitterRemarks || '无'" :style="{height:'50rpx',fontSize:'30rpx'}">
<input type="text" :value="detail.litterBoxRemarks || '无'" :style="{height:'50rpx',fontSize:'30rpx'}">
</view>
</view>
<view class="line" :style="{borderRadius:'1rpx'}"></view>
@ -375,10 +376,10 @@
尿垫摆放位置
</view>
<view class="img mt20">
<template v-if="handleImageUrl(detail.urinePadLocation).length > 0">
<template v-if="handleImageUrl(detail.peePadLocation).length > 0">
<u-image class="img" :src="item" mode="aspectFill" width="173rpx" height="230rpx"
@click="previewImage(item)"
v-for="(item, index) in handleImageUrl(detail.urinePadLocation)" :key="index"></u-image>
v-for="(item, index) in handleImageUrl(detail.peePadLocation)" :key="index"></u-image>
</template>
<view v-else class="empty-state">
<up-icon name="info-circle" size="40rpx" color="#999999"></up-icon>
@ -388,23 +389,24 @@
<view class="size-30 mt24 flex-between">
<view :style="{color:'#999999'}">更换尿垫</view>
<view class="level">
<view class="input_ mr10">
<input type="text" :value="detail.urinePadChangeFrequency"
<!-- <view class="input_ mr10">
<input type="text" :value="detail.peePadLocation"
:style="{width:'80rpx',height:'50rpx',fontSize:'30rpx'}">
</view>
<view>是</view>
</view> -->
<view v-if="detail.changePeePad">是</view>
<view v-else>否</view>
</view>
</view>
<view class="size-30 mt24 flex-between">
<view :style="{color:'#999999'}">尿垫更换频率</view>
<view class="level">
<view class="input_ mr10">
<input type="text" :value="detail.urinePadChangeFrequencyDays"
<input type="text" :value="detail.peePadFrequencyDays"
:style="{width:'80rpx',height:'50rpx',fontSize:'30rpx'}">
</view>
<view>天</view>
<view class="input_ mr10">
<input type="text" :value="detail.urinePadChangeFrequencyTimes"
<input type="text" :value="detail.peePadFrequencyTimes"
:style="{width:'80rpx',height:'50rpx',fontSize:'30rpx'}">
</view>
<view>次</view>
@ -414,7 +416,7 @@
备注信息
</view>
<view class="notes mt16 box-size ml--15" :style="{borderRadius:'16rpx'}">
<input type="text" disabled :value="detail.urinePadRemarks || '无'"
<input type="text" disabled :value="detail.peePadRemarks || '无'"
:style="{height:'50rpx',fontSize:'30rpx'}">
</view>
</view>
@ -768,7 +770,7 @@
<style scoped lang="scss">
@import"detail.scss";
@import"steps-custom.scss";
// @import"steps-custom.scss";
.empty-state {
display: flex;
@ -806,40 +808,40 @@
}
/* 自定义步骤条样式 */
:deep(.up-steps-custom) {
.u-steps-item__wrapper {
width: 40rpx !important;
height: 40rpx !important;
&__circle {
width: 40rpx !important;
height: 40rpx !important;
background: #E5E5E5;
&__text {
font-size: 24rpx;
}
}
}
.u-steps-item__line {
top: 20rpx !important;
height: 4rpx !important;
background: #E5E5E5 !important;
}
/* 激活状态样式 */
.u-steps-item--active {
.u-steps-item__wrapper__circle {
background: linear-gradient(90deg, #FFA042, #FFD591) !important;
}
}
/* 已完成步骤前的线条样式 */
.u-steps-item--process {
.u-steps-item__line {
background: linear-gradient(90deg, #FFA042, #FFD591) !important;
}
}
}
// :deep(.up-steps-custom) {
// .u-steps-item__wrapper {
// width: 40rpx !important;
// height: 40rpx !important;
// &__circle {
// width: 40rpx !important;
// height: 40rpx !important;
// background: #E5E5E5;
// &__text {
// font-size: 24rpx;
// }
// }
// }
// .u-steps-item__line {
// top: 20rpx !important;
// height: 4rpx !important;
// background: #E5E5E5 !important;
// }
// /* 激活状态样式 */
// .u-steps-item--active {
// .u-steps-item__wrapper__circle {
// background: linear-gradient(90deg, #FFA042, #FFD591) !important;
// }
// }
// /* 已完成步骤前的线条样式 */
// .u-steps-item--process {
// .u-steps-item__line {
// background: linear-gradient(90deg, #FFA042, #FFD591) !important;
// }
// }
// }
</style>

+ 1
- 1
otherPages/orderTakingManage/detail/index.vue View File

@ -326,7 +326,7 @@
// 查看宠物信息
const petInfo = () => {
uni.navigateTo({
url: "/otherPages/orderTakingManage/pet/index?id=" + orderId.value
url: "/otherPages/orderTakingManage/pet/index?id=" + orderDetail.value.order.orderId
})
}


+ 2
- 2
utils/getUrl.js View File

@ -3,10 +3,10 @@ const accountInfo = wx.getAccountInfoSync();
// current = accountInfo.miniProgram.envVersion;
const api = {
// develop:"http://127.0.0.1:8002",
develop:"http://127.0.0.1:8002",
// develop:"http://h5.xzaiyp.top",
// develop:"https://api.catmdogd.com/prod-api",
develop:"https://pet-admin.hhlm1688.com/api",
// develop:"https://pet-admin.hhlm1688.com/api",
// develop: "http://youyi-test.natapp1.cc/prod-api", // 开发
trial: "https://api.catmdogd.com/prod-api", //测试
release: "https://api.catmdogd.com/prod-api",


Write Preview
Loading…
Cancel
Save