1.修改样式

pages.json

@@ -497,7 +497,7 @@
 		    "path" : "pages/user/bindingCard/bindingCard",
 		    "style" :                                                                                    
 		    {
-		        "navigationBarTitleText": "绑定定卡号",
+		        "navigationBarTitleText": "绑定卡号",
 		        "navigationBarBackgroundColor": "#0083f5",
 		        "backgroundColorTop": "#0083f5",
 		        "navigationBarTextStyle": "white",

pages/goods/refuel-confirm/refuel-confirm.vue

@@ -59,7 +59,7 @@
 			<view class="line1"></view>
 			<view class="heightl60 paddleft10 fcor666 width100 backcorfff" @tap="paytype='gonghuika'">
 				<view class="width60 flleft fontwig6">
-					工会卡支付<text class="font14 fcor666 margle">余额: {{tongCardPrice}}元</text>
+					汇联通工会卡<text class="font14 fcor666 margle">余额: {{tongCardPrice}}元</text>
 				</view>
 				<view class="flright width30 fotct">
 					<radio :checked="paytype=='gonghuika'" @click="changeRiado()" color="#0083f5" />

pages/login/updatePas/updatePas.vue

@@ -9,8 +9,14 @@
 		<!-- 账号密码输入框 -->
 		<view class="form">
 			<view class="password">
-				<image src="../../../static/img/pas.png" style="width: 40rpx;height: 40rpx;"></image><input
+				<image src="../../../static/img/pas.png" style="width: 40rpx;height: 40rpx;margin-right: 10px;"></image>
-					placeholder="请输入密码" type="number" maxlength="6" v-model="passwd" password=true placeholder-style="color: #333333;" />
+				<input placeholder="请输入密码" type="number" maxlength="6" v-model="passwd" password=true
+					placeholder-style="color: #333333;" />
+			</view>
+			<view class="password">
+				<image src="../../../static/img/pas.png" style="width: 40rpx;height: 40rpx;margin-right: 10px;"></image>
+				<input placeholder="请确认密码" type="number" maxlength="6" v-model="qrpasswd" password=true
+					placeholder-style="color: #333333;" />
 			</view>
 			<view class="btn mart50" @tap="setUserPayPwd">确 认</view>
 		</view>
@@ -21,11 +27,12 @@
 	import {
 		setUserPayPwd
 	} from "../../../Utils/Api.js";
-	let app =getApp();
+	let app = getApp();
 	export default {
 		data() {
 			return {
 				passwd: '',
+				qrpasswd: ''
 			}
 		},
 		methods: {
@@ -36,8 +43,27 @@
 						title: '请填写密码',
 						icon: "none"
 					});
-					return false;
+					return;
+				}
+				if (this.qrpasswd == '') {
+					uni.showToast({
+						title: '请确认密码',
+						icon: "none"
+					});
+					return;
 				}
+				if (this.qrpasswd != this.passwd) {
+					uni.showToast({
+						title: '您输入的两次密码不相同',
+						icon: "none"
+					});
+					return;
+				}
+				uni.showModal({
+					title: '设置密码',
+					content: '是否确认设置密码',
+					success: (res) => {
+						if (res.confirm) {
 							uni.showLoading({
 								title: '设置中...'
 							})
@@ -50,7 +76,7 @@
 									uni.showToast({
 										title: '设置成功',
 										icon: "none",
-							duration:2000
+										duration: 2000
 									});
 									app.globalData.userInfo = res.return_data
 										.object
@@ -61,8 +87,7 @@
 											.object
 											.highUser
 									})
-						uni.navigateBack({
+									uni.navigateBack({})
-						})
 								} else {
 									uni.hideLoading();
 									uni.showToast({
@@ -71,14 +96,20 @@
 									})
 								}
 							})
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+						}
+					}
+				});
 			}
 		}
 	}
 </script>
 
 <style lang="scss">
