Merge branch 'master' of http://8.134.10.79:3000/Leadfyy.co/ec.uniapp-master

pages/aboutpay/confirmcash.vue

@@ -23,18 +23,21 @@
 					</countdown-timer>
 				</view>
 				<view>
-					<button class="confirmcash-btn" hover-class="lf-opacity" @click="offlinePay">确认</button>
+					<button class="confirmcash-btn" hover-class="lf-opacity" @click="confirm">确认</button>
 				</view>
 			</view>
 		</view>
+		<lf-pay-password v-if="show_pay" @comfirm="payComfirm" title="请输入支付密码"></lf-pay-password>
 	</view>
 </template>
 
 <script>
 	import countdownTimer from '@/components/countdown-timer/countdown-timer';
+	import lfPayPassword from '@/components/lf-payPassword/lf-payPassword.vue'
 	export default {
 		components: {
-			countdownTimer
+			countdownTimer,
+			lfPayPassword
 		},
 		data() {
 			return {
@@ -42,7 +45,9 @@
 				amount: 0,
 				clerk_id: 0,
 				brand_id: 0,
-				is_date_end: false
+				is_date_end: false,
+				show_pay: false,
+				pay_pwd: '' // 支付密码
 			}
 		},
 		onLoad(options){
@@ -55,7 +60,8 @@
 				console.log("倒计时结束");
 				this.is_date_end = true;
 			},
-			offlinePay(){
+			// 确认
+			confirm(){
 				if(this.amount == 0){
 					return this.$msg('支付金额不能为0');
 				}
@@ -68,18 +74,32 @@
 					});
 					return;
 				};
+				this.show_pay = true;
+			},
+			// 密码输入完毕
+			payComfirm(event){
+				this.show_pay = false;
+				this.pay_pwd = event;
+				this.offlinePay();
+			},
+			offlinePay(){
+				uni.showLoading({
+					title: '正在支付中'
+				})
 				let token = this.$cookieStorage.get('user_token');
 				this.$http.post({
 					api: 'api/offline/pay',
 					data: {
 						clerk_id: this.clerk_id,
 						brand_id: this.brand_id,
-						amount: this.amount
+						amount: this.amount,
+						pay_pwd: this.pay_pwd
 					},
 					header: {
 						Authorization: token
 					}
 				}).then(res => {
+					uni.hideLoading();
 					if(res.data.code == 200){
 						this.$url('/pages/aboutpay/paystate?payState=1&amount='+ this.amount);
 					}else{
@@ -87,7 +107,7 @@
 							this.$url('/pages/aboutpay/paystate?payState=0');
 						})
 					}
-				})
+				}).catch(err => uni.hideLoading())
 			}
 		}
 	}

pages/business/center/center.vue

@@ -111,6 +111,8 @@
 					</view>
 				</view>
 			</view>
+			<button class="out-btn" hover-class="lf-opacity" @click="outLogin">退出登录</button>
+			<view style="height: 30rpx;"></view>
 		</block>
 	</view>
 </template>
@@ -218,6 +220,21 @@
 				}).then(res => {
 					this.$msg(res.data.message || '自提核销成功');
 				})
+			},
+			// 退出登录
+			outLogin(){
+				uni.showModal({
+					title: '温馨提示',
+					content: '您确定退出登录商家中心吗？',
+					success: result => {
+						if(result.confirm){
+							this.$cookieStorage.clear('store_token');
+							this.$msg('退出成功', {icon: 'success'}).then(() => {
+								this.$toBack();
+							})
+						}
+					}
+				})
 			}
 		}
 	}
@@ -336,4 +353,16 @@
 			}
 		}
 	}
+	.out-btn{
+		width: 686rpx;
+		height: 90rpx;
+		background-color: #0D2E9A;
+		color: #FFFFFF;
+		font-size: 32rpx;
+		margin: 0 auto;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		margin-top: 60rpx;
+	}
 </style>