V6.2.4

components/cm-module/orderDetails/orderInformation.vue

@@ -4,7 +4,7 @@
 		 <view class="information-content">
 			<view class="information-view num">
 				<view class="view-num">
-					<text class="bage-buss" v-if="orderData.orderSubmitType == 3">协销</text>
+					<text class="bage-buss" v-if="orderData.orderSubmitType == 3 || orderData.orderSubmitType == 4">协销</text>
 					<text class="bage-auto" v-if="orderData.orderSubmitType == 0 || orderData.orderSubmitType == 1 ||orderData.orderSubmitType == 2">自主</text>
 					<text class="bage-text">订单编号：{{orderData.orderNo =='undefined' ? '' : orderData.orderNo}}</text>
 				</view>

pages/search/search-order.vue

@@ -32,7 +32,7 @@
 						<view  class="tui-order-item" v-for="(order,orderIndex) in orderList" :key="orderIndex" @click.stop="detail(order.orderID)">
 							<view class="order-title">
 								<view class="order-title-t">
-									<text class="bage-buss tui-skeleton-fillet" v-if="order.orderSubmitType == 3">协销</text>
+									<text class="bage-buss tui-skeleton-fillet" v-if="order.orderSubmitType == 3 || order.orderSubmitType == 4">协销</text>
 									<text class="bage-auto tui-skeleton-fillet" v-if="order.orderSubmitType == 0 || order.orderSubmitType == 1 || order.orderSubmitType == 2">自主</text>
 									<text class="bage-text tui-skeleton-fillet">订单号：{{order.orderNo}}</text>
 								</view>

pages/tabBar/cart/cart.vue

@@ -306,6 +306,7 @@
 				let goodsCheckedLength = 0,
 					disabledListLength = 0,
 					goodsList = this.goodsList;
+					
 				goodsList.forEach(item => {
 					if(item.checked) {
 						goodsCheckedLength++;
@@ -338,6 +339,10 @@
 						pros.productsChecked = false;
 					}
 				})
+				//删除按钮 全选包括失效商品勾选
+				this.failureList.forEach(failureItem=>{
+					failureItem.productsChecked = true;
+				})
 			},
 			updateBothCheckBtn() {
 				if(this.isshowDelbtn) {
@@ -346,6 +351,7 @@
 						item.checked = this.isCheckAll;
 						this.setProductChecked(item);
 					})
