2022-2-16

pages/activity/bargain/index.vue

@@ -49,7 +49,7 @@
 		getBargainUserCancel
 	} from "@/api/activity";
 	import {
-		userinfos
+		getUserInfo
 	} from '@/api/user.js';
 	import Loading from "@/components/Loading";
 
@@ -148,7 +148,7 @@
 			 */
 			getUserInfo: function() {
 				let that = this;
-				userinfos().then(res => {
+				getUserInfo().then(res => {
 					that.userInfo = res.data;
 				});
 			},

pages/activity/goods_bargain/index.vue

@@ -29,7 +29,7 @@
 		openBargainSubscribe
 	} from '@/utils/SubscribeMessage.js';
 	import {
-		userinfos,getBargainList
+		getUserInfo,getBargainList
 	} from '@/api/user.js';
 	import home from '@/components/home';
 	import {
@@ -93,7 +93,7 @@
 			 */
 			getUserInfo: function() {
 				let that = this;
-				userinfos({}).then(({ data }) => {
+				getUserInfo({}).then(({ data }) => {
 					that.$set(that, 'userInfo', data);
 				});
 			},

pages/money/pay.vue

@@ -338,7 +338,7 @@ export default {
 					// 保存订单号
 					obj.orderId = data.result.orderId;
 					// 判断是否为余额支付
-					if (obj.payName == 'yue') {
+					if (obj.payName == 'yue'||obj.payName == 'gp_now_money'||obj.payName == 'integral') {
 						if (status == 200 && data.status == 'SUCCESS') {
 							obj.paySuccessTo();
 						} else {

pages/money/wallet.vue

@@ -6,7 +6,7 @@
 				<view class="money">{{ money | getMoneyStyle }}</view>
 			</view>
 			<view class="moneyTx" @click="navto('/pages/money/recharge')">充值</view>
-			<view class="flex buttom-box">
+			<!-- <view class="flex buttom-box">
 				<view class="buttom" @click="navto('/pages/money/recharge')">
 					<view class="icon"><image class="icon-img" src="/static/icon/i5.png" mode="aspectFit"></image></view>
 					<text>充值</text>
@@ -16,7 +16,7 @@
 					<view class="icon"><image class="icon-img" src="/static/icon/i1.png" mode="aspectFit"></image></view>
 					<text>提现</text>
 				</view>
-			</view>
+			</view> -->
 		</view>
 		<view class="navbar">
 			<view v-for="(item, index) in navList" :key="index" class="nav-item" :class="{ current: tabCurrentIndex === index }" @click="tabClick(index)">{{ item.text }}</view>

pages/order/order.vue

@@ -189,8 +189,12 @@ export default {
 		},
 		// 订单支付
 		orderPay(e) {
+			let  url = '/pages/money/pay?type=1&ordid=' + e.order_id + '&money=' + e.pay_price;
+			if(e.is_gp==1){
+				url+=`&is_gp=1`
+			}
 			uni.navigateTo({
-				url: '/pages/money/pay?type=1&ordid=' + e.order_id + '&money=' + e.pay_price
+				url
 			});
 		},
 		//获取订单列表

pages/public/wxLogin.vue

@@ -4,7 +4,7 @@
 		<image class="bg-img" ：src="/static/img/img09.png" mode=" scaleToFill"></image>
 		<view class="logo-img-box">
 			<image class="logo-img" src="/static/img/img10.png" mode=" aspectFit"></image>
-			<button class="userInfo" type="warn" open-type="getUserInfo" @getuserinfo="userInfoData">
+			<button class="userInfo" type="warn" open-type="getUserInfo" @click="userInfoData">
 				<text class="iconfont iconweixin"></text>
 				<text>微信授权登录</text>
 			</button>
@@ -143,11 +143,11 @@ export default {
 					// 保存返回用户数据
 					obj.setUserInfo(e.data);
 					obj.ToIndex();
-					// if (e.data.phone == null || !e.data.phone ) {
-					// 	obj.MaskShow = true;
-					// } else {
-					// 	obj.ToIndex();
-					// }
+					if (e.data.phone == null || !e.data.phone ) {
+						obj.MaskShow = true;
+					} else {
+						obj.ToIndex();
+					}
 				})
 				.catch(e => {
 					uni.hideLoading();

pages/user/user.vue

@@ -153,7 +153,7 @@
 import { mapState, mapMutations } from 'vuex';
 import uniList from '@/components/uni-list/uni-list.vue';
 import uniListItem from '@/components/uni-list-item/uni-list-item.vue';
-import { orderData, userinfo } from '@/api/user.js';
+import { orderData, getUserInfo } from '@/api/user.js';
 import { saveUrl, interceptor } from '@/utils/loginUtils.js';
 let startY = 0,
 	moveY = 0,
@@ -222,7 +222,7 @@ export default {
 		...mapMutations('user', ['setUserInfo', 'setOrderInfo']),
 		// 加载初始数据
 		loadBaseData() {
-			userinfo({})
+			getUserInfo({})
 				.then(({ data }) => {
 					this.setUserInfo(data);
 					// 获取用户数据完毕后在获取订单数据防止多次跳转到登录页

store/index.js

@@ -6,7 +6,7 @@ Vue.use(Vuex)
 const store = new Vuex.Store({
 	state: {
 		// baseURL:"http://yrh.liuniu946.com",//'http://eb.shuibo.net',//请求地址配置 
-		baseURL:'http://wj.liuniu946.com',//请求地址配置 
+		baseURL:'http://gp.liuniu946.com',//请求地址配置 
 		urlFile:'/index',//项目部署所在文件夹
 		loginInterceptor:false,//是否打开强制登录
 		// #ifdef H5 || MP-WEIXIN