机构用户类型修改优化

api/use.js

@@ -62,7 +62,7 @@ export function organizationVerifyRegisterFirst(params) {
 	});
 }
 /**
- *机构注册提交审核
+ *机构升级会员机构
  */
 export function organizationRegister(params) {
 	return new Promise(function(resolve,reject) {
@@ -76,11 +76,11 @@ export function organizationRegister(params) {
 	})
 }
 /**
- *机构修改申请信息
+ *机构修改资料
  */
 export function organizationUpdateModifyInfo(params) {
 	return new Promise(function(resolve,reject) {
-		request.get('/user/club/applicationData',params, res => {
+		request.lodingGet('/user/club/applicationData',params, res => {
 			if(res.code == 0){
 				resolve(res)
 			}else{

components/cm-module/listTemplate/buyagainList.vue

@@ -9,7 +9,7 @@
 						<text class="list-details-title">{{item.name}}</text>
 						<text class="list-details-specs">规格：{{item.unit}}</text>
 						<text class="list-details-miniQuantity">起订量：{{item.ladderPriceFlag == '1' ? item.maxBuyNumber : item.minBuyNumber}}</text>
-<!-- 						<view class="list-details-price" v-if="item.price1TextFlag == 1">
+ 					<!--<view class="list-details-price" v-if="item.price1TextFlag == 1">
 							<view class="list-none">
 								<view class="price-small">未公开价格</view>
 							</view>

components/cm-module/listTemplate/commodityList.vue

@@ -19,7 +19,7 @@
 								</view>
 								<text v-else>￥<text class="price-larger">{{item.retailPrice?item.retailPrice.toFixed(2):'0.00'}}</text></text>
 							</view>
-							<view v-else>
+							<view v-if="userIdentity == 2">
 								<view class="price-larger" v-if="item.price1TextFlag == '1'">
 									<text class="txt">未公开价格</text>
 								</view>

components/cm-module/listTemplate/immediatelyList.vue

@@ -29,11 +29,11 @@
 						<text class="list-details-title">{{item.name}}</text>
 						<text class="list-details-specs">规格：{{item.unit?item.unit:''}}</text>
 						<text class="list-details-miniQuantity">起订量：{{item.minBuyNumber}}</text>
-<!-- 						<view class="list-details-price" v-if="item.price1TextFlag == 1">
+ 					<!--<view class="list-details-price" v-if="item.price1TextFlag == 1">
 							<view class="list-none">
 								<view class="price-small">未公开价格</view>
 							</view>
-						</view> -->
+						</view>-->	
 						<view class="list-details-price">
 							<view class="list-shop">
 								<view class="list-price" >

pages.json

@@ -175,7 +175,7 @@
 				"navigationStyle":"custom"
 			}
 		},{
-			"path": "pages/login/login",
+			"path": "pages/login/logincode",
 			"style": {
 				"navigationBarTitleText": "授权登录"
 			}
@@ -377,7 +377,18 @@
 					}
 				}
 			]
-		}
+		},
+		{
+			"root": "h5",
+			"pages": [
+				{
+					"path": "pages/activity/activity",
+					"style": {
+						"navigationBarTitleText": "活动名称"
+					}
+				}
+			]	
+		}			
 	],
 	"tabBar": {
 		"height":"80",

pages/login/apply.vue

@@ -420,7 +420,7 @@ import { mapMutations } from 'vuex';
 				organizationRegister(params).then(response =>{
 					this.$util.msg('您的升级申请已提交审核',2000);
 					setTimeout(()=>{
-						this.$api.switchTabTo('/pages/tabBar/home/home')
+						uni.navigateBack();
 					},2000)
 				}).catch(error =>{
 					this.$util.msg(error.msg,2000);
@@ -534,18 +534,16 @@ import { mapMutations } from 'vuex';
 				this.mainpro = this.checkLikes(e,this.medicaCampList)
 			},
 			checkLikes(e,list){
-				let items = list
 				let	values = e.detail.value
 				let arr = []
-				for (let i = 0, lenI = items.length; i < lenI; ++i) {
-					const item = items[i]
+				list.forEach(item => {
 					if(values.indexOf(item.value) >= 0){
 						this.$set(item,'checked',true)
 						arr.push(item.name)
 					}else{
 						this.$set(item,'checked',false)
 					}
-				}
+				})
 				return arr.join('/')
 			},
 			onBlurInput(e){//
@@ -561,7 +559,7 @@ import { mapMutations } from 'vuex';
 			setNewMainpro(arr){//回显处理主营内容
 				let _ARRAY = []
 				arr.split('/').forEach((item,index) =>{
-					let _OBJ = {value:index,name:item,checked:true}
+					let _OBJ = {value:(index+1).toString(),name:item,checked:true}
 					_ARRAY.push(_OBJ)
 				})
 				return _ARRAY

pages/login/information.vue

@@ -438,7 +438,7 @@
 				organizationUpdate(params).then(response =>{
 					this.$util.msg('修改成功',2000,true,'success')
 					setTimeout(()=>{
-						this.$api.switchTabTo('/pages/tabBar/user/user')
+						uni.navigateBack();
 					},2000)
 				}).catch(error =>{
 					this.$util.msg(error.msg,2000);
@@ -555,18 +555,16 @@
 				this.mainpro = this.checkLikes(e,this.medicaCampList)
 			},
 			checkLikes(e,list){
-				let items = list
 				let	values = e.detail.value
 				let arr = []
-				for (let i = 0, lenI = items.length; i < lenI; ++i) {
-					const item = items[i]
+				list.forEach(item => {
 					if(values.indexOf(item.value) >= 0){
 						this.$set(item,'checked',true)
 						arr.push(item.name)
 					}else{
 						this.$set(item,'checked',false)
 					}
-				}
+				})
 				return arr.join('/')
 			},
 			onBlurInput(e){//
@@ -582,7 +580,7 @@
 			setNewMainpro(arr){//回显处理主营内容
 				let _ARRAY = []
 				arr.split('/').forEach((item,index) =>{
-					let _OBJ = {value:index,name:item,checked:true}
+					let _OBJ = {value:(index+1).toString(),name:item,checked:true}
 					_ARRAY.push(_OBJ)
 				})
 				return _ARRAY

pages/login/register.vue

@@ -12,12 +12,12 @@
 					<input class="row-input" type="text" name="input" v-model="userName" placeholder="请输入联系姓名" maxlength="6"/>
 				</view>
 			</view>
-			<view class="register-row none clearfix">
+			<view class="register-row clearfix">
 				<view class="register-from">
 					<view class="label">手机号:</view>
 					<input class="row-input" type="number" name="input" v-model="bindMobile" placeholder="请输入手机号" maxlength="11"/>
 				</view>
-				<view class="register-tip"><text>提示：手机号可用作登陆账号</text></view>
+				<!-- <view class="register-tip"><text>提示：手机号可用作登陆账号</text></view> -->
 			</view>
 			<view class="register-row clearfix">
 				<view class="register-from imgcode">
@@ -600,18 +600,16 @@
 				this.mainpro = this.checkLikes(e,this.medicaCampList)
 			},
 			checkLikes(e,list){
-				let items = list
 				let	values = e.detail.value
 				let arr = []
-				for (let i = 0, lenI = items.length; i < lenI; ++i) {
-					const item = items[i]
+				list.forEach(item => {
 					if(values.indexOf(item.value) >= 0){
 						this.$set(item,'checked',true)
 						arr.push(item.name)
 					}else{
 						this.$set(item,'checked',false)
 					}
-				}
+				})
 				return arr.join('/')
 			},
 			agreeCheck() {

pages/tabBar/home/home.vue

@@ -316,6 +316,9 @@
 			navto(url){
 				this.$api.navigateTo(url)
 			},
+			swiperNavtopage(link){
+				this.$api.navigateTo(`/h5/pages/activity/activity?productID=4204&path=${link}`)
+			},
 			telPhoneTo(){
 				let self = this;
 				this.$api.get('/home/afterSale',{organizeID:this.userOrganizeID}, 

seller/pages/cart/buyagain.vue

@@ -91,13 +91,7 @@
 			},
 			changeCountAdd(){//popup弹窗数量增加按钮
 				this.number++
-				if(this.handleData.ladderPriceFlag == '1'){
-					this.handleData.ladderPriceList.forEach((item,index)=>{
-						if(this.number>=item.buyNum){
-							this.buyRetailPrice = item.buyPrice
-						}
-					})
-				}
+				this.calculatPerice()
 			},
 			changeCountSub(){//popup弹窗数量减按钮
 				if(this.number<=this.minBuyNumber){
@@ -107,13 +101,7 @@
 					return
 				}else{
 					this.number--
-					if(this.handleData.ladderPriceFlag == '1'){
-						this.handleData.ladderPriceList.forEach((item,index)=>{
-							if(this.number>=item.buyNum){
-								this.buyRetailPrice = item.buyPrice
-							}
-						})
-					}
+					this.calculatPerice()
 					this.isQuantity =false
 				}
 			 },
@@ -126,6 +114,16 @@
 					this.number = this.minBuyNumber
 				}else{
 					this.number = e.detail.value
+					this.calculatPerice()
+				}
+			},
+			calculatPerice(){//判断是否为阶梯价然后做计算价格处理
+				if(this.handleData.ladderPriceFlag == '1'){
+					this.handleData.ladderPriceList.forEach((item,index)=>{
+						if(this.number>=item.buyNum){
+							this.buyRetailPrice = item.buyPrice
+						}
+					})
 				}
 			},
 			getAddProductCart(){//增加购物车成功和toast弹窗提示成功

seller/pages/cart/immediately.vue

@@ -87,13 +87,7 @@
 			},
 			changeCountAdd(){//popup弹窗数量增加按钮
 				this.number++
-				if(this.handleData.ladderPriceFlag == '1'){
-					this.handleData.ladderPriceList.forEach((item,index)=>{
-						if(this.number>=item.buyNum){
-							this.buyRetailPrice = item.buyPrice
-						}
-					})
-				}
+				this.calculatPerice()
 			},
 			changeCountSub(){//popup弹窗数量减按钮
 				if(this.number<=this.minBuyNumber){
@@ -103,13 +97,7 @@
 					return
 				}else{
 					this.number--
-					if(this.handleData.ladderPriceFlag == '1'){
-						this.handleData.ladderPriceList.forEach((item,index)=>{
-							if(this.number>=item.buyNum){
-								this.buyRetailPrice = item.buyPrice
-							}
-						})
-					}
+					this.calculatPerice()
 					this.isQuantity =false
 				}
 			 },
@@ -122,6 +110,16 @@
 					this.number = this.minBuyNumber
 				}else{
 					this.number = e.detail.value
+					this.calculatPerice()
+				}
+			},
+			calculatPerice(){//判断是否为阶梯价然后做计算价格处理
+				if(this.handleData.ladderPriceFlag == '1'){
+					this.handleData.ladderPriceList.forEach((item,index)=>{
+						if(this.number>=item.buyNum){
+							this.buyRetailPrice = item.buyPrice
+						}
+					})
 				}
 			},
 			getAddProductCart(){//增加购物车成功和toast弹窗提示成功

seller/pages/club/club-list.vue

@@ -107,7 +107,7 @@
 				this.initclubList()
 			},
 			initclubList(){
-				let params = {name:this.searchInputVal,pageNum:1,pageSize:this.pageSize,spId:this.serviceProviderId,status:90}
+				let params = {userIdentity:'',name:this.searchInputVal,pageNum:1,pageSize:this.pageSize,spId:this.serviceProviderId,status:90}
 				getSellerClubList(params).then(response =>{
 					let responseData = response.data
 					if(responseData.results&&responseData.results.length > 0){
@@ -133,7 +133,7 @@
 			},	
 			getOnReachBottomData(){
 				this.pageNum+=1
-				let params = {name:this.searchInputVal,pageNum:this.pageNum,pageSize:this.pageSize,spId:this.serviceProviderId,status:90}
+				let params = {userIdentity:'',name:this.searchInputVal,pageNum:this.pageNum,pageSize:this.pageSize,spId:this.serviceProviderId,status:90}
 				getSellerClubList(params).then(response =>{
 					let responseData = response.data
 					if(responseData.results&&responseData.results.length > 0){

seller/pages/login/apply.vue

@@ -409,8 +409,7 @@ import { mapMutations } from 'vuex';
 					}else{
 						if(this.firstClubType == '1'){
 							this.mentuzCampList = this.setNewMainpro(organizationClub.mainpro)
-							this.medicaCampList = this.medicaCampNullList
-							
+							this.medicaCampList = this.medicaCampNullList							
 						}else{
 							this.medicaCampList = this.setNewMainpro(organizationClub.mainpro)
 							this.mentuzCampList = this.mentuzCampNullList
@@ -452,7 +451,7 @@ import { mapMutations } from 'vuex';
 				}
 			},
 			clubUpgradeApi(){
-				if(!this.isMainproCheck){
+				if(this.isMainproCheck){
 					let mainproList = []
 					if(this.firstClubType == '1'){
 						this.mentuzCampList.forEach(item =>{
@@ -493,13 +492,13 @@ import { mapMutations } from 'vuex';
 					this.$util.msg('请上传您的营业执照',2000);
 					return
 				}
+				console.log(this.isOrganizationType)
 				if(this.isOrganizationType!=0){
 					if(this.mainpro == ''){
 						this.$util.msg('请选择住机构主营内容',2000);
 						return
 					}
 				}
-				
 				let params = {
 						userID:this.userID,
 						clubID:this.clubID,		//会所ID	
@@ -640,18 +639,16 @@ import { mapMutations } from 'vuex';
 				this.mainpro = this.checkLikes(e,this.medicaCampList)
 			},
 			checkLikes(e,list){
-				let items = list
 				let	values = e.detail.value
 				let arr = []
-				for (let i = 0, lenI = items.length; i < lenI; ++i) {
-					const item = items[i]
+				list.forEach(item => {
 					if(values.indexOf(item.value) >= 0){
 						this.$set(item,'checked',true)
 						arr.push(item.name)
 					}else{
 						this.$set(item,'checked',false)
 					}
-				}
+				})
 				return arr.join('/')
 			},
 			onBlurInput(e){//
@@ -667,7 +664,7 @@ import { mapMutations } from 'vuex';
 			setNewMainpro(arr){//回显处理主营内容
 				let _ARRAY = []
 				arr.split('/').forEach((item,index) =>{
-					let _OBJ = {value:index,name:item,checked:true}
+					let _OBJ = {value:(index+1).toString(),name:item,checked:true}
 					_ARRAY.push(_OBJ)
 				})
 				return _ARRAY
@@ -1123,6 +1120,7 @@ import { mapMutations } from 'vuex';
 					flex-direction: column;
 					font-size: $font-size-28;
 					color: $color-system;
+					margin-bottom: 20rpx;
 					.icon-xiangxiajiantou{
 						transform:rotate(180deg);
 					}

seller/pages/login/information.vue

@@ -553,18 +553,16 @@
 				this.mainpro = this.checkLikes(e,this.medicaCampList)
 			},
 			checkLikes(e,list){
-				let items = list
 				let	values = e.detail.value
 				let arr = []
-				for (let i = 0, lenI = items.length; i < lenI; ++i) {
-					const item = items[i]
+				list.forEach(item => {
 					if(values.indexOf(item.value) >= 0){
 						this.$set(item,'checked',true)
 						arr.push(item.name)
 					}else{
 						this.$set(item,'checked',false)
 					}
-				}
+				})
 				return arr.join('/')
 			},
 			agreeCheck() {
@@ -588,7 +586,7 @@
 			setNewMainpro(arr){//回显处理主营内容
 				let _ARRAY = []
 				arr.split('/').forEach((item,index) =>{
-					let _OBJ = {value:index,name:item,checked:true}
+					let _OBJ = {value:(index+1).toString(),name:item,checked:true}
 					_ARRAY.push(_OBJ)
 				})
 				return _ARRAY

seller/pages/login/register.vue

@@ -547,18 +547,16 @@
 				this.mainpro = this.checkLikes(e,this.medicaCampList)
 			},
 			checkLikes(e,list){
-				let items = list
 				let	values = e.detail.value
 				let arr = []
-				for (let i = 0, lenI = items.length; i < lenI; ++i) {
-					const item = items[i]
+				list.forEach(item => {
 					if(values.indexOf(item.value) >= 0){
 						this.$set(item,'checked',true)
 						arr.push(item.name)
 					}else{
 						this.$set(item,'checked',false)
 					}
-				}
+				})
 				return arr.join('/')
 			},
 			agreeCheck() {