la

pages/public/login.vue

@@ -35,8 +35,13 @@
 			<!-- #ifdef APP-PLUS -->
 			<!-- <block v-if="!is_ios">
 				<view class="weixin" @click="wecahtLogin"><image src="/static/img/img05.png" mode="scaleToFill"></image></view>
+<<<<<<< HEAD
 				<view class="weixin_text" @click="wecahtLogin">微信登录</view>
 			</block>
+=======
+				<!-- <view class="weixin_text" @click="wecahtLogin">微信登录</view> -->
+			<!-- </block>
+>>>>>>> 096bfe13572299bb8c079d664b260aed0d2398c9
 			<block v-else>
 				<view class="ios_login flex" @click="wecahtLogin('weixin')">
 					<text class="iconfont iconweixin"></text>

pages/user/registerList.vue

@@ -70,7 +70,7 @@
 							<image src="../../static/img/x.png" mode="aspectFill"></image>
 						</view>
 					</view>
-					<view class="paybox-main flex">
+					<!-- <view class="paybox-main flex">
 						<view class="zftype flex">
 							<image src="../../static/img/weixin.png" mode="aspectFill"></image>
 							<view class="zf">微信支付</view>
@@ -79,7 +79,7 @@
 							<radio style="transform:scale(0.7)" value="" :checked="paytype == 'weixin'" color="#5dbc7c">
 							</radio>
 						</label>
-					</view>
+					</view> -->
 					<view class="paybox-main flex">
 						<view class="zftype flex">
 							<image src="../../static/img/yue.png" mode="aspectFill"></image>
@@ -325,13 +325,14 @@
 					from: 'app' //来源
 					// #endif
 				}
+				obj.$refs.popupPay.close();
 				payRegister(data, id).then(res => {
 					uni.hideLoading()
 					uni.showToast({
 						title: '支付成功',
 						duration: 2000
 					});
-					let s = obj.registerList[obj.tabCurrentIndex].list.indexOf(item);
+					let s = obj.registerList[obj.tabCurrentIndex].list.indexOf(obj.payitem);
 					obj.registerList[obj.tabCurrentIndex].list.splice(s, 1);
 				}).catch(err => {
 					uni.hideLoading()

utils/loginUtils.js

@@ -1,59 +1,59 @@
-export function getActionPage() {
-	let pages = getCurrentPages();
-	return pages[pages.length - 1]
-}
-//登录拦截
-export function interceptor() {
-	let pages = getActionPage();
-	// 获取当前页面
-	let pageUrl = '/' + pages.route;
-	let url = '/pages/public/login'
-	// #ifdef H5
-	// 判断是否为公众号调用微信授权登录
-	let weichatBrowser = uni.getStorageSync('weichatBrowser');
-	if (weichatBrowser) {
-		url = '/pages/public/wxLogin';
-	}
-	// #endif
-	// #ifdef MP-WEIXIN
-	url = '/pages/public/wxLogin';
-	// #endif
-	if (pageUrl != url) {
-		uni.navigateTo({
-			url
-		})
-	}
-}
-
-// 保存页面
-export function saveUrl() {
-	let path = getPageUrl(true)
-	uni.setStorageSync('present', path);
-}
-
-// 处理分享链接地址
-export function getPageUrl(showSpeard=false) {
-	let page = getActionPage();
-	let path = '/' + page.route;
-	let url = '';
-	// 获取对象可枚举键值列表
-	let objKeys = Object.keys(page.options);
-	// 判断有无传值
-	if (objKeys.length > 0) {
-		// 循环赋值对象数据
-		for (let a in page.options) {
-			// 判断有无邀请人
-			if (a != 'speard') {
-				url += a + "=" + page.options[a] + "&"
-			}else{
-				// 判断是否需要存储邀请人
-				if(showSpeard){
-					url += a + "=" + page.options[a] + "&"
-				}
-			}
-		}
-		path += '?' + url.substr(0, url.length - 1);
-	}
-	// 返回处理邀请人后的邀请地址
-	return path
-}
+export function getActionPage() {
+	let pages = getCurrentPages();
+	return pages[pages.length - 1]
+}
+//登录拦截
+export function interceptor() {
+	let pages = getActionPage();
+	// 获取当前页面
+	let pageUrl = '/' + pages.route;
+	let url = '/pages/public/login'
+	// #ifdef H5
+	// 判断是否为公众号调用微信授权登录
+	let weichatBrowser = uni.getStorageSync('weichatBrowser');
+	if (weichatBrowser) {
+		url = '/pages/public/wxLogin';
+	}
+	// #endif
+	// #ifdef MP-WEIXIN
+	url = '/pages/public/wxLogin';
+	// #endif
+	if (pageUrl != url) {
+		uni.navigateTo({
+			url
+		})
+	}
+}
+
+// 保存页面
+export function saveUrl() {
+	let path = getPageUrl(true)
+	uni.setStorageSync('present', path);
+}
+
+// 处理分享链接地址
+export function getPageUrl(showSpeard=false) {
+	let page = getActionPage();
+	let path = '/' + page.route;
+	let url = '';
+	// 获取对象可枚举键值列表
+	let objKeys = Object.keys(page.options);
+	// 判断有无传值
+	if (objKeys.length > 0) {
+		// 循环赋值对象数据
+		for (let a in page.options) {
+			// 判断有无邀请人
+			if (a != 'speard') {
+				url += a + "=" + page.options[a] + "&"
+			}else{
+				// 判断是否需要存储邀请人
+				if(showSpeard){
+					url += a + "=" + page.options[a] + "&"
+				}
+			}
+		}
+		path += '?' + url.substr(0, url.length - 1);
+	}
+	// 返回处理邀请人后的邀请地址
+	return path
+}