From 695f0bf8e2dea99763aa1384ada63d80fa629890 Mon Sep 17 00:00:00 2001
From: Vinjor <vinjorm@gmail.com>
Date: Tue, 12 Nov 2024 17:35:43 +0800
Subject: [PATCH] 1

---
 pages-order/orderDetail/orderDetail.vue       |  26 ++--
 uni_modules/uni-steps/changelog.md            |  18 +++
 .../components/uni-steps/uni-steps.vue        | 113 +++++++++++++++---
 uni_modules/uni-steps/package.json            |  87 ++++++++++++++
 uni_modules/uni-steps/readme.md               |  13 ++
 5 files changed, 231 insertions(+), 26 deletions(-)
 create mode 100644 uni_modules/uni-steps/changelog.md
 create mode 100644 uni_modules/uni-steps/package.json
 create mode 100644 uni_modules/uni-steps/readme.md

diff --git a/pages-order/orderDetail/orderDetail.vue b/pages-order/orderDetail/orderDetail.vue
index 2ba4804..904ee36 100644
--- a/pages-order/orderDetail/orderDetail.vue
+++ b/pages-order/orderDetail/orderDetail.vue
@@ -175,7 +175,12 @@
         <view class="card cardInfo projCard">
           <view class="projTitle">维修进度记录表</view>
           <view class="projList">
-            <uni-steps :options="list2" active-color="#007AFF" :active="active" direction="column" />
+            <view class="tushi-box">
+              <view class="tushi-item" style="color: #B7BDC6">待维修  </view>
+              <view class="tushi-item" style="color: #E8A321">维修中  </view>
+              <view class="tushi-item" style="color: #2979FF;">已完成</view>
+            </view>
+            <uni-steps :options="list2" active-color="#007AFF" :active="active" :doingActive="doingActive"  @prviewImage="prviewImage" direction="column" />
           </view>
         </view>
         <view class="card cardInfo projCard">
@@ -184,12 +189,15 @@
             <template>
               <view v-for="item in ticketInfo.records" :key="item.id" class="projItem">
                 <view class="projTop">
-                  <text class="projName">{{item.type }}【{{item.dealUserName}}】</text>
+                  <text class="projName">{{item.type }}【{{item.roleName}}-{{item.dealUserName}}】</text>
                   <!--                  <text class="projAmount">${{ item.amount }}</text>-->
                 </view>
                 <view class="projBody">
-                  <view class="projDate">
-                    <image mode="aspectFit" src="/static/icons/date.png" style="width: 24rpx;height: 24rpx"></image>
+                  <view class="projDate" style="padding: 10rpx 0 0 0" v-if="item.projectName">
+                    <text class="projDateText">本次维修项目：{{ item.projectName }}</text>
+                  </view>
+                  <view class="projDate" style="padding: 10rpx 0">
+                    <image mode="aspectFit"  src="/static/icons/date.png" style="width: 24rpx;height: 24rpx"></image>
                     <text class="projDateText">{{ item.createTime }}</text>
                   </view>
                   <template >
@@ -236,9 +244,9 @@
         carInfo: {},
         userInfo: {},
         imgUrlPrex:config.baseImageUrl,
+        active: -1,
+        doingActive: -1,
         //维修项目进度记录表
-        tableData:[],
-        active: 1,
         list2: [],
 			};
 		},
@@ -305,9 +313,12 @@
               let thisObj = res.data[i]
               thisObj.title = thisObj.itemName
               if(thisObj.itemStatus=='03'){
-                //这个项目已处理完毕,维修完成的项目设置为这个
+                //这个项目已处理完毕,
                 endIndex = i
                 thisObj.desc = formatTimestamp(thisObj.updateTime)
+              }else if(thisObj.itemStatus=='02'){
+                //正在处理中
+                this.doingActive = i
               }
               this.list2.push(thisObj)
             }
