购物车倍数增长

api/use.js

@@ -270,7 +270,7 @@ export function userInfoLogin(params) {
 			if(res.code == 0 || res.code == 4){
 				resolve(res)
 			}else if(res.code == -6){
-				resolve(res)
+				reject(res)
 			}else{
 				reject(res)
 			}

components/cm-module/orderDetails/goodsList.vue

@@ -112,6 +112,10 @@
 					}
 				}
 				.title-text{
+					width: 630rpx;
+					overflow: hidden;
+					text-overflow:ellipsis;
+					white-space: nowrap;
 					float: left;
 					margin-left: 16rpx;
 					font-size: $font-size-28;

components/cm-module/orderDetails/supplierRecorgButton.vue

@@ -2,7 +2,7 @@
 	<view class="button-template">
 		<!-- 底部按钮 -->
 		<view class="button-content">
-			<view class="btn btn-color" @click.stop="btnConfirm('cancel',hanldData)">撤销发货</view>
+			<view class="btn btn-color" v-if="hanldData.mailer == 1" @click.stop="btnConfirm('cancel',hanldData)">撤销发货</view>
 			<view class="btn btn-color" @click.stop="btnConfirm('add',hanldData)">添加物流</view>
 		</view>
 	</view>

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

@@ -18,6 +18,7 @@
 			</view>
 			<view class="info-viewT" :class="goodsData.isNoneDisabled ? 'none' : ''" v-if="product.productCode!=''&&product.productCode!=null">
 				<view class="info-viewL tui-skeleton-fillet">商品编码：<text>{{product.productCode}}</text></view>
+				<view class="info-viewR tui-skeleton-fillet">库存：<text>{{product.stock}}</text></view>
 			</view>
 		</view>
 		<view class="wrap-seve" :class="goodsData.isNoneDisabled ? 'none' : ''">

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

@@ -15,10 +15,6 @@
 					<view class="p-minBuy">起订量:<text class="min-text">{{minBuyNumber}}</text></view>
 				</view>
 				<view class="wrap-ladder" v-else>
-					<view class="ladder-text">
-						<text class="ladder-h1">说明：</text>
-						<text class="ladder-p">本商品有以下优惠购物方案</text>
-					</view>
 					<view class="ladder-main tui-skeleton-fillet">
 						<view class="ladder-left">
 							<view class="ladder-b">起订量:</view>
@@ -55,10 +51,6 @@
 					<view class="p-minBuy">起订量:<text class="min-text">{{minBuyNumber}}</text></view>
 				</view>
 				<view class="wrap-ladder" v-else>
-					<view class="ladder-text">
-						<text class="ladder-h1">说明：</text>
-						<text class="ladder-p">本商品有以下优惠购物方案</text>
-					</view>
 					<view class="ladder-main tui-skeleton-fillet">
 						<view class="ladder-left">
 							<view class="ladder-b">起订量:</view>
@@ -91,10 +83,6 @@
 					<view class="p-minBuy">起订量:<text class="min-text">{{minBuyNumber}}</text></view>
 				</view>
 				<view class="wrap-ladder" v-else>
-					<view class="ladder-text">
-						<text class="ladder-h1">说明：</text>
-						<text class="ladder-p">本商品有以下优惠购物方案</text>
-					</view>
 					<view class="ladder-main tui-skeleton-fillet">
 						<view class="ladder-left">
 							<view class="ladder-b">起订量:</view>
@@ -120,7 +108,6 @@
 		props:{
 			product:{
 				type:Object,
-				default: {}
 			},
 			userIdentity: {
 				type: Number,
@@ -128,15 +115,12 @@
 			},
 			ladderPriceList:{
 				type: Array,
-				default:[]
 			},
 			retailPrice:{
 				type:String,
-				default:0.00
 			},
 			smallMoney:{
 				type:String,
-				default:0.00
 			},
 			minBuyNumber:{
 				type: Number,

components/cm-module/productDetails/supplierDetails.vue

@@ -25,7 +25,7 @@
 			</view>
 			<view class="sup-conte">
 				<view class="conte-l">
-					<text class="tit-l">经营品项:</text>
+					<text class="tit-l">经营范围:</text>
 				</view>
 				<view class="conte-r" v-if="shop.businessScopeArray.length>0">
 					<text class="age" v-for="(item,idx) in shop.businessScopeArray" :key="idx">{{item}}</text>

pages/goods/cart.vue

@@ -40,6 +40,8 @@
 													{{pros.retailPrice?pros.retailPrice.toFixed(2):''}}
 												</view>
 												<view class="count" v-if="pros.validFlag == '2'"  :class="[isshowDelbtn ? 'none':'show']">
+													<text class="count-tips" v-if="pros.productCount<pros.minBuyNumber">起订量:{{pros.minBuyNumber}}</text>
+													<text class="count-tips step" v-if="pros.isStep">购买量必须为起订量的整数倍</text>
 													<view class="number-box">
 														<view  class="iconfont icon-jianhao" :class="[pros.validFlag == '3'?'disabled':'']" @click="changeCountSub(item,pros)"></view>
 														<input class="btn-input" type="number" maxlength='4' v-model="pros.productCount" @blur="changeNnmber($event,item,pros)" @focus="changeInput(pros)">
@@ -162,6 +164,7 @@
 				skeletonShow:true,
 				isshowDelbtn:false,
 				isDisabled: false, // 供应商/店铺全选是否禁用状态
+				isNoConfim:false,
 				isEmpty:false,//显示空购物车
 				scrollHeight: 'auto',
 				nomoreText: '上拉显示更多',
@@ -237,6 +240,11 @@
 								pros.shopID = item.shopID;
 								pros.isStep = false
 								if(pros.validFlag == '3' ) {invalidLength++;}
+								if(pros.step === 2){
+									pros.productCount = pros.minBuyNumber 
+									this.totalShopPeice()
+									this.updateShoppogNum(pros)
+								}
 							})
 							item.isDisabled = invalidLength === productsListLength;
 						})
