前端

pages/erp/receivingfeedback/details.vue

@@ -465,7 +465,7 @@
 						return
 					}
 					var tranProcessInfo = {}
-					tranProcessInfo.flag=0
+					tranProcessInfo.flag='1'
 					tranProcessInfo.id=that.freightspace[index].id
 					tranProcessInfo.infoId = that.detailData.infoId
 					tranProcessInfo.processId = that.detailData.id
@@ -527,7 +527,7 @@
 						return
 					}
 					var tranProcessInfo = {}
-					tranProcessInfo.flag=0
+					tranProcessInfo.flag='1'
 					tranProcessInfo.id=that.freightspace[index].id
 					tranProcessInfo.infoId = that.detailData.infoId
 					tranProcessInfo.processId = that.detailData.id
@@ -567,7 +567,7 @@
 						return
 					}
 					var tranProcessInfo = {}
-					tranProcessInfo.flag=0
+					tranProcessInfo.flag='1'
 					tranProcessInfo.id=that.freightspace[index].id
 					tranProcessInfo.infoId = that.detailData.infoId
 					tranProcessInfo.processId = that.detailData.id

pages/user/set_nickname.vue

@@ -4,9 +4,9 @@
 			昵称长度限制在2-24个字符内
 		</view>
 		<view class="editText">
-			<input placeholder="请输入昵称" name="input" v-model="nickname" class="texts"></input>
+			<input placeholder="请输入昵称" placeholder-color="#C6C6C6" name="input" v-model="nickname" class="texts"></input>
 		</view>
-		<view class="btn" @click="commit">
+		<view class="btn" :class="nickname.length==0?'':'btn-active'" @click="commit">
 			保存
 		</view>
 	</view>
@@ -113,6 +113,8 @@
 		padding-left: 20px;
 		margin-top: 10px;
 		padding-top: 12px;
+		border-top: 1px solid #C9C9CB;
+		border-bottom:1px solid #C9C9CB;
 	}
 
 	.texts {
@@ -121,17 +123,22 @@
 		font-size: 16px;
 		/* placeholder-style="font-size:18px" */
 	}
-
-	.btn {
-		width: 100%;
-		height: 50px;
-		background-color: #FFFFFF;
-		text-align: center;
-		color: #22C572;
-		font-size: 20px;
+	.btn{
+		width: 90%;
+		height: 46px;
+		font-size: 17px;
+		margin:0 auto;
 		margin-top: 16px;
 		border-radius: 20px;
-		line-height: 50px;
+		line-height: 46px;
 		font-weight: 500;
+		text-align: center;
+		background-color: #D8DAE0;
+		color: #fff;
+	}
+	.btn-active {
+		background-color: #FFFFFF;
+		color: #22C572;
+		
 	}
 </style>