修复

components/cm-module/cart-components/cm-unit-popup.vue

@@ -65,8 +65,8 @@
 					</view>
 				</view>
 				<view class="sku-unit-nunbox">
-					<view class="sku-unit-nunbox" v-if="skuProduct.step === 2">
-						<view class="text">*该商品只能以起订量的整数倍购买</view>
+					<view class="sku-unit-nunbox-t" v-if="skuProduct.step === 2">
+						<view class="text">该商品只能以起订量的整数倍购买</view>
 					</view>
 					<view class="sku-unit-nunbox-t">
 						<view class="sku-unit-nunbox-text">购买数量:</view>
@@ -365,7 +365,7 @@ export default {
 			.text {
 				font-size: $font-size-24;
 				line-height: 48rpx;
-				color: #999999;
+				color: #FF5B00;
 			}
 			.sku-unit-nunbox-text {
 				line-height: 44rpx;

components/cm-module/cart-components/index.vue

@@ -725,6 +725,7 @@ export default {
 						this.goodsList.forEach((supplier, index) => {
 							supplier.cartList.forEach(pros => {
 								pros.shopId = supplier.shopId
+								pros.productCount = pros.number
 								pros.isStep = false
 								if(pros.stock === 0 || pros.number > pros.stock ){
 								    supplier.isDisable = true
@@ -1234,7 +1235,7 @@ export default {
 			//输入商品数量更新
 			let _value = Number(e.detail.value)
 			if (!this.$api.isNumber(_value)) {
-				pros.number = pros.min
+				pros.number = pros.productCount
 			} else if (_value < pros.min) {
 				this.$util.msg(`该商品最小起订量为${pros.min}`, 2000)
 				pros.number = pros.min
@@ -1242,7 +1243,7 @@ export default {
 				if (pros.step === 2) {
 					if (_value % pros.min != 0) {
 						pros.isStep = true
-						pros.number = pros.min
+						pros.number = pros.productCount
 					}
 				}else{
 					pros.isStep = false
@@ -1252,6 +1253,10 @@ export default {
 			}
 			this.updateShoppogNum(pros)
 			this.totalShopPeice()
+			setTimeout(()=>{
+				pros.isStep = false
+				this.$forceUpdate()
+			},2000)
 		},
 		processActivityPrice(pros) {
 			//单独处理活动价格和阶梯价格

components/cm-module/homeIndex/navbars.vue

@@ -5,7 +5,7 @@
 				<view class="icon"> <image class="icon-image" :src="item.icon" mode="widthFix"></image> </view>
 				<view class="name">{{ item.name }}</view>
 			</view>
-			<view class="nav-item" @click="handleMore" v-if="list.length === 9">
+			<view class="nav-item" @click="handleMore" v-if="list.length === 9 || list.length > 9">
 				<view class="icon">
 					<image
 						class="icon-image"

components/cm-module/productDetails/cm-unit-popup.vue

@@ -70,8 +70,8 @@
 					</view>
 				</view>
 				<view class="sku-unit-nunbox">
-					<view class="sku-unit-nunbox" v-if="skuProduct.step === 2">
-						<view class="text">*该商品只能以起订量的整数倍购买</view>
+					<view class="sku-unit-nunbox-t" v-if="skuProduct.step === 2">
+						<view class="text">该商品只能以起订量的整数倍购买</view>
 					</view>
 					<view class="sku-unit-nunbox-t">
 						<view class="sku-unit-nunbox-text">购买数量:</view>
@@ -294,8 +294,16 @@ export default {
 					productCount: this.productCount
 				})
 			} else {
-				this.addParams.productCount = this.productCount
-				this.handleAddClubCart(this.addParams)
+				if (this.skuProduct.step == 2) {
+					if (this.productCount % this.handleMinNumber != 0) {
+						this.$util.msg('购买量必须为起订量的整数倍', 2000)
+						this.productCount = this.handleMinNumber
+						return
+					}
+				}else{
+					this.addParams.productCount = this.productCount
+					this.handleAddClubCart(this.addParams)
+				}
 			}
 		},
 		handleToConfirm(data) {
@@ -452,7 +460,7 @@ export default {
 			.text {
 				font-size: $font-size-24;
 				line-height: 48rpx;
-				color: #999999;
+				color: #FF5B00;
 			}
 			.sku-unit-nunbox-text {
 				line-height: 44rpx;

pages/login/register.vue

@@ -96,7 +96,7 @@
             </view>
             <view class="register-main clearfix">
                 <view class="register-agree">
-                    <view class="agree-text" @tap.stop="agreeCheck()">
+                    <view class="agree-text" @tap.stop="agreeCheck">
                         <button
                             class="checkbox iconfont"
                             :class="[isCheck ? 'icon-gouxuan' : 'icon-weigouxuan']"

pages/seller/cart/cart.vue

@@ -454,7 +454,7 @@ export default {
 							let cartListLength = supplier.cartList.length,
 								invalidLength = 0
 							supplier.cartList.forEach(pros => {
-								pros.shopId = supplier.shopId
+								pros.productCount = pros.number
 								pros.isStep = false
 								if (pros.stock === 0 || pros.number > pros.stock) {
 									supplier.isDisable = true
@@ -523,7 +523,7 @@ export default {
 						let productsListLength = supplier.cartList.length,
 							invalidLength = 0
 						supplier.cartList.forEach(pros => {
-							pros.shopId = supplier.shopId
+							pros.productCount = pros.number
 							pros.isStep = false
 							if (pros.stock === 0 || pros.number > pros.stock) {
 								supplier.isDisable = true
@@ -937,7 +937,7 @@ export default {
 			//输入商品数量更新
 			let _value = e.detail.value
 			if (!this.$api.isNumber(_value)) {
-				pros.number = pros.min
+				pros.number = pros.productCount
 			} else if (_value < pros.min) {
 				this.$util.msg(`该商品最小起订量为${pros.min}`, 2000)
 				pros.number = pros.min
@@ -945,7 +945,7 @@ export default {
 				if (pros.step === 2) {
 					if (_value % pros.min != 0) {
 						pros.isStep = true
-						pros.number = pros.min
+						pros.number = pros.productCount
 					}
 				}else{
 					pros.isStep = false
@@ -955,6 +955,10 @@ export default {
 			}
 			this.updateShoppogNum(pros)
 			this.totalShopPeice()
+			setTimeout(()=>{
+				pros.isStep = false
+				this.$forceUpdate()
+			},2000)
 		},
 		processActivityPrice(pros) {
 			//单独处理活动价格和阶梯价格

pages/seller/cart/components/cm-unit-popup.vue

@@ -68,8 +68,8 @@
 					</view>
 				</view>
 				<view class="sku-unit-nunbox">
-					<view class="sku-unit-nunbox" v-if="skuProduct.step === 2">
-						<view class="text">*该商品只能以起订量的整数倍购买</view>
+					<view class="sku-unit-nunbox-t" v-if="skuProduct.step === 2">
+						<view class="text">该商品只能以起订量的整数倍购买</view>
 					</view>
 					<view class="sku-unit-nunbox-t">
 						<view class="sku-unit-nunbox-text">购买数量:</view>
@@ -231,13 +231,23 @@ export default {
 			} else if (_value < this.handleMinNumber) {
 				this.$util.msg(`该商品最小起订量为${this.handleMinNumber}`, 2000)
 				this.productCount = this.handleMinNumber
-			} else if (_value % this.handleMinNumber != 0) {
-				this.$util.msg('购买量必须为起订量的整数倍', 2000)
-				this.productCount = this.handleMinNumber
-			} else if (_value > this.handleStock) {
-				this.productCount = this.handleStock
-			} else {
-				this.productCount = e.detail.value
+			} else{
+				if (this.skuProduct.step == 2) {
+					if (_value % this.handleMinNumber != 0) {
+						this.$util.msg('购买量必须为起订量的整数倍', 2000)
+						this.productCount = this.handleMinNumber
+					} else if (_value > this.handleStock) {
+						this.productCount = this.handleStock
+					} else {
+						this.productCount = _value
+					}
+				}else{
+					if (_value > this.handleStock) {
+						this.productCount = this.handleStock
+					} else {
+						this.productCount = _value
+					}
+				}
 			}
 			this.totalLadderPrice()
 		},
@@ -250,11 +260,18 @@ export default {
 					}
 				})
 			}
-			console.log('22222222',this.skuProduct.price)
 		},
 		handleBuyConfirm() {
-			this.addParams.productCount = this.productCount
-			this.handleAddClubCart(this.addParams)
+			if (this.skuProduct.step == 2) {
+				if (this.productCount % this.handleMinNumber != 0) {
+					this.$util.msg('购买量必须为起订量的整数倍', 2000)
+					this.productCount = this.handleMinNumber
+					return
+				}
+			}else{
+				this.addParams.productCount = this.productCount
+				this.handleAddClubCart(this.addParams)
+			}
 		},
 		handleAddClubCart(params) {
 			//增加购物车成功和toast弹窗提示成功
@@ -411,7 +428,7 @@ export default {
 			.text {
 				font-size: $font-size-24;
 				line-height: 48rpx;
-				color: #999999;
+				color: #FF5B00;
 			}
 			.sku-unit-nunbox-text {
 				line-height: 44rpx;

pages/seller/club/list.vue

@@ -312,7 +312,8 @@ export default {
 			this.getList()
 		},
 		async getList() {
-			try{
+			try{
+				this.listQuery.pageNum = 1
 				const res = await this.SellerService.GetSellerClubList(this.listQuery)
 				const data = res.data
 				if (data.list && data.list.length > 0) {
@@ -344,7 +345,7 @@ export default {
 		},
 		async getOnReachBottomData() {
 			try{
-				this.listQuery.pageNum ++
+				this.listQuery.pageNum++
 				const res = await this.SellerService.GetSellerClubList(this.listQuery)
 				const data = res.data
 				if (data.list && data.list.length > 0) {
@@ -404,12 +405,10 @@ export default {
 				case 0:
 					this.tabCurrentIndex = 0
 					this.listQuery.status = 90
-					this.listQuery.pageNum = 1
 					this.listQuery.userIdentity = 4
 					this.getList()
 					break
 				case 1:
-					this.listQuery.pageNum = 1
 					this.listQuery.status = 90
 					this.listQuery.userIdentity = 2
 					this.getList()
@@ -423,19 +422,16 @@ export default {
 				case 0:
 					this.tabCurrentIndex = 0
 					this.listQuery.type = 1
-					this.listQuery.pageNum = 1
 					this.listQuery.groupServiceId = 0
 					this.getList()
 					break
 				case 1:
 					this.listQuery.type = this.isManage ? 2 : 6
-					this.listQuery.pageNum = 1
 					this.listQuery.groupServiceId = 0
 					this.getList()
 					break
 				case 2:
 					this.listQuery.type = 6
-					this.listQuery.pageNum = 1
 					this.listQuery.groupServiceId = 0
 					this.getList()
 					break
@@ -445,7 +441,6 @@ export default {
 			console.log('确定筛选', data)
 			//确定筛选
 			this.listQuery = { ...this.listQuery, ...data }
-			this.listQuery.pageNum = 1
 			this.getList()
 		},
 		handleChoiceaSellerData(data) {

pages/seller/login/information.vue

@@ -47,7 +47,7 @@
 			</view>
 			<view class="register-fiexd clearfix">
 				<view class="register-agree">
-					<view class="agree-text"  @tap.stop="agreeCheck()">
+					<view class="agree-text"  @tap.stop="agreeCheck">
 						<button class="checkbox iconfont" :class="[isCheck ?'icon-gouxuan':'icon-weigouxuan']"></button> 
 						我已阅读并同意
 						<text @click.stop="this.$api.navigateTo('/pages/service/service?id=1036&title=机构协议')">《机构协议》</text>
@@ -310,7 +310,7 @@
 				isDisabled:true,
 				isShowInput:true,
 				textareaFocus:false,
-				isCheck:true,			//是否勾选协议
+				isCheck:false,			//是否勾选协议
 				businessLicense:'',	//营业执照图片
 				shopPhoto:'',  	//门头照图片
 				medicalPracticeLicense:'', 	//资质照图片

pages/seller/login/register.vue

@@ -34,7 +34,7 @@
 					<text>收起<text class="iconfont icon-xiangshangjiantou"></text></text>
 				</view>
 				<view class="register-agree">
-					<view class="agree-text"  @tap.stop="agreeCheck()">
+					<view class="agree-text"  @tap.stop="agreeCheck">
 						<button class="checkbox iconfont" :class="[isCheck?'icon-gouxuan':'icon-weigouxuan']"></button> 
 						我已阅读并同意
 						<text @click.stop="this.$api.navigateTo('/pages/service/service?id=1036&title=机构协议')">《机构协议》</text>