@@ -540,23 +548,22 @@
 					if(this.isNoConfim){
 						this.$util.modal('','有商品的购买量没达到最小起订量，请修改数量后再次提交结算','去修改','',false,() =>{})
 						return;
-					}else{
-						let productID = '';
-						this.goodsList.forEach(el=>{//获取勾选的商品ID拼接字符串逗号隔开，最后一个逗号去掉
-							el.productsList.forEach(pros=>{
-								if(pros.productsChecked){
-								   productID += pros.productID+','
-								}
-							})
-						})
-						let cartPramsData={
-								allPrice:this.allPrice,
-								allCount:this.allCount,
-								productID:productID.substring(0,productID.lastIndexOf(',')),
-								productCount:''
-						    }
-						this.$api.navigateTo(`/pages/user/order/create-order?data=${JSON.stringify({data:cartPramsData})}`)
 					}
+					let productID = '';
+					this.goodsList.forEach(el=>{//获取勾选的商品ID拼接字符串逗号隔开，最后一个逗号去掉
+						el.productsList.forEach(pros=>{
+							if(pros.productsChecked){
+							   productID += pros.productID+','
+							}
+						})
+					})
+					let cartPramsData={
+							allPrice:this.allPrice,
+							allCount:this.allCount,
+							productID:productID.substring(0,productID.lastIndexOf(',')),
+							productCount:''
+						}
+					this.$api.navigateTo(`/pages/user/order/create-order?data=${JSON.stringify({data:cartPramsData})}`)
 				}
 			},
 			showDelManager(){//显示删除商品管理
@@ -820,6 +827,11 @@
 				padding: 10rpx;
 			}
 			.text{
+				display: block;
+				overflow: hidden;
+				text-overflow:ellipsis;
+				white-space: nowrap;
+				text-align: right;
 				margin-left: 37rpx;
 				font-size: $font-size-28;
 				color: $text-color;

pages/goods/product.vue

@@ -155,12 +155,15 @@
 			<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 ?'-332rpx' : '-294rpx'}">
+				<view class="layer" @tap.stop="discard" :style="{paddingBottom :isIphoneX ? '68rpx' : '36rpx',bottom:isIphoneX ?'-354rpx' : '-294rpx'}">
 					<view class="content">
 						<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">
+								<view class="text">*该商品只能以起订量的整数倍购买</view>
+							</view>
 							<view class="layer-nunbox-t">
 								<view class="layer-nunbox-text">数量:</view>
 								<view class="number-box">
@@ -916,7 +919,10 @@
 		background-color: #FFFFFF;
 		margin-bottom: 24rpx;
 		position: relative;
