ソースを参照

commit 测试修复bug

zhengjinyi 4 年 前
コミット
27d5111674

+ 1 - 1
components/cm-module/orderDetails/orderInformation.vue

@@ -34,7 +34,7 @@
 					<view class="view-num" v-if="orderData.freePostFlag == '1'">运费:<label class="label">¥{{ orderData.freight | NumFormat}}</label></view>
 				</view>
 				<view class="information-view same">
-					<view class="view-man" >采美豆抵用运费:<label class="label">{{ orderData.userBeans }}</label></view>
+					<view class="view-man" >采美豆抵用运费:<label class="label">{{ orderData.userBeans }}</label></view>
 				</view>
 				<view class="information-view">
 					<view class="view-num">经理折扣:<label class="label">¥{{ orderData.discountFee =='undefined' ? '' : orderData.discountFee | NumFormat}}</label></view>

+ 1 - 1
pages/login/apply.vue

@@ -199,7 +199,7 @@
 		<!-- 提交审核提示弹窗 -->
 		<view class="tui-alert-box" v-if="isConfirmShow">
 			<view class="tui-alert-content">
-				<view class="tui-alert-main">升级信息提交成功,审核通过后您的身份将成为会员机构,并且获得<text class="red">100</text>采美豆的奖励</view>
+				<view class="tui-alert-main">升级信息提交成功,审核通过后您的身份将成为会员机构,并且获得<text class="red">20</text>采美豆的奖励</view>
 				<view class="tui-alert-btn" @click="handleClick">知道了</view>
 			</view>
 		</view>

+ 45 - 34
pages/login/information.vue

@@ -108,7 +108,7 @@
 					<view class="row-input">
 						<radio-group @change="bindPickerChange">
 							 <label class="label-radio" v-for="(item, index) in typename" :key="item.value">
-								 <radio class="row-radio" :value="item.value" :checked="item.value === firstClubType" color='#E15616'/>{{item.name }}
+								 <radio class="row-radio" :value="item.value" :checked="index === firstClubTypeCurrent" color='#E15616'/>{{item.name }}
 							 </label>
 						</radio-group>
 					</view>
