bug修改

pages.json

@@ -197,7 +197,7 @@
             "path" : "pages/index/Workordertodone/Workordertodone",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "工单待办",
+                "navigationBarTitleText": "报修工单",
                 "enablePullDownRefresh": false
             }
             

pages/index/Inspectionrecord/Inspectionrecord.vue

@@ -100,6 +100,9 @@
 	// import tTable from '@/components/t-table/t-table.vue';
 	// import tTh from '@/components/t-table/t-th.vue';
 	// import tTr from '@/components/t-table/t-tr.vue';
+
+import cellGroup from '../../../uni_modules/uview-ui/libs/config/props/cellGroup';
+
 	// import tTd from '@/components/t-table/t-td.vue';
 	export default {
 		components: {
@@ -131,7 +134,7 @@
 				// ],
 				indexList: [],
 				xjlx: '巡检类型',
-
+				
 				dataList: [],
 				dataForm: {
 					projectId: "",
@@ -183,6 +186,14 @@
 
 			for (let i = 0; i < getDictDataList.length; i++) {
 				if (getDictDataList[i].dictType == 'ReviewType') {
+					console.log(getDictDataList[i].dataList,"1231313135646");
+					let pushdata={
+						dictLabel: "全部",
+						dictValue:"",
+					}
+					getDictDataList[i].dataList.unshift(pushdata)
+					
+					
 					this.columnstypexunjian = [getDictDataList[i].dataList]
 				}
 			}

pages/index/Onlinewarranty/Onlinewarranty.vue

@@ -3,13 +3,14 @@
 
 		<view class="wfgz">
 			<!-- 注意，如果需要兼容微信小程序，最好通过setRules方法设置rules规则 -->
-			<u--form labelPosition="left" :model="model1" :rules="rules" ref="form1">
+			<u--form labelPosition="left" :model="model1" :rules="rules"  ref="form1">
 				<!-- <u-form-item labelWidth='180' label="任务名称:" prop="userInfo.contactPerson" borderBottom ref="item1">
                     <u--input v-model="model1.userInfo.contactPerson" border="none"></u--input>
                 </u-form-item> -->
-
-				<u-form-item labelWidth='180' label="报修位置:" prop="userInfo.repairPositionName" borderBottom
+			
+				<u-form-item labelWidth='180'  label="报修位置:" prop="userInfo.repairPositionName" borderBottom
 					@click="showfloor = true;" ref="item1">
+					
 					<u--input v-model="model1.userInfo.repairPositionName" disabled disabledColor="#ffffff"
 						placeholder="请选择报修位置" border="none"></u--input>
 					<u-icon slot="right" contactPerson="arrow-right"></u-icon>
@@ -425,4 +426,5 @@
 		margin: 20rpx;
 		margin-top: 0px;
 	}
+	
 </style>

pages/index/Workordertodone/Workordertodone.vue

@@ -6,7 +6,7 @@
 		</view>
 		
 
-		<!-- 待派送 -->
+		<!-- 待指派 -->
 		<view class="" v-show="cdshow==0">
 			<view style="padding:20rpx 0 0 30rpx">
 				共有 <span style="color: red">{{totalnumber}}</span>条记录
@@ -139,7 +139,7 @@
 				cdshow: 0,
 				fatherparameter: {},
 				expensedata:'全部',
-				list: ['待派送', '已派送(待维修)','已维修' ],
+				list: ['待指派', '已指派(待维修)','已维修' ],
 				current: 0,
 				dataForm: {
 					status: "1",

pages/my/my.vue

@@ -41,16 +41,42 @@
 		</view>
 		<!-- 头部结束 -->
 		<view class="minndle">
-			<u-grid :border="false" col="4" @click="navigations">
+			<!-- <u-grid :border="false" col="4" @click="navigations">
 				<u-grid-item v-for="(listItem,listIndex) in list" :key="listIndex">
 					<u-icon :customStyle="{paddingTop:20+'rpx'}" :name="listItem.name" :color="listItem.color"
 						:size="55"></u-icon>
 					<text class="grid-text" style="padding-top: 8px;">{{listItem.title}}</text>
 				</u-grid-item>
-			</u-grid>
+			</u-grid> -->
+			<view class="information">
+				<view class="icon1">
+					<u-icon name="account" size="55" color="#30D3A2" class=""></u-icon>
+				</view>
+				<view  style="padding-top: 8px;">
+					个人信息
+				</view>
+			</view>
+			<view class="distribute">
+				<view class="icon2">
+					<u-icon name="list" size="55" color="#09C700"></u-icon>
+				</view>
+				<view  style="padding-top: 8px;">
+					我的派发
+				</view>
+			</view>
+			<view class="task">
+				<view class="icon3">
+					<u-icon name="order" size="55" color="#FF9C27"></u-icon>
+				</view>
+				<view  style="padding-top: 8px;">我的任务</view>
+			</view>
+			<view class="opinions">
+				<view class="icon4">
+					<u-icon name="more-circle" size="55" color="#F7B717"></u-icon>
+				</view>
+				<view  style="padding-top: 8px;">意见建议</view>
+			</view>
 		</view>
-		
-		
 		<!-- 导航栏结束 -->
 		<view class="middleimgs">
 			<!-- <img src="@/static/my/xinxi.png" alt=""> -->
@@ -230,8 +256,31 @@
 		width: 750rpx;
 		height: 150rpx;
 		margin: 25rpx 0;
+		display: flex;
+		align-items: center;
+		justify-content: space-around;
+		text-align: center;
+	}
+	.icon1{
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+	.icon2{
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+	.icon3{
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+	.icon4{
+		display: flex;
+		align-items: center;
+		justify-content: center;
 	}
-
 	.middleimgs {
 		width: 750rpx;
 		height: 200rpx;
@@ -291,6 +340,7 @@
 		color: #fff;
 	}
 }
+
 .Username2{
 	font-size: 20rpx;
 	color: #333333;