From e8754ab4e8a165f2953841f8c690a1dd1d0bc146 Mon Sep 17 00:00:00 2001
From: yangjie <812952667@qq.com>
Date: Tue, 31 Aug 2021 17:14:53 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=AF=B9=E6=8E=A5=E5=8D=A1=E5=8F=B7=E7=BB=91?=
 =?UTF-8?q?=E5=AE=9A=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Utils/Api.js                                  |   4 +
 pages.json                                    |  35 ++--
 pages/user/bindingCard/bindingCard.vue        | 180 +++++++-----------
 .../user/bindingCardList/bindingCardList.vue  |  25 +++
 static/css/login.scss                         |   7 +-
 5 files changed, 126 insertions(+), 125 deletions(-)
 create mode 100644 pages/user/bindingCardList/bindingCardList.vue

diff --git a/Utils/Api.js b/Utils/Api.js
index 02de670..0103d6e 100644
--- a/Utils/Api.js
+++ b/Utils/Api.js
@@ -160,6 +160,10 @@ export const getCmsContent = params => {
 /**
  * 工会卡
  */
+//根据卡号查询 
+export const getHuiLianTongCardByCardNo = params => {
+	return POST('GET', `${base}/highUserCard/getHuiLianTongCardByCardNo`, params).then(res => res.data);
+}
 // 获取用户卡号列表
 export const getUserCardList = params => {
 	return POST('GET', `${base}/highUserCard/getUserCardList`, params).then(res => res.data);
diff --git a/pages.json b/pages.json
index deeaccf..a2f5cf6 100644
--- a/pages.json
+++ b/pages.json
@@ -1,6 +1,6 @@
 {
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
-		{
+	{
 			"path": "pages/tabBar/home/home",
 			"style": {
 				"navigationBarTextStyle": "white",
@@ -476,7 +476,29 @@
             }
             
         }
-        ,{
+        ,	{
+		    "path" : "pages/user/bindingCard/bindingCard",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "綁定卡号",
+		        "navigationBarBackgroundColor": "#0083f5",
+		        "backgroundColorTop": "#0083f5",
+		        "navigationBarTextStyle": "white",
+		        "enablePullDownRefresh": false
+		    }
+		    
+		},{
+		    "path" : "pages/user/bindingCardList/bindingCardList",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "卡列表",
+		        "navigationBarBackgroundColor": "#0083f5",
+		        "backgroundColorTop": "#0083f5",
+		        "navigationBarTextStyle": "white",
+		        "enablePullDownRefresh": false
+		    }
+		    
+		},{
             "path" : "pages/user/unionCard/unionCard",
             "style" :                                                                                    
             {
@@ -489,15 +511,6 @@
             }
             
         }
-        ,{
-            "path" : "pages/user/bindingCard/bindingCard",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
-            }
-            
-        }
     ],
 
 	"globalStyle": {
diff --git a/pages/user/bindingCard/bindingCard.vue b/pages/user/bindingCard/bindingCard.vue
index c51251e..438758d 100644
--- a/pages/user/bindingCard/bindingCard.vue
+++ b/pages/user/bindingCard/bindingCard.vue
@@ -1,30 +1,20 @@
 <template>
 	<view>
-		<view class="logo">
-			<view class="img">
-				<image mode="widthFix"
-					src="data:image/png;base64,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">
-				</image>
-			</view>
-		</view>
-		<view class="form re">
+		<view class="form re" style="top: 100rpx;">
 			<view class="username">
+				<input style="width: 100%;" :disabled="disStute" placeholder="请输入卡号" v-model="cardNoNumber"
+					placeholder-style="color: #333333;"/>
+			</view>
+			<view class="username" v-if="phoneNumber">
 				<view class="get-code" :style="{'color':getCodeBtnColor}" @click.stop="getCode()">{{getCodeText}}</view>
-				<input placeholder="请输入手机号" v-model="phoneNumber" placeholder-style="color: rgba(255,255,255,0.8);" />
+				<input disabled="true" v-model="phoneNumber" placeholder-style="color: #333333;" />
 			</view>
-			<view class="code">
-				<input placeholder="请输入验证码" v-model="code" placeholder-style="color: rgba(255,255,255,0.8);" />
+			<view class="code" v-if="phoneNumber">
+				<input placeholder="请输入验证码" v-model="code" placeholder-style="color: #333333;" />
 			</view>
-			<!-- 	<view class="password">
-				<input placeholder="请输入密码" v-model="passwd" password=true placeholder-style="color: rgba(255,255,255,0.8);"/>
-			</view> -->
-			<view class="btn mart50" v-if="Typeid == 1" @tap="doReg">立即注册</view>
-			<view class="btn mart50" v-else @tap="doReg">绑定手机号</view>
-			<!-- 	<view class="res">
-				<view @tap="toLogin">已有账号立即登录</view>
-			</view> -->
 
-			<image v-if="Typeid == 1" @click="openWx" :src="imagewxUrl+imgadres" class="wximg"></image>
+			<view class="btn mart50" @tap="bindHuiLianTongCard" v-if="phoneNumber">绑定卡号</view>
+			<view class="btn mart50" @tap="doCardNonum" v-else>获取预留手机号</view>
 		</view>
 
 	</view>
@@ -34,27 +24,23 @@
 	import md5 from "@/common/SDK/md5.min.js";
 	import {
 		sendSmsCode,
-		bindUserPhone,
-		H5login
+		getHuiLianTongCardByCardNo,
+		bindHuiLianTongCard
 	} from '../../../Utils/Api.js';
 	let app = getApp();
 	export default {
 		data() {
 			return {
+				cardNoNumber: "",
 				phoneNumber: "",
-				imagewxUrl: app.globalData.imageWxImg,
-				imgadres:'wx.png',
 				code: '',
-				passwd: "",
 				getCodeText: '获取验证码',
-				getCodeBtnColor: "#ffffff",
+				getCodeBtnColor: "#0083f5",
 				getCodeisWaiting: false,
-				Typeid: ''
+				disStute: false
 			}
 		},
-		onLoad(options) {
-			this.Typeid = options.id
-		},
+		onLoad(options) {},
 		methods: {
 			Timer() {},
 			getCode() {
@@ -78,7 +64,7 @@
 				sendSmsCode(params).then(res => {
 					if (res.return_code == '000000') {
 						this.getCodeisWaiting = true;
-						this.getCodeBtnColor = "rgba(255,255,255,0.5)"
+						this.getCodeBtnColor = "#999999"
 						uni.showToast({
 							title: '验证码已发送',
 							icon: "none"
@@ -95,7 +81,7 @@
 				this.Timer = setInterval(() => {
 					if (holdTime <= 0) {
 						this.getCodeisWaiting = false;
-						this.getCodeBtnColor = "#ffffff";
+						this.getCodeBtnColor = "#333333";
 						this.getCodeText = "获取验证码"
 						clearInterval(this.Timer);
 						return;
@@ -105,7 +91,37 @@
 
 				}, 1000)
 			},
-			doReg() {
+			//获取预留手机号
+			doCardNonum() {
+				if (!this.cardNoNumber) {
+					uni.showToast({
+						title: '请填写卡号',
+						icon: "none"
+					});
+					return false;
+				}
+				uni.showLoading({
+					title: '查询中...'
+				})
+				let params = {
+					cardNo: this.cardNoNumber
+				}
+				getHuiLianTongCardByCardNo(params).then(res => {
+					uni.hideLoading()
+					if (res.return_code == '000000') {
+						// this.phoneNumber = res.return_data.userMobile;
+						this.phoneNumber = 15583658692;
+						this.disStute = true
+					} else {
+						uni.showToast({
+							title: res.return_msg,
+							icon: "none"
+						});
+					}
+				})
+			},
+			//绑定卡号
+			bindHuiLianTongCard() {
 				uni.hideKeyboard()
 				//模板示例部分验证规则
 				if (!(/^1(3|4|5|6|7|8|9)\d{9}$/.test(this.phoneNumber))) {
@@ -126,88 +142,32 @@
 					title: '提交中...'
 				})
 				let params = {
+					cardNo: this.cardNoNumber,
 					phone: this.phoneNumber,
-					code: this.code
+					smsCode: this.code
 				}
-				if (this.Typeid == 1) {
-					H5login(params).then(res => {
-						uni.hideLoading()
-						if (res.return_code == '000000') {
-							app.globalData.userInfo = res.return_data
-								.object
-								.highUser;
-							app.globalData.token = res.return_data.uniqueCode;
-							uni.setStorage({
-								key: "user",
-								data: res.return_data
-									.object
-									.highUser
-							})
-							uni.setStorage({
-								key: "token",
-								data: res.return_data.uniqueCode
-							})
-							if (this.isWeiXinLogin()) {
-								//微信内核支付
-								location.href ='https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxa075e8509802f826&redirect_uri=https%3A%2F%2Fhsgcs.dctpay.com%2FH5%2Findex.html%23%2F&response_type=code&scope=snsapi_base&state=1#wechat_redirect'
-							}else{
-								uni.reLaunch({
-									url: '/pages/tabBar/home/home'
-								})
+				bindHuiLianTongCard(params).then(res => {
+					uni.hideLoading()
+					if (res.return_code == '000000') {
+						uni.showToast({
+							title: '绑定成功',
+							icon: "success",
+							duration: 2000,
+							success() {
+								setTimeout(() => {
+									uni.navigateBack({})
+								}, 1000)
 							}
-							
-						} else {
-							uni.showToast({
-								title: res.return_msg,
-								icon: "none"
-							});
-						}
-					})
-				} else {
-					bindUserPhone(params).then(res => {
-						uni.hideLoading()
-						if (res.return_code == '000000') {
-							app.globalData.userInfo = res.return_data
-								.object
-								.highUser;
-							app.globalData.token = res.return_data.uniqueCode;
-							uni.setStorage({
-								key: "user",
-								data: res.return_data
-									.object
-									.highUser
-							})
-							uni.setStorage({
-								key: "token",
-								data: res.return_data.uniqueCode
-							})
-							uni.navigateBack({})
-						} else {
-							uni.showToast({
-								title: res.return_msg,
-								icon: "none"
-							});
-						}
-					})
-				}
+						});
+					} else {
+						uni.showToast({
+							title: res.return_msg,
+							icon: "none"
+						});
+					}
+				})
 
 			},
-			//微信内核浏览器
-			isWeiXinLogin() {
-				var ua = navigator.userAgent.toLowerCase();
-				if (ua.search(/MicroMessenger/i) > -1) {
-					return true;
-				} else {
-					return false;
-				}
-			},
-		toLogin() {
-				uni.hideKeyboard()
-				uni.redirectTo({
-					url: 'login'
-				});
-				uni.navigateBack();
-			}
 		}
 	}
 </script>
diff --git a/pages/user/bindingCardList/bindingCardList.vue b/pages/user/bindingCardList/bindingCardList.vue
new file mode 100644
index 0000000..0d4c41f
--- /dev/null
+++ b/pages/user/bindingCardList/bindingCardList.vue
@@ -0,0 +1,25 @@
+<template>
+	<view>
+			<view class="height80 cardListcs width90"></view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style  lang="scss">
+	.cardListcs{
+		box-shadow: 0px 1px 7px 1px rgba(0, 0, 0, 0.14);
+		border-radius: 16rpx;
+	}
+</style>
diff --git a/static/css/login.scss b/static/css/login.scss
index 97e94e7..eddecf0 100644
--- a/static/css/login.scss
+++ b/static/css/login.scss
@@ -44,12 +44,11 @@ page {
 		margin-bottom: 26upx;
 		margin-top: 30px;
 		input {
-			width: 90%;
-			margin-left: 5%;
+			width: 60%;
 			height: 50upx;
 			font-size: 16px;
 			color: #333333;
-			font-weight: 200;
+			font-weight: blod;
 		}
 	}
 
@@ -84,7 +83,7 @@ page {
 					content: " ";
 					width: 1upx;
 					height: 50upx;
-					background-color: #333333;
+					// background-color: #333333;
 					position: absolute;
 					z-index: 3;
 					margin-right: 100%;