Przeglądaj źródła

用户体系V6.2.0

zhengjinyi 5 lat temu
rodzic
commit
3d9a5ca28d

+ 1 - 1
api/use.js

@@ -272,7 +272,7 @@ export function queryHomeInfo(params) {
 export function userInfoLogin(params) {
 	return new Promise(function(resolve,reject) {
 		request.post('/club/authorization',params,false, res => {
-			if(res.code == 0){
+			if(res.code == 0 || res.code == 4){
 				resolve(res)
 			}else{
 				reject(res)

+ 1 - 1
common/config/config.js

@@ -1,7 +1,7 @@
 let URL_CONFIG = ""
 if(process.env.NODE_ENV === 'development'){
     // 开发环境
-	// URL_CONFIG = 'http://192.168.1.26:8008'	 //裴裴联调地址
+	// URL_CONFIG = 'http://192.168.1.22:8008'	 //裴裴联调地址
 	// URL_CONFIG = 'http://192.168.1.24:8008'	 //俊俊联调地址
     URL_CONFIG = 'https://spi-b.caimei365.com'//采美测试地址
 }else{

+ 1 - 1
components/module/orderDetails/invoiceTent.vue

@@ -4,7 +4,7 @@
 		 <view class="invoice-content">
 		 	<view class="invoice-title">发票信息</view>
 			<view class="invoice-empty" v-if="isEmpty">
-			 	<text>无</text>
+			 	<text>无<text class="txt">(请到个人中心页面填写发票信息)</text></text>
 			</view>
 			<view class="invoice-text" v-else>
 				<view class="invoice-top" @click="showInvoice">

+ 9 - 0
components/module/productDetails/recommend.vue

@@ -128,6 +128,15 @@
 .recommend{
 	background: #FFFFFF;
 	width: 100%;
+	.recommend-empty{
+		width: 702rpx;
+		height: 100rpx;
+		line-height: 100rpx;
+		padding: 0 24rpx;
+		font-size: $font-size-32;
+		color: #999999;
+		text-align: center;
+	}
 	.recommend-list{
 		width: 702rpx;
 		height: auto;

+ 3 - 1
pages/user-module/bindemail.vue

@@ -78,7 +78,7 @@
 						email:this.bindEmail,
 						code:this.bindEmailCode
 				}
-				bindingEmail(params).then(res =>{
+				bindingEmail(params).then(response =>{
 					if(this.loginPath == 1){
 						uni.switchTab({
 							url:'/pages/tabBar/user/user'
@@ -86,6 +86,8 @@
 					}else{
 						this.$api.navigateTo(`/pages/user-module/bindwechat?data=${JSON.stringify(this.getOption)}&type=${this.loginType}`)
 					}
+				}).catch(response =>{
+					this.$util.msg(response.msg,2000)
 				})
 			},
 			bindEmailNone(){

+ 3 - 2
pages/user-module/bindwechat.vue

@@ -178,8 +178,10 @@
 			       		},1000)
 			      	}
 				}).catch( res =>{
+					console.log(res)
 					this.$util.msg(res.msg,2000)
-					this.isMobileDisabled = false;
+					this.isMobileDisabled = false	
+					console.log(this.isMobileDisabled)
 				})
 			},
 			bindingWechatLogin(){//获取用户基本信息登录
@@ -299,7 +301,6 @@
 						border-radius: 14rpx;
 						color: #FFFFFF;
 						background: $btn-confirm;
-						
 					}
 					&.disabled{
 						background: #F7F7F7;

+ 2 - 2
pages/user-module/login-accont.vue

@@ -155,8 +155,8 @@
 				position: absolute;
 				right: 0;
 				top: 0;
-				font-size: 46rpx;
-				color: $color-system;
+				font-size: 44rpx;
+				color: #999999;
 				font-weight: bold;
 				z-index: 99;
 				width: 96rpx;

+ 2 - 2
pages/user-module/password.vue

@@ -328,8 +328,8 @@
 						position: absolute;
 						right: 0;
 						top: 0;
-						font-size: 46rpx;
-						color: $color-system;
+						font-size: 44rpx;
+						color: #999999;
 						font-weight: bold;
 						z-index: 99;
 						width: 96rpx;

+ 2 - 1
pages/user/operator/addoperator.vue

@@ -62,7 +62,8 @@
 						mobile:this.clubMobile,
 						linkName:this.linkman,
 						userID:this.userID,
-						clubID:this.clubID
+						clubID:this.clubID,
+						configFlag:2
 					}
 				addOperator(params).then(response =>{
 					this.$util.msg('添加成功',2000);

+ 8 - 0
pages/user/operator/list.vue

@@ -324,12 +324,20 @@
 			height: 92rpx;
 			padding: 34rpx 0;
 			.title{
+				width: 100rpx;
 				float: left;
 				font-size: $font-size-36;
 				color: $text-color;
 				line-height: 92rpx;
 				text-align: left;
 				margin-left: 20rpx;
+				-o-text-overflow: ellipsis;
+				text-overflow: ellipsis;
+				display: -webkit-box;
+				word-break: break-all;
+				-webkit-box-orient: vertical;
+				-webkit-line-clamp: 1;
+				overflow: hidden;
 			}
 			.head{
 				width: 92rpx;