+		display: flex;
 		.title{
+			display: flex;
+			flex: 2;
 			line-height: 88rpx;
 			display: inline-block;
 			float: left;
@@ -924,6 +930,8 @@
 			color: $text-color;
 		}
 		.name{
+			display: flex;
+			flex: 2;
 			line-height: 88rpx;
 			display: inline-block;
 			float: left;
@@ -931,6 +939,10 @@
 			color: #D0D0D0;
 			float: right;
 			padding-right: 48rpx;
+			overflow: hidden;
+			text-overflow:ellipsis;
+			white-space: nowrap;
+			text-align: right;
 		}
 		.icon-xiayibu{
 			line-height: 88rpx;
@@ -1204,7 +1216,7 @@
 			bottom: -294rpx;
 			width: 702rpx;
 			padding: 24rpx 24rpx 36rpx 24rpx;
-			height: 236rpx;
+			height: 260rpx;
 			border-radius: 30rpx 30rpx 0 0;
 			background-color: #fff;
 			display: flex;
@@ -1216,6 +1228,7 @@
 			.btn {
 				width: 100%;
 				height: 88rpx;
+				margin-top: 20rpx;
 				.button {
 					width: 100%;
 					height: 88rpx;
@@ -1281,14 +1294,19 @@
 			justify-content: space-between;
 			align-items: center;
 			width: 536rpx;
-			height: 88rpx;
-			padding: 13rpx 0 0 0;
+			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;

pages/search/search-order.vue

@@ -720,6 +720,10 @@
 			}
 		}
 		.title-text{
+			width: 630rpx;
+			overflow: hidden;
+			text-overflow:ellipsis;
+			white-space: nowrap;
 			float: left;
 			margin-left: 16rpx;
 			font-size: $font-size-28;

pages/tabBar/cart/cart.vue

@@ -230,6 +230,11 @@
 								pros.shopID = item.shopID;
 								pros.isStep = false
 								if(pros.validFlag == '3' ) {invalidLength++;}
+								if(pros.step === 2){ 
+									pros.productCount = pros.minBuyNumber 
+									this.totalShopPeice()
+									this.updateShoppogNum(pros)
+								}
 							})
 							item.isDisabled = invalidLength === productsListLength;
 						})