@@ -583,6 +594,7 @@
       gap: 20rpx;
 
       .tushi-box{
+        font-size: 16px;
         display: flex;
         align-items: center;
         justify-content: center;
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
index 11fb29c..6117006 100644
--- a/uni_modules/uni-steps/components/uni-steps/uni-steps.vue
+++ b/uni_modules/uni-steps/components/uni-steps/uni-steps.vue
@@ -4,10 +4,27 @@
 			<view :class="[direction==='column'?'uni-steps__column-text-container':'uni-steps__row-text-container']">
 				<view v-for="(item,index) in options" :key="index"
 					:class="[direction==='column'?'uni-steps__column-text':'uni-steps__row-text']">
-					<text :style="{color:index === active?activeColor:deactiveColor}"
+					<text v-if="doingActive==index" :style="{color:doingColor}"
+						:class="[direction==='column'?'uni-steps__column-title':'uni-steps__row-title']">{{item.title}}</text>
+					<text v-else :style="{color:index <= active?activeColor:deactiveColor}"
 						:class="[direction==='column'?'uni-steps__column-title':'uni-steps__row-title']">{{item.title}}</text>
 					<text v-if="item.desc" :style="{color: deactiveColor}"
 						:class="[direction==='column'?'uni-steps__column-desc':'uni-steps__row-desc']">{{item.desc}}</text>
+          <template >
+            <view class="projImg" v-if="item.recordsItemList.length>0">
+              <image v-for="(img, imgIndex) in item.recordsItemList" @click="prviewImage(item.recordsItemList,imgIndex)" :key="imgIndex" :src="imgUrlPrex + img.image"
+                     class="projImgItem"></image>
+            </view>
+            <view class="projSend" v-if="item.recordsItemList.length>0 && canOpenCus">
+              <template >
+                <uni-icons v-if="doingActive==index" type="cloud-upload" size="18" :style="{color:doingColor}"></uni-icons>
+                <uni-icons v-else type="cloud-upload" size="18" :style="{color:index <= active?activeColor:deactiveColor}"></uni-icons>
+<!--                <image mode="aspectFit" src="@/static/icons/send.png" class="projIcon" :style="{color:index <= active?activeColor:deactiveColor}"></image>-->
+                <text v-if="doingActive==index"  :style="{color: doingColor}" @click="sendCusImgManage(item.recordsItemList)">发送给客户</text>
+                <text v-else :style="{color:index <= active?activeColor:deactiveColor}" @click="sendCusImgManage(item.recordsItemList)">发送给客户</text>
+              </template>
+            </view>
+          </template>
 				</view>
 			</view>
 			<view :class="[direction==='column'?'uni-steps__column-container':'uni-steps__row-container']">
@@ -17,12 +34,18 @@
 						:class="[direction==='column'?'uni-steps__column-line':'uni-steps__row-line',direction==='column'?'uni-steps__column-line--before':'uni-steps__row-line--before']"
 						:style="{backgroundColor:index<=active&&index!==0?activeColor:index===0?'transparent':deactiveColor}">
 					</view>
-					<view :class="[direction==='column'?'uni-steps__column-check':'uni-steps__row-check']"
-						v-if="index === active">
-						<uni-icons :color="activeColor" :type="activeIcon" size="20" />
-					</view>
+<!--					<view :class="[direction==='column'?'uni-steps__column-check':'uni-steps__row-check']"-->
+<!--						v-if="index === active">-->
+<!--						<uni-icons :color="activeColor" :type="activeIcon" size="20" />-->
+<!--					</view>-->
+					<view v-if="doingActive==index" :class="[direction==='column'?'uni-steps__column-circle':'uni-steps__row-circle']"
+						:style="{backgroundColor:doingColor}" >
+            <text style="font-size: 16px;color: white">{{index+1}}</text>
+          </view>
 					<view v-else :class="[direction==='column'?'uni-steps__column-circle':'uni-steps__row-circle']"
-						:style="{backgroundColor:index<active?activeColor:deactiveColor}" />
+						:style="{backgroundColor:index<=active?activeColor:deactiveColor}" >
+            <text style="font-size: 16px;color: white">{{index+1}}</text>
+          </view>
 					<view
 						:class="[direction==='column'?'uni-steps__column-line':'uni-steps__row-line',direction==='column'?'uni-steps__column-line--after':'uni-steps__row-line--after']"
 						:style="{backgroundColor:index<active&&index!==options.length-1?activeColor:index===options.length-1?'transparent':deactiveColor}" />
@@ -44,7 +67,7 @@
 	 * @property {String} activeColor 选中状态的颜色
 	 * @property {Array} options 数据源，格式为：[{title:'xxx',desc:'xxx'},{title:'xxx',desc:'xxx'}]
 	 */
-
+  import config from '@/config'
 	export default {
 		name: 'UniSteps',
 		props: {
@@ -53,6 +76,11 @@
 				type: String,
 				default: 'row'
 			},
+      canOpenCus: {
+				// 是否可以操作发送给客户
+				type: Boolean,
+				default: false
+			},
 			activeColor: {
 				// 激活状态颜色
 				type: String,
@@ -63,10 +91,20 @@
 				type: String,
 				default: '#B7BDC6'
 			},
+			doingColor: {
+				// 进行中颜色
+				type: String,
+				default: '#E8A321'
+			},
 			active: {
-				// 当前步骤
+				// 当前已经处理完的步骤
 				type: Number,
-				default: 0
+				default: -1
+			},
+      doingActive: {
+				// 当前正在处理的步骤
+				type: Number,
+				default: -1
 			},
 			activeIcon: {
 				// 当前步骤
@@ -83,6 +121,7 @@
 		data() {
 			return {
 				heightArr: [],
+        imgUrlPrex:config.baseImageUrl,
 			}
 		},
 		mounted() {
@@ -95,6 +134,14 @@
 				}).exec()
 			}
 		},