+					
 				} else {
 					this.goodsList.forEach((item)=>{
 						item.checked = this.isCheckAll && !item.isDisabled;
@@ -534,7 +540,6 @@
 				if(this.isCheckAll) {
 					this.updateBothCheckBtn();	
 				} else {
-					// 失效也被勾选
 					this.goodsList.forEach(item => {
 						if(item.checked) {
 							item.productsList.forEach(pros => {
@@ -544,6 +549,7 @@
 					})
 					this.updateCheckAllBtn();
 				}
+				// 失效也被勾选
 				this.failureList.forEach(failureItem => {
 					if(failureItem.isFailureLayer){
 						failureItem.isFailureLayer = false
@@ -597,7 +603,9 @@
 				if(this.delGoodsList.length == 0){
 					this.$util.msg("请选择要删除的商品~",2000);
 					return
-				}else{				
+				}else{			
+					console.log(this.delGoodsList);
+					debugger
 					this.$util.modal('','确定删除选中的商品吗？','确定','取消',true,() =>{
 						shoppingCartDelete({userID:this.userID,productIDs:this.delGoodsList}).then(response =>{
 							this.$util.msg('删除成功',2000);

pages/tabBar/user/user.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="container user clearfix">
-		<cm-custom :navbar-data='nvabarData'></cm-custom>
+		<cm-custom :navbar-data='nvabarData' v-if="isCmcustom"></cm-custom>
 		<view class="user-section">
 			<view class="header" :style="{height:(CustomBar+90)-StatusBar+'px',paddingTop:CustomBar+'px',background:'url('+ bgImgUrl +')',backgroundSize:'cover'}">
 				<view class="header-main" v-if="hasLogin">
@@ -9,7 +9,7 @@
 							<text class="u-viptips" v-if="userIdentity == 2">{{userType}}</text>
 							<text class="u-tips" v-if="userIdentity == 4">{{userType}}</text>
 						</view>
-						<view class="user-item"><text class="u-p">账户余额：{{userMoney}}元</text></view>
+						<view class="user-item amount"><text class="u-p">账户余额：{{userMoney}}元</text></view>
 					</view>
 					<view class="header-icon"><image :src="headpic == null? '../../../static/temp/icon-club@3x.png' : headpic" mode=""></image></view>
 				</view>
@@ -159,6 +159,7 @@
 				},
 				CustomBar:this.CustomBar,// 顶部导航栏高度
 				StatusBar: this.StatusBar,
+				isCmcustom:false,
 				isUpgradeAlert:false,
 				bgImgUrl:'https://img.caimei365.com/group1/M00/03/94/Cmis216Sk_SAPDwvAAcTspdl8h0610.png',
 				name:'',
@@ -309,9 +310,11 @@
 		},
 		onPageScroll(e){//实时获取到滚动的值
 			if(e.scrollTop>20){
+				this.isCmcustom = true
 				this.nvabarData.bgColor = '#FFFFFF'
 				this.nvabarData.textColor = '#333333'
 			}else{
+				this.isCmcustom = false
 				this.nvabarData.bgColor = ''
 				this.nvabarData.textColor = '#FFFFFF'
 			}	
@@ -329,6 +332,8 @@
 				this.$api.getStorage().then((resolve) =>{
 					this.userID = resolve.userID
 					this.getUserInfo()
+				}).catch(reject =>{
+					console.log('异常处理=========>',reject)
 				})
 			}else{
 				this.getPhone()
@@ -367,6 +372,10 @@
 				flex: 1;
 				height: 64rpx;
 				line-height: 64rpx;
+				&.amount{
+					height: 30rpx;
+					line-height: 30rpx;
+				}
 				.u-tips{
 					display: inline-block;
 					float: left;
@@ -412,7 +421,7 @@
 				}
 				.u-p{
 					font-size: $font-size-24;
-					line-height: 64rpx;
+					line-height: 30rpx;
 					color: #FFFFFF;
 					text-align: left;
 				}

pages/user/order/order-list.vue

@@ -22,7 +22,7 @@
 							<view  class="tui-order-item" v-for="(order,orderIndex) in tabItem.orderList" :key="orderIndex" @click.stop="detail(order.orderID)">
 								<view class="order-title">
 									<view class="order-title-t">
-										<text class="bage-buss tui-skeleton-fillet" v-if="order.orderSubmitType == 3">协销</text>
+										<text class="bage-buss tui-skeleton-fillet" v-if="order.orderSubmitType == 3 || order.orderSubmitType == 4">协销</text>
 										<text class="bage-auto tui-skeleton-fillet" v-if="order.orderSubmitType == 0 || order.orderSubmitType == 1 || order.orderSubmitType == 2">自主</text>
 										<text class="bage-text tui-skeleton-fillet">订单号：{{order.orderNo}}</text>
 									</view>

seller/pages/order/order-historylist.vue

@@ -25,7 +25,7 @@
 								<view class="order-title">
 									<view class="order-title-name">这里是机构的名称</view>
 									<view class="order-title-t">
-										<text class="bage-buss tui-skeleton-fillet" v-if="order.orderSubmitType == 3">协销</text>
+										<text class="bage-buss tui-skeleton-fillet" v-if="order.orderSubmitType == 3 || order.orderSubmitType == 4">协销</text>
 										<text class="bage-auto tui-skeleton-fillet" v-if="order.orderSubmitType == 0 || order.orderSubmitType == 1 || order.orderSubmitType == 2">自主</text>
 										<text class="bage-text tui-skeleton-fillet">订单号：{{order.orderNo}}({{order.orderID}})</text>
 									</view>

seller/pages/order/order-list.vue

@@ -33,7 +33,7 @@
 								<view class="order-title">
 									<view class="order-title-name">{{order.clubName}}</view>
 									<view class="order-title-t">
-										<text class="bage-buss tui-skeleton-fillet" v-if="order.orderSubmitType == 3">协销</text>
+										<text class="bage-buss tui-skeleton-fillet" v-if="order.orderSubmitType == 3 || order.orderSubmitType == 4">协销</text>
 										<text class="bage-auto tui-skeleton-fillet" v-if="order.orderSubmitType == 0 || order.orderSubmitType == 1 || order.orderSubmitType == 2">自主</text>
 										<text class="bage-text tui-skeleton-fillet">订单号：{{order.orderNo}}({{order.orderID}})</text>
 									</view>

seller/pages/search/search-order.vue

@@ -32,7 +32,7 @@
 							<view class="order-title">
 								<view class="order-title-name">这里是机构的名称</view>
 								<view class="order-title-t">
-									<text class="bage-buss tui-skeleton-fillet" v-if="order.orderSubmitType == 3">协销</text>
+									<text class="bage-buss tui-skeleton-fillet" v-if="order.orderSubmitType == 3 || order.orderSubmitType == 4">协销</text>
 									<text class="bage-auto tui-skeleton-fillet" v-if="order.orderSubmitType == 0 || order.orderSubmitType == 1 || order.orderSubmitType == 2">自主</text>
 									<text class="bage-text tui-skeleton-fillet">订单号：{{order.orderNo}}({{order.orderID}})</text>
 								</view>