@@ -437,6 +442,7 @@
 			},		
 			changeCountAdd(item,pros){//商品数量加加
 				if(pros.step === 2){
+					pros.isStep = false
 					pros.productCount += pros.minBuyNumber
 					this.processActivityPrice(pros)
 					this.isStock = false
@@ -455,6 +461,7 @@
 					return
 				}else{
 					if(pros.step === 2){
+						pros.isStep = false
 						pros.productCount -= pros.minBuyNumber
 					}else{
 						pros.productCount--
@@ -534,23 +541,22 @@
 					if(this.isNoConfim){
 						this.$util.modal('','有商品的购买量没达到最小起订量，请修改数量后再次提交结算','去修改','',false,() =>{})
 						return;
-					}else{
-						let productID = '';
-						this.goodsList.forEach(el=>{//获取勾选的商品ID拼接字符串逗号隔开，最后一个逗号去掉
-							el.productsList.forEach(pros=>{
-								if(pros.productsChecked){
-								   productID += pros.productID+','
-								}
-							})
-						})
-						let cartPramsData={
-								allPrice:this.allPrice,
-								allCount:this.allCount,
-								productID:productID.substring(0,productID.lastIndexOf(',')),
-								productCount:''
-						    }
-						this.$api.navigateTo(`/pages/user/order/create-order?data=${JSON.stringify({data:cartPramsData})}`)
 					}
+					let productID = '';
+					this.goodsList.forEach(el=>{//获取勾选的商品ID拼接字符串逗号隔开，最后一个逗号去掉
+						el.productsList.forEach(pros=>{
+							if(pros.productsChecked){
+							   productID += pros.productID+','
+							}
+						})
+					})
+					let cartPramsData={
+							allPrice:this.allPrice,
+							allCount:this.allCount,
+							productID:productID.substring(0,productID.lastIndexOf(',')),
+							productCount:''
+						}
+					this.$api.navigateTo(`/pages/user/order/create-order?data=${JSON.stringify({data:cartPramsData})}`)
 				}
 			},
 			showDelManager(){//显示删除商品管理
@@ -814,6 +820,10 @@
 				padding: 10rpx;
 			}
 			.text{
+				display: block;
+				overflow: hidden;
+				text-overflow:ellipsis;
+				white-space: nowrap;
 				margin-left: 37rpx;
 				font-size: $font-size-28;
 				color: $text-color;

pages/tabBar/home/home.vue

@@ -300,7 +300,8 @@
 				console.log(e.detail.query)
 			},
 			showTost(){
-				this.$util.msg("正在开发中，敬请期待~",2000)
+				this.$api.navigateTo(`/supplier/pages/login/share-info?scene=scene`)
+				// this.$util.msg("正在开发中，敬请期待~",2000)
 				// uni.navigateToMiniProgram({
 				// 	appId: 'wx5a5cda32926f55ac',
 				// 	path: '/pages/tabBar/home/home',

pages/user/order/order-list.vue

@@ -613,6 +613,10 @@
 			}
 		}
 		.title-text{
+			width: 630rpx;
+			overflow: hidden;
+			text-overflow:ellipsis;
+			white-space: nowrap;
 			float: left;
 			margin-left: 16rpx;
 			font-size: $font-size-28;

seller/pages/club/allClub-list.vue

@@ -223,7 +223,6 @@
 	page,.container{
 		/* padding-bottom: 120upx; */
 		background: #F7F7F7;
-		border-top: 1px solid #EBEBEB;
 	}
 	.container{
 		position: relative;

seller/pages/club/club-list.vue

@@ -202,7 +202,6 @@
 	page,.container{
 		/* padding-bottom: 120upx; */
 		background: #F7F7F7;
-		border-top: 1px solid #EBEBEB;
 	}
 	.container{
 		position: relative;

seller/pages/club/list.vue

@@ -278,7 +278,6 @@
 	page,.container{
 		/* padding-bottom: 120upx; */
 		background: #F7F7F7;
-		border-top: 1px solid #EBEBEB;
 	}
 	.container{
 		position: relative;

supplier/pages/deliver/add-logistics.vue

@@ -23,7 +23,7 @@
 		<view class="logistics-btn">
 			<view class="btn add-btn" @click="addListFn">添加物流</view>
 		</view>
-		<view class="logistics-btn-fiexd" :style="{paddingBottom :isIphoneX ? '68rpx' : '0'}">
+		<view class="logistics-btn-fiexd" :style="{paddingBottom :isIphoneX ? '68rpx' : '34rpx'}">
 			<view class="btn-tips" @click.stop="showShowRemarksFn">
 				<text class="iconfont icon-xiangxiajiantou" v-if="isShowRemarks"></text>
 				<text class="iconfont icon-xiangshangjiantou" v-else></text>

supplier/pages/deliver/deliver-record.vue

@@ -9,7 +9,7 @@
 			</view>
 		</view>
 		<view class="record-content" v-else>
-			<scroll-view scroll-y="true" >
+			<scroll-view scroll-y="true" class="scroll-view">
 				<view class="record-list clearfix"  v-for="(item,index) in RecordList" :key="index">
 					<view class="record-top clearfix">
 						<view class="top-view">
@@ -17,9 +17,9 @@
 							<view class="top-viewtext">{{item.deliveryTime}}</view>
 						</view>
 						<view class="top-view">
-							<view class="top-viewlabel">申通快递:</view>
+							<view class="top-viewlabel" v-for="(logist,idx) in item.logisticsInformationList" :key="logist.id">{{logist.logisticsCompanyName}}:</view>
 							<view class="top-viewtext">
-								<text v-for="(logist,idx) in item.logisticsInformationList" :key="logist.id">{{logist.nu}}</text>
+								<text>{{logist.nu}}</text>
 							</view>
 						</view>
 					</view>
@@ -272,6 +272,9 @@
 	.record-content{
 		position: relative;
 		border-top: 1px solid #EBEBEB;
+		.scroll-view{
+			height: 100%;
+		}
 	}
 	.record-content-empty{
 		width: 100%;

supplier/pages/login/share-info.vue

@@ -16,7 +16,7 @@
 				invitationCode:'',
 				imagePath:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/06/%E6%97%A0%E6%9D%83%E9%99%90%402x.png',
 				serviceProviderId:'',
-				shopOrderId:'',
+				shopOrderId:16098,
 				source:1,
 				shareCode:'',
 				authority:'',//用户权限
@@ -24,8 +24,9 @@
 		},
 		onLoad(option) {
 			// scene 需要使用 decodeURIComponent 才能获取到生成二维码时传入的 scene
-			if(option.scene){
-				this.shopOrderId =Number(decodeURIComponent(option.scene))
+			if(option.scene == 'scene'){
+				this.shopOrderId = 16098
+				// this.shopOrderId = Number(decodeURIComponent(option.scene))
 			}else{
 				this.shopOrderId = option.shopOrderId
 				this.authority = option.authority

supplier/pages/order/order-service-details.vue

@@ -80,7 +80,7 @@
 								售价:<text style="color: #666;">￥{{toFixedFn(handleData.discountPrice)}}</text>
 							</view>
 							<view class="layer-text-fr">
-								<text style="color: #666;">共计{{handleData.num}}件商品</text>
+								<text style="color: #666;">共计{{handleData.num+handleData.presentNum}}件商品</text>
 							</view>
 						</view>
 					</view>