Merge branch 'dev-photo-v2' of https://git.banshouhui.com/heyinchen/take_order into dev-photo-v2

take-order/pages/photo/setting.vue

@@ -24,7 +24,7 @@
 			<switch class="itemSwitch" :checked="item['enable']" @change="itemChange(item, ikey)" color="#007AFF" />
 		</view>
 		<u-popup border-radius="10" v-model="isPopShow" safe-area-inset-bottom :mask-close-able="false" mode="center"
-			width="690rp" height="600rpx">
+			width="690rpx" height="600rpx">
 			<view class="popCenterView">
 				<text class="popTitle">设置自定义项</text>
 				<view class="inputBackView">
@@ -48,12 +48,12 @@
 				<text class="popNoticeText u-m-t-20">示例：</text>
 				<text class="popNoticeText">工程队名称：蓝天工程队</text>
 				<view class="popBtnView">
-					<view class="popCancelBtn" @click="popCancelClick()">
-						<text class="popBtnText">取消</text>
-					</view>
-					<view class="popSaveBtn" @click="popSaveClick()">
-						<text class="popBtnText">保存</text>
-					</view>
+					<u-button :custom-style="customStyleCancel" hover-class="none" shape="circle" type="primary" @click="popCancelClick()">
+						取消
+					</u-button>
+					<u-button :custom-style="customStyleSave" shape="circle" type="primary" @click="popSaveClick()">
+						保存
+					</u-button>
 				</view>
 			</view>
 		</u-popup>
@@ -98,6 +98,21 @@
 			},
 			showTitleSwitch() {
 				return this.result['lower_right'].hasOwnProperty('title_text')
+			},
+			customStyleCancel() {
+				return {
+					'background-color': '#D1D4D4',
+					'width': '280rpx',
+					'height': '96rpx'
+				}
+			},
+			customStyleSave() {
+				return {
+					'background-color': '##2272FF',
+					'width': '280rpx',
+					'height': '96rpx',
+					'margin-left': '50rpx'
+				}
 			}
 		},
 		onLoad(e) {
@@ -395,10 +410,10 @@
 		width: 100%;
 		display: flex;
 		align-items: center;
-		justify-content: space-between;
+		justify-content: center;
 	}
 
-	.popCancelBtn {
+	/* .popCancelBtn {
 		background-color: #D1D4D4;
 		width: 280rpx;
 		height: 96rpx;
@@ -407,9 +422,9 @@
 		display: flex;
 		align-items: center;
 		justify-content: center;
-	}
+	} */
 
-	.popSaveBtn {
+/* 	.popSaveBtn {
 		background-color: #2272FF;
 		width: 280rpx;
 		height: 96rpx;
@@ -418,11 +433,11 @@
 		display: flex;
 		align-items: center;
 		justify-content: center;
-	}
+	} */
 
-	.popBtnText {
+/* 	.popBtnText {
 		font-size: 32rpx;
 		color: #FFFFFF;
 		font-weight: 600;
-	}
+	} */
 </style>