zhengjinyi 4 tháng trước cách đây
mục cha
commit
ba18105a52

+ 20 - 1
pages.json

@@ -860,6 +860,12 @@
 						"navigationBarTitleText": "机构填写咨询记录详情"
 					}
 				},
+				{
+					"path": "club/team-list",
+					"style": {
+						"navigationBarTitleText": "我的组员"
+					}
+				},
 				{
 					"path": "login/register",
 					"style": {
@@ -910,7 +916,20 @@
 					"style": {
 						"navigationBarTitleText": "订单列表"
 					}
-				}, {
+				}, 
+				{
+					"path": "order/order-team-list",
+					"style": {
+						"navigationBarTitleText": "组员订单"
+					}
+				}, 
+				{
+					"path": "order/order-team-details",
+					"style": {
+						"navigationBarTitleText": "组员订单详情"
+					}
+				}, 
+                {
 					"path": "order/search-order",
 					"style": {
 						"navigationBarTitleText": "订单搜索"

+ 3 - 3
pages/seller/cart/components/immediatelyList.vue

@@ -37,7 +37,7 @@
 			</view>
 			<!-- 单一商品 -->
 			<view class="product-container" v-else>
-				<view :class="tabIndex" v-if="tabIndex === 0" :style="{ paddingTop: searchStatus ? '128rpx' : '' }">
+				<view :class="tabIndex" v-if="tabIndex === 0" :style="{ paddingTop: searchStatus ? '118rpx' : '' }">
 					<scroll-view
 						:style="{ height: scrollHeight + 'px' }"
 						@scrolltolower="scrolltolower(tabIndex)"
@@ -828,11 +828,11 @@ export default {
 .good-search {
 	height: 68rpx;
 	width: 100%;
-	padding: 24rpx;
+	padding:20rpx 24rpx;
 	background: #ffffff;
 	display: flex;
 	align-items: center;
-	margin-bottom: 20rpx;
+	margin-bottom: 10rpx;
 	position: fixed;
 	top: 0;
 	left: 0;

+ 1 - 1
pages/seller/cart/immediately.vue

@@ -149,7 +149,7 @@ export default {
 			console.log(this.handleData)
 			if (this.$refs.productList.tabIndex == 1) {
 				if (data.productKind == 0) {
-					this.$util.msg(`请至少选购一种商品`, 2000)
+					this.$util.msg('请至少选购一种商品', 2000)
 				} else {
 					this.specClasszuhe = 'show'
 					this.productKind = data.productKind

+ 17 - 8
pages/seller/club/list.vue

@@ -79,7 +79,7 @@
             					</view>
             					<view class="list-content">
             						<view class="list-name">
-            							{{ club.userIdentity === 2 ? club.name : club.linkMan }}
+                                        <text class="list-name-text">{{ club.userIdentity === 2 ? club.name : club.linkMan }}</text>
             							<text class="tags" v-if="club.vipFlag == 0 && club.userIdentity === 2">VIP</text>
             							<text class="tags sv" v-if="club.vipFlag == 1">SVIP</text>
             							<text class="tags xf" v-if="club.newDeal === 1">新分配</text>
@@ -202,7 +202,6 @@
 		<!-- 选择弹窗 -->
 		<cm-seller-popup
 			ref="cmresellerpopup"
-			v-if="isSellerpopup"
 			:show="isSellerpopup"
 			@handleChoiceaSeller="handleChoiceaSellerData"
 		/>
@@ -785,7 +784,7 @@ page,
 				}
 			}
 			.list-content {
-				width: 520rpx;
+				width: 550rpx;
 				height: auto;
 				float: left;
 				padding-left: 20rpx;
@@ -795,21 +794,31 @@ page,
 					height: 50rpx;
 					float: left;
 					line-height: 50rpx;
-					text-align: left;
-					font-size: $font-size-26;
-					color: #333333;
+                    .list-name-text{
+                        width: 310rpx;
+                        text-align: left;
+                        text-overflow: ellipsis;
+                        overflow: hidden;
+                        display: -webkit-box;
+                        -webkit-line-clamp: 1;
+                        line-clamp: 1;
+                        -webkit-box-orient: vertical;
+                        font-size: $font-size-26;
+                        color: #333333;
+                        float: left;
+                    }
 					.tags {
 						display: inline-block;
 						height: 36rpx;
 						box-sizing: border-box;
-						padding: 0 15rpx;
+						padding: 0 10rpx;
 						border-radius: 8rpx;
 						background: #f0cb72;
 						font-size: $font-size-22;
 						color: #4e4539;
 						text-align: center;
 						line-height: 36rpx;
-						margin-left: 20rpx;
+						margin-left: 8rpx;
 						margin-top: 7rpx;
 						&.sv {
 							background: #333333;

+ 308 - 0
pages/seller/club/team-list.vue

@@ -0,0 +1,308 @@
+<template>
+    <view class="container club clearfix">
+        <tui-skeleton v-if="skeletonShow" backgroundColor="#fafafa" borderRadius="10rpx" :isLoading="true"
+            :loadingType="5" />
+        <template v-else>
+            <view class="club-main">
+                <view v-if="isEmpty" class="empty-container">
+                    <image class="club-empty-image"
+                        src="https://img.caimei365.com/group1/M00/03/71/Cmis2F3wna6AY2ZjAABpmnBICH4247.png"
+                        mode="aspectFit"></image>
+                    <view class="txt">暂无数据~</view>
+                </view> 
+                <view v-else class="club-list">
+                    <scroll-view scroll-y="true" class="club-list-main">
+                        <view class="list" v-for="(team, index) in teamList" :key="index">
+                            <view class="club-list-top">
+                                <view class="list-left">
+                                    <view class="list-head">
+                                        <image src="https://static.caimei365.com/app/img/icon/default-head-new.png"  mode=""></image>
+                                    </view>
+                                </view>
+                                <view class="list-item">
+                                    <view class="list-title">
+                                        <text class="list-name"> {{ team.name }} </text>
+                                    </view>
+                                </view>
+                            </view>
+                            <view class="club-list-bot">
+                                <view class="btn" @click.stop="handleClickOper(1, team)">
+                                    组员订单
+                                </view>
+                                <view class="btn" @click.stop="handleClickOper(2, team)">
+                                    组员机构
+                                </view>
+                            </view>
+                        </view>
+                    </scroll-view>
+                </view>
+            </view>
+        </template>
+    </view>
+</template>
+
+<script>
+    export default {
+        components: {},
+        data() {
+            return {
+                skeletonShow:true,
+                isShowClose: false,
+                isEmpty: false,
+                nomoreText: '上拉显示更多',
+                hasNextPage: false,
+                loadding: false,
+                pullUpOn: true,
+                pullFlag: true,
+                scrollHeight: '',
+                currPage: '', //当前页面
+                prevPage: '', //上一个页面
+                teamList: [],
+                currentIndex: 0
+            }
+        },
+        onLoad() {},
+        methods: {
+            async initGetStotage() {
+                // 初始化
+                const userInfo = await this.$api.getStorage()
+                this.userSellerServiceTeam(userInfo.serviceProviderId)
+                setTimeout(()=>{
+                    this.skeletonShow = false
+                },1000)
+            },
+            searchClubList() {
+                // 搜索
+                this.userSellerServiceTeam()
+            },
+            async userSellerServiceTeam(spId) {
+            	//获取组员协销列表
+            	try{
+            		const res = await this.SellerService.userSellerServiceTeam({ spId: spId })
+            		this.teamList = res.data
+            	}catch(e){
+            		console.log('=========>获取组员协销列表异常')
+            	}
+            },
+            handleClickOper(type, team) {
+                const pathMap = {
+                    1: `/pages/seller/order/order-team-list?groupServiceId=${team.serviceProviderId}`,
+                    2: '/pages/seller/order/order-team-list',
+                }
+                this.$api.navigateTo(pathMap[type])
+            },
+            handleShowBubble(club, index) {
+                this.currentIndex = index
+                club.bubble = !club.bubble
+            }
+        },
+        onShow() {
+            this.initGetStotage()
+        }
+    }
+</script>
+
+<style lang="scss">
+    page {
+        height: auto;
+    }
+
+    page,
+    .container {
+        /* padding-bottom: 120upx; */
+        background: #f7f7f7;
+    }
+
+    .container {
+        position: relative;
+    }
+
+    .club-main {
+        padding-top: 0rpx;
+        .club-list{
+            width: 100%;
+            padding: 20rpx 0;
+            .club-list-main{
+                width: 100%;
+                box-sizing: border-box;
+                padding: 0 24rpx;
+                .list {
+                    align-items: center;
+                    width: 100%;
+                    height: auto;
+                    padding: 18rpx 20rpx;
+                    background: #ffffff;
+                    position: relative;
+                    float: left;
+                    margin-bottom: 20rpx;
+                    box-sizing: border-box;
+                    border-radius: 24rpx;
+                    .club-list-top {
+                        width: 100%;
+                        height: 100rpx;
+                        float: left;
+                        display: flex;
+                        align-items: center;
+                
+                        .list-left {
+                            height: 100rpx;
+                            flex: 1;
+                            margin-right: 15rpx;
+                
+                            .list-head {
+                                width: 100rpx;
+                                height: 100rpx;
+                                border-radius: 50%;
+                
+                                image {
+                                    width: 100rpx;
+                                    height: 100rpx;
+                                    border-radius: 50%;
+                                }
+                            }
+                        }
+                
+                        .list-item {
+                            height: 100rpx;
+                            flex: 8;
+                            display: flex;
+                            flex-direction: column;
+                
+                            .list-title {
+                                flex: 2;
+                                line-height: 100rpx;
+                                width: 100%;
+                                font-size: $font-size-28;
+                                color: $text-color;
+                                padding-left: 11rpx;
+                                flex-direction: row;
+                                justify-content: flex-start;
+                
+                                .list-name {
+                                    min-width: 100rpx;
+                                    display: block;
+                                    float: left;
+                                    text-align: left;
+                                    -o-text-overflow: ellipsis;
+                                    text-overflow: ellipsis;
+                                    display: -webkit-box;
+                                    word-break: break-all;
+                                    -webkit-box-orient: vertical;
+                                    -webkit-line-clamp: 1;
+                                    overflow: hidden;
+                                }
+                
+                                .tags {
+                                    display: inline-block;
+                                    height: 36rpx;
+                                    padding: 0 15rpx;
+                                    border-radius: 8rpx;
+                                    background: #f0cb72;
+                                    font-size: $font-size-22;
+                                    color: #4e4539;
+                                    text-align: center;
+                                    line-height: 36rpx;
+                                    margin-left: 10rpx;
+                                    margin-right: 10rpx;
+                
+                                    &.sv {
+                                        background: #333333;
+                                        color: #f0cb72;
+                                    }
+                                }
+                
+                                .list-hist {
+                                    display: block;
+                                    float: right;
+                                    color: #999999;
+                                    font-size: $font-size-24;
+                                    text-align: right;
+                                    padding-right: 30rpx;
+                
+                                    .icon-dingdanliebiao {
+                                        font-size: $font-size-30;
+                                        color: #999999;
+                                    }
+                                }
+                            }
+                
+                            .list-opea {
+                                width: 100%;
+                                display: flex;
+                                flex: 4;
+                                color: #166ce1;
+                                flex-direction: row;
+                                align-items: center;
+                
+                                .tags {
+                                    display: inline-block;
+                                    height: 36rpx;
+                                    padding: 0 15rpx;
+                                    border-radius: 8rpx;
+                                    background: #f0cb72;
+                                    font-size: $font-size-22;
+                                    color: #4e4539;
+                                    text-align: center;
+                                    line-height: 36rpx;
+                                    margin-left: 10rpx;
+                                    margin-right: 10rpx;
+                
+                                    &.sv {
+                                        background: #333333;
+                                        color: #f0cb72;
+                                    }
+                
+                                    &.sm {
+                                        display: inline-block;
+                                        height: 36rpx;
+                                        box-sizing: border-box;
+                                        padding: 0 8rpx 0 15rpx;
+                                        border-radius: 8rpx;
+                                        background: #faede5;
+                                        font-size: $font-size-22;
+                                        color: $color-system;
+                                        text-align: center;
+                                        line-height: 36rpx;
+                                        margin-right: 10rpx;
+                
+                                        .icon-xiayibu {
+                                            font-size: 20rpx;
+                                            margin-left: 10rpx;
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                
+                    .club-list-bot {
+                        width: 100%;
+                        height: 60rpx;
+                        float: left;
+                        border-radius: 8rpx;
+                        .btn {
+                            height: 62rpx;
+                            box-sizing: border-box;
+                            line-height: 63rpx;
+                            padding: 0 30rpx;
+                            font-size: $font-size-24;
+                            background: #ffffff;
+                            color: #666666; 
+                            text-align: center;
+                            float: right;
+                            position: relative;
+                            border-radius: 40rpx;
+                            margin: 0 10rpx;
+                            box-sizing: border-box;
+                            border: 1px solid #e1e1e1;
+                            &.buy{
+                                background:$btn-confirm;
+                                color: #FFFFFF;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+</style>

+ 3 - 3
pages/seller/components/homeIndex/customer.vue

@@ -19,11 +19,11 @@
                     <view class="search-text">{{ hotSearchText }}</view>
                     <view class="search-btn">搜索</view>
                 </view>
-                <view class="gosearch-kf">
+<!--                <view class="gosearch-kf">
                     <view class="contact-btn" @click.stop="handleToChat">
                         <text class="iconfont icon-AIzhushou"></text>
                     </view>
-                </view>
+                </view> -->
             </view>
             <view class="swiper-banner-nav">
                 <scroll-view class="scroll-view_H" scroll-x="true">
@@ -231,7 +231,7 @@
         box-sizing: border-box;
         margin-top: 10rpx;
         .gosearch-btn {
-            width: 632rpx;
+            width: 100%;
             height: 100%;
             padding: 5rpx;
             border-radius: 40rpx;

+ 7 - 1
pages/seller/components/user.vue

@@ -95,6 +95,12 @@
                         </view>
                         <view class="name">{{ item.name }}</view>
                     </view>
+                    <view class="list-cell-navs" v-if="isManage" @click="navigator('/pages/seller/club/team-list')">
+                        <view class="icon">
+                            <image class="icon-image" src="https://static.caimei365.com/app/img/icon/icon_seller_4@2x.png" mode="widthFix"></image>
+                        </view>
+                        <view class="name">我的组员</view>
+                    </view>
                 </view>
                 <view class="list-cell-main clearfix">
                     <view class="list-cell-navs" v-for="(item,index) in firstList" :key="index"
@@ -175,7 +181,7 @@
                         name: '客户咨询记录',
                         path: '/pages/seller/remarks/list',
                         icon: 'https://static.caimei365.com/app/img/icon/icon_seller_7@2x.png'
-                    },
+                    }
                 //     {
                 //         name: '邀请运营人员',
                 //         path: '/pages/seller/club/allClub-list',

+ 27 - 26
pages/seller/order/components/cm-goods-temp.vue

@@ -228,32 +228,33 @@ export default {
 			width: 100%;
 			height: auto;
 			padding: 12rpx 0;
-			.pros-img {
-				width: 210rpx;
-				height: 100%;
-				border-radius: 10rpx;
-				margin: 0 26rpx 0 0;
-				position: relative;
-				.tips {
-					display: inline-block;
-					width: 80rpx;
-					height: 40rpx;
-					background-image: linear-gradient(214deg, #ff4500 0%, #ff5800 53%, #ff4367 100%);
-					line-height: 40rpx;
-					text-align: center;
-					font-size: $font-size-24;
-					color: #ffffff;
-					border-radius: 10rpx 0 10rpx 0;
-					position: absolute;
-					top: 0;
-					left: 0;
-				}
-				image {
-					width: 210rpx;
-					height: 210rpx;
-					border-radius: 10rpx;
-					border: 1px solid #f3f3f3;
-				}
+			.pros-img {
+				float: left;
+				width: 180rpx;
+				height: 100%;
+				border-radius: 10rpx;
+				margin: 0 20rpx 0 0;
+				position: relative;
+				.tips {
+					display: inline-block;
+					width: 80rpx;
+					height: 40rpx;
+					background-image: linear-gradient(214deg, #ff4500 0%, #ff5800 53%, #ff4367 100%);
+					line-height: 40rpx;
+					text-align: center;
+					font-size: $font-size-24;
+					color: #ffffff;
+					border-radius: 10rpx 0 10rpx 0;
+					position: absolute;
+					top: 0;
+					left: 0;
+				}
+				image {
+					width: 178rpx;
+					height: 178rpx;
+					border-radius: 10rpx;
+			        border: 1px solid #f3f3f3;
+				}
 			}
 		}
 		.pros-product {

+ 1 - 1
pages/seller/order/order-historylist.vue

@@ -705,7 +705,7 @@ page {
 			font-size: $font-size-22;
 			text-align: center;
 			color: #ffffff;
-			float: right;
+			float: left;
 			&.buss{
 				background: radial-gradient(circle, rgba(255, 39, 180, 1) 0%, rgba(193, 77, 245, 1) 100%);
 			}

+ 29 - 29
pages/seller/order/order-list.vue

@@ -746,7 +746,7 @@ page {
 	display: flex;
 	flex-direction: column;
 	width: 702rpx;
-	padding: 20rpx 24rpx 0 24rpx;
+	padding: 0rpx 24rpx 0 24rpx;
 	background: #fff;
 	border-bottom: 20rpx solid #f7f7f7;
 }
@@ -807,7 +807,7 @@ page {
 			font-size: $font-size-22;
 			text-align: center;
 			color: #ffffff;
-			float: right;
+			float: left;
 			&.buss{
 				background: radial-gradient(circle, rgba(255, 39, 180, 1) 0%, rgba(193, 77, 245, 1) 100%);
 			}
@@ -878,33 +878,33 @@ page {
 	width: 100%;
 	height: auto;
 	padding: 24rpx 0;
-	.pros-img {
-		float: left;
-		width: 210rpx;
-		height: 100%;
-		border-radius: 10rpx;
-		margin: 0 26rpx 0 0;
-		position: relative;
-		.tips {
-			display: inline-block;
-			width: 80rpx;
-			height: 40rpx;
-			background-image: linear-gradient(214deg, #ff4500 0%, #ff5800 53%, #ff4367 100%);
-			line-height: 40rpx;
-			text-align: center;
-			font-size: $font-size-24;
-			color: #ffffff;
-			border-radius: 10rpx 0 10rpx 0;
-			position: absolute;
-			top: 0;
-			left: 0;
-		}
-		image {
-			width: 210rpx;
-			height: 210rpx;
-			border-radius: 10rpx;
-			border: 1px solid #f3f3f3;
-		}
+	.pros-img {
+		float: left;
+		width: 180rpx;
+		height: 100%;
+		border-radius: 10rpx;
+		margin: 0 20rpx 0 0;
+		position: relative;
+		.tips {
+			display: inline-block;
+			width: 80rpx;
+			height: 40rpx;
+			background-image: linear-gradient(214deg, #ff4500 0%, #ff5800 53%, #ff4367 100%);
+			line-height: 40rpx;
+			text-align: center;
+			font-size: $font-size-24;
+			color: #ffffff;
+			border-radius: 10rpx 0 10rpx 0;
+			position: absolute;
+			top: 0;
+			left: 0;
+		}
+		image {
+			width: 178rpx;
+			height: 178rpx;
+			border-radius: 10rpx;
+            border: 1px solid #f3f3f3;
+		}
 	}
 }
 .pros-product {

+ 751 - 0
pages/seller/order/order-team-details.vue

@@ -0,0 +1,751 @@
+<template>
+	<view class="container details clearfix">
+		<!-- 自定义返回 -->
+		<tui-skeleton
+			v-if="!skeletonShow"
+			backgroundColor="#fafafa"
+			borderRadius="10rpx"
+			:isLoading="true"
+			:loadingType="5"
+		/>
+		<view class="container-details">
+			<view class="status-text">
+				<view class="view-type">{{ orderInfo.status | statusFilters }}</view>
+				<view class="status-visible"> 
+					{{ orderInfo.orderSeen == 2 ? '订单对机构不可见' : '订单对机构可见' }}
+				</view>
+				<view class="Rebate " v-if="orderInfo.rebateFlag == 1">返佣</view>
+				<text class="bage-buss btn" v-if="orderInfo.orderSubmitType == 3 || orderInfo.orderSubmitType == 4"
+					>协销</text
+				>
+				<text
+					class="bage-auto btn"
+					v-if="
+						orderInfo.orderSubmitType == 0 ||
+							orderInfo.orderSubmitType == 1 ||
+							orderInfo.orderSubmitType == 2
+					"
+					>自主</text
+				>
+			</view>
+			<!-- 地址选择 -->
+			<cm-address-temp ref="orderAddress" v-if="skeletonShow && !rechargeGoods" :addressData="addressData" />
+			<!-- 特殊商品退货须知 -->
+			<view class="return-instructions" v-if="returnGoodsStutas" v-html="helpContent"></view>
+			<!-- 商品 -->
+			<cm-goods-temp
+				ref="goods"
+				v-if="skeletonShow"
+				:list="orderInfo.orderProductList"
+				:orderInfo="orderInfo"
+				@popupClick="hanldePopupFn"
+			/>
+			<!-- 订单信息 -->
+			<cm-order-temp ref="orderInfo" v-if="skeletonShow" :orderInfo="orderInfo" />
+			<!-- 发票信息 -->
+			<cm-invice-temp ref="invoice" v-if="skeletonShow" :orderInvoice="orderInvoice" />
+			<!-- 支付记录 -->
+			<cm-payment-temp
+				ref="payment"
+				v-if="skeletonShow"
+				:discernReceiptList="discernReceiptList"
+				:receiptAmount="receiptAmount"
+			/>
+			<!-- 退款记录 -->
+			<cm-refund-temp
+				ref="refund"
+				v-if="skeletonShow"
+				:returnedPurchaseList="returnedPurchaseList"
+				:returnedPurchaseFee="returnedPurchaseFee"
+			/>
+			<!-- 支付凭证记录 -->
+			<cm-voucher-temp ref="voucher" v-if="skeletonShow && voucherList.length > 0" :list="voucherList" />
+			<view
+				class="clause"
+				v-if="orderInfo.secondHandOrderFlag != 1"
+				@click="openclauseConten(clauseData.id)"
+				:class="clauseData.name == '无条款' ? 'noclick' : ''"
+			>
+				售后条款:<label class="text" :class="clauseData.name == '无条款' ? 'color-bg' : ''">{{
+					clauseData.name
+				}}</label>
+			</view>
+		</view>
+		<!-- 付款弹窗 -->
+		<cm-orderpay-popup
+			v-if="isPayModel"
+			:payModelData="payModelData"
+			:modelType="modelType"
+			@paymentConfirm="hanldPaymentConfirm"
+		/>
+		<!-- 分享弹窗 -->
+		<cm-share-popup
+			:shopOrderId="shopOrderId"
+			:shareType="isShareType"
+			v-if="isShareModal"
+			@shareConfirm="onShareAppMessage"
+		/>
+		<!-- 促销活动弹窗 -->
+		<cm-promote-popup :Promotion="handlerPros" :popupShow="popupShow" />
+		<!-- 再来一单 -->
+		<view class="aganBj" v-show="showAgan">
+			<view class="alertAgan">
+				<text class="title">{{ promptitle }}</text>
+				<view class="goods">
+					<view class="list" v-for="(item, index) in failList" :key="index">
+						<image class="image-left" :src="item.image"></image>
+						<view class="name-right">{{ item.name }}</view>
+					</view>
+				</view>
+				<view class="BtnAll">
+					<view class="closebtn btn" @click="showAgan = false">取消</view>
+					<view class="cancel btn" @click="handleAddAgian">确定</view>
+				</view>
+			</view>
+		</view>
+		<!-- 提示弹窗 -->
+		<tui-modal
+			:show="modal"
+			@click="handleClick"
+			:content="contentModalText"
+			:button="modalButton"
+			color="#333"
+			:size="32"
+			shape="circle"
+			:maskClosable="false"
+		/>
+	</view>
+</template>
+
+<script>
+import headerBack from '@/components/cm-module/headerNavbar/header-back' //自定义导航
+import cmAddressTemp from './components/details/cm-address-temp' //地址信息
+import cmGoodsTemp from './components/details/cm-goods-temp' //商品列表
+import cmOrderTemp from './components/details/cm-order-temp' //订单信息
+import cmInviceTemp from './components/details/cm-invice-temp' //发票信息
+import cmPaymentTemp from './components/details/cm-payment-temp' //支付记录
+import cmRefundTemp from './components/details/cm-refund-temp' //退款记录
+import cmVoucherTemp from './components/details/cm-voucher-temp' //退款记录
+import cmDetailsButton from './components/cm-details-button' //底部按钮
+import cmSharePopup from './components/cm-share-popup' //分享弹窗
+import cmOrderpayPopup from './components/cm-orderpay-popup' //付款弹窗
+import cmPromotePopup from './components/details/cm-promote-popup' //促销活动弹窗
+
+export default {
+	components: {
+		headerBack,
+		cmAddressTemp,
+		cmGoodsTemp,
+		cmOrderTemp,
+		cmInviceTemp,
+		cmPaymentTemp,
+		cmRefundTemp,
+		cmVoucherTemp,
+		cmDetailsButton,
+		cmSharePopup,
+		cmOrderpayPopup,
+		cmPromotePopup
+	},
+	data() {
+		return {
+			nvabarData: {
+				//顶部自定义导航
+				showCapsule: 1, // 是否显示左上角图标   1表示显示    0表示不显示
+				title: '订单详情' // 导航栏 中间的标题
+			},
+			state: 0,
+			userId: '',
+			orderId: 0,
+			shopOrderId: 0,
+			clubUserId: 0,
+			serviceProviderId: '', //协销ID
+			shareCode: '', //分享码
+			shareType: '', //分享登录页过来记录的状态
+			cellPhone: '', //客服电话
+			skeletonShow: false, //是否加载完成渲染子组件
+			isOrderShare: false,
+			isShareModal: false,
+			isShareType: 2,
+			isPayModel: false,
+			modelType: 0,
+			ableUserMoney: '', //机构余额
+			payModelData: {},
+			addressData: {}, //地址信息初始化
+			orderInfo: {}, //订单信息初始化
+			orderInvoice: {}, //发票信息初始化
+			returnedPurchaseList: {}, //退款信息初始化
+			discernReceiptList: {}, //支付信息初始化
+			voucherList:[], // 线下支付凭证
+			receiptAmount: 0, //支付金额
+			returnedPurchaseFee: 0, //退款金额
+			navbarHeight: '',
+			rechargeGoods: false,
+			headerBtnPosi: this.setHeaderBtnPosi(), //获取设备顶部胶囊高度
+			systeminfo: this.setSysteminfo(), //获取设备信息
+			isIphoneX: this.$store.state.isIphoneX,
+			CustomBar: this.CustomBar, // 顶部导航栏高度
+			popupShow: false,
+			handlerPros: {},
+			clauseData: {},
+			showAgan: false,
+			failList: [], // 再来一单可购买商品
+			promptitle: '',
+			returnGoodsStutas: false,
+			helpContent: '',
+			handleModelEven: 0,
+			modal: false,
+			contentModalText: '订单查询失败,请稍候重试~', //操作文字提示语句
+			modalButton: [
+				{
+					text: '取消',
+					type: 'gray',
+					plain: true //是否空心
+				},
+				{
+					text: '确定',
+					customStyle: {
+						color: '#fff',
+						bgColor: 'linear-gradient(90deg, #F28F31 0%, #FF5B00 100%)'
+					},
+					plain: false
+				}
+			],
+		}
+	},
+	onLoad(option) {
+		console.log(option)
+		this.shareType = option.type
+		this.shopOrderId = option.shopOrderId
+		this.clubUserId = option.userId
+		if (this.shareType === 'share') {
+			this.listType = 0
+			this.isOrderShare = true
+		} else if (option.type === 'confim' || option.type === 'search' || option.type === 'cash') {
+			this.listType = 0
+		} else {
+			this.listType = option.listType
+		}
+		this.getHeaderTopHeight()
+		this.initOrderDetaileData()
+	},
+	filters: {
+		NumFormat(value) {
+			//处理金额
+			return Number(value).toFixed(2)
+		},
+		statusFilters(value) {
+			//处理订单状态显示
+			const map = {
+				0: '待确认',
+				2: '交易完成',
+				4: '已关闭',
+				5: '交易全退',
+				6: '交易全退',
+				11: '待付款待发货',
+				12: '待付款部分发货',
+				13: '待付款已发货',
+				21: '部分付款待发货',
+				22: '部分付款部分发货',
+				23: '部分付款已发货',
+				31: '已付款待发货',
+				32: '已付款部分发货',
+				33: '已付款已发货'
+			}
+			return map[value]
+		}
+	},
+	methods: {
+		async initOrderDetaileData() {
+			try {
+				const res = await this.OrderService.QueryOrderDetails({
+					shopOrderId: this.shopOrderId,
+					userId: this.clubUserId
+				})
+				const data = res.data
+				this.orderInfo = data.shopOrder
+				this.userId = this.orderInfo.userId
+				this.rechargeGoods = this.orderInfo.rechargeGoods
+				// this.shareCode = data.shareCode
+				this.addressData = data.userInfo
+				this.receiptAmount = this.orderInfo.receiptAmount
+				this.returnedPurchaseFee = this.orderInfo.returnedPurchaseFee
+				this.orderInvoice = data.orderInvoice
+				this.returnedPurchaseList = data.returnedPurchaseList
+				this.discernReceiptList = data.discernReceiptList
+				this.voucherList = data.voucher
+				this.ableUserMoney = data.ableUserMoney
+				this.clauseData = data.clause
+				if (this.clauseData && this.clauseData.name.length > 10) {
+					this.clauseData.name = this.clauseData.name.substr(0, 10) + '...'
+				}
+				// 特殊商品退货须知
+				this.returnGoodsStutas = data.returnGoodsStutas && data.returnGoodsStutas === 2 // 1:可以 2:不可以
+				this.helpContent = data.helpContent
+				this.skeletonShow = true
+			} catch (error) {
+				this.$util.msg(error.msg, 2000)
+			}
+		},
+		handButtonConfirm(data) {
+			//判断点击的按钮类型并执行...
+			switch (data.type) {
+				case 'cancel': //取消订单
+					this.modal = true
+					this.contentModalText = '确认取消该订单吗?'
+					this.handleModelEven = 1
+					break
+				case 'delete': //删除订单
+					this.modal = true
+					this.contentModalText = '确认删除该订单吗?'
+					this.handleModelEven = 2
+					break
+				case 'confirm': // 确认订单
+					this.modal = true
+					this.contentModalText = '确认此订单吗?'
+					this.handleModelEven = 3
+					break
+				case 'balance':
+					this.getOrderPaymentValidation(data)
+					break
+				case 'again':
+					this.handOrderAgain(data.shopOrderId)
+					break
+				case 'query':
+					this.isModalLayer = true
+					this.$api.navigateTo('/pages/user/order/order-logistics?shopOrderId=' + data.shopOrderId)
+					break
+			}
+		},
+		handleClick(e) {
+			//确认操作
+			if (e.index == 1) {
+				switch (this.handleModelEven) {
+					case 1: //取消订单
+						this.cancelOrder(this.shopOrderId)
+						break
+					case 2: //删除订单
+						this.deleteOrder(this.shopOrderId)
+						break
+					case 3: //确认订单
+						this.affirmOrder(this.shopOrderId)
+						break
+				}
+			}
+			this.modal = false
+		},
+		//取消订单
+		async cancelOrder(shopOrderId) {
+			try {
+				const res = await this.OrderService.CancelOrder({ shopOrderId: shopOrderId, userIdentity: 1 })
+				this.$util.msg(res.msg, 2000, true, 'success')
+				setTimeout(() => {
+					this.initOrderDetaileData()
+				}, 2000)
+			} catch (error) {
+				this.$util.msg(error.msg, 2000)
+			}
+		},
+		//删除订单
+		async deleteOrder(shopOrderId) {
+			try {
+				const res = await this.OrderService.DeleteOrder({ shopOrderId: shopOrderId })
+				this.$util.msg(res.msg, 2000, true, 'success')
+				setTimeout(() => {
+					if (this.shareType === 'share') {
+						this.$api.switchTabTo('/pages/tabBar/home/index')
+					} else {
+						this.$api.redirectTo(`/pages/user/order/order-list?type=detele&state=${this.state}`)
+					}
+				}, 2000)
+			} catch (error) {
+				this.$util.msg(error.msg, 2000)
+			}
+		},
+		//确认订单
+		async affirmOrder(shopOrderId) {
+			try {
+				const res = await this.OrderService.AffirmOrder({ shopOrderId: shopOrderId })
+				this.$util.msg(res.msg, 2000, true, 'success')
+				setTimeout(() => {
+					this.initOrderDetaileData()
+				}, 2000)
+			} catch (error) {
+				this.$util.msg(error.msg, 2000)
+			}
+		},
+		// 再来一单
+		async handOrderAgain(shopOrderId) {
+			try{
+				const res = await this.SellerService.SellerCreateOrderAgain({
+					confirmFlag: 0,
+					shopOrderId: shopOrderId,
+					serviceProviderId: this.serviceProviderId
+				})
+				const data = res.data
+				this.$api.setStorage('orderUserInfo', {
+					clubId: data.clubId,
+					againBuyProductIds: data.productIds,
+					userId: data.userId
+				})
+				this.$api.navigateTo('/pages/seller/cart/cart')
+			}catch(error){
+				if (error.code == -3) {
+					this.showAgan = true
+					this.promptitle = error.msg
+					this.failList = error.data
+				} else if (error.code == -2) {
+					this.$util.modal('', error.msg, '确定', '', false, () => {})
+				} else {
+					this.$util.msg(error.msg, 2000)
+				}
+			}
+		},
+		async handleAddAgian() {
+			// 再来一单弹窗
+			try{
+				await this.SellerService.SellerCreateOrderAgain({
+					confirmFlag: 1,
+					shopOrderId: this.shopOrderId,
+					serviceProviderId: this.serviceProviderId,
+				})
+				this.$api.navigateTo('/pages/seller/cart/cart')
+				this.showAgan = false
+			}catch(error){
+				this.$util.msg(error.msg, 2000)
+			}
+		},
+		//监听余额抵扣按钮
+		async hanldPaymentConfirm(data) {
+			try{
+				await this.OrderService.OrderBalanceDeduction({ shopOrderId: this.shopOrderId })
+				this.$util.msg('余额抵扣成功', 2000)
+				this.initOrderDetaileData()
+			}catch(error){
+				this.$util.msg(error.msg, 2000)
+			}
+		},
+		//监听根据付款状态做操作
+		async getOrderPaymentValidation(order) {
+			try{
+				const res = await this.OrderService.OrderPaymentValidation({ shopOrderId: order.shopOrderId })
+				const data = res.data
+				this.payModelData = data
+				if (data.balanceFlag == 0) {
+					// 0可以走余额抵扣,1不能走余额抵扣
+					if (data.code == -1) {
+						this.$util.modal('', '订单已申请全部退款,无需再付款!', '确定', '', false, () => {})
+					} else {
+						console.log('payModelData',this.payModelData)
+						this.isPayModel = true
+						this.modelType = 3
+						console.log('isPayModel',this.isPayModel)
+					}
+				} else {
+					this.$util.modal('', '该订单已走线上支付流程,不能进行余额抵扣。', '确定', '', false, () => {})
+				}
+			}catch(error){
+				this.$util.msg(error.msg, 2000)
+			}
+		},
+		// 条款
+		openclauseConten(id) {
+			this.$api.navigateTo(`/pages/service/sellconten?clauseId=${id}`)
+		},
+		hanldePopupFn(data) {
+			//监听活动内容
+			this.popupShow = true
+			this.handlerPros = data
+		},
+		getHeaderTopHeight() {
+			let statusBarHeight = this.systeminfo.statusBarHeight // 状态栏高度
+			let headerPosi = this.headerBtnPosi
+			let btnPosi = {
+				// 胶囊实际位置,坐标信息不是左上角原点
+				height: headerPosi.height,
+				width: headerPosi.width,
+				// 胶囊top - 状态栏高度
+				top: headerPosi.top - statusBarHeight,
+				// 胶囊bottom - 胶囊height - 状态栏height (现胶囊bottom 为距离导航栏底部的长度)
+				bottom: headerPosi.bottom - headerPosi.height - statusBarHeight,
+				// 屏幕宽度 - 胶囊right
+				right: this.systeminfo.screenWidth - headerPosi.right
+			}
+			this.navbarHeight = headerPosi.bottom + btnPosi.bottom // 原胶囊bottom + 现胶囊bottom
+		},
+		setHeaderBtnPosi() {
+			// 获得胶囊按钮位置信息
+			let headerBtnPosi = uni.getMenuButtonBoundingClientRect()
+			return headerBtnPosi
+		},
+		setSysteminfo() {
+			let systeminfo
+			uni.getSystemInfo({
+				// 获取设备信息
+				success: res => {
+					systeminfo = res
+				}
+			})
+			return systeminfo
+		}
+	},
+	onShareAppMessage(res) {
+		//分享转发
+		this.isShareModal = false
+		if (res.from === 'button') {
+			// 来自页面内转发按钮
+		}
+		return {
+			title: '您有新的订单,请点击查看~',
+			path: `/pages/user/order/order-sharelogin?shopOrderId=${this.shopOrderId}&userId=${
+				this.userId
+			}&serviceProviderId=${this.serviceProviderId}`,
+			imageUrl: 'https://img.caimei365.com/group1/M00/03/95/Cmis216Sk_SABnOFABZCgCzFV_g063.png'
+		}
+	},
+	onShow() {
+		this.$api.getStorage().then(resolve => {
+			this.serviceProviderId = resolve.serviceProviderId ? resolve.serviceProviderId : 0
+		})
+	}
+}
+</script>
+
+<style lang="scss">
+page {
+	height: auto;
+	background: #f7f7f7;
+}
+.btn-hover {
+	background: #ffffff;
+}
+.animation {
+	/* transition: transform 0.3s ease;*/
+	transition-property: transform;
+	transition-duration: 0.3s;
+	transition-timing-function: ease;
+}
+.invoice-balance {
+	width: 702rpx;
+	height: auto;
+	padding: 0 24rpx;
+	background: #ffffff;
+	float: left;
+	margin-top: 24rpx;
+	margin-bottom: 24rpx;
+	.balabce-t {
+		width: 100%;
+		height: 86rpx;
+		line-height: 86rpx;
+		font-size: $font-size-28;
+		color: $text-color;
+		float: left;
+		.balabce-t-le {
+			float: left;
+			font-weight: bold;
+		}
+		.balabce-t-ri {
+			float: right;
+			display: flex;
+			align-items: center;
+			.money {
+				display: flex;
+				float: left;
+			}
+			.checkbox-box {
+				display: flex;
+				width: 60rpx;
+				float: left;
+				height: 100%;
+				font-size: $font-size-24;
+				.checkbox {
+					width: 40rpx;
+					text-align: right;
+					box-sizing: border-box;
+					text-align: center;
+					text-decoration: none;
+					border-radius: 0;
+					-webkit-tap-highlight-color: transparent;
+					overflow: hidden;
+				}
+			}
+		}
+	}
+	.balabce-b {
+		width: 100%;
+		float: left;
+		overflow: hidden;
+		.balabce-b-text {
+			width: 100%;
+			line-height: 58rpx;
+			font-size: $font-size-24;
+			color: #ff2a2a;
+			text-align: right;
+			float: right;
+		}
+		&.balabce-b--hide {
+			padding: 0 0;
+			height: 0px;
+			line-height: 0px;
+		}
+	}
+}
+.clause {
+	float: right;
+	font-size: 24rpx;
+	color: #999999;
+	margin-top: 60rpx;
+	margin-right: 24rpx;
+	&.noclick {
+		pointer-events: none;
+	}
+	.text {
+		color: #1890f9;
+		&.color-bg {
+			color: #333333;
+		}
+	}
+}
+.status-text {
+	overflow: hidden;
+	padding: 24rpx;
+	background: #fff;
+	font-size: $font-size-26;
+	.view-type {
+		float: left;
+		color: #ff2a2a;
+	}
+	.status-visible {
+		float: left;
+		color: #999999;
+		margin-left: 20rpx;
+	}
+	.bage-buss {
+		display: inline-block;
+		width: 72rpx;
+		height: 32rpx;
+		background: radial-gradient(circle, rgba(255, 39, 180, 1) 0%, rgba(193, 77, 245, 1) 100%);
+		border-radius: 16rpx 0;
+		line-height: 32rpx;
+		text-align: center;
+		color: #ffffff;
+		float: right;
+		font-size: 22rpx;
+	}
+	.bage-auto {
+		display: inline-block;
+		width: 72rpx;
+		height: 32rpx;
+        background: #7fba4f;
+        color: #ffffff;
+		border-radius: 16rpx 0;
+		line-height: 32rpx;
+		text-align: center;
+		float: right;
+		font-size: 22rpx;
+	}
+	.bage-name {
+		line-height: 32rpx;
+		display: inline-block;
+		color: #999999;
+		float: right;
+		font-size: 22rpx;
+	}
+	.Rebate {
+		display: inline-block;
+		width: 72rpx;
+		height: 32rpx;
+		background: #ff7a51;
+		border-radius: 6rpx;
+		line-height: 32rpx;
+		text-align: center;
+		color: #ffffff;
+		float: right;
+		font-size: $font-size-24;
+		margin-left: 20rpx;
+	}
+}
+.aganBj {
+	position: fixed;
+	left: 0;
+	top: 0;
+	bottom: 0;
+	width: 100%;
+	height: 100%;
+	background-color: rgba(0, 0, 0, 0.5);
+	z-index: 999999;
+	.alertAgan {
+		position: absolute;
+		top: 50%;
+		left: 50%;
+		transform: translate(-50%, -50%);
+		width: 580rpx;
+		background-color: #fff;
+		border-radius: 16rpx;
+		.title {
+			font-size: 30rpx;
+			color: #333333;
+			line-height: 42rpx;
+			padding: 30rpx;
+			display: block;
+		}
+		.goods {
+			padding: 0 30rpx;
+			.list {
+				padding: 10px 0;
+				border-bottom: 1rpx solid #e1e1e1;
+				margin: 10rpx 0;
+				.image-left {
+					width: 86rpx;
+					height: 86rpx;
+					border: 2rpx solid #e1e1e1;
+					border-radius: 6rpx;
+					display: inline-block;
+					vertical-align: middle;
+				}
+				.name-right {
+					display: inline-block;
+					width: 416rpx;
+					margin-left: 15rpx;
+					font-size: 26rpx;
+					color: #666666;
+					vertical-align: middle;
+					word-break: break-all;
+					overflow: hidden;
+					text-overflow: ellipsis;
+					display: -webkit-inline-box;
+					-webkit-line-clamp: 2;
+					-webkit-box-orient: vertical;
+				}
+			}
+		}
+		.BtnAll {
+			margin-top: 30rpx;
+			.btn {
+				display: inline-block;
+				width: 290rpx;
+				height: 90rpx;
+				line-height: 90rpx;
+				text-align: center;
+				&.closebtn {
+					border-radius: 0px 0px 0px 10px;
+					color: #999999;
+					background: #efefef;
+				}
+				&.cancel {
+					border-radius: 0px 0px 8px 0px;
+					background: $btn-confirm;
+					color: #fff;
+				}
+			}
+		}
+	}
+}
+.return-instructions {
+	font-size: 26rpx;
+	color: #ff5b00;
+	line-height: 42rpx;
+	padding: 32rpx 50rpx;
+	background-color: #fffaf8;
+	text-align: justify;
+}
+</style>

+ 1015 - 0
pages/seller/order/order-team-list.vue

@@ -0,0 +1,1015 @@
+<template>
+	<view class="container" :style="{ paddingTop: 40 + 'px' }">
+		<tui-skeleton
+			v-if="skeletonShow"
+			backgroundColor="#fafafa"
+			borderRadius="10rpx"
+			:isLoading="true"
+			:loadingType="5"
+		/>
+		<template v-else>
+			<view class="order-section-top">
+				<scroll-view scroll-x scroll-with-animation class="tab-view" :scroll-left="scrollLeft">
+					<view
+						v-for="(item, index) in orderTabBar"
+						:key="index"
+						class="tab-bar-item"
+						:class="[currentTab == index ? 'active' : '']"
+						:data-current="index"
+						@tap.stop="onClickTab"
+					>
+						<text class="tab-bar-title">{{ item.text }}</text>
+					</view>
+				</scroll-view>
+			</view>
+			<swiper
+				class="tab-content"
+				:current="currentTab"
+				duration="80"
+				@animationfinish="onChange"
+				:style="{ height: winHeight + 'px' }"
+			>
+				<swiper-item v-for="(tabItem, index) in orderTabBar" :key="index"  @touchmove.stop="">
+					<scroll-view
+						scroll-y
+						class="scoll-y tui-skeleton"
+						@scrolltolower="scrolltolower"
+						:style="{ height: winHeight + 'px' }"
+					>
+						<view :class="{ 'tui-order-list': scrollTop >= 0 }" class="tui-skeleton clearfix">
+							<!-- 空白页 -->
+							<empty
+								v-if="tabItem.loaded === true && tabItem.orderList.length === 0"
+								:typeIndex="currentTab"
+								:navbarHeight="navbarHeight"
+							/>
+							<!-- 列表 -->
+							<view v-else class="tui-order-content">
+								<view
+									class="tui-order-item"
+									v-for="(order, orderIndex) in tabItem.orderList"
+									:key="orderIndex"
+									@click.stop="detail(order)"
+								>
+									<view class="order-title">
+										<view class="order-title-name">
+											<text>{{ order.clubName ? order.clubName : '' }}</text>
+											<text
+												class="tags"
+												v-if="order.svipUserFlag == 0 && order.userIdentity === 2"
+												>VIP</text
+											>
+											<text class="tags sv" v-if="order.svipUserFlag == 1">SVIP</text>
+											<view class="name" v-if="screenTab === 3"
+												>【 {{ order.serviceName ? order.serviceName : '' }} 】</view
+											>
+										</view>
+										<view class="order-title-t">
+											<view class="order-title-tip tui-skeleton-fillet">
+												{{ order.status | statusFilters }}
+											</view>
+											<view class="bage ebate" v-if="order.rebateFlag == 1">返佣</view>
+											<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>
+											<image
+												class="bage-icon"
+												src="https://static.caimei365.com/app/img/icon/icon-type@3x.png"
+												mode="widthFix"
+												v-if="order.secondHandOrderFlag == 1"
+											>
+											</image>
+										</view>
+										<view class="order-title-b">
+											<view class="order-title-btxt num tui-skeleton-fillet">
+												订单编号:{{ order.shopOrderNo }}({{ order.shopOrderId }})
+											</view>
+										</view>
+										<view class="order-title-b">
+											<view class="order-title-btxt tui-skeleton-fillet">
+												下单时间:{{ order.orderTime }}
+											</view>
+										</view>
+									</view>
+									<view class="goods-title">
+										<view v-if="order.shopPromotion" class="floor-item-act">
+											<view class="floor-tags">{{ order.shopPromotion.name }}</view>
+										</view>
+										<view class="title-text tui-skeleton-fillet">{{ order.shopName }}</view>
+									</view>
+									<view
+										class="goods-item"
+										v-for="(pros, prosIndex) in order.orderProductList"
+										:key="prosIndex"
+									>
+										<view class="goods-pros-t">
+											<view class="pros-img tui-skeleton-fillet">
+												<image :src="pros.image" alt="" />
+												<text
+													class="tips"
+													v-if="pros.giftType == 2 || pros.giftType == 1"
+													>赠品</text
+												>
+											</view>
+											<view class="pros-product clearfix">
+												<view class="producttitle tui-skeleton-fillet">{{
+													pros.name
+												}}</view>
+												<view
+													class="productspec tui-skeleton-fillet"
+													v-if="pros.productCategory != 2"
+												>
+													规格:{{ pros.productUnit ? pros.productUnit : '' }}
+												</view>
+												<view class="productprice">
+													<view
+														class="price tui-skeleton-fillet"
+														:class="
+															pros.svipPriceFlag == 1 ||
+															PromotionsFormat(pros.productPromotion)
+																? 'none'
+																: ''
+														"
+													>
+														<text>¥{{ pros.price | NumFormat }}</text>
+													</view>
+													<view class="count tui-skeleton-fillet">
+														<text class="small">x</text>{{ pros.num }}
+													</view>
+												</view>
+												<view class="floor-item-act">
+													<template v-if="pros.productPromotion">
+														<view
+															v-if="PromotionsFormat(pros.productPromotion)"
+															class="floor-tags"
+															@click.stop="clickPopupShow(pros.productPromotion)"
+														>
+															{{ pros.productPromotion.name }}
+															<text
+																v-if="
+																	pros.productPromotion != null &&
+																		pros.productPromotion.type != 3
+																"
+															>
+																:¥{{
+																	pros.productPromotion == null
+																		? '0.00'
+																		: pros.productPromotion.touchPrice
+																		  | NumFormat
+																}}
+															</text>
+														</view>
+														<view
+															v-else-if="pros.productPromotion.type != 3"
+															class="floor-tags"
+															@click.stop="clickPopupShow(pros.productPromotion)"
+															>{{ pros.productPromotion.name }}</view
+														>
+													</template>
+													<template v-if="pros.svipPriceFlag == 1">
+														<view class="svip-tags">
+															<view class="tags">SVIP</view>
+															<view class="price">{{ pros.svipPriceTag }}</view>
+														</view>
+													</template>
+												</view>
+											</view>
+										</view>
+									</view>
+									<view class="order-footer">
+										<!-- <view class="order-footer-top" v-if="order.discountFee != 0"
+											>经理折扣:¥{{ order.discountFee | NumFormat }}</view
+										> -->
+										<view class="order-footer-bot">
+											<view class="count tui-skeleton-fillet"
+												>共{{ order.itemCount }}件商品</view
+											>
+											<view
+												class="money tui-skeleton-fillet"
+												v-if="order.status == 31 || order.status == 32 || order.status == 33"
+											>
+												已支付:<label style="color:#f94b4b ;"
+													>¥{{ order.receiptAmount | NumFormat }}</label
+												>
+											</view>
+											<view class="money tui-skeleton-fillet" v-else
+												>待付总额:<label style="color:#f94b4b ;">
+													¥{{ order.obligation | NumFormat }}</label
+												>
+											</view>
+										</view>
+									</view>
+									<!-- 底部button -->
+<!-- 									<cm-list-button
+										ref="orderButton"
+										v-if="screenTab != 3"
+										:status="order.status"
+										:order="order"
+										:shopOrderId="order.shopOrderId"
+										:rechargeGoods="order.rechargeGoods"
+										:userId="order.userId"
+										:secondHandOrderFlag="order.secondHandOrderFlag"
+										@buttonConfirm="handButtonConfirm"
+									/>-->
+								</view>
+								<!--加载loadding-->
+								<tui-loadmore :visible="loadding" :index="3" type="black"/>
+								<tui-nomore
+									:visible="!pullUpOn"
+									:backgroundColor="'#ffffff'"
+									:text="nomoreText"
+								/>
+								<!--加载loadding-->
+							</view>
+						</view>
+					</scroll-view>
+				</swiper-item>
+			</swiper>
+		</template>
+		<!-- 分享弹窗 -->
+		<cm-share-popup
+			:shopOrderId="handleShopOrderId"
+			:shareType="isShareType"
+			v-if="isShareModal"
+			@shareConfirm="onShareAppMessage"
+		/>
+		<!-- 透明模态层 -->
+		<modal-layer v-if="isModalLayer" />
+		<view class="aganBj" v-show="showAgan">
+			<view class="alertAgan">
+				<text class="title">{{ promptitle }}</text>
+				<view class="goods">
+					<view class="list" v-for="(item, index) in failList" :key="index">
+						<image class="image-left" :src="item.image"></image>
+						<view class="name-right">{{ item.name }}</view>
+					</view>
+				</view>
+				<view class="BtnAll">
+					<view class="closebtn btn" @click="showAgan = false">取消</view>
+					<view class="cancel btn" @click="handleAddAgian">确定</view>
+				</view>
+			</view>
+		</view>
+		<!-- 筛选抽屉 -->
+		<cm-orderDrawer
+			ref="screendrawer"
+			v-if="rightDrawer"
+			:rightDrawer="rightDrawer"
+			@handSearchConfirm="handSearchConfirmData"
+		/>
+		<!-- 提示弹窗 -->
+		<tui-modal
+			:show="modal"
+			@click="handleClick"
+			:content="contentModalText"
+			:button="modalButton"
+			color="#333"
+			:size="32"
+			shape="circle"
+			:maskClosable="false"
+		/>
+	</view>
+</template>
+
+<script>
+import { mapState, mapMutations } from 'vuex'
+import headerBack from '@/components/cm-module/headerNavbar/header-back' //自定义顶部导航
+import modalLayer from '@/components/modal-layer'
+import empty from '@/components/empty'
+import cmListButton from './components/cm-list-button' //操作按钮
+import cmSharePopup from './components/cm-share-popup' //分享弹窗
+import cmOrderDrawer from '../components/cm-order-drawer' //筛选抽屉
+import orderMixins from './mixins/orderMixins.js'
+
+export default {
+	mixins: [orderMixins],
+	components: {
+		headerBack,
+		empty,
+		modalLayer,
+		cmListButton,
+		cmSharePopup,
+		cmOrderDrawer
+	},
+	data() {
+		return {
+			orderTabBar: [
+				{ listType: 0, text: '全部订单', orderList: [] },
+				{ listType: 1, text: '待确认', orderList: [] },
+				{ listType: 2, text: '待付款', orderList: [] },
+				{ listType: 3, text: '待发货', orderList: [] },
+				{ listType: 4, text: '已发货', orderList: [] },
+				{ listType: 5, text: '退货/款', orderList: [] }
+			],
+			screenTabBar: [
+				{ type: 0, text: '全部订单(我的)' },
+				{ type: 1, text: '自主订单(我的)' },
+				{ type: 2, text: '协销订单(我的)' }
+			],
+			headerBtnPosi: this.setHeaderBtnPosi(), //获取设备顶部胶囊高度
+			systeminfo: this.setSysteminfo(), //获取设备信息
+			nvabarData: {
+				//顶部自定义导航
+				showCapsule: 1, // 是否显示左上角图标  1表示显示  0表示不显示,
+				showSearch: 1,
+				title: ' ' // 导航栏中间的标题
+			},
+			CustomBar: this.CustomBar, // 顶部导航栏高度
+			winHeight: '', //窗口高度
+			currentTab: 0, //预设当前项的值
+			screenTab: 0, //筛选预设当前项的值
+			scrollLeft: 0, //tab标题的滚动条位置
+			orderData: [],
+			listQuery: {
+				pageNum: 1, //页数
+				pageSize: 10, //条数
+				groupServiceId: 0,
+				serviceProviderId: 0, //协销用户ID
+				listType: 0,
+				orderSubmitType: 3
+			},
+			scrollTop: 0,
+			skeletonShow: true,
+			isClickChange: false,
+			isShareModal: false, //控制分享弹窗
+			isShareType: 2,
+			isModalLayer: false,
+			loadding: false,
+			pullUpOn: true,
+			hasNextPage: false,
+			pullFlag: true,
+			navbarHeight: '',
+			nomoreText: '上拉显示更多',
+			showAgan: false,
+			failList: [], // 再来一单可购买商品
+			promptitle: '',
+			userId: 0,
+			manager: 0,
+			rightDrawer: false ,//控制筛选抽屉
+			
+		}
+	},
+	onLoad(option) {
+		this.getHeaderTopHeight() //设置自定义导航高度
+		this.initGetStotage(option)
+	},
+	computed: {
+		...mapState(['isManage'])
+	},
+	methods: {
+		async initGetStotage(option) {
+			const userInfo = await this.$api.getStorage()
+			this.userId = userInfo.userId ? userInfo.userId : 0
+			this.manager = userInfo.manager ? userInfo.manager : 0
+			this.listQuery.groupServiceId = option.groupServiceId
+			this.listQuery.serviceProviderId = userInfo.serviceProviderId
+			this.getOrderDatainit(this.currentTab)
+		},
+		// 滚动切换标签样式
+		onChange(e) {
+			let index = e.target.current || e.detail.current
+			if (this.isClickChange) {
+				this.currentTab = index
+				this.isClickChange = false
+				return
+			}
+			this.isClickChange = false
+			this.currentTab = index
+			this.listQuery.listType = index
+			this.checkCor()
+			this.pullUpOn = true //切换时隐藏
+			this.loadding = false //切换时隐藏
+			this.nomoreText = ''
+			this.getOrderDatainit(this.currentTab, 'tabChange')
+		},
+		// 点击标题切换当前页时改变样式
+		onClickTab(e) {
+			let tabIndex = e.target.dataset.current || e.currentTarget.dataset.current
+			if (this.currentTab === tabIndex) {
+				return false
+			} else {
+				this.isClickChange = true
+				this.currentTab = tabIndex
+				this.listQuery.listType = tabIndex
+				this.pullUpOn = true //切换时隐藏
+				this.loadding = false //切换时隐藏
+				this.getOrderDatainit(this.currentTab)
+			}
+		},
+		onClickScreenTab(index) {
+			this.screenTab = index
+			this.listQuery.orderSubmitType = index
+			this.pullUpOn = true //切换时隐藏
+			this.loadding = false //切换时隐藏
+			this.nomoreText = ''
+			this.getOrderDatainit(this.currentTab)
+		},
+		//判断当前滚动超过一屏时,设置tab标题滚动条。
+		checkCor: function() {
+			if (this.currentTab > 3) {
+				//这里距离按实际计算
+				this.scrollLeft = 300
+			} else {
+				this.scrollLeft = 0
+			}
+		},
+		async getOrderDatainit(index, source) {
+			try {
+				this.listQuery.pageNum = 1
+				let orderItem = this.orderTabBar[index]
+				if (source === 'tabChange' && orderItem.loaded === true) {
+					//tab切换只有第一次需要加载数据
+					return
+				}
+				//loaded新字段用于表示数据加载完毕,如果为空可以显示空白页
+				const res = await this.SellerService.GetSellerOrderList(this.listQuery) 
+				const data = res.data
+				if (data.list && data.list.length > 0) {
+					orderItem.orderList = []
+					data.list.forEach(item => { 
+						orderItem.orderList.push(item)
+					})
+					this.hasNextPage = data.hasNextPage
+					if (this.hasNextPage) {
+						this.pullUpOn = false
+						this.nomoreText = '上拉显示更多'
+					} else {
+						if (orderItem.orderList.length < 2) {
+							this.pullUpOn = true
+						} else {
+							this.pullUpOn = false
+							this.nomoreText = '已至底部'
+						}
+					}
+				} else {
+					this.$set(orderItem, 'loaded', true)
+					orderItem.orderList = []
+				}
+				this.skeletonShow = false
+			} catch (error) {
+				this.$util.msg(error.msg, 2000)
+			}
+		},
+		//上拉加载
+		async getOnReachBottomData(index) {
+			try {
+				this.listQuery.pageNum += 1
+				const res = await this.SellerService.GetSellerOrderList(this.listQuery)
+				const data = res.data
+				const orderItem = this.orderTabBar[index]
+				orderItem.orderList = orderItem.orderList.concat(data.list)
+				this.hasNextPage = data.hasNextPage
+				this.pullFlag = false // 防上拉暴滑
+				setTimeout(() => {
+					this.pullFlag = true
+				}, 500)
+				if (this.hasNextPage) {
+					this.pullUpOn = false
+					this.nomoreText = '上拉显示更多'
+				} else {
+					this.loadding = false
+					this.pullUpOn = false
+					this.nomoreText = '已至底部'
+				}
+			} catch (error) {
+				this.$util.msg(error.msg, 2000)
+			}
+		},
+		//获取点击
+		handButtonConfirm(data) {
+			console.log('data',data)
+			this.handleShopOrderId = data.shopOrderId
+			switch (data.type) {
+				case 'cancel': //取消订单
+					this.modal = true
+					this.contentModalText = '确认取消该订单吗?'
+					this.handleModelEven = 1
+					break
+				case 'delete': //删除订单
+					this.modal = true
+					this.contentModalText = '确认删除该订单吗?'
+					this.handleModelEven = 2
+					break
+				case 'confirm': // 确认订单
+					this.modal = true
+					this.contentModalText = '确认此订单吗?'
+					this.handleModelEven = 3
+					break
+				case 'again':
+					this.handOrderAgain(data.shopOrderId)
+					break
+				case 'query':
+					this.isModalLayer = true
+					this.$api.navigateTo('/pages/user/order/order-logistics?shopOrderId=' + data.shopOrderId)
+					break
+			}
+		},
+		//确定筛选
+		handSearchConfirmData(data) {
+			this.listQuery.groupServiceId = data.serviceProviderId
+			this.getOrderDatainit(this.currentTab)
+		},
+		scrolltolower() {
+			if (this.hasNextPage) {
+				this.loadding = true
+				this.pullUpOn = true
+				this.getOnReachBottomData(this.currentTab)
+			}
+		},
+		detail(order) {
+			//订单详情跳转
+			this.isModalLayer = true
+			this.$api.navigateTo(
+				`/pages/seller/order/order-team-details?listType=${this.currentTab}&shopOrderId=${
+					order.shopOrderId
+				}&userId=${order.userId}`
+			)
+		},
+		handlSearchPath() {
+			this.$api.navigateTo('/pages/seller/order/search-order')
+		},
+		
+		PromotionsFormat(promo) {
+			//促销活动类型数据处理
+			if (promo != null) {
+				if (promo.type == 1 && promo.mode == 1) {
+					return true
+				} else {
+					return false
+				}
+			}
+			return false
+		},
+		getHeaderTopHeight() {
+			// 状态栏高度
+			let self = this
+			let statusBarHeight = this.systeminfo.statusBarHeight
+			let headerPosi = this.headerBtnPosi
+			let btnPosi = {
+				// 胶囊实际位置,坐标信息不是左上角原点
+				height: headerPosi.height,
+				width: headerPosi.width,
+				// 胶囊top - 状态栏高度
+				top: headerPosi.top - statusBarHeight,
+				// 胶囊bottom - 胶囊height - 状态栏height (现胶囊bottom 为距离导航栏底部的长度)
+				bottom: headerPosi.bottom - headerPosi.height - statusBarHeight,
+				// 屏幕宽度 - 胶囊right
+				right: this.systeminfo.screenWidth - headerPosi.right
+			}
+			this.navbarHeight = headerPosi.bottom + btnPosi.bottom // 原胶囊bottom + 现胶囊bottom
+			//  高度自适应
+			uni.getSystemInfo({
+				success: function(res) {
+					let calc = res.windowHeight
+					self.winHeight = calc
+				}
+			})
+		},
+		setHeaderBtnPosi() {
+			// 获得胶囊按钮位置信息
+			let headerBtnPosi = uni.getMenuButtonBoundingClientRect()
+			return headerBtnPosi
+		},
+		setSysteminfo() {
+			let systeminfo
+			uni.getSystemInfo({
+				// 获取设备信息
+				success: res => {
+					systeminfo = res
+				}
+			})
+			return systeminfo
+		}
+	},
+	onPageScroll(e) {
+		this.scrollTop = e.scrollTop
+	},
+	onShow() {
+		this.isModalLayer = false
+	}
+}
+</script>
+
+<style lang="scss">
+page {
+	background-color: #ffffff;
+}
+/*tabbar start*/
+::-webkit-scrollbar {
+	width: 0;
+	height: 0;
+	color: transparent;
+}
+.order-section-top {
+	width: 100%;
+	position: fixed;
+	top: 0;
+	left: 0;
+	z-index: 99;
+	background: #ffffff;
+}
+.tab-view::before {
+	content: '';
+	position: absolute;
+	border-bottom: 1rpx solid #eaeef1;
+	-webkit-transform: scaleY(0.5);
+	transform: scaleY(0.5);
+	bottom: 0;
+	right: 0;
+	left: 0;
+}
+.tab-view {
+	width: 100%;
+	height: 80rpx;
+	overflow: hidden;
+	box-sizing: border-box;
+	background: #fff;
+	white-space: nowrap;
+	border-top: 1px solid #f7f7f7;
+}
+.tab-bar-item {
+	padding: 0;
+	height: 80rpx;
+	min-width: 80rpx;
+	line-height: 80rpx;
+	margin: 0 28rpx;
+	display: inline-block;
+	text-align: center;
+	box-sizing: border-box;
+	&.active {
+		border-bottom: 6rpx solid $color-system;
+	}
+	.tab-bar-title {
+		height: 80rpx;
+		line-height: 80rpx;
+		font-size: $font-size-28;
+		color: $text-color;
+	}
+	&.active .tab-bar-title {
+		color: $color-system !important;
+	}
+}
+.container {
+	padding-bottom: env(safe-area-inset-bottom);
+	height: auto;
+	position: relative;
+}
+.tui-order-content {
+	width: 100%;
+	height: auto;
+    background-color: #F7F7F7;
+}
+.tui-order-list {
+	width: 100%;
+	position: relative;
+}
+.tui-order-item {
+	display: flex;
+	flex-direction: column;
+	width: 702rpx;
+	padding: 0rpx 24rpx 0 24rpx;
+	background: #fff;
+    margin-bottom: 20rpx;
+}
+.order-title {
+	width: 100%;
+	height: auto;
+	.order-title-name {
+		width: 100%;
+		height: 72rpx;
+		border-bottom: 1px solid #f7f7f7;
+		line-height: 72rpx;
+		text-align: left;
+		font-size: $font-size-28;
+		color: #333333;
+		.tags {
+			display: inline-block;
+			width: 60rpx;
+			height: 32rpx;
+			border-radius: 16rpx 0;
+			background: #f0cb72;
+			font-size: $font-size-22;
+			color: #4e4539;
+			text-align: center;
+			line-height: 32rpx;
+			margin-left: 10rpx;
+			&.sv {
+				background: #333333;
+				color: #f0cb72;
+			}
+		}
+		.name {
+			float: right;
+			font-size: 26rpx;
+			color: #999999;
+		}
+	}
+	.order-title-t {
+		width: 100%;
+		height: 68rpx;
+		float: left;
+		line-height: 68rpx;
+		position: relative;
+		.bage-icon {
+			width: 50rpx;
+			height: 50rpx;
+			display: block;
+			position: absolute;
+			right: 110rpx;
+			top: 12rpx;
+		}
+		.bage{
+			display: inline-block;
+			width: 72rpx;
+			height: 32rpx;
+			margin: 19rpx 10rpx 0 10rpx;
+			border-radius: 16rpx 0;
+			line-height: 32rpx; 
+			font-size: $font-size-22;
+			text-align: center;
+			color: #ffffff;
+			float: left;
+			&.buss{
+				background: radial-gradient(circle, rgba(255, 39, 180, 1) 0%, rgba(193, 77, 245, 1) 100%);
+			}
+			&.auto{
+				background: #7fba4f;
+				color: #ffffff;
+			}
+			&.ebate{
+				background: #ff7a51;
+			}
+		}
+		.order-title-tip {
+			float: left;
+			font-size: $font-size-28;
+			line-height: 68rpx;
+			text-align: right;
+			color: #ff2a2a;
+		}
+	}
+	.order-title-b {
+		width: 100%;
+		height: 40rpx;
+		float: left;
+		margin-top: 8rpx;
+		.order-title-btxt {
+			float: left;
+			font-size: $font-size-28;
+			line-height: 40rpx;
+			color: #999999;
+			text-align: left;
+			&.num{
+				color: #333333;
+			}
+		}
+	}
+}
+.goods-title {
+	width: 100%;
+	height: 56rpx;
+	float: left;
+	margin-top: 10rpx;
+	.floor-item-act {
+		height: 56rpx;
+		text-align: center;
+		box-sizing: border-box;
+		float: left;
+		padding: 10rpx 0;
+		margin-right: 12rpx;
+	}
+	.title-text {
+		width: 400rpx;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+		float: left;
+		font-size: $font-size-28;
+		color: $text-color;
+		text-align: left;
+		line-height: 56rpx;
+		font-weight: bold;
+	}
+}
+.goods-item {
+	width: 100%;
+	height: auto;
+}
+.goods-pros-t {
+	width: 100%;
+	height: auto;
+	padding: 24rpx 0;
+	.pros-img {
+		float: left;
+		width: 180rpx;
+		height: 100%;
+		border-radius: 10rpx;
+		margin: 0 20rpx 0 0;
+		position: relative;
+		.tips {
+			display: inline-block;
+			width: 80rpx;
+			height: 40rpx;
+			background-image: linear-gradient(214deg, #ff4500 0%, #ff5800 53%, #ff4367 100%);
+			line-height: 40rpx;
+			text-align: center;
+			font-size: $font-size-24;
+			color: #ffffff;
+			border-radius: 10rpx 0 10rpx 0;
+			position: absolute;
+			top: 0;
+			left: 0;
+		}
+		image {
+			width: 178rpx;
+			height: 178rpx;
+			border-radius: 10rpx;
+	        border: 1px solid #f3f3f3;
+		}
+	}
+}
+.pros-product {
+	width: 460rpx;
+	height: 100%;
+	line-height: 36rpx;
+	font-size: $font-size-26;
+	position: relative;
+	float: left;
+	.producttitle {
+		width: 100%;
+		display: inline-block;
+		height: auto;
+		text-overflow: ellipsis;
+		display: -webkit-box;
+		word-break: break-all;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 2;
+		overflow: hidden;
+		margin-bottom: 8rpx;
+	}
+	.productspec {
+		height: 36rpx;
+		color: #999999;
+		text-overflow: ellipsis;
+		display: -webkit-box;
+		word-break: break-all;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 1;
+		overflow: hidden;
+	}
+	.productprice {
+		height: 48rpx;
+		width: 100%;
+		float: left;
+		.price {
+			line-height: 48rpx;
+			font-size: $font-size-28;
+			width: 48%;
+			color: #ff2a2a;
+			float: left;
+			font-weight: bold;
+			&.none {
+				text-decoration: line-through;
+				color: #999999;
+			}
+		}
+		.count {
+			height: 100%;
+			float: right;
+			position: relative;
+			.small {
+				color: #666666;
+			}
+		}
+	}
+	.floor-item-act {
+		width: 100%;
+		height: 56rpx;
+		text-align: center;
+		box-sizing: border-box;
+		float: left;
+		padding: 0 0 10rpx 0;
+	}
+}
+.order-footer {
+	width: 100%;
+	height: 78rpx;
+	float: left;
+	.order-footer-top {
+		width: 100%;
+		height: 34rpx;
+		line-height: 34rpx;
+		font-size: $font-size-24;
+		color: #999999;
+		text-align: right;
+	}
+	.order-footer-bot {
+		width: 100%;
+		float: left;
+		height: 48rpx;
+		line-height: 48rpx;
+		font-size: $font-size-28;
+		font-weight: bold;
+		color: $text-color;
+		.count {
+			width: 50%;
+			float: left;
+			text-align: left;
+		}
+		.money {
+			width: 50%;
+			float: right;
+			text-align: right;
+		}
+	}
+}
+.aganBj {
+	position: fixed;
+	left: 0;
+	top: 0;
+	bottom: 0;
+	width: 100%;
+	height: 100%;
+	background-color: rgba(0, 0, 0, 0.5);
+	z-index: 999999;
+	.alertAgan {
+		position: absolute;
+		top: 50%;
+		left: 50%;
+		transform: translate(-50%, -50%);
+		width: 580rpx;
+		background-color: #fff;
+		border-radius: 16rpx;
+		.title {
+			font-size: 30rpx;
+			color: #333333;
+			line-height: 42rpx;
+			padding: 30rpx;
+			display: block;
+		}
+		.goods {
+			padding: 0 30rpx;
+			.list {
+				padding: 10px 0;
+				border-bottom: 1rpx solid #e1e1e1;
+				margin: 10rpx 0;
+				.image-left {
+					width: 86rpx;
+					height: 86rpx;
+					border: 2rpx solid #e1e1e1;
+					border-radius: 6rpx;
+					display: inline-block;
+					vertical-align: middle;
+				}
+				.name-right {
+					display: inline-block;
+					width: 416rpx;
+					margin-left: 15rpx;
+					font-size: 26rpx;
+					color: #666666;
+					vertical-align: middle;
+					word-break: break-all;
+					overflow: hidden;
+					text-overflow: ellipsis;
+					display: -webkit-inline-box;
+					-webkit-line-clamp: 2;
+					-webkit-box-orient: vertical;
+				}
+			}
+		}
+		.BtnAll {
+			margin-top: 30rpx;
+			.btn {
+				display: inline-block;
+				width: 290rpx;
+				height: 90rpx;
+				line-height: 90rpx;
+				text-align: center;
+				&.closebtn {
+					border-radius: 0px 0px 0px 10px;
+					color: #999999;
+					background: #efefef;
+				}
+				&.cancel {
+					border-radius: 0px 0px 8px 0px;
+					background: $btn-confirm;
+					color: #fff;
+				}
+			}
+		}
+	}
+}
+</style>

+ 3 - 3
pages/tabBar/home/components/customer.vue

@@ -19,11 +19,11 @@
                     <view class="search-text">{{ hotSearchText }}</view>
                     <view class="search-btn">搜索</view>
                 </view>
-                <view class="gosearch-kf">
+              <!--  <view class="gosearch-kf">
                     <view class="contact-btn" @click.stop="handleToChat">
                         <text class="iconfont icon-AIzhushou"></text>
                     </view>
-                </view>
+                </view> -->
             </view>
             <view class="swiper-banner-nav">
                 <scroll-view class="scroll-view_H" scroll-x="true">
@@ -231,7 +231,7 @@
         box-sizing: border-box;
         margin-top: 10rpx;
         .gosearch-btn {
-            width: 632rpx;
+            width: 100%;
             height: 100%;
             padding: 5rpx;
             border-radius: 40rpx;

+ 2 - 2
services/config.env.js

@@ -2,8 +2,8 @@ let URL_CONFIG = ''
 if(process.env.NODE_ENV === 'development'){
     // 开发环境
     // URL_CONFIG = 'http://192.168.2.67:18002'	 //智捷联调地址
-    // URL_CONFIG = 'https://core-b.caimei365.com' 
-    URL_CONFIG = 'https://core.caimei365.com'    
+    URL_CONFIG = 'https://core-b.caimei365.com' 
+    // URL_CONFIG = 'https://core.caimei365.com'    
 }else{
     // 生产环境
     URL_CONFIG = 'https://core.caimei365.com'