Merge branch 'master' of https://git.banshouhui.com/lijundan/self-support

src/pages/order/complete.vue

@@ -78,12 +78,12 @@
             </view>
             <view class="btn-wrap flex-xc">
 				<u-button class="btn-submit" @click="saveComplete"
-				    type="primary" shape="circle" :hover-class="submitStatus ? '' : 'none'">
+				    type="primary" shape="circle" :custom-style="customStyle" :hover-class="submitStatus ? '' : 'none'">
 				    暂存
 				</u-button>
 				<u-button class="btn-submit" @click="orderFinish" v-if="tabIndex===list.length - 1"
-				    type="primary" shape="circle" :hover-class="submitStatus ? '' : 'none'">
-				    交付
+				    type="primary" shape="circle" :custom-style="buttonStyle" :hover-class="submitStatus ? '' : 'none'">
+				    完工
 				</u-button>
                 <u-button class="btn-submit" @click="nextStep" :custom-style="buttonStyle" v-else
                     type="primary" shape="circle" :hover-class="submitStatus ? '' : 'none'">
@@ -212,19 +212,33 @@
                 return this.submitBtnStatus ? {
                     'color': '#FFFFFF',
                     'background-color': '#2272FF;',
-                    'width': '600rpx',
+                    'width': '300rpx',
                     'height': '104rpx',
                     'font-size': '32rpx',
-                    'font-weight': 'bold'
+                    'font-weight': 'bold',
+					'margin-left': '50rpx'
                 } : {
                     'color': '#FFFFFF',
                     'background-color': '#D1D4D4;',
-                    'width': '600rpx',
+                    'width': '300rpx',
                     'height': '104rpx',
                     'font-size': '32rpx',
-                    'font-weight': 'bold'
+                    'font-weight': 'bold',
+					'margin-left': '50rpx'
                 }
-            }
+            },
+			customStyle() {
+				return {
+					'background-color': '#D1D4D4',
+					'width': '300rpx',
+					'height': '104rpx',
+					'background-color': 'transparent',
+					'border': '1px solid #2272FF',
+					'color': '#2272FF',
+					'font-weight': 'bold',
+					'font-size': '32rpx',
+				}
+			},
         },
         methods: {
 			getCompleteData() {//获取工单配置的完工项目
@@ -501,8 +515,6 @@
     }
 
     .class-item {
-        padding: 50rpx;
-		margin-bottom: 30rpx;
 		background-color: #fff;
 		padding: 30rpx;
 		border-radius: 8rpx;
@@ -658,7 +670,7 @@
     /*提交按钮*/
     .btn-wrap {
         width: 100%;
-        padding: 20rpx 0 40rpx 0;
+        padding: 20rpx 0 44rpx 0;
 		display: flex;
 		justify-content: center;
 		align-items: center;