帮机构下单缓存数据修改字段

components/cm-module/creatOrder/sellerExchangeCoupon.vue

@@ -45,7 +45,7 @@
 		},
 		created() {
 			this.$api.getComStorage('orderUserInfo').then((resolve) =>{
-				this.params.userId = resolve.userID ? resolve.userID : 0;
+				this.params.userId = resolve.userId ? resolve.userId : 0;
 			}).catch(error =>{
 				console.log('暂无用户信息~')
 			})

components/cm-module/creatOrder/sellerGoodsList.vue

@@ -59,10 +59,10 @@
 				<view class="goods-pros-b">
 					<view class="sum-none" v-if="item.reducedPrice>0">
 						<text class="money-sign">￥</text>
-						<text class="money">{{ item.totalPrice | NumFormat }}</text>
+						<text class="money">{{ item.originalPrice | NumFormat }}</text>
 						<text class="money-reduced">减<text>￥{{ item.reducedPrice | NumFormat}}</text></text>
 					</view>
-					<view class="sum">合计:<text class="money">￥{{ ( item.totalPrice -item.reducedPrice ) | NumFormat }}</text></view>
+					<view class="sum">合计:<text class="money">￥{{ ( item.originalPrice -item.reducedPrice ) | NumFormat }}</text></view>
 				</view>
 			</view>
 		</view>	

components/cm-module/creatOrder/sellerInvoice.vue

@@ -142,7 +142,7 @@
 		methods:{
 			getUseFindInvoice(){//获取发票信息
 				this.$api.getComStorage('orderUserInfo').then((resolve) =>{
-					this.OrderService.GetFindInvoice({userId:resolve.userID}).then(response =>{
+					this.OrderService.GetFindInvoice({userId:resolve.userId}).then(response =>{
 						if(response.data == null){
 							this.invoiceData = Object.assign(this.invoiceData,'',{type:0})
 						}else{

components/cm-module/listTemplate/buyagainList.vue

@@ -143,7 +143,7 @@ export default {
 		this.setScrollHeight()
 		this.$parent.getClubProductNum()
 		this.$api.getComStorage('orderUserInfo').then(resolve => {
-			this.userId = resolve.userID
+			this.userId = resolve.userId
 			this.getProductAgainInfo(false)
 		})
 	},

components/cm-module/listTemplate/immediatelyList.vue

@@ -71,13 +71,13 @@
 											<text
 												class="price-larger"
 												:class="
-													PromotionsFormat(pros.promotions) || item.svipProductFlag == 1
+													PromotionsFormat(pros.promotions) || pros.svipProductFlag == 1
 														? 'none'
 														: ''
 												"
 											>
 												￥{{
-													(PromotionsFormat(pros.promotions)
+													(PromotionsFormat(pros.promotions) || pros.svipProductFlag == 1
 														? pros.originalPrice
 														: pros.price) | NumFormat
 												}}
@@ -319,7 +319,7 @@ export default {
 				console.log(error)
 			})
 		this.$api.getComStorage('orderUserInfo').then(resolve => {
-			this.clubUserId = resolve.userID
+			this.clubUserId = resolve.userId
 		})
 		this.getProductAgainInfo()
 		this.isFocus = true

components/cm-module/listTemplate/secondHand.vue

@@ -159,7 +159,7 @@
 				console.log(error)
 			})
 			this.$api.getComStorage('orderUserInfo').then((resolve) =>{
-				this.clubUserId = resolve.userID
+				this.clubUserId = resolve.userId
 			})
 			this.getProductAgainInfo()
 			this.isFocus = true

pages/seller/address/address.vue

@@ -145,7 +145,7 @@
 		},
 		onShow() {
 			this.$api.getComStorage('orderUserInfo').then((resolve) =>{
-				this.listQuery.userId = resolve.userID? resolve.userID : 0
+				this.listQuery.userId = resolve.userId? resolve.userId : 0
 				this.listQuery.pageNum = 1
 				this.addressList = []
 				this.getQueryAddressList()

pages/seller/address/addressManage.vue

@@ -190,8 +190,8 @@
 		},
 		onShow() {
 			this.$api.getComStorage('orderUserInfo').then((resolve) =>{
-				this.addressData.userId = resolve.userID ? resolve.userID : 0
-				console.log('userID',this.addressData.userId)
+				this.addressData.userId = resolve.userId ? resolve.userId : 0
+				console.log('userId',this.addressData.userId)
 			})
 		}
 	}

pages/seller/cart/buyagain.vue

@@ -190,7 +190,7 @@ export default {
 	},
 	onShow() {
 		this.$api.getComStorage('orderUserInfo').then(resolve => {
-			this.clubID = resolve.clubID
+			this.clubID = resolve.clubId
 		})
 		this.$api.getStorage().then(resolve => {
 			this.serviceProviderId = resolve.serviceProviderId

pages/seller/cart/cart.vue

@@ -304,7 +304,9 @@ export default {
 			submitIds: [],
 			depositIds: [6060, 6061, 6062, 6063, 6064], //定金商品ID
 			rechargeIds: [6065, 6066, 6067, 6068, 6069], //充值余额商品ID
-			isIphoneX: this.$store.state.isIphoneX
+			isIphoneX: this.$store.state.isIphoneX,
+			vipFlag:0,
+			userIdentity:0
 		}
 	},
 	onLoad() {
@@ -334,16 +336,22 @@ export default {
 		}
 	},
 	methods: {
-		initData() {
+		async initGetStotage() {
+			const clubInfo = await this.$api.getComStorage('orderUserInfo')
+			const userInfo = await this.$api.getStorage()
 			this.isModallayer = false //遮罩层 防止多次点击
 			this.skeletonShow = true //预加载圆圈
 			this.isCheckAll = false //是否全选
 			this.submitIds = []
-			this.$api.getStorage().then(resolve => {
-				this.listQuery.serviceProviderId = resolve.serviceProviderId ? resolve.serviceProviderId : 0
-				this.initGetCartGoodsList()
-				this.getClubProductNum()
-			})
+			this.vipFlag = clubInfo.vipFlag ? clubInfo.vipFlag : 0
+			this.userIdentity = clubInfo.userIdentity ? clubInfo.userIdentity : 0
+			console.log('userIdentity',this.userIdentity)
+			console.log('vipFlag',this.vipFlag)
+			this.listQuery.clubId = clubInfo.clubId ? clubInfo.clubId : 0
+			this.listQuery.againBuyProductIds = clubInfo.againBuyProductIds ? clubInfo.againBuyProductIds : ''
+			this.listQuery.serviceProviderId = userInfo.serviceProviderId ? userInfo.serviceProviderId : 0
+			this.initGetCartGoodsList()
+			this.getClubProductNum()
 		},
 		initLogin() {
 			this.$api.redirectTo('/pages/login/login?type=4')
@@ -962,7 +970,16 @@ export default {
 		navToListPage(id) {
 			this.isModallayer = true
 			this.$api.navigateTo(`/pages/goods/product?id=${id}`)
-		}
+		},
+		isShowVipFlag(pros){
+			if(pros.priceFlag!=1){
+				if(this.userIdentity == 4 && this.vipFlag == 1){
+					return true
+				}else if(this.userIdentity == 2){
+					return true
+				}
+			}
+		},
 	},
 	onReachBottom() {
 		if (this.hasNextPage) {
@@ -977,12 +994,7 @@ export default {
 		uni.stopPullDownRefresh()
 	},
 	onShow() {
-		this.$api.getComStorage('orderUserInfo').then(resolve => {
-			console.log(resolve)
-			this.listQuery.clubId = resolve.clubID ? resolve.clubID : 0
-			this.listQuery.againBuyProductIds = resolve.againBuyProductIds ? resolve.againBuyProductIds : ''
-			this.initData()
-		})
+		this.initGetStotage()
 	}
 }
 </script>
@@ -1139,7 +1151,7 @@ page {
 				color: $color-system;
 				text-align: center;
 				display: inline-block;
-				padding: 0 16rpx;
+				padding: 0 6rpx;
 				font-size: $font-size-20;
 				border: 1px solid #e15616;
 				float: right;
@@ -1389,19 +1401,6 @@ page {
 			float: left;
 			padding: 0 0 10rpx 0;
 			margin-left: 10rpx;
-			.floor-tags {
-				height: 28rpx;
-				border-radius: 6rpx;
-				background-color: #ffffff;
-				line-height: 28rpx;
-				color: $color-system;
-				text-align: center;
-				display: inline-block;
-				padding: 0 16rpx;
-				font-size: $font-size-20;
-				border: 1px solid #e15616;
-				float: left;
-			}
 		}
 	}
 }

pages/seller/cart/immediately.vue

@@ -312,7 +312,7 @@
 		},
 		onShow() {
 			this.$api.getComStorage('orderUserInfo').then((resolve) =>{
-				this.clubId = resolve.clubID ? resolve.clubID : 0
+				this.clubId = resolve.clubId ? resolve.clubId : 0
 			})
 			this.$api.getStorage().then((resolve) =>{
 				this.serviceProviderId = resolve.serviceProviderId

pages/seller/cart/second.vue

@@ -183,7 +183,7 @@
 		},
 		onShow() {
 			this.$api.getComStorage('orderUserInfo').then((resolve) =>{
-				this.clubID = resolve.clubID
+				this.clubID = resolve.clubId
 			})
 			this.$api.getStorage().then((resolve) =>{
 				this.serviceProviderId = resolve.serviceProviderId

pages/seller/club/addoperator.vue

@@ -102,7 +102,7 @@
 		},
 		onShow() {
 			this.$api.getComStorage('orderUserInfo').then((resolve) =>{
-				this.userID = resolve.userID
+				this.userID = resolve.userId
 			})
 		}
 	}

pages/seller/club/list.vue

@@ -274,22 +274,22 @@ export default {
 			//修改机构资料
 			switch (this.tabCurrentNum) {
 				case 0:
-					this.$api.navigateTo(`/pages/seller/login/apply?userID=${club.userID}`)
+					this.$api.navigateTo(`/pages/seller/login/apply?userID=${club.userId}`)
 					break
 				case 1:
-					this.$api.navigateTo(`/pages/seller/login/information?userID=${club.userID}`)
+					this.$api.navigateTo(`/pages/seller/login/information?userID=${club.userId}`)
 					break
 			}
 		},
 		orderHistory(club) {
 			//跳转机构历史订单
 			this.$api.setStorage('orderUserInfo', club)
-			this.$api.navigateTo(`/pages/seller/order/order-historylist?clubId=${club.clubID}&listType=0`)
+			this.$api.navigateTo(`/pages/seller/order/order-historylist?clubId=${club.clubId}&listType=0`)
 		},
 		clubRemaks(club){
 			//跳转机构资料备注
 			this.$api.setStorage('orderUserInfo', club)
-			this.$api.navigateTo(`/pages/seller/remarks/list?clubId=${club.clubID}`)
+			this.$api.navigateTo(`/pages/seller/remarks/list?clubId=${club.clubId}`)
 		},
 		onShowClose() {
 			//输入框失去焦点时触发

pages/seller/order/create-order.vue

@@ -264,8 +264,8 @@
 					const data = JSON.parse(option.data)
 					const clubInfo = await this.$api.getComStorage('orderUserInfo')
 					const userInfo = await this.$api.getStorage()
-					this.productParam.clubId = this.cartParam.clubId = this.confirmParam.clubId = clubInfo.clubID ? clubInfo.clubID : 0
-					this.postageParam.userId = clubInfo.userID ? clubInfo.userID : 0
+					this.productParam.clubId = this.cartParam.clubId = this.confirmParam.clubId = clubInfo.clubId ? clubInfo.clubId : 0
+					this.postageParam.userId = clubInfo.userId ? clubInfo.userId : 0
 					this.productParam.serviceProviderId = userInfo.serviceProviderId ? userInfo.serviceProviderId : 0
 					this.cartParam.serviceProviderId = userInfo.serviceProviderId ? userInfo.serviceProviderId : 0
 					this.confirmParam.serviceProviderId = userInfo.serviceProviderId ? userInfo.serviceProviderId : 0
@@ -360,7 +360,7 @@
 					{
 						pageNum:1,
 						pageSize:1,
-						userId:clubInfo.userID,
+						userId:clubInfo.userId,
 					}
 				).then(response =>{
 					let data = response.data

pages/seller/order/create-recharge-order.vue

@@ -71,8 +71,8 @@
 			async initStorage(){
 					const culbInfo = await this.$api.getComStorage('orderUserInfo')
 					const userInfo = await this.$api.getStorage()
-					this.userId = culbInfo.userID ? culbInfo.userID : 0
-					this.params.clubId = culbInfo.clubID ? culbInfo.clubID : 0
+					this.userId = culbInfo.userId ? culbInfo.userId : 0
+					this.params.clubId = culbInfo.clubId ? culbInfo.clubId : 0
 					this.params.serviceProviderId = userInfo.serviceProviderId ? userInfo.serviceProviderId : 0
 					this.getInitCrearOrder()
 			},

pages/seller/order/order-details.vue

@@ -316,9 +316,9 @@ export default {
 				.then(res => {
 					if (res.code == 0) {
 						this.$api.setStorage('orderUserInfo', {
-							clubID: res.data.clubId,
+							clubId: res.data.clubId,
 							againBuyProductIds: res.data.productIds,
-							userID: res.data.userId
+							userId: res.data.userId
 						})
 						this.$api.navigateTo('/pages/seller/cart/cart')
 					}

pages/seller/order/order-historylist.vue

@@ -342,8 +342,8 @@ export default {
 		async initDataInfo() {
 			const clubInfo = await this.$api.getComStorage('orderUserInfo')
 			const userInfo = await this.$api.getStorage()
-			this.clubId = clubInfo.clubID ? clubInfo.clubID : 0
-			this.userId = clubInfo.userID ? clubInfo.userID : 0
+			this.clubId = clubInfo.clubId ? clubInfo.clubId : 0
+			this.userId = clubInfo.clubId ? clubInfo.clubId : 0
 			this.serviceProviderId = userInfo.serviceProviderId ? userInfo.serviceProviderId : 0
 			this.getOrderDatainit(this.currentTab)
 		},

pages/seller/order/order-list.vue

@@ -549,9 +549,9 @@ export default {
 				.then(res => {
 					if (res.code == 0) {
 						this.$api.setStorage('orderUserInfo', {
-							clubID: res.data.clubId,
+							clubId: res.data.clubId,
 							againBuyProductIds: res.data.productIds,
-							userID: res.data.userId
+							userId: res.data.userId
 						})
 						this.$api.navigateTo('/pages/seller/cart/cart')
 					}

pages/seller/remarks/add.vue

@@ -98,7 +98,7 @@ export default {
 		async initGetStotage() {
 			const clubInfo = await this.$api.getComStorage('orderUserInfo')
 			const userInfo = await this.$api.getStorage()
-			this.remarksParams.clubId = clubInfo.clubID ? clubInfo.clubID : 0
+			this.remarksParams.clubId = clubInfo.clubId ? clubInfo.clubId : 0
 			this.remarksParams.serviceProviderId = userInfo.serviceProviderId ? userInfo.serviceProviderId : 0
 		},
 		getUserClubRemarksDetail(remarksId) {

pages/seller/remarks/list.vue

@@ -117,7 +117,7 @@ export default {
 		...mapMutations(['login', 'logout']),
 		async initGetStotage() {
 			const clubInfo = await this.$api.getComStorage('orderUserInfo')
-			this.listQuery.clubId = clubInfo.clubID ? clubInfo.clubID : 0
+			this.listQuery.clubId = clubInfo.clubId ? clubInfo.clubId : 0
 			this.GetProductListInfo()
 		},
 		GetProductListInfo() {

pages/seller/search/search-order.vue

@@ -501,8 +501,9 @@ export default {
 				.then(res => {
 					if (res.code == 0) {
 						this.$api.setStorage('orderUserInfo', {
-							clubID: res.data.clubId,
-							againBuyProductIds: res.data.againBuyProductIds
+							clubId: res.data.clubId,
+							againBuyProductIds: res.data.againBuyProductIds,
+							userId: res.data.userId
 						})
 						this.$api.navigateTo('/pages/seller/cart/cart')
 					}