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

take-order/pages/photo/index.vue

@@ -12,8 +12,8 @@
 				</view>
 			</template>
 		</view>
-		<button class="ph-pr-button" type="primary" @click="handleClick" :disabled="!selectedAll"
-			:style="buttonStyle">下一步</button>
+		<u-button class="ph-pr-button" type="primary" shape="circle" @click="handleClick"
+			:hover-class="selectedAll ? '' : 'none'" :custom-style="buttonStyle">下一步</u-button>
 	</view>
 </template>
 
@@ -53,8 +53,17 @@
 				]
 			},
 			buttonStyle() {
-				return this.selectedAll ? 'color: #FFFFFF;background-color: #2272FF;' :
-					'color: #FFFFFF;background-color: #D1D4D4;'
+				return this.selectedAll ? {
+					'color': '#FFFFFF',
+					'background-color': '#2272FF;',
+					'width': '600rpx',
+					'height': '104rpx'
+				} : {
+					'color': '#FFFFFF',
+					'background-color': '#D1D4D4;',
+					'width': '600rpx',
+					'height': '104rpx'
+				}
 			}
 		},
 		onLoad(e) {
@@ -120,10 +129,13 @@
 			// 点击下一步
 			handleClick() {
 				// 点击下一步设置全局拍照品牌品类
+				if (!this.selectedAll) {
+					return
+				}
 				const globalData = getApp().globalData
 				if (!globalData.token) {
 					uni.navigateTo({
-						url:'/pages/login/wxlogin'
+						url: '/pages/login/wxlogin'
 					})
 					return
 				}
@@ -216,10 +228,6 @@
 	.ph-pr-button {
 		position: absolute;
 		bottom: 76rpx;
-		border-radius: 52rpx;
-		height: 104rpx;
 		font-size: 32rpx;
-		width: 600rpx;
-		line-height: 104rpx;
 	}
 </style>