commit -m 运费

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

@@ -1,298 +0,0 @@
-<template>
-	<view id="category" :style="{paddingTop:CustomBar+'px'}">
-		<!--顶部搜索导航栏-->
-		<view class="'search-input-fixed" :style="{top:CustomBar/2+'px'}">
-			<cat-search :systeminfo='systeminfo' :navbar-data='nvabarData' :headerBtnPosi ="headerBtnPosi" @click="hanldTabClick"></cat-search>
-		</view>
-		<tui-skeleton v-if="skeletonShow" backgroundColor="#fafafa" borderRadius="10rpx" :isLoading	="true" :loadingType="5"></tui-skeleton>
-		<view class="category-list" v-else>
-			<!-- 左侧分类导航 -->
-			<scroll-view class="left-aside" scroll-y="true" scroll-with-animation :scroll-top="verticalNavTop" :style="{top:(CustomBar+38)+'px',height:(windowHeight-CustomBar+38)+'px'}">
-				<view class="row" v-for="(m, index) in categoryList" :key="index" :class="[index==showCategoryIndex?'on':'']" @tap="showCategory($event,index)" :data-id="index">
-					<view class="text">{{m.name}}</view>
-					<view class="block"></view>
-				</view>
-			</scroll-view>
-			<!--右侧子导航-->
-			<scroll-view  scroll-y="true" class="right-aside" :style="{top:(CustomBar+38)+'px',height:(windowHeight-CustomBar+38)+'px'}">
-				<view class="category" v-for="(first,index) in categoryList" :key="index" v-show="index==showCategoryIndex" >
-					<template v-if="first.smalltypeList">
-						<view class="category-box AAA" v-for="(small,oIndex) in first.smalltypeList" :key="oIndex">
-							<view class="title">{{small.name}}</view>
-							<view class="list" v-if="small.tinytypeList.length > 0">
-								<view class="box" v-for="(pro,proIndex) in small.tinytypeList" :key="proIndex" @click.stop="navToListPage(pro,3)">
-									<image :src="pro.crmIcon ? pro.crmIcon : 'https://static.caimei365.com/app/img/icon/icon-noneproduct.jpg'"></image>
-									<view class="text">{{pro.name}}</view>
-								</view>
-							</view>
-							<view v-else class="no-data">
-								<view class="box" @click.stop="navToListPage(small,2)">
-									<image :src="small.crmIcon ? small.crmIcon : 'https://static.caimei365.com/app/img/icon/icon-noneproduct.jpg'"></image>
-									<view class="text">全部商品</view>
-								</view>
-							</view>
-						</view>
-					</template>
-					<template v-else>
-						<view class="category-box BBB">
-							<view class="title">{{first.name}}</view>
-							<view class="no-data">
-								<view class="box" @click.stop="navToListPage(first,1)">
-									<image :src="first.crmIcon ? first.crmIcon : 'https://static.caimei365.com/app/img/icon/icon-noneproduct.jpg'"></image>
-									<view class="text">全部商品</view>
-								</view>
-							</view>
-						</view>
-					</template>
-				</view>
-			</scroll-view>
-		</view>
-	</view>
-</template>
-<script>
-	import catSearch from '@/components/uni-search/cat-search.vue'
-	export default {
-		components: {
-			catSearch
-		},
-		data() {
-			return {
-				nvabarData: {							 //顶部自定义导航
-					showCapsule: 1, // 是否显示左上角图标   1表示显示    0表示不显示
-					title: ''		// 导航栏 中间的标题
-				},
-				CustomBar:this.CustomBar,// 顶部导航栏高度
-				headerBtnPosi:	this.setHeaderBtnPosi(), //获取设备顶部胶囊高度
-				systeminfo: this.setSysteminfo(),		 //获取设备信息
-				headerShow:true,
-				showCategoryIndex: 0,
-				categoryList: [],//分类列表
-				search: '',
-				cateTop: {},
-				verticalNavTop: 0,
-				categoryTabIndex:1,
-				windowHeight:0,
-				scrollHeight:0,
-				skeletonShow:true
-			}
-		},
-		created() {
-			this.initData();
-		},
-		methods: {
-			// 数据初始化
-			initData() {
-				this.GetProductCate(this.categoryTabIndex);
-				const {windowHeight, pixelRatio} = wx.getSystemInfoSync();
-				this.windowHeight = windowHeight - 1;
-				this.scrollHeight = windowHeight - 1;
-			},
-			hanldTabClick(data){
-				this.categoryList = []
-				this.GetProductCate(data);
-			},
-			// 获取商品分类列表
-			GetProductCate (index) {
-				this.CommonService.GetFirstClassly({typeSort:index,source :'crm'}).then(response =>{
-					this.categoryList = response.data
-					// 查询第一个拥有二级菜单的子菜单
-					for (let i = 0; i < this.categoryList.length; i++) {
-						if (this.categoryList[i].smalltypeList.length > 0) {
-							this.showCategoryIndex = i;
-							break;
-						}
-					}
-					this.skeletonShow = false
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000)
-				})
-			},
-			showCategory(e,index){//分类切换显示
-				this.showCategoryIndex = index;
-				this.verticalNavTop = (e.currentTarget.dataset.id - 1) * 50
-			},
-			toSearch () {// 跳转至搜索详情页
-				uni.navigateTo({
-					url: `/search/pages/search/search?search=${JSON.stringify(this.search)}`
-				})
-			},
-			navToListPage(item,index){//分类导航跳转
-				switch(index){
-					case 1:
-						this.$api.navigateTo(`/pages/goods/goods-classify?classType=1&id=${item.bigTypeID}&title=${item.name}`)
-						break;
-					case 2:
-						this.$api.navigateTo(`/pages/goods/goods-classify?classType=2&id=${item.smallTypeID}&title=${item.name}`)
-						break;
-					case 3:
-						this.$api.navigateTo(`/pages/goods/goods-classify?classType=3&id=${item.tinyTypeID}&title=${item.name}`)
-						break;
-				}
-			},
-			setHeaderBtnPosi(){
-				// 获得胶囊按钮位置信息
-				let headerBtnPosi = uni.getMenuButtonBoundingClientRect();
-				return headerBtnPosi
-			},
-			setSysteminfo(){
-				let systeminfo;
-				uni.getSystemInfo({ // 获取设备信息
-					success: (res) => {
-						systeminfo = res
-					},
-				})
-				return systeminfo
-			},
-		}
-	}
-</script>
-<style lang="scss">
-	page {
-		background-color: #fff;
-	}
-	.search-input-fixed{
-		width: 100%;
-		height:auto;
-		position: fixed;
-		top: 0;
-		left: 0;
-		z-index: 1000;
-		background: #FFFFFF;
-		border-bottom: 1px solid #F7F7F7;
-	}		
-	.category-list{
-		width: 100%;
-		background-color: #fff;
-		display: flex;
-		.left-aside,.right-aside{
-			position: absolute;
-			top: 100rpx;
-			/*  #ifdef  APP-PLUS  */
-			top: calc(100rpx + var(--status-bar-height));
-			/*  #endif  */
-			bottom: 0rpx;
-		}
-		.left-aside{
-			width: 200rpx;
-			left: 0rpx;
-			background-color: #f2f2f2;
-			.row{
-				width: 100%;
-				height: 100rpx;
-				display: flex;
-				align-items: center;
-				position: relative;
-				.text{
-					width: 100%;
-					position: relative;
-					font-size: $font-size-28;
-					display: flex;
-					justify-content: center;
-					color: $text-color;
-					/* transition: transform 0.3s ease;*/
-					transition-property: transform;
-					transition-duration: 0.2s;
-					transition-timing-function: ease;
-				}
-				.block{
-					position: absolute;
-					width: 0rpx;
-					left: 0;
-					/* transition: transform 0.3s ease;*/
-					transition-property: transform;
-					transition-duration: 0.2s;
-					transition-timing-function: ease;
-				}
-				&.on{
-					height: 100rpx;
-					background-color: #fff;
-					.text{
-						font-size: $font-size-28;
-						color: $color-system;
-					}
-					.block{
-						width: 10rpx;
-						height: 60rpx;
-						top: 20rpx;
-						background-color: $color-system;
-						border-radius: 0 15rpx 15rpx 0;
-					}
-				}
-			}
-		}
-		.right-aside{
-			width: 550rpx;
-			left: 200rpx;
-			.category{
-				width: calc(100%);
-				padding: 0 15rpx 20rpx 0;
-				background: #F7F7F7;
-				.category-box{
-					background: #FFFFFF;
-					margin-bottom: 20rpx;
-					.title{
-						padding: 0 24rpx;
-						line-height: 80rpx;
-						height: 80rpx;
-						text-align: left;
-						color: $text-color;
-						font-size: $font-size-26;
-						border-bottom: 1px solid #F7F7F7;
-						font-weight: 600;
-					}
-					.list{
-						margin-top: 24rpx;
-						width: 100%;
-						display: flex;
-						flex-wrap: wrap;
-						.box{
-							width: calc(71.44vw / 3);
-							margin-bottom: 40rpx;
-							display: flex;
-							justify-content: center;
-							align-items: center;
-							flex-wrap: wrap;
-							image{
-								width: 140rpx;
-								height: 140rpx;
-							}
-							.text{
-								margin-top: 8rpx;
-								width: 100%;
-								display: flex;
-								justify-content: center;
-								font-size: $font-size-24;
-							}
-						}
-					}
-					.no-data {
-						text-align: center;
-						margin: 30rpx 0;
-						color: #666666;
-						font-size: 24rpx;
-						line-height: 80rpx;
-						.box{
-							width: calc(71.44vw / 3);
-							margin-bottom: 40rpx;
-							display: flex;
-							justify-content: center;
-							align-items: center;
-							flex-wrap: wrap;
-							image{
-								width: 140rpx;
-								height: 140rpx;
-							}
-							.text{
-								margin-top: 8rpx;
-								width: 100%;
-								display: flex;
-								justify-content: center;
-								font-size: $font-size-24;
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-</style>

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

@@ -1,183 +0,0 @@
-<template>
-	<view class="container home clearfix" :style="{paddingTop:CustomBar+'px'}">
-		<customer ref="customer" :navbar-data='nvabarData'></customer>
-		<!-- 主页内容 -->
-		<tui-skeleton v-if="skeletonShow" backgroundColor="#fafafa" borderRadius="10rpx" :isLoading	="true" :loadingType="5"></tui-skeleton>
-		<view class="container-home tui-skeleton">
-			<!-- 轮播 -->
-			<banner :list="bannerImageList" v-if="isNavRequest"></banner>
-			<!-- 金刚区菜单 -->
-			<navbars :list="navBarsList" v-if="isNavRequest"></navbars>
-			<!-- 直播 -->
-			<page-special :templateData="templateData" v-if="isLiveRequest"></page-special>
-		</view>	
-		<!-- 楼层 -->
-		<view class="container-section tui-skeleton">
-			<page-floor :list="pageList" :userIdentity="userIdentity" :pageType='1' v-if="isRequest"></page-floor>
-			<supplier-list :supplierObj="supplierObj" v-if="isRequest"></supplier-list>
-		</view>
-		<!-- 活动弹窗 -->
-		<activityAlert :show="isActivity" @click="handleClick" @cancel="handleCancelClick"></activityAlert>
-		<!-- 侧边 -->
-		<scroll-top :isScrollTop="isScrollTop" :bottom="50"></scroll-top>
-	</view>
-</template>
-
-<script>
-	import tuiSkeleton from "@/components/tui-skeleton/tui-skeleton"
-	import authorize from '@/common/config/authorize.js'
-	import customer from '@/components/cm-module/homeIndex/customer.vue'
-	import banner from '@/components/cm-module/homeIndex/banner.vue'
-	import navbars from '@/components/cm-module/homeIndex/navbars.vue'
-	import pageFloor from '@/components/cm-module/homeIndex/pageFloor.vue'
-	import pageSpecial from '@/components/cm-module/homeIndex/pageSpecial.vue'
-	import supplierList from '@/components/cm-module/homeIndex/supplierList.vue'
-	import { userInfoLogin } from "@/services/use.js"
-	import { mapState,mapMutations} from 'vuex';
-	export default {
-		components:{
-			tuiSkeleton,
-			customer,
-			banner,
-			navbars,
-			pageFloor,
-			pageSpecial,
-			supplierList
-		},
-		data() {
-			return {
-				nvabarData: {//顶部自定义导航
-					showCapsule: 1, // 是否显示左上角图标  1表示显示  0表示不显示,
-					showSearch: 0,
-					title: '采美采购商城', // 导航栏 中间的标题
-					haveBack:false,
-					textLeft:this.$store.state.isIphone,
-					textColor:'#FFFFFF'
-				},
-				CustomBar:this.CustomBar,// 顶部导航栏高度
-				userID:0,
-				clubStatus:'',
-				current:0,
-				mode:'round',
-				modallayer:false,
-				isLogin:false,
-				skeletonShow: true,
-				userIdentity:'',
-				flootData:[],//楼层
-				bannerImageList:[],//轮播
-				navBarsList:[],//导航分类
-				templateData:{},
-				pageList:[],//楼层
-				supplierObj:{},//供应商列表
-				isScrollTop:false,
-				isRequest:false,
-				isNavRequest:false,
-				isLiveRequest:false,
-			}
-		},
-		created() {
-			this.$api.getStorage().then((resolve) =>{
-				this.userID = resolve.userID ? resolve.userID : 0
-				this.userIdentity = resolve.userIdentity
-				this.getHomeInformation()
-			})
-		},
-		filters: {
-			NumFormat:function(text) {//处理金额
-				return Number(text).toFixed(2);
-			},
-		},
-		computed: {
-			...mapState(['hasLogin','userInfo','isActivity'])
-		},
-		methods: {
-			...mapMutations(['login','logout']),
-			GetHomeInit(){//金刚区分类
-				this.CommonService.GetHomeInit({source:2}).then(response =>{
-					let data = response.data
-					this.navBarsList = data.topMenuList
-					this.isNavRequest = true
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000)
-				})
-			},
-			GetHomeTopDataInfo(){//直播、活动、文章模块
-				this.CommonService.GetHomeTopDataInfo({source:2}).then(response =>{
-					this.templateData = response.data
-					this.isLiveRequest = true
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000)
-				})
-			},
-			GetHomeFloorInfo(){//初始化首页楼层数据
-				this.CommonService.GetHomeDataInfo({userId:this.userID,soure:2}).then(response =>{
-					let data = response.data;
-					this.liveList = data.liveList;
-					this.pageList = data.homePageFloor;
-					this.supplierObj = data.supplierImage;
-					this.isRequest = true;
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000)
-				})
-			},
-			getHomeInformation(){//初始化首页数据	
-				this.CommonService.GetHomeModulesDataInfo({ userId:this.userID }).then(res =>{
-					let data = res.data;
-					this.bannerImageList = data.bannerImageList
-					this.mallPageModules = data.mallPageModules
-					this.$store.commit('updateAllNum',data.shoppingCartCount)
-					this.skeletonShow = false;
-					this.GetHomeInit()
-					this.GetHomeTopDataInfo()
-					this.GetHomeFloorInfo()
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000)
-				})
-			},
-			handleClick(data){
-				this.$api.navigateTo(`/h5/pages/activity/meobohui`)
-				this.$store.commit('setActivity',data)
-			},
-			handleCancelClick(data){
-				this.$store.commit('setActivity',data)
-			}
-		},
-		onPageScroll(e){//实时获取到滚动的值
-			if(e.scrollTop>50){
-				this.inputActive = 'fixed'
-			}else{
-				this.inputActive = 'float'
-			}	
-			if(e.scrollTop>400){
-				this.isScrollTop = true
-			}else{
-				this.isScrollTop = false
-			}	
-		},
-		onPullDownRefresh() {//下拉刷新
-			this.getHomeInformation()
-			uni.stopPullDownRefresh()
-		},
-		onShareAppMessage(res){//分享转发
-			if (res.from === 'button') {
-		      // 来自页面内转发按钮
-		    }
-			return {
-			  title: '生美医美正品采购服务平台',
-			  path: 'pages/tabBar/home/index',
-			  imageUrl:'https://static.caimei365.com/app/img/bg/min-banner.jpg'
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	page{
-		background-color: #FFFFFF;
-	}
-	.container-section{
-		width: 100%;
-		height: auto;
-		background-color: #F7F7F7;
-	}
-</style>

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

@@ -1,546 +0,0 @@
-<template>
-	<view class="container user clearfix">
-		<cm-custom :navbar-data='nvabarData'></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">
-					<view class="header-text">
-						<view class="user-item">
-							<text class="u-h1">{{name}}</text>
-						</view>
-						<view class="user-item">
-							<text class="u-tips">协销人员</text>
-						</view>
-					</view>
-					<view class="header-icon" @click="TestZHIboFn()"><image :src="headpic == null? 'https://static.caimei365.com/app/img/icon/icon-seller@3x.png' : headpic" mode=""></image></view>
-				</view>
-				<!-- 订单 -->
-				<view class="user-order">
-					<view class="tab-title" @click="navigator('/seller/pages/order/order-list?listType=0')">
-						<text class="cell-tit">我的订单</text>
-						<text class="cell-more">全部订单</text>
-						<text class="iconfont icon-chakangengduo"></text>
-					</view>
-					<view class="order-section">
-						<view class="order-item" @click="navigator('/seller/pages/order/order-list?listType=1')" hover-class="common-hover"  :hover-stay-time="50">
-							<view class="order-icon">
-								<image src="https://static.caimei365.com/app/img/icon/order5@3x.png" mode=""></image>
-								<text 	v-if="beforeConfirmCount>0" 
-										class="uni-badge uni-badge-error uni-small uni-badge--small icon-num" 
-										:class="[beforeConfirmCount < 10 ? 'goleft':'']">
-										{{beforeConfirmCount >= 99? '99+' : beforeConfirmCount}}
-								</text>
-							</view>
-							<text class="order-t">待确认</text>
-						</view>
-						<view class="order-item" @click="navigator('/seller/pages/order/order-list?listType=2')"  hover-class="common-hover" :hover-stay-time="50">
-							<view class="order-icon">
-								<image src="https://static.caimei365.com/app/img/icon/order1@3x.png" mode=""></image>
-								<text  v-if="beforePayCount >0" 
-									   class="uni-badge uni-badge-error uni-small uni-badge--small icon-num " 
-									   :class="[beforePayCount < 10 ? 'goleft':'']">
-									   {{beforePayCount >= 99? '99+' : beforePayCount}}
-								</text>
-							</view>
-							<text class="order-t">待付款</text>
-						</view>
-						<view class="order-item" @click="navigator('/seller/pages/order/order-list?listType=3')" hover-class="common-hover"  :hover-stay-time="50">
-							<view class="order-icon">
-								<image src="https://static.caimei365.com/app/img/icon/static/temp/order2@3x.png" mode=""></image>
-								<text   v-if="beforeShipCount >0" 
-										class="uni-badge uni-badge-error uni-small uni-badge--small icon-num" 
-										:class="[beforeShipCount < 10 ? 'goleft':'']">
-										{{beforeShipCount >= 99? '99+' : beforeShipCount}}
-								</text>
-							</view>
-							<text class="order-t">待发货</text>
-						</view>
-						<view class="order-item" @click="navigator('/seller/pages/order/order-list?listType=4')" hover-class="common-hover"  :hover-stay-time="50">
-							<view class="order-icon">
-								<image src="https://static.caimei365.com/app/img/icon/static/temp/order3@3x.png" mode=""></image>
-								<text 	v-if="shippedCount>0" 
-										class="uni-badge uni-badge-error uni-small uni-badge--small icon-num" 
-										:class="[shippedCount < 10 ? 'goleft':'']">
-										{{shippedCount >= 99? '99+' : shippedCount}}
-								</text>
-							</view>
-							<text class="order-t">已发货</text>
-						</view>
-						<view class="order-item" @click="navigator('/seller/pages/order/order-list?listType=5')" hover-class="common-hover"  :hover-stay-time="50">
-							<view class="order-icon">
-								<image src="https://static.caimei365.com/app/img/icon/static/temp/order4@3x.png" mode=""></image>
-								<text 	v-if="refundsCount >0"
-										class="uni-badge uni-badge-error uni-small uni-badge--small icon-num" 
-										:class="[refundsCount < 10 ? 'goleft':'']">
-										{{refundsCount >= 99 ? '99+' : refundsCount}}
-								</text>
-							</view>
-							<text class="order-t">退货/款</text>
-						</view>
-					</view>
-				</view>
-			</view>
-			<!-- 底部跳转 -->
-			<view class="foot-list">
-				<view class="list-cell-item">
-					<view class="list-cell"  v-for="(item, index) in firstList" :key="index" @click="navigator(item.path)" hover-class="cell-hover" :hover-stay-time="50">
-						<text class="cell-icon"><text class="iconfont" :class="item.icon"></text></text>
-						<text class="cell-tit">{{item.name}}</text>
-						<text 	v-if="index == 0 && orderNum >0"
-								class="uni-badge uni-badge-error uni-small uni-badge--small icon-num">
-								{{orderNum == 99 ? '99+' : orderNum}}
-						</text>
-						<text class="cell-more iconfont icon-chakangengduo"></text>
-					</view>
-				</view>
-			</view>
-		</view>	
-	</view>
-</template>
-<script>
-	import authorize from '@/common/config/authorize.js'
-	import uniBadge from '@/components/uni-badge/uni-badge.vue'
-	import { mapState,mapMutations } from 'vuex'
-	import { userInfoLogin } from "@/services/use.js"
-	
-	export default{
-		components: {
-			uniBadge,
-		},
-		data() {
-			return{	
-				nvabarData: {//顶部自定义导航
-					showCapsule: 1, // 是否显示左上角图标  1表示显示  0表示不显示,
-					showSearch: 0,
-					title: '账户中心', // 导航栏 中间的标题
-					haveBack:false,
-					textLeft:this.$store.state.isIphone,
-					textColor:'#FFFFFF',
-					bgColor:''
-				},
-				CustomBar:this.CustomBar,// 顶部导航栏高度
-				StatusBar: this.StatusBar,
-				bgImgUrl:'https://img.caimei365.com/group1/M00/03/B0/Cmis217Z_i6ASHobAAhl69yz3SM078.png',
-				name:'',
-				headpic:'',
-				userId:'',
-				skeletonShow:true,
-				orderNum:0,//机构自主下单订单数
-				beforeConfirmCount:0,//待确认角标
-				beforePayCount:0, 	//待付款角标
-				beforeShipCount:0, //待发货角标
-				shippedCount:0,   //已发货角标
-				refundsCount:'', //退货/款角标
-				institutionsCont:120,
-				firstList:[
-					{name:'机构列表',path:'/seller/pages/club/list',icon:'icon-jigouliebiao'},
-					{name:'帮机构下单',path:'/seller/pages/club/club-list',icon:'icon-bangjigouxiadan'},
-					{name:'拉机构上线',path:'/seller/pages/login/register',icon:'icon-lajigoushangxian'},
-					{name:'邀请运营人员',path:'/seller/pages/club/allClub-list',icon:'icon-yaoqingyunyingrenyuan'}
-				],
-			}
-		},
-		created() {
-			this.initData()
-		},
-		computed: {
-			...mapState(['hasLogin','userInfo'])
-		},
-		methods:{
-			...mapMutations(['login','logout']),
-			initData(){
-				authorize.getCode('weixin').then(wechatcode =>{// 根据微信的code获取用户登录状态:1已登录过 -1未登录过
-					authorize.getUserInfo('weixin').then(wxResponse =>{
-						userInfoLogin({code:wechatcode,encryptedData:wxResponse.encryptedData,iv:wxResponse.iv}).then(response =>{
-							this.$store.commit('updateStatus',response.data)
-							this.login(response.data);
-							uni.setStorageSync('token',response.data.token)
-							uni.removeStorageSync('sessionid')
-							uni.setStorageSync('sessionid','JSESSIONID='+response.data.sessionId)
-							this.getUserSellerHome()
-						}).catch(response =>{
-							this.logout()
-							uni.removeStorageSync('sessionid')
-							uni.setStorageSync('sessionid','JSESSIONID='+response.data)
-							this.$store.commit('updateStatus',response.data)
-							this.$api.navigateTo('/seller/pages/login/login')
-						})
-					})
-				})
-			},
-			getUserSellerHome(){
-				this.$api.getStorage().then((resolve) =>{
-					this.userId = resolve.userID
-					this.SellerService.GetSellerHome({userId:this.userId}).then(response =>{
-						let sellerData = response.data
-						this.name = sellerData.seller.linkMan1?sellerData.seller.linkMan1:'' 	//协销名称
-						this.headpic = sellerData.seller.logo //会所头像
-						this.beforeConfirmCount = this.showBadge(sellerData.beforeConfirmCount)//待付款
-						this.beforePayCount = this.showBadge(sellerData.beforePayCount)//待付款
-						this.beforeShipCount = this.showBadge(sellerData.beforeShipCount)//待发货		
-						this.shippedCount = this.showBadge(sellerData.shippedCount)//已发货	
-						this.refundsCount = this.showBadge(sellerData.refundsCount)//退货/款	
-						this.orderNum = this.showBadge(sellerData.orderNum)//机构自主下单订单数
-						this.skeletonShow = false;
-					}).catch(error =>{
-						this.$util.msg(error.msg,2000)
-					})
-				})	
-			},
-			TestZHIboFn(){//测试跳转直播小程序
-				uni.navigateToMiniProgram({
-					appId: 'wx92d650b253f8f2e3',
-					path: '/pages/index/index',
-					extraData: {
-						'data1': 'test'
-					},
-					envVersion: 'develop',
-					success(res) {
-						// 打开成功
-						console.log(res)
-					}
-				})
-			},
-			navigator(url){
-				this.$api.navigateTo(url)
-			},			
-			showBadge(n){
-				let num ='';
-				if(n>100){num = 99}else{num = n;}
-				return num;
-			},
-			onPullDownRefresh() {//下拉刷新
-				this.initData()
-				uni.stopPullDownRefresh()
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	@import "@/uni.scss";
-	page{
-		background-color: #F7F7F7;
-	}
-	.user{
-		width: 100%;
-		height: 100%;
-		position:relative;
-		background: rgba(247, 247, 247, 1);
-	}	
-	.header{
-		width: 100%;
-		position: relative;
-		background-size: cover;
-		border-radius: 0 0 100rpx 100rpx;
-	}	
-	.header-main{
-		width: 702rpx;
-		height: 130rpx;
-		padding: 12rpx 24rpx;
-		display: flex;
-		.header-text{
-			flex: 8;
-			display: flex;
-			flex-direction: column;
-			.user-item{
-				flex: 1;
-				height: 64rpx;
-				line-height: 64rpx;
-				.u-tips{
-					display: inline-block;
-					float: left;
-					width: 98rpx;
-					height: 30rpx;
-					border: 1px solid #FFFFFF;
-					background: linear-gradient(128deg,rgba(242,143,49,1) 0%,rgba(225,86,22,1) 100%);
-					border-radius: 16rpx;
-					line-height: 30rpx;
-					font-size: $font-size-20;
-					text-align: center;
-					color: #FFFFFF;
-					margin-left: 10rpx;
-				}
-				.u-viptips{
-					display: inline-block;
-					float: left;
-					width: 98rpx;
-					height: 30rpx;
-					border: 1px solid #FFE600;
-					background: linear-gradient(128deg,rgba(242,143,49,1) 0%,rgba(225,86,22,1) 100%);
-					border-radius: 16rpx;
-					line-height: 30rpx;
-					font-size: $font-size-20;
-					text-align: center;
-					color: #FFE600;
-					margin-left: 10rpx;
-					margin-top: 17rpx;
-				}
-				.u-h1{
-					float: left;
-					font-size: $font-size-36;
-					color: #FFFFFF;
-					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;
-				}
-				.u-p{
-					font-size: $font-size-24;
-					line-height: 64rpx;
-					color: #FFFFFF;
-					text-align: left;
-				}
-			}
-		}
-		.header-icon{
-			flex: 2;
-			margin-right: 20rpx;
-			image{
-				float: right;
-				width: 128rpx;
-				height: 128rpx;
-				border-radius: 100%;
-				border: 2rpx solid #FFFFFF;
-			}
-		}
-	}
-	.header-main-none{
-		width: 702rpx;
-		height: 152rpx;
-		padding: 0 24rpx;
-		display: flex;
-		.header-text{
-			flex: 8;
-			display: flex;
-			flex-direction: column;
-			.user-item{
-				flex: 1;
-				height: 50rpx;
-				line-height: 50rpx;
-				.line{
-					margin: 0 10rpx;
-				}
-				.u-h1{
-					float: left;
-					font-size: $font-size-36;
-					color: #FFFFFF;
-					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;
-				}
-				.u-p{
-					font-size: $font-size-24;
-					line-height: 50rpx;
-					color: #EFEFEF;
-					text-align: left;
-				}
-				.u-btn{
-					width: 160rpx;
-					height: 40rpx;
-					background: rgba(255,255,255,.5);
-					border-radius: 5rpx;
-					line-height: 40rpx;
-					text-align: center;
-					font-size: $font-size-24;
-					color: #FFFFFF;
-					display: block;
-					margin-top: 5rpx;
-					padding-left: 6rpx;
-					.icon-xiangyouhuabeifen{
-						font-size: $font-size-24;
-					}
-				}
-			}
-		}
-		.header-icon{
-			flex: 2;
-			display: flex;
-			margin-right: 20rpx;
-			align-items: center;
-			justify-content: center;
-			image{
-				float: right;
-				width: 128rpx;
-				height: 128rpx;
-				border-radius: 100%;
-				border: 2rpx solid #FFFFFF;
-			}
-		}
-	}
-	.user-order{
-		width: 654rpx;
-		height: auto;
-		padding: 0 24rpx;
-		background-color: $bg-color;
-		margin-bottom: 24rpx;
-		position: absolute;
-		bottom: -170rpx;
-		left: 24rpx;
-		border-radius: 20rpx;
-	}	
-	.tab-title{
-		font-size: $font-size-28;
-		line-height: 80rpx;
-		color: #333333;
-		text-align:left;
-		border-bottom: 1px solid #F8F8F8;
-		position: relative;
-		.cell-tit{
-			font-size: $font-size-28;
-			color: $text-color;
-		}
-		.cell-more{
-			float: right;
-			line-height: 80rpx;
-			font-size: $font-size-24;
-			color: #666666;
-			padding-right: 30rpx;
-		}
-		.iconfont{
-			width: 30rpx;
-			height: 80rpx;
-			line-height: 80rpx;
-			text-align: center;
-			position: absolute;
-			right: 0;
-			top: 0;
-			display: block;
-			font-size: $font-size-28;
-		}
-	}
-	.order-section{
-		display: flex;
-		justify-content: space-around;
-		align-items: center;
-		flex-wrap:wrap;
-		height: 99rpx;
-		padding: 24rpx 0;
-	}
-	.order-item{
-		flex:1;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		position: relative;
-		&:last-child{
-			margin-right: 0;
-		}
-		.order-icon{
-			width: 52rpx;
-			height: 52rpx;
-			position: relative;
-			image{
-				width: 52rpx;
-				height: 52rpx;
-			}
-			.icon-num{
-				position: absolute;
-				right:-24rpx;
-				top: -9rpx;
-			}
-			.icon-num.goleft{
-				right: -12rpx;
-			}
-		}
-		.order-t{
-			line-height: 50rpx;
-			font-size: $font-size-24;
-			color: $text-color;
-		}
-	}
-	.foot-list{
-		width: 702rpx;
-		padding: 0 24rpx;
-		padding-top: 168rpx;
-	}	
-	.list-cell-item{
-		width: 654rpx;
-		height: auto;
-		margin-bottom: 24rpx;
-		padding:0 24rpx;
-		background: $bg-color;
-		border-radius: 20rpx;
-	}
-	.list-cell{
-		display:flex;
-		width: 100%;
-		align-items:baseline;
-		line-height:100rpx;
-		position:relative;
-		background: $bg-color;
-		justify-content: center;
-		border-bottom: 1px solid #EBEBEB;
-		&:last-child{
-			border-bottom: none;
-		}
-		&.cell-hover{
-			background:#fafafa;
-		}
-		.cell-icon{
-			width: 60rpx;
-			height: 100rpx;
-			line-height: 100rpx;
-			text-align: center;
-			.iconfont{
-				font-size: $font-size-34;
-				color: #666666;
-			}
-		}
-		.cell-more{
-			align-self: baseline;
-			font-size:$font-size-28;
-			color:#666666;
-			.txt{
-				color: #FB4343;
-				padding-right: 10rpx;
-			}
-		}
-		.cell-tit{
-			flex: 1;
-			font-size: $font-size-28;
-			color: #666666;
-			margin-right:10rpx;
-		}
-		.cell-tip{
-			font-size: $font-size-28;
-			color: $text-color;
-		}
-	}	
-	.list-cell.last{
-		border-bottom: none;
-	}
-	.uni-badge--small {
-		-webkit-transform: scale(.8);
-		-ms-transform: scale(.8);
-		transform: scale(.8);
-		-webkit-transform-origin: center center;
-		-ms-transform-origin: center center;
-		transform-origin: center center;
-	}
-	.uni-badge {
-		font-family: 'Helvetica Neue', Helvetica, sans-serif;
-		-webkit-box-sizing: border-box;
-		box-sizing: border-box;
-		font-size: 12px;
-		line-height: 1;
-		display: inline-block;
-		padding: 3px 6px;
-		color: #333;
-		border-radius: 100px;
-		background-color: #f1f1f1;
-	}
-	.uni-badge-error {
-		color: #fff;
-		background-color: #dd524d;
-	}
-</style>

components/cm-module/creatOrder/sellerFreight.vue

@@ -5,8 +5,8 @@
 			<view class="freight-left">运费</view>
 			<view class="freight-right">
 				<text class="text-l">{{freightText}}</text>
-				<text class="text" v-if="freightData.freePostFlag == 1">￥{{orderPriceToFixed(freightMoney)}}</text>
-				<text class="iconfont icon-chakangengduo"></text>
+				<!-- <text class="text" v-if="freightData.freePostFlag == 1">￥{{orderPriceToFixed(freightMoney)}}</text> -->
+				<!-- <text class="iconfont icon-chakangengduo"></text> -->
 			</view>
 		</view>
 		<!--底部选择模态层弹窗组件 -->
@@ -54,7 +54,7 @@
 		},
 		data() {
 			return{
-				freightText:'不包邮',
+				freightText:'到付',
 				freightMoney:0,
 				specClass: '',//规格弹窗css类，控制开关动画
 				freightList:[
@@ -138,8 +138,8 @@
 				}, 200);
 			},
 			hanldOperationConfim(data){//显示选择数量确认弹窗
-				this.specClass = 'show';
-				this.freightMoney = this.hanldFreight
+				// this.specClass = 'show';
+				// this.freightMoney = this.hanldFreight
 			},
 			radioChange(e) {//运费选择切换
 				this.freightData.freePostFlag = parseInt(e.target.value);

components/cm-module/creatOrder/sellerInvoice.vue

@@ -257,7 +257,6 @@
 						break;
 					}
 				}
-				console.log('2222222222')
 				switch(this.invoiceType){
 					case '2':
 						this.getUseFindInvoice()

components/cm-module/listTemplate/productList.vue

@@ -170,7 +170,6 @@ export default {
 			const clubInfo = uni.getStorageSync('clubInfo')
 			this.userId = clubInfo.userId
 			this.SellerService.CartQuantity({ userId: this.userId }).then(res => {
-				console.log(res)
 				this.cartQuantity = res.data
 			})
 		},

pages/user/order/create-order.vue

@@ -14,7 +14,7 @@
 		</seller-invoice>
 		<!-- 运费 -->
 		<seller-freight ref="freight" 
-						v-if="isFreight" 
+						v-if="isRequest" 
 						:freightDatas="freightData" 
 						@handleChoiceaFreight="handleChoiceaFreightData" 
 						@showFreightAlert="handFreightAlertShow">
@@ -142,7 +142,7 @@
 						this.addressId = response.data.list[0].addressId;
 						this.townId = response.data.list[0].townId;
 						this.addressData = response.data.list[0];
-						this.getFreightData()
+						// this.getFreightData()
 					}else{
 						this.addressData = this.addressData;
 					}
@@ -200,8 +200,8 @@
 				this.payInfo = {
 						orderShouldPayFee:this.payAllPrice.toFixed(2),//提交的总价
 						balancePayFlag:this.balanceDeductionFlag,//余额抵扣的状态
-						freight:parseInt(this.freightData.freight).toFixed(2),//邮费
-						freePostFlag:parseInt(this.freightData.freePostFlag)//运费形式
+						freight:0,//邮费
+						freePostFlag:-1//运费形式
 					}
 					console.log(this.payInfo)
 				let params = {

pages/user/order/order-logistics.vue

@@ -67,12 +67,12 @@
 		},
 		data() {
 			return {
-				orderID: '',
+				orderId: '',
 				goodsList:[]
 			}
 		},
 		onLoad(option){//商品数据
-			this.orderID = option.orderID;
+			this.orderId = option.orderId;
 			this.getData();
 		},
 		methods: {
@@ -85,6 +85,7 @@
 				this.goodsList[index].logisticsData[loIndex]['isOpen'] = !isOpen;
 			},
 			clipboard(data) {
+				console.log(data)
 				thorui.getClipboardData(data, (res) => {
 					if (res) {
 						this.$util.msg("复制成功",2000,true,'success');
@@ -94,7 +95,7 @@
 				})
 			},
 			getData() {
-				this.OrderService.QueryLogistics({orderID: this.orderID}).then(response =>{
+				this.OrderService.QueryLogistics({orderId: this.orderId}).then(response =>{
 					const resData = response.data;
 					// 添加订单列表信息
 					let orderListArr = [];
@@ -338,6 +339,7 @@
 				color: $text-color;
 				line-height: 56rpx;
 				text-align: justify;
+				float: left;
 			}
 			.logistics-animation {
 				/* transition: transform 0.3s ease;*/
@@ -358,18 +360,15 @@
 				display: none;
 			}	
 			.clipboard{
-				width: 84rpx;
-				height: 36rpx;
-				background: linear-gradient(34deg,rgba(255,41,41,1) 0%,rgba(255,109,27,1) 100%);
+				width: 74rpx;
+				height: 40rpx;
+				background: linear-gradient(270deg, #c4761f 0%, #fccd90 100%);
 				text-align: center;
-				font-size: $font-size-24;
+				font-size: $font-size-22;
 				color: #FFFFFF;
-				border-radius: 6rpx;
-				line-height: 36rpx;
+				border-radius: 20rpx;
+				line-height: 40rpx;
 				display: inline-block;
-				margin-left: 24rpx;
-				position: relative;
-				z-index: 99;
 			}
 		}
 	}

services/sellse.service.js

@@ -97,34 +97,6 @@ export default class SellerService {
 			isLoading: true
 		})
 	}
-	/**
-	 *@协销机构列表
-	 *@param name 	  机构名字关键字（搜索用）
-	 *@param pageNum  页码
-	 *@param pageSize 条数
-	 */
-	GetFindAllClubList(data = {}) {
-		return this.AjaxService.get({
-			url: '/seller/findAllClub',
-			data,
-			isLoading: true
-		})
-	}
-	/**
-	 *@协销订单列表（搜索订单）
-	 *@param listType 订单类型
-	 *@param orderNo  订单号
-	 *@param pageNum  页码
-	 *@param pageSize 条数
-	 *@param serviceProviderId 协销ID
-	 */
-	GetSellerOrderList(data = {}) {
-		return this.AjaxService.get({
-			url: '/seller/order/list',
-			data,
-			isLoading: true
-		})
-	}
 	/**
 	 *@协销下机构订单列表
 	 *@param clubID   机构ID
@@ -179,43 +151,6 @@ export default class SellerService {
 			isLoading: true
 		})
 	}
-	/**
-	 *@协销-二手商品推荐
-	 *@param productId：商品ID（数字类型，必传）
-	 */
-	ProductRecommend(data = {}) { //相关推荐
-		return this.AjaxService.get({
-			url: '/product/getSecondHandProductRecommend',
-			data,
-			isLoading: true
-		})
-	}
-	/**
-	 *@协销-关键词搜索订单
-	 *@param  userId：商品ID（数字类型，必传）
-	 *@param pageNum：机构会所ID(同之前)
-	 *@param pageSize：协销ID(同之前)
-	 */
-	getSellerOrderList(data = {}) {
-		return this.AjaxService.get({
-			url: '/seller/searchOrder',
-			data,
-			isLoading: true
-		})
-	}
-	/*协销下单购物车->api*/
-	/**
-	 *@单一商品加入购物车
-	 *@param clubId 会所的ID
-	 *@param serviceProviderId 协销ID
-	 */
-	ShoppingCartAddCart(data = {}) {
-		return this.AjaxService.post({
-			url: '/seller/addCart',
-			data,
-			isLoading: true
-		})
-	}
 	/**
 	 *@组合商品加入购物车
 	 *@param clubId 会所的ID
@@ -240,98 +175,4 @@ export default class SellerService {
 			isLoading: false
 		})
 	}
-	/**
-	 *@协销帮机构下单购物车商品加减数量
-	 *@param clubId 机构的clubId
-	 *@param serviceProviderId 	协销ID
-	 */
-	SellerAddProductNum(data = {}) {
-		return this.AjaxService.post({
-			url: '/seller/addProductNum',
-			data,
-			isLoading: true
-		})
-	}
-	/**
-	 *@协销帮机构下单购物车删除商品
-	 *@param sellerCartIds 购物车ID
-	 */
-	DeleteSellerCart(data = {}) {
-		return this.AjaxService.post({
-			url: '/seller/deleteSellerCart',
-			data,
-			isLoading: true
-		})
-	}
-	/**
-	 *@协销帮机构下单获取购物车列表
-	 *@param clubId 会所的ID
-	 *@param serviceProviderId 协销ID
-	 */
-	GetSellerShoppingInfo(data = {}) {
-		return this.AjaxService.get({
-			url: '/seller/shoppingInfo',
-			data,
-			isLoading: false
-		})
-	}
-	/*协销下单订单->api*/
-	/**
-	 *@协销帮机构下单去结算初始化
-	 *@param clubId 机构ID
-	 *@param serviceProviderId 协销ID
-	 *@param productIds 商品ID
-	 */
-	SellerSettlement(data = {}) {
-		return this.AjaxService.post({
-			url: '/seller/settlement',
-			data,
-			isLoading: true
-		})
-	}
-	/**
-	 *@协销帮机构下单提交订单
-	 *@param orderSource 2,//提交来源
-	 *@param clubUserId//机构UserID
-	 *@param cartType	//从购物车提交
-	 *@param serviceProviderId//帮下单协销ID
-	 *@param addressId//地址ID
-	 *@param orderInfo//商品信息
-	 *@param payInfo//订单信息
-	 *@param orderInvoice//发票信息
-	 */
-	SellerCreateOrderSubmit(data = {}) {
-		return this.AjaxService.post({
-			url: '/seller/order/submit',
-			data,
-			isLoading: true
-		})
-	}
-	// 协销订单列表/再来一单
-	SellerCreateOrderAgain(data = {}) {
-		return this.AjaxService.post({
-			url: '/seller/order/again',
-			data,
-			isLoading: true
-		})
-	}
-	// 协销购物车清空失效列表
-	SellerCartdelete(data = {}) {
-		return this.AjaxService.post({
-			url: '/seller/deleteSellerCart',
-			data,
-			isLoading: true
-		})
-	}
-	/**
-	 *@协销邀请运营人员
-	 *@param userID  机构userID
-	 */
-	SellerBindingOperation(data = {}) {
-		return this.AjaxService.post({
-			url: '/seller/bindingOperation',
-			data,
-			isLoading: true
-		})
-	}
 }