COMMIT 商品详情

pages/goods/components/cm-unit-popup.vue

@@ -160,7 +160,7 @@ export default {
 			} else {
 				this.isShowButton = true
 			}
-			this.skuList = this.skuProduct.skus
+			this.skuList = this.skuProduct.organizeSkus
 			this.productCount = this.skuList[0].minBuyNumber
 			this.handleMinNumber = this.skuList[0].minBuyNumber
 			this.handleStock = this.skuList[0].stock
@@ -231,15 +231,6 @@ export default {
 				if (this.isBtnDisable || this.goodsData.disabled) {
 					return
 				}
-				if (process.env.NODE_ENV != 'development') {
-					this.$uma.trackEvent(UmTrackEvent, {
-						Um_Key_PageName: UmKeyPageName,
-						Um_Key_SourcePage: '商品详情',
-						Um_Key_ProductID: `${this.skuProduct.productId}`
-					})
-				}
-				const UmKeyPageName = type === 'add' ? '加入购物车' : '立即购买'
-				const UmTrackEvent = type === 'add' ? 'Um_Event_ProductAddCart' : 'Um_Event_ProductBuyConfirm'
 				this.$emit('buyConfirm', { type: type, productCount: this.productCount })
 				this.$parent.popupShow3 = false
 			} else {

pages/goods/product.vue

@@ -94,7 +94,7 @@
 						<image class="none-image" :src="staticUrl + 'icon_product_none@2x.png'" mode=""></image>
 					</view>
 					<!-- 选择规格 -->
-					<view class="product-parameter" v-if="isShowButton || userIdentity === 1" @click="showPopup(3)">
+					<view class="product-parameter" @click="showPopup(3)">
 						<text class="title">选择：</text> <text class="name">共{{ skusCount }}种规格可选</text>
 						<text class="iconfont icon-xiangyou"></text>
 					</view>
@@ -307,8 +307,8 @@ export default {
 	methods: {
 		async initGetStotage() {
 			// 初始化
-			// const userInfo = await this.$api.getStorage()
-			// this.userId = this.addParams.userId = userInfo.userId ? userInfo.userId : 0
+			const userInfo = await this.$api.getStorage()
+			this.userId = this.addParams.userId = userInfo.userId ? userInfo.userId : 0
 			// this.userIdentity = userInfo.userIdentity ? userInfo.userIdentity : 0
 			if (isPreviewImg) {
 				isPreviewImg = false
@@ -320,12 +320,12 @@ export default {
 		async getProductDetils() {
 			// 初始化商品详情查询
 			try{
-				const res = await this.ProductService.getProductDetils({productId: this.productId})
+				const res = await this.ProductService.getProductDetils({productId: this.productId ,userId:this.userId})
 				const data = res.data
 				const dataStr = JSON.stringify(data)
 				this.product = JSON.parse(dataStr)
 				this.skuProduct = JSON.parse(dataStr)
-				this.skusCount = this.product.skus.length
+				this.skusCount = this.product.organizeSkus.length
 				this.addParams.skuId = this.product.skuId
 				// 判断是否显示已收藏
 				if (this.product.userLike && this.product.userLike == 1) {
@@ -354,25 +354,7 @@ export default {
 		adaptRichTextImg(product) {
 			// 商品详情
 			let defaulHtml = '<div style="text-align: center;color:#333333;">暂无内容</div>'
-			let html = ''
-			if (product.productDetailChose == 1) {
-				// 同资质机构显示商品详情
-				html = product.productDetail ? this.$api.adaptRichTextImg(product.productDetail.detailInfo) : defaulHtml
-			} else {
-				if (this.hasLogin && this.userIdentity != 4) {
-					html = product.productDetail
-						? this.$api.adaptRichTextImg(product.productDetail.detailInfo)
-						: defaulHtml
-				} else {
-					if (product.productDetail.commonDetailInfo) {
-						html = product.productDetail
-							? this.$api.adaptRichTextImg(product.productDetail.commonDetailInfo)
-							: defaulHtml
-					} else {
-						html = defaulHtml
-					}
-				}
-			}
+			let html = product.productDetail ? this.$api.adaptRichTextImg(product.productDetail.detailInfo) : defaulHtml
 			return html
 		},
 		handleCollection() {

pages/login/information.vue

@@ -134,7 +134,7 @@
 		</view>
 		<view class="register-fiexd clearfix" :style="{ paddingBottom: isIphoneX ? '68rpx' : '36rpx' }">
 			<view class="register-row">
-				<view class="register-btn sub" @click.stop="organizationUpdateInfo">确定</view>
+				<view class="register-btn sub" @click.stop="handleConfirm">确定</view>
 			</view>
 		</view>
 		<!-- 地址  -->
@@ -201,32 +201,23 @@ export default {
 				}
 			],
 			params: {
-				userId: '', // 用户ID
-				clubId: '', // 会所ID
-				bindMobile: '',
-				isAgreed: 0,
-				password: '',
-				passWordConfirm: '',
-				smsCode: '',
-				avatarUrl: '',
-				nickName: '',
-				source: 1,
-				unionId: '',
-				linkMan: '',
-				name: '',
+				name:'',
+				linkMan:'',
 				provinceId: '',
 				cityId: '',
-				townId: '',
+				townId:'',
 				address: '',
-				shopPhoto: '',
-				businessLicense: '',
-				medicalPracticeLicense: ''
+				organizeType:1, //外部商城机构类型 0内部机构 1外部机构
+				shopPhoto:'',
+				businessLicense:'',
+				medicalPracticeLicense:'',
 			},
-			handleAddress: '请选择机构所在地区'
+			textareaFocus: false,
+			handleAddress:'请选择机构所在地区',
 		}
 	},
 	onLoad(option) {
-		this.organizationInfo()
+		this.updateModifyInfo()
 	},
 	methods: {
 		hanldNavigateBack() {
@@ -236,136 +227,76 @@ export default {
 				})
 			})
 		},
-		async organizationInfo() {
+		async updateModifyInfo() {
 			const resolve =await this.$api.getStorage()
 			this.params.userId = resolve.userId ? resolve.userId : 0
+			if(resolve.clubStatus === 92){
+				this.isUnderLogin = true
+			}
 			try{
 				const res =await this.UserService.OrganizationUpdateModifyInfo({ userId: this.params.userId })
-				console.log('res',res)
-				this.handleInstallInfo(res.data)
+				let club = res.data.club
+				let user = res.data.user
+				this.params.clubId = user.clubId
+				this.handleAddress = club.provincialAddress ? club.provincialAddress : '请选择机构所在地区'
+				this.params.name = club.name
+				this.params.linkMan = club.linkMan
+				this.params.provinceId = club.provinceId
+				this.params.cityId = club.cityId
+				this.params.townId = club.townId
+				this.params.address = club.address
+				this.params.organizeType = club.organizeType
+				this.params.socialCreditCode = club.socialCreditCode
+				this.params.shopPhoto = club.shopPhoto
+				this.params.businessLicense = club.businessLicense
+				this.params.medicalPracticeLicense = club.medicalPracticeLicense
 			}catch(error){
 				this.$util.msg(error.msg, 2000)
 			}
 		},
-		// 初始化机构资料
-		handleInstallInfo(data){
-			let organizationClub = data.club
-			let organizationUser = data.user
-			this.params.clubId = organizationUser.clubId
-			this.params.clubId = organizationUser.clubId
-			this.params.name = organizationClub.name ? organizationClub.name : ''
-			this.params.linkMan = organizationClub.linkMan
-			if (organizationClub.provinceId == null) {
-				this.params.provinceId = ''
-			} else {
-				this.params.provinceId = organizationClub.provinceId
+		handleConfirm(){
+			// 提交审核
+			if (this.params.linkMan == '') {
+				this.$util.msg('请输入联系人名称', 2000)
+				return
+			}
+			if (this.params.name == '') {
+				this.$util.msg('请输入机构名称', 2000)
+				return
+			}
+			if (this.params.townId == '') {
+				this.$util.msg('请选择机构地址', 2000)
+				return
 			}
-			if (organizationClub.cityId == null) {
-				this.params.cityId = ''
-			} else {
-				this.params.cityId = organizationClub.cityId
+			if (this.params.addressDetail == '') {
+				this.$util.msg('请填写机构详细地址', 2000)
+				return
 			}
-			if (organizationClub.townId == null) {
-				this.params.townId = ''
-			} else {
-				this.params.townId = organizationClub.townId
+			if (this.params.businessLicense == '') {
+				this.$util.msg('请上传营业执照', 2000)
+				return
+			}	
+			if (this.params.shopPhoto == '') {
+				this.$util.msg('请上传门头照', 2000)
+				return
 			}
-			this.handleAddress = organizationClub.provincialAddress
-				? organizationClub.provincialAddress
-				: ''
-			this.params.address = organizationClub.address ? organizationClub.address : ''
-			this.params.socialCreditCode = this.$reg.checkData(organizationClub.socialCreditCode)
-			this.params.businessLicense = this.$reg.checkData(organizationClub.businessLicense)
-			this.params.medicalPracticeLicense = this.$reg.checkData(
-				organizationClub.medicalPracticeLicense
-			)
-			this.params.shopPhoto = this.$reg.checkData(organizationClub.shopPhoto)
-			console.log('params',this.params)
+			if (this.params.medicalPracticeLicense == '') {
+				this.$util.msg('请上传医疗执业许可证', 2000)
+				return
+			}
+			this.clubUpdate(this.params)
 		},
-		organizationUpdateInfo() {
-			//提交审核
-			let params = {}
-			if (this.userIdentity === 4) {
-				params = {
-					userId: this.userId,
-					clubId: this.clubId, //会所ID
-					linkMan: this.linkMan,
-					fax: this.clubFax,
-					contractPhone: this.clubTelePhone,
-					profile: this.profile
-				}
-			} else {
-				if (this.contractEmail == '') {
-					this.$util.msg('请输入邮箱地址', 2000)
-					return
-				}
-				if (!this.$reg.isEmail(this.contractEmail)) {
-					this.$util.msg('请输入正确的邮箱地址', 2000)
-					return
-				}
-				if (this.name == '') {
-					this.$util.msg('请输入机构名称', 2000)
-					return
-				}
-				if (this.addressData.townId == '') {
-					this.$util.msg('请选择机构地址', 2000)
-					return
-				}
-				if (this.addressData.addressDetail == '') {
-					this.$util.msg('请填写机构详细地址', 2000)
-					return
-				}
-				if (this.businessLicense == '') {
-					this.$util.msg('请上传您的营业执照', 2000)
-					return
-				}
-				if (this.firstClubType == 1) {
-					if (this.medicalPracticeLicense == '') {
-						this.$util.msg('请上传您的资质许可证', 2000)
-						return
-					}
-				}
-				if (this.firstClubType == 1 || this.firstClubType == 2) {
-					if (this.mainProduct == '') {
-						this.$util.msg('请选择住机构主营内容', 2000)
-						return
-					}
-				}
-				params = {
-					userId: this.userId,
-					clubId: this.clubId, //会所ID
-					name: this.name,
-					linkMan: this.linkMan,
-					linkManIdentity: this.linkManIdentity,
-					shortName: this.shortName,
-					contractEmail: this.contractEmail,
-					provinceId: this.addressData.provinceId,
-					cityId: this.addressData.cityId,
-					townId: this.addressData.townId,
-					address: this.addressData.addressDetail,
-					socialCreditCode: this.socialCreditCode,
-					businessLicense: this.businessLicense,
-					shopPhoto: this.shopPhoto,
-					firstClubType: this.firstClubType, //机构类型分类 医美:0和生美:1
-					secondClubType: this.secondClubType, //机构类型二级分类 诊所:1,门诊:2,医院:3
-					department: this.department, //科室
-					medicalPracticeLicense: this.medicalPracticeLicense, //资质图片
-					mainProduct: this.mainProduct,
-					fax: this.clubFax,
-					contractPhone: this.clubTelePhone,
-					profile: this.profile
-				}
+		async clubUpdate(params) {
+			// 修改资料
+			try{
+				await this.UserService.updateOrganize(params)
+				this.$util.msg('保存成功', 2000)
+				setTimeout(()=>{
+					this.$api.navigateBack(1)
+				},2000)
+			}catch(error){
+				this.$util.msg(error.msg, 2000)
 			}
-			this.UserService.OrganizationUpdate(params)
-				.then(response => {
-					this.$util.msg('修改成功', 2000, true, 'success')
-					setTimeout(() => {
-						uni.navigateBack()
-					}, 2000)
-				})
-				.catch(error => {
-					this.$util.msg(error.msg, 2000)
-				})
 		},
 		// 三级联动选择
 		showMulLinkageThreePicker() {
@@ -454,9 +385,6 @@ export default {
 		}
 	},
 	onShow() {
-		this.$api.getStorage().then(resolve => {
-			this.userIdentity = resolve.userIdentity
-		})
 		if (this.isPreviewImage) {
 			this.isPreviewImage = false
 			return

pages/login/register-unid.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="container register" :style="{ paddingTop: CustomBar + 'px' }">
+	<view class="container register">
 		<view class="register-main title clearfix" v-if="isUnderLogin">
 			<view class="register-row  clearfix" style="padding: 24rpx;margin-bottom: 0;">
 				<view class="error-title">审核未通过原因:</view>
@@ -8,7 +8,7 @@
 				</view>
 			</view>
 		</view>
-		<view class="register-main clearfix">
+		<view class="register-main clearfix" style="padding-bottom: 300rpx;">
 			<view class="register-row clearfix">
 				<view class="register-from">
 					<view class="label"><text>*</text>联系人</view>
@@ -132,10 +132,12 @@
 					</view>
 				</view>
 			</view>
-			<view class="register-row ">
+		</view>	
+		<view class="register-fiexd clearfix" :style="{ paddingBottom: isIphoneX ? '68rpx' : '36rpx' }">
+			<view class="register-row">
 				<view class="register-btn sub" @click.stop="handleConfirm">重新提交审核</view>
 			</view>
-		</view>	
+		</view>
 		<!-- 地址  -->
 		<mpvue-city-picker
 			:themeColor="themeColor"
@@ -163,7 +165,6 @@
 
 <script>
 import { mapState, mapMutations } from 'vuex'
-import authorize from '@/common/config/authorize.js'
 import wxLogin from '@/common/config/wxLogin.js'
 import mpvueCityPicker from '@/components/mpvue-citypicker/mpvueCityPicker.vue'
 import { uploadFileImage } from '@/services/public.js'
@@ -173,6 +174,8 @@ export default {
 	},
 	data() {
 		return {
+			isIphoneX: this.$store.state.isIphoneX,
+			CustomBar: this.CustomBar, // 顶部导航栏高度
 			params: {
 				name:'',
 				linkMan:'',
@@ -183,8 +186,10 @@ export default {
 				organizeType:1, //外部商城机构类型 0内部机构 1外部机构
 				shopPhoto:'',
 				businessLicense:'',
+				socialCreditCode:'',
 				medicalPracticeLicense:'',
 			},
+			textareaFocus: false,
 			handleAddress:'请选择机构所在地区',
 			isUnderLogin:false,
 			auditNote:''
@@ -211,7 +216,17 @@ export default {
 				this.auditNote = user.auditNote
 				this.params.clubId = user.clubId
 				this.handleAddress = club.provincialAddress ? club.provincialAddress : '请选择机构所在地区'
-				this.params = {...this.params , ...club}
+				this.params.name = club.name
+				this.params.linkMan = club.linkMan
+				this.params.provinceId = club.provinceId
+				this.params.cityId = club.cityId
+				this.params.townId = club.townId
+				this.params.address = club.address
+				this.params.organizeType = club.organizeType
+				this.params.socialCreditCode = club.socialCreditCode
+				this.params.shopPhoto = club.shopPhoto
+				this.params.businessLicense = club.businessLicense
+				this.params.medicalPracticeLicense = club.medicalPracticeLicense
 			}catch(error){
 				this.$util.msg(error.msg, 2000)
 			}
@@ -249,11 +264,14 @@ export default {
 			this.clubUpdate(this.params)
 		},
 		async clubUpdate(params) {
-			// 注册
+			// 修改资料
 			try{
-				await this.UserService.OrganizationUpdate(params)
+				await this.UserService.againUpdateOrganize(params)
 				this.$util.msg('提交成功', 2000)
-				this.$api.navigateBack(1)
+				wxLogin.wxLoginAuthorize()
+				setTimeout(()=>{
+					this.$api.navigateBack(1)
+				},2000)
 			}catch(error){
 				this.$util.msg(error.msg, 2000)
 			}
@@ -339,9 +357,6 @@ export default {
 					})
 					break;
 			}
-		},
-		handleClick1(){
-			this.$api.switchTabTo('/pages/tabBar/user/user')
 		}
 	},
 	onShow() {
@@ -684,30 +699,34 @@ export default {
 		}
 	}
 }
-.tui-modal-custom {
-	text-align: center;
-}
-
-.tui-modal-custom-text {
-	font-size: 30rpx;
-	color: #333;
-	padding: 30rpx 0 50rpx;
-}
-
-.tui-button-custom{
-	width: 420rpx;
-	height: 84rpx;
-	line-height: 84rpx;
-	text-align: center;
-	color: #FFFFFF;
-	background: $btn-confirm;
-	font-size: $font-size-28;
-	margin: 15rpx auto;
-	border-radius: 42rpx;
-}
-
-.tui-prompt-title {
-	padding-bottom: 20rpx;
-	font-size: 34rpx;
+.register-fiexd {
+	width: 100%;
+	height: auto;
+	padding: 20rpx 0;
+	position: fixed;
+	bottom: 0;
+	left: 0;
+	z-index: 99;
+	background: #ffffff;
+	.register-btn {
+		width: 600rpx;
+		height: 88rpx;
+		border-radius: 44rpx;
+		font-size: $font-size-28;
+		line-height: 88rpx;
+		color: #ffffff;
+		margin: 0 auto;
+		text-align: center;
+		background: $btn-confirm;
+		margin-top: 96rpx;
+		&.none {
+			background: #ffffff;
+			color: $text-color;
+			margin-top: 0;
+		}
+		&.sub {
+			margin-top: 0;
+		}
+	}
 }
 </style>

pages/login/register.vue

@@ -246,7 +246,6 @@
 
 <script>
 import { mapState, mapMutations } from 'vuex'
-import authorize from '@/common/config/authorize.js'
 import wxLogin from '@/common/config/wxLogin.js'
 import mpvueCityPicker from '@/components/mpvue-citypicker/mpvueCityPicker.vue'
 import { uploadFileImage } from '@/services/public.js'
@@ -284,6 +283,7 @@ export default {
 				}
 			],
 			stepNum:0,
+			textareaFocus: false,
 			isMobileDisabled: false, //手机验证码按钮控制
 			mobilCount: '', //倒计时
 			mobileCodeText: '获取验证码',

pages/tabBar/home/index.js

@@ -36,7 +36,7 @@ const homeMiXins = {
         async mallOrganizeHome() {
             //初始化首页数据
             try{
-                const res = await this.CommonService.mallOrganizeHome({ organizeId: 1 })
+                const res = await this.CommonService.mallOrganizeHome({ organizeId: 4 })
                 let data = res.data
                 this.bannerList = data.bannerList
                 this.mainmenu = data.mainmenu

pages/tabBar/user/user.vue

@@ -14,19 +14,22 @@
 				<view class="header-main" v-if="hasLogin">
 					<view class="header-icon">
 						<view class="header-logo">
-							<image :src="headpic ? headpic : `${staticUrl}icon_default@3x.png`" mode=""></image>
+							<image :src="underInfo.shopPhoto ? underInfo.shopPhoto : `${staticUrl}icon_default@3x.png`" mode=""></image>
 						</view>
 					</view>
 					<view class="header-text">
 						<view class="user-item"
-							><text class="u-h1">{{ name }}</text></view
+							><text class="u-none">{{ underInfo.name }}</text></view
 						>
 					</view>
 				</view>
 				<view class="header-main" v-else-if="isUnderLogin">
 					<view class="header-icon">
 						<view class="header-logo">
-							<image :src="underInfo.shopPhoto ? underInfo.shopPhoto : `${staticUrl}icon_default@3x.png`" mode=""></image>
+							<image
+								:src="underInfo.shopPhoto ? underInfo.shopPhoto : `${staticUrl}icon_default@3x.png`"
+								mode=""
+							></image>
 						</view>
 					</view>
 					<view class="header-text">
@@ -36,7 +39,9 @@
 						<view class="user-item">
 							<view class="user-item-tips none">
 								<text v-if="underInfo.clubStatus === 1">待审核</text>
-								<text v-if="underInfo.clubStatus === 92" @click="underNavigator">审核未通过，请重新提交 ></text>
+								<text v-if="underInfo.clubStatus === 92" @click="underNavigator"
+									>审核未通过，请重新提交 ></text
+								>
 							</view>
 						</view>
 					</view>
@@ -158,7 +163,7 @@
 							</view>
 							<text class="cell-tit"> 官方客服 </text>
 							<text class="cell-more iconfont icon-xiangyou"></text>
-						</button>	
+						</button>
 						<!-- #endif -->
 					</view>
 				</view>
@@ -188,7 +193,7 @@ export default {
 				textColor: '#333333',
 				bgColor: ''
 			},
-			staticUrl:this.global.staticUrl,
+			staticUrl: this.global.staticUrl,
 			CustomBar: this.CustomBar, // 顶部导航栏高度
 			StatusBar: this.StatusBar,
 			userId: 0,
@@ -196,7 +201,7 @@ export default {
 			isCmcustom: false,
 			name: '',
 			userType: '',
-			headpic: '',
+			shopPhoto: '',
 			userVip: {}, // 超级会员信息
 			userBeans: 0,
 			userMoney: '0.00',
@@ -206,10 +211,8 @@ export default {
 			openid: '',
 			aboutHtml: '',
 			telPhone: '',
-			bindMobile: '',
 			isSvip: false,
 			isSvipType: 2,
-			clubStatus: '', // 机构升级资质机构审核状态1:待审核  91:审核失败
 			userIdentity: '', // 机构等级
 			confirmedCount: 0, // 待确认
 			paymentCount: 0, // 待付款角标
@@ -238,8 +241,8 @@ export default {
 					icon: 'icon_club_4@2x.png'
 				}
 			],
-			underInfo:{},
-			isUnderLogin:false
+			underInfo: {},
+			isUnderLogin: false
 		}
 	},
 	onLoad(option) {},
@@ -248,41 +251,23 @@ export default {
 	},
 	methods: {
 		...mapMutations(['updateNoticeNum']),
-		async infoClucbUser(){
+		async infoClucbUser() {
 			const user = await this.$api.getStorage()
 			console.log(user)
 			this.underInfo = user
-			if(this.underInfo.clubStatus === 1 || this.underInfo.clubStatus === 92){
+			if (this.underInfo.clubStatus === 1 || this.underInfo.clubStatus === 92) {
 				this.isUnderLogin = true
 			}
 		},
-		getClubObtainCenter() {
+		async getClubObtainCenter() {
 			// 获取个人中心数据
-			this.UserService.GetClubObtainCenter({ userId: this.userId })
-				.then(response => {
-					let data = response.data
-					this.userIdentity = data.user.userIdentity //机构等级
-					if (this.userIdentity == 2) {
-						this.name = data.club.name //资质机构名称
-						this.userType = '资质机构'
-					} else {
-						this.name = data.user.userName //个人机构名称
-						this.userType = '个人机构'
-					}
-					this.userBeans = data.user.userBeans // 采美豆数量
-					this.headpic = data.user.image // 会所头像
-					this.bindMobile = data.user.bindMobile // 登录手机号
-					this.clubStatus = data.user.clubStatus // 机构审核状态
-					this.couponNum = data.couponNum // 优惠券数量
-					this.bankNum = data.bankNum // 银行卡数量
-					this.isModify = data.isModify // 是否显示采美豆
-					this.contactNumber = data.contactNumber // 联系电话
-					let clubInfo = { name: this.name, image: this.headpic, userId: data.user.userId }
-					uni.setStorage({ key: 'clubInfo', data: clubInfo })
-				})
-				.catch(error => {
-					this.$util.msg(error.msg, 2000)
-				})
+			try{
+				const res = await this.UserService.GetClubObtainCenter({ userId: this.userId })
+				let data = res.data
+				this.underInfo = { ...this.underInfo , ...data.user } 
+			}catch(e){
+				this.$util.msg(error.msg, 2000)
+			}
 		},
 		UserClubOrderCount() {
 			//获取订单状态数量
@@ -312,7 +297,7 @@ export default {
 				this.$api.navigateTo('/pages/login/login?type=0')
 			}
 		},
-		underNavigator(){
+		underNavigator() {
 			// 审核未通过修改资料
 			this.$api.navigateTo('/pages/login/register-unid')
 		},
@@ -415,17 +400,17 @@ page {
 				display: inline-block;
 				float: left;
 				height: 40rpx;
-				background: #FCC120;
+				background: #fcc120;
 				border-radius: 20rpx;
 				line-height: 40rpx;
 				font-size: $font-size-22;
 				text-align: center;
-				color: #FFFFFF;
+				color: #ffffff;
 				box-sizing: border-box;
 				padding: 0 20rpx;
 				position: relative;
 				&.none {
-					background: #F85050;
+					background: #f85050;
 				}
 			}
 			.u-none {
@@ -733,7 +718,7 @@ page {
 	display: flex;
 	flex-direction: column;
 	align-items: center;
-	image{
+	image {
 		width: 180rpx;
 		height: 60rpx;
 	}

pages/user/setting/setting.vue

@@ -29,14 +29,10 @@
 			
 		},
 		methods:{
-			initSetting(){
-				this.$api.getStorage().then((resolve) =>{
-					this.UserService.PersonalInfo({userID:resolve.userId}).then(response =>{
-						this.bindMobile=response.data.user.bindMobile
-					}).catch(error =>{
-						this.$util.msg(error.msg,2000)
-					})
-				})
+			async initSetting() {
+				const user = await this.$api.getStorage()
+				console.log(user)
+				this.bindMobile = user.bindMobile
 			},
 			navigator(url){
 				this.$api.navigateTo(url)

services/product.service.js

@@ -53,7 +53,7 @@ export default class ProductService {
 	 */
     getProductDetils (data = {}) {
         return this.AjaxService.get({
-            url:'/commodity/mallProduct/getProductInfo',
+            url:'/commodity/product/organizeDetails',
             data,
             isLoading: false ,
               

services/user.service.js

@@ -94,31 +94,30 @@ export default class UserService {
 
         })
     }
-    /* 协销拉机构上线(查询暂时数据)*/
-    UseRregisterTemporaryInfo(data = {}) {
-        return this.AjaxService.get({
-            url: '/user/register/temporary/data',
+    /* 机构升级资质机构 */
+    OrganizationRegister(data = {}) {
+        return this.AjaxService.post({
+            url: '/user/register/club/upgrade',
             data,
             isLoading: true,
 
         })
     }
-    /* 机构升级资质机构 */
-    OrganizationRegister(data = {}) {
+    /* 机构提交资料修改 */
+    updateOrganize(data = {}) {
         return this.AjaxService.post({
-            url: '/user/register/club/upgrade',
+            url: '/user/club/info/updateOrganize',
             data,
             isLoading: true,
 
         })
     }
     /* 机构提交资料修改 */
-    OrganizationUpdate(data = {}) {
+    againUpdateOrganize(data = {}) {
         return this.AjaxService.post({
-            url: '/user/club/info/update',
+            url: '/user/club/info/organizeClubinfo',
             data,
             isLoading: true,
-
         })
     }
     /* 供应商资料信息-数据回显 */