commit-m 协销下单修改

components/cm-module/cm-seller/home.vue

@@ -24,7 +24,7 @@
 </template>
 
 <script>
-	import tuiSkeleton from "@/components/tui-skeleton/tui-skeleton"
+	import tuiSkeleton from '@/components/tui-skeleton/tui-skeleton'
 	import authorize from '@/common/config/authorize.js'
 	import customer from '@/components/cm-module/homeIndex/customer.vue'
 	import banner from '@/components/cm-module/homeIndex/banner.vue'
@@ -32,7 +32,7 @@
 	import pageFloor from '@/components/cm-module/homeIndex/pageFloor.vue'
 	import pageSpecial from '@/components/cm-module/homeIndex/pageSpecial.vue'
 	import supplierList from '@/components/cm-module/homeIndex/supplierList.vue'
-	import { mapState,mapMutations} from 'vuex';
+	import { mapState,mapMutations} from 'vuex'
 	export default {
 		components:{
 			tuiSkeleton,
@@ -83,7 +83,7 @@
 		},
 		filters: {
 			NumFormat:function(text) {//处理金额
-				return Number(text).toFixed(2);
+				return Number(text).toFixed(2)
 			},
 		},
 		computed: {
@@ -101,36 +101,30 @@
 			},
 			GetHomeFloorInfo(){//初始化首页楼层数据
 				this.CommonService.GetHomeDataInfo({userId:this.userID,soure:2}).then(response =>{
-					let data = response.data;
-					this.pageList = data.homePageFloor;
-					this.supplierObj = data.supplierImage;
-					this.isRequest = true;
+					let data = response.data
+					this.pageList = data.homePageFloor
+					this.supplierObj = data.supplierImage
+					this.isRequest = true
 				}).catch(error =>{
 					this.$util.msg(error.msg,2000)
 				})
 			},
 			getHomeInformation(){//初始化首页数据	
 				this.CommonService.GetHomeModulesDataInfo({ source: 2 }).then(res =>{
-					let data = res.data;
+					let data = res.data
 					this.bannerImageList = data.bannerList
 					this.mallPageModules = data.mallPageModules
-					this.skeletonShow = false;
+					this.skeletonShow = false
 					this.navBarsList = data.topMenuList
 					this.isNavRequest = true
 					this.GetHomeTopDataInfo()
 					this.GetHomeFloorInfo()
-                    this.initShoppingCartCount()
 				}).catch(error =>{
 					this.$util.msg(error.msg,2000)
 				})
 			},
-            initShoppingCartCount(){// 获取购物车数量
-                this.OrderService.ShoppingCartCount({ userId: this.userID}).then(res =>{
-                    this.$store.commit('updateAllNum',res.data)
-                })
-            },
 			handleClick(data){
-				this.$api.navigateTo(`/pages/h5/activity/meobohui`)
+				this.$api.navigateTo('/pages/h5/activity/meobohui')
 				this.$store.commit('setActivity',data)
 			},
 			handleCancelClick(data){

components/cm-module/creatOrder/sellerClubVisible.vue

@@ -9,7 +9,7 @@
 		</view>
 		<!-- 优惠券 -->
 		<tui-bottom-popup :radius="true" :show="popupShow" @close="hidePopup">
-			<view class="tui-popup-box clearfix">
+			<view class="tui-popup-box clearfix" :style="{ paddingBottom: isIphoneX ? '68rpx' : '34rpx' }">
 				<view class="tui-popup-content">
 					<radio-group @change="radioChange">
 						<label class="uni-list-cell uni-list-cell-pd" v-for="(item, index) in items" :key="item.value">

components/cm-module/creatOrder/sellerFreight.vue

@@ -5,7 +5,7 @@
 			<view class="freight-left">运费</view>
 			<view class="freight-right">
 				<text class="text-l">{{freightText}}</text>
-				<text class="text" v-if="freightData.postageFlag == 1">￥{{orderPriceToFixed(freightMoney)}}</text>
+				<text class="text" v-if="hanldFreightData.postageFlag == 1">￥{{orderPriceToFixed(freightMoney)}}</text>
 				<text class="iconfont icon-xiayibu"></text>
 			</view>
 		</view>
@@ -24,15 +24,15 @@
 							</label>
 						</radio-group>
 					</view>
-					<view class="freight-group" v-if="freightData.postageFlag == 1">
+					<view class="freight-group" v-if="hanldFreightData.postageFlag == 1">
 						<view class="group-from">
-							<input class="form-input" type="text" v-model="hanldFreight" @input="setFreightMoney" placeholder="请填写运费" maxlength="20">
+							<input class="form-input" type="number" v-model="hanldFreight" @input="setFreightMoney" placeholder="请填写运费" maxlength="20">
 						</view>
 					</view>	
-					<view class="freight-group" v-if="freightData.postageFlag == 0">
+					<view class="freight-group" v-if="hanldFreightData.postageFlag == 0">
 						<text class="text">{{freightText}}</text>
 					</view>
-					<view class="freight-group" v-if="freightData.postageFlag == -1">
+					<view class="freight-group" v-if="hanldFreightData.postageFlag == -1">
 						<text class="text">{{freightText}}</text>
 					</view>
 				</view>
@@ -64,7 +64,7 @@
 				],
 				current:0,
 				hanldFreight:0,
-				freightData:{
+				hanldFreightData:{
 					postageFlag:1,
 					postage:0
 				}
@@ -88,38 +88,38 @@
 				switch(data.postageFlag){
 					case 1:
 						this.current = 0
-						this.freightData.postageFlag = data.postageFlag
+						this.hanldFreightData.postageFlag = data.postageFlag
 						if(data.freight == 0){
 							this.hanldFreight = ''
 						}else{
 							this.hanldFreight = data.postage
 						}
-						this.freightData.postage = data.postage
+						this.hanldFreightData.postage = data.postage
 						this.freightMoney = this.hanldFreight
 						this.freightText = ''
 						break
 					case 0:
 						this.current = 1
-						this.freightData.postageFlag = data.postageFlag
+						this.hanldFreightData.postageFlag = data.postageFlag
 						this.freightText = '包邮'
 						break
 					case -1:
 						this.current = 2
-						this.freightData.postageFlag = data.postageFlag
+						this.hanldFreightData.postageFlag = data.postageFlag
 						this.freightText = '到付'
 						break
 				}
 			},
 			freightConfim(){//提交完成运费选择
-				switch(this.freightData.postageFlag){
+				switch(this.hanldFreightData.postageFlag){
 					case 1:
-						this.choiceaFreightFirst(this.freightData.postageFlag)
+						this.choiceaFreightFirst(this.hanldFreightData.postageFlag)
 						break
 					case 0:
-						this.choiceaFreightFirst(this.freightData.postageFlag)
+						this.choiceaFreightFirst(this.hanldFreightData.postageFlag)
 						break
 					case -1:
-						this.choiceaFreightFirst(this.freightData.postageFlag)
+						this.choiceaFreightFirst(this.hanldFreightData.postageFlag)
 						break	
 				}		
 			},
@@ -129,11 +129,11 @@
 						this.$util.msg('请填写运费',2000)
 						return
 					}
-					this.freightData.postage = this.hanldFreight
-					this.$emit('handleChoiceaFreight',this.freightData)
+					this.hanldFreightData.postage = this.hanldFreight
+					this.$emit('handleChoiceaFreight',this.hanldFreightData)
 				}else{
-					this.freightData.postage = 0
-					this.$emit('handleChoiceaFreight',this.freightData)
+					this.hanldFreightData.postage = 0
+					this.$emit('handleChoiceaFreight',this.hanldFreightData)
 				}
 				this.hideSpec()
 			},