+    methods:{
+      prviewImage(itemList,index){
+        this.$emit("prviewImage",itemList,index)
+      },
+      sendCusImgManage(itemList){
+        this.$emit("sendCusImgManage",itemList)
+      },
+    }
 	}
 </script>
 
@@ -164,15 +211,15 @@
 	}
 
 	.uni-steps__row-title {
-		font-size: 14px;
-		line-height: 16px;
+		font-size: 28rpx;
+		line-height: 32rpx;
 		text-align: center;
 	}
 
 	.uni-steps__column-title {
-		font-size: 18px;
+		font-size: 28rpx;
 		text-align: left;
-		line-height: 24px;
+		line-height: 32rpx;
 	}
 
 	.uni-steps__row-desc {
@@ -182,9 +229,9 @@
 	}
 
 	.uni-steps__column-desc {
-		font-size: 16px;
+		font-size: 25rpx;
 		text-align: left;
-		line-height: 20px;
+		line-height: 32rpx;
 	}
 
 	.uni-steps__row-container {
@@ -253,16 +300,17 @@
 	}
 
 	.uni-steps__row-circle {
-		width: 15px;
-		height: 15px;
+		width: 20px;
+		height: 20px;
 		border-radius: 50%;
 		background-color: #B7BDC6;
 		margin: 0px 3px;
 	}
 
 	.uni-steps__column-circle {
-		width: 15px;
-		height: 15px;
+		width: 20px;
+		height: 20px;
+    text-align: center;
 		border-radius: 50%;
 		background-color: #B7BDC6;
 		margin: 4px 0px 5px 0px;
@@ -277,4 +325,31 @@
 		line-height: 14px;
 		margin: 2px 0px;
 	}
+  .projImg {
+    width: 100%;
+    display: grid;
+    grid-template-columns: repeat(auto-fill, 120rpx);
+    justify-content: space-between;
+    gap: 20rpx;
+    padding: 20rpx 0;
+
+    .projImgItem {
+      width: 120rpx;
+      height: 120rpx;
+      background-color: #efefef;
+    }
+  }
+
+  .projSend {
+    display: flex;
+    align-items: center;
+    font-weight: 500;
+    font-size: 28rpx;
+    column-gap: 8rpx;
+  }
+  .projIcon{
+    width: 28rpx;
+    height: 28rpx;
+  }
+
 </style>
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 
+
+