-@import "../../../static/css/login.scss";
+	@import "../../../static/css/login.scss";
-.form {
+
+	.form {
 		.res {
 			display: flex;
 			justify-content: space-between;

pages/order/confirmation.vue

@@ -97,7 +97,7 @@
 			<view class="width94 line1 mart5 marb5" v-if="couponList.payType == 1 || couponList.payType==3 "></view>
 			<view class="height50 width100 backcorfff" @tap="paytype='gonghuika'">
 				<view class="width70 flleft fcor333 fontwig6 font16 text1" style="padding-left: 4%;">
-					工会卡支付<text class="font14 fcor666 margle">可用余额: {{tongCardPrice}}元</text>
+					汇联通工会卡<text class="font14 fcor666 margle">可用余额: {{tongCardPrice}}元</text>
 				</view>
 				<view class="width20 flright fotrt paddtright10 font15 fontwig6 fcor666 alijun"
 					style="align-items: center;">
@@ -106,7 +106,7 @@
 			</view>
 		</view>
 
-		<view class="width94 comorder mart10">
+		<!-- <view class="width94 comorder mart10">
 			<view class="height50 width100 backcorfff">
 				<view class="width80p flleft fcor333 fontwig6 font14" style="padding-left: 4%;">
 					<text style="color: #0083F5;">《条约协议》</text>点击立即支付，即代表同意
@@ -115,7 +115,7 @@
 					<image class="jtcs" src="../../static/img/jt.png"></image>
 				</view>
 			</view>
-		</view>
+		</view> -->
 
 		<view class="width100 height60"></view>
 		<view class="footer">

pages/pay/payment/payment.vue

@@ -34,7 +34,7 @@
 							<image style="border-radius: 50%;" src="../../../static/img/ghkpay.png"></image>
 						</view>
 						<view class="center">
-							工会卡支付(余额:{{tongCardPrice}}元)
+							汇联通工会卡(余额:{{tongCardPrice}}元)
 						</view>
 						<view class="right">
 							<radio :checked="paytype=='gonghuika'" @click="changeRiado()" color="#0083f5" />

pages/tabBar/home/home.vue

@@ -694,31 +694,45 @@
 						uni.navigateTo({
 							url:'../../userLogin/userLogin'
 						})
-						return false;
+						return;
+					}
+					if (!app.globalData.userInfo.phone) {
+						uni.navigateTo({
+							url:'../../userLogin/userLogin'
+						})
+						return;
 					}
 					uni.navigateTo({
 						url: '/pages/tabBar/order/order?id=1'
 					})
-
 				} else if (item.name == '电影票') {
-
 					if (!app.globalData.userInfo) {
 						uni.navigateTo({
 							url:'../../userLogin/userLogin'
 						})
-						return false;
+						return;
+					}
+					if (!app.globalData.userInfo.phone) {
+						uni.navigateTo({
+							url:'../../userLogin/userLogin'
+						})
+						return;
 					}
 					uni.navigateTo({
 						url: '/pages/tabBar/order/order?id=2'
 					})
-
-
 				} else if (item.name == '话费充值') {
 					if (!app.globalData.userInfo) {
 						uni.navigateTo({
 							url:'../../userLogin/userLogin'
 						})
-						return false;
+						return;
+					}
+					if (!app.globalData.userInfo.phone) {
+						uni.navigateTo({
+							url:'../../userLogin/userLogin'
+						})
+						return;
 					}
 					uni.navigateTo({
 						url: '/pages/tabBar/order/order?id=3'
@@ -738,7 +752,13 @@
 					uni.navigateTo({
 						url:'../../userLogin/userLogin'
 					})
-					return false;
+					return;
+				}
+				if (!app.globalData.userInfo.phone) {
+					uni.navigateTo({
+						url:'../../userLogin/userLogin'
+					})
+					return;
 				}
 				uni.navigateTo({
 					url: '/pages/tabBar/order/order?id=' + item

pages/tabBar/user/user.vue

@@ -249,7 +249,7 @@
 				this.czList = [{
 						url: '../../user/unionCard/unionCard',
 						text: '工会卡',
-						img: '../../../static/img/ghk.png'
+						img: '../../../static/img/ghkpay.png'
 					},
 					{
 						url: '../../login/updatePas/updatePas',
@@ -262,7 +262,7 @@
 			this.czList = [{
 					url: '../../user/unionCard/unionCard',
 					text: '工会卡',
-					img: '../../../static/img/ghk.png'
+					img: '../../../static/img/ghkpay.png'
 				},
 				{
 					url: '../../login/updatePas/resetPas',

pages/userLogin/userLogin.vue

@@ -1,13 +1,14 @@
 <template>
 	<view>
-		<image mode="widthFix" class="width90 mart20" src="../../static/img/login.png"></image>
+		<image mode="widthFix" class="width90 mart20" v-if="!user" :src="imagewxUrl+imgadres"></image>
+		<image mode="widthFix" class="width90 mart20" v-if="!user.phone && user" :src="imagewxUrl+imgadres1"></image>
 		<!-- #ifdef MP -->
-		<view class="mart30 width90 height50 fcorfff backcor008 fotct btns font16" v-if="!user" @click="getuserinfo">
+		<view class="mart30 width90 height50 fcorfff backcor008 fotct btns font16 fontlet" v-if="!user" @click="getuserinfo">
 			授权并登录</view>
-		<button class="mart30 width90 height50 fcorfff backcor008 fotct btns font16" v-if="!user.phone && user"
+		<button class="mart30 width90 height50 fcorfff backcor008 fotct btns font16 fontlet" v-if="!user.phone && user"
 			open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">授权手机号</button>
-		<button class="mart30 width90 height50 fcorfff backcor008 fotct btns font16" v-if="user.phone && user"
+		<!-- <button class="mart30 width90 height50 fcorfff backcor008 fotct btns font16" v-if="user.phone && user"
-			@click="reqmessage">授权获取消息通知</button>
+			@click="reqmessage">授权获取消息通知</button> -->
 		<!-- #endif -->
 		<!-- #ifdef H5 -->
 		<button class="mart30 width90 height50 fcorfff backcor008 fotct btns font16"
@@ -25,9 +26,15 @@
 	export default {
 		data() {
 			return {
-				user: ''
+				user: '',
+				imagewxUrl: app.globalData.imageWxImg,
+				imgadres: 'login.png',
+				imgadres1: 'loginphone.png',
 			}
 		},
+		onLoad() {
+			this.user = app.globalData.userInfo;
+		},
 		methods: {
 			getuserinfo() {
 				let that = this;
@@ -57,7 +64,10 @@
 									key: "token",
 									data: res.return_data.uniqueCode
 								})
-								if (res.return_data.object.highUser.phone) {}
+								if (res.return_data.object.highUser.phone) {
+									uni.navigateBack({
+									})
+								}
 							} else {
 								uni.showToast({
 									title: res.return_msg
@@ -75,17 +85,17 @@
 				that.isShowAuth = false
 			},
 			//获取订阅号授权
-			reqmessage() {
+			// reqmessage() {
-				uni.requestSubscribeMessage({
+			// 	uni.requestSubscribeMessage({
-					tmplIds: ['oUvaCPeeOg4wH6HTvCcSabU6FnzXUXOBXsqBYAPOV-U'],
+			// 		tmplIds: ['oUvaCPeeOg4wH6HTvCcSabU6FnzXUXOBXsqBYAPOV-U'],
-					success(res) {
+			// 		success(res) {
-						uni.navigateBack({})
+			// 			uni.navigateBack({})
-					},
+			// 		},
-					fail: (res) => {
+			// 		fail: (res) => {
-						uni.navigateBack({})
+			// 			uni.navigateBack({})
-					}
+			// 		}
-				})
+			// 	})
-			},
+			// },
 			// 微信获取手机号
 			getPhoneNumber(PhoneNumber) {
 				let params = {
@@ -100,6 +110,8 @@
 							icon: 'none',
 							duration: 2000
 						})
+						uni.navigateBack({
+						})
 						this.user = res.return_data.object.highUser;
 						app.globalData.userInfo = res.return_data
 							.object

uni.scss

@@ -87,6 +87,10 @@ $uni-font-size-paragraph:30upx;
   font-size: 13px;
 }
 
+.fontlet{
+	letter-spacing: 2px;
+}
+
 .font14 {
   font-size: 14px;
 }