@@ -155,8 +155,8 @@
 				}
 			},
 			radioChange(e) {//运费选择切换
-				this.freightData.postageFlag = parseInt(e.target.value)
-				switch(this.freightData.postageFlag){
+				this.hanldFreightData.postageFlag = parseInt(e.target.value)
+				switch(this.hanldFreightData.postageFlag){
 					case 1:
 						this.freightText = '不包邮'
 						break
@@ -177,9 +177,9 @@
 			setFreightMoney(e){//处理邮费显示
 				if(e.detail.value == ''){
 					this.freightMoney=0
-					this.freightData.postage=0
+					this.hanldFreightData.postage=0
 				}else{
-					this.freightData.postage = e.detail.value
+					this.hanldFreightData.postage = e.detail.value
 					this.freightMoney = this.orderPriceToFixed(e.detail.value)
 				}
 			},

components/cm-module/productDetails/cm-price.vue

@@ -284,7 +284,7 @@
 							</view>
 						</view>
 					</template>
-					<view class="tui-right-flex tui-popup-btn" :style="{ paddingBottom: isIphoneX ? '68rpx' : '0rpx' }">
+					<view class="tui-right-flex tui-popup-btn" :style="{ paddingBottom: isIphoneX ? '68rpx' : '34rpx' }">
 						<view class="tui-flex-1">
 							<view
 								class="tui-button"

pages/goods/goods-active.vue

@@ -208,8 +208,8 @@ export default {
 			})
 			return NewArray
 		},
-		detail: function(id) {
-			this.$api.navigateTo(`/pages/goods/productDetail?id=${id}`)
+		detail(id) {
+			this.$api.navigateTo(`/pages/goods/product?id=${id}`)
 		}
 	},
 	onReachBottom() {

pages/goods/goods-supporting.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="container product clearfix">
-		<view class="product-content" :style="{ paddingBottom: popupShow ? '68rpx' : '0' }">
+		<view class="product-content" :style="{ paddingBottom: popupShow ? '136rpx' : '0' }">
 			<view :class="{ 'tui-order-list': scrollTop >= 0 }" class="clearfix">
 				<!-- 空白页 -->
 				<view class="empty-container" v-if="isEmpty">
@@ -18,6 +18,7 @@
 								<view
 									class="checkbox iconfont"
 									:class="[pros.isChecked ? 'icon-yixuanze' : 'icon-weixuanze']"
+									:style="{color : disabledChecked(pros) ? '#E1E1E1' : '#E15616' }"
 									@click="checkedSoperv(pros)"
 								>
 								</view>
@@ -84,7 +85,7 @@
 											</view>
 											<view class="list-details-price none">
 												<view class="floor-item-act">
-													<view class="coupon-tags" v-if="item.product.couponsLogo"
+													<view class="coupon-tags" v-if="pros.couponsLogo"
 														>优惠券</view
 													>
 													<template v-if="pros.actStatus == 1">
@@ -272,19 +273,6 @@
 				</view>
 			</view>
 		</tui-bottom-popup>
-		<!-- 弹窗提示 -->
-		<tui-modal
-			:show="modal"
-			@click="handleClick"
-			@cancel="hideMobel"
-			:content="contentModalText"
-			:button="modalButton"
-			color="#333"
-			:size="32"
-			shape="circle"
-			:maskClosable="false"
-		>
-		</tui-modal>
 	</view>
 </template>
 <script>
@@ -303,21 +291,6 @@ export default {
 		return {
 			StaticUrl: this.$Static,
 			isIphoneX: this.$store.state.isIphoneX,
-			modalButton: [
-				{
-					text: '取消',
-					type: 'gray',
-					plain: true //是否空心
-				},
-				{
-					text: '确认',
-					customStyle: {
-						color: '#fff',
-						bgColor: 'linear-gradient(90deg, #F28F31 0%, #E15616 100%)'
-					},
-					plain: false
-				}
-			],
 			totalRecord: 0,
 			cartQuantity: 0,
 			popupShow: true,
@@ -342,13 +315,9 @@ export default {
 			pullUpOn: true,
 			pullFlag: true,
 			hasNextPage: false,
-			navbarHeight: '',
 			nomoreText: '上拉显示更多',
-			contentModalText: '', //操作文字提示语句
-			modal: false,
 			vipFlag: 0,
 			userIdentity: 0,
-			isQuantity: false,
 			isStock: false
 		}
 	},
@@ -365,7 +334,7 @@ export default {
 		}
 	},
 	computed: {
-		...mapState(['hasLogin', 'userInfo'])
+		...mapState(['hasLogin', 'userInfo']),
 	},
 	methods: {
 		...mapMutations(['login', 'logout']),
@@ -458,10 +427,19 @@ export default {
 		},
 		getAddProductCart() {
 			//增加购物车成功和toast弹窗提示成功
-			this.ProductService.shoppingAddCart({
-				productID: this.handleData.productId,
-				userID: this.listQuery.userId,
-				productCount: this.number
+			let list = []
+			if(!this.isProductChecked){
+				this.$util.msg('请先选择商品', 2000)
+				return
+			}
+			this.productList.forEach((el)=>{
+				if(el.isChecked){
+					list.push({ productId:el.productId , productCount: el.number })
+				}
+			})
+			this.ProductService.ShoppingAddCarts({
+				productInfo:JSON.stringify(list),
+				userId: this.listQuery.userId
 			})
 				.then(response => {
 					this.$util.msg('加入购物车成功', 1500, true, 'success')
@@ -472,45 +450,26 @@ export default {
 		},
 		toConfirmation() {
 			//跳转确认订单页面
-			let data = []
+			let list = []
+			if(!this.isProductChecked){
+				this.$util.msg('请先选择商品', 2000)
+				return
+			}
 			this.productList.map((el, index) => {
 				if(el.isChecked){
-					data.push({ id:el.productId , count: el.number })
+					list.push({ id:el.productId , count: el.number })
 				}
 			})
-			console.log('勾选商品',data)
+			console.log('勾选商品',list)
 			this.$api.navigateTo(
-				`/pages/user/order/create-order?type=3&data=${JSON.stringify({ data: data })}`
+				`/pages/user/order/create-order?type=3&data=${JSON.stringify({ data: list })}`
 			)
 		},
-		handleClick(e) {
-			//取消收藏
-			if (e.index == 1) {
-				this.handleDeleteUserLike()
-			}
-			this.modal = false
-		},
-		handleDeleteUserLike() {
-			//操作取消收藏
-			this.ProductService.getDeleteUserLike({
-				productIds: this.productIds,
-				userId: this.listQuery.userId
-			})
-				.then(response => {
-					this.$util.msg('取消收藏成功', 2000, true, 'success')
-				})
-				.catch(error => {
-					this.$util.msg(error.msg, 2000)
-				})
-		},
-		hideMobel() {
-			this.modal = false
-		},
 		updateCheckAllBtn() {
 			//勾选单个判断全选
 			let goodsCheckedLength = 0
-			this.productList.forEach(item => {
-				if (item.isChecked) {
+			this.productList.forEach(pros => {
+				if (pros.isChecked) {
 					goodsCheckedLength++
 				}
 			})
@@ -523,10 +482,21 @@ export default {
 		},
 		updateBothCheckBtn() {
 			//全选勾选判断
-			this.productList.forEach(item => {
-				item.isChecked = this.isAllChecked
+			this.productList.forEach(pros => {
+				if(!this.disabledChecked(pros)){
+					pros.isChecked = this.isAllChecked
+				}
 			})
 		},
+		disabledChecked(pros){
+			if(pros.priceFlag ==1){// 为公开价格返回 true 禁用按钮
+				return true
+			}else{
+				if(this.userIdentity == 4 && pros.priceFlag ==2){// 普通机构且商品价格仅会员可见 禁用按钮
+					return true
+				}
+			}
+		},
 		isCheckedAll() {
 			//全选
 			this.isAllChecked = !this.isAllChecked
@@ -537,10 +507,12 @@ export default {
 			}
 			this.updateBothCheckBtn()
 		},
-		checkedSoperv(item) {
+		checkedSoperv(pros) {
 			//选择
-			item.isChecked = !item.isChecked
-			console.log(item)
+			if(this.disabledChecked(pros)){
+				return
+			}
+			pros.isChecked = !pros.isChecked
 			this.updateCheckAllBtn()
 		},
 		PromotionsFormat(promo) {

pages/goods/product.vue

@@ -465,7 +465,7 @@
 				<!-- 底部按钮 -->
 				<view class="menu" v-if="isShowButton">
 					<view class="bottom-btn" :style="{ paddingBottom: isIphoneX ? '68rpx' : '0rpx' }">
-						<view class="bottom-le">
+						<view class="bottom-le"> 
 							<view class="item-bt" @click="this.$api.switchTabTo('/pages/tabBar/home/index')">
 								<image src="../../static/icon-home-active@3x.png"></image> <text>首页</text>
 							</view>
@@ -513,18 +513,9 @@
 					</view>
 				</view>
 				<!--底部选择模态层弹窗组件 -->
-				<view class="popup spec" :class="specClass" @touchmove.stop.prevent="discard" @tap="hideSpec">
-					<!-- 遮罩层 -->
-					<view class="mask"></view>
-					<view
-						class="layer"
-						@tap.stop="discard"
-						:style="{
-							paddingBottom: isIphoneX ? '68rpx' : '36rpx',
-							bottom: isIphoneX ? '-352rpx' : '-296rpx'
-						}"
-					>
-						<view class="content">
+				<tui-bottom-popup :radius="true" :show="popupShow3" @close="hidePopup(3)">
+					<view class="tui-popup-box clearfix">
+						<view class="tui-shopping-main" :style="{ paddingBottom: isIphoneX ? '68rpx' : '34rpx' }">
 							<view class="layer-smimg"> <image :src="product.mainImage" mode=""></image> </view>
 							<view class="layer-nunbox">
 								<view class="layer-nunbox-t" v-if="product.step === 2">
@@ -560,9 +551,14 @@
 								</view>
 							</view>
 						</view>
-						<view class="btn"><view class="button" @click.stop="btnConfirm">确定</view></view>
+						<view
+							class="tui-right-flex tui-popup-btn"
+							:style="{ paddingBottom: isIphoneX ? '68rpx' : '34rpx' }"
+						>
+							<view class="tui-flex-1"> <view class="tui-button" @click="btnConfirm">确定</view> </view>
+						</view>
 					</view>
-				</view>
+				</tui-bottom-popup>
 				<!-- 侧边 -->
 				<scroll-top :isScrollTop="isScrollTop" :bottom="200" v-show="tabCurrentIndex !== 3"></scroll-top>
 			</view>
@@ -663,6 +659,7 @@ export default {
 			popupShow0: false, // 参数弹窗
 			popupShow1: false, // 培训方案
 			popupShow2: false, // 优惠券
+			popupShow3:false,   // 购买弹窗
 			tabSelectFlag: false,
 			sectionPropsArr: [],
 			scrollTopArray: [],
@@ -881,7 +878,7 @@ export default {
 					this.supportingList = data.results
 					this.supportingNum = data.totalRecord
 					if(this.supportingList.length>0){
-						if(this.userIdentity == 2 || this.userIdentity == 4){
+						if(!this.hasLogin || this.userIdentity == 2 || this.userIdentity == 4){
 							this.isShowSupportingList = true
 						}
 					}
@@ -1027,6 +1024,9 @@ export default {
 								Um_Key_ProductID: `${this.product.productId}`
 							})
 						}
+						if (this.ladderPriceFlag) {
+							this.processActivityPrice()
+						}
 						break
 					case 'buy':
 						// 友盟埋点商品详情立即购买点击事件
@@ -1039,7 +1039,9 @@ export default {
 						}
 						break
 				}
-				this.showSpec(type)
+				this.isBtnType = type
+				this.popupShow3 = true
+				console.log('1313123113121')
 			} else {
 				this.$api.navigateTo('/pages/login/login?type=1')
 			}
@@ -1097,21 +1099,6 @@ export default {
 				})
 			}
 		},
-		showSpec(type) {
-			//显示选择数量确认弹窗
-			this.isBtnType = type
-			this.specClass = 'show'
-			if (this.ladderPriceFlag) {
-				this.processActivityPrice()
-			}
-		},
-		hideSpec() {
-			//关闭选择数量确认弹窗
-			this.specClass = 'hide'
-			setTimeout(() => {
-				this.specClass = 'none'
-			}, 200)
-		},
 		btnConfirm() {
 			//加入购物车&&立即购买跳转订单页并关闭弹窗
 			// 友盟埋点商品详情确认购买商品点击事件
@@ -1124,13 +1111,14 @@ export default {
 			}
 			if (this.isBtnType == 'add') {
 				this.getAddProductCart()
+				this.popupShow3 = false
 			} else {
 				this.toConfirmation()
+				
 			}
 		},
 		toConfirmation() {
 			//跳转确认订单页面
-			this.specClass = 'hide'
 			let productStp = {
 				productIds: this.product.productId,
 				productCount: this.number
@@ -1138,9 +1126,7 @@ export default {
 			this.$api.navigateTo(
 				`/pages/user/order/create-order?type=1&data=${JSON.stringify({ data: productStp })}`
 			)
-			setTimeout(() => {
-				this.specClass = 'none'
-			}, 200)
+			this.popupShow3 = false
 		},
 		getAddProductCart() {
 			//增加购物车成功和toast弹窗提示成功
@@ -1252,6 +1238,9 @@ export default {
 				case 2:
 					this.popupShow2 = false
 					break
+				case 3:
+					this.popupShow3 = false
+					break
 			}
 		},
 		couponChange(e) {
@@ -2328,188 +2317,11 @@ page {
 		opacity: 0;
 	}
 }
-.popup {
-	position: fixed;
-	top: 0;
-	width: 100%;
-	height: 100%;
-	z-index: 999;
-	display: none;
-	.mask {
-		position: fixed;
-		top: 0;
-		width: 100%;
-		height: 100%;
-		z-index: 21;
-		background-color: rgba(0, 0, 0, 0.6);
-	}
-	.layer {
-		position: fixed;
-		z-index: 22;
-		bottom: -294rpx;
-		width: 702rpx;
-		padding: 24rpx 24rpx 36rpx 24rpx;
-		height: 260rpx;
-		border-radius: 20rpx 20rpx 0 0;
-		background-color: #fff;
-		display: flex;
-		flex-wrap: wrap;
-		align-content: space-between;
-		.content {
-			width: 100%;
-		}
-		.btn {
-			width: 100%;
-			height: 88rpx;
-			margin-top: 20rpx;
-			.button {
-				width: 100%;
-				height: 88rpx;
-				color: #fff;
-				display: flex;
-				align-items: center;
-				justify-content: center;
-				background: $btn-confirm;
-				font-size: $font-size-28;
-				border-radius: 44rpx;
-			}
-		}
-	}
-
-	&.show {
-		display: block;
-		.mask {
-			animation: showPopup 0.2s linear both;
-		}
-		.layer {
-			animation: showLayer 0.2s linear both;
-		}
-	}
-	&.hide {
-		display: block;
-		.mask {
-			animation: hidePopup 0.2s linear both;
-		}
-
-		.layer {
-			animation: hideLayer 0.2s linear both;
-		}
-	}
-	&.none {
-		display: none;
-	}
-	&.service {
-		.row {
-			margin: 30upx 0;
-			.title {
-				font-size: 30upx;
-				margin: 10upx 0;
-			}
-			.description {
-				font-size: 28upx;
-				color: #999;
-			}
-		}
-	}
-	.layer-smimg {
-		width: 114rpx;
-		height: 114rpx;
-		float: left;
-		border-radius: 10rpx;
-		margin-right: 24rpx;
-		image {
-			width: 114rpx;
-			height: 114rpx;
-			border-radius: 10rpx;
-		}
-	}
-	.layer-nunbox {
-		justify-content: space-between;
-		align-items: center;
-		width: 536rpx;
-		height: auto;
-		float: left;
-		.layer-nunbox-t {
-			width: 100%;
-			height: 44rpx;
-			position: relative;
-			display: flex;
-			margin-bottom: 10rpx;
-			.text {
-				font-size: $font-size-24;
-				line-height: 48rpx;
-				color: #999999;
-			}
-			.layer-nunbox-text {
-				line-height: 44rpx;
-				font-size: $font-size-28;
-			}
-			.number-box {
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				border: 2rpx solid #ffe6dc;
-				border-radius: 30rpx;
-				height: 48rpx;
-				margin-left: 20rpx;
-				.iconfont {
-					font-size: $font-size-24;
-					padding: 0 18rpx;
-					color: #999999;
-					text-align: center;
-					line-height: 48rpx;
-					font-weight: bold;
-					background: #fef6f3;
-					&.icon-jianhao {
-						border-radius: 30rpx 0 0 30rpx;
-					}
-					&.icon-jiahao {
-						border-radius: 0 30rpx 30rpx 0;
-					}
-				}
-				.btn-input {
-					width: 62rpx;
-					height: 48rpx;
-					line-height: 48rpx;
-					background: #ffffff;
-					border-radius: 4rpx;
-					text-align: center;
-					font-size: $font-size-28;
-				}
-			}
-			.product-step {
-				position: absolute;
-				left: 45rpx;
-				bottom: 0;
-				height: 44rpx;
-				background: #ffffff;
-			}
-		}
-		.layer-nunbox-b {
-			width: 100%;
-			height: 44rpx;
-			margin-top: 13rpx;
-		}
-		.text {
-			line-height: 44rpx;
-			font-size: $font-size-28;
-			.p {
-				color: #ff2a2a;
-			}
-			.p:first-child {
-				margin-left: 30rpx;
-			}
-			.p.sm {
-				font-size: $font-size-24;
-			}
-		}
-	}
-}
 .tui-popup-box {
 	position: relative;
 	box-sizing: border-box;
 	min-height: 220rpx;
-	padding: 24rpx 24rpx 0 24rpx;
+	padding: 40rpx 24rpx 0 24rpx;
 	.tui-popup-close {
 		width: 90rpx;
 		height: 90rpx;
@@ -2711,6 +2523,102 @@ page {
 			}
 		}
 	}
+	.tui-shopping-main{
+		width: 100%;
+		.layer-smimg {
+			width: 114rpx;
+			height: 114rpx;
+			float: left;
+			border-radius: 10rpx;
+			margin-right: 24rpx;
+			image {
+				width: 114rpx;
+				height: 114rpx;
+				border-radius: 10rpx;
+			}
+		}
+		.layer-nunbox {
+			justify-content: space-between;
+			align-items: center;
+			width: 536rpx;
+			height: auto;
+			float: left;
+			.layer-nunbox-t {
+				width: 100%;
+				height: 44rpx;
+				position: relative;
+				display: flex;
+				margin-bottom: 10rpx;
+				.text {
+					font-size: $font-size-24;
+					line-height: 48rpx;
+					color: #999999;
+				}
+				.layer-nunbox-text {
+					line-height: 44rpx;
+					font-size: $font-size-28;
+				}
+				.number-box {
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					border: 2rpx solid #ffe6dc;
+					border-radius: 30rpx;
+					height: 48rpx;
+					margin-left: 20rpx;
+					.iconfont {
+						font-size: $font-size-24;
+						padding: 0 18rpx;
+						color: #999999;
+						text-align: center;
+						line-height: 48rpx;
+						font-weight: bold;
+						background: #fef6f3;
+						&.icon-jianhao {
+							border-radius: 30rpx 0 0 30rpx;
+						}
+						&.icon-jiahao {
+							border-radius: 0 30rpx 30rpx 0;
+						}
+					}
+					.btn-input {
+						width: 62rpx;
+						height: 48rpx;
+						line-height: 48rpx;
+						background: #ffffff;
+						border-radius: 4rpx;
+						text-align: center;
+						font-size: $font-size-28;
+					}
+				}
+				.product-step {
+					position: absolute;
+					left: 45rpx;
+					bottom: 0;
+					height: 44rpx;
+					background: #ffffff;
+				}
+			}
+			.layer-nunbox-b {
+				width: 100%;
+				height: 44rpx;
+				margin-top: 13rpx;
+			}
+			.text {
+				line-height: 44rpx;
+				font-size: $font-size-28;
+				.p {
+					color: #ff2a2a;
+				}
+				.p:first-child {
+					margin-left: 30rpx;
+				}
+				.p.sm {
+					font-size: $font-size-24;
+				}
+			}
+		}
+	}
 }
 .tui-popup-btn {
 	width: 100%;

pages/search/search.vue

@@ -1199,9 +1199,9 @@ page {
 	width: 100%;
 	min-height: 300rpx;
 	position: fixed;
-	top: 88rpx;
+	top: 180rpx;
 	left: 0;
-	z-index: 9999;
+	z-index: 888;
 }
 .s-block {
 	background: #ffffff;

pages/seller/order/create-order.vue

@@ -59,7 +59,7 @@
 			</view>
 		</view>
 		<!-- 选择对机构是否可见 -->
-		<sellerClubVisible v-if="isRequest" @handleClubVisible="handleClubVisibleData"></sellerClubVisible>
+		<sellerClubVisible ref="clubVisible"  v-if="isRequest" @handleClubVisible="handleClubVisibleData"></sellerClubVisible>
 		<!-- 售后条例 -->
 		<seller-regulations  ref="regulations"
 							 v-if="isRequest && seconDepositFlg" 
@@ -337,7 +337,8 @@
 			getFreightData(){//获取邮费信息
 				this.OrderService.GetOrderPostage(this.postageParam).then(response =>{
 					let data = response.data
-					this.freightData = this.handleFreightData = data
+					this.freightData  = data
+					this.handleFreightData = data
 					this.isFreight = true
 					if(data.postageFlag== 1){
 						this.orderShouldPayFee = this.allPrice + data.postage
@@ -377,6 +378,7 @@
 				this.confirmParam.orderInvoice = data
 			},
 			handleChoiceaFreightData(data){//获取运费信息
+				console.log('编辑运费信息',data)
 				if(data.postageFlag == 1){
 					this.handleFreightData = data
 					this.orderShouldPayFee = this.allPrice + parseInt(data.postage)
@@ -541,19 +543,26 @@
 					this.confirmParam.payInfo.balancePayFlag = 0
 					this.couponAmount = 0
 					this.confirmParam.clubCouponId = 0
+					this.confirmParam.orderSeen = 2
+					this.$refs.clubVisible.orderVisibleText = '不可见'
 					this.orderShouldPayFee = this.allPrice + parseInt(this.freightData.postage) - this.couponAmount
 					this.totalDiscountAmount = this.reducedPrice + this.couponAmount
 					this.$refs.coupon.coupon.couponAmount = 0
+					console.log('返佣订单勾选freightData',this.freightData)
 					this.$refs.freight.infoData(this.freightData)
-					this.$refs.freight.freightData = this.handleFreightData = this.freightData
+					this.$refs.freight.freightData  = this.freightData
+					this.handleFreightData = this.freightData
 				}else{
+					this.confirmParam.orderSeen = 1
+					this.$refs.clubVisible.orderVisibleText = '可见'
 					this.confirmParam.payInfo.rebateFlag=0
-					this.confirmParam.clubCouponId = this.couponList[0].clubCouponId 
+					if(this.couponList.length>0){
+						this.confirmParam.clubCouponId = this.couponList[0].clubCouponId 
+						this.$refs.coupon.coupon.couponAmount = this.couponAmount = this.couponList[0].couponAmount
+					}
 					this.totalDiscountAmount = this.reducedPrice + this.couponAmount 
-					this.$refs.coupon.coupon.couponAmount = this.couponAmount = this.couponList[0].couponAmount
 					this.orderShouldPayFee = this.allPrice + parseInt(this.freightData.postage) - this.couponAmount
-					this.$refs.freight.infoData(this.handleFreightData)
-					
+					// this.$refs.freight.infoData(this.handleFreightData)
 				}
 			},
 			

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

@@ -1,283 +1,296 @@
 <template>
-	<view class="container order clearfix" :style="{paddingBottom :isIphoneX ? '170rpx' : '134rpx'}">
+	<view class="container order clearfix" :style="{ paddingBottom: isIphoneX ? '170rpx' : '134rpx' }">
 		<view class="product-info">
-			<view class="product-logo">
-				<image :src="productInfo.mainImage" mode=""></image>
-			</view>
+			<view class="product-logo"> <image :src="productInfo.mainImage" mode=""></image> </view>
 			<view class="product-cent">
-				<view class="product-name">商品编码：{{  productInfo.productCode }}</view>
-				<view class="product-note">规格：{{  productInfo.unit }}</view>
-				<view class="product-nums">X1</view>
+				<view class="product-name">商品编码：{{ productInfo.productCode }}</view>
+				<view class="product-note">规格：{{ productInfo.unit }}</view> <view class="product-nums">X1</view>
 			</view>
 		</view>
 		<view class="created-info">
 			<view class="created-item">
 				<view class="label">商品名称：</view>
-				<input class="input" type="text" v-model="params.name" placeholder="必填，最多不超过40个汉字" maxlength="40"/>
+				<input
+					class="input"
+					type="text"
+					v-model="params.name"
+					placeholder="必填，最多不超过40个汉字"
+					maxlength="40"
+				/>
 			</view>
 			<view class="created-item">
 				<view class="label">商品价格：</view>
-				<input class="input" type="number" v-model="params.price" placeholder="必填" maxlength="20"/>
+				<input class="input" type="number" v-model="params.price" placeholder="必填" maxlength="20" />
 			</view>
 			<view class="created-item">
 				<view class="label">备注：</view>
-				<input class="input" type="text" v-model="params.note" placeholder="选填，最多不超过50个汉字" maxlength="50"/>
+				<input
+					class="input"
+					type="text"
+					v-model="params.note"
+					placeholder="选填，最多不超过50个汉字"
+					maxlength="50"
+				/>
 			</view>
 			<view class="created-item">
-				<view class="label-total">合计：<text class="red">￥{{params.price | NumFormat}}</text>  </view>
-			</view>	
+				<view class="label-total"
+					>合计：<text class="red">￥{{ params.price | NumFormat }}</text>
+				</view>
+			</view>
 		</view>
-		<view class="footer" :style="{paddingBottom :isIphoneX ? '68rpx' : '0rpx'}">
+		<view class="footer" :style="{ paddingBottom: isIphoneX ? '68rpx' : '0rpx' }">
 			<view class="footer-le">
-				<view class="footer-count">
-					<text>共1件商品</text>
-				</view>
+				<view class="footer-count"> <text>共1件商品</text> </view>
 				<view class="footer-price">
-					<view class="sum">总价:<text class="price">￥{{params.price | NumFormat}}</text></view>
+					<view class="sum"
+						>总价:<text class="price">￥{{ params.price | NumFormat }}</text></view
+					>
 				</view>
 			</view>
-			<view class="footer-submit" @click.stop="orderSubmitMit">
-				<view class="btn">提交订单</view>
-			</view>
+			<view class="footer-submit" @click.stop="orderSubmitMit"> <view class="btn">提交订单</view> </view>
 		</view>
 	</view>
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				isIphoneX:this.$store.state.isIphoneX,
-				productInfo:{},
-				userId:0,
-				params:{
-					name:'',
-					price:'', 
-					note:'', 
-					clubId:0 , 
-					serviceProviderId:0
-				}
+export default {
+	data() {
+		return {
+			isIphoneX: this.$store.state.isIphoneX,
+			productInfo: {},
+			userId: 0,
+			params: {
+				name: '',
+				price: '',
+				note: '',
+				clubId: 0,
+				serviceProviderId: 0
 			}
+		}
+	},
+	onLoad() {
+		this.initStorage()
+	},
+	filters: {
+		NumFormat(value) {
+			//处理金额
+			return Number(value).toFixed(2)
+		}
+	},
+	methods: {
+		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.params.serviceProviderId = userInfo.serviceProviderId ? userInfo.serviceProviderId : 0
+			this.getInitCrearOrder()
 		},
-		onLoad(){
-			this.initStorage()
-		},
-		filters:{
-			NumFormat(value) {//处理金额
-				return Number(value).toFixed(2);
-			},
-		},
-		methods: {
-			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.params.serviceProviderId = userInfo.serviceProviderId ? userInfo.serviceProviderId : 0
-					this.getInitCrearOrder()
-			},
-			getInitCrearOrder(option){//协销购物车跳转确认订单初始化信息
-				this.SellerService.SellerProductRechargeGoods({
-					productId:6060,
-				})
-				.then(response =>{
+		getInitCrearOrder(option) {
+			//协销购物车跳转确认订单初始化信息
+			this.SellerService.SellerProductRechargeGoods({
+				productId: 6060
+			})
+				.then(response => {
 					this.productInfo = response.data
 					console.log(this.productInfo)
 				})
-				.catch(error =>{
-					this.$util.msg(error.msg,2000)
-				})
-			},
-			orderSubmitMit(){//提交订单
-				if( this.params.name == ''){
-					this.$util.msg('请填写商品名称',2000);
-					return
-				}
-				if( this.params.price == ''){
-					this.$util.msg('请填写商品价格',2000);
-					return
-				}
-				this.SellerService.SellerSubmitRechargeOrder(this.params).then(response =>{
-					const data = response.data;
-					this.$util.msg('订单提交成功',2000,true,'success')
-					setTimeout(()=>{
-						this.$api.redirectTo(`/pages/seller/order/order-details?type=cash&orderId=${data.orderId}&userId=${this.userId}`)
-					},2000)
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000);
+				.catch(error => {
+					this.$util.msg(error.msg, 2000)
 				})
-			},
 		},
-		onShow() {
-			
+		orderSubmitMit() {
+			//提交订单
+			if (this.params.name == '') {
+				this.$util.msg('请填写商品名称', 2000)
+				return
+			}
+			if (this.params.price == '') {
+				this.$util.msg('请填写商品价格', 2000)
+				return
+			}
+			this.SellerService.SellerSubmitRechargeOrder(this.params)
+				.then(response => {
+					const data = response.data
+					this.$util.msg('订单提交成功', 2000, true, 'success')
+					setTimeout(() => {
+						this.$api.redirectTo(
+							`/pages/seller/order/order-details?type=cash&orderId=${data.orderId}&userId=${this.userId}`
+						)
+					}, 2000)
+				})
+				.catch(error => {
+					this.$util.msg(error.msg, 2000)
+				})
 		}
-	}
+	},
+	onShow() {}
+}
 </script>
 
 <style lang="scss">
-	page {
-		height: auto;
-		background:#F7F7F7;
-	}
-	.product-info{
-		width: 100%;
-		height: 228rpx;
+page {
+	height: auto;
+	background: #f7f7f7;
+}
+.product-info {
+	width: 100%;
+	height: 228rpx;
+	float: left;
+	box-sizing: border-box;
+	padding: 24rpx;
+	background-color: #ffffff;
+	.product-logo {
+		width: 180rpx;
+		height: 180rpx;
+		border-radius: 8rpx;
 		float: left;
-		box-sizing: border-box;
-		padding: 24rpx;
-		background-color: #ffffff;
-		.product-logo{
+		image {
 			width: 180rpx;
 			height: 180rpx;
+			display: block;
 			border-radius: 8rpx;
+		}
+	}
+	.product-cent {
+		width: 498rpx;
+		height: 180rpx;
+		float: right;
+		.product-name {
+			width: 100%;
+			height: 50rpx;
 			float: left;
-			image{
-				width: 180rpx;
-				height: 180rpx;
-				display: block;
-				border-radius: 8rpx;
-			}
+			line-height: 50rpx;
+			font-size: $font-size-28;
+			color: #333333;
+			text-align: left;
 		}
-		.product-cent{
-			width: 498rpx;
-			height: 180rpx;
-			float: right;
-			.product-name{
-				width: 100%;
-				height: 50rpx;
-				float: left;
-				line-height: 50rpx;
-				font-size: $font-size-28;
-				color: #333333;
-				text-align: left;
-			}
-			.product-note{
-				width: 100%;
-				height: 50rpx;
-				float: left;
-				line-height: 50rpx;
-				font-size: $font-size-28;
-				color: #999999;
-				text-align: left;
-			}
-			.product-nums{
-				width: 100%;
-				height: 50rpx;
-				float: left;
-				line-height: 50rpx;
-				font-size: $font-size-28;
-				color: #333333;
-				text-align: right;
-				margin-top: 40rpx;
-			}
+		.product-note {
+			width: 100%;
+			height: 50rpx;
+			float: left;
+			line-height: 50rpx;
+			font-size: $font-size-28;
+			color: #999999;
+			text-align: left;
 		}
-	}
-	.created-info{
-		width: 100%;
-		height: auto;
-		box-sizing: border-box;
-		padding: 24rpx;
-		background-color: #FFFFFF;
-		float: left;
-		.created-item{
+		.product-nums {
 			width: 100%;
-			height: 64rpx;
+			height: 50rpx;
 			float: left;
-			margin-bottom: 24rpx;
-			.label{
-				width: 148rpx;
-				height: 64rpx;
-				line-height: 64rpx;
-				font-size: $font-size-28;
-				text-align: left;
-				color: #666666;
-				float: left;
-			}
-			.input{
-				width: 550rpx;
-				height: 64rpx;
-				box-sizing: border-box;
-				border: 1px solid #e1e1e1;
-				padding: 0 20rpx;
-				line-height: 64rpx;
-				font-size: $font-size-26;
-				color: #666666;
-				float: left;
-				border-radius: 8rpx;
-			}
-			.label-total{
-				text-align: right;
-				font-size: $font-size-28;
-				.red{
-					color: #f94b4b;
-				}
-			}
+			line-height: 50rpx;
+			font-size: $font-size-28;
+			color: #333333;
+			text-align: right;
+			margin-top: 40rpx;
 		}
 	}
-	.footer{
-		position: fixed;
-		left: 0;
-		bottom: 0;
-		z-index: 995;
-		display: flex;
-		align-items: center;
+}
+.created-info {
+	width: 100%;
+	height: auto;
+	box-sizing: border-box;
+	padding: 24rpx;
+	background-color: #ffffff;
+	float: left;
+	.created-item {
 		width: 100%;
-		height: 110rpx;
-		line-height: 110rpx;
-		justify-content: space-between;
-		font-size: $font-size-28;
-		background-color: #FFFFFF;
-		z-index: 998;
-		color: $text-color;
-		.footer-le{
-			width:570rpx;
-			height:100%;
+		height: 64rpx;
+		float: left;
+		margin-bottom: 24rpx;
+		.label {
+			width: 148rpx;
+			height: 64rpx;
+			line-height: 64rpx;
+			font-size: $font-size-28;
+			text-align: left;
+			color: #666666;
 			float: left;
 		}
-		.footer-count{
-			float: left;
-			padding-left: 24rpx;
-			width:190rpx;
+		.input {
+			width: 550rpx;
+			height: 64rpx;
 			box-sizing: border-box;
+			border: 1px solid #e1e1e1;
+			padding: 0 20rpx;
+			line-height: 64rpx;
 			font-size: $font-size-26;
+			color: #666666;
+			float: left;
+			border-radius: 8rpx;
 		}
-		.footer-price{
-			width:370rpx;
-			float: right;
+		.label-total {
 			text-align: right;
-			color: $text-color;
-			padding: 10rpx 20rpx 10rpx 0;
-			box-sizing: border-box;
-			.sum{
-				width: 100%;
-				height: 90rpx;
-				line-height: 90rpx;
-				float: left;
-				.price{
-					font-size: $font-size-32;
-					color: #FF2A2A;
-				}
+			font-size: $font-size-28;
+			.red {
+				color: #f94b4b;
 			}
-			
 		}
-		.footer-submit{
-			display:flex;
-			align-items:center;
-			justify-content: center;
-			width: 180rpx;
-			height: 100%;
-			box-sizing: border-box;
-			padding: 15rpx 5rpx;
-			.btn{
-				width: 100%;
-				height: 100%;
-				color: #FFFFFF;
-				background:linear-gradient(135deg,rgba(242,143,49,1) 0%,rgba(225,86,22,1) 100%);
-				font-size: $font-size-26;
-				text-align: center;
-				line-height: 80rpx;
-				border-radius: 40rpx;
+	}
+}
+.footer {
+	position: fixed;
+	left: 0;
+	bottom: 0;
+	z-index: 995;
+	display: flex;
+	align-items: center;
+	width: 100%;
+	height: 110rpx;
+	line-height: 110rpx;
+	justify-content: space-between;
+	font-size: $font-size-28;
+	background-color: #ffffff;
+	z-index: 998;
+	color: $text-color;
+	.footer-le {
+		width: 570rpx;
+		height: 100%;
+		float: left;
+	}
+	.footer-count {
+		float: left;
+		padding-left: 24rpx;
+		width: 190rpx;
+		box-sizing: border-box;
+		font-size: $font-size-26;
+	}
+	.footer-price {
+		width: 370rpx;
+		float: right;
+		text-align: right;
+		color: $text-color;
+		padding: 10rpx 20rpx 10rpx 0;
+		box-sizing: border-box;
+		.sum {
+			width: 100%;
+			height: 90rpx;
+			line-height: 90rpx;
+			float: left;
+			.price {
+				font-size: $font-size-32;
+				color: #ff2a2a;
 			}
 		}
 	}
+	.footer-submit {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		width: 180rpx;
+		height: 100%;
+		box-sizing: border-box;
+		padding: 15rpx 5rpx;
+		.btn {
+			width: 100%;
+			height: 100%;
+			color: #ffffff;
+			background: linear-gradient(135deg, rgba(242, 143, 49, 1) 0%, rgba(225, 86, 22, 1) 100%);
+			font-size: $font-size-26;
+			text-align: center;
+			line-height: 80rpx;
+			border-radius: 40rpx;
+		}
+	}
+}
 </style>

pages/tabBar/home/index.vue

@@ -176,7 +176,9 @@
                     }
 					this.GetHomeTopDataInfo()
 					this.GetHomeFloorInfo()
-                    this.initShoppingCartCount()
+					if(this.hasLogin){
+						this.initShoppingCartCount()
+					}
                     this.isNavRequest = true
 				}).catch(error =>{
 					this.$util.msg(error.msg,2000)

pages/user/order/create-order.vue

@@ -615,9 +615,28 @@
 					this.confirmParam.payInfo = JSON.parse(this.confirmParam.payInfo)
 					this.confirmParam.orderInfo = JSON.parse(this.confirmParam.orderInfo)
 					this.confirmParam.orderInvoice = JSON.parse(this.confirmParam.orderInvoice)
-					if(error.code == -3){
+					if(error.code == -3){// 已提交2个小于1000元的订单提示
 						this.showModal = true
-						this.contentModalText = error.msg  //操作文字提示语句
+						this.contentModalText = '您已有2个采购金额过小的订单，本次不能再进行采购。建议您前往采美旗下“呵呵商城”小程序购买小额商品。'  //操作文字提示语句
+						this.showModalstauts = 3
+						this.modalButton=[
+							{
+								text: '了解',
+								type: 'gray',
+								plain: true //是否空心
+							},
+							{
+								text: '前往呵呵商城',
+								customStyle: {
+									color: '#fff',
+									bgColor: 'linear-gradient(90deg, #F28F31 0%, #E15616 100%)'
+								},
+								plain: false
+							}
+						]
+					}else if(error.code == -4){// 采美豆为负数
+						this.showModal = true
+						this.contentModalText = '采美豆不足，不能提交订单。建议您前往采美旗下“呵呵商城”小程序购买小额商品。'  //操作文字提示语句
 						this.showModalstauts = 3
 						this.modalButton=[
 							{