diff --git a/components/orderCard.vue b/components/orderCard.vue
index c88f368..9667edb 100644
--- a/components/orderCard.vue
+++ b/components/orderCard.vue
@@ -70,7 +70,7 @@
作废
-
+
添加项目
diff --git a/pages-home/home/home.vue b/pages-home/home/home.vue
index 63e3066..1886d41 100644
--- a/pages-home/home/home.vue
+++ b/pages-home/home/home.vue
@@ -105,7 +105,7 @@
-
+
99?99:res.data
}
+ console.log("开始播放")
+ if(this.ifFirstLogin && this.noReadNum>0){
+ console.log("播放")
+ this.$refs.tarBar.dianyidain()
+ this.ifFirstLogin=false
+ }
})
},
/**
diff --git a/pages-order/orderDetail/orderDetail.vue b/pages-order/orderDetail/orderDetail.vue
index cf48e79..ab503a1 100644
--- a/pages-order/orderDetail/orderDetail.vue
+++ b/pages-order/orderDetail/orderDetail.vue
@@ -206,27 +206,28 @@
维修进度记录表
-
- - 待维修
- ○ 维修中
- √ 已完成
-
-
-
- 序号
- 维修项目
- -
- ○
- √
-
-
- {{ index+1 }}
- {{ item.itemName }}
- -
- ○
- √
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -375,6 +376,8 @@ export default {
ifCallCus:false,
//维修项目进度记录表
tableData:[],
+ active: 1,
+ list2: [],
//通知客户取车联系人对象
callServiceInfo:{
name:"",
@@ -822,7 +825,21 @@ export default {
params:{ticketId:this.ticketId}
}).then((res)=>{
if(res.code==200){
- this.tableData = res.data
+ this.list2 = []
+ //当前在修的项目
+ let endIndex = -1
+ for (let i = 0; i < res.data.length; i++) {
+ let thisObj = res.data[i]
+ thisObj.title = thisObj.itemName
+ if(thisObj.itemStatus=='03'){
+ //这个项目已处理完毕,维修完成的项目设置为这个
+ endIndex = i
+ thisObj.desc = formatTimestamp(thisObj.updateTime)
+ }
+ this.list2.push(thisObj)
+ }
+ this.active = endIndex
+ console.log(this.list2,"thisObj.itemStatus=='02'")
}
})
},
@@ -990,7 +1007,7 @@ export default {
.desc {
font-weight: 500;
- font-size: 24rpx;
+ font-size: 28rpx;
color: rgba(255, 255, 255, 0.7);
}
}
@@ -1109,7 +1126,7 @@ export default {
.flagDesc {
font-weight: 500;
- font-size: 24rpx;
+ font-size: 28rpx;
color: #999999;
}
}
@@ -1212,7 +1229,7 @@ export default {
.projDate {
font-weight: 500;
- font-size: 24rpx;
+ font-size: 28rpx;
color: #858BA0;
display: flex;
@@ -1224,7 +1241,7 @@ export default {
.projDesc {
font-weight: 500;
- font-size: 24rpx;
+ font-size: 28rpx;
color: #858BA0;
}
@@ -1278,7 +1295,7 @@ export default {
.projBaseInfo {
display: grid;
grid-template-columns: 1fr 1fr;
- font-size: 24rpx;
+ font-size: 28rpx;
color: #999999;
gap: 20rpx;
margin-bottom: 20rpx;
@@ -1321,7 +1338,7 @@ export default {
color: #333333;
.label {
- font-size: 24rpx;
+ font-size: 28rpx;
color: #999999;
}
}
diff --git a/pages-warehouse/home/home.vue b/pages-warehouse/home/home.vue
index 3ea433e..59b26d9 100644
--- a/pages-warehouse/home/home.vue
+++ b/pages-warehouse/home/home.vue
@@ -88,7 +88,7 @@
-
+
@@ -158,6 +158,8 @@ export default {
noReadNum: 0,
//通知公告数量
noticeNum: 0,
+ //是否首次打开页面
+ ifFirstLogin:true,
}
},
onLoad() {
@@ -191,6 +193,11 @@ export default {
url: '/pages-home/msg/message'
})
},
+ socketSuccess(){
+ this.getNoReadNum()
+ this.onRefresherrefresh()
+ console.log('通知并刷新成功')
+ },
/**
* 领配件、退配件Tab页
*/
@@ -314,6 +321,11 @@ export default {
if (res.code == 200) {
this.noReadNum = res.data > 99 ? 99 : res.data
}
+ if(this.ifFirstLogin && this.noReadNum>0){
+ console.log("播放")
+ this.$refs.tarBar.dianyidain()
+ this.ifFirstLogin=false
+ }
})
},
/**
diff --git a/uni_modules/uni-steps/changelog.md b/uni_modules/uni-steps/changelog.md
new file mode 100644
index 0000000..04367d8
--- /dev/null
+++ b/uni_modules/uni-steps/changelog.md
@@ -0,0 +1,18 @@
+## 1.1.2(2024-03-28)
+- 修复 uni-steps为竖排列时,文本长度过长引起点错乱的bug
+## 1.1.1(2021-11-22)
+- 修复 vue3中某些scss变量无法找到的问题
+## 1.1.0(2021-11-19)
+- 优化 组件UI,并提供设计资源,详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移,详见:[https://uniapp.dcloud.io/component/uniui/uni-steps](https://uniapp.dcloud.io/component/uniui/uni-steps)
+## 1.0.8(2021-05-12)
+- 新增 项目示例地址
+## 1.0.7(2021-05-06)
+- 修复 uni-steps 横向布局时,多行文字高度不合理的 bug
+## 1.0.6(2021-04-21)
+- 优化 添加依赖 uni-icons, 导入后自动下载依赖
+## 1.0.5(2021-02-05)
+- 优化 组件引用关系,通过uni_modules引用组件
+
+## 1.0.4(2021-02-05)
+- 调整为uni_modules目录规范
diff --git a/uni_modules/uni-steps/components/uni-steps/uni-steps.vue b/uni_modules/uni-steps/components/uni-steps/uni-steps.vue
new file mode 100644
index 0000000..11fb29c
--- /dev/null
+++ b/uni_modules/uni-steps/components/uni-steps/uni-steps.vue
@@ -0,0 +1,280 @@
+
+
+
+
+
+ {{item.title}}
+ {{item.desc}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/uni_modules/uni-steps/package.json b/uni_modules/uni-steps/package.json
new file mode 100644
index 0000000..4145ce9
--- /dev/null
+++ b/uni_modules/uni-steps/package.json
@@ -0,0 +1,87 @@
+{
+ "id": "uni-steps",
+ "displayName": "uni-steps 步骤条",
+ "version": "1.1.2",
+ "description": "步骤条组件,提供横向和纵向两种布局格式。",
+ "keywords": [
+ "uni-ui",
+ "uniui",
+ "步骤条",
+ "时间轴"
+],
+ "repository": "https://github.com/dcloudio/uni-ui",
+ "engines": {
+ "HBuilderX": ""
+ },
+ "directories": {
+ "example": "../../temps/example_temps"
+ },
+"dcloudext": {
+ "sale": {
+ "regular": {
+ "price": "0.00"
+ },
+ "sourcecode": {
+ "price": "0.00"
+ }
+ },
+ "contact": {
+ "qq": ""
+ },
+ "declaration": {
+ "ads": "无",
+ "data": "无",
+ "permissions": "无"
+ },
+ "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
+ "type": "component-vue"
+ },
+ "uni_modules": {
+ "dependencies": [
+ "uni-scss",
+ "uni-icons"
+ ],
+ "encrypt": [],
+ "platforms": {
+ "cloud": {
+ "tcb": "y",
+ "aliyun": "y",
+ "alipay": "n"
+ },
+ "client": {
+ "App": {
+ "app-vue": "y",
+ "app-nvue": "y"
+ },
+ "H5-mobile": {
+ "Safari": "y",
+ "Android Browser": "y",
+ "微信浏览器(Android)": "y",
+ "QQ浏览器(Android)": "y"
+ },
+ "H5-pc": {
+ "Chrome": "y",
+ "IE": "y",
+ "Edge": "y",
+ "Firefox": "y",
+ "Safari": "y"
+ },
+ "小程序": {
+ "微信": "y",
+ "阿里": "y",
+ "百度": "y",
+ "字节跳动": "y",
+ "QQ": "y"
+ },
+ "快应用": {
+ "华为": "u",
+ "联盟": "u"
+ },
+ "Vue": {
+ "vue2": "y",
+ "vue3": "y"
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-steps/readme.md b/uni_modules/uni-steps/readme.md
new file mode 100644
index 0000000..da7a4bf
--- /dev/null
+++ b/uni_modules/uni-steps/readme.md
@@ -0,0 +1,13 @@
+
+
+## Steps 步骤条
+> **组件名:uni-steps**
+> 代码块: `uSteps`
+
+
+步骤条,常用于显示进度
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-steps)
+#### 如使用过程中有任何问题,或者您对uni-ui有一些好的建议,欢迎加入 uni-ui 交流群:871950839
+
+