@@ -259,40 +259,39 @@
 		},
 		data() {
 			return{
-				nvabarData: {//顶部自定义导航
-					showCapsule: 1, // 是否显示左上角图标  1表示显示  0表示不显示,
+				nvabarData: {			// 顶部自定义导航
+					showCapsule: 1, 	// 是否显示左上角图标  1表示显示  0表示不显示,
 					showSearch: 0,
-					title: '修改资料', // 导航栏 中间的标题
+					title: '修改资料', 	// 导航栏 中间的标题
 					haveBack:true,
 					textLeft:this.$store.state.isIphone
 				},
 				isIphoneX:this.$store.state.isIphoneX,
 				CustomBar:this.CustomBar,// 顶部导航栏高度
-				isPreviewImage:false,   	//预览图片开关
-				userId:'',					//用户ID
-				clubId:'',					//会所ID
-				userIdentity:'',			//机构用户类型
-				contractEmail:'',					//邮箱
-				name:'',	 			//机构名称
-				shortName:'',	 		//机构简称
-				linkMan:'',	 			//联系人
-				mobile:'',					//联系人手机号
-				socialCreditCode:'',	//统一社会信用代码
+				isPreviewImage:false,    // 预览图片开关
+				userId:'',				 // 用户ID
+				clubId:'',				 // 会所ID
+				userIdentity:'',		 // 机构用户类型
+				contractEmail:'',		 // 邮箱
+				name:'',	 			 // 机构名称
+				shortName:'',	 		 // 机构简称
+				linkMan:'',	 			 // 联系人
+				mobile:'',				 // 联系人手机号
+				socialCreditCode:'',	 // 统一社会信用代码
 				isDisabled:true,
 				isShowInput:true,
 				textareaFocus:false,
-				businessLicense:'',	//营业执照图片
-				shopPhoto:'',  	//门头照图片
-				medicalPracticeLicense:'', 	//资质照图片
-				department:'',			//科室
-				isDepartment:false,     //是否显示科室
-				secondClubType:'',		//机构类型二级分类
-				mainProduct:'',				//主营内容
-				clubTelePhone:'',		//固定电话
-				clubFax:'',				//传真
-				profile:'',		//公司简介
-				firstClubType:'',		//机构类型
-				firstClubType:0,
+				businessLicense:'',		 // 营业执照图片
+				shopPhoto:'',  			 // 门头照图片
+				medicalPracticeLicense:'',// 资质照图片
+				department:'',			 // 科室
+				isDepartment:false,      // 是否显示科室
+				secondClubType:'',		 // 机构类型二级分类
+				mainProduct:'',			 // 主营内容
+				clubTelePhone:'',		 // 固定电话
+				clubFax:'',				 // 传真
+				profile:'',				 // 公司简介
+				firstClubType:0,		 // 机构类型
 				organizationTypeText:'请选择机构类型',
 				beautyList:beautyList,
 				mentuzCampNullList:mentuzCampNullList,
@@ -301,16 +300,17 @@
 				medicaCampList:[],
 				typtIndex:0,
 				organizationType:0,
+				firstClubTypeCurrent:0, 
 				current:0,
-				isShowAustomItem:false, //是否显示其他添加
-				customItemValue:'', 	//自定义项目
+				isShowAustomItem:false,  // 是否显示其他添加
+				customItemValue:'', 	 // 自定义项目
 				isMainproCheck:false,
 				addressData:{
 					address:'请选择机构所在地区',
-					townId:'',			//区ID
-					cityId:'',			//市ID
-					provinceId:'',		//省ID
-					addressDetail: '',	//地址详情
+					townId:'',			 // 区ID
+					cityId:'',			 // 市ID
+					provinceId:'',		 // 省ID
+					addressDetail: '',	 // 地址详情
 				},
 				typename:[
 					{name:'医美',value:1},
@@ -419,6 +419,7 @@
 							profile : this.profile,
 						}		
 				}else{
+					console.log('isMainproCheck',this.isMainproCheck)
 					if(!this.isMainproCheck){
 						let mainproList = []
 						if(this.firstClubType == 1){
@@ -430,6 +431,7 @@
 								mainproList.push(item.name)
 							})
 						}
+						console.log('mainproList',mainproList)
 						this.mainProduct = mainproList.join('/')
 					}
 					if( this.contractEmail == ''){
@@ -456,6 +458,8 @@
 						this.$util.msg('请上传您的营业执照',2000);
 						return
 					}
+					console.log('mainProduct',this.mainProduct)
+					console.log('firstClubType',this.firstClubType)
 					if(this.firstClubType!=0){
 						if(this.mainProduct == ''){
 							this.$util.msg('请选择住机构主营内容',2000);
@@ -570,6 +574,12 @@
 			},
 			bindPickerChange(e) {
 				this.firstClubType = e.target.value;
+				for (let i = 0; i < this.typename.length; i++) {
+					if (this.typename[i].value === e.target.value) {
+						this.firstClubTypeCurrent = i;
+						break;
+					}
+				}
 				// let self = this
 				// uni.showActionSheet({
 				// 	title:'标题',
@@ -608,11 +618,12 @@
 			},
 			chooseMaleLike(e){
 				this.isMainproCheck = true
-				this.mainpro = this.checkLikes(e,this.mentuzCampList)
+				this.mainProduct = this.checkLikes(e,this.mentuzCampList)
 			},
 			chooseMaleLikes(e){
 				this.isMainproCheck = true
-				this.mainpro = this.checkLikes(e,this.medicaCampList)
+				this.mainProduct = this.checkLikes(e,this.medicaCampList)
+				
 			},
 			checkLikes(e,list){
 				let	values = e.detail.value

+ 8 - 8
pages/user/account/account-bean.vue

@@ -48,7 +48,7 @@
 					</view>
 					<view class="list-b">
 						<view class="t-t">{{ item.addTime }}</view>
-						<view class="t-t">{{ item.type =='1'? '收入' : '支出' }}</view>
+						<view class="t-t">{{ item.type =='1'? '获取' : '消耗' }}</view>
 					</view>
 				</view>
 				<!--加载loadding-->
@@ -104,16 +104,16 @@
 				hasNextPage: false,
 				pullFlag: true,
 				nomoreText: '上拉显示更多',
-				errorText:'本月没有任何采美豆收支记录',
+				errorText:'本月没有任何采美豆记录',
 				navList: [	
 					{state: 0,text: '全部'},
-					{state: 1,text: '收入'},
-					{state: 2,text: '支出'},
+					{state: 1,text: '获取'},
+					{state: 2,text: '消耗'},
 				],
 				isCheckObject:{
-					0:['','本月没有采美豆收支记录'],
-					1:[1, '本月没有采美豆收入记录!'],
-					2:[2, '本月没有采美豆支出记录!'],
+					0:['','本月没有采美豆记录'],
+					1:[1, '本月没有采美豆获取记录!'],
+					2:[2, '本月没有采美豆消耗记录!'],
 				},
 			}
 		},
@@ -206,7 +206,7 @@
 			tabClick(index){//tab点击
 				this.tabCurrentIndex = index;
 				this.listQuery.type = index;
-				this.pageNum = 1
+				this.listQuery.pageNum = 1
 				this.beansList = []
 				this.pullUpOn = true //隐藏
 				this.GetAccountInitData();

+ 6 - 2
pages/user/order/create-order.vue

@@ -119,7 +119,8 @@
 				payInfo:{},				  // 订单信息
 				rechargeGoods:null,		  // 判断订单里有定金商品或者充值商品时,余额抵扣部分不显示
 				freightBeansMoney:0,	  // 存储采美豆抵扣金额
-				hanldUserBeans:0		  // 抵扣的采美豆数	
+				hanldUserBeans:0,		  // 抵扣的采美豆数	
+				isCheckedBeans:false,     // 是否抵扣采美豆
 			}
 		},
 		onLoad(option){//商品数据
@@ -219,6 +220,7 @@
 						this.freightBeansMoney = data.freightBeansMoney
 						this.payAllPrice =this.allPrice + this.hanldFreight
 						this.attributePallPrice()
+						this.hanldFreightBeans(this.isCheckedBeans)
 						break
 					case -1:
 						this.hanldFreight = 0
@@ -226,11 +228,13 @@
 						this.freightBeansMoney = data.freightBeansMoney
 						this.payAllPrice = this.allPrice
 						this.attributePallPrice()
+						this.hanldFreightBeans(this.isCheckedBeans)
 						break
 				}
 			},
 			hanldFreightBeans(data){//是否勾选采美豆抵扣
-				if(data){
+				this.isCheckedBeans = data;
+				if(this.isCheckedBeans){
 					this.hanldUserBeans = this.freightBeansMoney*100
 					if(this.hanldFreePostFlag == 1){
 						this.payAllPrice = this.allPrice + this.hanldFreight - this.freightBeansMoney