commit -m 维沙

common/config/addressdata.js

@@ -2,7 +2,7 @@
  *请求获取省市区
  *已提供给地区选择picker组件使用
  */ 
-import { queryAddressInformation } from '@/api/utils.js';
+import { queryAddressInformation } from '@/services/public.js';
 const provinceData=[];
 const cityData=[];
 const areaData=[];

common/config/wxLogin.js

@@ -1,6 +1,6 @@
 import store from '@/store/index.js'
 import authorize from '@/common/config/authorize.js'
-import { userInfoLogin } from "@/api/use.js"
+import { userInfoLogin } from "@/services/use.js"
 // 根据微信的code获取用户登录状态:1已登录过 -1未登录过
 const wxLoginAuthorize = function(){
 	authorize.getCode('weixin').then(wechatcode =>{

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

@@ -32,7 +32,7 @@
 	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 "@/api/use.js"
+	import { userInfoLogin } from "@/services/use.js"
 	import { mapState,mapMutations} from 'vuex';
 	export default {
 		components:{

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

@@ -101,7 +101,7 @@
 	import authorize from '@/common/config/authorize.js'
 	import uniBadge from '@/components/uni-badge/uni-badge.vue'
 	import { mapState,mapMutations } from 'vuex'
-	import { userInfoLogin } from "@/api/use.js"
+	import { userInfoLogin } from "@/services/use.js"
 	
 	export default{
 		components: {

components/cm-module/listTemplate/commodityList.vue

@@ -109,7 +109,7 @@
 	import listSkeleton from '@/components/cm-module/listTemplate/listSkeleton'
 	import modalLayer from "@/components/modal-layer"
 	import uniGrader from '@/components/uni-grade/uni-grade.vue'
-	import { searchQueryTinyType} from "@/api/utils.js"
+	import { searchQueryTinyType} from "@/services/public.js"
 	import { mapState,mapMutations } from 'vuex';
 	export default{
 		name:'CommodityList',

components/cm-module/modelAlert/supplierRegisreAlert.vue

@@ -23,7 +23,7 @@
 </template>
 
 <script>
-	import { cancelPrompt } from "@/api/use.js"
+	import { cancelPrompt } from "@/services/use.js"
 	export default{
 		name:'alert',
 		props:{

components/cm-module/modelAlert/upgradeAlert.vue

@@ -18,7 +18,7 @@
 </template>
 
 <script>
-	import { cancelPrompt } from "@/api/use.js"
+	import { cancelPrompt } from "@/services/use.js"
 	export default{
 		name:'alert',
 		props:{

components/cm-module/supplier/home.vue

@@ -32,7 +32,7 @@
 	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 "@/api/use.js"
+	import { userInfoLogin } from "@/services/use.js"
 	import { mapState,mapMutations} from 'vuex';
 	export default {
 		components:{

components/cm-module/supplier/user.vue

@@ -99,7 +99,7 @@
 	import authorize from '@/common/config/authorize.js'
 	import uniBadge from '@/components/uni-badge/uni-badge.vue'
 	import { mapState,mapMutations } from 'vuex'
-	import { userInfoLogin } from "@/api/use.js"
+	import { userInfoLogin } from "@/services/use.js"
 	
 	export default{
 		components: {

h5/pages/activity/activity-list.vue

@@ -1,208 +0,0 @@
-<template>
-	<view class="activity-container">
-		<scroll-view scroll-y="true" >
-			<view class="list" v-for="(item, index) in list" :key="index" @click="NavigateToActivity(item)">
-				<image class="list-image" :src="item.image" mode="scaleToFill"></image>
-				<view class="title">{{item.title}}</view>
-				<view class="time" v-if="item.status!=3">
-					<view class="text">{{ item.detail }}</view>
-				</view>
-				<view class="mack" v-if="item.status == 3">
-					<view class="mack-text">活动已经结束</view>
-				</view>
-			</view>
-			<!--加载loadding-->
-			<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-			<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text='nomoreText'></tui-nomore>
-			<!--加载loadding-->
-		</scroll-view>
-	</view>
-</template>
-
-<script>
-	import tuiLoadmore from "@/components/tui-components/loadmore/loadmore"
-	import tuiNomore from "@/components/tui-components/nomore/nomore"
-	export default {
-		components:{
-			tuiLoadmore,
-			tuiNomore,
-		},
-	    data() {
-	        return {
-				isEmpty:false,
-				nomoreText: '上拉显示更多',
-				listQuery:{
-					source:2,
-					pageNum:1,
-					pageSize:10,
-				},
-				hasNextPage:false,
-				loadding: false,
-				pullUpOn: true,
-				pullFlag: true,
-				allowDataStatus:true,
-				wrapperHeight:'100%',
-				scrollHeight:'',
-			    list:[],
-	        }
-	    },
-		onLoad(option) {
-			
-		},
-		methods:{
-			GetPromotionsrList(){//获取专题列表
-				this.ProductService.GetPromotionsrList(this.listQuery).then(response =>{
-					let responseData = response.data
-					if(responseData.list&&responseData.list.length > 0){
-						this.isEmpty = false
-						this.hasNextPage = responseData.hasNextPage
-						this.list = responseData.list
-						this.pullFlag = false;
-						setTimeout(()=>{this.pullFlag = true;},500)
-						if(this.hasNextPage){
-							this.pullUpOn = false
-							this.nomoreText = '上拉显示更多'
-						}else{
-							this.pullUpOn = true
-							this.loadding = false
-							this.nomoreText = '已至底部'
-						}
-					}else{
-						this.isEmpty = true
-					}
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000)
-				})
-			},
-			GetPromotionsrListBottomData(){
-				this.listQuery.pageNum+=1
-				this.ProductService.GetPromotionsrList(this.listQuery).then(response =>{
-					let responseData = response.data
-					if(responseData.list&&responseData.list.length > 0){
-						this.hasNextPage = response.data.hasNextPage
-						this.list = this.list.concat(responseData.list) 
-						this.pullFlag = false;// 防上拉暴滑
-						setTimeout(()=>{this.pullFlag = true;},500)
-						if(this.hasNextPage){
-							this.pullUpOn = false
-							this.nomoreText = '上拉显示更多'
-						}else{
-							this.pullUpOn = false
-							this.loadding = false
-							this.nomoreText = '已至底部'
-						}
-					}
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000)
-				})
-			},
-			NavigateToActivity(item){//跳转活动详情
-				if(item.status!=3 ){
-					if(item.crmLink){
-						this.$api.navigateTo(`/h5/pages/activity/activity?title=${item.title}&link=${item.crmLink}`)
-					}
-				}else{
-					this.$util.msg('活动已经结束',2000)
-				}
-			}
-		},
-		onReachBottom() {
-			if(this.hasNextPage){
-				this.loadding = true
-				this.pullUpOn = true
-				this.GetPromotionsrListBottomData()
-			}	
-		},
-		onPullDownRefresh() {//下拉刷新
-			this.listQuery.pageNum = 1
-			this.GetPromotionsrList()
-			uni.stopPullDownRefresh()
-		},
-		onShow() {
-			this.GetPromotionsrList()
-		}
-	}
-</script>
-
-<style lang="scss">
-	page{
-		background-color: #FFFFFF;
-	}
-	.activity-container{
-		width: 100%;
-		height: auto;
-		box-sizing: border-box;
-		padding: 0 24rpx;
-	}
-	.list{
-		width: 100%;
-		height: 318rpx;
-		float: left;
-		margin-bottom: 20rpx;
-		position: relative;
-		.list-image{
-			width: 100%;
-			height: 318rpx;
-			display: block;
-		}
-		.title{
-			width: 100%;
-			height: 72rpx;
-			line-height: 72rpx;
-			text-align: center;
-			background: rgba(254,246,243,0.8);
-			color: $color-system;
-			position: absolute;
-			bottom: 0;
-			left: 0;
-			font-size: $font-size-26;
-			text-overflow:ellipsis;
-			display: -webkit-box;
-			word-break: break-all;
-			-webkit-box-orient: vertical;
-			-webkit-line-clamp: 1;
-			overflow: hidden;
-		}
-		.time{
-			width: 100%;
-			height: 48rpx;
-			position: absolute;
-			top: 0;
-			left: 0;
-			.text{
-				width: 475rpx;
-				height: 48rpx;
-				font-size: $font-size-24;
-				margin: 0 auto;
-				line-height: 48rpx;
-				background:  linear-gradient(315deg, #f94b4b 0%, #bc3cff 100%);
-				color: #FFFFFF;
-				text-align: center;
-			}
-		}
-		.mack{
-			width: 100%;
-			height: 100%;
-			position: absolute;
-			top: 0;
-			left: 0;
-			z-index: 9999;
-			background: rgba(0,0,0,.1);
-			border-radius: 2rpx;
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-			justify-content: center;
-			.mack-text{
-				width: 220rpx;
-				height: 70rpx;
-				border-radius: 35rpx;
-				text-align: center;
-				background: rgba(0,0,0,.4);
-				color: #FFFFFF;
-				line-height: 70rpx;
-				font-size: $font-size-26;
-			}
-		}
-	}
-</style>

h5/pages/activity/activity.vue

@@ -1,50 +0,0 @@
-<template>
-	<view class="activity">
-	   <web-view :webview-styles="webviewStyles" :src="activityPath"></web-view>
-	   <!-- 侧边 -->
-	   <scroll-top :isScrollTop="isScrollTop" :bottom="200"></scroll-top>
-	</view>
-</template>
-
-<script>
-	export default {
-	    data() {
-	        return {
-	            webviewStyles: {
-	                progress: {
-	                    color: '#FF3333'
-	                }
-	            },
-				productID:'',
-				activityPath:'',
-				isScrollTop:false
-	        }
-	    },
-		onLoad(option) {
-			console.log(option)
-			uni.setNavigationBarTitle({title:option.title});
-			this.activityPath = option.link;
-		},
-		methods:{
-			
-		},
-		onPageScroll(e){//实时获取到滚动的值
-			if(e.scrollTop>600){
-				this.isScrollTop = true
-			}else{
-				this.isScrollTop = false
-			}	
-		},
-	}
-</script>
-	
-<style lang="scss">
-	.activity{
-		width: 100%;
-		height: auto;
-		image{
-			width: 100%;
-			height: auto;
-		}
-	}
-</style>

h5/pages/activity/meobohui-booth.vue

@@ -1,169 +0,0 @@
-<template>
-	<view class="container home clearfix">
-		<!-- 展位图 -->
-		<view class="container-page clearfix">
-			<view class="tui-group-list">
-				<view class="floor-item-booth" v-for="(booths,index) in boothList" :key="index"  @click="previewImg(index)">
-					<view class="floor-item-booth-image">
-						<image :src="booths.image" class="floor-item-image" mode="" ></image>
-					</view>
-					<view class="floor-item-text">
-						<view class="floor-item-p one">{{booths.name}}</view>
-						<view class="floor-item-p two">展位号：{{booths.num}}</view>
-					</view>
-				</view>
-			</view>
-		</view>
-		<!-- 侧边 -->
-		<scroll-top :isScrollTop="isScrollTop" :bottom="50"></scroll-top>
-	</view>
-</template>
-
-<script>
-	import authorize from '@/common/config/authorize.js'
-	import pageFloor from '@/components/cm-module/homeIndex/pageFloor.vue'
-	import supplierList from '@/components/cm-module/homeIndex/supplierList.vue'
-	import { userInfoLogin } from "@/api/use.js"
-	import { mapState,mapMutations} from 'vuex';
-	var isPreviewImg;
-	export default {
-		components:{
-			pageFloor,
-			supplierList,
-		},
-		data() {
-			return {
-				userID:0,
-				current:0,
-				mode:'round',
-				modallayer:false,
-				isLogin:false,
-				skeletonShow: true,
-				boothList:[
-					{image:'http://static.caimei365.com/app/meibohui/meibo_img_02.jpg',name:'GMS(可现场体验)',num:'B区 12.2馆C31'},
-					{image:'http://static.caimei365.com/app/meibohui/meibo_img_03.jpg',name:'优斐斯',num:'A区 4.2号馆A31'},
-					{image:'http://static.caimei365.com/app/meibohui/meibo_img_04.jpg',name:'唯美概念(可现场体验)',num:'B区 12.2馆B41'},
-					{image:'http://static.caimei365.com/app/meibohui/meibo_img_05.jpg',name:'美生美(可现场体验)',num:'B区 12.2馆B39'},
-					{image:'http://static.caimei365.com/app/meibohui/meibo_img_06.jpg',name:'品辉(可现场体验)',num:'B区 11.2馆H49'},
-					{image:'http://static.caimei365.com/app/meibohui/meibo_img_07.jpg',name:'和创元(可现场体验)',num:'B区 11.2馆F41'},
-					{image:'http://static.caimei365.com/app/meibohui/meibo_img_08.jpg',name:'瑞恺迪(可现场体验)',num:'B区 12.2 馆E40'},
-					{image:'http://static.caimei365.com/app/meibohui/meibo_img_09.jpg',name:'塑美颜(可现场体验)',num:'B区11.2 D41'},
-					{image:'http://static.caimei365.com/app/meibohui/meibo_img_10.jpg',name:'塑美颜(可现场体验)',num:'B区13.2 K29'}
-				],				
-				productImage:[],
-				isScrollTop:false,
-
-			}
-		},
-		onLoad() {
-			//处理商品图片列表
-			this.boothList.forEach(item =>{
-				this.productImage.push(item.image);
-			})
-		},
-		computed: {
-			...mapState(['hasLogin','userInfo','identity','isActivity'])
-		},
-		methods: {
-			...mapMutations(['login','logout']),
-			previewImg (index) {//顶部商品图片预览
-				isPreviewImg = true
-				let previewUrls = this.productImage
-				uni.previewImage({
-					current: index, 	//图片索引
-					urls: previewUrls, //必须是http图片，本地图片无效
-					longPressActions:''
-				})
-			},
-		},
-		onPageScroll(e){//实时获取到滚动的值
-			if(e.scrollTop>400){
-				this.isScrollTop = true
-			}else{
-				this.isScrollTop = false
-			}	
-		},
-		onPullDownRefresh() {//下拉刷新
-			uni.stopPullDownRefresh()
-		},
-		onShareAppMessage(res){//分享转发
-			if (res.from === 'button') {
-		      // 来自页面内转发按钮
-		    }
-			return {
-			  title: '生美医美正品采购服务平台',
-			  path: '/h5/pages/activity/meobohui',
-			  imageUrl:'https://static.caimei365.com/app/img/bg/min-banner.jpg'
-			}
-		},
-		onShow(){
-			
-		}
-	}
-</script>
-
-<style lang="scss">
-	page{
-		background-color: #F7F7F7;
-	}
-	.container-page{
-		background-color: #F7F7F7;
-		width: 100%;
-		height: auto;
-		box-sizing: border-box;
-		padding:24rpx;
-		float: left;
-	}
-	.tui-group-list{
-		width: 100%;
-		height: auto;
-		.floor-item-booth{
-			width: 339rpx;
-			height: 382rpx;
-			float: left;
-			margin-right: 24rpx;
-			margin-bottom: 24rpx;
-			background-color: #FFFFFF;
-			border-radius: 16rpx;
-			&:nth-child(2n){
-				margin-right: 0;
-			}
-			.floor-item-booth-image{
-				width: 100%;
-				height: 240rpx;
-				.floor-item-image{
-					width: 100%;
-					height: 100%;
-					display: block;
-					border-radius: 16rpx 16rpx 0 0;
-				}
-			}
-			.floor-item-text{
-				width: 100%;
-				height: 142rpx;
-				box-sizing: border-box;
-				padding: 31rpx 16rpx;
-				.floor-item-p{
-					width: 100%;
-					line-height: 40rpx;
-					text-align: left;
-					font-size: $font-size-24;
-					white-space: nowrap;
-					text-overflow: ellipsis;
-					overflow: hidden;
-					&.one{
-						color: #333333;
-					}
-					&.two{
-						color: #999999;
-					}
-				}
-			}
-		}
-	}
-	.container-section{
-		width: 100%;
-		height: auto;
-		background-color: #F7F7F7;
-	}
-</style>

h5/pages/activity/meobohui-supplier.vue

@@ -1,135 +0,0 @@
-<template>
-	<view class="container home clearfix">
-		<!-- 参展商 -->
-		<view class="container-page clearfix">
-			<view class="tui-group-list">
-				<view class="floor-item-sup" v-for="(supps,index) in supplierList2" :key="index" @click="goSupplierPath(supps.type,supps.id,supps.keyWord)">
-					<image :src="supps.image" class="floor-item-image" mode=""></image>
-				</view>
-			</view>
-		</view>
-		<!-- 侧边 -->
-		<scroll-top :isScrollTop="isScrollTop" :bottom="50"></scroll-top>
-	</view>
-</template>
-
-<script>
-	import authorize from '@/common/config/authorize.js'
-	import pageFloor from '@/components/cm-module/homeIndex/pageFloor.vue'
-	import supplierList from '@/components/cm-module/homeIndex/supplierList.vue'
-	import { userInfoLogin } from "@/api/use.js"
-	import { mapState,mapMutations} from 'vuex';
-	export default {
-		components:{
-			pageFloor,
-			supplierList,
-		},
-		data() {
-			return {
-				userID:0,
-				current:0,
-				mode:'round',
-				modallayer:false,
-				isLogin:false,
-				skeletonShow: true,
-				userIdentity:'',
-				supplierList2:[
-					{image:'http://static.caimei365.com/app/meibohui/meibo_logo_01.jpg',id:1172,type:1,keyWord:''},
-					{image:'http://static.caimei365.com/app/meibohui/meibo_logo_02.jpg',id:8888,type:2,keyWord:'INDIBA'},
-					{image:'http://static.caimei365.com/app/meibohui/meibo_logo_03.jpg',id:8888,type:2,keyWord:'维锶'},
-					{image:'http://static.caimei365.com/app/meibohui/meibo_logo_04.jpg',id:8888,type:2,keyWord:'imperium'},
-					{image:'http://static.caimei365.com/app/meibohui/meibo_logo_05.jpg',id:8888,type:2,keyWord:'易路达'},
-					{image:'http://static.caimei365.com/app/meibohui/meibo_logo_06.jpg',id:8888,type:2,keyWord:'ACTIVE'},
-					{image:'http://static.caimei365.com/app/meibohui/meibo_logo_07.jpg',id:1201,type:1,keyWord:''},
-					{image:'http://static.caimei365.com/app/meibohui/meibo_logo_09.jpg',id:1285,type:1,keyWord:''},
-					{image:'http://static.caimei365.com/app/meibohui/meibo_logo_10.jpg',id:1206,type:1,keyWord:''},
-					{image:'http://static.caimei365.com/app/meibohui/meibo_logo_11.jpg',id:1258,type:1,keyWord:''},
-					{image:'http://static.caimei365.com/app/meibohui/meibo_logo_12.jpg',id:1184,type:1,keyWord:''},
-					{image:'http://static.caimei365.com/app/meibohui/meibo_logo_13.jpg',id:1193,type:1,keyWord:''},
-					{image:'http://static.caimei365.com/app/meibohui/meibo_logo_14.jpg',id:1292,type:1,keyWord:''},
-					{image:'http://static.caimei365.com/app/meibohui/meibo_logo_15.jpg',id:1201,type:1,keyWord:''},
-					{image:'http://static.caimei365.com/app/meibohui/meibo_logo_16.jpg',id:1217,type:1,keyWord:''}
-				],
-				isScrollTop:false
-			}
-		},
-		onLoad() {
-			
-		},
-		computed: {
-			...mapState(['hasLogin','userInfo','identity','isActivity'])
-		},
-		methods: {
-			...mapMutations(['login','logout']),
-			goSupplierPath(type,value,keyWord){
-				if(type == 1){
-					this.$api.navigateTo('/supplier/pages/user/my-shop?shopId='+value)
-				}else if(type == 2){
-					this.$api.navigateTo(`/search/pages/search/search?keyWord=${keyWord}`)
-				}
-			},
-		},
-		onPageScroll(e){//实时获取到滚动的值
-			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: '/h5/pages/activity/meobohui',
-			  imageUrl:'https://static.caimei365.com/app/img/bg/min-banner.jpg'
-			}
-		},
-		onShow(){
-			
-		}
-	}
-</script>
-
-<style lang="scss">
-	page{
-		background-color: #F7F7F7;
-	}
-	.container-page{
-		background-color: #F7F7F7;
-		width: 100%;
-		height: auto;
-		box-sizing: border-box;
-		padding: 24rpx;
-		float: left;
-	}
-	.tui-group-list{
-		width: 100%;
-		height: auto;
-		.floor-item-sup{
-			width: 162rpx;
-			height: 162rpx;
-			float: left;
-			margin-right: 18rpx;
-			margin-bottom: 24rpx;
-			&:nth-child(4n){
-				margin-right: 0;
-			}
-			.floor-item-image{
-				width: 100%;
-				height: 100%;
-				display: block;
-			}
-		}
-	}
-	.container-section{
-		width: 100%;
-		height: auto;
-		background-color: #F7F7F7;
-	}
-</style>

h5/pages/activity/meobohui.vue

@@ -1,740 +0,0 @@
-<template>
-	<view class="container home clearfix">
-		<!-- top -->
-		<view class="container-top"><image src="http://static.caimei365.com/app/meibohui/banner.jpg" mode=""></image></view>
-		<view class="container-activ" @click="LookMyCouponDetils"><image src="http://static.caimei365.com/app/meibohui/meibo_coupon_02.png" mode=""></image></view>
-		<!-- VIP品牌线上馆 -->
-		<view class="container-page clearfix">
-			<view class="tui-group-name">
-				<view class="tui-group-title">
-					<view class="tui-group-l">VIP品牌线上馆</view>
-				</view>
-				<view class="tui-sub__desc">高新科技品牌尽在采美</view>
-			</view>
-			<view class="tui-group-list">
-				<view class="floor-item-vip" v-for="(vips,index) in supplierList1" :key="index">
-					<image :src="vips.image" class="floor-item-image" mode=""></image>
-				</view>
-			</view>
-		</view>
-		<!-- 参展商 -->
-		<view class="container-page clearfix">
-			<view class="tui-group-name">
-				<view class="tui-group-title">
-					<view class="tui-group-l">参展商</view>
-					<view class="tui-group-r" @click="NavToDetailPage('/h5/pages/activity/meobohui-supplier')">
-						<text>更多</text>
-						<text class="iconfont icon-xiayibu"></text>
-					</view>
-				</view>
-				<view class="tui-sub__desc">美博会采美合作品牌</view>
-			</view>
-			<view class="tui-group-list">
-				<view class="floor-item-sup" v-for="(supps,index) in supplierList2" :key="index" @click="goSupplierPath(supps.type,supps.id,supps.keyWord)">
-					<image :src="supps.image" class="floor-item-image" mode=""></image>
-				</view>
-			</view>
-		</view>
-		<!-- 现场直击 -->
-		<view class="container-page clearfix">
-			<view class="tui-group-name">
-				<view class="tui-group-title">
-					<view class="tui-group-l">现场直击</view>
-				</view>
-				<view class="tui-sub__desc">采美云逛展带你体验另样平行世界</view>
-			</view>
-			<view class="tui-group-scroll clearfix">
-				<scroll-view scroll-x>
-					<view class="floor-item__list">
-						<view class="floor-item__live" v-for="(lives,index) in liveList" :key="index" @click="LiveGoPathPros(lives)">
-							<view class="floor-item__image">
-								<image :src="lives.image" mode=""></image>
-							</view>
-							<view class="floor-item__text">{{lives.liveTitle}}</view>
-						</view>
-					</view>
-				</scroll-view>
-			</view>
-		</view>
-		<!-- 展位图 -->
-		<view class="container-page clearfix">
-			<view class="tui-group-name">
-				<view class="tui-group-title">
-					<view class="tui-group-l">展位图</view>
-					<view class="tui-group-r" @click="NavToDetailPage('/h5/pages/activity/meobohui-booth')">
-						<text>更多</text>
-						<text class="iconfont icon-xiayibu"></text>
-					</view>
-				</view>
-				<view class="tui-sub__desc">广州美博会采美合作展位</view>
-			</view>
-			<view class="tui-group-list">
-				<view class="floor-item-booth" v-for="(booths,index) in boothList" :key="index" @click="previewImg(index)">
-					<view class="floor-item-booth-image">
-						<image :src="booths.image" class="floor-item-image" mode=""></image>
-					</view>
-					<view class="floor-item-text">
-						<view class="floor-item-p one">{{booths.name}}</view>
-						<view class="floor-item-p two">展位号：{{booths.num}}</view>
-					</view>
-				</view>
-			</view>
-		</view>
-		<!-- 供应商商品楼层 -->
-		<view class="container-page clearfix" v-for="(floors,index) in flootData" :key="index">
-			<view class="tui-group-name">
-				<view class="tui-group-title">
-					<view class="tui-group-l">{{ floors.shopName }}</view>
-					<view class="tui-group-r" v-if="floors.shopId != 1161" @click="goSupplierPath(floors.type,floors.shopId,floors.keyWord)">
-						<text>更多</text>
-						<text class="iconfont icon-xiayibu"></text>
-					</view>
-				</view>
-				<view class="tui-sub__desc">{{ floors.marke }}</view>
-			</view>
-			<view class="tui-group-good__scroll clearfix">
-				<scroll-view scroll-x>
-					<view class="floor-good__list">
-						<view class="floor-item ad_04 clearfix" v-for="(product, idx) in floors.productSet" :key="idx" @click.stop="RouterDetailPage(product.productID)">
-							<image class="item-img tui-skeleton-fillet" :src="product.mainImage" mode="aspectFill"></image>
-							<view class="floor-item-content">
-								<view class="title tui-skeleton-rect">
-									<text class="mclap-tag">美博会</text>
-									<text class="mclap">{{product.name}}</text>
-								</view>
-								<view class="floor-item-price">
-									<view class="floor-item-act">
-										<template v-if="userIdentity === 3">
-											<template v-if="product.actStatus===1">
-												<view class="floor-tags" v-if="PromotionsFormat(product.promotions)">
-													{{product.promotions.name}}
-													<text v-if="hasLogin && product.price1TextFlag != 1 && product.shopID == shopId">:￥{{product.retailPrice | NumFormat}}</text>
-												</view>
-												<view class="floor-tags" v-else>{{product.promotions.name}}</view>	
-											</template>
-											<template v-if="product.actStatus ===0  &&  product.ladderPriceFlag===1">
-												<view class="floor-tags">阶梯价格</view>	
-											</template>
-										</template>	
-										<template v-else>
-											<template v-if="product.actStatus===1">
-												<view class="floor-tags" v-if="PromotionsFormat(product.promotions)">
-													{{product.promotions.name}}
-													<text v-if="hasLogin && product.price1TextFlag != 1">:￥{{product.retailPrice | NumFormat}}</text>
-												</view>
-												<view class="floor-tags" v-else>{{product.promotions.name}}</view>	
-											</template>
-											<template v-if="product.actStatus ===0  &&  product.ladderPriceFlag===1">
-												<view class="floor-tags">阶梯价格</view>	
-											</template>
-										</template>
-									</view>	
-									<view v-if="hasLogin">
-										<template v-if="product.productCategory == 1">
-											<template v-if="userIdentity == 3">
-												<template v-if="product.shopID == shopId">
-													<view class="title-none" v-if="product.price1TextFlag === '1'">
-														<text class="p big">￥未公开价格</text>
-													</view>
-													<view class="price tui-skeleton-rect" v-else :class="PromotionsFormat(product.promotions) ? 'none' : ''">
-														<text class="p sm">￥</text>
-														<text class="p big">{{ (PromotionsFormat(product.promotions) ? product.price1 : product.retailPrice ) | NumFormat}}</text>
-													</view>
-												</template>	
-												<template v-else>
-													<view class="no-price">
-														<view class="p-stars">
-															<text class="p-no">￥</text>
-															<uni-grader :grade="Number(product.price1Grade)" :margin="14"></uni-grader>
-														</view>
-													</view>	
-												</template>
-											</template>
-											<template v-else-if="userIdentity ===4">
-												<view class="title-none" v-if="product.price1TextFlag === '1'">
-													<text class="p big">￥未公开价格</text>
-												</view>
-												<view class="title-none"  v-if="product.price1TextFlag === '2'">
-													<text class="p big">￥价格仅会员可见</text>
-												</view>
-												<view class="price tui-skeleton-rect" v-if="product.price1TextFlag === '0'" :class="PromotionsFormat(product.promotions) ? 'none' : ''">
-													<text class="p sm">￥</text>
-													<text class="p big">{{ (PromotionsFormat(product.promotions) ? product.price1 : product.retailPrice ) | NumFormat}}</text>
-												</view>
-											</template>
-											<template v-else>
-												<view class="title-none" v-if="product.price1TextFlag === '1'">
-													<text class="p big">￥未公开价格</text>
-												</view>
-												<view class="price tui-skeleton-rect" v-else :class="PromotionsFormat(product.promotions) ? 'none' : ''">
-													<text class="p sm">￥</text>
-													<text class="p big">{{ (PromotionsFormat(product.promotions) ? product.price1 : product.retailPrice ) | NumFormat}}</text>
-												</view>
-											</template>
-										</template>	
-										<template v-else>
-											<view class="price tui-skeleton-rect">
-												<text class="p sm">￥</text>
-												<text class="p big">{{ product.retailPrice | NumFormat }}</text>
-											</view>
-										</template>
-									</view>
-									<view v-else class="no-price">
-										<template>
-											<view class="p-stars">
-												<text class="p-no">￥</text>
-												<uni-grader :grade="Number(product.price1Grade)" :margin="14"></uni-grader>
-											</view>
-										</template>
-									</view>	
-								</view>
-							</view>
-						</view>
-					</view>
-				</scroll-view>
-			</view>
-		</view>
-		<!-- 侧边 -->
-		<scroll-top :isScrollTop="isScrollTop" :bottom="50"></scroll-top>
-		<!-- 透明模态层 -->
-		<modal-layer v-if='isModallayer'></modal-layer>
-	</view>
-</template>
-
-<script>
-	import authorize from '@/common/config/authorize.js'
-	import uniGrader from '@/components/uni-grade/uni-grade.vue'
-	import modalLayer from "@/components/modal-layer"
-	import { userInfoLogin } from "@/api/use.js"
-	import { mapState,mapMutations} from 'vuex';
-	var isPreviewImg;
-	export default {
-		components:{
-			uniGrader,
-			modalLayer
-		},
-		data() {
-			return {
-				userID:0,
-				current:0,
-				mode:'round',
-				isModallayer:false,
-				isLogin:false,
-				skeletonShow: true,
-				userIdentity:'',
-				supplierList1:[
-					{image:'http://static.caimei365.com/app/meibohui/meibo_sup_01.jpg',id:1172,type:1,keyWord:''},
-					{image:'http://static.caimei365.com/app/meibohui/meibo_sup_02.jpg',id:1172,type:1,keyWord:''},
-					{image:'http://static.caimei365.com/app/meibohui/meibo_sup_03.jpg',id:1170,type:2,keyWord:'INDIBA'},
-					{image:'http://static.caimei365.com/app/meibohui/meibo_sup_04.jpg',id:1258,type:1,keyWord:''}
-				],
-				supplierList2:[
-					{image:'http://static.caimei365.com/app/meibohui/meibo_logo_01.jpg',id:1172,type:1,keyWord:''},
-					{image:'http://static.caimei365.com/app/meibohui/meibo_logo_02.jpg',id:8888,type:2,keyWord:'INDIBA'},
-					{image:'http://static.caimei365.com/app/meibohui/meibo_logo_03.jpg',id:8888,type:2,keyWord:'维锶'},
-					{image:'http://static.caimei365.com/app/meibohui/meibo_logo_04.jpg',id:8888,type:2,keyWord:'imperium'},
-					{image:'http://static.caimei365.com/app/meibohui/meibo_logo_05.jpg',id:8888,type:2,keyWord:'易路达'},
-					{image:'http://static.caimei365.com/app/meibohui/meibo_logo_06.jpg',id:8888,type:2,keyWord:'ACTIVE'},
-					{image:'http://static.caimei365.com/app/meibohui/meibo_logo_07.jpg',id:1201,type:1,keyWord:''},
-					{image:'http://static.caimei365.com/app/meibohui/meibo_logo_09.jpg',id:1285,type:1,keyWord:''},
-				],
-				liveList:[
-					{image:'http://static.caimei365.com/app/meibohui/meibo_live@_01.jpg',liveTitle:'采美LIVE带你体验美博会现场氛围',optionTitle:'直播详情',liveImg:'http://static.caimei365.com/app/meibohui/meibo_live_01.jpg'},
-					{image:'http://static.caimei365.com/app/meibohui/meibo_live@_02.jpg',liveTitle:'探访美博会采美合作展位上',optionTitle:'直播详情',liveImg:'http://static.caimei365.com/app/meibohui/meibo_live_02.jpg'},
-					{image:'http://static.caimei365.com/app/meibohui/meibo_live@_03.jpg',liveTitle:'探访美博会采美合作展位下',optionTitle:'直播详情',liveImg:'http://static.caimei365.com/app/meibohui/meibo_live_03.jpg'},
-					{image:'http://static.caimei365.com/app/meibohui/meibo_live@_05.jpg',liveTitle:'探访VIP品牌INDIBA体验点',optionTitle:'直播详情',liveImg:'http://static.caimei365.com/app/meibohui/meibo_live_04.jpg'},
-					{image:'http://static.caimei365.com/app/meibohui/meibo_live@_04.jpg',liveTitle:'探访VIP品牌科医人体验点',optionTitle:'直播详情',liveImg:'http://static.caimei365.com/app/meibohui/meibo_live_05.jpg'},
-				],
-				boothList:[
-					{image:'http://static.caimei365.com/app/meibohui/meibo_img_02.jpg',name:'GMS(可现场体验)',num:'B区 12.2馆C31'},
-					{image:'http://static.caimei365.com/app/meibohui/meibo_img_03.jpg',name:'优斐斯',num:'A区 4.2号馆A31'},
-					{image:'http://static.caimei365.com/app/meibohui/meibo_img_04.jpg',name:'唯美概念(可现场体验)',num:'B区 12.2馆B41'},
-					{image:'http://static.caimei365.com/app/meibohui/meibo_img_05.jpg',name:'美生美(可现场体验)',num:'B区 12.2馆B39'},
-				],
-				SuppierNoteList:[
-					{shopId:1172,marke:'光子嫩肤的黄金标准——美国高端技术品牌',type:1,keyWord:''},
-					{shopId:1161,marke:'专注于细胞治疗的西班牙高端技术品牌',type:2,keyWord:'INDIBA'},
-					{shopId:1258,marke:'专注于进口医学美容仪器及产品',type:1,keyWord:''},
-					{shopId:1193,marke:'坚持原装进口先进光电设备',type:1,keyWord:''},
-					{shopId:1285,marke:'国货之光——专注医学美容术前术后修复',type:1,keyWord:''},
-					{shopId:1184,marke:'专注于进口国际顶级医疗美容设备',type:1,keyWord:''},
-					{shopId:1292,marke:'专注于进口国际品牌医疗美容设备和医用级护肤品',type:1,keyWord:''},
-					{shopId:1205,marke:'致力于韩国原装进口高端美容仪器',type:1,keyWord:''},
-					{shopId:1201,marke:'专注原装进口国际高端高科技美容设备',type:1,keyWord:''},
-					{shopId:1206,marke:'致力于光学医疗美容设备的研发',type:1,keyWord:''},
-					{shopId:1217,marke:'专注于原装进口国际医疗美容设备',type:1,keyWord:''},
-				],
-				flootData:[],//楼层
-				isScrollTop:false,
-				isRequest:false,
-				isNavRequest:false,
-				isLiveRequest:false,
-				productImage:[],
-			}
-		},
-		onLoad() {
-			this.modallayer = false
-			this.$api.getComStorage('userInfo').then((resolve) =>{
-				this.clubStatus = resolve.clubStatus
-				this.userID = resolve.userID ? resolve.userID : 0;
-				this.shopId = resolve.shopID ? resolve.shopID : 0;
-				this.userIdentity = resolve.userIdentity
-				this.GetActitityInit()
-			}).catch(error =>{
-				this.GetActitityInit()
-			})
-		},
-		filters: {
-			NumFormat:function(text) {//处理金额
-				return Number(text).toFixed(2);
-			}
-		},
-		computed: {
-			...mapState(['hasLogin','userInfo','identity','isActivity'])
-		},
-		methods: {
-			...mapMutations(['login','logout']),
-			LookMyCouponDetils(){//点击优惠券 跳转处理
-				if(this.hasLogin){
-					if(this.userIdentity == 2 || this.userIdentity == 4){
-						this.$api.navigateTo('/pages/user/coupon/coupon')
-					}else if(this.userIdentity == 3){
-						this.$api.navigateTo('/supplier/pages/index/index')
-					}else{
-						return;
-					}
-				}else{
-					this.$api.navigateTo('/pages/login/login')
-				}
-			},
-			GetActitityInit(){
-				this.ActivityService.GetRepeatActivityFloorData({userId:this.userID}).then(response =>{
-					this.flootData = this.ReturnNewFlootData(response.data,this.SuppierNoteList)
-					console.log(this.flootData);
-					//处理商品图片列表
-					this.productImage =[]
-					this.boothList.forEach(item =>{
-						this.productImage.push(item.image);
-					})
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000)
-				})
-			},
-			ReturnNewFlootData(listA,listB){
-				let NewArray = []
-				listA.map(item=>{
-					for (let i = 0; i < listB.length; i++) {
-						if( item.shopId == listB[i].shopId ){
-							NewArray.push(Object.assign(item,listB[i])) 
-						}
-					}
-				});
-				return NewArray
-			},
-			NavToDetailPage(path){
-				this.$api.navigateTo(path)
-			},
-			RouterDetailPage(id) {
-				this.isModallayer = true;
-				this.$api.navigateTo(`/pages/goods/product?id=${id}`);
-				this.isModallayer = false;
-			},
-			goSupplierPath(type,value,keyWord){
-				if(type == 1){
-					this.$api.navigateTo('/supplier/pages/user/my-shop?shopId='+value)
-				}else if(type == 2){
-					this.$api.navigateTo(`/search/pages/search/search?keyWord=${keyWord}`)
-				}
-			},
-			LiveGoPathPros(live){
-				this.$api.navigateTo(`/h5/pages/article/page-image?title=${live.optionTitle}&image=${live.liveImg}`)
-			},
-			PromotionsFormat(promo){//促销活动类型数据处理
-				if(promo!=null){
-					if(promo.type == 1 && promo.mode == 1){
-						return true
-					}else{
-						return false
-					}
-				}
-				return false
-			},
-			previewImg (index) {//顶部商品图片预览
-				// isPreviewImg = true
-				let previewUrls = this.productImage
-				uni.previewImage({
-					current: index, 	//图片索引
-					urls: previewUrls, //必须是http图片，本地图片无效
-					longPressActions:''
-				})
-			},
-		},
-		onPageScroll(e){//实时获取到滚动的值
-			if(e.scrollTop>400){
-				this.isScrollTop = true
-			}else{
-				this.isScrollTop = false
-			}	
-		},
-		onPullDownRefresh() {//下拉刷新
-			this.GetActitityInit()
-			uni.stopPullDownRefresh()
-		},
-		onShareAppMessage(res){//分享转发
-			if (res.from === 'button') {
-		      // 来自页面内转发按钮
-		    }
-			return {
-			  title: '美博会震撼开启，重磅优惠等你来领~',
-			  path: '/h5/pages/activity/meobohui',
-			  imageUrl:'http://static.caimei365.com/app/meibohui/meibo_share_01.jpg'
-			}
-		},
-		onShow(){
-		
-		}
-	}
-</script>
-
-<style lang="scss">
-	page{
-		background-color: #F7F7F7;
-	}
-	.container-top{
-		width: 100%;
-		height: 500rpx;
-		float: left;
-		image{
-			width: 100%;
-			height: 100%;
-			display: block;
-		}
-	}
-	.container-activ{
-		width: 100%;
-		height: 240rpx;
-		box-sizing: border-box;
-		padding: 0 24rpx;
-		margin: 24rpx 0;
-		float: left;
-		image{
-			width: 100%;
-			height: 240rpx;
-			display: block;
-		}
-	}
-	.container-page{
-		background-color: #F7F7F7;
-		width: 100%;
-		height: auto;
-		box-sizing: border-box;
-		padding: 0 24rpx;
-		float: left;
-	}
-	.tui-group-name {
-		width: 100%;
-		height: 92rpx;
-		padding: 20rpx 0;
-	}
-	.tui-group-title{
-		width: 100%;
-		float: left;
-		.tui-group-l{
-			float: left;
-			font-size: 34rpx;
-			font-weight: bold;
-			text-align: left;
-			line-height: 49rpx;
-			color: #333;
-		}
-		.tui-group-r{
-			float: right;
-			font-size: $font-size-26;
-			text-align: right;
-			line-height: 49rpx;
-			color: #999999;
-			.icon-xiayibu{
-				font-size: $font-size-30;
-				color: #999999;
-			}
-		}
-	}
-	.tui-sub__desc {
-		width: 100%;
-		float: left;
-		color: rgba(153,153,153,0.9);
-		font-size: $font-size-26;
-	}
-	.tui-group-list{
-		width: 100%;
-		height: auto;
-		.floor-item-vip{
-			width: 339rpx;
-			height: 240rpx;
-			float: left;
-			margin-right: 24rpx;
-			margin-bottom: 24rpx;
-			&:nth-child(2n){
-				margin-right: 0;
-			}
-			.floor-item-image{
-				width: 100%;
-				height: 100%;
-				display: block;
-				border-radius: 16rpx;
-			}
-		}
-		.floor-item-sup{
-			width: 162rpx;
-			height: 162rpx;
-			float: left;
-			margin-right: 18rpx;
-			margin-bottom: 24rpx;
-			&:nth-child(4n){
-				margin-right: 0;
-			}
-			.floor-item-image{
-				width: 100%;
-				height: 100%;
-				display: block;
-			}
-		}
-		.floor-item-booth{
-			width: 339rpx;
-			height: 382rpx;
-			float: left;
-			margin-right: 24rpx;
-			margin-bottom: 24rpx;
-			background-color: #FFFFFF;
-			border-radius: 16rpx;
-			&:nth-child(2n){
-				margin-right: 0;
-			}
-			.floor-item-booth-image{
-				width: 100%;
-				height: 240rpx;
-				.floor-item-image{
-					width: 100%;
-					height: 100%;
-					display: block;
-					border-radius: 16rpx 16rpx 0 0;
-				}
-			}
-			.floor-item-text{
-				width: 100%;
-				height: 142rpx;
-				box-sizing: border-box;
-				padding: 31rpx 16rpx;
-				.floor-item-p{
-					width: 100%;
-					line-height: 40rpx;
-					text-align: left;
-					font-size: $font-size-24;
-					white-space: nowrap;
-					text-overflow: ellipsis;
-					overflow: hidden;
-					&.one{
-						color: #333333;
-					}
-					&.two{
-						color: #999999;
-					}
-				}
-			}
-		}
-		
-	}
-	.tui-group-scroll{
-		width: 100%;
-		height:392rpx;
-		float: left;
-		background-color: #F7F7F7;
-		box-sizing: border-box;
-		background-color: #F7F7F7;
-		overflow: hidden;
-		display: flex;
-		align-items: center;
-		.floor-item__list {
-			display: flex;
-			align-items: center;
-		}
-		.floor-item__live {
-			background-color: #fff;
-			width: 310rpx;
-			height: 392rpx;
-			border-radius: 16rpx;
-			box-sizing: border-box;
-			margin-right: 16rpx;
-			.floor-item__image{
-				width: 310rpx;
-				height: 310rpx;
-				float: left;
-				image{
-					width: 100%;
-					height: 100%;
-					display: block;
-					border-radius: 16rpx 16rpx 0 0;
-				}
-			}
-			.floor-item__text{
-				width: 100%;
-				height: 82rpx;
-				line-height: 82rpx;
-				box-sizing: border-box;
-				padding: 0 24rpx;
-				text-align: center;
-				font-size: $font-size-24;
-				color: #333333;
-				white-space: nowrap;
-				text-overflow: ellipsis;
-				overflow: hidden;
-			}
-		}
-	}
-	.tui-group-good__scroll{
-		.floor-good__list{
-			display: flex;
-			align-items: center;
-		}
-		.floor-item{
-			width: 310rpx;
-			height: 516rpx;
-			margin-right: 20rpx;
-			font-size: $font-size-24;
-			color: $text-color;
-			background: #FFFFFF;
-			line-height: 36rpx;
-			border-radius: 16rpx;
-			margin-bottom: 20rpx;
-			float: left;
-			box-sizing: border-box;
-			position: relative;
-			.item-img{
-				width: 310rpx;
-				height: 310rpx;
-				border-radius: 16rpx 16rpx 0 0;
-				display: block;
-				margin-bottom: 8rpx;
-			}
-			.floor-item_tag{
-				width: 100%;
-				height: 32rpx;
-				float: left;
-				margin: 20rpx 0;
-				padding: 0 20rpx;
-				box-sizing: border-box;
-				text{
-					display: inline-block;
-					padding: 0 8rpx;
-					border: 1px solid #e3ebf7;
-					border-radius: 8rpx ;
-					color: #9aa5b5;
-					font-size: $font-size-22;
-					line-height: 32rpx;
-					text-align: center;
-					float: left;
-				}
-			}
-			.floor-item-content{
-				width: 100%;
-				padding: 0 20rpx;
-				box-sizing: border-box;
-			}
-			.floor-item-act{
-				display: block;
-				width: 100%;
-				height: 32rpx;
-				text-align: center;
-				box-sizing: border-box;
-			}
-			.floor-tags{
-				height: 28rpx;
-				border-radius: 6rpx;
-				background-color: #FFFFFF;
-				line-height: 28rpx;
-				color: $color-system;
-				text-align: center;
-				display: inline-block;
-				padding:0 16rpx;
-				font-size: $font-size-20;
-				border: 1px solid #E15616;
-				float: left;
-			}
-			.title-none{
-				font-size: $font-size-26;
-				color: #FF2A2A;
-				line-height: 54rpx;
-			}
-			.title{
-				width: 100%;
-				height: 70rpx;
-				display: flex;
-				line-height: 35rpx;
-				flex-direction: column;
-				margin: 20rpx 0 10rpx 0;
-				padding: 0;
-				position: relative;
-				.mclap{
-					width: 100%;
-					line-height:35rpx;
-					text-overflow:ellipsis;
-					display: -webkit-box;
-					word-break: break-all;
-					-webkit-box-orient: vertical;
-					-webkit-line-clamp: 2;
-					overflow: hidden;
-					font-size: 26rpx;
-					text-indent: 95rpx;
-				}
-				.mclap-tag{
-					display: block;
-					width: 84rpx;
-					height: 32rpx;
-					background-image: linear-gradient(270deg, #f9c023 0%, #f83600 100%);
-					border-radius: 4rpx 48rpx 4px 4px;
-					line-height: 32rpx;
-					font-size: $font-size-22;
-					color: #FFFFFF;
-					text-align: center;
-					position: absolute;
-					left: 0;
-					top: 0;
-				}
-			}
-			.no-price{
-				height: 54rpx;
-				line-height: 54rpx;
-				display: flex;
-				box-sizing: border-box;
-				.p-no{
-					font-size: $font-size-28;
-					color: $text-color;
-					display: block;
-					float: left;
-				}
-				.p-stars{
-					float: left;
-				}
-			}
-			.price{
-				color: #FF2A2A;
-				line-height:54rpx;
-				&.none{
-					text-decoration: line-through;
-					color: #999999;
-				}
-				.sm{
-					font-size: $font-size-24;
-				}
-				.big{
-					font-size: $font-size-28;
-				}
-			}
-		}
-	}
-	.container-section{
-		width: 100%;
-		height: auto;
-		background-color: #F7F7F7;
-	}
-</style>

h5/pages/article/page-image.vue

@@ -1,50 +0,0 @@
-<template>
-	<view class="activity">
-		<image :src="banner" mode="widthFix" @click="previewImg()"></image>
-	</view>
-</template>
-
-<script>
-	export default {
-	    data() {
-	        return {
-	            webviewStyles: {
-	                progress: {
-	                    color: '#FF3333'
-	                }
-	            },
-				banner:'',
-				productImage:[],
-	        }
-	    },
-		onLoad(option) {
-			this.banner = option.image
-			this.productImage.push(option.image)
-			uni.setNavigationBarTitle({title:option.title});
-		},
-		methods:{
-			navToDetailPage() {//跳转商品详情页
-				this.$api.navigateTo(`/pages/goods/product?id=${this.productID}`)
-			},
-			previewImg (index) {//顶部商品图片预览
-				let previewUrls = this.productImage
-				uni.previewImage({
-					current: 0, 	//图片索引
-					urls: previewUrls, //必须是http图片，本地图片无效
-					longPressActions:''
-				})
-			}
-		}
-	}
-</script>
-	
-<style lang="scss">
-	.activity{
-		width: 100%;
-		height: auto;
-		image{
-			width: 100%;
-			height: auto;
-		}
-	}
-</style>

h5/pages/article/page.vue

@@ -1,55 +0,0 @@
-<template>
-	<view class="activity">
-		<!-- <image @click.stop="navToDetailPage" src="https://img.caimei365.com/group1/M00/03/9A/Cmis216Zf8GAb_UqABE6NiwUUZs004.jpg" mode="widthFix"></image> -->
-	   <web-view :webview-styles="webviewStyles" :src="activityPath"></web-view>
-	</view>
-</template>
-
-<script>
-	export default {
-	    data() {
-	        return {
-	            webviewStyles: {
-	                progress: {
-	                    color: '#FF3333'
-	                }
-	            },
-				productID:'',
-				activityPath:'',
-				
-	        }
-	    },
-		onLoad(option) {
-			// console.log(option)
-			switch(option.linkType){
-				case '7':
-					this.activityPath = 'https://www.caimei365.com/repair.html'
-					break;
-				case '99':
-					this.activityPath = 'https://www.caimei365.com/help/1000.html'
-					break;
-				case '101':
-					this.activityPath = 'https://www.caimei365.com/repair/form.html'
-					break;
-			}
-			// console.log(this.activityPath)
-			// uni.setNavigationBarTitle({title:'多重精华,多重修复'});
-		},
-		methods:{
-			navToDetailPage() {//跳转商品详情页
-				this.$api.navigateTo(`/pages/goods/product?id=${this.productID}`)
-			},
-		}
-	}
-</script>
-	
-<style lang="scss">
-	.activity{
-		width: 100%;
-		height: auto;
-		image{
-			width: 100%;
-			height: auto;
-		}
-	}
-</style>

h5/pages/article/path-live.vue

@@ -1,57 +0,0 @@
-<template>
-	<view class="activity">
-		<image :src="banner" mode="widthFix" @click="previewImg()"></image>
-	</view>
-</template>
-
-<script>
-	export default {
-	    data() {
-	        return {
-				banner:'',
-				productImage:[]
-	        }
-	    },
-		onLoad() {
-			this.GetHomeLiveAdvertising()
-		},
-		methods:{
-			GetHomeLiveAdvertising(){
-				this.CommonService.GetHomeLiveAdvertising().then(response =>{
-					this.banner = response.data
-					this.productImage.push(response.data)
-				}).catch(error =>{
-					this.$util.msg(error.msg,3000);
-				})
-			},
-			previewImg (index) {//顶部商品图片预览
-				let previewUrls = this.productImage
-				uni.previewImage({
-					current: 0, 	//图片索引
-					urls: previewUrls, //必须是http图片，本地图片无效
-					longPressActions:''
-				})
-			}
-		},
-		onPullDownRefresh() {
-			setTimeout(() => {
-				this.GetHomeLiveAdvertising()
-				uni.stopPullDownRefresh()
-			}, 200)
-		},
-		onShow() {
-			
-		}
-	}
-</script>
-	
-<style lang="scss">
-	.activity{
-		width: 100%;
-		height: auto;
-		image{
-			width: 100%;
-			height: auto;
-		}
-	}
-</style>

h5/pages/article/path.vue

@@ -1,42 +0,0 @@
-<template>
-	<view class="activity">
-		<!-- <image @click.stop="navToDetailPage" src="https://img.caimei365.com/group1/M00/03/9A/Cmis216Zf8GAb_UqABE6NiwUUZs004.jpg" mode="widthFix"></image> -->
-	   <web-view :webview-styles="webviewStyles" :src="activityPath"></web-view>
-	</view>
-</template>
-
-<script>
-	export default {
-	    data() {
-	        return {
-	            webviewStyles: {
-	                progress: {
-	                    color: '#FF3333'
-	                }
-	            },
-				productID:'',
-				activityPath:'',
-				
-	        }
-	    },
-		onLoad(option) {
-			this.activityPath = option.link
-		},
-		methods:{
-			navToDetailPage() {//跳转商品详情页
-				this.$api.navigateTo(`/pages/goods/product?id=${this.productID}`)
-			},
-		}
-	}
-</script>
-	
-<style lang="scss">
-	.activity{
-		width: 100%;
-		height: auto;
-		image{
-			width: 100%;
-			height: auto;
-		}
-	}
-</style>

h5/pages/other/brand.vue

@@ -1,161 +0,0 @@
-<template>
-	<view class="container clearfix" >
-		<view class="banner" :style="{paddingBottom :isIphoneX ? '120rpx' : '60rpx'}" v-if="isBannerHome">
-			<image :class="'banner-img'+index" :src="item" mode="" v-for="(item,index) in image1" :key="index"></image>
-		</view>	
-		<view class="banner" :style="{paddingBottom :isIphoneX ? '120rpx' : '60rpx'}" v-if="isBannerOems">
-			<image :class="'banner-imgs'+(index+1)" :src="item" mode="" v-for="(item,index) in image2" :key="index"></image>
-		</view>	
-		<view class="container-btn" :style="{paddingBottom :isIphoneX ? '68rpx' : '34rpx'}">
-			<view class="btn" @click="NavToH5Page(1)">
-				<view class="btn-text small">BRAND OEM SERVICE</view>
-				<view class="btn-text">品牌OEM服务</view>
-			</view>
-			<view class="btn" @click="NavToH5Page(2)" v-if="isBannerHome">
-				<view class="btn-text small">KNOW MORE ABOUT CAIMEI365</view>
-				<view class="btn-text">查看更多</view>
-			</view>
-			<view class="btn" @click="NavToH5Page(3)" v-if="isBannerOems">
-				<view class="btn-text">BACK</view>
-				<view class="btn-text">返回首页</view>
-			</view>
-		</view>
-		<!-- 侧边 -->
-		<scroll-top :isScrollTop="isScrollTop" :bottom="300"></scroll-top>
-	</view>
-</template> 
-
-<script>
-	import { mapState,mapMutations} from 'vuex';
-	
-	export default{
-		data(){
-			return{
-				isIphoneX:this.$store.state.isIphoneX,
-				isBannerHome:true,
-				isBannerOems:false,
-				image1:[
-					'https://www.caimei365.com/img/investment/h5_1.jpg',
-					'https://www.caimei365.com/img/investment/h5_2.jpg',
-					'https://www.caimei365.com/img/investment/h5_3.jpg'
-				],
-				image2:[
-					'https://www.caimei365.com/img/investment/h5_4.jpg',
-					'https://www.caimei365.com/img/investment/h5_5.jpg'
-				],
-				isScrollTop:false
-			} 
-		},
-		onLoad(option) {
-			
-		},
-		methods:{
-			NavToH5Page(index) {//跳转H5超皮秒防伪查询
-				switch(index){
-					case 1:
-						let path ='https://static.caimei365.com/app/caimei-activity-h5/html/2020/caimeih5_99.html'
-						this.$api.navigateTo(`/h5/pages/activity/activity?link=${path}&title=品牌OEM服务`)
-						break;
-					case 2:
-						this.isBannerHome = false
-						this.isBannerOems = true
-						break;
-					case 3:
-						this.isBannerHome = true
-						this.isBannerOems = false
-						break;
-				}
-			}
-		},
-		onPageScroll(e){//实时获取到滚动的值
-			if(e.scrollTop>400){
-				this.isScrollTop = true
-			}else{
-				this.isScrollTop = false
-			}	
-		},
-		onShow() {
-			
-		}
-	}
-</script>
-
-<style lang="scss">
-	page{
-		background-color: #FFFFFF;
-	}
-	.container{
-		width: 100%;
-		height: auto;
-		.container-btn{
-			width: 100%;
-			box-sizing: border-box;
-			padding: 7rpx 24rpx;
-			background-color: #FFFFFF;
-			position: fixed;
-			display: flex;
-			bottom: 0;
-			left: 0;
-			z-index: 999;
-			.btn{
-				flex: 1;
-				background-image: linear-gradient(270deg, #1045e1 0%, #2bb4ff 100%);
-				line-height: 84rpx;
-				border-radius: 42rpx;
-				text-align: center;
-				font-size: 26rpx;
-				color: #FFFFFF;
-				padding: 13rpx;
-				box-sizing:border-box;
-				margin: 0 10rpx;
-				.btn-text{
-					width: 100%;
-					height: 29rpx;
-					float: left;
-					line-height: 29rpx;
-					font-size: $font-size-24;
-					color: #FFFFFF;
-					text-align: center;
-					&.small{
-						font-size: 18rpx;
-					}
-				}
-			}
-		}
-		.banner{
-			width: 100%;
-			height: auto;
-			float: left;
-			.banner-img0{
-				width: 100%;
-				height: 1817rpx;
-				display: block;
-			}
-			.banner-img1{
-				width: 100%;
-				height: 2677rpx;
-				display: block;
-			}
-			.banner-img2{
-				width: 100%;
-				height: 1678rpx;
-				display: block;
-			}
-			.banner-imgs1{
-				width: 100%;
-				height: 2403rpx;
-				display: block;
-			}
-			.banner-imgs2{
-				width: 100%;
-				height: 1077rpx;
-				display: block;
-			}
-			.banner-img4{
-				width: 100%;
-				height: 2500rpx;
-				display: block;
-			}
-		}
-	}
-</style>

h5/pages/other/repair.vue

@@ -1,75 +0,0 @@
-<template>
-	<view class="container clearfix" >
-		<view class="banner" :style="{paddingBottom :isIphoneX ? '120rpx' : '60rpx'}">
-			<image :src="banner" mode=""></image>
-		</view>	
-		<view class="container-btn" :style="{paddingBottom :isIphoneX ? '68rpx' : '34rpx'}">
-			<view class="btn" @click="NavToH5Page">申请维修</view>
-		</view>
-	</view>
-</template> 
-
-<script>
-	import { mapState,mapMutations} from 'vuex';
-	
-	export default{
-		data(){
-			return{
-				isIphoneX:this.$store.state.isIphoneX,
-				banner:'https://static.caimei365.com/app/img/bg/icon-weixiu.jpg',
-			}
-		},
-		onLoad(option) {
-			
-		},
-		methods:{
-			NavToH5Page() {//跳转H5超皮秒防伪查询
-				 this.$api.navigateTo(`/h5/pages/article/page?linkType=101`)
-			}
-		},
-		onShow() {
-			
-		}
-	}
-</script>
-
-<style lang="scss">
-	page{
-		background-color: #FFFFFF;
-	}
-	.container{
-		width: 100%;
-		height: auto;
-		.container-btn{
-			width: 100%;
-			box-sizing: border-box;
-			padding: 7rpx 24rpx;
-			background-color: #FFFFFF;
-			position: fixed;
-			bottom: 0;
-			left: 0;
-			z-index: 999;
-			.btn{
-				width: 100%;
-				height: 100%;
-				background-image: $btn-confirm;
-				line-height: 84rpx;
-				border-radius: 42rpx;
-				text-align: center;
-				font-size: 26rpx;
-				color: #FFFFFF;
-			}
-		}
-		.banner{
-			width: 702rpx;
-			height: 1386rpx;
-			float: left;
-			padding: 0 24rpx;
-			image{
-				width: 100%;
-				height: 1386rpx;
-				display: block;
-			}
-		}
-	}
-</style>

pages.json

@@ -1,16 +1,16 @@
 {
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
 		{
-			"path": "pages/tabBar/home/index",
+			"path": "pages/authorization/authorization",
 			"style": {
-				"navigationBarTitleText": "采美采购商城",
-				"enablePullDownRefresh":true,
+				"navigationBarTitleText": "微信授权",
 				"navigationStyle":"custom"
 			}
 		},{
-			"path": "pages/authorization/authorization",
+			"path": "pages/tabBar/home/index",
 			"style": {
-				"navigationBarTitleText": "微信授权",
+				"navigationBarTitleText": "采美采购商城",
+				"enablePullDownRefresh":true,
 				"navigationStyle":"custom"
 			}
 		},{
@@ -366,409 +366,7 @@
 					}
 				}
 			]	
-		},
-		{
-			"root": "seller",
-			"pages": [
-				{
-					"path": "pages/index/index",
-					"style": {
-						"navigationBarTitleText": "采美采购商城",
-						"enablePullDownRefresh":true,
-						"navigationStyle":"custom"
-					}
-				},
-				{
-					"path": "pages/login/login",
-					"style": {
-						"navigationBarTitleText": "登录",
-						"navigationStyle":"custom"
-					}
-				},
-				{
-					"path": "pages/cart/cart",
-					"style": {
-						"navigationBarTitleText": "购物车"
-					}
-				},
-				{
-					"path": "pages/cart/buyagain",
-					"style": {
-						"navigationBarTitleText": "再次购买"
-					}
-				},
-				{
-					"path": "pages/cart/immediately",
-					"style": {
-						"navigationBarTitleText": "立即下单"
-					}
-				},{
-					"path": "pages/cart/second",
-					"style": {
-						"navigationBarTitleText": "二手下单"
-					}
-				},
-				{
-					"path": "pages/order/create-order",
-					"style": {
-						"navigationBarTitleText": "确认订单"
-					}
-				},
-				{
-					"path": "pages/order/order-details",
-					"style": {
-						"navigationBarTitleText": "订单详情",
-						"navigationStyle":"custom"
-					}
-				},
-				{
-					"path": "pages/order/order-list",
-					"style": {
-						"navigationBarTitleText": "订单列表",
-						"navigationStyle":"custom"
-					}
-				},
-				{
-					"path": "pages/order/order-sharedetails",
-					"style": {
-						"navigationBarTitleText": "订单详情",
-						"navigationStyle":"custom"
-					}
-				},
-				{
-					"path": "pages/club/list",
-					"style": {
-						"navigationBarTitleText": "机构列表"
-					}
-				},
-				{
-					"path": "pages/club/club-list",
-					"style": {
-						"navigationBarTitleText": "我的机构"
-					}
-				},
-				{
-					"path": "pages/club/allClub-list",
-					"style": {
-						"navigationBarTitleText": "所有机构"
-					}
-				},
-				{
-					"path": "pages/club/addoperator",
-					"style": {
-						"navigationBarTitleText": "邀请运营人员"
-					}
-				},
-				{
-					"path": "pages/login/register",
-					"style": {
-						"navigationBarTitleText": "拉机构上线",
-						"navigationStyle":"custom"
-					}
-				},
-				{
-					"path": "pages/login/information",
-					"style": {
-						"navigationBarTitleText": "修改资料",
-						"navigationStyle":"custom"
-					}
-				},
-				{
-					"path": "pages/login/apply",
-					"style": {
-						"navigationBarTitleText": "修改申请信息",
-						"navigationStyle":"custom"
-					}
-				},
-				{
-					"path": "pages/order/order-historylist",
-					"style": {
-						"navigationBarTitleText": "订单列表"
-					}
-				},{
-					"path": "pages/search/search-order",
-					"style": {
-						"navigationBarTitleText": "订单搜索"
-					}
-				},
-				{
-					"path": "pages/address/address",
-					"style": {
-						"navigationBarTitleText": "选择地址"
-					}
-				},
-				{
-					"path": "pages/address/addressManage",
-					"style": {
-						"navigationBarTitleText": "添加地址"
-					}
-				}
-			]
-		},
-		{
-			"root": "h5",
-			"pages": [
-				{
-					"path": "pages/activity/activity",
-					"style": {
-						"navigationBarTitleText": ""
-					}
-				},
-				{
-					"path": "pages/activity/activity_mid",
-					"style": {
-						"navigationBarTitleText": "年中大促",
-						"enablePullDownRefresh":true
-					}
-				},
-				{
-					"path": "pages/activity/meobohui",
-					"style": {
-						"navigationBarTitleText": "美博会",
-						"enablePullDownRefresh":true
-					}
-				},
-				{
-					"path": "pages/activity/meobohui-booth",
-					"style": {
-						"navigationBarTitleText": "展位图",
-						"enablePullDownRefresh":true
-					}
-				},
-				{
-					"path": "pages/activity/meobohui-supplier",
-					"style": {
-						"navigationBarTitleText": "参展商",
-						"enablePullDownRefresh":true
-					}
-				},
-				{
-					"path": "pages/article/page",
-					"style": {
-						"navigationBarTitleText": "采美采购平台",
-						"enablePullDownRefresh":true
-					}
-				},
-				{
-					"path": "pages/article/path",
-					"style": {
-						"navigationBarTitleText": "采美采购平台",
-						"enablePullDownRefresh":true
-					}
-				},
-				{
-					"path": "pages/article/page-image",
-					"style": {
-						"navigationBarTitleText": "采美采购平台"
-					}
-				},
-				{
-					"path": "pages/article/path-live",
-					"style": {
-						"navigationBarTitleText": "采美采购平台",
-						"enablePullDownRefresh":true
-					}
-				},
-				{
-					"path": "pages/activity/activity-list",
-					"style": {
-						"navigationBarTitleText": "商品专题",
-						"enablePullDownRefresh":true
-					}
-				},
-				{
-					"path": "pages/other/repair",
-					"style": {
-						"navigationBarTitleText": "维修"
-					}
-				},
-				{
-					"path": "pages/other/brand",
-					"style": {
-						"navigationBarTitleText": "品牌招商"
-					}
-				}
-			]	
-		},{
-			"root": "search",
-			"pages": [
-				{
-					"path": "pages/search/search",
-					"style": {
-						"navigationBarTitleText": "搜索"
-					}
-				},{
-					"path": "pages/search/search-supplier",
-					"style": {
-						"navigationBarTitleText": "搜索供应商"
-					}
-				},{ 
-					"path": "pages/search/search-instrument",
-					"style": {
-						"navigationBarTitleText": "搜索仪器"
-					}
-				},{
-					"path": "pages/search/search-order",
-					"style": {
-						"navigationBarTitleText": "订单搜索"
-					}
-				},{
-					"path": "pages/search/search-second",
-					"style": {
-						"navigationBarTitleText": "二手搜索"
-					}
-				}
-			]	
-		},{
-			"root": "second",
-			"pages": [
-				{
-					"path": "pages/form/introduce",
-					"style": {
-						"navigationBarTitleText": "二手市场介绍",
-						"enablePullDownRefresh":true
-					}
-				},{
-					"path": "pages/form/form",
-					"style": {
-						"navigationBarTitleText": "发布二手"
-					}
-				},
-				{
-					"path": "pages/product/product-list",
-					"style": {
-						"navigationBarTitleText": "二手商品",
-						"enablePullDownRefresh":true
-					}
-				},
-				{
-					"path": "pages/product/product-details",
-					"style": {
-						"navigationBarTitleText": "商品详情",
-						"enablePullDownRefresh":true,
-						"navigationStyle":"custom"
-					}
-				}
-			]	
-		},
-		{
-			"root": "supplier",
-			"pages": [
-				{
-					"path": "pages/index/index",
-					"style": {
-						"navigationBarTitleText": "采美采购商城",
-						"enablePullDownRefresh":true,
-						"navigationStyle":"custom"
-					}
-				},{
-					"path": "pages/login/bind-operator",
-					"style": {
-						"navigationBarTitleText": "绑定微信"
-					}
-				},{
-					"path": "pages/user/my-product",
-					"style": {
-						"navigationBarTitleText": "我的商品",
-						"enablePullDownRefresh":true
-					}
-				},{
-					"path": "pages/user/my-shop",
-					"style": {
-						"navigationBarTitleText": "店铺主页",
-						"enablePullDownRefresh":true
-					}
-				},{
-					"path": "pages/login/share-login",
-					"style": {
-						"navigationBarTitleText": "查看订单"
-					}
-				},{
-					"path": "pages/login/share-info",
-					"style": {
-						"navigationBarTitleText": "订单详情",
-						"navigationStyle":"custom"
-					}
-				},{
-					"path": "pages/order/order-details",
-					"style": {
-						"navigationBarTitleText": "订单详情",
-						"enablePullDownRefresh":true
-					}
-				},{
-					"path": "pages/user/supplier",
-					"style": {
-						"navigationBarTitleText": "供应商信息"
-					}
-				},{
-					"path": "pages/order/order-list",
-					"style": {
-						"navigationBarTitleText": "我的订单",
-						"enablePullDownRefresh":true
-					}
-				},{
-					"path": "pages/order/order-service-details",
-					"style": {
-						"navigationBarTitleText": "订单详情",
-						"navigationStyle":"custom",
-						"enablePullDownRefresh":true
-					}
-				},{
-					"path": "pages/deliver/add-logistics",
-					"style": {
-						"navigationBarTitleText": "录入物流信息"
-					}
-				},{
-					"path": "pages/deliver/deliver-goods",
-					"style": {
-						"navigationBarTitleText": "发货",
-						"enablePullDownRefresh":true
-					}
-				},{
-					"path": "pages/deliver/deliver-record",
-					"style": {
-						"navigationBarTitleText": "发货记录",
-						"enablePullDownRefresh":true,
-						"navigationStyle":"custom"
-					}
-				},{
-					"path": "pages/deliver/logistics-list",
-					"style": {
-						"navigationBarTitleText": "物流公司"
-					}
-				},{
-					"path": "pages/user/setting/password",
-					"style": {
-						"navigationBarTitleText": "修改密码"
-					}
-				},{
-					"path": "pages/user/setting/phone",
-					"style": {
-						"navigationBarTitleText": "更换手机号"
-					}
-				},{
-					"path": "pages/user/setting/setting",
-					"style": {
-						"navigationBarTitleText": "账户设置"
-					}
-				},{
-					"path": "pages/user/operator/list",
-					"style": {
-						"navigationBarTitleText": "运营人员管理"
-					}
-				},{
-					"path": "pages/user/operator/addoperator",
-					"style": {
-						"navigationBarTitleText": "添加运营人员"
-					}
-				},{
-					"path": "pages/user/information",
-					"style": {
-						"navigationBarTitleText": "资料信息"
-					}
-				}
-			]	
-		}	
+		}
 	],
 	"tabBar": {
 		"height":"80",
@@ -776,30 +374,7 @@
 		"selectedColor": "#E15616",
 		"borderStyle": "black",
 		"backgroundColor": "#ffffff",
-		"list": [{
-				"pagePath": "pages/tabBar/home/index",
-				"iconPath": "static/icon-home@3x.png",
-				"selectedIconPath": "static/icon-home-active@3x.png",
-				"text": "商城"
-			},{
-				"pagePath": "pages/tabBar/category/index",
-				"iconPath": "static/icon-sort@3x.png",
-				"selectedIconPath": "static/icon-sort-active@3x.png",
-				"text": "分类"
-			},
-			{
-				"pagePath": "pages/tabBar/cart/cart",
-				"iconPath": "static/icon-cart@3x.png",
-				"selectedIconPath": "static/icon-cart-active@3x.png",
-				"text": "购物车"
-			},
-			{
-				"pagePath": "pages/tabBar/user/user",
-				"iconPath": "static/icon-user@3x.png",
-				"selectedIconPath": "static/icon-user-active@3x.png",
-				"text": "我的"
-			}
-		]
+		"list": []
 	},
 	"easycom": {
 		"autoscan": true,
@@ -809,7 +384,7 @@
 	},
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
-		"navigationBarTitleText": "采美采购商城",
+		"navigationBarTitleText": "维沙采购商城",
 		"navigationBarBackgroundColor": "#FFFFFF",
 		"backgroundColor": "#FFFFFF"
 	},

pages/login/apply-supplier.vue

@@ -166,7 +166,7 @@
 	import { mapMutations } from 'vuex';
 	import mpvueCityPicker from '@/components/mpvue-citypicker/mpvueCityPicker.vue'
 	import { supplierList,supplierMedicaCampNullList } from '@/common/json/data.json.js' //本地数据
-	import { uploadFileImage } from "@/api/utils.js" 
+	import { uploadFileImage } from "@/services/public.js" 
 	export default{
 		components:{
 			mpvueCityPicker

pages/login/apply.vue

@@ -203,7 +203,7 @@
 	import { mapMutations } from 'vuex';
 	import mpvueCityPicker from '@/components/mpvue-citypicker/mpvueCityPicker.vue'
 	import { beautyList,mentuzCampNullList,medicaCampNullList } from '@/common/json/data.json.js' //本地数据
-	import { uploadFileImage } from "@/api/utils.js" 
+	import { uploadFileImage } from "@/services/public.js" 
 	export default{
 		components:{
 			mpvueCityPicker

pages/login/bindOperator.vue

@@ -80,8 +80,8 @@
 	import { mapState,mapMutations } from 'vuex'
 	import authorize from '@/common/config/authorize.js' 
 	import wxLogin from "@/common/config/wxLogin.js"
-	import { userInfoLogin } from "@/api/use.js"
-	import { getbindOperatorCode } from "@/api/utils.js"
+	import { userInfoLogin } from "@/services/use.js"
+	import { getbindOperatorCode } from "@/services/public.js"
 	export default{
 		data() {
 			return{

pages/login/bindemail.vue

@@ -40,8 +40,8 @@
 
 <script>
 	import authorize from '@/common/config/authorize.js' 
-	import { bindingEmail } from '@/api/use.js' 
-	import { getEmailCode } from "@/api/utils.js"
+	import { bindingEmail } from '@/services/use.js' 
+	import { getEmailCode } from "@/services/public.js"
 	import wxLogin from "@/common/config/wxLogin.js"
 	
 	export default{

pages/login/bindwechat.vue

@@ -72,8 +72,8 @@
 	import { mapState,mapMutations } from 'vuex'
 	import authorize from '@/common/config/authorize.js' 
 	import wxLogin from "@/common/config/wxLogin.js"
-	import { bindingWechat } from "@/api/use.js"
-	import { getbindWechatCode } from "@/api/utils.js"
+	import { bindingWechat } from "@/services/use.js"
+	import { getbindWechatCode } from "@/services/public.js"
 	export default{
 		data() {
 			return{
@@ -153,21 +153,21 @@
 				getbindWechatCode(params).then(res =>{
 					const TIME_COUNT = 60;
 					this.$util.msg('验证短信已发送',2000)
-			     	if (!this.codeTime) {
-			       		this.count = TIME_COUNT;
+			     	if (!this.codeTime) {
+			       		this.count = TIME_COUNT;
 						this.isMobileDisabled = true;
-			       		this.codeTime = setInterval(() => {
-			       			if (this.count > 1 && this.count <= TIME_COUNT) {
-			         			this.count--
-			         			this.mobileCodeText = this.count +'s重新发送'
-			        		} else {
-				         		this.isMobileDisabled = false;
-				         		clearInterval(this.codeTime)
-				         		this.codeTime = null
+			       		this.codeTime = setInterval(() => {
+			       			if (this.count > 1 && this.count <= TIME_COUNT) {
+			         			this.count--
+			         			this.mobileCodeText = this.count +'s重新发送'
+			        		} else {
+				         		this.isMobileDisabled = false;
+				         		clearInterval(this.codeTime)
+				         		this.codeTime = null
 								this.mobileCodeText = '获取验证码'
-			        		}
-			       		},1000)
-			      	}
+			        		}
+			       		},1000)
+			      	}
 				}).catch( error =>{
 					this.$util.msg(error.msg,2000)
 					this.isMobileDisabled = false;

pages/login/information.vue

@@ -252,7 +252,7 @@
 	import { mapMutations } from 'vuex';
 	import mpvueCityPicker from '@/components/mpvue-citypicker/mpvueCityPicker.vue'
 	import { beautyList,mentuzCampNullList,medicaCampNullList } from '@/common/json/data.json.js' //本地数据
-	import { getClubMobileCode,getClubNewMobileCode,uploadFileImage } from "@/api/utils.js" 
+	import { getClubMobileCode,getClubNewMobileCode,uploadFileImage } from "@/services/public.js" 
 	var self;
 	export default{
 		components:{

pages/login/logincode.vue

@@ -22,7 +22,7 @@
 	import authorize from '@/common/config/authorize.js'
 	import wxLogin from "@/common/config/wxLogin.js"
 	import {mapState,mapMutations } from 'vuex';
-	import { invitationCodeLogin  } from '@/api/use.js'
+	import { invitationCodeLogin  } from '@/services/use.js'
 	export default{
 		data() {
 			return{

pages/login/password.vue

@@ -108,8 +108,8 @@
 
 <script>
 	import authorize from '@/common/config/authorize.js' 
-	import { mobilePassword , emailPassword } from "@/api/use.js"
-	import { getEmailCode } from "@/api/utils.js"
+	import { mobilePassword , emailPassword } from "@/services/use.js"
+	import { getEmailCode } from "@/services/public.js"
 	
 	export default{
 		data() {

pages/login/register-supplier.vue

@@ -233,7 +233,7 @@
 	import mpvueCityPicker from '@/components/mpvue-citypicker/mpvueCityPicker.vue'
 	import supplierAlert from '@/components/cm-module/modelAlert/supplierRegisreAlert.vue'
 	import { supplierList,supplierMedicaCampNullList } from '@/common/json/data.json.js' //本地数据
-	import { uploadFileImage } from "@/api/utils.js"
+	import { uploadFileImage } from "@/services/public.js"
 	export default{
 		components:{
 			mpvueCityPicker,

pages/login/register.vue

@@ -71,8 +71,8 @@
 	import wxLogin from "@/common/config/wxLogin.js"
 	import mpvueCityPicker from '@/components/mpvue-citypicker/mpvueCityPicker.vue'
 	import { beautyList,mentuzCampNullList,medicaCampNullList } from '@/common/json/data.json.js' //本地数据
-	import { organizationVerifyRegisterFirst } from "@/api/use.js"
-	import { getRegisterMobileCode, uploadFileImage } from "@/api/utils.js"
+	import { organizationVerifyRegisterFirst } from "@/services/use.js"
+	import { getRegisterMobileCode, uploadFileImage } from "@/services/public.js"
 	export default{
 		components:{
 			mpvueCityPicker

pages/tabBar/home/index.vue

@@ -33,7 +33,7 @@
 	import pageSpecial from '@/components/cm-module/homeIndex/pageSpecial.vue'
 	import supplierList from '@/components/cm-module/homeIndex/supplierList.vue'
 	import activityAlert from '@/components/cm-module/activity/activity_01.vue'
-	import { userInfoLogin } from "@/api/use.js"
+	import { userInfoLogin } from "@/services/use.js"
 	import { mapState,mapMutations} from 'vuex';
 	export default {
 		components:{

pages/tabBar/user/user.vue

@@ -152,7 +152,7 @@
 	import upgradeAlert from '@/components/cm-module/modelAlert/upgradeAlert.vue'
 	import authorize from '@/common/config/authorize.js'
 	import { mapState,mapMutations } from 'vuex'
-	import { cancelPrompt } from "@/api/use.js"
+	import { cancelPrompt } from "@/services/use.js"
 	
 	
 	export default{

pages/user/account/account.vue

@@ -69,7 +69,7 @@
 	import tuiLoadmore from "@/components/tui-components/loadmore/loadmore"
 	import tuiNomore from "@/components/tui-components/nomore/nomore"
 	import uniCalendar from '@/components/uni-calendar/uni-calendar.vue'
-	import { accountInfo } from "@/api/use.js"
+	import { accountInfo } from "@/services/use.js"
 	var date = new Date();
 	export default{
 		components: {

pages/user/setting/phone.vue

@@ -40,8 +40,8 @@
 
 <script>
 	import { mapMutations } from 'vuex';
-	import { getClubMobileCode,getClubNewMobileCode } from "@/api/utils.js" 
-	import { changeMobile } from "@/api/use.js" 
+	import { getClubMobileCode,getClubNewMobileCode } from "@/services/public.js" 
+	import { changeMobile } from "@/services/use.js" 
 	var self;
 	export default{
 		data() {

search/pages/search/search-instrument.vue

@@ -1,303 +0,0 @@
-<template>
-	<view class="container supplier clearfix">
-		<view class="supplier-search clearfix">
-			<view class="search-from name">
-				<text class="iconfont icon-sousuo"></text>
-				<input class="input" 
-					   type="text" 
-					   confirm-type="search" 
-					   v-model="listQuery.keyword" 
-					   :focus="isFocus"
-					   @input="onShowClose" 
-					   @confirm="GetSearchEquipmentList()" 
-					   placeholder="请输入仪器名称" 
-					   maxlength="16"/>
-				<text class="iconfont icon-shanchu1" v-if="isShowClose" @click="delInputText()"></text>
-			</view>
-			<view class="search-btn">
-				<button class="search-btn" type="default" @click.stop="searchsupplierList">搜索</button>
-			</view>
-		</view>
-		<view class="equipment-main">
-			<view v-if="isEmpty" class="empty-container">
-				<image class="empty-container-image" :src="productNoneImage" mode="aspectFit"></image>
-				<view class="txt">暂无项目仪器数据^_^</view>
-			</view>
-			<view v-else class="supplier-list">
-					<view class="list clearfix" v-for="(item, index) in list" :key="index" @click.stop="navToDetailPage(item.e_id)">
-						<image class="pros-item-image" :src="item.e_image" mode="scaleToFill"></image>
-						<view class="pros-name">{{ isInterceptHtmlFn(item.e_name) }}</view>
-					</view>
-					<!--加载loadding-->
-					<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-					<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text='nomoreText'></tui-nomore>
-					<!--加载loadding-->
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import authorize from '@/common/config/authorize.js'	
-	import wxLogin from "@/common/config/wxLogin.js"
-	import tuiLoadmore from "@/components/tui-components/loadmore/loadmore"
-	import tuiNomore from "@/components/tui-components/nomore/nomore"
-	export default {
-		components:{
-			tuiLoadmore,
-			tuiNomore
-		},
-		data() {
-			return {
-				iconClass:'icon-aixin',
-				iconColor:'#ff9100',
-				isShowClose:false,
-				isEmpty:false,
-				isFocus:true,
-				productNoneImage:'https://static.caimei365.com/app/img/icon/icon-pnone.png',
-				nomoreText: '上拉显示更多',
-				loadding: false,
-				pullUpOn: true,
-				pullFlag: true,
-				list:[],
-				listQuery:{
-					keyword: '',
-					pageSize: 10,
-					pageNum: 1
-				},
-				total:0
-			}
-		},
-		onLoad(option){
-			if(option.type =='share'){
-				authorize.getSetting().then(wxResponse =>{// console.log('是否已授权',res);//0:为取消授权 1:为已授权 2:为未操作
-					console.log(wxResponse)
-					if(wxResponse == 1){
-						wxLogin.wxLoginAuthorize()
-					}else{
-						console.log(new Date +'用户未授权微信信息')
-					}
-				})	
-			}
-			if(option.keyWord){
-				this.listQuery.keyword = option.keyWord
-				this.GetSearchEquipmentList();
-			}
-		},
-		methods: {
-			searchsupplierList(){//搜索
-				this.listQuery.pageNum=1
-				this.GetSearchEquipmentList()
-			},
-			GetSearchEquipmentList(){//查询供应商列表	
-				this.ProductService.GetSearchEquipmentList(this.listQuery).then(response =>{
-					let data = JSON.parse(response.data)
-					let dataList = data.items
-					console.log(data)
-					this.total = data.total
-					if(dataList && dataList.length > 0){
-						this.isEmpty = false
-						this.list = dataList
-						this.pullFlag = false;
-						setTimeout(()=>{this.pullFlag = true;},500)
-						if(this.total>this.list.length){
-							this.pullUpOn = false
-							this.nomoreText = '上拉显示更多'
-						}else{
-							this.pullUpOn = true
-							this.loadding = false
-							this.nomoreText = '已至底部'
-						}
-					}else{
-						this.isEmpty = true
-					}
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000)
-				})
-			},	
-			GetSearchEquipmentListBottomData(){//上滑加载
-				this.listQuery.pageNum+=1
-				this.ProductService.GetSearchEquipmentList(this.listQuery).then(response =>{
-					let data = JSON.parse(response.data)
-					console.log(data)
-					this.total = data.total
-					this.list = this.list.concat(data.items) 
-					if(this.total>this.list.length){
-						this.pullUpOn = false
-						this.nomoreText = '上拉显示更多'
-					}else{
-						this.pullUpOn = true
-						this.loadding = false
-						this.nomoreText = '已至底部'
-					}
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000)
-				})
-			},
-			onShowClose () {//输入框失去焦点时触发
-				if(this.listQuery.keyword != ''){
-					this.isShowClose = true
-				}else{					
-					this.isShowClose = false
-					this.listQuery.pageNum=1
-					this.GetSearchEquipmentList()
-				}
-			},
-			delInputText(){//清除输入框内容
-				this.listQuery.keyword = ''
-				this.isShowClose = false
-				this.listQuery.pageNum=1
-				this.GetSearchEquipmentList()
-			},
-			navToDetailPage(id) {//跳转仪器详情页
-				this.$api.navigateTo(`/pages/goods/instrument-details?id=${id}`)
-			},
-			isInterceptHtmlFn(text){
-				let name = this.$reg.interceptHtmlFn(text)
-				return name
-			},
-		},
-		onReachBottom() {
-			if(this.total>this.list.length){
-				this.loadding = true
-				this.pullUpOn = true
-				this.GetSearchEquipmentListBottomData()
-			}	
-		},
-		onShareAppMessage(res){//分享转发
-			if (res.from === 'button') {
-		      // 来自页面内转发按钮
-		    }
-			return {
-			  title: `做项目找仪器，上采美`,
-			  path: `search/pages/search/search-instrument?type=share&keyWord=${this.listQuery.keyword}`
-			}
-		},
-		onShow() {
-
-		}
-	}
-</script>
-
-<style lang='scss'>
-	page {
-		height: auto;
-	}
-	page,.container{
-		/* padding-bottom: 120upx; */
-		background: #F7F7F7;
-	}
-	.container{
-		position: relative;
-	}
-	.supplier {
-		width: 100%;
-		height: auto;
-		box-sizing: border-box;
-	}
-	.supplier-search{
-		height: 84rpx;
-		width: 100%;
-		padding:10rpx 24rpx;
-		background: #FFFFFF;
-		display: flex;
-		align-items: center;
-		position: fixed;
-		top: 0;
-		left: 0;
-		z-index: 999;
-		box-sizing: border-box;
-		.search-from{
-			width: 582rpx;
-			height: 64rpx;
-			background: #F7F7F7;
-			border-radius: 32rpx;
-			float: left;
-			position: relative;
-			.input{
-				width: 500rpx;
-				height: 64rpx;
-				float: left;
-				line-height: 64rpx;
-				color: $text-color;
-				font-size: $font-size-24;
-			}
-			.icon-sousuo{
-				width: 64rpx;
-				height: 64rpx;
-				line-height: 64rpx;
-				text-align: center;
-				display: block;
-				font-size: $font-size-38;
-				float: left;
-				color: #999999;
-			}
-			.icon-shanchu1{
-				font-size: $font-size-32;
-				color: #999999;
-				position: absolute;
-				width: 64rpx;
-				height: 64rpx;
-				line-height: 64rpx;
-				text-align: center;
-				top: 0;
-				right: 0;
-				z-index: 10;
-			}
-		}
-		.search-btn{
-			width: 120rpx;
-			line-height: 64rpx;
-			text-align: center;
-			font-size: $font-size-28;
-			color: #666666;
-			float: left;
-			background: #FFFFFF;
-		}
-	}
-	.equipment-main{
-		box-sizing: border-box;
-		padding: 0 24rpx;
-		margin-top: 94rpx;
-	}
-	.list{
-		width: 340rpx;
-		height: 301rpx;
-		float: left;
-		margin-right: 20rpx;
-		margin-top: 10rpx;
-		margin-bottom: 10rpx;
-		border-radius: 6rpx;
-		background-color: #FFFFFF;
-		&:nth-child(2n){
-			margin-right: 0;
-		}
-		.pros-item-image{
-			width: 340rpx;
-			height: 227rpx;
-			display: block;
-			float: left;
-			border-radius: 6rpx 6rpx 0 0;
-		}
-		.pros-name{
-			width: 100%;
-			height: 74rpx;
-			background-color: #FFFFFF;
-			line-height: 74rpx;
-			box-sizing: border-box;
-			padding: 0 20rpx;
-			font-size: $font-size-24;
-			color: #666666;
-			white-space: normal;
-			word-break: break-all;
-			overflow: hidden;
-			text-overflow: ellipsis;
-			display: -webkit-box;
-			-webkit-box-orient: vertical;
-			-webkit-line-clamp: 1;
-			text-align: center;
-		}
-	}
-
-</style>
-

search/pages/search/search-order.vue

@@ -1,905 +0,0 @@
-<template>
-	<view class="search-container">
-		<!-- <or-search :theme="themeClass" @getSearchText="getSearchText"></or-search> -->
-		<view class="search-main">
-			<view class="search">
-				<view class="search-input">
-					<text class="iconfont icon-iconfonticonfontsousuo1"></text>
-					<input maxlength="20" focus type="text" value="" confirm-type="search" @focus="onFocus" @input="onShowClose" @confirm="subMitSearch()" placeholder="请输入商品关键词" v-model.trim="searchInputVal"/>
-					<text class="iconfont icon-shanchu1" v-if="isShowClose" @click="delInputText()"></text>
-				</view>
-				<view class="search-btn" @click="subMitSearch()">搜索</view>
-			</view>
-		</view>
-		<view class="search-container-history" v-if="!isShowWrapper">
-			<view :class="'s-' + themeClass" v-if="serachRecordList.length>0">
-				<view class="header">
-					搜索历史
-					<text class="iconfont icon-shanchu" @click="confirmDetele"></text>
-				</view>
-				<view class="list">
-					<view v-for="(item,index) in serachRecordList" :key="index" @click="keywordsClick(item.searchWord)">{{item.searchWord}}</view>
-				</view>
-			</view>
-		</view>
-		<view class=" order-container" v-if="isShowWrapper" :style="{'overflow' : 'auto','height': (showSkeleton? windowHeight + 'px' : 'auto')}">
-			<scroll-view  class="tui-skeleton" :style="{'height':scrollHeight+'px'}"  @scrolltolower="scrolltolower" scroll-y >
-				<view  :class="{'tui-order-list':scrollTop >= 0}" class="tui-skeleton clearfix">
-					<!-- 空白页 -->
-					<empty v-if="isShowEmpty" :navbarHeight="navbarHeight"></empty>
-					<!-- 列表 -->
-					<view v-else class="tui-order-content">
-						<view  class="tui-order-item" v-for="(order,orderIndex) in orderList" :key="orderIndex" @click.stop="detail(order.orderID)">
-							<view class="order-title">
-								<view class="order-title-t">
-									<text class="bage-buss tui-skeleton-fillet" v-if="order.orderSubmitType == 3 || order.orderSubmitType == 4">协销</text>
-									<text class="bage-auto tui-skeleton-fillet" v-if="order.orderSubmitType == 0 || order.orderSubmitType == 1 || order.orderSubmitType == 2">自主</text>
-									<text class="bage-text tui-skeleton-fillet">订单编号：{{order.orderNo}}</text>
-									<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 tui-skeleton-fillet">下单时间：{{order.orderTime}}</view>
-									<view class="order-title-tip tui-skeleton-fillet">{{ StateExpFormat(order.status) }}</view>
-								</view>
-							</view>
-							<block v-for="(shop,index) in order.shopOrderList" :key="index">
-								<view class="goods-title">
-										<view v-if="shop.shopPromotion" class="floor-item-act">
-											<view class="floor-tags">{{shop.shopPromotion.name}}</view>	
-										</view>
-										<view class="title-text tui-skeleton-fillet">{{shop.shopName}}</view>	
-								</view>
-								<view class="goods-item" v-for="(pros,prosIndex) in shop.orderProductList" :key="prosIndex">
-									<view class="goods-pros-t">
-										<view class="pros-img tui-skeleton-fillet">
-											<image :src="pros.productImage" alt="" />
-											<text class="tips" v-if="pros.productType ==2 || pros.productType ==1">赠品</text>
-										</view>
-										<view class="pros-product">
-											<view class="producttitle tui-skeleton-fillet">{{pros.name}}</view>
-											<view class="productspec tui-skeleton-fillet" v-if="pros.productCategory!=2">规格:{{pros.productUnit}}</view>
-											<view class="productprice">
-												<view class="price tui-skeleton-fillet">
-													<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" v-if="pros.productPromotion!=null">
-												<view v-if="PromotionsFormat(pros.productPromotion)"  class="floor-tags">
-													{{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">{{pros.productPromotion.name}}</view>	
-											</view>
-										</view>	
-									</view>
-								</view>	
-							</block>
-							<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.productCount}}件商品</view>
-									<view class="money tui-skeleton-fillet">待付总额：¥{{ order.pendingPayments | NumFormat}}</view>
-								</view>
-							</view>
-							<!-- 底部button -->
-							<order-button ref="orderButton" 
-										  :status="order.status" 
-										  :orderID="order.orderID" 
-										  :onlinePayFlag = "order.onlinePayFlag"
-										  @buttonConfirm="handButtonConfirm">
-							</order-button>
-						</view>
-						<!--加载loadding-->
-						<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-						<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text='nomoreText'></tui-nomore>
-						<!--加载loadding-->
-					</view>
-				</view>
-			</scroll-view>
-		</view>
-		<!-- 分享弹窗 -->
-		<share-alert   v-if="isShareModal"
-					   :orderID="btnoRderID" 
-					   @shareConfirm ='onShareAppMessage'>
-		</share-alert>
-		<!-- 透明模态层 -->
-		<modal-layer v-if='isModalLayer'></modal-layer>
-	</view>
-</template>
-
-<script>
-	import orSearch from '@/components/uni-search/or-search.vue'
-	import tuiLoadmore from "@/components/tui-components/loadmore/loadmore"
-	import tuiNomore from "@/components/tui-components/nomore/nomore"
-	import orderButton from '@/components/cm-module/orderDetails/orderListButton'	 //按钮
-	import modalLayer from "@/components/modal-layer"
-	import empty from "@/components/empty";
-	import shareAlert from '@/components/cm-module/modelAlert/shareAlert'			 //分享弹窗
-	import authorize from '@/common/config/authorize.js'
-	export default {
-		components: {
-			orSearch,
-			tuiLoadmore,
-			tuiNomore,
-			orderButton,
-			empty,
-			shareAlert,
-		},
-		data() {
-			return {
-				themeClass: 'block',
-				searchInputVal:'',
-				isShowClose:false,							//是否显示清空输入框图标
-				isSearchHistory:false,						//是都显示搜索历史
-				serachRecordList:[],
-				isShowWrapper:false,
-				isModallayer:false,
-				isShowEmpty:false,
-				windowHeight: '',
-				showSkeleton: true,
-				userID:0,
-				orderList: [],
-				btnoRderID: 0, //点击按钮传入的的订单ID
-				pageNum: 1,	  //页数
-				pageSize: 10,  //条数
-				scrollTop: 0,
-				deteleType:'',
-				skeletonShow: true,
-				isShareModal: false,//控制分享弹窗
-				isCenceModal: false,//控制取消订单弹窗
-				isShowDelModal: false,//控制删除订单弹窗
-				isModalLayer: false,
-				loadding: false,
-				pullUpOn: true,
-				hasNextPage: false,
-				pullFlag: true,
-				navbarHeight:'',
-				nomoreText: '上拉显示更多',
-				scrollHeight:''
-			}
-		},
-		onLoad() {
-		  this.initGetSerachRecord()
-		},
-		filters:{
-			NumFormat(value) {//处理金额
-				return Number(value).toFixed(2);
-			}
-		},
-		methods:{
-			subMitSearch() {
-				if (this.searchInputVal == '') {
-					this.$util.msg('请输入商品关键词',2000);
-				}else{
-					this.commodityList =[]
-					this.getOrderDatainit()
-				}
-			},
-			initGetSerachRecord(){
-				this.$api.getStorage().then((resolve) =>{
-					this.userID = resolve.userID
-					this.OrderService.SearchOrderHistory({userId:this.userID}).then(response =>{
-						this.serachRecordList = response.data
-						if(this.serachRecordList.length>0){
-							this.isSearchHistory = true
-						}else{
-							this.isSearchHistory = false
-						}
-					}).catch(error =>{
-						this.$util.msg(error.msg,2000)
-					})
-				})	
-			},
-			onShowClose () { //输入框失去焦点时触发
-				this.inputEmpty(this.searchInputVal)
-			},
-			onFocus () { //输入框获取焦点时触发
-				this.inputEmpty(this.searchInputVal)
-				this.initGetSerachRecord()
-			},
-			delInputText () { //清除输入框内容
-				this.searchInputVal = ''
-				this.isShowClose = false
-				this.isShowWrapper = false
-				this.inputEmpty(this.searchInputVal)
-				this.initGetSerachRecord()
-			},
-			keywordsClick (item) {	//关键词搜索与历史搜索
-				this.searchInputVal = item;
-				this.isShowClose = true;
-				this.subMitSearch();
-			},
-			confirmDetele () {//清空历史记录
-				this.$util.modal('提示','确定删除历史记录？','确定','取消',true,() =>{
-					this.OrderService.ClearOrderHistory({userId:this.userID}).then(response =>{
-						this.$util.msg('删除记录成功',2000,true,'success')
-						this.serachRecordList=[]
-					}).catch(error =>{
-						this.$util.msg(error.msg,2000)
-					})
-				})
-			},
-			inputEmpty(val){
-				this.isShowWrapper = false
-				if(val != ''){
-					this.isShowClose = true
-				}else{					
-					this.isShowClose = false
-				}
-			},
-			getOrderDatainit(index,source){
-				/**
-				 * @订单初始化加载  仅加载第一页码
-				 * @param：searchWord(搜索关键词)
-				 * @param：userId(用户ID)
-				 * @param：pageNum(页码数)
-				 * @param：pageSize(每页条数)
-				 * @param：organizeID(全局变量组织ID)
-				 */ 
-				let params = {searchWord:this.searchInputVal,userId:this.userID,pageNum:1,pageSize:this.pageSize};
-				this.OrderService.SearchOrderInfo(params).then(response =>{
-					this.isShowWrapper = true
-					this.showSkeleton = true
-					const _responseData = response.data.results;
-					if(_responseData && _responseData.length > 0){
-						let filrerData = _responseData.filter(item=>{
-							//添加不同状态下订单的表现形式
-							item = Object.assign(item, this.StateExpFormat(item.state));
-							return item;
-						});
-						this.orderList =[];
-						filrerData.forEach(item=>{
-							this.orderList.push(item);
-						})
-						this.hasNextPage = response.data.hasNextPage;
-						if(this.hasNextPage){
-							this.pullUpOn = false
-							this.nomoreText = '上拉显示更多'
-						}else{
-							if(this.orderList.length < 2){
-								this.pullUpOn = true
-							}else{
-								this.pullUpOn = false
-								this.nomoreText = '已至底部'
-							}
-						}
-						this.isShowEmpty = false
-					}else{
-						this.isShowEmpty = true
-					}
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000)
-				})
-			}, 
-			getOnReachBottomData(index){//上拉加载
-				this.pageNum+=1
-				let params = {searchWord:this.searchInputVal,userId:this.userID,pageNum:this.pageNum,pageSize:this.pageSize}
-				this.OrderService.SearchOrderInfo(params).then(response =>{
-					let resData = response.data.results
-					this.hasNextPage = response.data.hasNextPage;
-					this.orderList = this.orderList.concat(resData)
-					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)
-				})
-			},
-			scrolltolower() {
-				if(this.hasNextPage){
-					this.loadding = true
-					this.pullUpOn = true
-					this.showSkeleton = false
-					this.getOnReachBottomData();
-				}	
-			},
-			detail(id) {//订单详情跳转
-				this.isModalLayer = true;	
-				this.$api.navigateTo(`/pages/user/order/order-details?type=search&orderID=${id}`)
-			},
-			handButtonConfirm(data) {//获取点击
-				this.handShowAlert(data)
-				this.btnoRderID = data.orderId
-			},
-			handShowAlert(data) {//执行
-				switch(data.type){
-					case 'delete':
-						this.handOrderDetele(data.orderId);
-						break
-					case 'cancel':
-						this.handCenceConfirm(data.orderId)
-						break
-					case 'query':
-						this.isModalLayer = true;
-						this.$api.navigateTo('/pages/user/order/order-logistics?orderID='+data.orderId)
-						break
-					case 'confirm':
-						this.handOrderConfirm(data.orderId);
-						break
-					case 'confirmation':
-						this.handOrderConfirmation(data.orderId);
-						break	
-				}
-			},
-			handOrderConfirm (id){//确认收货
-				this.$util.modal('提示','是否确认收货','确定','取消',true,() =>{
-					this.OrderService.ConfirmReceipt({orderID:id}).then(response =>{
-						this.$util.msg(response.msg,2000,true,'success');
-						this.getOrderDatainit()
-					}).catch(error =>{
-						this.$util.msg(error.msg,2000)
-					})
-				})
-			},
-			handOrderConfirmation (id){//确认订单
-				this.$util.modal('提示','确认此订单？','确定','取消',true,() =>{
-					this.OrderService.AffirmOrder({orderID:id}).then(response =>{
-						this.$util.msg(response.msg,2000,true,'success');
-						setTimeout(() => {
-							this.getOrderDatainit()
-						},2000)
-					}).catch(error =>{
-						this.$util.msg(error.msg,2000)
-					})
-				})
-			},
-			handOrderDetele(id){//删除订单
-				this.$util.modal('提示','确认删除该订单吗？','确定','取消',true,() =>{
-					this.OrderService.DeleteOrder({orderID:id}).then(response =>{
-						this.$util.msg(response.msg,2000,true,'success');
-						setTimeout(() => {
-							this.getOrderDatainit()
-						},2000)
-					}).catch(error =>{
-						this.$util.msg(error.msg,2000)
-					})
-				})
-			},
-			handCenceConfirm(id){//取消订单
-				this.$util.modal('提示','确认取消该订单吗？','确定','取消',true,() =>{
-					this.OrderService.CancelOrder({orderID:id}).then(response =>{
-						this.$util.msg(response.msg,2000,true,'success');
-						setTimeout(() => {
-							this.getOrderDatainit()
-						},2000)
-					}).catch(error =>{
-						this.$util.msg(error.msg,2000)
-					})
-				})
-			},
-			onShareAppMessage (res){//分享转发
-				this.isShareModal = false
-				if (res.from === 'button') {// 来自页面内转发按钮
-			    }
-				return {
-					title: '您有新的分享订单，快来查看吧~',
-					path: `/pages/user/order/order-sharelogin?orderID=${this.btnoRderID}&userID=${this.userID}`,
-					imageUrl:'https://static.caimei365.com/app/img/bg/min-banner.jpg'
-				}
-			},
-			setScrollHeight() {
-				const {windowHeight, pixelRatio} = wx.getSystemInfoSync();
-				this.windowHeight = windowHeight - 1;
-				this.scrollHeight = windowHeight - 1;
-			},
-			PromotionsFormat(promo){//促销活动类型数据处理
-				if(promo!=null){
-					if(promo.type == 1 && promo.mode == 1){
-						return true
-					}else{
-						return false
-					}
-				}
-				return false
-			},
-			StateExpFormat(state){ //订单状态文字和颜色
-				var HtmlStateText = '',
-					stateTextObject={
-						0:'待确认',
-						4:'交易完成',
-						5:'订单完成',
-						6:'已关闭',
-						7:'交易全退',
-						77:'交易全退',
-						11:'待付款待发货',
-						12:'待付款部分发货',
-						13:'待付款已发货',
-						21:'部分付款待发货',
-						22:'部分付款部分发货',
-						23:'部分付款已发货',
-						31:'已付款待发货',
-						32:'已付款部分发货',
-						33:'已付款已发货',
-						111:'待付款待发货'
-					};
-				Object.keys(stateTextObject).forEach(function(key){
-					if(key == state){
-						HtmlStateText = stateTextObject[key]
-					}
-				});
-				return HtmlStateText;
-			}
-		},
-		onPageScroll(e) {
-			this.scrollTop = e.scrollTop;
-			
-		},
-		onShow() {
-			this.setScrollHeight();
-		}
-	}
-</script>
-
-<style lang="scss">
-	@import "@/uni.scss";
-	page{
-		background-color: #F7F7F7 !important;
-	}
-	.search{
-		width: 702rpx;
-		height: 70rpx;
-		padding: 12rpx 24rpx;
-		border-bottom: 1px solid #F0F0F0;
-		position: fixed;
-		top: 0;
-		left: 0;
-		background: #FFFFFF;
-		z-index: 1001;
-		.search-input{
-			width: 448rpx;
-			height: 70rpx;
-			padding: 0 68rpx;
-			line-height: 70rpx;
-			border-radius: 40rpx;
-			position: relative;
-			background: #F0F0F0;
-			float: left;
-			.icon-iconfonticonfontsousuo1{
-				font-size: 36rpx;
-				color: #8A8A8A;
-				position: absolute;
-				left: 24rpx;
-				z-index: 10;
-			}
-			.icon-shanchu1{
-				font-size: 36rpx;
-				color: #8A8A8A;
-				position: absolute;
-				right: 24rpx;
-				top: 0;
-				padding: 0 10rpx;
-				z-index: 10;
-			}
-			input{
-				width: 448rpx;
-				height: 70rpx;
-				background-color: #F0F0F0; 
-				font-size: 26rpx;
-			}
-		}
-		.search-btn{
-			width: 118rpx;
-			height: 70rpx;
-			line-height: 70rpx;
-			color: $color-system;
-			font-size: 30rpx;
-			text-align: center;
-			float: left;
-		}
-		.voice-icon{
-			width: 36rpx;
-			height: 36rpx;
-			padding: 16rpx 20rpx 16rpx 0;
-			position: absolute;
-			left: 16rpx;
-			top: 4rpx;
-			z-index: 10;
-		}
-		
-	}
-	.search-container{
-		padding-top: 106rpx;
-	}
-	.s-block{
-		background: #FFFFFF;
-		.header{
-			font-size: 32rpx;
-			padding:40rpx 24rpx 22rpx 24rpx;
-			line-height: 42rpx;
-			font-size: 30rpx;
-			font-weight: bold;
-			position: relative;
-			.icon-shanchu{
-				font-size: 36rpx;
-				color: #333333;
-				float: right;
-				padding: 0 10rpx;
-				z-index: 10;
-				font-weight: normal;
-			}
-		}
-		.list{
-			display: flex;
-			flex-wrap: wrap;
-			padding-bottom: 40rpx;
-			view{
-				color: #8A8A8A;
-				font-size: 24rpx;
-				box-sizing: border-box;
-				text-align: center;
-				height: 48rpx;
-				line-height: 48rpx;
-				border-radius: 24rpx;
-				margin:12rpx;
-				padding:.0 30rpx;
-				overflow: hidden;
-				white-space: nowrap;
-				text-overflow: ellipsis;
-				background-color: #F3F3F3;
-			}
-		}
-	}
-	.s-circle{
-		margin-top: 30rpx;
-		.header{
-			font-size: 32rpx;
-			padding: 30rpx;
-			border-bottom: 2rpx solid #F9F9F9;
-			position: relative;
-			image{
-				width: 36rpx;
-				height: 36rpx;
-				padding: 10rpx;
-				position: absolute;
-				right: 40rpx;
-				top: 24rpx;
-			}
-		}
-		.list{
-			display: flex;
-			flex-wrap: wrap;
-			padding: 0 30rpx 20rpx;
-			view{
-				padding: 8rpx 30rpx;
-				margin: 20rpx 30rpx 0 0;
-				font-size: 28rpx;
-				color: #8A8A8A;
-				background-color: #F7F7F7;
-				box-sizing: border-box;
-				text-align: center;
-				border-radius: 20rpx;
-			}
-		}
-	}
-	.wanted-block{
-		margin-top: 30rpx;
-		.header{
-			font-size: 32rpx;
-			padding: 30rpx;
-		}
-		.list{
-			display: flex;
-			flex-wrap: wrap;
-			view{
-				width: 50%;
-				color: #8A8A8A;
-				font-size: 28rpx;
-				box-sizing: border-box;
-				text-align: center;
-				padding: 20rpx 0;
-				border-top: 2rpx solid #FFF;
-				border-left: 2rpx solid #FFF;
-				background-color: #F7F7F7;
-				overflow: hidden;
-				white-space: nowrap;
-				text-overflow: ellipsis;
-			}
-		}
-	}
-	.wanted-circle{
-		margin-top: 30rpx;
-		.header{
-			font-size: 32rpx;
-			padding: 30rpx;
-		}
-		.list{
-			display: flex;
-			flex-wrap: wrap;
-			padding: 0 30rpx 20rpx;
-			view{
-				padding: 8rpx 30rpx;
-				margin: 20rpx 30rpx 0 0;
-				font-size: 28rpx;
-				color: #8A8A8A;
-				background-color: #F7F7F7;
-				box-sizing: border-box;
-				text-align: center;
-				border-radius: 20rpx;
-			}
-		}
-	}
-	.order-container {
-		scroll-view {
-			height: 100%;
-			overflow: scroll;
-		}	
-	}	
-	.container {
-		padding-bottom: env(safe-area-inset-bottom);
-		height: auto;
-		position: relative;
-	}
-	.tui-order-content{
-		width: 100%;
-		height: auto;
-	}
-	.tui-order-list {
-		width: 100%;
-		position: relative;
-	}
-	.tui-order-item {
-		display: flex;
-		flex-direction: column;
-		width: 702rpx;
-		padding:20rpx 24rpx 0 24rpx;
-		background: #fff;
-		border-bottom: 20rpx solid #F7F7F7;
-	}
-	.order-title{
-		width: 100%;
-		height: auto;
-		.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: 0;
-				top: 9rpx;
-			}
-			.bage-buss{
-				display: inline-block;
-				width: 72rpx;
-				height: 30rpx;
-				background:radial-gradient(circle,rgba(255,39,180,1) 0%,rgba(193,77,245,1) 100%);
-				border-radius: 4rpx;
-				line-height: 30rpx;
-				font-size: $font-size-22;
-				text-align: center;
-				color: #FFFFFF;
-			}
-			.bage-auto{
-				display: inline-block;
-				width: 72rpx;
-				height: 30rpx;
-				background:radial-gradient(circle,rgba(255,180,39,1) 0%,rgba(245,142,77,1) 100%);
-				border-radius: 4rpx;
-				line-height: 30rpx;
-				font-size: $font-size-22;
-				text-align: center;
-				color: #FFFFFF;
-			}
-			.bage-text{
-				display: inline-block;
-				font-size: $font-size-28;
-				line-height: 68rpx;
-				text-align: left;
-				color: $color-system;
-				margin-left: 10rpx;
-			}
-		}
-		.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: lef
-			}
-			.order-title-tip{
-				float: right;
-				font-size: $font-size-28;
-				line-height: 40rpx;
-				text-align: right;
-				color: #FF2A2A;
-			}
-		}
-	}
-	.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;
-			.floor-tags{
-				height: 28rpx;
-				border-radius: 6rpx;
-				background-color: #FFFFFF;
-				line-height: 28rpx;
-				color: $color-system;
-				text-align: center;
-				display: inline-block;
-				padding:0 16rpx;
-				font-size: $font-size-20;
-				border: 1px solid #E15616;
-				float: left;
-			}
-		}
-		.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{
-		display: flex;
-		align-items: center;
-		width: 100%;
-		height: 217rpx;
-		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-product{
-		width: 468rpx;
-		height: 100%;
-		line-height: 36rpx;
-		font-size: $font-size-26;	
-		position: relative;
-		.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;
-		}
-		.productprice{
-			height: 48rpx;
-			position: absolute;
-			width: 100%;
-			bottom: 0;
-			.price{
-				line-height: 48rpx;
-				font-size: $font-size-28;
-				width: 48%;
-				color: #FF2A2A;
-				float: left;
-				font-weight: bold;
-			}
-			.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;
-			.floor-tags{
-				height: 28rpx;
-				border-radius: 6rpx;
-				background-color: #FFFFFF;
-				line-height: 28rpx;
-				color: $color-system;
-				text-align: center;
-				display: inline-block;
-				padding:0 16rpx;
-				font-size: $font-size-20;
-				border: 1px solid #E15616;
-				float: left;
-			}
-		}
-	}
-	.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;
-			}
-		}
-	}
-</style>

search/pages/search/search-second.vue

@@ -1,438 +0,0 @@
-<template>
-	<view class="search-container">
-		<view class="search-main">
-			<view class="gosearch-btn">
-				<text class="iconfont icon-sousuo"></text>
-				<input class="input" maxlength="20" type="text" value="" confirm-type="search" @input="onShowClose" @focus="onFocus"  @confirm="subMitSearch()" placeholder="请输入搜索关键字" v-model.trim="name"/>
-				<text class="iconfont icon-shanchu1" v-if="isShowClose" @click.stop="delInputText()"></text>
-			</view>
-		</view>
-		<view  class="commodity-list-wrapper"  :style="{'overflow':'auto','height':(listData.length>4? windowHeight + 'px' : 'auto')}">
-			<scroll-view :style="{'height':scrollHeight+'px'}" @scrolltolower="scrolltolower" scroll-y v-if="listData.length > 0">
-				<view class="Listitem" v-for="(item, index) in listData" :key="index" :class="item.sold==1?'activeImg':''"
-				 :productid="item.productID" @click.stop="navToDetailPage(item.productID)">
-				    <view class="itemImg onhref" >
-				        <image :src="item.imageList[0]" class="bigImg"></image>
-						<image src="https://static.caimei365.com/app/img/icon/yishou.png" class="yishou_bg" v-if="item.sold==1&&item.newAdded==1||item.sold==1&&item.newAdded==0"></image>
-				    </view>
-				   <view class="ItemInfo">
-						<text class="infotag news" v-if="item.sold==0&&item.newAdded==1">新</text>
-				        <view class="productname" href="" :style="item.sold==0&&item.newAdded==1?'text-indent:60rpx':''">
-				            {{item.name}}
-				        </view>
-				        <view class="targetprice" >
-				            <text v-if="item.detailTalkFlag ==2 && hasLogin==false">￥详聊</text>
-				            <text v-else-if="!hasLogin" class="priceparam" @click.stop="this.$api.navigateTo('/pages/login/login')">登录查看价格></text>
-				            <text v-else-if="hasLogin && item.detailTalkFlag==2">￥详聊</text>
-				            <text v-else>￥{{item.price1Str}}</text>
-				        </view>
-						<view class="shijian">
-							<text class="iconfont  icon-shijian"></text> {{item.onLineDateStr}}
-						</view>
-				        <view class="dizhi">
-							<view class="dizhi_left">
-								<text class="iconfont  icon-dizhi1"></text>
-								{{item.provinceCityDistrict}}
-							</view>
-				            <view class="liulan_right">
-								<text class="iconfont  icon-kejian1"></text>
-				               {{item.viewingNum}}
-				            </view>
-				        </view>
-				    </view>
-				</view>
-				<view v-if="showLoading">
-					<view class="loading-wrapper loading-wrapper-now" v-if="loadingNow">{{loadingText}}<text v-if="loadingText === '已至底部'">‧ ‧ ‧</text></view>
-					<view class="loading-wrapper loading-wrapper-btm" v-else>———<text class="btm-text">已至底部</text>———</view>
-				</view>
-			</scroll-view>
-			<view class="empty-container" v-if="showEmpty">
-				<image class="empty-container-image" src="https://img.caimei365.com/group1/M00/03/8D/Cmis215XHXWAHCoqAAELHadZ9Xg365.png"></image>
-				<text class="error-text">抱歉，没有相关商品！</text>
-			</view>
-		</view>
-		<!-- 透明模态层 -->
-		<modal-layer v-if='isModallayer'></modal-layer>
-	</view>
-</template>
-
-<script>
-	import { mapState,mapMutations } from 'vuex'
-	import modalLayer from "@/components/modal-layer"
-	import uniGrader from '@/components/uni-grade/uni-grade.vue'
-	import authorize from '@/common/config/authorize.js'
-	
-	export default {
-		components: {
-			modalLayer,
-			uniGrader
-		},
-		data() {
-			return {
-				shopId:0,
-				userID:0,
-				themeClass: 'block',
-				show:false,
-				userIdentity:'',	
-				identity:2,
-				searchKeyType:1,
-				isShowClose:false,	//是否显示清空输入框图标
-				isSearchHistory:false,//是都显示搜索历史
-				isShowWrapper:false,
-				isModallayer:false,
-				isFocus:false,
-				priceLoading:true,
-				windowHeight: '',
-				showEmpty: false,
-				scrollHeight: '',
-				listData: [],
-				showLoading: false,
-				loadingNow: true,
-				loadingText: '上拉加载更多',
-				pullFlag: true,
-				pageNum: 1,
-				pageSize: 10,
-				secondHandType:1,
-				instrumentType:0,
-				name:'',
-				total:0,
-				hasNextPage:false
-			}
-		},
-		created() {
-			this.getListFromServer()
-		},
-		computed: {
-			...mapState(['hasLogin','userInfo'])
-		},
-		methods:{
-			subMitSearch() {//搜索
-				if (this.name == '') {
-					this.$util.msg('请输入商品关键字',2000);
-				}else{
-					this.getListFromServer()
-				}
-			},
-			getListFromServer(loadMore) {
-				this.showLoading = true;
-				this.loadingNow = true;
-				this.loadingText = '加载中';
-				this.showEmpty = false;				
-				if(loadMore) {
-					this.pageNum += 1;
-				}
-				let params = {
-						secondHandType:1,
-						instrumentType:0,
-						name:this.name,
-						pageNum:this.pageNum,
-						pageSize:this.pageSize
-				}
-				this.SecondService.SeconHandProductList(params).then(response =>{
-					this.isShowWrapper = true
-					const resData = response.data;
-					const resList = resData.results;
-					if(resList && resList.length > 0){
-						this.total = resData.totalRecord;
-						this.hasNextPage = resData.hasNextPage;
-						this.showEmpty = false;
-						if(loadMore) {
-							this.listData = [...this.listData,...resList];
-						} else {
-							this.listData = [...resList];
-						}
-						// 防上拉暴滑
-						this.pullFlag = false;
-						setTimeout(()=>{ this.pullFlag = true; },500)
-						// 底部提示文案
-						if(this.hasNextPage) {
-							this.loadingText = '上拉加载更多';
-						} else {
-							this.showLoading = true;
-							this.loadingNow = false;
-						}
-					} else {
-						if(!loadMore) {
-							this.showEmpty = true;
-						}
-					}
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000);
-				})
-			},
-			scrolltolower() {
-				if(this.hasNextPage && this.pullFlag) {
-					this.getListFromServer(true);
-				}
-			},
-			onShowClose () {//输入框失去焦点时触发
-				if(this.name != ''){
-					this.isShowClose = true;
-				}else{					
-					this.isShowClose = false
-				}
-			},
-			onFocus () { //输入框获取焦点时触发
-				this.inputEmpty(this.searchInputVal)
-			},
-			inputEmpty(val){
-				this.isShowWrapper = false
-				if(val != ''){
-					this.isShowClose = true
-				}else{					
-					this.isShowClose = false
-				}
-			},
-			delInputText () { //清除输入框内容
-				this.name = ''
-				this.isShowClose = false
-				this.isShowWrapper = false
-				this.getListFromServer()
-			},
-			keywordsClick (item) {//关键词搜索与历史搜索
-				this.name = item;
-				this.isShowClose = true;
-				this.subMitSearch();
-			},
-			navToDetailPage(id) {
-				this.isModallayer = true;
-				this.$api.navigateTo(`/second/pages/product/product-details?id=${id}`);
-				this.isModallayer = false;
-			},
-			setScrollHeight() {
-				const {windowHeight, pixelRatio} = wx.getSystemInfoSync();
-				this.windowHeight = windowHeight - 1;
-				this.scrollHeight = windowHeight - 1;
-			},
-			toLoginPage() {
-				let searchLoginType = 'search'
-				uni.navigateTo({
-					url:`/pages/login/login?type=${searchLoginType}`
-				})
-			},
-			topBubble() {//显隐搜索项
-				this.show = !this.show;
-			},
-		},
-		onShow() {
-			this.setScrollHeight();
-		}
-	}
-</script>
-
-<style lang="scss">
-	@import "@/uni.scss";
-	page{
-		background-color:#fff;
-	}
-	.search-main{
-		width: 100%;
-		height: 88rpx;
-		position: fixed;
-		top: 0;
-		left: 0;
-		background: #FFFFFF;
-		z-index: 1001;
-		box-sizing: border-box;
-		padding: 9rpx 0;
-		.gosearch-btn{
-			width: 702rpx;
-			height: 100%;
-			border-radius: 40rpx;
-			background: #F0F0F0;
-			margin: 0 auto;
-			padding:0 20rpx;
-			font-size: 28rpx;
-			line-height: 70rpx;
-			padding-left: 70rpx;
-			color: #8A8A8A;
-			background: #F7F7F7;
-			position: relative;
-			box-sizing: border-box;
-			.icon-sousuo{
-				width: 70rpx;
-				height: 70rpx;
-				line-height: 70rpx;
-				text-align: center;
-				display: block;
-				position: absolute;
-				left: 0;
-				top: 0;
-				font-size: 34rpx;
-				color: #8A8A8A;
-				z-index: 10;
-			}
-			.icon-shanchu1{
-				font-size: 36rpx;
-				color: #8A8A8A;
-				position: absolute;
-				right: 10rpx;
-				top: 0;
-				padding: 0 10rpx;
-				z-index: 100;
-			}
-			.input{
-				width: 400rpx;
-				height: 100%;
-				float: left;
-				font-size: $font-size-24;
-				box-sizing: border-box;
-				padding-right: 66rpx;
-			}
-		}
-		.search-btn{
-			width: 120rpx;
-			height: 70rpx;
-			line-height: 70rpx;
-			float: right;
-			text-align: center;
-			color: #666666;
-			font-size: $font-size-24;
-		}
-	}
-	.search-container{
-		padding-top: 96rpx;
-	}
-	.s-block{
-		background: #FFFFFF;
-		.header{
-			font-size: 32rpx;
-			padding:40rpx 24rpx 22rpx 24rpx;
-			line-height: 42rpx;
-			font-size: 30rpx;
-			font-weight: bold;
-			position: relative;
-			.icon-shanchu{
-				font-size: 36rpx;
-				color: #333333;
-				float: right;
-				padding: 0 10rpx;
-				z-index: 10;
-				font-weight: normal;
-			}
-		}
-		.list{
-			display: flex;
-			flex-wrap: wrap;
-			padding-bottom: 40rpx;
-			view{
-				color: #8A8A8A;
-				font-size: 24rpx;
-				box-sizing: border-box;
-				text-align: center;
-				height: 48rpx;
-				line-height: 48rpx;
-				border-radius: 24rpx;
-				margin:12rpx;
-				padding:.0 30rpx;
-				overflow: hidden;
-				white-space: nowrap;
-				text-overflow: ellipsis;
-				background-color: #F3F3F3;
-			}
-		}
-	}
-	.commodity-list-wrapper {
-		scroll-view {
-			height: 100%;
-			overflow: scroll;
-		}	
-		.Listitem{
-			height: 202rpx;
-			padding: 20rpx;
-			border-bottom: 2rpx solid #F0F2F4;
-			&.activeImg {
-				opacity: 0.5;
-			}
-			.itemImg {
-				width: 180rpx;
-				height: 180rpx;
-				float: left;
-				background: #000;
-				position: relative;
-				.yishou_bg{
-					width: 90rpx;
-					height: 90rpx;
-					position: absolute;
-					top: 50%;
-					left: 50%;
-					transform: translate(-50%, -50%)
-				}
-				.bigImg {
-					width: 100%;
-					height: 100%;
-				}
-			}
-			.ItemInfo {
-				float: right;
-				width:500rpx;
-				.infotag{
-					font-size: 20rpx;
-					padding: 5rpx 15rpx;
-					background: #f94b4b;
-					color: #fff;
-					position: absolute;
-					border-radius: 6rpx;
-				}
-				.productname{
-					display: inline-block;
-					font-size: 28rpx;
-					color: #333333;
-					vertical-align: top;
-					text-overflow: -o-ellipsis-lastline;
-					overflow: hidden;
-					text-overflow: ellipsis;
-					display: -webkit-box;
-					-webkit-line-clamp: 2;
-					line-clamp: 2;
-					-webkit-box-orient: vertical;
-					width: 500rpx;
-				}
-				.targetprice {
-					font-size: 26rpx;
-					color: #f94b4b;
-					cursor: pointer;
-					margin: 15rpx 0;
-				}
-				.shijian{
-					font-size: 24rpx;
-					color: #999999;
-					margin-top: 10rpx;
-					.icon-shijian{
-						font-size: 30rpx;
-						color: #999999;
-						margin-right: 10rpx;
-					}
-				}
-				.dizhi{
-					font-size: 24rpx;
-					color: #999999;
-					margin-top: 10rpx;
-					.dizhi_left{
-						float: left;
-						.icon-dizhi1{
-							font-size: 30rpx;
-							color: #999999;
-							margin-right: 10rpx;
-						}
-					}
-					.liulan_right{
-						float: right;
-						margin-right: 25rpx;
-						.icon-kejian1{
-							font-size: 30rpx;
-							color: #999999;
-							margin-right: 10rpx;
-						}
-					}
-				}
-				.shijian{
-					font-size: 24rpx;
-					color: #999999;
-					margin-top: 10rpx;
-				}
-			}
-		}
-	}
-	
-</style>

search/pages/search/search-supplier.vue

@@ -1,467 +0,0 @@
-<template>
-	<view class="container supplier clearfix">
-		<view class="supplier-search clearfix">
-			<view class="search-from name">
-				<text class="iconfont icon-sousuo"></text>
-				<input class="input" 
-					   type="text" 
-					   confirm-type="search" 
-					   v-model="listQuery.keyword" 
-					   :focus="isFocus"
-					   @input="onShowClose" 
-					   @confirm="GetSearchSupplierList()" 
-					   placeholder="请输入供应商名称" 
-					   maxlength="16"/>
-				<text class="iconfont icon-shanchu1" v-if="isShowClose" @click="delInputText()"></text>
-			</view>
-			<view class="search-btn">
-				<button class="search-btn" type="default" @click.stop="searchsupplierList">搜索</button>
-			</view>
-		</view>
-		<view class="supplier-main">
-			<view v-if="isEmpty" class="empty-container">
-				<image class="empty-container-image" :src="productNoneImage" mode="aspectFit"></image>
-				<view class="txt">暂无供应商数据^_^</view>
-			</view>
-			<view v-else class="supplier-list">
-					<view class="list clearfix" v-for="(item, index) in supplierList" :key="index">
-						<view class="list-top">
-							<view class="list-top-supplier" @click="goSupplier(item.s_id)">
-								<view class="logo"><img :src="item.s_logo" alt=""></view>
-								<view class="main">
-									<view class="name">{{ item.s_name }}</view>
-									<view class="massgs">
-										<view class="label">满意度:</view>
-										<view class="p-stars">
-											<uni-stars :stars="6" :iconClass="iconClass" :iconColor="iconColor" :fontSize="36" :widthInfo="176"></uni-stars>
-										</view>
-									</view>
-								</view>
-								<view class="right"><text class="iconfont icon-xiayibu"></text></view>
-							</view>
-							<view class="list-top-msg">
-								<view class="msg-pin clearfix">
-									<view class="label">经营品项:</view>
-									<view class="label-li" v-if="item.s_business">
-										<text class="text" v-for="(label, idx) in SetNewBusiness(item.s_business)" :key="idx">{{ label }}</text>
-									</view>
-									<view class="label-li" v-else>
-										<text class="none">暂无</text>
-									</view>
-								</view>
-								<view class="msg-pin clearfix">
-									<view class="label">所在地区:</view>
-									<view class="label-text">{{ item.s_address ? item.s_address : '暂无'}}</view>
-								</view>
-							</view>
-						</view>
-						<view class="list-bottom">
-							<view class="pros-item" v-for="(pros, pdx) in item.products" :key="pdx" @click.stop="navToDetailPage(pros.p_id)">
-								<image class="pros-item-image" :src="pros.p_image" mode="scaleToFill"></image>
-								<view class="pros-name">{{ pros.p_name }}</view>
-							</view>
-						</view>
-					</view>
-					<!--加载loadding-->
-					<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-					<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text='nomoreText'></tui-nomore>
-					<!--加载loadding-->
-			</view>
-		</view>
-	</view>  
-</template>
-
-<script>
-	import tuiLoadmore from "@/components/tui-components/loadmore/loadmore"
-	import tuiNomore from "@/components/tui-components/nomore/nomore"
-	import uniStars from '@/components/uni-stars/uni-stars.vue'
-	import authorize from '@/common/config/authorize.js'	
-	import wxLogin from "@/common/config/wxLogin.js"
-	
-	export default {
-		components:{
-			tuiLoadmore,
-			tuiNomore,
-			uniStars
-		},
-		data() {
-			return {
-				iconClass:'icon-aixin',
-				iconColor:'#ff9100',
-				serviceProviderId:'',
-				isShowClose:false,
-				isEmpty:false,
-				isFocus:true,
-				productNoneImage:'https://static.caimei365.com/app/img/icon/icon-pnone.png',
-				nomoreText: '上拉显示更多',
-				loadding: false,
-				pullUpOn: true,
-				pullFlag: true,
-				supplierList:[],
-				isIphoneX:this.$store.state.isIphoneX,
-				listQuery:{
-					keyword: '',
-					pageSize: 10,
-					pageNum: 1
-				},
-				total:0
-			}
-		},
-		onLoad(option){
-			if(option.type =='share'){
-				authorize.getSetting().then(wxResponse =>{// console.log('是否已授权',res);//0:为取消授权 1:为已授权 2:为未操作
-					console.log(wxResponse)
-					if(wxResponse == 1){
-						wxLogin.wxLoginAuthorize()
-					}else{
-						console.log(new Date +'用户未授权微信信息')
-					}
-				})	
-			}
-			if(option.keyWord){
-				console.log(option.keyWord)
-				this.listQuery.keyword = option.keyWord
-				this.GetSearchSupplierList();
-			}
-		},
-		methods: {
-			searchsupplierList(){//搜索
-				this.listQuery.pageNum=1
-				this.GetSearchSupplierList()
-			},
-			GetSearchSupplierList(){//查询供应商列表	
-				this.ShopService.GetSearchSupplierList(this.listQuery).then(response =>{
-					let data = JSON.parse(response.data)
-					let dataList = data.items
-					console.log(data)
-					this.total = data.total
-					if(dataList && dataList.length > 0){
-						this.isEmpty = false
-						this.supplierList = dataList
-						this.pullFlag = false;
-						setTimeout(()=>{this.pullFlag = true;},500)
-						if(this.total>this.supplierList.length){
-							this.pullUpOn = false
-							this.nomoreText = '上拉显示更多'
-						}else{
-							this.pullUpOn = true
-							this.loadding = false
-							this.nomoreText = '已至底部'
-						}
-					}else{
-						this.isEmpty = true
-					}
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000)
-				})
-			},	
-			GetSearchSupplierListBottomData(){//上滑加载
-				this.listQuery.pageNum+=1
-				this.ShopService.GetSupplierHomeProductList(this.listQuery).then(response =>{
-					let data = JSON.parse(response.data)
-					console.log(data)
-					this.total = data.total
-					this.supplierList = this.supplierList.concat(data.items) 
-					if(this.total>this.supplierList.length){
-						this.pullUpOn = false
-						this.nomoreText = '上拉显示更多'
-					}else{
-						this.pullUpOn = true
-						this.loadding = false
-						this.nomoreText = '已至底部'
-					}
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000)
-				})
-			},
-			onShowClose () {//输入框失去焦点时触发
-				if(this.listQuery.keyword != ''){
-					this.isShowClose = true
-				}else{					
-					this.isShowClose = false
-					this.listQuery.pageNum=1
-					this.GetSearchSupplierList()
-				}
-			},
-			delInputText(){//清除输入框内容
-				this.listQuery.keyword = ''
-				this.isShowClose = false
-				this.listQuery.pageNum=1
-				this.GetSearchSupplierList()
-			},
-			navToDetailPage(id) {//跳转商品详情页
-				this.$api.navigateTo(`/pages/goods/product?id=${id}`)
-			},
-			SetNewBusiness(value){//回显处理主营内容
-				let Array = []
-				value.split('/').forEach((item,index) =>{
-					Array.push(item)
-				})
-				return Array
-			},
-			goSupplier(value){//跳供应商资料页
-				this.$api.navigateTo('/supplier/pages/user/my-shop?shopId='+value)
-			},
-		},
-		onReachBottom() {
-			if(this.total>this.supplierList.length){
-				this.loadding = true
-				this.pullUpOn = true
-				this.GetSearchSupplierListBottomData()
-			}	
-		},
-		onShareAppMessage(res){//分享转发
-			if (res.from === 'button') {
-		      // 来自页面内转发按钮
-		    }
-			return {
-			  title: `采美正品供应商，质量有保证！`,
-			  path: `search/pages/search/search-supplier?type=share&keyWord=${this.listQuery.keyword}`
-			}
-		},
-		onShow() {
-			
-		}
-	}
-</script>
-
-<style lang='scss'>
-	page {
-		height: auto;
-	}
-	page,.container{
-		/* padding-bottom: 120upx; */
-		background: #F7F7F7;
-	}
-	.container{
-		position: relative;
-	}
-	.supplier {
-		width: 100%;
-		height: auto;
-		box-sizing: border-box;
-	}
-	.supplier-search{
-		height: 84rpx;
-		width: 100%;
-		padding:10rpx 24rpx;
-		background: #FFFFFF;
-		display: flex;
-		align-items: center;
-		position: fixed;
-		top: 0;
-		left: 0;
-		z-index: 999;
-		box-sizing: border-box;
-		.search-from{
-			width: 582rpx;
-			height: 64rpx;
-			background: #F7F7F7;
-			border-radius: 32rpx;
-			float: left;
-			position: relative;
-			.input{
-				width: 500rpx;
-				height: 64rpx;
-				float: left;
-				line-height: 64rpx;
-				color: $text-color;
-				font-size: $font-size-24;
-			}
-			.icon-sousuo{
-				width: 64rpx;
-				height: 64rpx;
-				line-height: 64rpx;
-				text-align: center;
-				display: block;
-				font-size: $font-size-38;
-				float: left;
-				color: #999999;
-			}
-			.icon-shanchu1{
-				font-size: $font-size-32;
-				color: #999999;
-				position: absolute;
-				width: 64rpx;
-				height: 64rpx;
-				line-height: 64rpx;
-				text-align: center;
-				top: 0;
-				right: 0;
-				z-index: 10;
-			}
-		}
-		.search-btn{
-			width: 120rpx;
-			line-height: 64rpx;
-			text-align: center;
-			font-size: $font-size-28;
-			color: #666666;
-			float: left;
-			background: #FFFFFF;
-		}
-	}
-	.supplier-main{
-		margin-top: 94rpx;
-	}
-	.list{
-		box-sizing: border-box;
-		padding: 0 24rpx;
-		background-color:#FFFFFF ;
-		margin-bottom: 20rpx;
-	}
-	.list-top{
-		width: 100%;
-		height: auto;
-	}
-	.list-top-msg{
-		width: 100%;
-		height: auto;
-		box-sizing: border-box;
-		padding-left: 115rpx;
-		.msg-pin{
-			width: 100%;
-			height: auto;
-			margin-bottom: 16rpx;
-			.label{
-				float: left;
-				line-height: 37rpx;
-				font-size: $font-size-26;
-				color: #999999;
-			}
-			.label-li{
-				width: 476rpx;
-				float: left;
-				line-height: 37rpx;
-				.text{
-					display: inline-block;
-					padding: 0 8rpx;
-					height: 33rpx;
-					border-radius: 6rpx;
-					background-color: #86b2fb;
-					color: #FFFFFF;
-					line-height: 33rpx;
-					float: left;
-					font-size: $font-size-20;
-					text-align: center;
-					margin: 10rpx;
-					margin-top: 5rpx;
-				}
-				.none{
-					font-size: $font-size-20;
-					color: #999999;
-				}
-			}
-			.label-text{
-				line-height: 37rpx;
-				font-size: $font-size-26;
-				color: #999999;
-				margin-left: 10rpx;
-				float: left;
-			}
-		}
-	}
-	.list-top-supplier{
-		width: 100%;
-		height: 140rpx;
-		padding: 30rpx 0 10rpx 0;
-		box-sizing: border-box;
-		background-color: #FFFFFF;
-		position: relative;
-		box-sizing: border-box;
-		.logo{
-			width: 90rpx;
-			height: 72rpx;
-			float: left;
-			border: 1px solid #efefef;
-			border-radius: 6rpx;
-			image{
-				width: 100%;
-				height: 100%;
-				display: block;
-				border-radius: 6rpx;
-			}
-		}
-		.main{
-			width: 470rpx;
-			height: 92rpx;
-			float: left;
-			margin-left: 20rpx;
-			.name{
-				width: 100%;
-				line-height: 46rpx;
-				float: left;
-				font-size: $font-size-28;
-				color: $text-color;
-				float: right;
-				overflow: hidden;
-				text-overflow:ellipsis;
-				white-space: nowrap;
-				text-align: left;
-			}
-			.massgs{
-				width: 100%;
-				line-height: 46rpx;
-				float: left;
-				font-size: $font-size-24;
-				color: #999999;
-				.label{
-					float: left;
-				}
-				.p-stars{
-					float: left;
-					margin-left: 20rpx;
-				}
-			}
-		}
-		.icon-xiayibu{
-			line-height: 154rpx;
-			display: inline-block;
-			position: absolute;
-			width: 48rpx;
-			top: 0;
-			right: 0;
-			color: #b2b2b2;
-		}
-	}
-	.list-bottom{
-		width: 100%;
-		height: auto;
-		float: left;
-		padding: 20rpx 0;
-		.pros-item{
-			width: 220rpx;
-			height: auto;
-			float: left;
-			margin-right: 20rpx;
-			&:last-child{
-				margin-right: 0;
-			}
-			.pros-item-image{
-				width: 218rpx;
-				height: 218rpx;
-				display: block;
-				float: left;
-				border: 1px solid #EBEBEB;
-				border-radius: 6rpx;
-			}
-			.pros-name{
-				width: 100%;
-				height: 54rpx;
-				line-height: 54rpx;
-				box-sizing: border-box;
-				padding: 0 10rpx;
-				font-size: $font-size-24;
-				color: #666666;
-				white-space: normal;
-				word-break: break-all;
-				overflow: hidden;
-				text-overflow: ellipsis;
-				display: -webkit-box;
-				-webkit-box-orient: vertical;
-				-webkit-line-clamp: 1;
-			}
-		}
-	}
-</style>
-

search/pages/search/search.vue

@@ -1,868 +0,0 @@
-<template>
-	<view class="search-container">
-		<view class="search-main">
-			<view class="search-tab">
-				<view class="search-tab-btn"  @click="topBubble">
-					<text>{{ tabValue }}</text>
-					<text class="iconfont icon-xiangxiajiantou"></text>
-				</view>
-				<tui-bubble-popup :show="show" :mask="true" position="absolute" direction="top" @close="topBubble" width="140rpx"
-				 left="10rpx" bottom="0rpx" translateY="100%" triangleRight="60rpx" triangleTop="-22rpx" :maskBgColor="maskBgColor">
-					<view class="tui-menu-item" @tap="selectTabs(1)">产品</view>
-					<view class="tui-menu-item" @tap="selectTabs(2)">供应商</view>
-					<view class="tui-menu-item" @tap="selectTabs(3)">项目仪器</view>
-				</tui-bubble-popup>
-			</view>
-			<view class="gosearch-btn">
-				<text class="iconfont icon-sousuo"></text>
-				<input class="input" maxlength="20" :focus="isFocus" type="text" value="" confirm-type="search" @focus="onFocus" @input="onShowClose" @confirm="subMitSearch()" placeholder="请输入搜索关键字" v-model.trim="listQuery.keyword"/>
-				<text class="iconfont icon-shanchu1" v-if="isShowClose" @click.stop="delInputText()"></text>
-			</view>
-			<view class="search-btn" @click="subMitSearch()">搜索</view>
-		</view>
-		<view class="search-container-history" v-if="!isShowWrapper">
-			<view :class="'s-' + themeClass" v-if="serachRecordList.length>0">
-				<view class="header">
-					搜索历史<text class="iconfont icon-shanchu" @click="confirmDetele"></text>
-				</view>
-				<view class="list">
-					<view class="list-main">
-						<view v-for="(item,index) in serachRecordList" :key="index" @click="keywordsClick(item.searchWord)">{{item.searchWord}}</view>
-					</view>
-				</view>
-			</view>
-			<view class="s-block hot clearfix">
-				<view class="header">热门搜索</view>
-				<view class="list">
-					<view class="list-title">产品</view>
-					<view class="list-main">
-						<view v-for="(item,index) in productHotSearch" :key="index" @click="keywordsClickPath(item)" :class="item.isHot == '1' ? 'list-active' : ''">
-							{{item.name}}
-							<text class="iconfont icon-resou" v-if="item.isHot === '1'"></text>
-						</view>
-					</view>
-				</view>
-				<view class="list">
-					<view class="list-title">仪器</view>
-					<view class="list-main">
-						<view v-for="(item,index) in instrumentHotSearch" :key="index" @click="keywordsClickPath(item)" :class="item.isHot == '1' ? 'list-active' : ''">
-							{{item.name}}
-							<text class="iconfont icon-resou" v-if="item.isHot === '1'"></text>
-						</view>
-					</view>
-				</view>
-			</view>
-		</view>
-		<view v-else class="commodity-list-wrapper"  :style="{'overflow':'auto','height':(listData.length>4? windowHeight + 'px' : 'auto')}">
-			<scroll-view :style="{'height':(listData.length>4? scrollHeight+'px' : 'auto')}" @scrolltolower="scrolltolower" scroll-y v-if="!showEmpty">
-				<view v-for="(item,index) in listData" :key="index" :id="item.id" class="all-type-list-content commodity-list" @click.stop="navToDetailPage(item.p_id)">
-					<image mode='widthFix' :src="item.p_image"  class="list-img" alt="list-img"></image>
-					<view class="list-details-info">
-						<view class="list-details-title">
-							<text class="mclap-tag" v-if="item.p_act_flag == '1'">美博会</text>
-							<text class="mclap" :class="item.p_act_flag =='1' ? 'indent' : ''">{{isInterceptHtmlFn(item.p_name)}}</text>
-						</view>
-						<text class="list-details-specs">规格：{{item.p_unit}}</text>
-						<view class="list-details-specs" v-if="item.p_code!=''&&item.p_code!=null">
-							<view>商品编码：{{item.p_code}}</view>
-						</view>
-						<view class="list-details-price">
-							<template v-if="userIdentity == 3">
-								<view class="floor-item-act" v-if="item.actStatus==1">
-									<view class="floor-tags" v-if="PromotionsFormat(item.promotions)">
-										{{item.promotions.name}}<text v-if="item.p_price_flag != '1' && item.supplierId === shopId">:￥{{ item.price | NumFormat }}</text>
-									</view>
-									<view class="floor-tags" v-else>{{item.promotions.name}}</view>	
-								</view>
-								<view class="floor-item-act" v-if="item.actStatus ==0  &&  item.ladderPriceFlag==1">
-									<view class="floor-tags">阶梯价格</view>	
-								</view>
-							</template>
-							<template v-else>
-								<view class="floor-item-act" v-if="item.actStatus==1">
-									<view class="floor-tags" v-if="PromotionsFormat(item.promotions)">
-										{{item.promotions.name}}<text v-if="hasLogin && item.p_price_flag != '1'">:￥{{ item.price | NumFormat }}</text>
-									</view>
-									<view class="floor-tags" v-else>{{item.promotions.name}}</view>	
-								</view>
-								<view class="floor-item-act" v-if="item.actStatus ==0  &&  item.ladderPriceFlag==1">
-									<view class="floor-tags">阶梯价格</view>	
-								</view>
-							</template>
-							<view v-if="hasLogin" class="list-price">
-								<template v-if="userIdentity == 1">
-									<text v-if="priceLoading" class="price-larger small">正在获取价格...</text>
-									<text v-else class="price-larger" :class="PromotionsFormat(item.promotions) ? 'none' : ''">
-										￥{{ (PromotionsFormat(item.promotions) ? item.originalPrice : item.price) | NumFormat}}
-									</text>
-								</template>	
-								<template v-if="userIdentity == 4">
-									<view class="price-larger" v-if="item.p_price_flag == '1'">
-										<text class="txt">￥未公开价格</text>
-									</view>
-									<text v-else-if="priceLoading" class="price-larger small">正在获取价格...</text>
-									<view v-else>
-										<view class="price-larger" v-if="item.p_price_flag == '2'">
-											<text class="txt">￥价格仅会员可见</text>
-										</view>
-										<text v-else class="price-larger" :class="PromotionsFormat(item.promotions) ? 'none' : ''">
-											￥{{ (PromotionsFormat(item.promotions) ? item.originalPrice : item.price) | NumFormat}}
-										</text>
-									</view>
-								</template>
-								<template v-if="userIdentity == 3">
-									<template v-if="item.supplierId == shopId">
-										<view class="price-larger" v-if="item.p_price_flag == '1'">
-											<text class="txt">￥未公开价格</text>
-										</view>
-										<text v-else-if="priceLoading" class="price-larger small">正在获取价格...</text>
-										<text v-else class="price-larger" :class="PromotionsFormat(item.promotions) ? 'none' : ''">
-											￥{{ (PromotionsFormat(item.promotions) ? item.originalPrice : item.price) | NumFormat}}
-										</text>
-									</template>
-									<template v-else>
-										<view  class="list-login-now">
-											<text class="p-no">￥</text>
-											<uni-grader :grade="Number(item.p_price_grade)"></uni-grader>
-										</view>
-									</template>
-								</template>
-								<template v-if="userIdentity == 2">
-									<view class="price-larger" v-if="item.p_price_flag == '1'">
-										<text class="txt">￥未公开价格</text>
-									</view>
-									<text v-else-if="priceLoading" class="price-larger small">正在获取价格...</text>
-									<text v-else class="price-larger" :class="PromotionsFormat(item.promotions) ? 'none' : ''">
-										￥{{ (PromotionsFormat(item.promotions) ? item.originalPrice : item.price) | NumFormat}}
-									</text>
-								</template>
-							</view>	
-							<view  v-else class="list-login-now">
-								<text class="p-no">￥</text>
-								<uni-grader :grade="Number(item.p_price_grade)"></uni-grader>
-							</view>
-						</view>
-					</view>
-				</view>
-				<view v-if="showLoading && listData.length > 4">
-					<view class="loading-wrapper loading-wrapper-now" v-if="loadingNow">{{loadingText}}<text v-if="loadingText === '已至底部'">‧ ‧ ‧</text></view>
-					<view class="loading-wrapper loading-wrapper-btm" v-else>———<text class="btm-text">已至底部</text>———</view>
-				</view>
-			</scroll-view>
-			<view class="empty-container" v-if="showEmpty">
-				<image class="empty-container-image" src="https://img.caimei365.com/group1/M00/03/8D/Cmis215XHXWAHCoqAAELHadZ9Xg365.png"></image>
-				<text class="error-text">抱歉，没有相关商品！</text>
-			</view>
-		</view>
-		<!-- 透明模态层 -->
-		<modal-layer v-if='isModallayer'></modal-layer>
-	</view>
-</template>
-
-<script>
-	import { mapState,mapMutations } from 'vuex'
-	import modalLayer from "@/components/modal-layer"
-	import uniGrader from '@/components/uni-grade/uni-grade.vue'
-	import authorize from '@/common/config/authorize.js'
-	import wxLogin from "@/common/config/wxLogin.js"
-	
-	export default {
-		components: {
-			modalLayer,
-			uniGrader
-		},
-		data() {
-			return {
-				shopId:0,
-				userID:0,
-				tabValue:'产品',
-				themeClass: 'block',
-				show:false,
-				userIdentity:'',	
-				searchKeyType:1,
-				isShowClose:false,	//是否显示清空输入框图标
-				isSearchHistory:false,//是都显示搜索历史
-				serachRecordList:[],//历史搜索记录
-				instrumentHotSearch:[],
-				productHotSearch:[],
-				isShowWrapper:false,
-				isModallayer:false,
-				isFocus:false,
-				priceLoading:true,
-				windowHeight: '',
-				showEmpty: false,
-				scrollHeight: '',
-				listData: [],
-				productIds:'',//查询价格的商品ID
-				showLoading: false,
-				loadingNow: true,
-				loadingText: '上拉加载更多',
-				pullFlag: true,
-				listQuery:{
-					identity:0,
-					keyword:'',
-					sortField:'',
-					sortType:'',
-					pageNum: 1,
-					pageSize: 20,
-				},
-				total:0
-			}
-		},
-		onLoad(option) {
-			console.log(option)
-			if(option.type =='share'){
-				authorize.getSetting().then(wxResponse =>{// console.log('是否已授权',res);//0:为取消授权 1:为已授权 2:为未操作
-					console.log(wxResponse)
-					if(wxResponse == 1){
-						wxLogin.wxLoginAuthorize()
-					}else{
-						console.log(new Date +'用户未授权微信信息')
-					}
-				})	
-			}
-			this.$api.getStorage().then((resolve) =>{
-				this.userID = resolve.userID ? resolve.userID : 0;
-				this.shopId = resolve.shopID ? resolve.shopID : 0;
-				this.userIdentity = resolve.userIdentity;
-				this.listQuery.identity = this.identity;
-				if(option.keyWord){
-					this.listQuery.keyword = option.keyWord
-					this.setSearchHistoryAdd()
-					this.getListFromServer()
-					this.isFocus = false
-				}else{
-					this.isFocus = true
-					this.initGetSerachRecord()
-				}
-			})	
-		},
-		filters: {
-			NumFormat:function(text) {//处理金额
-				return Number(text).toFixed(2);
-			},
-		},
-		computed: {
-			...mapState(['hasLogin','userInfo','identity'])
-		},
-		methods:{
-			GetHomeHotSearchTerms(){//金刚区分类
-				this.CommonService.GetHomeHotSearchTerms({}).then(response =>{
-					let data = response.data
-					console.log(data)
-					this.instrumentHotSearch = data.instrumentHotSearch
-					this.productHotSearch = data.productHotSearch
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000)
-				})
-			},
-			initGetSerachRecord(){//查询搜索历史记录
-				this.ProductService.GetProductSearchHistory({userId:this.userID}).then(response =>{
-					if(response.code == 0){
-						this.serachRecordList = response.data
-					}
-				})
-			},
-			subMitSearch() {//搜索
-				if (this.listQuery.keyword == '') {
-					this.$util.msg('请输入搜索关键词',2000);
-				}else{
-					switch(this.searchKeyType){
-						case 1:
-							this.listData =[]
-							this.setSearchHistoryAdd()
-							this.getListFromServer()
-							this.isFocus = false
-							break;
-						case 2:
-							this.setSearchHistoryAdd()
-							this.$api.navigateTo(`/search/pages/search/search-supplier?keyWord=${this.listQuery.keyword}`);
-							break;
-						case 3:
-							this.setSearchHistoryAdd()
-							this.$api.navigateTo(`/search/pages/search/search-instrument?keyWord=${this.listQuery.keyword}`);
-							break;
-					}
-				}
-			},
-			scrolltolower() {
-				if(this.total>this.listData.length && this.pullFlag) {
-					this.getListFromServer(true);
-				}
-			},
-			getListFromServer(loadMore) {
-				this.showLoading = true;
-				this.loadingNow = true;
-				this.loadingText = '加载中';
-				this.showEmpty = false;				
-				if(loadMore) {
-					this.listQuery.pageNum += 1;
-				}
-				this.ProductService.GetProductSearchList(this.listQuery).then(response =>{
-					this.isShowWrapper = true
-					const resData = JSON.parse(response.data);
-					const resList = resData.items;
-					if(resList && resList.length > 0){
-						this.total = resData.total;
-						this.showEmpty = false;
-						if(loadMore) {
-							this.listData = [...this.listData,...resList];
-							this.getProductPrice()
-						} else {
-							this.listData = [...resList];
-							this.getProductPrice()
-						}
-						// 防上拉暴滑
-						this.pullFlag = false;
-						setTimeout(()=>{ this.pullFlag = true; },500)
-						// 底部提示文案
-						if(this.totalPage>this.listData.length) {
-							this.loadingText = '上拉加载更多';
-						} else {
-							this.showLoading = true;
-							this.loadingNow = false;
-						}
-					} else {
-						if(!loadMore) {
-							this.showEmpty = true;
-						}
-					}
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000);
-				})
-			},
-			setSearchHistoryAdd(){//添加搜索记录
-				if (!this.hasLogin) {return false;}
-				this.ProductService.GetAddProductSearchHistory({userId: this.userID,keyword:this.listQuery.keyword}).then(response =>{
-					//此为每次搜索同时添加用户的搜索记录
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000);
-				})
-			},
-			getProductPrice(){//获取价格
-				let productIdArr = [];
-				this.listData.map(item=>{// 0公开价格 1不公开价格 2仅对会员机构公开
-					productIdArr.push(item.p_id)
-				})
-				this.productIds = productIdArr.join(",");
-				this.ProductService.querySearchProductPrice({userId: this.userID,productIds:this.productIds}).then(response =>{
-					if (response.data) {
-						this.listData = this.ReturnNewProducts(this.listData,response.data);
-					}
-					this.priceLoading = false;
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000)
-				})
-			},
-			ReturnNewProducts(Array,list){//处理对应商品ID的商品价格
-				let NewArray = []
-				Array.map(item=>{
-					for (let i = 0; i < list.length; i++) {
-						if( item.p_id == list[i].productId ){
-							NewArray.push(Object.assign(item,list[i])) 
-						}
-					}
-				});
-				return NewArray
-			},
-			PromotionsFormat(promo){//促销活动类型数据处理
-				if(promo!=null){
-					if(promo.type == 1 && promo.mode == 1){
-						return true
-					}else{
-						return false
-					}
-				}
-				return false
-			},
-			onShowClose () {//输入框输入时触发
-				this.inputEmpty(this.listQuery.keyword)
-			},
-			onFocus () { //输入框获取焦点时触发
-				this.inputEmpty(this.listQuery.keyword)
-				this.initGetSerachRecord()
-			},
-			delInputText () { //清除输入框内容
-				this.listQuery.keyword = ''
-				this.isShowClose = false
-				this.isShowWrapper = false
-				this.inputEmpty(this.listQuery.keyword)
-				this.initGetSerachRecord()
-			},
-			keywordsClick (item) {//关键词搜索与历史搜索
-				this.listQuery.keyword = item;
-				this.isShowClose = true;
-				this.isFocus = false
-				this.subMitSearch();
-			},
-			keywordsClickPath(item){
-				this.$api.FlooryNavigateTo(item)
-			},
-			confirmDetele() {//清空历史记录
-				this.$util.modal('提示','确定删除历史记录？','确定','取消',true,() =>{
-					this.ProductService.GetDeleteProductSearchHistory({userId:this.userID}).then(response =>{
-						this.$util.msg('删除成功',2000,true,'success')
-						this.serachRecordList=[];
-					}).catch(error =>{
-						this.$util.msg(error.msg,2000)
-					})
-				})
-			},
-			inputEmpty(val){
-				this.isShowWrapper = false
-				if(val != ''){
-					this.isShowClose = true
-					this.isFocus = true
-				}else{					
-					this.isShowClose = false
-					this.isFocus = true
-				}
-			},
-			isInterceptHtmlFn(text){
-				let name = this.$reg.interceptHtmlFn(text)
-				return name
-			},
-			navToDetailPage(id) {
-				this.isModallayer = true;
-				this.$api.navigateTo(`/pages/goods/product?id=${id}`);
-				this.isModallayer = false;
-			},
-			setScrollHeight() {
-				const {windowHeight, pixelRatio} = wx.getSystemInfoSync();
-				this.windowHeight = windowHeight - 1;
-				this.scrollHeight = windowHeight - 1;
-			},
-			toLoginPage() {
-				let searchLoginType = 'search'
-				uni.navigateTo({
-					url:`/pages/login/login?type=${searchLoginType}`
-				})
-			},
-			selectTabs(index){//选择搜索项
-				this.show = false
-				this.searchKeyType = index
-				switch(index){
-					case 1:
-						this.tabValue='产品'
-						break;
-					case 2:
-						this.tabValue='供应商'
-						break;
-					case 3:
-						this.tabValue='项目仪器'
-						break;
-				}
-			},
-			topBubble() {//显隐搜索项
-				this.show = !this.show;
-			},
-		},
-		onShareAppMessage(res){//分享转发
-			if (res.from === 'button') {
-		      // 来自页面内转发按钮
-		    }
-			return {
-			  title: `点击查看“${this.listQuery.keyword}”相关的商品`,
-			  path: `search/pages/search/search?type=share&keyWord=${this.listQuery.keyword}`
-			}
-		},
-		onShow() {
-			this.setScrollHeight();
-			this.GetHomeHotSearchTerms()
-		}
-	}
-</script>
-
-<style lang="scss">
-	@import "@/uni.scss";
-	page{
-		background-color: #F7F7F7 !important;
-	}
-	.search-main{
-		width: 100%;
-		height: 88rpx;
-		position: fixed;
-		top: 0;
-		left: 0;
-		background: #FFFFFF;
-		z-index: 1001;
-		box-sizing: border-box;
-		padding: 9rpx 0;
-		.search-tab{
-			width: 160rpx;
-			height: 70rpx;
-			line-height: 70rpx;
-			color: #666666;
-			font-size: $font-size-24;
-			text-align: center;
-			float: left;
-			position: relative;
-			.icon-xiangxiajiantou{
-				margin-left: 10rpx;
-				font-size: $font-size-30;
-			}
-		}
-		.gosearch-btn{
-			width: 470rpx;
-			height: 100%;
-			float: left;
-			border-radius: 40rpx;
-			background: #F0F0F0;
-			margin: 0 auto;
-			padding:0 20rpx;
-			font-size: 28rpx;
-			line-height: 70rpx;
-			padding-left: 70rpx;
-			color: #8A8A8A;
-			background: #F7F7F7;
-			position: relative;
-			box-sizing: border-box;
-			.icon-sousuo{
-				width: 70rpx;
-				height: 70rpx;
-				line-height: 70rpx;
-				text-align: center;
-				display: block;
-				position: absolute;
-				left: 0;
-				top: 0;
-				font-size: 34rpx;
-				color: #8A8A8A;
-				z-index: 10;
-			}
-			.icon-shanchu1{
-				font-size: 36rpx;
-				color: #8A8A8A;
-				position: absolute;
-				right: 10rpx;
-				top: 0;
-				padding: 0 10rpx;
-				z-index: 100;
-			}
-			.input{
-				width: 400rpx;
-				height: 100%;
-				float: left;
-				font-size: $font-size-24;
-				box-sizing: border-box;
-				padding-right: 66rpx;
-			}
-		}
-		.search-btn{
-			width: 120rpx;
-			height: 70rpx;
-			line-height: 70rpx;
-			float: right;
-			text-align: center;
-			color: #666666;
-			font-size: $font-size-24;
-		}
-	}
-	.search-container{
-		padding-top: 96rpx;
-	}
-	.s-block{
-		background: #FFFFFF;
-		&.hot{
-			border-top: 20rpx solid #F7F7F7;
-		}
-		.header{
-			font-size: 32rpx;
-			padding:40rpx 24rpx 22rpx 24rpx;
-			line-height: 42rpx;
-			font-size: 30rpx;
-			font-weight: bold;
-			position: relative;
-			width: 100%;
-			float: left;
-			box-sizing: border-box;
-			.icon-shanchu{
-				font-size: 36rpx;
-				color: #333333;
-				float: right;
-				padding: 0 10rpx;
-				z-index: 10;
-				font-weight: normal;
-			}
-		}
-		.list{
-			width: 100%;
-			height: auot;
-			float: left;
-			padding: 0 24rpx 30rpx 24rpx;
-			box-sizing: border-box;
-			.list-title{
-				width: 100%;
-				height: 40rpx;
-				font-size: $font-size-26;
-				color: #333;
-			}
-			.list-main{
-				width: 100%;
-				float: left;
-				display: flex;
-				flex-wrap: wrap;
-				view{
-					color: #8A8A8A;
-					font-size: 24rpx;
-					box-sizing: border-box;
-					text-align: center;
-					height: 48rpx;
-					line-height: 48rpx;
-					border-radius: 24rpx;
-					margin:12rpx 12rpx 12rpx 0;
-					padding:.0 20rpx;
-					white-space: nowrap;
-					text-overflow: ellipsis;
-					background-color: #F3F3F3;
-					.iconfont{
-						font-size: $font-size-30;
-						color: #e15616;
-						margin-left: 12rpx;
-					}
-					&.list-active{
-						background-color: #fef6f3;
-						color: #e15616;
-					}
-				}
-			}
-		}
-	}
-	.s-circle{
-		margin-top: 30rpx;
-		.header{
-			font-size: 32rpx;
-			padding: 30rpx;
-			border-bottom: 2rpx solid #F9F9F9;
-			position: relative;
-			image{
-				width: 36rpx;
-				height: 36rpx;
-				padding: 10rpx;
-				position: absolute;
-				right: 40rpx;
-				top: 24rpx;
-			}
-		}
-		.list{
-			display: flex;
-			flex-wrap: wrap;
-			padding: 0 30rpx 20rpx;
-			view{
-				padding: 8rpx 30rpx;
-				margin: 20rpx 30rpx 0 0;
-				font-size: 28rpx;
-				color: #8A8A8A;
-				background-color: #F7F7F7;
-				box-sizing: border-box;
-				text-align: center;
-				border-radius: 20rpx;
-			}
-		}
-	}
-	.wanted-block{
-		margin-top: 30rpx;
-		.header{
-			font-size: 32rpx;
-			padding: 30rpx;
-		}
-		.list{
-			display: flex;
-			flex-wrap: wrap;
-			view{
-				width: 50%;
-				color: #8A8A8A;
-				font-size: 28rpx;
-				box-sizing: border-box;
-				text-align: center;
-				padding: 20rpx 0;
-				border-top: 2rpx solid #FFF;
-				border-left: 2rpx solid #FFF;
-				background-color: #F7F7F7;
-				overflow: hidden;
-				white-space: nowrap;
-				text-overflow: ellipsis;
-			}
-		}
-	}
-	.wanted-circle{
-		margin-top: 30rpx;
-		.header{
-			font-size: 32rpx;
-			padding: 30rpx;
-		}
-		.list{
-			display: flex;
-			flex-wrap: wrap;
-			padding: 0 30rpx 20rpx;
-			view{
-				padding: 8rpx 30rpx;
-				margin: 20rpx 30rpx 0 0;
-				font-size: 28rpx;
-				color: #8A8A8A;
-				background-color: #F7F7F7;
-				box-sizing: border-box;
-				text-align: center;
-				border-radius: 20rpx;
-			}
-		}
-	}
-	.commodity-list-wrapper {
-		scroll-view {
-			height: 100%;
-			overflow: scroll;
-		}	
-		.empty-container-image {
-			margin-top: -300rpx;
-		}
-		.toIndexPage {
-			bottom: 390rpx;
-		}
-		.show-more-btn {
-			width: 276rpx;
-			height: 52rpx;
-			line-height: 52rpx;
-			border: 2rpx solid #D8D8D8;
-			background: #F7F7F7;
-			font-size: 26rpx;
-			margin: 26rpx 0;
-			position: absolute;
-			left: 50%;
-			margin-left: -138rpx;
-		}
-	}
-	.all-type-list-content {
-		height: 216rpx;
-		padding: 24rpx;
-		background: #fff;
-		margin-bottom: 2rpx;
-		display: flex;
-		flex-direction: row;
-		box-sizing: content-box;
-		.list-img {
-			width: 210rpx;
-			height: 218rpx !important;
-			margin-right: 26rpx;
-			border-radius: 10rpx;
-			border: 2rpx solid #f3f3f3;
-		}
-	}
-	.list-details-info {
-		width: 466rpx;
-		display: flex;
-		flex-direction: column;
-		font-size: 26rpx;
-		position: relative;
-		.list-details-title {
-			position: relative;
-			.mclap{
-				line-height: 38rpx;
-				text-overflow: ellipsis;
-				overflow: hidden;
-				display: -webkit-box;
-				-webkit-line-clamp: 2;
-				line-clamp: 2;
-				-webkit-box-orient: vertical;
-				&.indent{
-					text-indent: 95rpx;
-				}
-			}
-			.mclap-tag{
-				display: block;
-				width: 84rpx;
-				height: 32rpx;
-				background-image: linear-gradient(270deg, #f9c023 0%, #f83600 100%);
-				border-radius: 4rpx 48rpx 4px 4px;
-				line-height: 32rpx;
-				font-size: $font-size-22;
-				color: #FFFFFF;
-				text-align: center;
-				position: absolute;
-				left: 0;
-				top: 0;
-			}
-		}
-		.list-details-specs {
-			margin-top: 8rpx;
-			color: #666666;
-		}
-		.list-details-miniQuantity {
-			margin-top: 7rpx;
-		}
-	}
-	.list-details-price {
-		width: 100%;
-		height: 54rpx;
-		line-height: 54rpx;
-		position: absolute;
-		bottom: -10rpx;
-		right: 0;
-		.floor-item-act{
-			height: 54rpx;
-			text-align: center;
-			box-sizing: border-box;
-			float: right;
-			.floor-tags{
-				height: 28rpx;
-				border-radius: 6rpx;
-				background-color: #FFFFFF;
-				line-height: 28rpx;
-				color: $color-system;
-				text-align: center;
-				display: inline-block;
-				padding:0 16rpx;
-				font-size: $font-size-20;
-				margin-left: 15rpx;
-				margin-top:15rpx;
-				border: 1px solid #E15616;
-				float: right;
-			}
-		}
-		.price-icon {
-			width: 22rpx;
-			height: 28rpx;
-			vertical-align: middle;
-			margin-right: 10rpx;
-		}
-		.price-icon + text {
-			font-size: 25rpx;
-			vertical-align: middle;
-		}
-		.list-login-now {
-			color: #F8C499;
-			float: left;
-			line-height: 54rpx;
-			.p-no{
-				float: left;
-				font-size: $font-size-24;
-				color: $text-color;
-			}
-		}
-		.login-now {
-			padding: 10rpx 10rpx 10rpx 0;
-		}
-		.list-price {
-			color: #FF2A2A;
-			height: 44rpx;
-			float: left;
-			.price-larger {
-				width: 100%;
-				font-size: 32rpx;
-				&.none{
-					text-decoration: line-through;
-					color: #999999;
-				}
-				&.small{
-					font-size: $font-size-24;
-				}
-				.txt{
-					font-size: $font-size-24;
-					display: inline-block;
-					line-height: 44rpx;
-					text-align: left;
-					float: left;
-				}
-			}
-		}
-	}
-</style>

second/pages/form/form.vue

@@ -1,934 +0,0 @@
-<template name="secondHandrelease">
-	<view class="fleaMarketForm">
-	     <view class="bannerimg"><image src="https://static.caimei365.com/app/img/bg/secondbg.jpg"></image></view>
-	      <view class="my-maintenance" >
-	            <view class="newsTitle">
-					<view class="nestext">欢迎您来到采美365网二手商品市场，您可以在这里发布二手设备/产品信息，每个商品需要收取您100元的展示费，展示期为6个月； 为了完整展示您的商品，请您认真填写以下内容，谢谢合作</view>
-	             </view>
-				 <form>
-					 <view class="row fenlei"> 
-						 <view class="label">分类</view>
-						 <view class="secondradio">
-							  <radio-group class="row-group" @change="secondHandRidio" >
-							  	<label class="row-input" v-for="(item, index) in fenlei" :key="index">
-									<radio class="row-radio" :value="item.value" color="#E15616"/>
-							  		<view class="row-text">{{item.name}}</view>
-							  	</label>
-							  </radio-group>
-						  </view>
-						  <view class="secondradio Secondary"  v-if="isShow" >
-							  <checkbox-group class="row-group" @change="secondHandType">
-									<label class="row-input" v-for="(item, index) in radioList" :key="item.value" >
-										<checkbox class="row-check" :value="item.value" ></checkbox>
-										<view class="row-text">{{item.name}}</view>
-									</label>
-							  </checkbox-group>
-						  </view>
-						  <view class="linqi_text" v-show="secondParams.secondHandType==2">
-							  <view class="jiaobiao"></view>
-							  <p class="p">临期产品是指临近保质期的产品，距离到期日最好在6个月以上</p>
-						  </view>
-					 </view>
-					 <view class="row">
-						<view class="label">商品品牌</view>
-						<view class="select spacing"  @click="hanldOperationConfim">
-							 <view class="placeholder" :style="brandname=='请选择品牌名称'?'':'color:#333333'">{{brandname}}</view>
-						</view>
-						<text class="iconfont icon-xiayibu"></text>
-						<!-- 品牌弹窗 -->
-						<tui-bottom-popup :radius="true" :show="popupShow" @close="hidePopup()">
-							<view class="tui-popup-box clearfix">
-								<text class="iconfont  icon-iconfontguanbi"  @click="hidePopup()"></text>
-								<view class="content">
-									<view class="freight-radio">
-										 <scroll-view scroll-y style="max-height: 605rpx;">
-											<radio-group class="row-group" @change="radioChange" >
-												<label class="row-input" v-for="(item, index) in BrandList" :key="item.id">
-													<view class="row-text">{{item.name}}</view>
-													<radio class="row-radio" :value="item.id"  color="#E15616"/>
-												</label>
-											</radio-group>
-										</scroll-view>
-									</view>
-								</view>
-							</view>	
-						</tui-bottom-popup>	
-					 </view>
-					 <view class="row" v-if="secondParams.brandID==161">
-						 <view class="label">其它品牌</view>
-						 <view class="spacing">
-							 <input type="text" maxlength="40" v-model="secondParams.brandName" placeholder="请输入商品品牌" placeholder-class="placeholder">
-						 </view>
-					 </view>
-					 <view class="row">
-						 <view class="label">商品名称</view>
-						 <view class="spacing">
-							 <input type="text" maxlength="40"  v-model="secondParams.name" placeholder="请输入商品名称，不超过40个汉字" placeholder-class="placeholder">
-						 </view>
-					 </view>
-					 <view class="row">
-						 <view class="label">出厂日期</view>
-						 <view class="spacing">
-							<input type="text" v-model="secondParams.fixedYears"  maxlength="10" placeholder="请输入出厂日期 如：2020年06月" placeholder-class="placeholder">
-						 </view>
-					 </view>
-					 <!-- <view class="row"  v-show="secondParams.secondHandType==2">
-						 <view class="label second">产品到期日</view>
-						 <view class="spacing second">
-							<input type="text"  v-model="secondParams.maturityYears" maxlength="10" placeholder="请输入产品到期日，如：2020年12月" placeholder-class="placeholder">
-						 </view>
-					 </view> -->
-					 <view class="row">
-						 <view class="label">公司名称</view>
-						 <view class="spacing">
-							 <input type="text"  v-model="secondParams.companyName"  maxlength="30" placeholder="请输入公司名称，不超过30个汉字" placeholder-class="placeholder">
-						 </view>
-					 </view>
-					 <view class="row">
-						 <view class="label">交易价</view>
-						 <view class="spacing">
-							 <input type="text" maxlength="20" v-model="secondParams.price1"  placeholder="请输入交易价" placeholder-class="placeholder">
-						 </view>
-					 </view>
-					 <view style="margin-top: 15rpx;">
-						 <label  v-model="secondParams.detailTalkFlags" class="iconfont xiangliao"
-						 :class="vShow_detailTalkFlag ? 'icon-jiagexiangliao':'icon-juxingweigouxuan'" @click="Detailed($event)">
-							<label class='pricecolor' >价格详聊</label>
-						 </label>
-						 <label class="showflag" v-show="vShow_detailTalkFlag">(勾选代表同意不显示交易价)</label>
-					 </view>
-					<!-- <view class="row" v-show="secondParams.secondHandType==2">
-						 <view class="label">市场价</view>
-						 <view class="spacing">
-							  <input type="text"  v-model="secondParams.normalPrice" maxlength="30" placeholder="请输入市场价" placeholder-class="placeholder">
-						 </view>
-					 </view> -->
-					<!-- <view class="row"  v-show="secondParams.secondHandType==2">
-						 <view class="label second">采购价/原价</view>
-						 <view class="spacing second">
-							  <input type="text"  v-model="secondParams.originalPrice" maxlength="30" placeholder="请输入采购价/原价" placeholder-class="placeholder"/>
-						 </view>
-					 </view>
-					 <view class="row" v-show="secondParams.secondHandType==2">
-						 <view class="label">数量</view>
-						 <view class="spacing"> 
-							  <input type="text"   v-model="secondParams.stock" maxlength="30"  placeholder="请输入数量" placeholder-class="placeholder">
-						 </view>
-					 </view> -->
-					 <view class="row">
-						 <view class="label">商品成色</view>
-						 <view class="spacing">
-						     <input type="text" maxlength="10"  v-model="secondParams.productQuality"  placeholder="请输入商品成色，如“9成新”" placeholder-class="placeholder">
-					    </view> 
-					 </view>
-					 <view class="row">
-						 <view class="label">联系人</view>
-						 <view class="spacing">
-							  <input type="text" maxlength="15" v-model="secondParams.contactName" placeholder="请输入联系人姓名" placeholder-class="placeholder">
-					    </view> 
-					 </view>
-					 <view class="row">
-						 <view class="label">联系方式</view>
-						 <view class="spacing">
-							 <input type="text"  v-model="secondParams.contactMobile" maxlength="11" placeholder="请输入联系人手机号" placeholder-class="placeholder">
-					    </view> 
-					 </view>
-					 <view class="row">
-						 <view class="label">采美对接人</view>
-						 <view class="spacing">
-							 <input type="text"  v-model="secondParams.dockingPeopleName" maxlength="15" placeholder="请输入采美对接人姓名" placeholder-class="placeholder">
-					    </view> 
-					 </view>
-					 <view class="row">
-						 <view class="label">对接人联系方式</view>
-						 <view class="spacing">
-							 <input type="text"  v-model="secondParams.dockingPeopleMobile" maxlength="11" placeholder="请输入采美对接人手机号" placeholder-class="placeholder">
-					    </view> 
-					 </view>
-					 <view class="row">
-						 <view class="label">商品类型</view>
-						 <view class="secondradio">
-							 <radio-group class="row-group" @change="getProductType" >
-							 	<label class="row-input" v-for="(item, index) in beauty" :key="index">
-							 		<radio class="row-radio" :value="item.value" color="#E15616"/>
-							 		<view class="row-text">{{item.name}}</view>
-							 	</label>
-							 </radio-group>
-						 </view>
-					 </view>
-					<view class="row" >
-						 <view class="label">联系地址</view>
-						 <view class="spacing"  @click="showMulLinkageThreePicker">
-							 <text class="row-input" :class="addressData.address === '请选择所在地区' ? 'none,placeholder' : ''"  >
-							 	{{addressData.address}}
-							 </text>		
-					    </view> 
-						<text class="iconfont icon-xiayibu"></text>
-					 </view>
-					 <textarea type="text"  class="border-grey address-details" v-model="secondParams.address" maxlength="50"
-						placeholder="请填写详细地址，如街道/小区/门牌等"  placeholder-class="placeholder"/></textarea>
-					<view class="release-main-container">
-						<view class="release-from">
-							<view class="label">商品图片</view>
-								<view class="release-input upload image uploadGoodsImages" >
-									<view class="upload-file" v-if="GoodsImagesList.length<5">
-										<i class="iconfont icon-shangchuantupian"></i>
-										<p class="add-text">商品图片</p>
-										<view ref="goodsImages" class="input-file"  @click="uploadGoodsImagesFn"></view>
-									</view>
-									<view class="upload-file" v-for="(item, index) in GoodsImagesList" :key="index">
-										<image :data-original='item' :src="item" :data-image="item" alt="" class="upload-img" ></image>
-										<i class=" del iconfont icon-shanchu1" @click="removeGoodsImagesFn(index)"></i>
-									</view>
-								</view>
-								<view class="form-upload-tips">
-									<i class="iconfont icon-wenhao" ></i>
-									<view class="wen-tips" >最多上传5张二手商品图片，请尽量全部上传，单张图片不能超过5M</view>
-								</view>
-							</view>
-						</view>
-						<view class="productinfo">
-							 <view class="label unlogin-label" style="width: 100%;">商品详细信息</view>
-							 <div class="textarea-wrapper">
-								 <textarea 	class="textarea"
-								 			type="text" 
-								 			v-model="secondParams.productDetails" 
-								 			placeholder="请填写商品详细信息，对商品进行更详细的描述" 
-								 			placeholder-class="placeholder"
-								 			maxlength="200"
-								 			@input="onTextareaInputInfo"
-								 />
-								 <span class="word-limit">{{secondParams.productDetails.length}}/200</span>
-							 </div>
-						</view>
-						<view class="productinfo">
-							 <view class="label unlogin-label" style="width: 100%;">免责声明</view>
-							 <text class="smText" >鉴于本网站提供的二手版块信息包括但不限于公司名称，商品的简介、性能、描述与说明，相关图片、视频等均由卖家自行提供，由卖家对其提供的信息承担相应法律责任。买家应自行甄别商品信息并查验商品性状。本网站对二手版块中买卖双方的交易不提供任何形式的担保与保证，特此声明！</text>
-						</view>
-						<view class="row Read">
-							<span  @click="changeBox($event)" class="iconfont xiangliao"
-							:class="checkbox?'icon-jiagexiangliao':'icon-juxingweigouxuan'" ><span style="margin-left: 10rpx;">已阅读</span></span>
-						</view>
-						<div class="BtnAll" :style="{ paddingBottom :isIphoneX ? '68rpx' : '0rpx' }">
-							<view   @click="submitBtn" class="btn-submit">发布</view>
-					</div>
-				 </form>
-				 <!-- 地址弹窗 -->
-				 <mpvue-city-picker :themeColor="themeColor"
-				 					ref="mpvueCityPicker" 
-				 				    :pickerValueDefault="cityPickerValueDefault"
-				 					@onCancel="onCancel" 
-				 					@onConfirm="onConfirm">
-				 </mpvue-city-picker>
-	          </view>
-			<view class="secondBj thebj"   v-show="vShow_secondBj" :class="vShow_secondBj?'show':''">
-				<view class="bjmain theresult">
-					<span class="title">发布提示</span>
-					<p>发布二手商品，采美需要收取您每个商品100元的展示费，展示期为6个月</br>
-						支付完成后，商品会在1-2个工作日内进行审核，审核通过后，商品会立即上线</p>
-					<view class="paybtn">
-						<view class="thegopay gozhofubao" @click.stop="quxiao">取消发布</view>
-						<view class="cancel closebtn" @click.stop="gopay">去支付</view>
-					</view>
-				</view>
-			</view>
-		<payment-record ref="payment" v-if="isRequest" :discernReceiptList="discernReceiptList" :receiptAmount="receiptAmount"></payment-record>
-	</view>
-</template>
-
-<script>
-	import mpvueCityPicker from '@/components/mpvue-citypicker/mpvueCityPicker.vue'
-	import paymentRecord from '@/components/cm-module/orderDetails/paymentRecord'
-	import { uploadFileImage } from "@/api/utils.js"
-	import authorize from '@/common/config/authorize.js'
-	import $reg from '@/common/config/common.js'
-	import { mapState,mapMutations } from 'vuex';
-	export default{
-		name:'secondHandrelease',
-		components:{
-			mpvueCityPicker,
-			paymentRecord,
-		},
-		data(){
-			return{
-				userIdentity:0,
-				popupShow:false,
-				fenlei:[
-				   {name:'二手仪器',value:'1'},
-				   // {name:'临期产品',value:'2'},
-				   {name:'其他',value:'3'},
-				],
-				radioList:[
-				   {name:'轻光电',value:'1',isChecked:false},
-				   {name:'重光电',value:'2',isChecked:false},
-				   {name:'耗材配件',value:'3',isChecked:false},
-				],
-				beauty:[
-				   {name:'医美',value:'1'},
-				   {name:'非医美',value:'2'},
-				],
-				BrandList:[],
-				isShow:false,
-				GoodsImagesList:[],
-				vShow_GoodsImages:false,
-				secondParams:{
-					secondHandType:'',//一级分类
-					instrumentType:'',//二手仪器分类
-					name:'',
-					brandID:'',//品牌ID
-					brandName:'',//其他品牌
-					fixedYears:null,//出厂
-					companyName:'',//公司名称
-					maturityYears:'',//产品到期
-					price1:'',//交易价
-					detailTalkFlag:1,//是否启用详聊
-					normalPrice:'',//市场价
-					originalPrice:'',//采购价
-					stock:'',//数量
-					productQuality:'',//商品成色
-					contactName:'',//联系人
-					contactMobile:'',//联系方式
-					dockingPeopleName:'',//采美对接人姓名
-					dockingPeopleMobile:'',//采美对接人手机号
-					secondProductType:'',//
-					townId:'',//县区地址
-					address:'',//详细地址
-					image1:'',//图片
-					productDetails:'',//商品详细信息
-					source:2
-				 },
-				 addressData:{
-					address:'请选择所在地区',
-					townID:'',			//区ID
-					cityID:'',			//区ID
-					provinceID:'',		//区ID
-					addressDetail: '',	//地址
-				 },
-				brandname:'请选择品牌名称',
-				checkbox:false,
-				shoplogoTwo:false,
-				vShow_secondBj:false,
-				resultBj:false,
-				vShow_detailTalkFlag:false,
-				playid:'',
-			}
-		},
-		methods:{
-			onTextareaInputInfo(e){
-			   this.secondParams.productDetails = e.detail.value;
-			},
-			radioChange(e){//品牌
-				this.secondParams.brandID = e.target.value;
-				this.BrandList.forEach((item,index)=>{
-					if(item.id==this.secondParams.brandID){
-						this.brandname = item.name;
-						this.popupShow = false;
-					}
-				})
-			},
-			showMulLinkageThreePicker() {//三级地址联动
-				this.isShowInput = true
-				this.$refs.mpvueCityPicker.show()
-			},
-			onConfirm(e) {//获取选择的地址信息
-				this.addressData.address = e.name;
-				this.addressData.townID = e.townCode;
-				this.addressData.cityID = e.cityCode;
-				this.addressData.provinceID = e.provinceCode;
-				this.secondParams.townId = this.addressData.townID;
-			},
-			hanldOperationConfim(){
-				this.popupShow = true;
-			},
-			hidePopup(){
-				this.popupShow = false;
-			},
-			secondHandRidio(e) {
-				this.secondParams.secondHandType = e.target.value;
-				if (e.target.value == 1){
-					this.isShow = true;
-				}else {
-					this.isShow = false;
-				}
-			},
-			secondHandType(e){ //二手仪器
-				this.secondParams.instrumentType = e.target.value.toString();
-			},
-			Detailed(){
-			this.vShow_detailTalkFlag = !this.vShow_detailTalkFlag;
-			 if(this.vShow_detailTalkFlag){
-				 this.secondParams.detailTalkFlag = 2 ;//启用价格详聊
-			  }else {
-				this.secondParams.detailTalkFlag = 1 ;//不启用价格详聊
-			  }
-			},
-			 uploadGoodsImagesFn(event){//上传商品图片
-				uploadFileImage().then(res =>{
-					 this.GoodsImagesList.push(JSON.parse(res.data).data);
-					 this.secondParams.image1 =this.GoodsImagesList.toString()+',';
-				})
-			},
-			 removeGoodsImagesFn(index){//删除商品图片
-				this.GoodsImagesList.splice(index,1);
-				this.secondParams.image1 =this.GoodsImagesList.toString()+',';
-			 },
-			getProductType(e){
-			  this.secondParams.secondProductType = e.target.value ;
-			},
-			submitBtn () {
-				if(this.secondParams.secondHandType == ''){
-					this.$util.msg('请选择分类',2000);
-					return;
-				}
-				if(this.secondParams.secondHandType == 1 ){
-					if(this.secondParams.instrumentType ==''){
-						this.$util.msg('请完善仪器分类',2000);
-						return;
-					}
-				}
-				if(this.secondParams.brandID == ''){
-					this.$util.msg('请选择商品品牌',2000);
-					return;
-				}
-				if(this.secondParams.name == ''){
-					this.$util.msg('请输入商品名称',2000);
-					return
-				}
-				// if(this.secondParams.secondHandType ==2) {
-				// 	if (this.secondParams.maturityYears=='') {
-				// 		 this.$util.msg('请输入产品到期日',2000);
-				// 		 return
-				// 	} 
-				// }
-				if(!this.$api.isNumber(this.secondParams.price1)){
-					  this.$util.msg('请输入交易价',2000);
-						return
-				}
-				// if(this.secondParams.secondHandType ==2) {
-				// 	if (!this.$api.isNumber(this.secondParams.normalPrice)) {
-				// 		 this.$util.msg('请输入市场价',2000);
-				// 		 return
-				// 	}
-				// 	if(!this.$api.isNumber(this.secondParams.originalPrice)){
-				// 		  this.$util.msg('请输入采购价/原价',2000);
-				// 			return
-				// 	}
-				// 	if(!this.$api.isNumber(this.secondParams.stock)){
-				// 		  this.$util.msg('请输入数量',2000);
-				// 			return
-				// 	}
-				// }
-				if(this.secondParams.productQuality == ''){
-					this.$util.msg('请输入商品成色',2000);
-					return
-				}
-				if(this.secondParams.contactName == ''){
-					this.$util.msg('请输入联系人姓名',2000);
-					return
-				}
-				if(this.secondParams.contactMobile == ''){
-					console.log(this.secondParams.contactMobile)
-					this.$util.msg('请输入联系方式',2000);
-					return
-				}
-				if(!$reg.isMobile(this.secondParams.contactMobile)){
-					this.$util.msg('请填写正确的手机号',2000);
-					return
-				}
-				if(this.userIdentity === 1){
-					if(this.secondParams.dockingPeopleName == ''){
-						this.$util.msg('请输入采美对接人姓名',2000);
-						return
-					}
-					if(this.secondParams.dockingPeopleMobile == ''){
-						this.$util.msg('请输入采美对接人手机号',2000);
-						return
-					}
-				}
-				if(this.secondParams.dockingPeopleMobile !=''){
-					if(!$reg.isMobile(this.secondParams.dockingPeopleMobile)){
-						this.$util.msg('请填写正确的采美对接人手机号',2000);
-						return
-					}
-				}
-				if(this.secondParams.townId == ''|| this.secondParams.townId == undefined){
-					this.$util.msg('请完善联系地址',2000);
-					return
-				}
-				if(this.secondParams.address == ''){
-					this.$util.msg('请填写详细地址',2000);
-					return
-				}
-				if(this.GoodsImagesList ==''){
-					this.$util.msg('请上传图片',2000);
-					return;
-				}
-				if(this.checkbox==false){
-					this.$util.msg('请勾选已阅读',2000);
-					return
-				}
-				console.log(this.secondParams)
-				this.SecondService.SecondHandProduct(this.secondParams).then(res=>{ //提交发布
-					this.vShow_secondBj = true;
-					this.playid= res.data;
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000)
-					this.secondBj = false;
-					return
-				})
-			},
-			quxiao:function(){
-			 this.vShow_secondBj = false;
-			},
-			gopay(){
-				this.MiniWxPayFor()
-				this.vShow_secondBj = false;
-			},
-			MiniWxPayFor(){
-				authorize.getCode('weixin').then(wechatcode =>{
-					let params ={
-							code:wechatcode,
-							productId:this.playid
-						}
-					this.PayService.SecondHandPay(params).then(response =>{
-						let PayInfo = JSON.parse(response.data.data.payInfo);
-						this.WxRequestPayment(PayInfo)
-					}).catch(error =>{
-						this.$util.msg(error.msg,2000)
-					})
-				})
-			},
-			WxRequestPayment(data){
-				let self = this
-				wx.requestPayment({
-					'timeStamp': data.timeStamp,
-					'nonceStr': data.nonceStr,
-					'package': data.package,
-					'signType': data.signType,
-					'paySign': data.paySign,
-					'success':function(res){
-						wx.reLaunch({url: 'second/pages/product/product-list'});
-					},
-					'fail':function(res){
-						self.$util.msg('用户取消支付~')
-					},
-					'complete':function(res){
-			
-					}
-				})
-			},
-			changeBox:function () {
-				this.checkbox = !this.checkbox;
-			},
-		},
-		onShow() {
-			this.SecondService.brandList().then(res =>{//品牌列表
-				if(res.code == 0){
-				   this.BrandList = res.data;
-				}
-			})
-			this.$api.getComStorage('userInfo').then((resolve) =>{
-				this.userIdentity = resolve.userIdentity
-				console.log(this.userIdentity)
-			}).catch(error =>{
-				console.log(error)
-			})
-		}
-	}
-</script>
-
-<style lang="scss">
-	view{font-size: 28rpx;}
-	.my-maintenance{
-		padding: 20rpx;
-	} 
-	.bannerimg {
-		height: 66rpx;
-		width: 100%;
-	}
-	.bannerimg  image{
-		width: 100%;
-		height: 100% ;
-	}
-	.newsTitle {
-		line-height: 48rpx;
-		text-align: left;
-		color: #e15616;
-		padding:20rpx;
-		background-color: rgba(225, 86, 22, .1);
-	}
-	.nestext{
-		font-size: 24rpx;
-	}
-	.secondradio view{
-		display: inline-block;
-		color: #333333;
-		margin-right: 21rpx;
-	}
-	.secondradio{
-		display: inline-block;
-		margin-left: 40rpx;
-	}	
-	.Secondary{
-		margin-left: 96rpx;
-	}
-	.secondradio view.active {
-		color: #e15616;
-	}
-	.placeholder{
-		color: #b2b2b2;
-	}
-	.linqi_text { 
-		width: 607rpx; 
-		height: 68rpx;
-		background-color: #1890f9;
-		box-shadow: 0rpx 4rpx 6rpx 0rpx rgba(24, 144, 249, 0.17);
-		text-align: center;
-		line-height: 68rpx;
-		color: #ffffff;
-		margin: auto;
-		font-size:24rpx;
-		position: relative;
-	}
-	.jiaobiao {
-		width: 0;
-		height: 0;
-		border-left: 20rpx solid transparent;
-		border-right: 20rpx solid transparent;
-		top: -25%;
-		right: 40%;
-		border-bottom: 20rpx solid #1890f9;
-		position: absolute;
-		}
-	.label{
-		color: #666666;
-		display: inline-block;
-	}
-	.label.second{
-		width: 155rpx;
-	}
-	.row .spacing.second{
-		width: 70%;
-	}
-	.row{
-		border-bottom: 2rpx solid #e1e1e1;
-		line-height: 90rpx;
-		height: 90rpx;
-		position: relative;
-	}
-	.row.fenlei{
-		height: auto;
-		margin: 10rpx 0;
-		border: 0;
-	}
-	.select {
-		position: relative;
-		color: #b2b2b2;
-		text-align: left;
-		user-select: none;
-	}
-	.row .spacing{
-		display: inline-block;
-		margin-left: 50rpx;
-		width: 430rpx;
-		vertical-align:middle;
-		position: relative;
-	}
-	.select .placeholder {
-		position: relative;
-		cursor: pointer;
-		width: 100%;
-		display: inline-block;
-	}
-	.icon-xiayibu{
-		right: 0rpx;
-		color: #b2b2b2;
-		position: absolute;
-	}
-	.xiangliao{
-		font-size: 26rpx;
-		margin-right: 10rpx;
-		color: #b2b2b2;
-	}
-	.icon-jiagexiangliao{
-		color: #e15616 !important;
-	}
-	.pricecolor{
-		margin-left: 10rpx;
-	}
-	.showflag{
-		color: #b2b2b2;
-	}
-	.border-grey{
-		width: 100%;
-		resize: none;
-		padding: 20rpx 0;
-		height: 160rpx;
-		border-bottom: 2rpx solid #e1e1e1;
-	}
-	.release-main-container {
-		overflow: hidden;
-		margin: 20rpx 0;
-	}
-	.uploadGoodsImages{
-		display: flex;
-		overflow-x: auto;
-		overflow-y: hidden;
-	}
-	.secondradio{
-		.row-radio{
-			transform: scale(.8);
-		}
-		.row-input{margin-right: 10rpx;}
-	}
-	.linqi_text .p{
-		font-size: $font-size-20;
-	}
-	.upload-file {
-		float: left;
-		margin: 20rpx 20rpx 20rpx 0px;
-		cursor: pointer;
-		width: 194rpx;
-		height: 194rpx;
-		border-radius: 6rpx;
-		border: solid 2rpx #e1e1e1;
-		flex-shrink: 0;
-		position: relative;
-		display: inline-block;
-	}
-	.input-file {
-		width: 194rpx;
-		height: 194rpx;
-		opacity: 0;
-		cursor: pointer;
-		position: absolute;
-	}
-	.add-text {
-		font-size: 26rpx;
-		color: #333330;
-		opacity: 0.5;
-		position: absolute;
-		top: 55%;
-		right:24%;
-	}
-	.upload-img {
-		width: 100%;
-		height: 100%;
-		display: block;
-		border-radius: .53vw;
-	}
-	.icon-shangchuantupian{
-		width: 46rpx;
-		height: 46rpx;
-		color: #b2b2b2;
-		font-size: 18px;
-		position: absolute;
-		top: 30%;
-		left: 40%;
-	}
-	.icon-shanchu1{
-		position: absolute;
-		top: -25rpx;
-		right:-10rpx;
-		color: #f94b4b;
-		font-size: 36rpx;
-	}
-	.wen-tips {
-		width: 664rpx;
-		height: 68rpx;
-		line-height: 68rpx;
-		text-align: center;
-		color: #FFF;
-		font-size: 20rpx;
-		background-color: #1890f9;
-		box-shadow: 0 0.8vw 1.6vw 0 rgba(24, 144, 249, 0.17);
-		border-radius: 2rpx;
-		display: none;
-	}
-	.form-upload-tips:hover .wen-tips {
-		display: block;
-	}
-	.textarea-wrapper {
-		letter-spacing: 2rpx;
-		line-height: 48rpx;
-		color: #333333;
-		position: relative;
-		font-size: 28rpx;
-		border: 2rpx solid #b2b2b2;
-		height: 300rpx;
-		padding: 16rpx;
-		border-radius: 6rpx;
-		margin: 20rpx 0;
-	}
-	.textarea-wrapper textarea{
-		width: 100%;
-	}
-	.word-limit {
-		position: absolute;
-		right: 2.7vw;
-		bottom: 2.7vw;
-		font-size: 3.2vw;
-		color: #9aa5b5;
-	}
-	.smText{
-		color: #999999;
-		text-align: left;
-		line-height: 42rpx;
-		font-size: 24rpx;
-		margin-top: 10rpx;
-		width: 100%;
-		height: 260rpx;
-	}
-	.BtnAll{
-		width: 100%;
-		margin-bottom: 20rpx;
-		.btn-submit{
-			width: 600rpx;
-			height: 90rpx;
-			margin: auto;
-			text-align: center;
-			line-height: 90rpx;
-			color: #fff;
-			background-image: linear-gradient(315deg, 
-					#f28f31 0%, 
-					#e15616 100%);
-			border-radius: 90rpx;
-			font-size: 30rpx;
-		}
-	}
-	.row.Read{
-		border: 0;
-		text-align: center;
-		color: #999999;
-	}
-	.thebj {
-		position: fixed;
-		left: 0;
-		top: 0;
-		bottom: 0;
-		width: 100%;
-		height: 100%;
-		background-color: rgba(0, 0, 0, .5);
-		z-index: 999999;
-		opacity: 0;
-	}
-	.thebj.show{
-		 opacity: 1;
-	}
-	.theresult {
-		position: absolute;
-		top: 50%;
-		left: 50%;
-		transform: translate(-50%, -50%);
-		width:580rpx;
-		background-color: #fff;
-		border-radius: 32rpx;
-	}
-	.theresult .title{
-		line-height: 100rpx;
-		text-align: center;
-		display: block;
-		color: #333333;
-		font-size: 30rpx;
-		font-weight: bold;
-		border-bottom: 2rpx solid #efefef;
-	}
-	.theresult p{
-		padding: 30rpx 52rpx;
-		line-height: 48rpx;
-		color: #666666;
-		font-size: 30rpx;
-	}
-	.paybtn view{
-		width: 290rpx;
-		height: 90rpx;
-		text-align: center;
-		line-height: 90rpx;
-		font-size: 30rpx;
-		display: inline-block;
-	}
-	.paybtn .cancel{
-		background-image: linear-gradient(270deg, #f28f31 0%, #e15616 100%);
-		border-radius: 0rpx 0rpx 32rpx 0rpx;
-		color: #fff;
-		
-	}
-	.paybtn .thegopay{
-		background-color: #efefef;
-		border-radius: 0rpx 0rpx 0rpx 32rpx;
-		color: #999999;
-	}
-	.icon-wenhao{
-		color: #1890f9;
-		font-size: 35rpx;
-		width: 50rpx;
-	}
-	.form-upload-tips:hover .wen-tips {display: block;}
-	.tui-popup-box {
-		z-index: 22;
-		width: 702rpx;
-		padding: 24rpx 24rpx 36rpx 24rpx;
-		height: 670rpx;
-		position: relative;
-		.icon-iconfontguanbi{
-			font-size: 40rpx;
-			color: #b2b2b2;
-			width: 60rpx;
-			float: right;
-			display: block;
-		}
-		.content{
-			.freight-radio{
-				height: 66rpx;
-				line-height: 66rpx;
-				padding: 0 35rpx;
-				.row-group{
-					width: 100%;
-					// max-height: 605rpx;
-					// overflow: auto;
-			
-				}
-				.row-input{
-					height: 66rpx;
-					line-height: 66rpx;
-					width: 100%;
-					display: block;
-			
-				}
-				.row-radio{
-					float: right;
-					transform: scale(0.9);
-					color: #b2b2b2;
-				}
-				.row-text{
-					font-size: $font-size-28;
-					color: #666666;
-					float: left;
-				}
-			}
-		}
-		}
-		checkbox .wx-checkbox-input{
-		  border-radius: 50%;
-		}
-		.row-check{
-			 transform: scale(0.8);
-		}
-		checkbox .wx-checkbox-input.wx-checkbox-input-checked{
-		  background: #E15616;
-		  border: 2rpx solid #e15616;
-		}
-		checkbox .wx-checkbox-input.wx-checkbox-input-checked::before{
-		  border-radius: 50%;
-		  border: 2rpx solid #e15616;
-		  width: 34rpx;
-		  height: 34rpx;
-		  line-height: 34rpx;
-		  text-align: center;
-		  font-size:34rpx; 
-		  color:#fff;
-		  background: transparent;
-		  transform:translate(-50%, -50%) scale(.8);
-		  -webkit-transform:translate(-50%, -50%) scale(.8);
-		}
-</style>

second/pages/form/introduce.vue

@@ -1,314 +0,0 @@
-<template name="fleaMarket">
-	<view class="fleaMarket">
-	      <view class="second-hand-wrapper">
-	            <view class="top_title">
-	                <view ><image src="https://static.caimei365.com/app/img/icon/icon-logo2.png" mode=""></image></view>
-	                <view class="right-title">
-	                    <text class="right-one">二手市场</text>
-	                    <text class="right-two">SECOND-HANDMARKET</text>
-	                </view>
-	            </view>
-	            <view class="top_text">
-	                质量好一点，效率高一点
-	            </view>
-	            <view class="mian_text">
-	                <view class="main-title">采美二手市场介绍<view class="yellow_icon"></view></view>
-	                <span>
-	                    现实生活中，二手商品越来越经济实惠，二手商品也在多个经济生活领域出现。
-	                    面对潜力巨大的二手市场，采美365网于2019年开办美容行业二手交易版块，搭建二手交易平台，
-	                    将拥有闲置商品卖家与求购方（买家）信息集中起来，让交易双方的买卖信息传播得更广泛，交易更有保障。
-	                </span>
-	            </view>
-	            <view class="mian_content top">
-	                <text class="big-title">二手平台运营特色</text><view class="yellow_icon"></view>
-	                <view class="font_content">
-	                    <view class="content_list">
-	                        <view class="content-title">1.自运营</view>
-	                        <text class="content-text">用户自主上传二手商品信息，自主销售，平台提供商品展示位以及商品信息介绍页面，类似“闲鱼”。</text>
-	                    </view>
-	                    <view class="content_list">
-	                        <view class="content-title"> 2.代运营</view>
-	                        <text class="content-text">由平台协助销售二手商品，为用户提供贴心且必要的推广辅助，促成交易。</text>
-	                    </view>
-	                    <view class="content_list">
-	                        <view class="content-title">3.第三方服务</view>
-	                        <text class="content-text">平台提供第三方服务，如申请第三方评测、延保、维修等，一方面更客观全面展示仪器细节，另一方面，便于仪器机能维护，方便维修等。</text>
-	                    </view>
-	                    <view class="content_list">
-	                        <view class="content-title">4.套餐服务</view>
-	                        <text class="content-text">多项组合套餐式服务，满足卖家个性化推广需求。</text>
-	                    </view>
-	                    <view class="tishiyu">转让方/出售方（以下统称为“卖家”）需上传个人真实信息，平台留存备案后，卖家通过平台专属页面上传需要出售的商品信息，（按后台系统要求填写）。</view>
-	            </view>
-	           </view>
-	
-	            <view class="mian_content">
-	                <text class="big-title">合作模式</text><view class="yellow_icon y m" ></view>
-	            <view class="font_content">
-	                <view class="twobuy">成为自由卖家：二手出售方</view>
-	                  <view class="content_list">
-	                    <view class="content-title">1.自主发布</view>
-	                    <text class="content-text">平台已拥有独立上传信息页面，卖家可进入页面或者通过链接自主上传商品信息，获得在平台二手版块展示机会。平台收取展示位费用，详见第2条</text>
-	                  </view>
-	                  <view class="content_list">
-	                    <view class="content_list">2.自主发布</view>
-	                    <text class="content-text"> 卖家每上传一款商品，占据一个展示位,<text class="bluefont">平台收取每款商品100元的展示费用 ，有效期为<text style="font-size: 48px">6</text>个月</text>
-	                           平台提供与该商品匹配的详情信息以及文章信息，降低买家决策成本，以促进销售。特殊政策除外（如特定免费时段）。</text>
-	                  </view>
-	                   <view class="content_list">
-	                    <view class="content-title">3.平台推广服务(代运营)</view>
-	                    <text class="content-text"> 卖家如需采美平台提供个性化推广服务，以帮助达成交易 ，平台收取一定服务费或佣金。</text>
-	                  </view>
-	                  <view class="content_list">
-	                    <view class="content-title">4.第三方检测、维修、延保服务</view>
-	                    <text class="content-text"> 平台收取服务佣金。 </text>
-	                  </view>
-	                  <view class="content_list">
-	                      <view class="content-title">5.套餐服务</view>
-	                      <text class="content-text">多项组合服务。</text>
-	                  </view>
-	            </view>
-	            </view >
-	
-	            <view class="mian_content">
-	                <text class="big-title">交易流程</text><view class="yellow_icon y m" ></view>
-	                <view class="font_content">
-	                 <view class="content_list">
-	                    <view class="content-text">随着越来越多机构青睐性价比高的二手设备，采美二手市场也越来越火热，为了保障买卖双方利益和资金交易安全，
-	                    采美现将二手仪器交易的流程更加规范化，以促进二手市场的健康发展。</view>
-	                 </view>
-	                    <view class="threebuy">此流程适用于10万以下的设备，10万以上二手设备交易请联系高先生。</view>
-	                    <view class="jioayi">具体的流程如下：</view>
-						<image src="https://admin-b.caimei365.com/userfiles/1/images/photo/2020/11/intro.png" mode="" class="jiaoyi_img"></image>
-	                </view>
-	            </view>
-	            <view class="second-hand-btn" >
-	                <view class="button" @click.stop="gotoform">去发布</view>
-	                <view class="button" @click.stop="gotolist">逛二手市场</view>
-	                <view class="button" @click="gotorepair">去维修</view>
-	                <view class="button" @click="this.$api.switchTabTo('/pages/tabBar/home/index')">去首页</view>
-	            <view class="foot_font">
-	                <view style="color: #ADADAD"> 业务咨询/合作请联系：<label style="color: #666666;margin-right: 10rpx"> 0755-22907771  </label></view>
-					<view style="color: #ADADAD;">手机：<label style="color: #666666">15817465281</label></view>
-	            </view>
-	        </view>
-	    </view>
-	</view>
-</template>
-
-<script>
-	export default{
-		name:'fleaMarket',
-		components:{
-		},
-		methods:{
-			gotoform:function(){
-				this.$api.navigateTo('/second/pages/form/form');
-			},
-			gotolist:function(){
-				this.$api.navigateTo('/second/pages/product/product-list');
-			},
-			gotorepair:function(){
-				this.$api.navigateTo('/h5/pages/article/page?linkType=7');
-			},
-		},
-		
-		
-	}
-</script>
-
-<style lang="scss">
-page{
-	position: relative;
-	margin: 40rpx auto 0;
-}	
-.fleaMarket{
-	padding:20rpx;
-	background-image: linear-gradient(#FF7676, #E15616);
-}
-.second-hand-wrapper {
-	background-image: url("https://static.caimei365.com/app/img/bg/bg22.png");
-	background-position: 50% 9%;
-	background-repeat: no-repeat;
-	background-size: 100%;
-	image{
-		width: 100%;
-		display: block;
-		margin: 20rpx auto 0;
-		height: 800rpx;
-	}
-	.big-title{
-		color: #FFFFFF;
-		letter-spacing: 4rpx;
-	}
-}
-.second-hand-btn {
-	.button{
-		width: 280rpx;
-		height: 90rpx;
-		background: linear-gradient(225deg,rgba(255,107,107,1) 0%,rgba(247,76,0,1) 100%);
-		border-radius: 30rpx;
-		color: #fff;
-		border: none;
-		font-size: 27rpx;
-		outline: none;
-		margin-bottom:20rpx;
-		margin-right: 20rpx;
-		line-height: 90rpx;
-		display: inline-block
-	}
-	
-}
-.second-hand-btn {
-	position: relative;
-	background: #FFFFFF;
-	border-radius: 30rpx;
-	margin-top: 30rpx;
-	padding:40rpx 22.5rpx 37.5rpx 30rpx;
-	margin-bottom: 15rpx;
-	border-bottom: 9rpx solid #f1ac90;
-	border-right: 9rpx solid #f1ac90;
-	text-align: center;
-}
-.top_title{
-	padding: 40rpx 0 40rpx 0;
-	text-align: center;
-	.right-one{
-			letter-spacing: 12rpx;
-			font-size: 40rpx;
-			font-weight: bold;
-			color: #FFFFFF;
-			letter-spacing: 4rpx;
-	}
-	.right-two{
-		color: #FFFFFF;
-		font-size: 20rpx;
-		display: block;
-	}
-	image{
-		width: 100%;
-		height: 100%;
-	}
-}
-.top_text{
-	font-size: 60rpx;
-	color: #FFFFFF;
-	font-style: oblique;
-	font-weight: bold;
-	margin-top:40rpx;
-	text-align: center;
-}
-.mian_text{
-	margin-top: 75rpx;
-	color: #FFFFFF;
-	font-size: 22rpx;
-	padding: 0 30rpx 0 30rpx;
-	line-height: 40rpx;
-	letter-spacing: 4rpx;
-	.main-title{
-		font-size:36rpx;
-		font-weight: bold;
-		padding-bottom: 37.5rpx;
-	}
-}
-.mian_content{
-	margin-top: 80rpx;
-	.big-title{
-		font-size: 36rpx;
-		font-weight: bold;
-	}
-	&.top{
-		margin-top: 500rpx;
-	}
-}
-.font_content{
-	background: #FFFFFF;
-	border-radius:37.5rpx;
-	margin-top: 30rpx;
-	padding:18.5rpx;
-	font-weight: 400;
-	line-height: 45rpx;
-	color: rgba(109,114,120,1);
-	opacity: 1;
-	position: relative;
-	border-bottom:9.75rpx solid #f1ac90;
-	border-right: 9.75rpx solid #f1ac90;
-}
-.content_list{
-	margin-bottom: 37.5rpx;
-	.content-title{
-		font-size:30rpx;
-		font-family:Source Han Sans CN;
-	}
-	.content-text{
-		font-size: 22rpx;
-	}
-}
-.tishiyu{
-	background: #FFF8F8;
-	font-size:24rpx;
-	font-family: Source Han Sans CN;
-	font-weight: 400;
-	line-height: 40rpx;
-	color: #FF7354;
-	opacity: 1;
-	padding: 18rpx;
-	border-radius: 20rpx
-}
-.twobuy{
-	background: #EF5C3C;
-	border-radius: 15rpx;
-	font-size: 26rpx;
-	font-family: AlibabaPuHuiTiB;
-	opacity: 1;
-	padding: 6rpx;
-	color: #FFFFFF;
-	margin-bottom: 19.5rpx;
-	text-align: center;
-	width: 360rpx;
-}
-.threebuy{
-	background: #EF5C3C;
-	border-radius: 9.75rpx;
-	font-size: 27.7rpx;
-	color: #fff;
-	padding: 6rpx;
-	margin-bottom: 37.5rpx;
-}
-.bluefont{
-	font-size: 24rpx !important;
-	color: #0091FF;
-}
-.foot_font{
-	text-align: center;
-	font-size: 34rpx;
-	line-height: 52rpx;
-}
-.yellow_icon{
-	width: 315rpx;
-	height: 22.5rpx;
-	background: rgba(250,185,0,1);
-	opacity: 1;
-	margin-top: -22.5rpx;
-}
-.yellow_icon.m{
-	width: 160rpx;
-}
-.top_title view{
-	display: inline-block;
-}
-.jiaoyi{
-	font-size:24rpx;
-}
-.jiaoyi_pimg{
-	display: none !important;
-}
-.top_title view:nth-child(1){
-	// margin-right: 20rpx;
-	width: 104rpx;
-	height: 92rpx;
-}
-.right-title{
-	width: 250rpx;
-}
-</style>

second/pages/product/product-details.vue

@@ -1,1514 +0,0 @@
-
-<template>
-	<view class="product" :style="{paddingTop:CustomBar+'px'}">
-		<custom-p   v-if="isHeaderPoduct"
-					:systeminfo='systeminfo' 
-					:navbar-data='nvabarData' 
-					:headerBtnPosi ="headerBtnPosi" 
-					:headerColor="headerColor" 
-					:type="isShareType"
-					:page='backPage'>
-		</custom-p>
-		<view class="product-topnav" v-if='isNavbarFiexd' :class="navbarFiexd" :style="{top:CustomBar +'px'}">
-			<view class="search-input">
-				<view class="gosearch-btn" :class="navbarFiexd" @click="this.$api.navigateTo(clickPath)">
-					<view class="search-icon">
-						<text class="iconfont icon-iconfonticonfontsousuo1"></text>
-					</view>
-					<view class="search-text">搜索其他二手商品</view>
-				</view>
-			</view>
-			<view class="navbar">
-				<view class="nav-item tui-skeleton-fillet" :class="{ current: tabCurrentIndex === 0 }" @click="tabClick(0)">
-					<text>详情</text>
-					<text class="line"></text>
-				</view>
-				<view class="nav-item tui-skeleton-fillet" :class="{ current: tabCurrentIndex === 1 }" @click="tabClick(1)">
-					<text>品牌</text>
-					<text class="line"></text>
-				</view>	
-				<view class="nav-item tui-skeleton-fillet" :class="{ current: tabCurrentIndex === 2 }" @click="tabClick(2)">
-					<text>推荐</text>
-					<text class="line"></text>
-				</view>	
-			</view>	
-		</view>
-		<tui-skeleton v-if="skeletonShow" backgroundColor="#fafafa" borderRadius="10rpx" :isLoading	="true" :loadingType="5"></tui-skeleton>
-		<view class="container-product tui-skeleton">
-			<view class="container-product-main">
-				<view class="product-top">
-					<view class="banner-section">
-						<uni-swiper-dot :info="productImage" :current="current" field="content" :mode="mode" >
-							<swiper class="banner tui-banner tui-skeleton-rect"  @change="swiperChange" :duration='800' :autoplay="false" :circular="true" >
-								<swiper-item v-for="(item, index) in product.imageList" :key="index" class="banner-item"> 
-									<image :src="item" @click="previewImg(index)" class="product-img" />
-								</swiper-item>
-							</swiper>
-							<view class="swiper__dots-box">
-								<tui-tag padding="12rpx 24rpx" type="translucent" shape="circleLeft" size="32rpx" :scaleMultiple="0.82" originRight>{{ current + 1 }}/{{ product.imageList.length }}</tui-tag>
-							</view>
-						</uni-swiper-dot>
-					</view>
-					<view class="product-wrap clearfix">
-						<view class="wrap-top" >
-							<view class="wrap-top-price">
-								<second-price :product="product"></second-price>
-							</view>
-							<view class="p-title tui-skeleton-fillet">
-								<view class="p-title-name">
-									{{product.name == undefined ? '' : product.name}}
-								</view>
-								<button open-type="share" class="p-title-share tui-share-position" @tap="onShare">
-									<view class=""><text class="iconfont icon-fenxiang1"></text></view>
-									<view class="">分享</view>
-								</button>
-							</view>
-							<view class="productRemarks"  v-if="product.productRemarks!=''&&product.productRemarks!=null">
-								<text class="text">{{product.productRemarks}}</text>
-							</view>
-							<view class="wrap-label" v-if="product.tagsList.length>0">
-								<view class="label-a tui-skeleton-fillet" v-for="(label,index) in  product.tagsList" :key="index">{{label}}</view>
-							</view>
-						</view>
-					</view>	
-						<view class="product-seve">
-							<text class="iconfont icon-wuyoutuihuo tui-skeleton-rect"><text class="text">无忧退货</text></text>
-							<text class="iconfont icon-wuyoutuihuoi tui-skeleton-rect"><text class="text">快速退款</text></text>
-							<text class="iconfont icon-wuyoutuihuo tui-skeleton-rect"><text class="text">正品保证</text></text>
-						</view>
-				</view>
-				
-				<view class="product-parameter" @click="showPopup">
-					<text class="title">参数：</text>
-					<text class="name">品牌  起订量  分类...</text>
-					<text class="iconfont icon-xiayibu"></text>
-				</view>
-			</view>
-			<view class="product-details productDetails0">
-				<!-- 商品详情 -->
-				<view class="title">
-					<view class="title-tab">商品详情</view>
-				</view>
-				<view class="Disclaimer">
-					<span >免责声明</span>
-					<text class="text">
-						鉴于本商城提供的二手版块信息包括但不限于公司名称，商品的简介、性能、描述与说明，相关图片、视频等均由卖家自行提供，由卖家对其提供的信息承担相应法律责任。买家应自行甄别商品信息并查验商品性状。本商城对二手版块中买卖双方的交易不提供任何形式的担保与保证，特此声明！
-					</text>
-				</view>
-				<view class="content tui-banner product-rich-text tui-skeleton-rect">
-					<view class="contentHtml">
-						<view class="detailsText" v-if="product.productDetails!=''||product.productDetails!=null"  >{{product.productDetails}}</view>
-						   <view class="imgList" v-for="(item, index) in product.imageList" :key="index" :data-src="item">
-							   <img :src="item"/>
-						   </view>
-					</view>
-				</view>
-			</view>	
-			<view class="product-details secondBrand productDetails1" v-if="product.brandInfo!=''&&product.brandInfo!=null">
-				<!-- 品牌信息 -->
-				<view class="title">
-					<view class="title-tab">品牌信息</view>
-				</view>
-				<text class="brandinfo">
-					{{product.brandInfo}}
-				</text>
-			</view>
-			<view class="product-details recommend productDetails2">
-				<!-- 相关推荐 -->
-				<view class="title">
-					<view class="title-tab">相关推荐</view>
-				</view>
-				<view class="content hot">
-					<recommend :query-productid="product.productID" v-if="isRequest" ></recommend>
-				</view>
-			</view>	
-				</view> 
-			<!-- 商品参数 -->
-			<tui-bottom-popup :radius="true" :show="popupShow" @close="hidePopup()">
-				<view class="tui-popup-box clearfix">
-					<view class="title">商品参数</view>
-				    <cm-parameter :product="product" :goodsData="goodsData" ></cm-parameter>
-					<view class="tui-right-flex tui-popup-btn" :style="{ paddingBottom :isIphoneX ? '68rpx' : '0rpx' }">
-						<view class="tui-flex-1">
-							<view class="tui-button" @click="hidePopup()">收起</view>
-						</view>
-					</view>
-				</view>	
-			</tui-bottom-popup>	
-			<!-- 侧边 -->
-			<scroll-top :isScrollTop="isScrollTop" :bottom="200"></scroll-top>
-			</view>
-	</view>
-</template>
-
-<script>
-	import { mapState,mapMutations } from 'vuex'
-	import customP from '@/components/cm-module/headerNavbar/header-poduct' 		 //自定义导航
-	import secondPrice from "@/components/cm-module/productDetails/secondPrice.vue" //价格显示
-	import authorize from '@/common/config/authorize.js'
-	import uniStars from '@/components/uni-stars/uni-stars.vue'
-	import tuiSkeleton from "@/components/tui-skeleton/tui-skeleton"
-	import recommend from "@/components/cm-module/productDetails/secondRecommend" //相关推荐
-	import cmParameter from "@/components/cm-module/productDetails/secondParameters.vue" //相关参数
-	import wxLogin from "@/common/config/wxLogin.js"
-	import { debounce } from '@/common/config/common.js'
-	var isPreviewImg;
-	export default{
-		components:{
-			uniStars,
-			customP,
-			tuiSkeleton,
-			recommend,
-			secondPrice,
-			cmParameter,
-		},
-		data(){
-			return{		
-				clickPath:'/search/pages/search/search-second',
-				disabledTabNavList:[{name:'相关推荐'}],
-				mode:'round',
-				iconClass:'icon-aixin',
-				iconColor:'#ff9100',
-				specClass: '',//规格弹窗css类，控制开关动画
-				isRequest:false,
-				isScrollTop:false,
-				current:0,
-				isShareType:'',
-				isHeaderPoduct:false,
-				isNavbarFiexd:false,
-				navbarFiexd:'none',
-				isRecommend:false,
-				isRarameter:true,
-				isService:false,
-				skeletonShow:true,
-				disabled:false,
-				isNoneDisabled:false,
-				tabCurrentIndex:0,
-				userID:'',
-				productID:0,
-				userIdentity:'',//用户类型
-				goodsData:{},//自定义数据
-				shop:{},//供应商信息
-				product:{},//采美
-				productImage:[],
-				headerBtnPosi:	this.setHeaderBtnPosi(), //获取设备顶部胶囊高度
-				systeminfo: this.setSysteminfo(),		 //获取设备信息
-				isIphoneX:this.$store.state.isIphoneX,
-				windowHeight: '',
-				headerColor:false,
-				backPage:1,
-				nvabarData: {							 //顶部自定义导航
-					showCapsule: 1, // 是否显示左上角图标   1表示显示    0表示不显示
-					title: ''		// 导航栏 中间的标题
-				},
-				linkPath:'',
-				popupShow:false,//参数弹窗
-				CustomBar:this.CustomBar,// 顶部导航栏高度
-				tabSelectFlag:false,
-				sectionPropsArr: [],
-				scrollTopArray:[],
-				sectionTopRangeArr: [],
-				winHeight:''
-			}
-		},
-		onLoad(option) {
-			this.productID = option.id;//获取商品ID
-			this.isShareType = option.type
-			this.linkPath = option.path
-			this.isHeaderPoduct = true
-			if(option.page == 2){
-				this.backPage = option.page
-			}
-			if(this.isShareType =='share'){
-				authorize.getSetting().then(wxResponse =>{// console.log('是否已授权',res);//0:为取消授权 1:为已授权 2:为未操作
-					console.log(wxResponse)
-					if(wxResponse == 1){
-						wxLogin.wxLoginAuthorize()
-					}else{
-						console.log(new Date +'用户未授权微信信息')
-					}
-				})	
-			}
-		},
-		computed: {
-			...mapState(['hasLogin','isWxAuthorize'])
-		},
-		methods:{
-			initData(){// 初始化商品详情查询
-				this.SecondService.ProductDetail({productId:this.productID}).then(response =>{	
-					this.skeletonShow = false
-					this.productImage=[];
-					this.shop = response.data.shop
-					this.product = response.data
-					//处理商品图片列表
-					this.product.imageList.forEach(item =>{
-						this.productImage.push(item);
-					})
-					setTimeout(()=>{
-						this.getSectionProps();
-					},2000)
-					this.isRequest = true
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000);
-				})
-			},
-			swiperChange(e) {//顶部商品图片切换
-				const index = e.detail.current;
-				this.current = index;
-			},
-			previewImg (index) {//顶部商品图片预览
-				isPreviewImg = true
-				let previewUrls = this.productImage
-				uni.previewImage({
-					current: index, 	//图片索引
-					urls: previewUrls, //必须是http图片，本地图片无效
-					longPressActions:''
-				})
-			},
-			tabClick(index) {//商品详情&&供应商信息tab切换
-				this.tabSelectFlag = true
-				this.tabCurrentIndex = index;
-				let classIndex = '.productDetails'+index;
-				uni.createSelectorQuery().select('.container-product-main').boundingClientRect((data)=>{//最外层盒子节点
-				　　uni.createSelectorQuery().select(classIndex).boundingClientRect((res)=>{//最外层盒子节点
-				　　　　uni.pageScrollTo({
-				　　　　　　duration:300,//过渡时间必须为0，uniapp bug，否则运行到手机会报错
-				　　　　　　scrollTop:res.top - data.top - 150,//滚动到实际距离是元素距离顶部的距离减去最外层盒子的滚动距离
-				　　　　})
-						setTimeout(()=>{
-							this.tabSelectFlag = false;
-						},500)
-				　　}).exec()
-				}).exec()
-			},
-			handleContact(e){//跳转小程序客服
-
-			},
-			navToLogin(){
-				authorize.getSetting().then(wxResponse =>{// console.log('是否已授权',res);//0:为取消授权 1:为已授权 2:为未操作
-					if(wxResponse == 1){
-						this.$store.commit('setLoginType',8)
-						this.$store.commit('setLoginProductId',this.productID)
-						this.$api.navigateTo(`/pages/login/login?id=${this.productID}`)
-					}else{
-						this.$api.navigateTo('/pages/authorization/authorization?type=1')
-					}
-				})	
-			},
-			setHeaderBtnPosi(){
-				// 获得胶囊按钮位置信息
-				let headerBtnPosi = uni.getMenuButtonBoundingClientRect();
-				return headerBtnPosi
-			},
-			setSysteminfo(){
-				let systeminfo;
-				uni.getSystemInfo({ // 获取设备信息
-					success: (res) => {
-						systeminfo = res
-					},
-				})
-				return systeminfo
-			},
-			getOptionFn(e){
-				this.isShareType = e.type
-			},
-			discard(){
-				//丢弃
-			},
-			onShare(res){//分享转发
-				if (res.from === 'button') {
-			      // 来自页面内转发按钮
-			    }
-				return {
-				  title: `${this.product.name}`,
-				  path: `second/pages/product/product-details?type=share&id=${this.productID}`,
-				  imageUrl:`${this.product.imageList[0]}`
-				}
-			},
-			showPopup(){
-				this.popupShow = true
-			},
-			hidePopup(){
-				this.popupShow = false
-			},
-			getSectionProps() {//获取每个tab对应区域的scrollTop值
-				let className = '.product-details',
-					sectionPropsArr = [];
-				uni.createSelectorQuery().select('.container-product-main').boundingClientRect((data)=>{//最外层盒子节点
-				　　uni.createSelectorQuery().selectAll(className).boundingClientRect((res)=>{//最外层盒子节点
-						res.forEach((item, index) => {
-							sectionPropsArr.push({
-								className: `${className}${index}`,
-								scrollTop: item.top - data.top - 150
-							})
-						})
-						this.sectionPropsArr = sectionPropsArr;
-						this.sectionTopRangeArr = this.getSectionRange(sectionPropsArr);
-				　　}).exec()
-				}).exec()
-			},
-			getSectionRange(arr) {// 获取每个tab对应区域的区间
-				let sectionScrollTopList = [];
-				for(let i = 0; i < arr.length; i++) {
-					let thisScrollTop = arr[i].scrollTop;
-					if(i < arr.length - 1) {
-						let nextScrollTop = arr[i+1].scrollTop;
-						if(i == 0) {
-							sectionScrollTopList.push(`0-${thisScrollTop}`);
-						} else if(i == arr.length - 1){
-							sectionScrollTopList.push(`${thisScrollTop}-${nextScrollTop - this.winHeight}`);
-						} else {
-							sectionScrollTopList.push(`${thisScrollTop}-${nextScrollTop}`);
-						}
-					} else {
-						sectionScrollTopList.push(`${thisScrollTop}-${thisScrollTop+500}`);
-					}
-				}
-				return sectionScrollTopList;
-			},
-			activeTab: debounce((top, _this)=> {//当滑动时也能同步激活tab
-				const { sectionTopRangeArr } = _this;
-				if(sectionTopRangeArr.length > 0) {
-					sectionTopRangeArr.forEach((item, index) => {
-						let splitItem = item.split('-'),
-							openInterval = Number(splitItem[0]),
-							closedInterval = Number(splitItem[1]);
-						if(top >= openInterval && top < closedInterval) {
-							_this.tabCurrentIndex = index;
-						}
-					})
-				}
-			},100, true),
-			getWinHeight() {
-				this.winHeight = wx.getSystemInfoSync().windowHeight;
-			},
-			
-		},
-		onPullDownRefresh() {
-			setTimeout(() => {
-				this.initData()
-				uni.stopPullDownRefresh()
-			}, 200)
-		},
-		onPageScroll(e){//实时获取到滚动的值
-			const { scrollTop } = e;
-			if(!this.tabSelectFlag) {
-				this.activeTab(scrollTop, this);
-			}
-			if(e.scrollTop>100){
-				this.headerColor = true
-				this.navbarFiexd = 'fixed'
-				this.isNavbarFiexd = true
-				this.nvabarData={							
-					showCapsule: 1, 
-					title: '商品详情', 		
-				}
-			}else{
-				this.headerColor = false
-				this.navbarFiexd = 'none'
-				this.isNavbarFiexd = false
-				this.nvabarData={
-					showCapsule: 1, 
-					title: '', 		
-				}
-			}
-			if(e.scrollTop>700){
-				this.isScrollTop = true
-			}else{
-				this.isScrollTop = false
-			}
-		},
-		onShareAppMessage(res){//分享转发
-			if (res.from === 'button') {
-		      // 来自页面内转发按钮
-		    }
-			return {
-			  title: `${this.product.name}`,
-			  path: `second/pages/product/product-details?type=share&id=${this.productID}`,
-			  imageUrl:`${this.product.imageList[0]}`
-			}
-		},
-		onShow() {
-			this.$api.getStorage().then((resolve) => {
-				this.userID = resolve.userID ? resolve.userID : '';	
-				this.userIdentity = resolve.userIdentity ? resolve.userIdentity : 3
-				if (isPreviewImg) {
-					isPreviewImg = false;
-					return;
-				} else {
-					this.initData();
-				}
-			}).catch(error =>{
-				this.initData();
-			})
-		}
-	}
-</script>
-
-<style lang="scss">
-	page{
-		background-color: #FFFFFF;
-	}
-	.product-topnav{
-		width: 100%;
-		height: 174rpx;
-		box-sizing: border-box;
-		background: #FFFFFF;
-		z-index: 1000;
-		position: fixed;
-		opacity: 1;
-		left: 0;
-		&.fixed{
-			animation: showFixedColor 0.1s ease-in-out both;
-		}
-		&.none{
-		   animation: hideFixedColor 0.1s ease-in-out both;
-		}
-		.navbar {
-			width: 100%;
-			height: 60rpx;
-			box-sizing: border-box;
-			padding: 0 24rpx;
-			display: flex;
-			.nav-item {
-				display: flex;
-				flex: 1;
-				justify-content: center;
-				align-items: center;
-				height: 60rpx;
-				font-size: $font-size-28;
-				color: $text-color;
-				position: relative;
-				float: left;
-				position: relative;
-				.line{
-					width: 60rpx;
-					height: 2px;
-					border-radius: 1px;
-					background: #FFFFFF;
-					position: absolute;
-					bottom: 0;
-					left: 50%;
-					margin-left: -30rpx;
-				}
-				&.current{
-					color:$color-system;
-					.line{
-						background: $color-system;
-					}
-				}
-			}
-		}
-		.search-input{
-			width: 100%;
-			height: 114rpx;
-			padding:24rpx;
-			box-sizing: border-box;
-			.gosearch-btn{
-				width: 100%;
-				height: 100%;
-				border-radius: 40rpx;
-				margin: 0 auto;
-				font-size: 26rpx;
-				line-height: 66rpx;
-				color: #B2B2B2;
-				position: relative;
-				box-sizing: border-box;
-				padding-left: 66rpx;
-				&.fixed{
-					background: rgba(70,70,70,0.1);
-				}
-				&.none{
-					background: rgba(70,70,70,0.1);
-				}
-				.search-icon{
-					width: 66rpx;
-					height: 66rpx;
-					position:absolute ;
-					left: 0;
-					top: 2rpx;
-					text-align: center;
-					line-height: 66rpx;
-					.icon-iconfonticonfontsousuo1{
-						margin:0 6rpx;
-						font-size: $font-size-34;
-						color: #B2B2B2;
-						z-index: 10;
-					}
-				}
-				.search-text{
-					font-size: $font-size-24;
-					line-height: 66rpx;
-					color: #B2B2B2;
-				}
-			}
-		}
-	}
-	.productRemarks{
-		height: 36rpx;
-		margin: 8rpx 0;
-		width: 100%;
-		float: left;
-		.text{
-			display: inline-block;
-			padding: 0 18rpx;
-			line-height: 32rpx;
-			font-size: 20rpx;
-			color: #FF2A2A;
-			text-align: center;
-			border-radius: 4rpx;
-			background: #FFFFFF;
-			border: 1px solid #FF2A2A;
-			float: left;
-			opacity: 0.8;
-		}
-	}
-	.banner-section{
-		width: 100%;
-		height: 750rpx;
-		position: relative;
-	}	
-	.banner{
-		width: 100%;
-		height: 750rpx;
-		.product-img{
-			width: 750rpx;
-		}
-		image {
-			width: 100%;
-			height: 100%;
-		}
-	}
-	.swiper__dots-box{
-		position: absolute;
-		color: #fff;
-		bottom: 30rpx;
-		right: 0;
-	}
-	.product-wrap{
-		width: 100%;
-		height: auto;
-		padding: 24rpx 0 0 0;
-		background-color: #FFFFFF;
-		.wrap-top{
-			width: 702rpx;
-			padding: 0 24rpx;
-			height: auto;
-			float: left;
-			padding-bottom:20rpx;
-			&.none{
-				.p-title{
-					color:#999999
-				}
-			}
-			.p-title{
-				width: 100%;
-				height: auto;
-				float: left;
-				.p-title-name{
-					width:602rpx;
-					// height: 96rpx;
-					float: left;
-					line-height: 46rpx;
-					font-size: $font-size-34;
-					color: $text-color;
-					// -o-text-overflow: ellipsis;
-					// text-overflow: ellipsis;
-					// display: -webkit-box;
-					// word-break: break-all;
-					// -webkit-box-orient: vertical;
-					// -webkit-line-clamp: 2;
-					// overflow: hidden;
-				}
-				.p-title-share{
-					width: 96rpx;
-					height: 96rpx;
-					float: right;
-					text-align: center;
-					color: #999999;
-					font-size: $font-size-24;
-					box-sizing: border-box;
-					padding: 8rpx 0;
-					.icon-fenxiang1{
-						font-size: $font-size-34;
-					}
-				}
-			}
-			.wrap-main-text{
-				line-height: 56rpx;
-				color: #FF2A2A;
-				font-size: $font-size-26;
-				display: block;
-				float: left;
-				font-weight: normal;
-			}
-			.wrap-main-none{
-				display: block;
-				width: 256rpx;
-				height: 44rpx;
-				padding-left: 20rpx;
-				border-radius: 11rpx;
-				background: $btn-confirm;
-				float: right;
-				line-height: 44rpx;
-				color: #FFFFFF;
-				text-align: center;
-				font-size: $font-size-24;
-			}
-			
-			.p-price-none{
-				height: 44rpx;
-				line-height: 44rpx;
-				float: left;
-				font-size: $font-size-24;
-				color: #666;
-				text-decoration: line-through;
-				margin-left: 8rpx;
-			}
-			.p-minBuy{
-				height: 44rpx;
-				line-height: 44rpx;
-				float: right;
-				padding: 0 18rpx;
-				border-radius: 22rpx;
-				background-color: #f7f7f7;
-				color: #7F7F7F;
-				font-size: 24rpx;
-				text-align: center;
-				.min-text{
-					margin: 0 6rpx;
-				}
-			}
-			.p-login{
-				height: 56rpx;
-				line-height: 56rpx;
-				color: $color-system;
-				font-size: $font-size-24;
-				&.grade{
-					.price-left{
-						float: left;
-						.none{
-							display: block;
-							font-size: $font-size-20;
-							line-height: 48rpx;
-							color: #4A4B54;
-							float: left;
-							font-weight: bold;
-							margin-left: 5rpx;
-							text{
-								letter-spacing: 4rpx;
-								font-size: $font-size-32;
-							}
-						}
-					}
-				}
-				.p-no{
-					float: left;
-					margin-right: 5rpx;
-					font-size: $font-size-28;
-					color: $text-color;
-				}
-				.p-login-btn{
-					display: block;
-					height: 44rpx;
-					padding: 0 10rpx 0 20rpx;
-					border-radius: 11rpx;
-					background: $btn-confirm;
-					float: right;
-					line-height: 44rpx;
-					color: #FFFFFF;
-					text-align: center;
-					font-size: $font-size-24;
-				}
-			}
-		}
-		.wrap-label{
-			float: left;
-			width: 100%;
-			box-sizing: border-box;
-			.label-a{
-				padding: 0 18rpx;
-				line-height: 32rpx;
-				font-size: $font-size-20;
-				color:$color-system;
-				text-align: center;
-				border-radius: 6rpx;
-				background:#ffe6dc;
-				margin: 0 20rpx 15rpx 0;
-				display: inline-block;
-			}
-		}
-		.wrap-top-price{
-			float: left;
-			width: 100%;
-			box-sizing: border-box;
-			.wrap-main-item{
-				width: 100%;
-				height: 56rpx;
-				.p-price{
-					height: 56rpx;
-					line-height: 56rpx;
-					float: left;
-					color: #FF2A2A;
-					font-weight: bold;
-					&.none{
-						text-decoration: line-through;
-						color: #999999;
-						font-weight: normal;
-					}
-					.txt{
-						margin:0 2rpx;
-					}
-					.txt.sm{
-						font-size: $font-size-26;
-					}
-					.txt.big{
-						font-size: $font-size-34;
-					}
-				}
-			}
-			.floor-item-act{
-				height: 56rpx;
-				text-align: center;
-				box-sizing: border-box;
-				float: left;
-				padding:10rpx 0;
-				margin-left: 10rpx;
-				.floor-tags{
-					height: 28rpx;
-					border-radius: 6rpx;
-					background-color: #FFFFFF;
-					line-height: 28rpx;
-					color: $color-system;
-					text-align: center;
-					display: inline-block;
-					padding:0 16rpx;
-					font-size: $font-size-20;
-					border: 1px solid #E15616;
-					float: right;
-				}
-			}
-			.floor-item-btn{
-				float: left;
-				height: 40rpx;
-				margin-top: 8rpx;
-				.btn{
-					line-height: 40rpx;
-					padding: 0 20rpx;
-					height: 40rpx;
-					background: $btn-confirm;
-					color: #FFFFFF;
-					font-size: $font-size-20;
-					border-radius: 4rpx;
-				}
-			}
-		}
-		.wrap-info{
-			float: left;
-			width: 702rpx;
-			padding: 24rpx 24rpx 0 24rpx;
-			border-bottom: 1px solid #F8F8F8;
-			.info-viewT{
-				width: 100%;
-				min-height: 40rpx;
-				font-size: $font-size-28;
-				color: $text-color;
-				line-height: 40rpx;
-				text-align: left;
-				&.none{
-					color: #999999;
-				}
-				.info-viewL{
-					min-width: 350rpx;
-					float: left;
-					margin-bottom: 24rpx;
-				}
-				.info-viewR{
-					min-width: 352rpx;
-					float: left;
-					margin-bottom: 24rpx;
-				}
-			}
-			.info-viewB{
-				width: 100%;
-				height: auto;
-			}
-			.info-f{
-				width: 50%;
-				float: left;
-				font-size: $font-size-28;
-				color: $text-color;
-				line-height: 40rpx;
-				margin-bottom: 24rpx;
-				text-align: left;
-			}
-		}
-	}
-	.product-seve{
-		width: 702rpx;
-		height: 90rpx;
-		padding: 0 24rpx;
-		background-color: #FFFFFF;
-		position: relative;
-		display: flex;
-		line-height: 90rpx;
-		border-bottom: 20rpx solid #F7F7F7;
-		.title{
-			line-height: 90rpx;
-			display: inline-block;
-			float: left;
-			font-size: $font-size-28;
-			color: $text-color;
-		}
-		.iconfont{
-			color: #fea785;
-			margin-right: 40rpx;
-			font-size: $font-size-26;
-		}
-		.text{
-			font-size: $font-size-26;
-			color: #fea785;
-			margin-left: 10rpx;
-		}
-	}
-	.product-parameter{
-		width: 702rpx;
-		height: 90rpx;
-		padding: 0 24rpx;
-		background-color: #FFFFFF;
-		position: relative;
-		display: flex;
-		border-bottom: 20rpx solid #F7F7F7;
-		.title{
-			line-height: 90rpx;
-			display: inline-block;
-			float: left;
-			font-size: $font-size-28;
-			color: #666666;
-		}
-		.name{
-			float: right;
-			line-height: 90rpx;
-			display: inline-block;
-			float: left;
-			font-size: $font-size-28;
-			color: $text-color;
-			float: right;
-			padding-right: 48rpx;
-			overflow: hidden;
-			text-overflow:ellipsis;
-			white-space: nowrap;
-			text-align: right;
-		}
-		.icon-xiayibu{
-			line-height: 90rpx;
-			display: inline-block;
-			position: absolute;
-			width: 48rpx;
-			top: 0;
-			right: 0;
-			color: #b2b2b2;
-		}
-	}
-	.product-supplier{
-		width: 100%;
-		height: 174rpx;
-		padding: 30rpx 24rpx;
-		box-sizing: border-box;
-		background-color: #FFFFFF;
-		position: relative;
-		box-sizing: border-box;
-		border-bottom: 20rpx solid #F7F7F7;
-		.logo{
-			width: 128rpx;
-			height: 92rpx;
-			float: left;
-			border: 1px solid #efefef;
-			border-radius: 6rpx;
-			image{
-				width: 100%;
-				height: 100%;
-				display: block;
-				border-radius: 6rpx;
-			}
-		}
-		.main{
-			width: 470rpx;
-			height: 92rpx;
-			float: left;
-			margin-left: 20rpx;
-			.name{
-				width: 100%;
-				line-height: 46rpx;
-				float: left;
-				font-size: $font-size-28;
-				color: $text-color;
-				float: right;
-				overflow: hidden;
-				text-overflow:ellipsis;
-				white-space: nowrap;
-				text-align: left;
-			}
-			.massgs{
-				width: 100%;
-				line-height: 46rpx;
-				float: left;
-				font-size: $font-size-24;
-				color: #999999;
-				.label{
-					float: left;
-				}
-				.p-stars{
-					float: left;
-					margin-left: 20rpx;
-				}
-				.acount{
-					float: right;
-					text{
-						color: $color-system;
-					}
-				}
-			}
-		}
-		
-		.icon-xiayibu{
-			line-height: 154rpx;
-			display: inline-block;
-			position: absolute;
-			width: 48rpx;
-			top: 0;
-			right: 0;
-			color: #b2b2b2;
-		}
-	}
-	.product-details {
-		background: #FFFFFF;
-		border-bottom: 20rpx solid #F7F7F7;
-		padding: 24rpx;
-		&.service{
-			border-bottom: none;
-		}
-		&.recommend{
-			background-color: #F7F7F7;
-			border-bottom: none;
-			padding: 0;
-			.title{
-				.title-tab{
-					background-color: #F7F7F7;
-					color: $text-color;
-					padding: 0 24rpx;
-					
-				}
-			}
-		}
-		.title{
-			width: 100%;
-			box-sizing: border-box;
-			// padding: 0 24rpx;
-			.title-tab{
-				width: 100%;
-				height: 100rpx;
-				background: #fff;
-				z-index: 10;
-				font-size: $font-size-30;
-				text-align: left;
-				color: $text-color;
-				line-height: 100rpx;
-				font-weight: 600;
-				box-sizing: border-box;
-			}
-			.title-msg{
-				width: 100%;
-				height: 236rpx;
-				padding: 18rpx;
-				background-color: rgba(225,86,22, 0.1);
-				color: $color-system;
-				box-sizing: border-box;
-				margin-bottom: 30rpx;
-				.tit{
-					line-height: 46rpx;
-					font-size: $font-size-24;
-					text-align: left;
-				}
-				.txt{
-					line-height: 38rpx;
-					font-size: $font-size-20;
-					text-align: justify;
-				}
-			}
-		}
-	
-		.content{
-			width: 100%;
-			// background-color: #FFFFFF;
-		}
-	}
-	.isLower{
-		width: 100%;
-		height: 116rpx;
-		line-height: 116rpx;
-		text-align: center;
-		color: #000000;
-		font-size: $font-size-32;
-		font-weight: bold;
-	}
-	.bottom-btn{
-		width: 100%;
-		height: 110rpx;
-		position: fixed;
-		bottom: 0;
-		left: 0;
-		background: #FFFFFF;
-		z-index: 99;
-		.bottom-le{
-			width: 302rpx;
-			height: 86rpx;
-			padding:12rpx 24rpx;
-			float: left;
-			.item-bt{
-				width: 86rpx;
-				height: 100%;
-				margin-right:22rpx;
-				display: flex;
-				float: left;
-				flex-direction: column;
-				align-items: center;
-				font-size: $font-size-24;
-				color: $text-color;
-				line-height: 34rpx;
-				position: relative;
-				.animation-num{
-					font-size:$font-size-32 ;
-					color: #FF2A2A;
-					position: absolute;
-					top: -12rpx;
-					right: 4rpx;
-					font-weight: bold;
-				}
-				.animation{
-					animation: showAmnation 2.2s ease-in-out both;
-				}
-				.restion{
-					animation: hideAmnation 1s ease-in-out both;
-				}
-				.icon-num{
-					position: absolute;
-					right:-12rpx;
-					top: -9rpx;
-				}
-				.icon-num.goleft{
-					right: 4rpx;
-				}
-				&:last-child{
-					margin-right: 0;
-				}
-				image {
-					width: 40rpx;
-					height: 40rpx;
-					margin-bottom: 8rpx;
-				}
-				button.contact-btn{
-					width: 100%;
-					height: 100%;
-					margin: 0;
-					padding: 0;
-					display: flex;
-					flex-direction: column;
-					align-items: center;
-					box-sizing: border-box;
-					font-size: $font-size-24;
-					text-align: center;
-					text-decoration: none;
-					line-height: 34rpx;
-					border-radius: 0;
-					-webkit-tap-highlight-color: transparent;
-					overflow: hidden;
-					color: $text-color;
-					background-color:#FFFFFF;
-				}
-			}
-		}
-		.bottom-ri{
-			width: 400rpx;
-			height: 100%;
-			float: right;
-			display: flex;
-			box-sizing: border-box;
-			padding: 13rpx 20rpx 13rpx 0;
-			.btn{
-				flex: 1;
-				width: 200rpx;
-				line-height: 84rpx;
-				text-align: center;
-				font-size: $font-size-28;
-				color: #FFFFFF;
-			}
-			.btn-cart{
-				background-color: #ffe6dc;
-				color: $color-system;
-				border-radius: 42rpx 0 0 42rpx;
-			}
-			.btn-cart.disabled{
-				background-color: #E1E1E1;
-			}
-			.btn-bay{
-				background:linear-gradient(to right, #f28f31 0%, #e15616 100%);
-				border-radius: 0 42rpx 42rpx 0;
-			}
-			.btn-bay.disabled{
-				background-color: linear-gradient(135deg,rgba(242,143,49,0.5) 0%,rgba(225,86,22,0.5) 100%);;
-			}
-		}
-	}
-	.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;
-	}
-	/* 加入购物模态层*/
-	@keyframes showPopup {
-		0% {
-			opacity: 0;
-		}
-		100% {
-			opacity: 1;
-		}
-	}
-	@keyframes hidePopup {
-		0% {
-			opacity: 1;
-		}
-		100% {
-			opacity: 0;
-		}
-	}
-	@keyframes showLayer {
-		0% {
-			transform: translateY(0);
-		}
-		100% {
-			transform: translateY(-100%);
-		}
-	}
-	@keyframes hideLayer {
-		0% {
-			transform: translateY(-100%);
-		}
-		100% {
-			transform: translateY(0);
-		}
-	}
-	@keyframes showAmnation {
-		0% {
-			top: -12rpx;
-			opacity: 0;
-		}
-		50% {
-			top: -60rpx;
-			opacity: 1;
-		}
-		100% {
-			top: -100rpx;
-			opacity: 0;
-		}
-	}
-	@keyframes hideAmnation {
-		0% {
-			top: -100rpx;
-			opacity: 0;
-		}
-		100% {
-			top: -12rpx;
-			opacity: 0;
-		}
-	}
-	.popup {
-		position: fixed;
-		top: 0;
-		width: 100%;
-		height: 100%;
-		z-index: 999;
-		display: none;
-		.mask{
-			position: fixed;
-			top: 0;
-			width: 100%;
-			height: 100%;
-			z-index: 21;
-			background-color: rgba(0, 0, 0, 0.6);
-		}
-		.layer {
-			position: fixed;
-			z-index: 22;
-			bottom: -294rpx;
-			width: 702rpx;
-			padding: 24rpx 24rpx 36rpx 24rpx;
-			height: 260rpx;
-			border-radius: 20rpx 20rpx 0 0;
-			background-color: #fff;
-			display: flex;
-			flex-wrap: wrap;
-			align-content: space-between;
-			.content {
-				width: 100%;
-			}
-			.btn {
-				width: 100%;
-				height: 88rpx;
-				margin-top: 20rpx;
-				.button {
-					width: 100%;
-					height: 88rpx;
-					color: #fff;
-					display: flex;
-					align-items: center;
-					justify-content: center;
-					background: $btn-confirm;
-					font-size: $font-size-28;
-					border-radius: 14rpx;
-				}
-			}
-		}
-		
-		&.show {
-			display: block;
-			.mask{
-				animation: showPopup 0.2s linear both;
-			}
-			.layer {
-				animation: showLayer 0.2s linear both;
-			}
-		}
-		&.hide {
-			display: block;
-			.mask{
-				animation: hidePopup 0.2s linear both;
-			}
-			
-			.layer {
-				animation: hideLayer 0.2s linear both;
-			}
-		}
-		&.none {
-			display: none;
-		}
-		&.service {
-			.row {
-				margin: 30upx 0;
-				.title {
-					font-size: 30upx;
-					margin: 10upx 0;
-				}
-				.description {
-					font-size: 28upx;
-					color: #999;
-				}
-			}
-		}
-		.layer-smimg{
-			width: 114rpx;
-			height: 114rpx;
-			float: left;
-			border-radius: 10rpx;
-			margin-right: 24rpx;
-			image{
-				width: 114rpx;
-				height: 114rpx;	
-				border-radius: 10rpx;
-			}
-		}
-		.layer-nunbox{
-			justify-content: space-between;
-			align-items: center;
-			width: 536rpx;
-			height: auto;
-			float: left;
-			.layer-nunbox-t{
-				width: 100%;
-				height:44rpx;
-				position:relative;
-				display: flex;
-				margin-bottom: 10rpx;
-				.text{
-					font-size: $font-size-24;
-					line-height: 48rpx;
-					color: #999999;
-				}
-				.layer-nunbox-text{
-					line-height: 44rpx;
-					font-size: $font-size-28;
-				}
-				.number-box{
-					display: flex;
-					justify-content: center;
-					align-items: center;
-					.iconfont{
-						font-size: $font-size-32;
-						padding:0 18rpx;
-						font-size: $text-color;
-					}
-					.btn-input{
-						width: 62rpx;
-						height: 48rpx;
-						line-height: 48rpx;
-						background: #F8F8F8;
-						border-radius: 4rpx;
-						text-align: center;
-						font-size: $font-size-28;
-					}
-				}
-				.product-step{
-					position: absolute;
-					left: 45rpx;
-					bottom: 0;
-					height: 44rpx;
-					background: #FFFFFF;
-				}
-			}
-			.layer-nunbox-b{
-				width: 100%;
-				height:44rpx;
-				margin-top: 13rpx;
-			}
-			.text{
-				line-height: 44rpx;
-				font-size: $font-size-28;
-				.p{
-					color: #FF2A2A;
-				}
-				.p:first-child{
-					margin-left: 30rpx;
-				}
-				.p.sm{
-					font-size: $font-size-24;
-				}
-			}
-		}
-	}
-	.tui-popup-box {
-		position: relative;
-		box-sizing: border-box;
-		min-height: 220rpx;
-		padding:0rpx 24rpx 24rpx 24rpx;
-		.title{
-			font-size: $font-size-34;
-			color: $text-color;
-			line-height: 88rpx;
-			text-align: center;
-			float: left;
-			width: 100%;
-			height: 88rpx;
-		}
-		.content{
-			width: 100%;
-			height: auto;
-			float: left;
-			.content-tr{
-				width: 100%;
-				height: 58rpx;
-				line-height: 58rpx;
-				display: flex;
-				.content-td{
-					display: flex;
-					flex: 3;
-					font-size: $font-size-26;
-					color: #999999;
-					line-height: 58rpx;
-					text-align: left;
-				}
-				.content-th{
-					display: flex;
-					flex: 7;
-					font-size: $font-size-26;
-					color: #333333;
-					line-height: 58rpx;
-					text-align: left;
-				}
-			}
-		}
-	}
-	.tui-popup-btn {
-		width: 100%;
-		height: auto;
-		float: left;
-		margin-top: 24rpx;
-		.tui-button{
-			width: 100%;
-			height: 88rpx;
-			background: $btn-confirm;
-			line-height: 88rpx;
-			text-align: center;
-			color: #FFFFFF;
-			font-size: $font-size-28;
-			border-radius: 44rpx;
-		}
-	}
-	/*富文本样式*/
-	rich-text.p{
-		width: 702rpx !important;
-		padding: 0 24rpx;
-		text-align: justify;
-	}
-	rich-text.img{
-		width: 100%;
-		height: auto;
-	}
-	.Disclaimer {
-	    background: rgba(225,86,22,0.1);
-	    border-radius:20rpx;
-	    padding:0 20rpx  20rpx 20rpx;
-		font-size: 20rpx;
-		color: #e15616;
-		margin-bottom: 30rpx
-	}
-	.Disclaimer span {
-	    display: block;
-	    padding: 20rpx 0;
-	    text-align: left;
-		font-size: 24rpx;
-	}
-	.Disclaimer .text {
-	    line-height:48rpx;
-	}
-	.brandinfo{
-		color: #333333;
-		line-height: 46rpx;
-		font-size: 26rpx;
-		}
-		.imgList{
-			width: 702rpx; 
-			margin: auto;
-			height: 710rpx;
-			margin-bottom: 20rpx;
-		}
-		.imgList img{
-			width: 100%;
-			height: 100%;
-			
-		}
-		.detailsText{
-			padding: 0 30rpx 30rpx 30rpx;
-			color: #333333;
-			font-size: 24rpx;
-			text-align: left;
-		}
-</style>

second/pages/product/product-list.vue

@@ -1,559 +0,0 @@
-<template name="secondList">
-	<view class="container">
-		<view class="good-search-top">
-			<view class="search-from name" @click="this.$api.navigateTo(clickPath)">
-				<text class="iconfont icon-iconfonticonfontsousuo1"></text>
-				<view class="input">请输入商品关键词</view>
-				<text class="iconfont icon-shanchu1" v-if="isShowClose" @click="delInputText"></text>
-			</view>
-		</view>
-		<view class="ListImg" v-if="searchHide">
-			<image src="https://static.caimei365.com/app/img/bg/banner.png" class="banner-img"></image>
-		</view>
-		<view class="main-content" v-if="searchHide">
-			<view class="secondTitle">
-				<view class="ClassA" @click="handle('1')" :class="[currentId == '1' ? 'active':'',currentId == '1' ? 'off':'']">
-					{{ tabTitleName }}
-					<text class="iconfont" :class="mainflag ? 'icon-xiangshangjiantou':'icon-xiangxiajiantou'"></text>
-					<view class="line" v-if="currentId == '1'"></view>
-				</view>
-				<!-- <view class="ClassA" @click="handle('2')" :class="[currentId == '2' ? 'active':'',currentId == '2' ? 'off':'']">
-					临期产品
-					<view class="line" v-if="currentId == '2'"></view>
-				</view> -->
-				<view class="ClassA" @click="handle('3')" :class="[currentId == '3' ? 'active':'',currentId == '3' ? 'off':'']">
-					其他
-					<view class="line" v-if="currentId == '3'"></view>
-				</view>
-			</ul>
-		</view>
-		<view class="mainTab" v-if="mainflag" v-show="searchHide">
-			 <view class="li" v-for="(item,index) in tabList" @click='handleChild(item)' :key="index" :class="currentID2 ==index?'addstyle':' '">{{item.name}}</view>
-		</view>
-		<view class="shopList" :style="{'overflow':(showSkeleton? 'hidden' : 'auto'),'height': (showSkeleton? windowHeight + 'px' : 'auto')}">
-			<scroll-view :style="{'height':scrollHeight+'px'}" @scrolltolower="scrolltolower" scroll-y v-if="tabchildList.length > 0">
-		            <view class="Listitem" v-if="isShow" v-for="(item, index) in tabchildList" :key="index" :class="item.sold==1?'activeImg':''"
-					 :productid="item.productID" @click.stop="navToDetailPage(item.productID)">
-		                <view class="itemImg onhref" >
-		                    <image :src="item.imageList[0]" class="bigImg"></image>
-							<image src="https://static.caimei365.com/app/img/icon/yishou.png" class="yishou_bg" v-if="item.sold==1&&item.newAdded==1||item.sold==1&&item.newAdded==0"></image>
-		                </view>
-		               <view class="ItemInfo">
-							<text class="infotag news" v-if="item.sold==0&&item.newAdded==1">新</text>
-		                    <view class="productname" href="" :style="item.sold==0&&item.newAdded==1?'text-indent:60rpx':''">
-		                        {{item.name}}
-		                    </view>
-		                    <view class="targetprice" >
-		                        <text v-if="item.detailTalkFlag ==2 && hasLogin==false">￥详聊</text>
-		                        <text v-else-if="!hasLogin" class="priceparam" @click.stop="this.$api.navigateTo('/pages/login/login')">登录查看价格></text>
-		                        <text v-else-if="hasLogin && item.detailTalkFlag==2">￥详聊</text>
-		                        <text v-else>￥{{item.price1Str}}</text>
-		                    </view>
-							<view class="shijian">
-								<text class="iconfont  icon-shijian"></text> {{item.onLineDateStr}}
-							</view>
-		                    <view class="dizhi">
-								<view class="dizhi_left">
-									<text class="iconfont  icon-dizhi1"></text>
-									{{item.provinceCityDistrict}}
-								</view>
-		                        <view class="liulan_right">
-									<text class="iconfont  icon-kejian1"></text>
-		                           {{item.viewingNum ? item.viewingNum : '0'}}
-		                        </view>
-		                    </view>
-		                </view>
-		            </view>
-					<view v-if="showLoading && tabchildList.length > 4">
-						<view class="loading-wrapper loading-wrapper-now" v-if="loadingNow">{{loadingText}}<text v-if="loadingText === '已至底部'">‧ ‧ ‧</text></view>
-						<view class="loading-wrapper loading-wrapper-btm" v-else>———<text class="btm-text">已至底部</text>———</view>
-					</view>
-					</scroll-view>
-		            <view class="no-content" v-show="showflag" :class="showflag?'show':''">
-		                <image src="https://static.caimei365.com/app/img/bg/kong_m.png"  />
-		                <view class="error-message">
-		                    <view>该分类下面没有商品，请更换其它分类</view>
-		                </view>
-		            </view>
-		        </view>
-				<view class="fabu" :style="{ paddingBottom :isIphoneX ? '68rpx' : '0rpx' }">
-					 <text  class="intro"  @click.stop="gotointro" >二手市场介绍</text>
-					 <text  class="release" @click.stop="gotoform" >我要发布</text>
-				</view>
-				<!-- 透明模态层 -->
-				<modal-layer v-if='isModallayer'></modal-layer>
-		</view>
-	</view>
-</template>
-
-<script>
-	import authorize from '@/common/config/authorize.js'
-	import wxLogin from "@/common/config/wxLogin.js"
-	import modalLayer from "@/components/modal-layer"
-	import { mapState,mapMutations } from 'vuex';
-	export default{
-		name:'secondList',
-		components:{
-			modalLayer
-		},
-		data(){
-			return{
-				clickPath:'/search/pages/search/search-second',
-				 isShowClose:false,
-				 isModallayer:false,
-				 currentId:1,
-				 currentID2:0,
-				 isShow:false,
-				 requestFlag: true,
-				 showflag:false,
-				 mainflag:false,
-				 tabTitleName:'二手仪器',
-				 tabTitle: [
-							{value:'1',name:'二手仪器'},
-							{value:'2',name:'临期产品'},
-							{value:'3',name:'其他'}
-						   ],
-			    tabList : [
-							{value:'0',name:'全部'},
-							{value:'1',name:'轻光电'},
-							{value:'2',name:'重光电'},
-							{value:'3',name:'耗材配件'},
-				   ],
-			    // listQuery:{
-						pageNum:1,
-						pageSize:10,
-						name:'',
-					// },   
-			  tabchildList:[],
-			  productsList:[],
-			  tabchild:{},
-			  params:{},
-			  hasNextPage:false ,
-			  showLoading: false,
-			  loadingNow: true,
-			 loadingText: '上拉加载更多',
-			 pullFlag: true,
-			 isFocus:false,
-			 isShowEmpty: false,
-			 isShowEmptyText: '搜索相关商品',
-			 showSkeleton:true,
-			 windowHeight: '',
-			 scrollHeight: '',
-			 searchHide:true,
-			}
-		},
-		created() {
-			 this.setScrollHeight();		
-			 this.gettabList();
-			 this.isFocus = true;
-		},
-		onLoad(option) {
-			if(option.type =='share'){
-				authorize.getSetting().then(wxResponse =>{// console.log('是否已授权',res);//0:为取消授权 1:为已授权 2:为未操作
-					console.log(wxResponse)
-					if(wxResponse == 1){
-						wxLogin.wxLoginAuthorize()
-					}else{
-						console.log(new Date +'用户未授权微信信息')
-					}
-				})	
-			}
-		},
-		computed: {
-			...mapState(['hasLogin','userInfo'])
-		},
-		methods:{
-			scrolltolower() {
-				if(this.hasNextPage && this.pullFlag) {
-					this.gettabList(true);
-				}
-			},
-			setScrollHeight() {
-				const {windowHeight, pixelRatio} = wx.getSystemInfoSync();
-				this.windowHeight = windowHeight - 1;
-				this.scrollHeight = windowHeight - 1;
-			},
-			handle: function (index) {//一級分类
-				   const _this = this;
-				   _this.currentId = index;
-				   _this.tabTitleName = '二手仪器';
-				   this.pageNum = 1
-				   if ( _this.currentId == '1'){
-						_this.mainflag = !_this.mainflag;
-				   }else {
-						_this.mainflag=false;
-						_this.currentID2 = 0;
-				   }
-				   _this.gettabList();
-			          },
-			 handleChild:function(item){ //二级分类
-				const _this = this;
-			   _this.currentID2 = item.value;
-			   _this.tabTitleName = item.name;
-			   if (_this.currentID2==item.value){
-				   _this.mainflag=false;
-			   }
-		       _this.gettabList();
-			  },	
-		    gotointro:function(){
-				this.$api.navigateTo('/second/pages/form/introduce');
-			},
-			gotoform:function(){
-				this.$api.navigateTo('/second/pages/form/form');
-			},
-			navToDetailPage:function(id) {
-				this.isModallayer = true;
-				this.$api.navigateTo(`/second/pages/product/product-details?id=${id}`);
-				this.isModallayer = false;
-			},
-			gettabList:function (loadMore) {
-				this.showLoading = true;
-				this.loadingNow = true;
-				this.loadingText = '加载中';
-				this.isShowEmpty = false;				
-				if(loadMore) {this.pageNum += 1;}
-				let params = {
-						secondHandType:this.currentId,
-						instrumentType:this.currentID2,
-						name:this.name,
-						pageNum:this.pageNum,
-						pageSize:this.pageSize
-				}
-				this.SecondService.SeconHandProductList(params).then(res =>{
-					 if (res.code == 0) {
-						   const data = res.data;
-						   if(data.results.length == 0){
-							   this.tabchildList = [];
-							   this.showflag = true;
-							   this.listRecord = data.totalRecord;
-						   }else {
-							   this.showflag = false;
-							   this.isShow = true;
-							   let results = data.results;
-							   if(loadMore) {
-								this.tabchildList = [...this.tabchildList,...results];
-							   } else {
-								this.tabchildList = [...results];
-								this.showSkeleton = false;
-							   }
-							   this.hasNextPage = data.hasNextPage;
-							   this.listRecord = data.totalRecord;
-							  
-						   }
-						   // 防上拉暴滑
-						   this.pullFlag = false;
-						   setTimeout(()=>{ this.pullFlag = true; },500)
-						   // 底部提示文案
-						   if(this.hasNextPage) {
-							this.loadingText = '上拉加载更多';
-						   } else {
-							this.showLoading = true;
-							this.loadingNow = false;
-							this.loadingText = '已至底部';
-						   }
-						 }else{
-							this.$util.msg(error.msg,2000);
-						 }
-					this.requestFlag = true;
-				})
-			},	
-			onShowClose () {//输入框失去焦点时触发
-				if(this.name != ''){
-					this.isShowClose = true;
-				}else{					
-					this.isShowClose = false
-				}
-			},
-			delInputText(){//清除输入框内容
-			  	this.name = '';
-			  	this.tabchildList =[];
-			  	this.isFocus = true
-			  	this.isShowClose = false;
-			  	this.loadingNow = false;
-			  	this.isShowEmpty = true;
-			  	this.secondHandType = 1;
-			  	this.instrumentType='';
-			  	this.gettabList();
-				this.searchHide = true;
-			},
-			searchOpertor(){//搜索商品
-				if(this.name == ''){
-					this.$util.msg('请输入商品关键词',2000)
-					this.secondHandType = 1
-					this.instrumentType=''
-					// this.gettabList();
-					this.searchHide = true;
-				}else{
-					this.pageNum = 1
-					this.showSkeleton = true;
-					this.gettabList();
-					this.isFocus = false;
-					this.searchHide = false;
-					
-				}
-			},
-		},
-		onShareAppMessage(res){//分享转发
-			if (res.from === 'button') {
-		      // 来自页面内转发按钮
-		    }
-			return {
-			  title: `欢迎来到采美二手市场~`,
-			  path: `search/pages/search-instrument?keyWord=${this.listQuery.keyword}`
-			}
-		},	
-	}
-</script>
-<style lang="scss">
-	.ClassA .iconfont{
-		position: absolute;
-		right: 20rpx;
-	}
-	.warp-container{
-		width: 100%;
-		height: 100%;
-	}
-	.good-search-top{
-		width: 702rpx;
-		height: 70rpx;
-		flex: 1;
-		margin: 20rpx auto;
-		
-	}
-	.search-from{
-		width: 702rpx;
-		height: 66rpx;
-		background: #F7F7F7;
-		border-radius: 40rpx;
-		float: left;
-		position: relative;
-	}
-	.input{
-		width: 340rpx;
-		height: 66rpx;
-		float: left;
-		line-height: 66rpx;
-		color: #b2b2b2;
-		font-size: 28rpx;
-	}
-	.icon-iconfonticonfontsousuo1{
-		width: 64rpx;
-		height: 66rpx;
-		line-height: 66rpx;
-		text-align: center;
-		display: block;
-		font-size: 38rpx;
-		float: left;
-		color: #999999;
-	}
-	.icon-shanchu1{
-		font-size:32rpx;
-		color: #999999;
-		position: absolute;
-		width: 120rpx;
-		height: 70rpx;
-		line-height: 70rpx;
-		top: 0;
-		right: 0;
-		text-align: center;
-		z-index: 10;
-	}
-	.ListImg{
-		width: 750rpx;
-		height: 266rpx;
-	}
-	.banner-img{
-		width: 100%;
-		height: 100%;
-	}
-	.secondTitle {
-		width: 100%;
-		height:90rpx;
-		background-color: #ffffff;
-		border-bottom: 2rpx solid #F0F2F4;
-		position: relative;
-	}
-	.ClassA.active {
-		color: #E15621;
-	}
-	.ClassA {
-		width: 240rpx;
-		height: 90rpx;
-		display: inline-block;
-		text-align: center;
-		line-height: 90rpx;
-		font-size: 30rpx;
-		cursor: pointer;
-		color: #666666;
-		border: 0;
-		position: relative;
-		.line {
-		    width: 10vw;
-		    margin: 0 auto;
-		    height: .48vw;
-		    background-color: #e15616;
-		    display: block;
-		}
-	}
-	.mainTab {
-		background: #fff;
-		width: 29vw;
-		position: absolute;
-		z-index: 1;
-		border-radius: 6rpx;
-		box-shadow:0rpx 6rpx 12rpx 0rpx rgba(0, 0, 0, 0.07);
-		.li{
-			height: 80rpx;
-			line-height: 80rpx;
-			text-align: center;
-			color: #627386;
-			cursor: pointer;
-			&.addstyle{
-				color: #e15616;
-			}
-		}
-		.line {
-			width: 75rpx;
-			margin: 0 auto;
-			height: 4rpx;
-			background-color: #e15616;
-			display: block;
-		}
-	}
-	.no-content{
-		width: 100%;
-		text-align: center;
-		top: 50%;
-		position: absolute;
-		image{
-			width: 306rpx;
-			height: 212rpx;
-		}
-
-	}
-	.error-message{
-		font-size: 24rpx;
-		color: #b2b2b2;
-	}
-	.Listitem {
-		height: 202rpx;
-		padding:30rpx 20rpx;
-		border-bottom: 2rpx solid #F0F2F4;
-	}
-	.itemImg {
-		width: 180rpx;
-		height: 180rpx;
-		float: left;
-		background: #000;
-		position: relative;
-		.bigImg {
-			width: 100%;
-			height: 100%;
-		}
-	}
-	.activeImg {
-		opacity: 0.5;
-	}
-	.ItemInfo {
-		float: right;
-		width:500rpx;
-		.dizhi{
-			font-size: 24rpx;
-			color: #999999;
-			margin-top: 10rpx;
-		}
-		.shijian{
-			font-size: 24rpx;
-			color: #999999;
-			margin-top: 10rpx;
-		}
-	}
-	.infotag{
-		font-size: 20rpx;
-		padding: 5rpx 15rpx;
-		background: #f94b4b;
-		color: #fff;
-		position: absolute;
-		border-radius: 6rpx;
-	}
-	.productname{
-		display: inline-block;
-		font-size: 28rpx;
-		color: #333333;
-		vertical-align: top;
-		text-overflow: -o-ellipsis-lastline;
-		overflow: hidden;
-		text-overflow: ellipsis;
-		display: -webkit-box;
-		-webkit-line-clamp: 2;
-		line-clamp: 2;
-		-webkit-box-orient: vertical;
-		width: 500rpx;
-	}
-	.targetprice {
-		font-size: 26rpx;
-		color: #f94b4b;
-		cursor: pointer;
-		margin: 15rpx 0;
-	}
-	.icon-shijian{
-		font-size: 30rpx;
-		color: #999999;
-		margin-right: 10rpx;
-	}
-	.icon-kejian1{
-		font-size: 30rpx;
-		color: #999999;
-		margin-right: 10rpx;
-	}
-	.icon-dizhi1{
-		font-size: 30rpx;
-		color: #999999;
-		margin-right: 10rpx;
-	}
-	.dizhi_left{
-		float: left;
-	}
-	.liulan_right{
-		float: right;
-		margin-right: 25rpx;
-	}
-	.itemImg  {
-		.yishou_bg{
-			width: 90rpx;
-			height: 90rpx;
-			position: absolute;
-			top: 50%;
-			left: 50%;
-			transform: translate(-50%, -50%)
-		}
-	}
-	.fabu {
-		text{
-			display: inline-block;
-			width: 280rpx;
-			height: 84rpx;
-			line-height: 84rpx;
-			text-align: center;
-			border-radius: 42rpx;
-			margin: 15rpx;
-			font-size: 30rpx;
-		}
-	}
-	.fabu{
-		position: fixed;
-		bottom: 0;
-		width: 100%;
-		background: #fff;
-		.intro{
-			background: #ffe6dc;
-			color: #e15616;
-		}
-		.release{
-			background: $btn-confirm;
-			color: #ffffff;
-			width: 402rpx;
-		}
-	}
-
-</style>

seller/pages/address/address.vue

@@ -1,301 +0,0 @@
-<template>
-	<view class="container clearfix">
-		<view v-if="isEmpty" class="empty-container">
-			<image class="empty-container-image" src="https://img.caimei365.com/group1/M00/03/71/Cmis2F3wna6AFmO1AAGxLZjSeDg040.png" mode="aspectFit"></image>
-			<view class="txt">您还没有收货地址</view>
-			<view class="txt">点击底部按钮添加收货地址吧~~</view>
-			<view class="login-btn" @click="addAddress('add')">添加新地址</view>
-		</view>
-		<view v-else class="address-list" :style="{'height': scrollHeight + 'px'}">
-			<scroll-view scroll-y="true" :style="{'height': scrollHeight + 'px'}">
-				<view class="list" v-for="(item, index) in addressList" :key="index" @click="checkAddress(item)">
-					<view class="wrapper">
-						<view class="u-box">
-							<text class="name">{{item.shouHuoRen}}</text>
-							<text class="mobile">{{item.mobile}}</text>
-						</view>
-						<view class="u-box b-b">
-							<text class="address">收货地址：{{item.province}}{{item.city}}{{item.town}}{{item.address}}</text>
-						</view>
-						<view class="u-box b-t">
-							<view v-if="item.defaultFlag == 1" class="tag-left">
-								<view class="tag">默认地址</view>
-							</view>
-							<view v-else class="tag-left"></view>
-							<view class="tag-right">
-								<view class="t-b"  @click.stop="deleteAddress(item.addressID)">
-									<text class="iconfont icon-shanchu"></text>
-									<text class="txt">删除</text>
-								</view>
-								<view class="t-b"  @click.stop="addAddress('edit',item)">
-									<text class="iconfont icon-bianji"></text>
-									<text class="txt">编辑</text>
-								</view>
-								
-							</view>
-						</view>
-					</view>
-				</view>
-			</scroll-view>
-			<view class="add-btn" @click="addAddress('add')">添加新地址</view>
-		</view>
-		<!-- 删除弹窗 -->
-		<model-alert v-if="isShowDelModal"
-					 :alertText='alertText' 
-					 @btnConfirm ='confirmDetele'>
-		</model-alert>
-	</view>
-</template>
-
-<script>
-	import authorize from '@/common/config/authorize.js'	
-	import modelAlert from '@/components/cm-module/modelAlert/modelAlert.vue'
-	export default {
-		components:{
-			modelAlert
-		},
-		data() {
-			return {
-				isSelect:false,
-				isEmpty:false,
-				isLoadMore:false,
-				userID:'',
-				pageNum:1,
-				pageSize:10,
-				addressList: [],
-				hasNextPage:false,
-				allowDataStatus:true,
-				wrapperHeight:'100%',
-				scrollHeight:'',
-				currPage:'',//当前页面
-				prevPage:''//上一个页面
-			}
-		},
-		onLoad(option){	
-			if(option.type=='select'){this.isSelect = true;}
-			this.setScrollHeight();
-		},
-		onReachBottom() {
-			if(this.isLoadMore) {
-				this.initAddressList();
-			}
-		},
-		methods: {
-			setScrollHeight() {	// 窗口高度 - 底部距离
-				setTimeout(()=> {
-					const query = wx.createSelectorQuery().in(this);
-					query.selectAll('.add-btn').boundingClientRect();
-					query.exec(res => {
-						if(res[0][0]){
-							let winHeight = this.$api.getWindowHeight(),
-								eleTop = res[0][0].top - 1;
-								this.scrollHeight =  eleTop;
-						}
-					})
-				}, 500)
-			},
-			initAddressList(){	
-				this.$api.getComStorage('orderUserInfo').then((resolve) =>{
-					this.userID = resolve.userID
-					let params = {pageNum:this.pageNum,pageSize:this.pageSize,userID:this.userID}
-					this.UserService.QueryAddressList(params).then(response =>{
-						if(response.data.results == ''){
-							this.isEmpty = true
-						}else{
-							this.isEmpty = false
-							let results =[];
-							results = response.data.results;
-							this.addressList = this.addressList.concat(results);
-							this.pageNum = response.index +1;
-							if(this.pageNum === response.totalPage + 1 ){
-								this.isLoadMore = false;
-							} else {
-								this.isLoadMore = true;
-							}
-						}
-					}).catch(error =>{
-						this.$util.msg(error.msg,2000)
-					})
-				})
-				
-			},
-			//选择地址
-			checkAddress(item){
-				//是否需要返回地址(从订单确认页跳过来选收货地址)
-				if(!this.isSelect){return ;}
-				uni.setStorageSync('selectAddress',item)
-				var pages = getCurrentPages();
-				var prevPage = pages[pages.length - 2];  //上一个页面	
-					prevPage.setData({select:'select'})
-				uni.navigateBack();
-			},
-			addAddress(type,item){
-				uni.navigateTo({
-					url: `/seller/pages/address/addressManage?type=${type}&data=${JSON.stringify(item)}`
-				})
-			},
-			//删除收货地址
-			deleteAddress(id){
-				this.$util.modal('','确定要删除该地址？','确定','取消',true,() =>{
-					this.UserService.DeleteNewAddress({addressID:id,userID:this.userID}).then(response =>{
-						this.$util.msg('删除成功',2000,true,'success')
-						setTimeout(() =>{
-							this.pageNum = 1;
-							this.addressList = [];
-							this.initAddressList();
-						},2000)
-					}).catch(error =>{
-						this.$util.msg(error.msg,2000);
-						setTimeout(function(){
-							uni.switchTab({
-								url:'/seller/pages/home/home'
-							})
-						},1000)
-					})
-				})
-			}
-		},
-		onShow() {
-			this.$api.getStorage().then((resolve) =>{
-				this.userID = resolve.userID
-				this.pageNum = 1;
-				this.addressList = [];
-				this.initAddressList();
-				var pages = getCurrentPages();
-				var prevPage = pages[pages.length - 2];  //上一个页面	
-					// prevPage.setData({select:''})
-			})
-		}
-	}
-</script>
-
-<style lang='scss'>
-	page {
-		height: auto;
-	}
-	page,.container{
-		/* padding-bottom: 120upx; */
-		background: #F7F7F7;
-		border-top: 1px solid #EBEBEB;
-	}
-	.container{
-		position: relative;
-	}
-	.list{
-		display: flex;
-		align-items: center;
-		width: 702rpx;
-		height: auto;
-		padding: 24rpx;
-		background: #FFFFFF;
-		position: relative;
-		border-bottom: 1px solid #EBEBEB;
-	}
-	.wrapper{
-		display: flex;
-		flex-direction: column;
-		flex: 1;
-	}
-	.u-box.b-b{
-		
-	}
-	.u-box.b-b{
-		margin-bottom:24rpx;
-	}
-	.u-box.b-t{
-		margin-bottom:0;
-	}
-	.u-box{
-		display: flex;
-		align-items: center;
-		font-size: $font-size-28;
-		color: $text-color;
-		line-height: 40rpx;
-		margin-bottom: 12rpx;
-		.name{
-			margin-right: 40rpx;
-			font-weight: bold;
-		}
-		.mobile{
-			font-weight: bold;
-		}
-		.tag-left{
-			flex: 6;
-			.tag{
-				width: 120rpx;
-				height: 40rpx;
-				background: $color-system;
-				border-radius: 20rpx;
-				font-size: $font-size-24;
-				color: #FFFFFF;
-				line-height: 40rpx;
-				text-align: center;
-				padding: 0 6rpx;
-			}
-		}
-		.tag-right{
-			flex: 4;
-			display: flex;
-			text-align: right;
-			.t-b{
-				flex: 1;
-				line-height: 40rpx;
-				.txt{
-					font-size: $font-size-24;
-					color: $text-color;
-					line-height: 40rpx;
-				}
-			}
-			.icon-shanchu{
-				color:#FF2A2A ;
-				margin-right: 8rpx;
-			}
-			.icon-bianji{
-				color: #2A7AFF;
-				margin-right: 8rpx;
-			}
-		}
-		.address{
-			font-size: $font-size-28;
-			color: $text-color;
-			line-height: 40rpx;
-			-o-text-overflow: ellipsis;
-			text-overflow: ellipsis;
-			display: -webkit-box;
-			word-break: break-all;
-			-webkit-box-orient: vertical;
-			-webkit-line-clamp: 2;
-			overflow: hidden;
-		}
-	}
-	.add-btn{
-		position: fixed;
-		left: 24rpx;
-		right: 24rpx;
-		bottom: 34rpx;
-		z-index: 95;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		width: 702rpx;
-		height: 88rpx;
-		font-size: $font-size-28;
-		line-height: 88rpx;
-		color: #FFFFFF;
-		text-align: center;
-		background: $btn-confirm;
-		border-radius: 45rpx;
-	}
-	.adds-btn{
-		width: 702rpx;
-		height: 88rpx;
-		font-size: 28rpx;
-		line-height: 88rpx;
-		color: #FFFFFF;
-		margin: 0 auto;
-		text-align: center;
-		background: #000000;
-		border-radius: 14rpx;
-	}
-</style>
-

seller/pages/address/addressManage.vue

@@ -1,287 +0,0 @@
-<template>
-	<view class="container clearfix">
-		<view class="add-content">
-			<view class="input-row b-b">
-				<input class="input" type="text" v-model="addressData.shouHuoRen" @input="onShouHuoRen" placeholder="收货人姓名" placeholder-class="placeholder" />
-			</view>
-			<view class="input-row b-b">
-				<input class="input" type="number" maxlength="11" v-model="addressData.mobile"  @input="onMobile" placeholder="手机号码" placeholder-class="placeholder" />
-			</view>
-			<view class="input-row b-b" @click="showMulLinkageThreePicker">
-				<text class="input">
-					{{addressData.allAddress}}
-				</text>		
-				<text class="iconfont icon-xiayibu"></text>
-			</view>
-			<view class="text-textarea b-b"> 
-				<view class="textarea show" v-if="isShowInput">{{addressData.address ?addressData.address :'详细地址：如道路、门牌号、小区、楼房号、单元室等'}}</view>
-				<textarea 	v-else
-							class="textarea" 
-							type="text" 
-							v-model="addressData.address" 
-							placeholder="详细地址：如道路、门牌号、小区、楼房号、单元室等" 
-							placeholder-class="placeholder"
-							maxlength="50"
-							@input="onTextareaInput"
-							:class="isShowInput ? '':''"
-				/>
-			</view>
-			<view class="text-input default-row">
-				<text class="tit">设为默认地址</text>
-				<switch :checked="switchDefault" color="#5FB00A" @change="switchChange" style="transform:scale(0.8)" />
-			</view>
-			<button class="add-btn" :disabled="isConfirm" :class="[isConfirm == true ? 'disabled':'']" @click="confirm">{{buttonText}}</button>
-		</view>
-		<mpvue-city-picker :themeColor="themeColor" 
-							ref="mpvueCityPicker" 
-						    :pickerValueDefault="cityPickerValueDefault"
-							@onCancel="onCancel" 
-							@onConfirm="onConfirm">
-		</mpvue-city-picker>
-
-	</view>
-</template>
-
-<script>	
-	import mpvueCityPicker from '@/components/mpvue-citypicker/mpvueCityPicker.vue'
-	import authorize from '@/common/config/authorize.js'	
-	export default {
-		components:{
-			mpvueCityPicker
-		},
-		data() {
-			return {
-				buttonText:'保存',
-				addType:1,				//记录添加地址的类型
-				isConfirm:true,
-				isShowInput:false,
-				switchDefault:false,
-				addressData:{
-					addressID:'',
-					allAddress:'所在地区',
-					userID: '',			//用户id ,只在新增收货地址时传
-					shouHuoRen: '',		//收货人
-					mobile:'',			//收货人手机
-					townID:'',			//区ID
-					address: '',	//地址
-					defaultFlag:0,		//是否默认收货地址(0 不是默认,1 默认)
-				},
-				params:{}				//参数
-			}
-		},
-		onLoad(option){
-			let title = '添加新地址'
-			if(option.type==='edit'){
-				title = '编辑收货地址'
-				this.isConfirm = false;
-				this.addType = 2;	
-				let optionData = JSON.parse(option.data)
-				this.addressData.allAddress = `${optionData.province}-${optionData.city}-${optionData.town}`
-				this.addressData.address = optionData.address
-				this.addressData.defaultFlag = optionData.defaultFlag;
-				this.addressData.userID = optionData.userID;
-				this.addressData.mobile = optionData.mobile;
-				this.addressData.townID = optionData.townID;
-				this.addressData.addressID = optionData.addressID;
-				this.addressData.shouHuoRen = optionData.shouHuoRen;
-				this.addressData.addressID = optionData.addressID;
-				if(optionData.defaultFlag == 1){
-					this.switchDefault = true
-				}else{
-					this.switchDefault = false
-				}
-			}
-			uni.setNavigationBarTitle({
-				title
-			})
-		},
-		methods: {			
-			switchChange(e){
-				if(e.detail.value== true){
-					this.addressData.defaultFlag = 1;
-				}else{
-					this.addressData.defaultFlag = 0;
-				}
-			},
-			// 三级联动选择
-			showMulLinkageThreePicker() {
-				this.isShowInput = true
-				this.$refs.mpvueCityPicker.show()
-			},
-			onConfirm(e) {
-				this.addressData.allAddress = e.name;
-				this.addressData.townID = e.townCode;
-				this.initInput();
-			},			
-			//提交
-			confirm(){
-				if(!this.addressData.shouHuoRen){
-					this.$util.msg('请填写收货人');
-				}
-				if(this.addressData.address =='所在地区'){
-					this.$util.msg('请选择所在地区');
-				}
-				if(!/(^1[0-9][0-9]{9}$)/.test(this.addressData.mobile)){
-					this.$util.msg('请输入正确的手机号码');
-					return;
-				}
-				if(this.addType ==1){
-					this.params ={
-							userID:this.addressData.userID,			//用户id ,只在新增收货地址时传
-							shouHuoRen:this.addressData.shouHuoRen ,//收货人
-							townID:this.addressData.townID,			//区ID
-							address:this.addressData.address,		//地址
-							mobile:this.addressData.mobile,			//手机
-							defaultFlag:this.addressData.defaultFlag//是否默认收货地址(0 不是默认,1 默认)
-						}
-					this.postAddressData(this.params)	
-				}else{
-					this.params = this.addressData;
-					this.postAddressData(this.params)
-				}
-			},
-			postAddressData(res){
-				this.btnText(true)
-				this.UserService.AddNewAddress(res).then( response=>{
-					this.$util.msg('保存成功',2000,true,'success')
-					this.btnText(false)
-					setTimeout(()=>{
-						uni.navigateBack();
-					},2000)
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000);
-					setTimeout(function(){
-						uni.switchTab({
-							url:'/seller/pages/index/index'
-						})
-					},1000)
-				})
-			},
-			btnText(flg){
-				if(flg){
-					this.isConfirm = true;
-					this.buttonText = '保存中...'
-				}else{
-					this.isConfirm = false;
-					this.buttonText = '保存'
-				}
-			},
-			onShouHuoRen(e){
-			   this.addressData.shouHuoRen = e.detail.value;
-			   this.initInput();
-			},
-			onMobile(e){
-			   this.addressData.mobile = e.detail.value;
-			   this.initInput();
-			},
-			onTextareaInput(e){
-			   this.addressData.address = e.detail.value;
-			   this.initInput();
-			},
-			initInput(){
-				if(this.addressData.shouHuoRen !== "" && this.addressData.mobile !=="" && this.addressData.address !=="" && this.addressData.townID!==""){
-					this.isConfirm =false;
-				}else{
-					this.isConfirm =true;
-				}
-			}
-		},
-		onShow() {
-			this.$api.getComStorage('orderUserInfo').then((resolve) =>{
-				this.addressData.userID = resolve.userID
-			})
-		}
-	}
-</script>
-
-<style lang="scss">
-	page{
-		height: auto;
-		background: $bg-color;
-		// border-top: 1px solid #EBEBEB;
-	}
-	.add-content{
-		width: 702rpx;
-		padding:0 24rpx;
-		.input-row{
-			display: flex;
-			align-items: center;
-			position: relative;
-			width: 654rpx;
-			height: 88rpx;
-			padding:0 24rpx;
-			margin: 0 auto;
-			// background: #F7F7F7;
-			// border-radius: 14rpx;
-			.input{
-				width: 100%;
-				height: 100%;
-				// background: #F7F7F7;
-				font-size: $font-size-28;
-				line-height: 88rpx;
-				color: #333333;
-				border-bottom: 2rpx solid #e1e1e1;
-
-			}
-			&.b-b{
-				margin: 20rpx 0;
-			}
-		}
-	}
-	.icon-xiayibu{
-		font-size: 36rpx;
-		color: #b2b2b2;
-		position: absolute;
-		right: 0;
-	}
-	.text-textarea{
-		width: 654rpx;
-		height: 146rpx;
-		padding: 0 24rpx;
-		// background: #F7F7F7;
-		border-bottom: 2rpx solid #e1e1e1;
-		.textarea{
-			width: 100%;
-			height: 100%;
-			font-size: $font-size-28;
-			color: $text-color;
-			z-index: 1;
-		}
-		.textarea.hide{
-			opacity: 0;
-		}
-		.textarea.show{
-			color: #999999;
-		}
-	}
-	.default-row{
-		background: #FFFFFF;
-		margin-top: 16upx;
-		.tit{
-			font-size: $font-size-28;
-			line-height: 40rpx;
-			color: #333333;
-			flex: 1;
-		}
-		switch{
-			transform: translateX(16upx) scale(.9);
-		}
-	}
-	.add-btn{
-		width: 600rpx;
-		height: 90rpx;
-		font-size: $font-size-28;
-		line-height: 90rpx;
-		color: #FFFFFF;
-		margin: 0 auto;
-		text-align: center;
-		background: $btn-confirm;
-		border-radius: 45rpx;
-		margin-top: 80rpx;
-	}
-	.add-btn.disabled{
-		background: #F8F8F8;
-		border-radius: 45rpx;
-	}
-</style>
-

seller/pages/cart/buyagain.vue

@@ -1,416 +0,0 @@
-<template>
-	<view class="container all-type-list-wrapper">
-		<buyagain-list ref="productList" 
-					   @operationConfim="hanldOperationConfim"
-					   @goCartPage="hanldToCartPage">
-		</buyagain-list>
-		<!--底部选择模态层弹窗组件 -->
-		<view class="popup spec" :class="specClass"  @touchmove.stop.prevent="discard" @tap="hideSpec">
-			<!-- 遮罩层 -->
-			<view class="mask"></view>
-			<view class="layer" @tap.stop="discard" :style="{paddingBottom :isIphoneX ? '68rpx' : '36rpx',bottom:isIphoneX ?'-352rpx' : '-320rpx'}">
-				<view class="content">
-					<view class="layer-smimg">
-						<image :src="handleData.mainImage" mode=""></image>
-					</view>
-					<view class="layer-nunbox">
-						<view class="layer-nunbox-t">
-							<view class="layer-nunbox-text">数量:</view>
-							<view class="number-box">
-								<view  class="iconfont icon-jianhao" :class="[isQuantity==true?'disabled':'']" @click="changeCountSub()"></view>
-								<input class="btn-input" type="number" v-model="number" maxlength='4'  @blur="changeNumber($event)">
-								<view  class="iconfont icon-jiahao"  :class="[isStock==true?'disabled':'']" @click="changeCountAdd()"></view>
-							</view>
-						</view>
-						<view class="layer-nunbox-b">
-							<view class="text">单价:
-								<text class="p sm">￥</text>
-								<text class="p bg">{{buyRetailPrice.toFixed(2)}}</text>
-							</view>
-						</view>
-					</view>
-				</view>
-				<view class="btn">
-					<view class="button add" @click="getAddProductCart">加入购物车</view>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import buyagainList from '@/components/cm-module/listTemplate/buyagainList'
-	export default{
-		components:{
-			buyagainList
-		},
-		data(){
-			return{
-				isIphoneX:this.$store.state.isIphoneX,
-				clubID:'',//机构ID
-				serviceProviderId:'',//协销ID
-				serverUrl: '',
-				emptyText: '',
-				lastPageType: '',
-				lastPageVal: '',
-				specClass: '',//规格弹窗css类，控制开关动画
-				handleData:{},
-				isQuantity:false,
-				isStock:false,
-				minBuyNumber:0,
-				number:0,
-				buyRetailPrice:0,
-				buyRetailPriceStep:1,
-			}
-		},
-		onLoad() {
-		
-		},
-		methods:{
-			getClubProductNum(){
-				this.SellerService.GetSellerProductNum({clubId:this.clubID,serviceProviderId:this.serviceProviderId}).then(response =>{
-					this.$refs.productList.cartQuantity = response.data
-				})
-			},
-			hanldOperationConfim(data){//显示选择数量确认弹窗
-				console.log(data)
-				this.specClass = 'show';
-				this.handleData = data
-				this.minBuyNumber = data.minBuyNumber
-				this.buyRetailPrice = data.retailPrice;
-				this.buyRetailPriceStep = data.step
-				if(this.handleData.ladderPriceFlag == '1'){
-					this.number = data.maxBuyNumber
-				}else{
-					this.number = data.minBuyNumber
-				}
-			},
-			hideSpec() {//关闭选择数量确认弹窗
-				this.specClass = 'hide';
-				setTimeout(() => {
-					this.specClass = 'none';
-				}, 200);
-			},
-			changeCountAdd(){//popup弹窗数量增加按钮
-				if(this.buyRetailPriceStep == 2){
-					this.number += this.minBuyNumber
-				}else{
-					this.number++
-				}
-				this.calculatPerice()
-			},
-			changeCountSub(){//popup弹窗数量减按钮
-				if(this.number<=this.minBuyNumber){
-					this.number= this.minBuyNumber
-					this.isQuantity =true
-					this.$util.msg(`该商品最小起订量为${this.minBuyNumber}`,2000);
-					return
-				}else{
-					if(this.buyRetailPriceStep == 2){
-						this.number-=this.minBuyNumber
-					}else{
-						this.number--
-					}
-					this.calculatPerice()
-					this.isQuantity =false
-				}
-			 },
-			changeNumber(e){
-				let _value = e.detail.value;
-				if(!this.$api.isNumber(_value)){
-					this.number = this.minBuyNumber
-				}else if(_value < this.minBuyNumber){	
-					this.$util.msg(`该商品最小起订量为${this.minBuyNumber}`,2000);
-					this.number = this.minBuyNumber
-				}else if( _value % this.minBuyNumber !=0 ){
-					this.$util.msg(`购买量必须为起订量的整数倍`,2000);
-					this.number = this.minBuyNumber
-				}else{
-					this.number = e.detail.value
-					this.calculatPerice()
-				}
-			},
-			calculatPerice(){//判断是否为阶梯价然后做计算价格处理
-				if(this.handleData.ladderPriceFlag == '1'){
-					this.handleData.ladderPriceList.forEach((item,index)=>{
-						if(this.number>=item.buyNum){
-							this.buyRetailPrice = item.buyPrice
-						}
-					})
-				}else{
-					this.buyRetailPrice = this.handleData.retailPrice;
-				}
-			},
-			getAddProductCart(){//增加购物车成功和toast弹窗提示成功
-				let params ={
-						productId:this.handleData.productID,
-						clubId:this.clubID,
-						serviceProviderId:this.serviceProviderId,
-						num:this.number
-					}
-				this.SellerService.ShoppingCartAddCart(params).then(response => {
-					this.specClass = 'hide';
-					this.$util.msg('加入购物车成功',1500,true,'success')
-					this.getClubProductNum()
-					setTimeout(() => {this.specClass = 'none'}, 200)
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000);
-				})
-			},
-			hanldToCartPage(){
-				this.$api.navigateTo('/seller/pages/cart/cart')
-			},
-			discard(){
-				//丢弃
-			}
-		},
-		onShow() {
-			this.$api.getComStorage('orderUserInfo').then((resolve) =>{
-				this.clubID = resolve.clubID
-			})
-			this.$api.getStorage().then((resolve) =>{
-				this.serviceProviderId = resolve.serviceProviderID
-				this.getClubProductNum()
-			})
-		},
-	}
-</script>
-
-<style lang="scss">
-	page {
-		background: $sub-bg-color;
-		.all-type-list-wrapper {
-			display: flex;
-			flex-direction: column;
-		}
-	}
-	/* 加入购物模态层*/
-	@keyframes showPopup {
-		0% {
-			opacity: 0;
-		}
-		100% {
-			opacity: 1;
-		}
-	}
-	@keyframes hidePopup {
-		0% {
-			opacity: 1;
-		}
-		100% {
-			opacity: 0;
-		}
-	}
-	@keyframes showLayer {
-		0% {
-			transform: translateY(0);
-		}
-		100% {
-			transform: translateY(-100%);
-		}
-	}
-	@keyframes hideLayer {
-		0% {
-			transform: translateY(-100%);
-		}
-		100% {
-			transform: translateY(0);
-		}
-	}
-	@keyframes showAmnation {
-		0% {
-			top: -12rpx;
-			opacity: 0;
-		}
-		50% {
-			top: -60rpx;
-			opacity: 1;
-		}
-		100% {
-			top: -100rpx;
-			opacity: 0;
-		}
-	}
-	@keyframes hideAmnation {
-		0% {
-			top: -100rpx;
-			opacity: 0;
-		}
-		100% {
-			top: -12rpx;
-			opacity: 0;
-		}
-	}
-	.popup {
-		position: fixed;
-		top: 0;
-		width: 100%;
-		height: 100%;
-		z-index: 999;
-		display: none;
-		.mask{
-			position: fixed;
-			top: 0;
-			width: 100%;
-			height: 100%;
-			z-index: 21;
-			background-color: rgba(0, 0, 0, 0.6);
-		}
-		.layer {
-			position: fixed;
-			z-index: 22;
-			bottom: -294rpx;
-			width: 702rpx;
-			padding: 24rpx 24rpx 36rpx 24rpx;
-			height: 260rpx;
-			border-radius: 20rpx 20rpx 0 0;
-			background-color: #fff;
-			display: flex;
-			flex-wrap: wrap;
-			align-content: space-between;
-			.content {
-				width: 100%;
-			}
-			.btn {
-				width: 100%;
-				height: 88rpx;
-				display: flex;
-				.button {
-					width: 702rpx;
-					height: 88rpx;
-					color: #fff;
-					display: flex;
-					align-items: center;
-					justify-content: center;
-					font-size: $font-size-28;
-					border-radius: 44rpx;
-					background: $btn-confirm;
-				}
-			}
-		}
-		
-		&.show {
-			display: block;
-			.mask{
-				animation: showPopup 0.2s linear both;
-			}
-			.layer {
-				animation: showLayer 0.2s linear both;
-			}
-		}
-		&.hide {
-			display: block;
-			.mask{
-				animation: hidePopup 0.2s linear both;
-			}
-			
-			.layer {
-				animation: hideLayer 0.2s linear both;
-			}
-		}
-		&.none {
-			display: none;
-		}
-		&.service {
-			.row {
-				margin: 30upx 0;
-				.title {
-					font-size: 30upx;
-					margin: 10upx 0;
-				}
-				.description {
-					font-size: 28upx;
-					color: #999;
-				}
-			}
-		}
-		.layer-smimg{
-			width: 114rpx;
-			height: 114rpx;
-			float: left;
-			border-radius: 10rpx;
-			margin-right: 24rpx;
-			image{
-				width: 114rpx;
-				height: 114rpx;	
-				border-radius: 10rpx;
-			}
-		}
-		.layer-nunbox{
-			justify-content: space-between;
-			align-items: center;
-			width: 536rpx;
-			height: 88rpx;
-			padding: 13rpx 0 0 0;
-			float: left;
-			.layer-nunbox-t{
-				width: 100%;
-				height:44rpx;
-				position:relative;
-				display: flex;
-				.layer-nunbox-text{
-					line-height: 44rpx;
-					font-size: $font-size-28;
-				}
-				.number-box{
-					display: flex;
-					justify-content: center;
-					align-items: center;
-					border: 2rpx solid #ffe6dc;
-					border-radius: 30rpx;
-					height: 48rpx;
-					margin-left: 20rpx;
-					.iconfont{
-						font-size: $font-size-24;
-						padding:0 18rpx;
-						color: #999999;
-						text-align: center;
-						line-height: 48rpx;
-						font-weight: bold;
-						background: #fef6f3;
-						&.icon-jianhao{
-							border-radius: 30rpx 0 0 30rpx;
-						}
-						&.icon-jiahao{
-							border-radius: 0 30rpx 30rpx 0;
-						}
-					}
-					.btn-input{
-						width: 62rpx;
-						height: 48rpx;
-						line-height: 48rpx;
-						background: #FFFFFF;
-						border-radius: 4rpx;
-						text-align: center;
-						font-size: $font-size-28;
-					}
-				}
-				.product-step{
-					position: absolute;
-					left: 45rpx;
-					bottom: 0;
-					height: 44rpx;
-					background: #FFFFFF;
-				}
-			}
-			.layer-nunbox-b{
-				width: 100%;
-				height:44rpx;
-				margin-top: 13rpx;
-			}
-			.text{
-				line-height: 44rpx;
-				font-size: $font-size-28;
-				.p{
-					color: #FF2A2A;
-				}
-				.p:first-child{
-					margin-left: 30rpx;
-				}
-				.p.sm{
-					font-size: $font-size-24;
-				}
-			}
-		}
-	}	
-</style>

seller/pages/cart/cart.vue

@@ -1,1569 +0,0 @@
-<template>
-	<view class="container cart clearfix">	
-		<tui-skeleton v-if="skeletonShow" backgroundColor="#fafafa" borderRadius="10rpx" :isLoading	="true" :loadingType="5"></tui-skeleton>
-		<view class="foot-check-delbtn" v-if="!isshowDelbtn && goodsList.length>0" :style="{top:CustomBar+'px'}">
-			<view class="foot-text">共<text>{{kindCount}}</text>件商品</view>
-			<view class="delBtn" @tap.stop="showDelManager">删除</view>
-		</view>
-		<view class="container-cart-main tui-skeleton" :style="{paddingTop:isshowDelbtn ? '0rpx':'80rpx'}">
-			<view v-if="!isEmpty" class="container-cart">
-				<scroll-view class="cart-content"  scroll-y  @scrolltolower="toLower">
-					<view class="goods-list">
-						<view v-for="(item, index) in goodsList" :key="index" class="goods-item">
-							<view class="shoptitle">
-								<!--选择商店的全部商品 :disabled="isNnder"-->
-								<view class="checkbox-box" @click.stop="checkShop(item)">
-									<view class="checkbox iconfont" :class="[item.checked ?'icon-yixuanze':'icon-weixuanze']"></view>
-								</view>
-								<view v-if="item.promotions" class="floor-item-act">
-									<view class="floor-tags" @click.stop="clickPopupShow(item,2)">{{item.promotions.name}}</view>	
-								</view>
-								<view class="text">{{item.name}}</view> 
-							</view>
-							<view class="productlist">
-								<view 	class="goods-pros" v-for="(pros,idx) in item.productsList" :key="idx">
-									<view class="goods-pros-t">
-										<!--选择商品-->
-										<view class="checkbox-box" @click.stop="ischeck(item,pros,idx)">
-											<view class="checkbox iconfont" :class="[pros.productsChecked ?'icon-yixuanze':'icon-weixuanze']"></view>
-										</view>
-										<view class="pros-img" @click.stop="navToListPage(pros.productID)">
-											<image :src="pros.mainImage ? pros.mainImage :''" alt="" />
-										</view>
-										<view class="pros-product">
-											<view class="producttitle" @click.stop="navToListPage(pros.productID)"	>
-												{{pros.name}}
-											</view>
-											<view class="productspec">规格:{{pros.unit ? pros.unit : ''}}</view>
-											<view class="productspec" v-if="pros.productCode!=''&&pros.productCode!=null">
-												<view bgcolor="#666666">商品编码:{{pros.productCode}}</view>
-											</view>
-											<view class="productprice">
-												<!--使用过滤器对总价改变-->
-												<view class="price" :class="PromotionsFormat(pros.promotions) ? 'disabled' : ''">
-													<text>￥</text>
-													{{ (PromotionsFormat(pros.promotions) ? pros.price1 : pros.retailPrice)  | NumFormat }}
-												</view>
-												<view class="count" :class="[isshowDelbtn ? 'none':'show']">
-													<text class="count-tips step" v-if="pros.isStep">购买量必须为起订量的整数倍</text>
-													<view class="number-box">
-														<view  class="iconfont icon-jianhao"  @click="changeCountSub(item,pros)"></view>
-														<input class="btn-input" type="number" maxlength='6' v-model="pros.productCount" @blur="changeNnmber($event,item,pros)">
-														<view  class="iconfont icon-jiahao"   @click="changeCountAdd(item,pros)"></view>
-													</view>
-												</view>
-											</view>
-											<view v-show="pros.actStatus==1" class="floor-item-act">
-												<view v-if="PromotionsFormat(pros.promotions)"  class="floor-tags" @click.stop="clickPopupShow(pros,1)">
-													{{pros.promotions.name}}
-													<text v-if ="pros.promotions!=null && pros.promotions.type!=3">
-														:￥{{ pros.promotions == null ? '0.00' : pros.promotions.touchPrice | NumFormat}}
-													</text>
-												</view>
-												<view v-else-if="pros.promotions.type!=3" class="floor-tags" @click.stop="clickPopupShow(pros,2)">{{pros.promotions.name}}</view>	
-											</view>
-											<view  v-if="pros.actStatus == null  &&  pros.ladderFlag == 1" class="floor-item-act">
-												<view class="floor-tags" @click.stop="clickPopupShow(pros,2)">阶梯价格</view>	
-											</view>
-										</view>	
-									</view>
-								</view>
-							</view>	
-							<view class="goods-pros-b clearfix" :class="[isshowDelbtn ? 'none':'show']" >
-								<view class="sum-none" v-if="item.reducedPrice>0">
-									<text class="money-sign">￥</text>
-									<text class="money">{{ item.totalOriginalPrice | NumFormat }}</text>
-									<text class="money-reduced">减<text>￥{{ item.reducedPrice | NumFormat}}</text></text>
-								</view>
-								<view class="sum">合计:<text class="money"><text class="money-sign">￥</text>{{item.totalPrice | NumFormat}}</text></view>
-							</view>
-						</view>
-					</view>	
-					<view class="failure-list" v-if="failureList.length>0">
-							<view class="failure-title">
-								<view class="title-txt">失效商品<text>{{failureList.length}}件</text></view>
-								<view class="title-btn" @click.stop="deletefailureList"><text class="butto">清空失效商品</text></view>
-							</view>
-							<view class="productlist">
-								<view class="goods-pros" v-for="(failure,failureIdx) in failureList" :key="failureIdx" >
-									<view class="goods-pros-t" @click.stop="failureToProduct(failure)">
-										<!--选择商品-->
-										<view class="checkbox-box" @click.stop="ischeckFailure(failure)" v-if="isshowDelbtn">
-											<button class="checkbox iconfont" 
-													:class="[ failure.productsChecked ? 'icon-yixuanze':'icon-weixuanze']">
-											</button>
-										</view>
-										 <text class="img-tip">失效</text>
-										<view class="pros-img">
-											<image :src="failure.mainImage ? failure.mainImage:''" alt="" />
-										</view>
-										<view class="pros-product">
-											<view class="producttitle">{{failure.name}}</view>
-											<view class="productspec">规格:{{failure.unit ? failure.unit : ''}}</view>
-											<view class="productstate">{{failureStateText(failure.validFlag)}}</view>
-										</view>
-										<view class="pros-marks" v-if="failure.isFailureLayer"></view>
-									<!--</view>-->
-								</view> 
-							</view>	
-						</view>
-						
-					</view> 
-					
-					<!--加载loadding-->
-					<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-					<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text='nomoreText'></tui-nomore>
-					<!--加载loadding-->
-				</scroll-view>
-				<!-- 脚部菜单 -->
-				<view class="footer" :style="{paddingBottom :isIphoneX ? '68rpx' : '0rpx'}">
-					<view class="footer-le">
-						<view class="foot-check checkbox-box" @tap.stop="checkAll()">
-							<button class="checkbox iconfont" :class="[isCheckAll?'icon-yixuanze':'icon-weixuanze']"></button> 
-							<view class="text">全选</view>
-						</view>
-						<view class="sum">
-							<view class="sum-none" v-if="reducedPrice>0">
-								<text class="money-sign">￥</text>
-								<text class="money">{{ totalOriginalPrice | NumFormat }}</text>
-								<text class="money-reduced">减<text>￥{{ reducedPrice | NumFormat}}</text></text>
-							</view>
-							<view class="sum-price" :class="reducedPrice == 0 ? 'none' : ''">
-								总价:<text class="money-sign">￥</text><text class="money">{{allPrice | NumFormat}}</text>
-							</view>
-						</view>
-					</view>
-					<view v-if="!isshowDelbtn" class="footer-ri" >
-						<view class="btn hanld-btn" @tap="toConfirmation">去结算({{allCount}})</view>
-					</view>
-					<view v-else class="footer-del">
-						<view class="btn btn-cancel" @tap.stop="hideDelManage">取消</view>
-						<view class="btn btn-confirm" @tap.stop="deleteList">删除</view>
-					</view>
-				</view>
-			</view>
-			<view v-if="isEmpty" class="cart-content empty">
-				<view  class="empty-container">
-					<image class="empty-container-image" src="https://img.caimei365.com/group1/M00/03/71/Cmis2F3wna6AWdWzAAGlgAP0das422.png" mode="aspectFit"></image>
-					<text class="error-text">购物车空空如也~</text>
-				</view>
-			</view>
-		</view>
-		<!-- 促销活动弹窗 -->
-		<activi-popup :product="handlerPros" :popupShow="popupShow"></activi-popup>
-		<!-- 透明模态层 -->
-		<modal-layer v-if='modallayer'></modal-layer>
-	</view>
-</template>
-<script>
-	import tuiSkeleton from "@/components/tui-skeleton/tui-skeleton"
-	import tuiLoadmore from "@/components/tui-components/loadmore/loadmore"
-	import tuiNomore from "@/components/tui-components/nomore/nomore"
-	import activiPopup from "@/components/cm-module/productDetails/cm-activipopu"
-	import modalLayer from "@/components/modal-layer"
-	import { mapState,mapMutations } from 'vuex';
-	
-	export default{
-		components:{
-			tuiSkeleton,
-			tuiLoadmore,
-			tuiNomore,
-			activiPopup,
-			modalLayer
-		},
-		data(){
-			return{
-				clubId:'',	//机构ID
-				userID:'',
-				kindCount:0,
-				serviceProviderId:'',//协销ID
-				isStock:'',
-				popupShow:false,
-				handlerPros:{},//监听单挑促销商品
-				promotionsList:[],//促销活动列表
-				failureList:[],	//失效商品列表
-				goodsList:[],	//购物车的商品
-				delGoodsList:'',//要删除的商品
-				setGoodData:'', //确认订单的商品
-				isCheckAll:false,//是否全选
-				totalOriginalPrice:0,//所有原价价
-				reducedPrice:0,//满减
-				allPrice:0,//所有价格
-				allCount:0,//被选中的产品数量
-				isModallayer:false,
-				skeletonShow:true,
-				isshowDelbtn:false,
-				isDisabled: false, // 供应商/店铺全选是否禁用状态
-				isEmpty:false,//显示空购物车
-				scrollHeight: 'auto',
-				nomoreText: '上拉显示更多',
-				hasNextPage: false,
-				loadding: false,
-				pullUpOn: true,
-				pullFlag: true,
-				pageSize: 10,
-				pageNum: 1,
-				submitIds:[],
-				depositIds : [6060,6061,6062,6063,6064],//定金商品ID
-				rechargeIds : [6065,6066,6067,6068,6069],//充值余额商品ID
-				isIphoneX:this.$store.state.isIphoneX,
-				againBuyProductIds:''
-			}
-		},
-		onLoad(){
-			this.setScrollHeight();
-		},
-		computed: {
-			...mapState(['hasLogin','userInfo'])
-		},
-		filters:{
-			NumFormat(value) {//处理金额
-				return Number(value).toFixed(2);
-			},
-		    totalprice(val,count){//单件商品的价格 × 数量
-		        return (val * count).toFixed(2)
-		    }
-		},	
-		methods:{
-			initData(){
-				this.isModallayer = false //遮罩层 防止多次点击
-				this.skeletonShow = true //预加载圆圈
-				this.isCheckAll=false//是否全选
-				this.submitIds = []
-				this.$api.getStorage().then((resolve) => {
-					this.serviceProviderId = resolve.serviceProviderID;
-					this.initGetCartGoodsList();
-				})	
-			},
-			initLogin(){
-				this.$api.redirectTo('/pages/login/login?type=4')
-			},
-			clickPopupShow(pros,type){//显示活动弹窗
-				this.popupShow = true;
-				this.handlerPros = pros;
-			},
-			failureToProduct(failure){
-				if(failure.status == 1){
-					this.$util.msg('商品已丢失,不能查看',2000)
-					return
-				}else if(failure.status == 2){
-					this.$util.msg('商品已停售,不能查看',2000)
-					return
-				}else{
-					this.isModallayer = true;
-					this.$api.navigateTo(`/pages/goods/product?id=${failure.productId}`)
-				}
-			},
-			failureStateText(state){
-				let stateText = '',
-					stateTextObject={
-						0:'商品已停售',
-						10:'商品已丢失'
-					}
-				Object.keys(stateTextObject).forEach(key => {
-					if(key == state){
-						stateText = stateTextObject[key]
-					}
-				})
-				return stateText;
-			},
-			deletefailureList(){
-				this.failureList.forEach(failure=>{ this.delGoodsList += failure.sellerCartId+',' })
-				this.$util.modal('','确定清空全部失效商品吗？','确定','取消',true,() =>{
-					console.log(this.delGoodsList)
-					this.SellerService.SellerCartdelete({sellerCartIds:this.delGoodsList}).then(response =>{
-						console.log(response)
-						this.$util.msg('删除成功',2000);
-						setTimeout(()=>{
-							this.isshowDelbtn = false;
-							this.initGetCartGoodsList();
-						},2000)
-					}).catch(error =>{
-						this.$util.msg(error.msg,2000)
-					})
-				})
-			},
-			setScrollHeight() {
-				// 窗口高度-footer高度
-				const {windowHeight, pixelRatio} = uni.getSystemInfoSync();
-				setTimeout(()=> {
-					const query = uni.createSelectorQuery().in(this);
-					query.selectAll('.footer').boundingClientRect();
-					query.exec(res => {
-						this.windowHeight = windowHeight;
-						if(res[0][0]) {
-							this.scrollHeight = windowHeight - res[0][0].height;
-						}
-					})
-				}, 500)
-			},
-			initGetCartGoodsList(){//初始化购物车 index:1
-				let params = {clubId:this.clubId,serviceProviderId:this.serviceProviderId,pageNum:1,pageSize:this.pageSize,againBuyProductIds:this.againBuyProductIds}
-				 this.SellerService.GetSellerShoppingInfo(params).then(response =>{
-					this.skeletonShow = false
-					this.$store.commit('updateAllNum',response.data.cartQuantity)
-					this.promotionsList = response.data.promotionsList;
-					this.kindCount = response.data.productCount;
-					const resultsData = response.data.pageDate;	
-					if(resultsData.results.length > 0||response.data.invalidProductList.length>0){
-						this.isEmpty =false
-					}else{
-						this.isEmpty =true
-					}
-					if(resultsData.results&&resultsData.results.length > 0){
-						this.hasNextPage = resultsData.hasNextPage;
-						this.goodsList = resultsData.results;
-						this.goodsList.forEach((item,index) => {
-							let productsListLength = item.productsList.length,invalidLength = 0;
-							item.productsList.forEach(pros => {
-								pros.shopID = item.shopID;
-								pros.isStep = false
-								if(pros.step === 2){
-									if(pros.productCount % pros.minBuyNumber != 0){
-										pros.productCount = pros.minBuyNumber
-										this.totalShopPeice()
-										this.updateShoppogNum(pros)
-									}
-								}
-							})
-						})
-						this.totalShopPeice()
-						this.pullFlag = false;
-						setTimeout(()=>{this.pullFlag = true;},500)
-						if(this.hasNextPage){
-							this.pullUpOn = false
-							this.nomoreText = '上拉显示更多'
-						}else{
-							if(this.goodsList.length < 4){
-								this.pullUpOn = true
-							}else{
-								this.pullUpOn = false
-								this.nomoreText = '已至底部'
-							}
-						}
-					} else {
-						this.goodsList = [];
-					}
-					if( response.data.invalidProductList && response.data.invalidProductList.length > 0){
-						let newFailureList = [],isFailureLayer;
-						response.data.invalidProductList.forEach((failure,index) => {
-							if(failure.validFlag == 0 || failure.validFlag == 10) {
-								isFailureLayer = true
-							}else{
-								isFailureLayer = false
-							}
-							newFailureList.push(Object.assign({},failure,{isFailureLayer:isFailureLayer}))
-						})
-						this.failureList = newFailureList;
-						console.log(this.failureList)
-					} else {
-						this.failureList = [];
-					}
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000);
-				})
-			},		
-			getOnReachBottomData(){//上拉加载
-				this.pageNum+=1
-				let params = {clubId:this.clubId,serviceProviderId:this.serviceProviderId,pageNum:this.pageNum,pageSize:this.pageSize}
-				this.SellerService.GetSellerShoppingInfo(params).then(response =>{
-					let resultsData = response.data.pageDate
-					this.promotionsList = response.data.promotionsList;
-					this.hasNextPage = resultsData.hasNextPage;
-					this.goodsList = this.goodsList.concat(resultsData.results)
-					this.goodsList.forEach((item,index) => {
-						let productsListLength = item.productsList.length,invalidLength = 0;
-						item.productsList.forEach(pros => {
-							pros.shopID = item.shopID;
-							pros.isStep = false
-							if(pros.step === 2){
-								if(pros.productCount % pros.minBuyNumber != 0){
-									pros.productCount = pros.minBuyNumber
-									this.totalShopPeice()
-									this.updateShoppogNum(pros)
-								}
-							}
-						})
-					})
-					this.totalShopPeice()
-					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);
-				})
-			},
-			ischeck(item,pro){//为未选中的时候改变为true，反之为true
-				pro.productsChecked = !pro.productsChecked;
-				if(pro.productsChecked) {
-					if(!this.submitIds.includes(pro.productID*1)){
-						this.submitIds.push(pro.productID);
-					}
-				} else {
-					var lent = this.submitIds.indexOf(pro.productID*1);
-					if(lent >=0 ){
-						this.submitIds.splice(lent, 1);
-					}
-				}
-				this.updateProductCheckedAllBtn(item);
-				this.updateCheckAllBtn();
-			},
-			updateProductCheckedAllBtn(item) {// 单独每个供应商的勾选判断
-				let productsList = item.productsList,
-					productsCheckedLength = 0,
-					disabledLength = 0;
-				if(this.isshowDelbtn) {
-					productsList.forEach(pros => {
-						if(pros.productsChecked) {
-							productsCheckedLength++;
-						}
-					})
-				} else {
-					productsList.forEach(pros => {
-						if(pros.productsChecked) {
-							productsCheckedLength++;
-						}
-					})
-				}
-				item.checked = productsCheckedLength === productsList.length - disabledLength;
-			},
-			updateCheckAllBtn() {// 全选勾选判断
-				let goodsCheckedLength = 0,
-					disabledListLength = 0,
-					goodsList = this.goodsList;
-				goodsList.forEach(item => {
-					if(item.checked) {
-						goodsCheckedLength++;
-					}
-				})
-				this.isCheckAll = goodsCheckedLength === goodsList.length - disabledListLength;
-			},
-			checkShop(item){//与单选商品类似
-				item.checked = !item.checked;
-				this.setProductChecked(item);
-				this.updateCheckAllBtn();
-			},
-			setProductChecked(item) {
-				item.productsList.forEach(pros=>{
-					if(item.checked) {
-						pros.productsChecked = true;
-						if(!this.submitIds.includes(pros.productID*1)){
-							this.submitIds.push(pros.productID);
-						}
-					} else {
-						pros.productsChecked = false;
-						var lent = this.submitIds.indexOf(pros.productID*1);
-						if(lent >=0 ){
-							this.submitIds.splice(lent, 1);
-						}
-					}
-				})
-			},
-			updateBothCheckBtn() {
-				if(this.isshowDelbtn) {
-					// 当管理删除按钮出现时,失效的商品可被选择
-					this.goodsList.forEach((item)=>{
-						item.checked = this.isCheckAll;
-						this.setProductChecked(item);
-					})
-				} else {
-					this.goodsList.forEach((item)=>{
-						item.checked = this.isCheckAll;
-						this.setProductChecked(item);
-					})
-				}
-			},
-			checkAll(){//全选方法内调用方法
-			    this.isCheckAll = !this.isCheckAll;
-				this.updateBothCheckBtn();     
-			},
-			totalShopPeice(){//每次所属会所下的商品增减重新计算合计价格&减去含有下架的商品
-				let touchPrice = 0;
-				let reducedPrice = 0;//商铺合计满减价
-				this.goodsList.map((item,index)=>{
-					//计算店铺满减后店铺合计
-					if(item.promotions && item.promotions.mode == 2){
-						let prosPrice=0;
-						let totalOriginalPrice = 0;//商铺合计原价
-						item.productsList.forEach(pros=>{
-							prosPrice += pros.retailPrice*pros.productCount
-							totalOriginalPrice += pros.retailPrice*pros.productCount
-						})
-						if(prosPrice >= item.promotions.touchPrice){
-							item.totalPrice = prosPrice - item.promotions.reducedPrice  
-							item.reducedPrice = item.promotions.reducedPrice
-							item.totalOriginalPrice = totalOriginalPrice
-						}else{
-							item.reducedPrice = 0  //统计合计价格
-							item.totalPrice = prosPrice
-						}
-					}else{//以下为计算除店铺满减以外的单品满减以及正常商品合计
-						let _totalPrice = 0;
-						let _reducedPrice = 0;
-						let _totalOriginalPrice =0;
-						item.productsList.forEach(pros=>{
-							let _price = pros.retailPrice*pros.productCount
-							_totalOriginalPrice += pros.retailPrice*pros.productCount;
-							if(pros.promotions && pros.promotions.type != 2 && pros.promotions.mode == 2){
-								if(_price >= pros.promotions.touchPrice){
-									_price = _price - pros.promotions.reducedPrice
-									_reducedPrice += pros.promotions.reducedPrice
-								}
-								_totalPrice += _price
-							}else{
-								_reducedPrice = 0;
-								_totalPrice += pros.retailPrice*pros.productCount;
-							}
-						})
-						item.reducedPrice = _reducedPrice
-						item.totalOriginalPrice = _totalOriginalPrice
-						item.totalPrice = _totalPrice
-					}
-				})
-			},
-			totalPeice(){	//计算总价格,每次调用此方法，将初始值为0，遍历价格并累加
-				let totalPrice = 0;
-				let reducedPrice = 0;
-				let originalPrice = 0;
-				this.goodsList.forEach((item,index)=>{
-					let supplierPrice = 0;
-					let supplierReducedPrice = 0;
-					item.totalprice = 0;
-					item.reducedprice = 0;
-					item.originalprice = 0;
-					item.productsList.forEach(pros=>{	
-						if(pros.productsChecked){								
-							supplierPrice += pros.retailPrice*pros.productCount;
-							// 单品满减
-							if(pros.promotions && pros.promotions.type*1===1 && pros.promotions.mode*1===2){
-								// 单品满减-重新计算供应商总价/满减金额
-								if(pros.retailPrice*pros.productCount >= pros.promotions.touchPrice){
-									supplierPrice -= pros.promotions.reducedPrice;
-									supplierReducedPrice += pros.promotions.reducedPrice;
-								}
-							}
-						}	
-					})
-					// 店铺满减
-					if(item.promotions && item.promotions.mode*1===2){
-						// 店铺满减-计算供应商总价/满减金额
-						if(supplierPrice >= item.promotions.touchPrice){
-							supplierPrice -= item.promotions.reducedPrice;
-							supplierReducedPrice += item.promotions.reducedPrice;
-						}
-					}
-					item.totalprice = supplierPrice;
-					item.reducedprice = supplierReducedPrice;
-					item.originalprice = (supplierPrice+supplierReducedPrice);
-					totalPrice += item.totalprice;
-					reducedPrice += item.reducedprice;
-					originalPrice += item.originalprice;
-				})
-				 //总促销计算
-				this.promotionsList.forEach(promotions =>{
-					// 凑单满减
-					if(promotions.mode*1===2 && promotions.type*1===2){
-						let total = 0;
-						 promotions.products.forEach(pros=>{
-							if (this.submitIds.includes(pros.productID*1)){
-								total += pros.productCount * pros.retailPrice;
-							}
-						});
-						if(total>=promotions.touchPrice){
-							totalPrice -= promotions.reducedPrice;
-							reducedPrice += promotions.reducedPrice;
-						}
-					}
-				});
-				//最后统计商品原价
-				this.totalOriginalPrice = originalPrice;
-				//最后满减金额 = 店铺减去金额 + 单品减去金额 + 凑单减去金额
-				this.reducedPrice = reducedPrice;
-				//最终合计价格 = 	店铺满减合计 + 单品满减  + 正常合计 + 凑单满减			
-				this.allPrice = totalPrice ;
-			},
-			totalCount(){//计算总数量
-			    this.allCount = 0
-				let prosAllCount=0
-				let validCount = 0
-				let validList =[];
-				let productsList =[];
-			    this.goodsList.forEach(item=>{
-					productsList = item.productsList
-					productsList.forEach(pros=>{
-						if(pros.productsChecked){
-							prosAllCount+=parseInt(pros.productCount);
-							this.allCount = prosAllCount
-						}
-					})
-			    })
-			},		
-			changeCountAdd(item,pros){//商品数量加加
-				if(pros.step === 2){
-					pros.isStep = false
-					pros.productCount += pros.minBuyNumber
-					this.processActivityPrice(pros)
-					this.isStock = false
-				}else{
-					pros.productCount++
-					this.processActivityPrice(pros)
-					this.isStock = false
-				}
-				this.updateShoppogNum(pros)
-				this.totalShopPeice();
-			},
-			changeCountSub(item,pros){//商品数量减减
-				if(pros.productCount<=pros.minBuyNumber){
-					pros.productCount= pros.minBuyNumber
-					this.$util.msg(`该商品最小起订量为${pros.minBuyNumber}`,2000);
-					return
-				}else{
-					if(pros.step === 2){
-						pros.isStep = false
-						pros.productCount -= pros.minBuyNumber
-					}else{
-						pros.productCount--
-					}
-					this.processActivityPrice(pros)
-				}
-				this.updateShoppogNum(pros)
-				this.totalShopPeice();
-			},
-			changeNnmber(e,item,pros){//输入商品数量更新
-				let _value = e.detail.value;
-				if(!this.$api.isNumber(_value)){
-					pros.productCount = pros.minBuyNumber
-				}else if(_value < pros.minBuyNumber){	
-					this.$util.msg(`该商品最小起订量为${pros.minBuyNumber}`,2000);
-					pros.productCount = pros.minBuyNumber
-				}else if(_value % pros.minBuyNumber != 0){
-					pros.isStep = true
-					pros.productCount = pros.minBuyNumber
-				}else{
-					pros.isStep = false
-					pros.productCount = e.detail.value
-					this.processActivityPrice(pros)
-				}
-				this.updateShoppogNum(pros)
-				this.totalShopPeice();
-			},
-			processActivityPrice(pros){//单独处理活动价格和阶梯价格
-				let ladderPriceList = pros.ladderPriceList;
-				if(pros.ladderPriceFlag == '1'){
-					ladderPriceList.forEach((item,index)=>{
-						if(pros.productCount>=item.buyNum){
-							pros.retailPrice = item.buyPrice
-						}
-					});
-				}else{
-					pros.retailPrice = pros.retailPrice
-				}
-			},
-			updateShoppogNum(pros){//加减购物车商品更新到后台
-				let params ={id:pros.sellerCartId,productID:pros.productID,num:pros.productCount}
-				this.SellerService.SellerAddProductNum(params).then(response =>{
-					this.isshowDelbtn = false;
-					this.initGetCartGoodsList();
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000);
-				})
-			 },
-			toConfirmation(){//跳转确认订单页面
-				let setGoodsList=[];
-				let productIdList = [];
-				let productID = '';
-				this.goodsList.forEach(res=>{
-					let products = res.productsList
-					products.forEach(pros=>{
-						if(pros.productsChecked){
-						    setGoodsList.push(pros.productID)
-						}
-					})
-				})
-				if(setGoodsList == ''){
-					this.$util.msg("请先选择结算商品~",2000);
-					return
-				}else{
-					/**
-					 * @获取勾选的商品ID拼接字符串逗号隔开，最后一个逗号去掉
-					 * @获取勾选的商品分类ID拼接字符串格式逗号隔开，最后一个逗号去掉
-					 */
-					this.goodsList.forEach(el=>{
-						el.productsList.forEach(pros=>{
-							if(pros.productsChecked){
-							   productIdList.push(pros.productID)
-							}
-						})
-					})
-					//判断勾选的商品是否为充值商品或者为定金商品的一些处理逻辑
-					const isHasDepositlds = productIdList.filter(item =>this.depositIds.includes(item))
-					const isHasRechargeIds = productIdList.filter(item =>this.rechargeIds.includes(item))
-					const isGoods= productIdList.every(item =>{ [...this.depositIds,...this.rechargeIds].includes(item)}) 
-					if(productIdList.length == 1 && isHasDepositlds.length === 1 && isHasRechargeIds.length === 0){
-						console.log('定金商品')
-						productIdList.forEach(item =>{
-							productID += item +','
-						})
-					}else if(productIdList.length == 1 && isHasRechargeIds.length === 1 && isHasDepositlds.length === 0){
-						console.log('充值余额商品')
-						productIdList.forEach(item =>{
-							productID += item +','
-						})
-					}else if(!isGoods && isHasRechargeIds.length === 0 && isHasDepositlds.length === 0){
-						console.log('正常商品')
- 						productIdList.forEach(item =>{
-							productID += item +','
-						})
-					}else{
-						this.$util.modal('提示','缴纳订金商品或余额充值商品请单独下单!','确定','',false,() =>{})
-						return
-					}
-					let cartPramsData={
-							clubId:this.clubId,
-							allPrice:this.allPrice,
-							allCount:this.allCount,
-							productID:productID.substring(0,productID.lastIndexOf(',')),
-							productCount:''
-						}
-					this.$api.navigateTo(`/seller/pages/order/create-order?data=${JSON.stringify({data:cartPramsData})}`)
-				}
-			},
-			showDelManager(){//显示删除商品管理
-				this.isshowDelbtn = true;
-				if(this.isCheckAll) {
-					this.updateBothCheckBtn();	
-				} else {
-					this.updateCheckAllBtn();
-				}
-			},
-			hideDelManage(){//隐藏删除商品管理			
-				this.isshowDelbtn = false;
-				if(this.isCheckAll) {
-					this.updateBothCheckBtn();	
-				} else {
-					this.updateCheckAllBtn();
-				}
-			},
-			deleteList(){//删除购物车商品	
-				this.delGoodsList=[];
-				this.goodsList.forEach(delitem=>{
-					let products = delitem.productsList
-					products.forEach(pros=>{
-						if(pros.productsChecked){
-						    this.delGoodsList += pros.sellerCartId+','
-						}
-					})
-				})
-				this.failureList.forEach(failure=>{
-					if(failure.productsChecked){
-						this.delGoodsList += failure.sellerCartId+','
-					}
-				})
-				if(this.delGoodsList.length == 0){
-					this.$util.msg("请选择要删除的商品~",2000);
-					return
-				}else{				
-					this.$util.modal('','确定删除选中的商品吗？','确定','取消',true,() =>{
-						this.SellerService.DeleteSellerCart({sellerCartIds:this.delGoodsList}).then(response =>{
-							this.$util.msg('删除成功',2000);
-							setTimeout(()=>{
-								this.isshowDelbtn = false;
-								this.initGetCartGoodsList();
-							},2000)
-						}).catch(error =>{
-							this.$util.msg(error.msg,2000)
-						})
-					})
-				}
-			},
-			goNavto(url){
-				uni.navigateTo ({
-					url
-				})
-			},
-			PromotionsFormat(promo){//促销活动类型数据处理
-				if(promo!=null){
-					if(promo.type == 1 && promo.mode == 1){
-						return true
-					}else{
-						return false
-					}
-				}
-				return false
-			},
-			navToListPage(id){
-				this.isModallayer = true;
-				this.$api.navigateTo(`/pages/goods/product?id=${id}`)
-			}
-		},
-		watch:{//深度监听所有数据，每次改变重新计算总价和总数
-		    goodsList:{
-		        deep:true,
-		        handler(val,oldval){
-		            this.totalPeice()
-		            this.totalCount()
-		        }
-		    }
-		},
-		onReachBottom() {
-			if(this.hasNextPage){
-				this.loadding = true
-				this.pullUpOn = true
-				this.getOnReachBottomData()
-			}	
-		},
-		onPullDownRefresh() {//下拉刷新
-			this.initGetCartGoodsList()
-			uni.stopPullDownRefresh()
-		},
-		onShow(){
-			this.$api.getComStorage('orderUserInfo').then((resolve) =>{
-				console.log(resolve)
-				this.clubId = resolve.clubID
-				this.againBuyProductIds = resolve.againBuyProductIds
-				this.initData()
-			})
-		}
-	}
-</script>
-
-<style lang="scss">
-	page{
-		background: #f7f7f7;
-	}
-	.cart-content{
-		position: relative;
-		padding-bottom:74rpx;
-	}
-	.container-cart-main.none{
-		display: none;
-	}
-	.container-cart-main.show{
-		display: block;
-	}
-	.cart-content.empty.none{
-		display: none;
-	}
-	.cart-content.empty.show{
-		display: block;
-	}
-	.container-cart.show{
-		display: block;
-	}
-	.container-cart.none{
-		display: none;
-	}
-	.empty-container.none{
-		display: none;
-	}
-	.empty-container.show{
-		display: flex;
-	}
-	.foot-check-delbtn{
-		width: 100%;
-		height: 80rpx;
-		position: fixed;
-		top: 0;
-		left: 0;
-		box-sizing: border-box;
-		padding: 15rpx 24rpx;
-		background-color: #F7F7F7;
-		z-index: 990;
-		.foot-text{
-			font-size: $font-size-26;
-			height: 50rpx;
-			line-height: 50rpx;
-			color: #666666;
-			float: left;
-			padding-left: 10rpx;
-			text{
-				// color: $color-system;
-				margin: 0 6rpx;
-			}
-		}
-		.delBtn{
-			width: 100rpx;
-			display: inline-block;
-			padding: 0 15rpx;
-			font-size: $font-size-26;
-			height: 50rpx;
-			line-height: 50rpx;
-			border-radius: 30rpx;
-			background:#FFFFFF;
-			border: 1px solid #E15616;
-			color: $color-system;
-			float: right;
-			text-align: center;
-			&.none{
-				display: none;	
-			}
-		}
-	}
-	.checkbox-box{
-		display: flex;
-		align-items: center;
-		.checkbox{
-			display: flex;
-			margin: 0;
-			padding: 0;
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-			box-sizing: border-box;
-			text-align: center;
-			text-decoration: none;
-			border-radius: 0;
-			-webkit-tap-highlight-color: transparent;
-			overflow: hidden;
-			background-color:#FFFFFF;
-			font-size: 36rpx;
-			color:$color-system;
-			padding: 5rpx;
-			&.icon-weixuanze{
-				color: #b2b2b2;
-			}
-		}
-		&.disabled{
-			.checkbox{
-				color:#999999
-			}
-		}
-		.text{
-			font-size: $font-size-24;
-			margin-left: 10rpx;
-		}
-	}
-	.goods-list{
-		width: 100%;
-		height: auto;
-		border-top: 1px solid #EBEBEB;
-		background-color: #F7F7F7;
-		.goods-item{
-			width: 702rpx;
-			padding: 0 24rpx;
-			background: #FFFFFF;
-			margin-bottom: 24rpx;
-		}
-		.shoptitle{
-			display: flex;
-			align-items: center;
-			height: 80rpx;
-			line-height: 80rpx;
-			.checkbox-box{
-				padding: 10rpx;
-			}
-			.text{
-				width: 450rpx;
-				display: block;
-				overflow: hidden;
-				text-overflow:ellipsis;
-				white-space: nowrap;
-				margin-left: 20rpx;
-				font-size: $font-size-28;
-				color: $text-color;
-				text-align: left;
-				font-weight: bold;
-			}
-			.floor-item-act{
-				height: 56rpx;
-				text-align: center;
-				box-sizing: border-box;
-				float: left;
-				padding:10rpx 0;
-				margin-left: 20rpx;
-				.floor-tags{
-					height: 28rpx;
-					border-radius: 6rpx;
-					background-color: #FFFFFF;
-					line-height: 28rpx;
-					color: $color-system;
-					text-align: center;
-					display: inline-block;
-					padding:0 16rpx;
-					font-size: $font-size-20;
-					border: 1px solid #E15616;
-					float: right;
-				}
-			}
-		}
-		.goods-pros{
-			width: 100%;
-			height: auto;
-		}	
-		.goods-pros-t{
-			display: flex;
-			align-items: center;
-			width: 100%;
-			height: auto;
-			padding:0 0 20rpx 0;
-			.checkbox-box{
-				padding: 10rpx;
-			}
-			.pros-img{
-				width: 210rpx;
-				height: 210rpx;
-				border-radius: 10rpx;
-				margin:0 20rpx;
-				border:1px solid #f3f3f3;
-				image{
-					width: 210rpx;
-					height: 210rpx;
-					border-radius: 10rpx;
-				}
-			}
-		}
-		.goods-pros-b{
-			width:100%;
-			height: auto;
-			padding:0 0 24rpx 0;
-			box-sizing: border-box;
-			&.show{
-				display: block;
-			}
-			&.none{
-				display: none;
-			}
-			.sum-none{
-				width: 100%;
-				height: 48rpx;
-				line-height: 48rpx;
-				color: $text-color;
-				float: left;
-				text-align: right;
-				.money{
-					font-size: $font-size-26;
-					color: #999999;
-					text-decoration: line-through;
-				}
-				.money-sign{
-					font-size: $font-size-26;
-					color: #999999;
-					text-decoration: line-through;
-				}
-				.money-reduced{
-					margin-left: 10rpx;
-					font-size: $font-size-26;
-					color: $color-system;
-					.iconfont{
-						font-size: $font-size-34;
-					}
-				}
-			}
-			.sum{
-				width: 100%;
-				height: 40rpx;
-				font-size: $font-size-28;
-				line-height: 40rpx;
-				color: $text-color;
-				float: left;
-				display: flex;
-				justify-content: flex-end;
-				.money{
-					color: #FF2A2A;
-					font-size: $font-size-28;
-				}
-				.money-sign{
-					font-size: $font-size-24;
-					color: #FF2A2A;
-				}
-			}
-		}
-		.pros-product{
-			width: 386rpx;
-			height: 100%;
-			line-height: 36rpx;
-			font-size: $font-size-26;	
-			position: relative;
-			.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;
-				.no-text{
-					display: inline-block;
-					height:36rpx;
-					padding: 0 12rpx;
-					line-height: 36rpx;
-					background:linear-gradient(315deg,rgba(231,0,0,1) 0%,rgba(255,104,1,1) 100%);
-					border-radius:18rpx;
-					text-align: center;
-					color: #FFFFFF;
-					font-size: $font-size-24;
-					margin-right: 24rpx;
-				}
-			}
-			.productspec{
-				height: 36rpx;
-				color: #999999;
-				text-overflow:ellipsis;
-				display: -webkit-box;
-				word-break: break-all;
-				-webkit-box-orient: vertical;
-				-webkit-line-clamp: 2;
-				overflow: hidden;
-				margin-top: 10rpX;
-			}
-			.productCode{
-				color: #666666;
-			}
-			.productprice{
-				width: 100%;
-				height: 48rpx;
-				margin: 10rpx 0 0 0;
-				.price{
-					line-height: 48rpx;
-					font-size: $font-size-28;
-					width: 48%;
-					color: #FF2A2A;
-					float: left;
-					&.disabled{
-						color: #999999;
-						text-decoration: line-through;
-					}
-					.money-sign{
-						font-size: $font-size-24;
-						color: #FF2A2A;
-					}
-				}
-				.count{
-					height: 100%;
-					float: right;
-					position: relative;
-					&.show{
-						display: block;
-					}
-					&.none{
-						display: none;
-					}
-					.count-tips{
-						width: auto;
-						display: inline-block;
-						padding: 0 15rpx;
-						line-height: 44rpx;
-						height: 44rpx;
-						border-radius: 22rpx;
-						background: $btn-confirm;
-						font-size: $font-size-24;
-						text-align: center;
-						color: #FFFFFF;
-						position: absolute;
-						top:-60rpx;
-						left: -5rpx; 
-						z-index: 5;
-						&.step{
-							left:-217rpx
-						}
-						&::before{
-							content: "";
-							position: absolute;
-							bottom: -30rpx;
-							right: 15rpx;
-							z-index:1;
-							width: 0; 
-							height: 0;
-							border-width: 18rpx;
-							border-style: solid;
-							border-color:$color-system transparent transparent transparent;
-						}
-					}
-					.number-box{
-						display: flex;
-						justify-content: center;
-						align-items: center;
-						border: 2rpx solid #ffe6dc;
-						border-radius: 30rpx;
-						height: 48rpx;
-						.iconfont{
-							font-size: $font-size-24;
-							padding:0 18rpx;
-							color: #999999;
-							text-align: center;
-							line-height: 48rpx;
-							font-weight: bold;
-							background: #fef6f3;
-							&.icon-jianhao{
-								border-radius: 30rpx 0 0 30rpx;
-							}
-							&.icon-jiahao{
-								border-radius: 0 30rpx 30rpx 0;
-							}
-						}
-						.btn-input{
-							width: 62rpx;
-							height: 44rpx;
-							line-height: 44rpx;
-							border-radius: 4rpx;
-							text-align: center;
-							font-size: $font-size-24;
-							border-bottom: 2rpx solid #ffe6dc;
-							border-top: 2rpx solid #ffe6dc;
-						}
-					}
-					.uni-numbox{
-						position: absolute;
-						left: 45rpx;
-						bottom: 0;
-						.uni-numbox-minus, .uni-numbox-plus{
-							width: 50rpx;
-							line-height: 40rpx;
-						}
-						.uni-numbox-value {
-							font-size: $font-size-28;
-							width: 60rpx;
-						}
-					}
-				}
-			}
-			.floor-item-act{
-				width: 100%;
-				height: 56rpx;
-				text-align: center;
-				box-sizing: border-box;
-				float: left;
-				padding:0 0 10rpx 0;
-				margin-left: 10rpx;
-				.floor-tags{
-					height: 28rpx;
-					border-radius: 6rpx;
-					background-color: #FFFFFF;
-					line-height: 28rpx;
-					color: $color-system;
-					text-align: center;
-					display: inline-block;
-					padding:0 16rpx;
-					font-size: $font-size-20;
-					border: 1px solid #E15616;
-					float: left;
-				}
-			}
-		}
-	}
-	.footer{
-		width: 100%;
-		background-color: #FFFFFF;
-		height: 110rpx;
-		position: fixed;
-		bottom: 0rpx;
-		z-index: 100;
-		.footer-le{
-			width: 510rpx;
-			height: 100%;
-			padding:0 24rpx;
-			float: left;
-			.foot-check{
-				width: 100rpx;
-				float: left;
-				line-height: 110rpx;
-				font-size: $font-size-24;
-				.checkbox{
-					width: 40rpx;
-					text-align: center;
-				}
-				.text{
-					width: 60rpx;
-					float: right;
-				}
-			}
-			.sum{
-				width: 380rpx;
-				height: 110rpx;
-				float: right;
-				box-sizing: border-box;
-				padding: 10rpx;
-				.sum-none{
-					width: 100%;
-					height: 45rpx;
-					line-height: 45rpx;
-					color: $text-color;
-					float: left;
-					text-align: right;
-					.money{
-						font-size: $font-size-24;
-						color: #999999;
-						text-decoration: line-through;
-					}
-					.money-sign{
-						font-size: $font-size-24;
-						color: #999999;
-						text-decoration: line-through;
-					}
-					.money-reduced{
-						margin-left: 10rpx;
-						font-size: $font-size-24;
-						color: $color-system;
-					}
-				}
-				.sum-price{
-					text-align: right;
-					width: 100%;
-					height: 45rpx;
-					line-height: 45rpx;
-					font-size: $font-size-30;
-					color: $text-color;
-					float: left;
-					font-weight: normal;
-					&.none{
-						height: 90rpx;
-						line-height: 90rpx;
-					}
-					.money{
-						color: #FF2A2A;
-					}
-					.money-sign{
-						font-size: $font-size-24;
-						color: #FF2A2A;
-					}
-				}
-			}
-		}
-		.footer-ri{
-			width: 180rpx;
-			height: 84rpx;
-			background:linear-gradient(135deg,rgba(242,143,49,1) 0%,rgba(225,86,22,1) 100%);
-			float: right;
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			z-index: 999;
-			border-radius: 49rpx;
-			margin-top: 15rpx;
-			margin-right: 10rpx;
-			&.none{
-				display: none;
-			}
-			.btn{
-				width: 200rpx;
-				height: 100%;
-				font-size: $font-size-28;
-				line-height: 110rpx;
-				color: #FFFFFF;
-				display: flex;
-				justify-content: center;
-				align-items: center;
-			}
-		}
-		.footer-del{
-			width: 400rpx;
-			height: 110rpx;
-			position: absolute;
-			padding-left: 200rpx;
-			background: #FFFFFF;
-			right: 0;
-			top: 0;
-			z-index: 1000;
-			&.show{
-				animation: showDelbtn 0s linear both;
-			}
-			&.none{
-				animation: hideDelbtn 0s linear both;
-			}
-			.btn{
-				width: 50%;
-				height: 100%;
-				line-height: 110rpx;
-				font-size: $font-size-28;
-				color: #FFFFFF;
-				text-align: center;
-				float: left;
-			}
-			.btn.btn-cancel{
-				background:#EEC1AB;
-			}
-			.btn.btn-confirm{
-				background:#FF2A2A;
-			}
-			@keyframes showDelbtn {
-				0% {
-					transform: translateX(0);
-				}
-				100% {
-					transform: translateX(-100%);
-				}
-			}
-			@keyframes hideDelbtn {
-				0% {
-					transform: translateX(-100%);
-				}
-				100% {
-					transform: translateX(0);
-				}
-			}
-		}
-	}
-	.failure-list{
-		width: 702rpx;
-		height: auto;
-		padding: 0 24rpx;
-		margin-top: 20rpx;
-		background: #FFFFFF;
-		.failure-title{
-			width: 100%;
-			height: 82rpx;
-			line-height: 82rpx;
-			font-size: $font-size-28;
-			.title-txt{
-				float: left;
-				color:#666666;
-				text-align: left;
-			}
-			.title-btn{
-				float: right;
-				color: $color-system;
-				text-align: right;
-				line-height: 80rpx;
-				.butto{
-					display: inline-block;
-					padding: 0 15rpx;
-					font-size: $font-size-26;
-					height: 50rpx;
-					line-height: 50rpx;
-					border-radius: 30rpx;
-					background:#FFFFFF;
-					// border: 1px solid #C9C9C9;
-					// color: #999999;
-					margin-top: 15rpx;
-				}
-			}
-		}
-		.productlist{
-			padding-top: 10rpx;
-			.goods-pros{
-				width: 100%;
-				height: auto;
-				padding: 20rpx 0;
-			}	
-			.goods-pros-t{
-				display: flex;
-				align-items: center;
-				width: 100%;
-				height: 210rpx;
-				position: relative;
-				.img-tip{
-					display: block;
-					width: 72rpx;
-					height: 36rpx;
-					line-height: 36rpx;
-					font-size: $font-size-24;
-					text-align: center;
-					color: #FFFFFF;
-					border-radius: 24rpx;
-					background:rgba(51,51,51,0.3);
-					// position: absolute;
-					// left: 0;
-					// top: 0;
-				}
-				.checkbox-box{
-					padding: 10rpx;
-				}
-				.pros-img{
-					width: 180rpx;
-					height: 100%;
-					border-radius: 10rpx;
-					margin:0 20rpx;
-					border:1px solid #f3f3f3;
-					position: relative;
-					image{
-						width: 100%;
-						height: 100%;
-						border-radius: 10rpx;
-					}
-				}
-				.pros-marks{
-					width: 750rpx;
-					height: 250rpx;
-					z-index: 90;
-					background: rgba(0,0,0,.05);
-					position: absolute;
-					left:-20rpx;
-					top: -20rpx;
-				}
-			}
-			.goods-pros-b{
-				width:622rpx;
-				margin-left: 84rpx;
-				height: 40rpx;
-				padding:0 0 26rpx 0;
-				// border-top: 1px solid #EBEBEB;
-				&.show{
-					display: block;
-				}
-				&.none{
-					display: none;
-				}
-				.sum{
-					font-size: $font-size-28;
-					line-height: 40rpx;
-					color: $text-color;
-					display: flex;
-					justify-content: flex-end;
-					.money{
-						color: #FF2A2A;
-						font-size: $font-size-28;
-					}
-					.money-sign{
-						font-size: $font-size-24;
-						color: #FF2A2A;
-					}
-				}
-			}
-			.pros-product{
-				width: 402rpx;
-				height: 100%;
-				line-height: 36rpx;
-				font-size: $font-size-28;	
-				position: relative;
-				.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;
-					.no-text{
-						display: inline-block;
-						height:36rpx;
-						padding: 0 12rpx;
-						line-height: 36rpx;
-						background:linear-gradient(315deg,rgba(231,0,0,1) 0%,rgba(255,104,1,1) 100%);
-						border-radius:18rpx;
-						text-align: center;
-						color: #FFFFFF;
-						font-size: $font-size-28;
-						margin-right: 24rpx;
-					}
-				}
-				.productspec{
-					height: 36rpx;
-					color: #999999;
-					font-size: $font-size-26;
-					margin-top: 20rpx;
-				}
-				.productstate{
-					font-size: $font-size-28;
-					height: 44rpx;
-					color: #FF2A2A;
-					position: absolute;
-					bottom: 0;
-					left: 0;
-				}
-			}
-		}
-	}
-</style>

seller/pages/cart/immediately.vue

@@ -1,634 +0,0 @@
-<template>
-	<view class="container all-type-list-wrapper">
-		<immediately-list ref="productList"
-						  :search-status="true"
-						  @operationConfim="hanldOperationConfim"
-						  @alertjietiConfim ="hanldalertjietiConfim"
-						  @goCartPage="hanldToCartPage"
-						  :tabBars="tabBars"
-						  :tabIndex="tabIndex"
-						  @changetab="hanldChangeTab"
-						  >
-		</immediately-list>
-		<!--底部选择模态层弹窗组件 -->
-		<view class="popup spec"  :class="specClass"  @touchmove.stop.prevent="discard" @tap="hideSpec" >
-			<!-- 遮罩层 -->
-			<view class="mask"></view>
-			<view class="layer" @tap.stop="discard" :style="{paddingBottom :isIphoneX ? '68rpx' : '36rpx',bottom:isIphoneX ?'-370rpx' : '-360rpx'}">
-				<view class="content">
-					<view class="layer-smimg">
-						<image :src="handleData.p_image" mode=""></image>
-					</view>
-					<view class="layer-nunbox">
-						<view class="layer-nunbox-m" v-if="handleData.p_code!=''&& handleData.p_code!=null">商品编码：{{handleData.p_code}}</view>
-						<view class="layer-nunbox-t">
-							<view class="layer-nunbox-text">数量：</view>
-							<view class="number-box">
-								<view  class="iconfont icon-jianhao" :class="[isQuantity==true?'disabled':'']" @click="changeCountSub()"></view>
-								<input class="btn-input" type="number" v-model="number" maxlength='6'  @blur="changeNumber($event)">
-								<view  class="iconfont icon-jiahao"  :class="[isStock==true?'disabled':'']" @click="changeCountAdd()"></view>
-							</view>
-						</view>
-						<view class="layer-nunbox-b">
-							<view class="text">单价：
-								<text class="p sm">￥</text>
-								<text class="p bg">{{ buyRetailPrice | NumFormat }}</text>
-							</view>
-						</view>
-					</view>
-				</view>
-				<view class="btn">
-					<view class="button add" @click="getAddProductCart">加入购物车</view>
-				</view>
-			</view>
-		</view>
-		<!-- 组合加入购物车 -->
-		<view class="popup spec zuhe" :class="specClasszuhe"  @touchmove.stop.prevent="discard" @tap="hideSpecs">
-			<!-- 遮罩层 -->
-			<view class="mask"></view>
-			<view class="layer" @tap.stop="discard" :style="{paddingBottom :isIphoneX ? '68rpx' : '36rpx',bottom:isIphoneX ?'-290rpx' : '-270rpx'}">
-				<view class="content zuhe-content">
-					<view class="number-left">
-						<text>种类：{{productKind}}</text>
-						<text>数量：{{productTotalNum}}</text>
-					</view>
-					<view class="number-right">
-						<view class="text">
-							总额：<text class="number-right-text">￥{{ productTotalAmount | NumFormat }}</text>
-						</view>
-					</view>
-				</view>
-				<view class="btn">
-					<view class="button add" @click="getzuheCart">确定</view>
-				</view>
-			</view>
-		</view>
-
-		<!--  -->
-		<view class="popup spec zuhe" :class="specClassjieti"  @touchmove.stop.prevent="discard" >
-			<view class="mask"></view>
-			<view class="jieti_box " @tap.stop="discard">
-				<view class="jieti_box_one">
-					<view class="jieti_left" >
-						<view>起订量</view>
-						<view class="ladder-a"  v-for="(item,index) in ladderPriceList" :key="index">
-							{{item.buyNumRangeShow}}
-						</view>
-					</view>
-					<view class="jieti_right" >
-						<view>价格</view>
-						<view class="" v-for="(item,index) in ladderPriceList" :key="index">￥ {{item.buyPrice | NumFormat}}</view>
-					</view>
-				</view>
-				<view class="addbtn" @tap="hideSpecjieti">知道了</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import immediatelyList from '@/components/cm-module/listTemplate/immediatelyList'
-	export default{
-		components:{
-			immediatelyList
-		},
-		data(){
-			return{
-				clubID:'',	//机构ID
-				serviceProviderId:'',//协销ID
-				serverUrl: '',
-				emptyText: '',
-				lastPageType: '',
-				lastPageVal: '',
-				isIphoneX:this.$store.state.isIphoneX,
-				specClass: '',//规格弹窗css类，控制开关动画
-				specClasszuhe:'',//组合加购物车弹窗
-				specClassjieti:'',//阶梯展示弹窗
-				ladderPriceList:{},
-				handleData:{},
-				isQuantity:false,
-				isStock:false,
-				minBuyNumber:0,
-				number:0,
-				buyRetailPrice:0,
-				hanldChangeTabIndex:0,
-				handleDataLadderPriceList:[],
-				productKind:0,
-				productTotalNum:0,
-				productTotalAmount:0,
-				buyNumRangeShow:'',//起订量范围
-				buyPrice:'',//起订量范围价格
-				buyRetailPriceStep:1,
-			}
-		},
-		onLoad() {
-
-		},
-		filters:{
-			NumFormat(value) {//处理金额
-				return Number(value).toFixed(2);
-			},
-		},	
-		methods:{
-			getClubProductNum(){
-				this.SellerService.GetSellerProductNum({clubId:this.clubID,serviceProviderId:this.serviceProviderId}).then(response =>{
-					this.$refs.productList.cartQuantity = response.data
-				})
-			},
-			hanldChangeTab(index){
-				if(index == 1){
-					this.$refs.productList.getcombinationProduct()
-				}
-			},
-			hanldalertjietiConfim(data){
-				this.ladderPriceList = data.ladderPriceList
-				this.specClassjieti='show';
-			},
-			hanldOperationConfim(data){//显示选择数量确认弹窗
-				this.handleData = data
-				console.log(this.handleData)
-				if(this.$refs.productList.tabIndex == 1){
-					if(data.productKind ==0){
-						this.$util.msg(`请至少选购一种商品`,2000);
-					}else{
-						this.specClasszuhe = 'show';
-						this.productKind= data.productKind;
-						this.productTotalNum = data.productTotalNum;
-						this.productTotalAmount = data.productTotalAmount;
-					}
-				}else{
-					this.number = data.minBuyNumber
-					this.minBuyNumber = data.minBuyNumber
-					this.buyRetailPrice = data.price;
-					this.buyRetailPriceStep = data.step
-					this.specClass = 'show';
-					if(this.handleData.ladderPriceFlag == '1'){
-						this.ProductService.GetSearchProductLadderPrice({productId:this.handleData.p_id}).then(response=>{
-							this.handleDataLadderPriceList = response.data
-							this.handleDataLadderPriceList.forEach((item,index)=>{
-								if(this.number>=item.buyNum){
-									this.buyRetailPrice = item.buyPrice
-								}
-							})
-						}).catch(error =>{
-							console.log('获取阶梯价格异常')
-						})
-					}
-				}
-			},
-			hideSpec() {//关闭选择数量确认弹窗
-				this.specClass = 'hide';
-				setTimeout(() => {
-					this.specClass = 'none';
-				}, 200);
-			},
-			hideSpecs(){
-				this.specClasszuhe='hide';
-				setTimeout(() => {
-					this.specClasszuhe='none';
-				}, 200);
-			},
-			hideSpecjieti(){
-				this.specClassjieti='hide';
-				setTimeout(() => {
-					this.specClassjieti='none';
-				}, 200);
-			},
-			changeCountAdd(){//popup弹窗数量增加按钮
-				if(this.buyRetailPriceStep == 2){
-					this.number += this.minBuyNumber
-				}else{
-					this.number++
-				}
-				this.calculatPerice()
-			},
-			changeCountSub(){//popup弹窗数量减按钮
-				if(this.number<=this.minBuyNumber){
-					this.number= this.minBuyNumber
-					this.isQuantity =true
-					this.$util.msg(`该商品最小起订量为${this.minBuyNumber}`,2000);
-					return
-				}else{
-					if(this.buyRetailPriceStep == 2){
-						this.number-=this.minBuyNumber
-					}else{
-						this.number--
-					}
-					this.calculatPerice()
-					this.isQuantity =false
-				}
-			 },
-			changeNumber(e){
-				let _value = e.detail.value;
-				if(!this.$api.isNumber(_value)){
-					this.number = this.minBuyNumber
-				}else if(_value < this.minBuyNumber){
-					this.$util.msg(`该商品最小起订量为${this.minBuyNumber}`,2000);
-					this.number = this.minBuyNumber
-				}else if( _value % this.minBuyNumber !=0 ){
-					this.$util.msg(`购买量必须为起订量的整数倍`,2000);
-					this.number = this.minBuyNumber
-				}else{
-					this.number = e.detail.value
-					this.calculatPerice()
-				}
-			},
-			calculatPerice(){//判断是否为阶梯价然后做计算价格处理
-				if(this.handleData.ladderPriceFlag == '1'){
-					this.handleDataLadderPriceList.forEach((item,index)=>{
-						if(this.number>=item.buyNum){
-							this.buyRetailPrice = item.buyPrice
-						}
-					})
-				}else{
-					this.buyRetailPrice = this.handleData.price;
-				}
-			},
-			getzuheCart(){//组合商品加入购物车
-				let productInfo=[];
-				let setGoodsList ={};
-				let productID = '';
-				let productNum ='';
-				this.handleData.combinationProductList.forEach(item =>{
-					if(item.initProductNum >0){
-						setGoodsList.productId = item.productID
-						setGoodsList.productNum =item.initProductNum
-						productInfo.push(JSON.parse(JSON.stringify(setGoodsList)))
-					}
-				})
-				let params ={
-						clubId:this.clubID,
-						serviceProviderId:this.serviceProviderId,
-						productInfo:productInfo
-					}
-				this.SellerService.ShoppingCartBatchAddCart({'params':JSON.stringify(params)}).then(response => {
-					this.specClasszuhe = 'hide';
-					this.$util.msg('加入购物车成功',1500,true,'success');
-					this.getClubProductNum();
-					this.clearProduct();//清空
-					setTimeout(() => {this.specClasszuhe = 'none'}, 200)
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000);
-				})
-			},
-			clearProduct(){//成功加入购物车后清空所选值
-				this.handleData.productKind= 0;
-				this.handleData.productTotalNum = 0;
-				this.handleData.productTotalAmount = 0;
-				this.handleData.combinationProductList.forEach(item =>{
-					item.initProductNum = 0;
-				})
-			},
-			getAddProductCart(){//增加购物车成功和toast弹窗提示成功
-				let params ={
-						productId:this.handleData.p_id,
-						clubId:this.clubID,
-						serviceProviderId:this.serviceProviderId,
-						num:this.number
-					}
-				this.SellerService.ShoppingCartAddCart(params).then(response => {
-					this.specClass = 'hide';
-					this.$util.msg('加入购物车成功',1500,true,'success')
-					this.getClubProductNum();
-					setTimeout(() => {this.specClass = 'none'}, 200)
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000);
-				})
-			},
-			hanldToCartPage(){
-				this.$api.navigateTo('/seller/pages/cart/cart')
-			},
-			discard(){
-				//丢弃
-			}
-		},
-		onShow() {
-			this.$api.getComStorage('orderUserInfo').then((resolve) =>{
-				this.clubID = resolve.clubID
-			})
-			this.$api.getStorage().then((resolve) =>{
-				this.serviceProviderId = resolve.serviceProviderID
-				this.getClubProductNum()
-			})
-		},
-	}
-</script>
-
-<style lang="scss">
-	// 阶梯价格弹窗
-	.jieti_box{
-		width: 596rpx;
-		// height: 496rpx;
-		top: 10%;
-		right: 50%;
-		transform: translate(50%,50%);
-		position: absolute;
-		background:#FFFFFF;
-		color: #000;
-		font-size: 28rpx;
-		border-radius: 10rpx;
-		text-align: center;
-		line-height: 84rpx;
-		padding: 20rpx;
-		z-index: 99999;
-	}
-	.jieti_box_one{
-		// width: 548rpx;
-		overflow: hidden;
-		border: 2rpx solid #F5F5F5;
-		border-bottom: 0;
-		margin: auto;
-	}
-	.jieti_left{
-		width: 298rpx;
-		float: left;
-		}
-	.jieti_left view{
-		height: 84rpx;
-		border-bottom:2rpx solid #F5F5F5 ;
-		border-right:2rpx solid #F5F5F5  ;
-	}
-	.ladder-a{
-		letter-spacing: 4rpx;
-	}
-	.jieti_right{
-			width: 294rpx;
-			float: right;
-		}
-	.jieti_right view{
-			height: 84rpx;
-			border-bottom:2rpx solid #F5F5F5;
-		}
-	.addbtn{
-			height: 84rpx;
-			background: linear-gradient(135deg,rgba(242,143,49,1) 0%,rgba(225,86,22,1) 100%);
-			text-align: center;
-			font-size: 28rpx;
-			color: #fff;
-			line-height: 84rpx;
-			border-radius: 42rpx;
-			margin: 20rpx auto
-		}
-	.zuhe-content{
-		display: inline-block;
-	}
-	.number-left{
-		float: left;
-	}
-	.number-right{
-		margin-left: 30rpx;
-		float: left;
-	}
-	.number-left text{
-		margin-left: 30rpx;
-	}
-	.number-right-text{
-		color: #FF2A2A;
-	}
-	page {
-		background: $sub-bg-color;
-		.all-type-list-wrapper {
-			display: flex;
-			flex-direction: column;
-		}
-	}
-	/* 加入购物模态层*/
-	@keyframes showPopup {
-		0% {
-			opacity: 0;
-		}
-		100% {
-			opacity: 1;
-		}
-	}
-	@keyframes hidePopup {
-		0% {
-			opacity: 1;
-		}
-		100% {
-			opacity: 0;
-		}
-	}
-	@keyframes showLayer {
-		0% {
-			transform: translateY(0);
-		}
-		100% {
-			transform: translateY(-100%);
-		}
-	}
-	@keyframes hideLayer {
-		0% {
-			transform: translateY(-100%);
-		}
-		100% {
-			transform: translateY(0);
-		}
-	}
-	@keyframes showAmnation {
-		0% {
-			top: -12rpx;
-			opacity: 0;
-		}
-		50% {
-			top: -60rpx;
-			opacity: 1;
-		}
-		100% {
-			top: -100rpx;
-			opacity: 0;
-		}
-	}
-	@keyframes hideAmnation {
-		0% {
-			top: -100rpx;
-			opacity: 0;
-		}
-		100% {
-			top: -12rpx;
-			opacity: 0;
-		}
-	}
-	.popup {
-		position: fixed;
-		top: 0;
-		width: 100%;
-		height: 100%;
-		z-index: 999;
-		display: none;
-		.mask{
-			position: fixed;
-			top: 0;
-			width: 100%;
-			height: 100%;
-			z-index: 21;
-			background-color: rgba(0, 0, 0, 0.6);
-		}
-		.layer {
-			position: fixed;
-			z-index: 22;
-			bottom: -360rpx;
-			width: 702rpx;
-			padding: 24rpx 24rpx 36rpx 24rpx;
-			// height: 236rpx;
-			border-radius: 20rpx 20rpx 0 0;
-			background-color: #fff;
-			display: flex;
-			flex-wrap: wrap;
-			align-content: space-between;
-			.content {
-				width: 100%;
-				margin-top: 20rpx;
-			}
-			.btn {
-				width: 100%;
-				// height: 88rpx;
-				display: flex;
-				.button {
-					width: 702rpx;
-					height: 88rpx;
-					color: #fff;
-					display: flex;
-					align-items: center;
-					justify-content: center;
-					font-size: $font-size-28;
-					border-radius: 44rpx;
-					background: $btn-confirm;
-					margin-top: 20rpx;
-				}
-			}
-		}
-		.layer-nunbox-m{
-			font-size: 28rpx;
-		}
-		&.show {
-			display: block;
-			.mask{
-				animation: showPopup 0.2s linear both;
-			}
-			.layer {
-				animation: showLayer 0.2s linear both;
-			}
-		}
-		&.hide {
-			display: block;
-			.mask{
-				animation: hidePopup 0.2s linear both;
-			}
-
-			.layer {
-				animation: hideLayer 0.2s linear both;
-			}
-		}
-		&.none {
-			display: none;
-		}
-		&.service {
-			.row {
-				margin: 30upx 0;
-				.title {
-					font-size: 30upx;
-					margin: 10upx 0;
-				}
-				.description {
-					font-size: 28upx;
-					color: #999;
-				}
-			}
-		}
-		.layer-smimg{
-			width: 158rpx;
-			height: 158rpx;
-			float: left;
-			border-radius: 10rpx;
-			margin-right: 24rpx;
-			image{
-				width: 158rpx;
-				height: 158rpx;
-				border-radius: 10rpx;
-			}
-		}
-		.layer-nunbox{
-			justify-content: space-between;
-			align-items: center;
-			width: 510rpx;
-			height: 88rpx;
-			padding: 10rpx 0 0 0;
-			float: left;
-			.layer-nunbox-t{
-				width: 100%;
-				height:44rpx;
-				position:relative;
-				display: flex;
-				margin-top: 10rpx;
-				.layer-nunbox-text{
-					line-height: 44rpx;
-					font-size: $font-size-28;
-				}
-				.number-box{
-					display: flex;
-					justify-content: center;
-					align-items: center;
-					border: 2rpx solid #ffe6dc;
-					border-radius: 30rpx;
-					height: 48rpx;
-					margin-left: 20rpx;
-					.iconfont{
-						font-size: $font-size-24;
-						padding:0 18rpx;
-						color: #999999;
-						text-align: center;
-						line-height: 48rpx;
-						font-weight: bold;
-						background: #fef6f3;
-						&.icon-jianhao{
-							border-radius: 30rpx 0 0 30rpx;
-						}
-						&.icon-jiahao{
-							border-radius: 0 30rpx 30rpx 0;
-						}
-					}
-					.btn-input{
-						width: 80rpx;
-						height: 48rpx;
-						line-height: 48rpx;
-						background: #FFFFFF;
-						border-radius: 4rpx;
-						text-align: center;
-						font-size: $font-size-28;
-					}
-				}
-				.product-step{
-					position: absolute;
-					left: 45rpx;
-					bottom: 0;
-					height: 44rpx;
-					background: #FFFFFF;
-				}
-			}
-			.layer-nunbox-b{
-				width: 100%;
-				height:44rpx;
-				margin-top: 13rpx;
-			}
-			.text{
-				line-height: 44rpx;
-				font-size: $font-size-28;
-				.p{
-					color: #FF2A2A;
-				}
-				.p:first-child{
-					margin-left: 30rpx;
-				}
-				.p.sm{
-					font-size: $font-size-24;
-				}
-			}
-		}
-	}
-
-	.zuhe .layer{
-		bottom: -270rpx;
-		height: 200rpx;
-	}
-</style>

seller/pages/cart/second.vue

@@ -1,516 +0,0 @@
-<template>
-	<view class="container all-type-list-wrapper">
-		<second-hand ref="productList"
-						  :search-status="true"
-						  @operationConfim="hanldOperationConfim"
-						  >
-		</second-hand>
-		<!--底部选择模态层弹窗组件 -->
-		<view class="popup spec"  :class="specClass"  @touchmove.stop.prevent="discard" @tap="hideSpec" >
-			<!-- 遮罩层 -->
-			<view class="mask"></view>
-			<view class="layer" @tap.stop="discard" :style="{paddingBottom :isIphoneX ? '68rpx' : '36rpx',bottom:isIphoneX ?'-370rpx' : '-360rpx'}">
-				<view class="content">
-					<view class="layer-smimg">
-						<image :src="handleData.mainImage" mode=""></image>
-					</view>
-					<view class="layer-nunbox">
-						<view class="layer-nunbox-t">
-							<view class="layer-nunbox-text">数量：</view>
-							<view class="number-box">
-								<view  class="iconfont icon-jianhao" :class="[isQuantity?'disabled':'']" @click="changeCountSub()"></view>
-								<input class="btn-input" type="number" v-model="number" maxlength='6'  @blur="changeNumber($event)">
-								<view  class="iconfont icon-jiahao"  :class="[isStock?'disabled':'']" @click="changeCountAdd()"></view>
-							</view>
-						</view>
-						<view class="layer-nunbox-b">
-							<view class="text">单价：
-								<text class="p sm">￥</text>
-								<text class="p bg">{{buyRetailPrice.toFixed(2)}}</text>
-							</view>
-						</view>
-					</view>
-				</view>
-				<view class="btn">
-					<view class="button add" @click="toConfirmation">立即购买</view>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import secondHand from '@/components/cm-module/listTemplate/secondHand'
-	export default{
-		components:{
-			secondHand
-		},
-		data(){
-			return{
-				clubID:'',	//机构ID
-				serviceProviderId:'',//协销ID
-				serverUrl: '',
-				emptyText: '',
-				lastPageType: '',
-				lastPageVal: '',
-				isIphoneX:this.$store.state.isIphoneX,
-				specClass: '',//规格弹窗css类，控制开关动画
-				specClasszuhe:'',//组合加购物车弹窗
-				specClassjieti:'',//阶梯展示弹窗
-				ladderPriceList:{},
-				handleData:{},
-				isQuantity:false,
-				isStock:false,
-				number:1,
-				buyRetailPrice:0,
-				productKind:0,
-				productTotalNum:0,
-				productTotalAmount:0,
-				buyNumRangeShow:'',//起订量范围
-				buyPrice:'',//起订量范围价格
-				buyRetailPriceStep:1,
-				secondProductType:'',
-			}
-		},
-		onLoad() {
-
-		},
-		methods:{
-			getClubProductNum(){
-				this.SellerService.GetSellerProductNum({clubId:this.clubID,serviceProviderId:this.serviceProviderId}).then(response =>{
-					this.$refs.productList.cartQuantity = response.data
-				})
-			},
-			hanldOperationConfim(data){//显示选择数量确认弹窗
-				console.log(this.handleData)
-				this.handleData = data
-					this.number = 1
-					this.buyRetailPrice = Number(data.price1);
-					this.secondProductType = data.secondProductType
-					this.specClass = 'show';
-			},
-			hideSpec() {//关闭选择数量确认弹窗
-				this.specClass = 'hide';
-				setTimeout(() => {
-					this.specClass = 'none';
-				}, 200);
-			},
-			changeCountAdd(){//popup弹窗数量增加按钮
-				if(this.handleData.secondHandType == 2||this.handleData.secondHandType == 3){
-					// if(this.number >= this.handleData.stock){
-					// 	this.number= this.handleData.stock
-					// 	this.isStock =true
-					// 	this.$util.msg(`购买数量最高为${this.handleData.stock}`,2000);
-					// 	return
-					// }else{
-						this.number++
-						this.isQuantity =false
-					// }
-					this.buyRetailPrice = this.number*this.handleData.price1
-				}else{
-					this.isStock =true
-					this.$util.msg(`该商品购买数量只能为1`,2000);
-				}
-			},
-			changeCountSub(){//popup弹窗数量减按钮
-				if(this.handleData.secondHandType == 2||this.handleData.secondHandType == 3){
-					// if(this.number <= 1){
-					// 	this.number= 1
-					// 	this.isQuantity =true
-					// 	this.$util.msg(`购买数量最低为1`,2000);
-					// 	return
-					// }else{
-						this.number--
-						this.isQuantity =false
-					// }
-					this.buyRetailPrice = this.number*this.handleData.price1
-				}else{
-					this.isQuantity =true
-					this.$util.msg(`该商品购买数量只能为1`,2000);
-				}
-			 },
-			// changeNumber(e){
-			// 	let _value = e.detail.value;
-			// 	if(!this.$api.isNumber(_value)){
-			// 		this.number = this.minBuyNumber
-			// 	}else if(_value < this.minBuyNumber){
-			// 		this.$util.msg(`该商品最小起订量为${this.minBuyNumber}`,2000);
-			// 		this.number = this.minBuyNumber
-			// 	}else if( _value % this.minBuyNumber !=0 ){
-			// 		this.$util.msg(`购买量必须为起订量的整数倍`,2000);
-			// 		this.number = this.minBuyNumber
-			// 	}else{
-			// 		this.number = e.detail.value
-			// 	}
-			// },
-			changeNumber(e){
-				let _value = e.detail.value;
-				if(!this.$api.isNumber(_value)){
-					this.number = 1
-				}else if(_value <= 1){
-					this.$util.msg(`该商品最小起订量为1`,2000);
-					this.number = 1
-				}else{
-					this.number = e.detail.value
-				}
-				this.buyRetailPrice = this.number*this.handleData.price1
-			},
-			clearProduct(){//成功加入购物车后清空所选值
-				this.handleData.productKind= 0;
-				this.handleData.productTotalNum = 0;
-				this.handleData.productTotalAmount = 0;
-				this.handleData.combinationProductList.forEach(item =>{
-					item.initProductNum = 0;
-				})
-			},
-			toConfirmation(){//跳转确认订单页面
-				this.specClass = 'hide';
-				let cartPramsData={
-						clubId:this.clubID,
-						allPrice:this.buyRetailPrice,
-						allCount:this.number,
-						productID:this.handleData.productID,
-						productCount:this.number
-				}
-				this.$api.navigateTo(`/seller/pages/order/create-order?type=prodcut&data=${JSON.stringify({data:cartPramsData})}`)
-				setTimeout(() => {
-					this.specClass = 'none';
-				}, 200);
-			},
-			hanldToCartPage(){
-				this.$api.navigateTo('/seller/pages/cart/cart')
-			},
-			discard(){
-				//丢弃
-			}
-		},
-		onShow() {
-			this.$api.getComStorage('orderUserInfo').then((resolve) =>{
-				this.clubID = resolve.clubID
-			})
-			this.$api.getStorage().then((resolve) =>{
-				this.serviceProviderId = resolve.serviceProviderID
-				this.getClubProductNum()
-			})
-		},
-	}
-</script>
-
-<style lang="scss">
-	// 阶梯价格弹窗
-	.jieti_box{
-		width: 596rpx;
-		// height: 496rpx;
-		top: 10%;
-		right: 50%;
-		transform: translate(50%,50%);
-		position: absolute;
-		background:#FFFFFF;
-		color: #000;
-		font-size: 28rpx;
-		border-radius: 10rpx;
-		text-align: center;
-		line-height: 84rpx;
-		padding: 20rpx;
-		z-index: 99999;
-	}
-	.jieti_box_one{
-		// width: 548rpx;
-		overflow: hidden;
-		border: 2rpx solid #F5F5F5;
-		border-bottom: 0;
-		margin: auto;
-	}
-	.jieti_left{
-		width: 298rpx;
-		float: left;
-		}
-	.jieti_left view{
-		height: 84rpx;
-		border-bottom:2rpx solid #F5F5F5 ;
-		border-right:2rpx solid #F5F5F5  ;
-	}
-	.ladder-a{
-		letter-spacing: 4rpx;
-	}
-	.jieti_right{
-			width: 294rpx;
-			float: right;
-		}
-	.jieti_right view{
-			height: 84rpx;
-			border-bottom:2rpx solid #F5F5F5;
-		}
-	.addbtn{
-			height: 84rpx;
-			background: linear-gradient(135deg,rgba(242,143,49,1) 0%,rgba(225,86,22,1) 100%);
-			text-align: center;
-			font-size: 28rpx;
-			color: #fff;
-			line-height: 84rpx;
-			border-radius: 10rpx;
-			margin: 20rpx auto
-		}
-	.zuhe-content{
-		display: inline-block;
-	}
-	.number-left{
-		float: left;
-	}
-	.number-right{
-		margin-left: 30rpx;
-		float: left;
-	}
-	.number-left text{
-		margin-left: 30rpx;
-	}
-	.number-right-text{
-		color: #FF2A2A;
-	}
-	page {
-		background: $sub-bg-color;
-		.all-type-list-wrapper {
-			display: flex;
-			flex-direction: column;
-		}
-	}
-	/* 加入购物模态层*/
-	@keyframes showPopup {
-		0% {
-			opacity: 0;
-		}
-		100% {
-			opacity: 1;
-		}
-	}
-	@keyframes hidePopup {
-		0% {
-			opacity: 1;
-		}
-		100% {
-			opacity: 0;
-		}
-	}
-	@keyframes showLayer {
-		0% {
-			transform: translateY(0);
-		}
-		100% {
-			transform: translateY(-100%);
-		}
-	}
-	@keyframes hideLayer {
-		0% {
-			transform: translateY(-100%);
-		}
-		100% {
-			transform: translateY(0);
-		}
-	}
-	@keyframes showAmnation {
-		0% {
-			top: -12rpx;
-			opacity: 0;
-		}
-		50% {
-			top: -60rpx;
-			opacity: 1;
-		}
-		100% {
-			top: -100rpx;
-			opacity: 0;
-		}
-	}
-	@keyframes hideAmnation {
-		0% {
-			top: -100rpx;
-			opacity: 0;
-		}
-		100% {
-			top: -12rpx;
-			opacity: 0;
-		}
-	}
-	.popup {
-		position: fixed;
-		top: 0;
-		width: 100%;
-		height: 100%;
-		z-index: 999;
-		display: none;
-		.mask{
-			position: fixed;
-			top: 0;
-			width: 100%;
-			height: 100%;
-			z-index: 21;
-			background-color: rgba(0, 0, 0, 0.6);
-		}
-		.layer {
-			position: fixed;
-			z-index: 22;
-			bottom: -360rpx;
-			width: 702rpx;
-			padding: 24rpx 24rpx 36rpx 24rpx;
-			// height: 236rpx;
-			border-radius: 20rpx 20rpx 0 0;
-			background-color: #fff;
-			display: flex;
-			flex-wrap: wrap;
-			align-content: space-between;
-			.content {
-				width: 100%;
-				margin-top: 20rpx;
-			}
-			.btn {
-				width: 100%;
-				// height: 88rpx;
-				display: flex;
-				.button {
-					width: 702rpx;
-					height: 88rpx;
-					color: #fff;
-					display: flex;
-					align-items: center;
-					justify-content: center;
-					font-size: $font-size-28;
-					border-radius: 44rpx;
-					background: $btn-confirm;
-					margin-top: 20rpx;
-				}
-			}
-		}
-		.layer-nunbox-m{
-			font-size: 28rpx;
-		}
-		&.show {
-			display: block;
-			.mask{
-				animation: showPopup 0.2s linear both;
-			}
-			.layer {
-				animation: showLayer 0.2s linear both;
-			}
-		}
-		&.hide {
-			display: block;
-			.mask{
-				animation: hidePopup 0.2s linear both;
-			}
-
-			.layer {
-				animation: hideLayer 0.2s linear both;
-			}
-		}
-		&.none {
-			display: none;
-		}
-		&.service {
-			.row {
-				margin: 30upx 0;
-				.title {
-					font-size: 30upx;
-					margin: 10upx 0;
-				}
-				.description {
-					font-size: 28upx;
-					color: #999;
-				}
-			}
-		}
-		.layer-smimg{
-			width: 158rpx;
-			height: 158rpx;
-			float: left;
-			border-radius: 10rpx;
-			margin-right: 24rpx;
-			image{
-				width: 158rpx;
-				height: 158rpx;
-				border-radius: 10rpx;
-			}
-		}
-		.layer-nunbox{
-			justify-content: space-between;
-			align-items: center;
-			width: 510rpx;
-			height: 88rpx;
-			padding: 10rpx 0 0 0;
-			float: left;
-			.layer-nunbox-t{
-				width: 100%;
-				height:44rpx;
-				position:relative;
-				display: flex;
-				margin-top: 10rpx;
-				.layer-nunbox-text{
-					line-height: 44rpx;
-					font-size: $font-size-28;
-				}
-				.number-box{
-					display: flex;
-					justify-content: center;
-					align-items: center;
-					border: 2rpx solid #ffe6dc;
-					border-radius: 30rpx;
-					height: 48rpx;
-					margin-left: 20rpx;
-					.iconfont{
-						font-size: $font-size-24;
-						padding:0 18rpx;
-						color: #999999;
-						text-align: center;
-						line-height: 48rpx;
-						font-weight: bold;
-						background: #fef6f3;
-						&.icon-jianhao{
-							border-radius: 30rpx 0 0 30rpx;
-						}
-						&.icon-jiahao{
-							border-radius: 0 30rpx 30rpx 0;
-						}
-					}
-					.btn-input{
-						width: 80rpx;
-						height: 48rpx;
-						line-height: 48rpx;
-						background: #FFFFFF;
-						border-radius: 4rpx;
-						text-align: center;
-						font-size: $font-size-28;
-					}
-				}
-				.product-step{
-					position: absolute;
-					left: 45rpx;
-					bottom: 0;
-					height: 44rpx;
-					background: #FFFFFF;
-				}
-			}
-			.layer-nunbox-b{
-				width: 100%;
-				height:44rpx;
-				margin-top: 13rpx;
-			}
-			.text{
-				line-height: 44rpx;
-				font-size: $font-size-28;
-				.p{
-					color: #FF2A2A;
-				}
-				.p:first-child{
-					margin-left: 30rpx;
-				}
-				.p.sm{
-					font-size: $font-size-24;
-				}
-			}
-		}
-	}
-
-	.zuhe .layer{
-		bottom: -270rpx;
-		height: 200rpx;
-	}
-</style>

seller/pages/club/addoperator.vue

@@ -1,286 +0,0 @@
-<template>
-	<view class="container login">
-		<view class="login-main">
-			<text class="logo-titl">本页面协销人员不用填写！</text>
-			<text class="logo-text">点击右上方<text class="sp">···</text>，选择“发送给朋友”，把该页面发送给该机构人员填写，填写好之后对方就能成为该机构的运营人员</text>
-		</view>
-		<view class="login-form clearfix">
-			<view class="login-input">
-				<input type="text" 
-					   v-model="bindLinkName"  
-					   maxlength="30" 
-					   class="input" 
-					   disabled="true"
-					   placeholder="请输入姓名"
-				/>
-			</view>
-		</view>
-		<view class="login-form clearfix">
-			<view class="login-input">
-				<input type="number" 
-					   v-model="bindLinkPhone"  
-					   maxlength="11" 
-					   class="input" 
-					   disabled="true"
-					   placeholder="请输入手机号"
-				/>
-			</view>
-		</view>
-		<view class="login-form clearfix">
-			<view class="login-input code">
-				<input type="text" 
-					   v-model="imageCode"  
-					   maxlength="4" 
-					   class="input" 
-					   disabled="true"
-					   placeholder="请输入右侧图形验证码"
-				/>
-			</view>
-			<view class="login-input img-btn">
-				<view class="vscodeimg">
-					<image :src="imageCodeUrl" mode=""></image>
-				</view>
-				<view class="vscod-refresh">
-					<text class="iconfont"></text>
-					<text class="ref-text"></text>
-				</view>
-			</view>
-		</view>
-		<view class="login-form clearfix">
-			<view class="login-input code">
-				<input type="number" 
-					   v-model="mobildeCode"  
-					   maxlength="6" 
-					   class="input" 
-					   disabled="true"
-					   placeholder="请输入短信验证码"
-				/>
-			</view>
-			<view class="login-input btn disabled">
-				<button type="button"
-						disabled="true"
-					    class="input">
-						{{ mobileCodeText }}
-				</button>
-			</view>
-		</view>
-		<view class="login-form clearfix">
-			<view class="login-btn">确定</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import { mapState,mapMutations } from 'vuex'
-	import authorize from '@/common/config/authorize.js' 
-	import { bindingWechat } from "@/api/use.js"
-	import { getbindWechatCode } from "@/api/utils.js"
-	export default{
-		data() {
-			return{
-				userID:'',
-				imageCodeUrl:'',
-				mobileCodeText:'获取验证码'
-			}
-		},
-		onLoad(option) {
-			this.getVerificationCode()
-		},
-		methods:{
-			getVerificationCode(){//图形验证
-				this.PublicService.GetImgVerifyCode().then(res => {
-					this.imageCodeUrl = res.data.baseImage
-				})
-			},
-		},
-		onShareAppMessage(res){//分享转发
-			if (res.from === 'button') { // 来自页面内转发按钮
-		    }
-			return {
-			  title: '快来成为机构运营人员吧~',
-			  path: `pages/login/bindOperator?userID=${this.userID}`,
-			  imageUrl:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/04/%E5%BF%AB%E6%9D%A5%E6%88%90%E4%B8%BA%E6%9C%BA%E6%9E%84%E8%BF%90%E8%90%A5%E4%BA%BA%E5%91%98%403x.png'
-			}
-		},
-		onShow() {
-			this.$api.getComStorage('orderUserInfo').then((resolve) =>{
-				this.userID = resolve.userID
-			})
-		}
-	}
-</script>
-
-<style lang="scss">
-	.login{
-		width: 100%;
-		height: auto;
-		border-top: 1px solid #F7F7F7;
-		.model-warp.none{
-			display: none;			
-		}
-		.model-warp.show{
-			display: block;
-		}
-		.login-main{
-			width: 702rpx;
-			background: rgba(225, 86, 22, 0.1);
-			display: flex;
-			flex-direction: column;
-			height: 142rpx;
-			padding: 20rpx 24rpx;
-			margin: 24rpx 0 118rpx 0;
-			.logo-titl{
-				font-size: 26rpx;
-				line-height: 34rpx;
-				color:$text-color;
-				margin-bottom: 40rpx;
-				font-weight: bold;
-			}
-			.logo-text{
-				font-size: 24rpx;
-				line-height: 34rpx;
-				color: $color-system;
-				.sp{
-					color: #000000;
-					font-weight: bold;
-				}
-			}
-		}
-		.login-form{
-			width: 702rpx;
-			height: auto;
-			padding: 0 24rpx;
-			.login-input{
-				width: 654rpx;
-				height: 40rpx;
-				padding: 24rpx;
-				margin-bottom: 20rpx;
-				background: #F7F7F7;
-				border-radius: 14rpx;
-				display: flex;
-				flex-direction: column;
-				align-items: center;
-				&.code{
-					width: 370rpx;
-					float: left;
-					margin-right: 20rpx;
-				}
-				&.btn{
-					width: 258rpx;
-					height: 88rpx;
-					padding: 0;
-					float: left;
-					background: $btn-confirm;
-					.input{
-						width: 258rpx;
-						height: 88rpx;
-						line-height: 88rpx;
-						padding: 0;
-						border-radius: 14rpx;
-						color: #FFFFFF;
-						background: $btn-confirm;
-					}
-					&.disabled{
-						background: #F7F7F7;
-						.input{
-							background: #F7F7F7;
-							color: #999999;
-						}
-					}
-				}
-				&.img-btn{
-					width: 250rpx;
-					height: 88rpx;
-					padding: 0;
-					float: left;
-					background: #FFFFFF;
-					display: block;
-					.vscodeimg{
-						width: 180rpx;
-						height: 88rpx;
-						float: left;
-						display: flex;
-						flex-direction: column;
-						align-items: center;
-						border-radius: 14rpx;
-						image{
-							width: 180rpx;
-							height: 88rpx;
-							border-radius: 14rpx;
-						}
-					}
-					.vscod-refresh{
-						width: 70rpx;
-						float: right;
-						display: flex;
-						flex-direction: column;
-						align-items: center;
-						.icon-shuaxin{
-							font-size: 48rpx;
-							color: #333333;
-						}
-						.ref-text{
-							font-size: 24rpx;
-							color: #333333;
-						}
-					}
-				}
-				.input{
-					width: 100%;
-					height: 100%;
-					background: #F7F7F7;
-					font-size: $font-size-28;
-					line-height: 40rpx;
-					color: #333333;
-					border-radius: 14rpx;
-				}
-			}
-		}
-		.login-btn{
-			width: 702rpx;
-			height: 88rpx;
-			border-radius: 44rpx;
-			font-size: $font-size-28;
-			line-height: 88rpx;
-			color: #FFFFFF;
-			margin: 0 auto;
-			text-align: center;
-			background: $btn-confirm;
-			margin-top: 100rpx;
-		}
-		.model-authorization{
-			width: 100%;
-			height: 100%;
-			position: fixed;
-			top: 0;
-			left: 0;
-			z-index: 999;
-			.authorization{
-				width: 518rpx;
-				height: 320rpx;
-				position: absolute;
-				background: rgba(255,255,255,.7);
-				left: 0;
-				right: 0;
-				bottom: 0;
-				top: 0;
-				margin: auto;
-				.to-btn{
-					position: absolute;
-					top: 0;
-					left: 0;
-					right: 0;
-					bottom: 0;
-					margin: auto;
-					width: 70%;
-					height: 88rpx;
-					font-size: $font-size-28;
-					line-height: 88rpx;
-					color: #FFFFFF;
-					text-align: center;
-					border-radius: 44rpx;
-				}
-			}
-		}
-	}
-</style>

seller/pages/club/allClub-list.vue

@@ -1,355 +0,0 @@
-<template>
-	<view class="container club clearfix">
-		<view class="club-search clearfix">
-			<view class="search-from name">
-				<text class="iconfont icon-iconfonticonfontsousuo1"></text>
-				<input class="input" 
-					   type="text" 
-					   confirm-type="search" 
-					   v-model="searchInputVal" 
-					   @input="onShowClose" 
-					   @confirm="initclubList()" 
-					   placeholder="机构名称/姓名/手机号" 
-					   maxlength="16"/>
-				<text class="iconfont icon-shanchu1" v-if="isShowClose" @click="delInputText()"></text>
-			</view>
-			<view class="search-btn">
-				<button class="search-btn" type="default" @click.stop="searchClubList">搜索</button>
-			</view>
-		</view>
-		<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">
-					<view class="list" v-for="(item, index) in clubList" :key="index">
-						<view class="list-left">
-							<view class="list-head"><image :src="item.headpic ? item.headpic : 'https://static.caimei365.com/app/img/icon/icon-club@3x.png'" mode=""></image></view>
-							<view class="list-tel">
-								<text class="txt">{{item.name == null ? item.username : item.name}}</text>
-								<text class="txt sm">
-									<text class="txt-le">{{checkData(item.linkMan1)  ? desensitizationName(item.linkMan1) : ''}}</text>
-									{{item.contractMobile1 ? hidePhone(item.contractMobile1) : ''}}
-								</text>
-							</view>
-						</view>
-						<view class="list-opea">
-							<view class="opea-type-cell" @click.stop="goOperator(item)">
-								<text class="text">邀请运营人员</text>
-							</view>
-						</view>
-					</view>
-					<!--加载loadding-->
-					<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-					<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text='nomoreText'></tui-nomore>
-					<!--加载loadding-->
-				</scroll-view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import authorize from '@/common/config/authorize.js'	
-	import tuiLoadmore from "@/components/tui-components/loadmore/loadmore"
-	import tuiNomore from "@/components/tui-components/nomore/nomore"
-	export default {
-		components:{
-			tuiLoadmore,
-			tuiNomore,
-		},
-		data() {
-			return {
-				serviceProviderId:'',
-				isShowClose:false,
-				searchInputVal:'',
-				isEmpty:false,
-				nomoreText: '上拉显示更多',
-				pageNum:1,
-				pageSize:10,
-				hasNextPage:false,
-				loadding: false,
-				pullUpOn: true,
-				pullFlag: true,
-				allowDataStatus:true,
-				wrapperHeight:'100%',
-				scrollHeight:'',
-				deleteAddressId:'',
-				currPage:'',//当前页面
-				prevPage:'',//上一个页面
-				tabCurrentIndex:0,
-				listStatus:1,
-				clubList:[],
-				isIphoneX:this.$store.state.isIphoneX,
-				show_index:0,//控制显示那个组件
-			}
-		},
-		onLoad(){				
-			this.setScrollHeight();
-		},
-		methods: {
-			setScrollHeight() {
-				// 窗口高度 - 底部距离
-				setTimeout(()=> {
-					const query = wx.createSelectorQuery().in(this);
-					query.selectAll('.add-btn').boundingClientRect();
-					query.exec(res => {
-						if(res[0][0]){
-							let winHeight = this.$api.getWindowHeight(),
-								eleTop = res[0][0].top - 1;
-								this.scrollHeight =  eleTop;
-						}
-					})
-				}, 500)
-			},
-			searchClubList(){
-				this.pageNum=1
-				this.initclubList()
-			},
-			initclubList(){	
-				let params = { searchWord:this.searchInputVal,pageNum:1,pageSize:this.pageSize }
-				this.SellerService.GetFindAllClubList(params).then(response =>{
-					let responseData = response.data
-					if(responseData.results&&responseData.results.length > 0){
-						this.isEmpty = false
-						this.hasNextPage = response.data.hasNextPage
-						this.clubList =responseData.results
-						this.pullFlag = false;
-						setTimeout(()=>{this.pullFlag = true;},500)
-						if(this.hasNextPage){
-							this.pullUpOn = false
-							this.nomoreText = '上拉显示更多'
-						}else{
-							this.pullUpOn = true
-							this.loadding = false
-							this.nomoreText = '已至底部'
-						}
-					}else{
-						this.isEmpty = true
-					}
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000)
-				})
-			},	
-			getOnReachBottomData(){
-				this.pageNum+=1
-				let params = {searchWord:this.searchInputVal,pageNum:this.pageNum,pageSize:this.pageSize }
-				this.SellerService.GetFindAllClubList(params).then(response =>{
-					let responseData = response.data
-					if(responseData.results&&responseData.results.length > 0){
-						this.hasNextPage = response.data.hasNextPage
-						this.clubList = this.clubList.concat(responseData.results) 
-						this.pullFlag = false;// 防上拉暴滑
-						setTimeout(()=>{this.pullFlag = true;},500)
-						if(this.hasNextPage){
-							this.pullUpOn = false
-							this.nomoreText = '上拉显示更多'
-						}else{
-							this.pullUpOn = false
-							this.loadding = false
-							this.nomoreText = '已至底部'
-						}
-					}
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000)
-				})
-			},
-			goOperator(item){
-				this.$api.setStorage('orderUserInfo',item)
-				this.$api.navigateTo('/seller/pages/club/addoperator')
-			},
-			onShowClose () {//输入框失去焦点时触发
-				if(this.searchInputVal != ''){
-					this.isShowClose = true
-				}else{					
-					this.isShowClose = false
-					this.pageNum=1
-					this.initclubList()
-				}
-			},
-			delInputText(){//清除输入框内容
-				this.searchInputVal = ''
-				this.isShowClose = false
-				this.pageNum=1
-				this.initclubList()
-			},
-			hidePhone(val){
-				let phone
-				if(val==null || val==""){
-					phone = ""	
-				}else{
-					phone = this.$reg.hidePhone(val)
-				}
-				return phone
-			},
-			checkData (value){
-				let data;
-				if(value == null || value ==""){
-					data = ''
-				}else{
-					data = value
-				}
-				return data
-			},
-			desensitizationName(val){
-				let name = this.$reg.desensitizationName(val)
-				return name
-			}
-		},
-		onReachBottom() {
-			if(this.hasNextPage){
-				this.loadding = true
-				this.pullUpOn = true
-				this.getOnReachBottomData()
-			}	
-		},
-		onShow() {
-			this.$api.getStorage().then(response =>{
-				this.serviceProviderId = response.serviceProviderID
-				this.pageNum = 1;
-				this.initclubList();
-			})
-		}
-	}
-</script>
-
-<style lang='scss'>
-	page {
-		height: auto;
-	}
-	page,.container{
-		/* padding-bottom: 120upx; */
-		background: #F7F7F7;
-	}
-	.container{
-		position: relative;
-	}
-	.club-search{
-		height: 64rpx;
-		width: 702rpx;
-		padding: 24rpx;
-		background: #FFFFFF;
-		display: flex;
-		align-items: center;
-		position: fixed;
-		top: 0;
-		left: 0;
-		z-index: 999;
-		.search-from{
-			width: 582rpx;
-			height: 64rpx;
-			background: #F7F7F7;
-			border-radius: 32rpx;
-			float: left;
-			position: relative;
-			.input{
-				width: 500rpx;
-				height: 64rpx;
-				float: left;
-				line-height: 64rpx;
-				color: $text-color;
-				font-size: $font-size-24;
-			}
-			.icon-iconfonticonfontsousuo1{
-				width: 64rpx;
-				height: 64rpx;
-				line-height: 64rpx;
-				text-align: center;
-				display: block;
-				font-size: $font-size-38;
-				float: left;
-				color: #999999;
-			}
-			.icon-shanchu1{
-				font-size: $font-size-32;
-				color: #999999;
-				position: absolute;
-				width: 64rpx;
-				height: 64rpx;
-				line-height: 64rpx;
-				text-align: center;
-				top: 0;
-				right: 0;
-				z-index: 10;
-			}
-		}
-		.search-btn{
-			width: 120rpx;
-			line-height: 64rpx;
-			text-align: center;
-			font-size: $font-size-28;
-			color: $color-system;
-			float: left;
-			background: #FFFFFF;
-		}
-	}
-	.club-main{
-		padding-top: 122rpx;
-		.list{
-			display: flex;
-			align-items: center;
-			width: 702rpx;
-			height: auto;
-			padding: 24rpx;
-			background: #FFFFFF;
-			position: relative;
-			border-bottom: 1px solid #EBEBEB;
-			.list-left{
-				display: flex;
-				flex: 8;
-				.list-head{
-					width: 92rpx;
-					height: auto;
-					display: flex;
-					align-items: center;
-					image{
-						width: 92rpx;
-						height: 92rpx;
-						border-radius: 14rpx;
-					}
-				}
-				.list-tel{
-					margin: 0 15rpx;
-					width: 320rpx;
-					.txt{
-						display: flex;
-						flex: 1;
-						font-size: $font-size-26;
-						color: $text-color;
-						line-height: 40rpx;
-						&.sm{
-							font-size: $font-size-24;
-							color: #666666;
-							.txt-le{
-								margin-right: 26rpx;
-							}
-						}
-					}
-				}
-			}
-			.list-opea{
-				display: flex;
-				flex: 2;
-				color: #166CE1;
-				flex-direction: column;
-				.opea-type-cell{
-					font-size: 24rpx;
-					.text{
-						width: 156rpx;
-						height: 60rpx;
-						padding: 0 20rpx;
-						line-height: 60rpx;
-						border-radius: 30rpx;
-						font-size: $font-size-24;
-						color: #FFFFFF;
-						text-align: center;
-						background: $btn-confirm;
-						display: block;
-					}
-				}
-			}
-		}
-	}
-</style>
-

seller/pages/club/club-list.vue

@@ -1,373 +0,0 @@
-<template>
-	<view class="container club clearfix">
-		<view class="club-search clearfix">
-			<view class="search-from name">
-				<text class="iconfont icon-iconfonticonfontsousuo1"></text>
-				<input class="input" 
-					   type="text" 
-					   confirm-type="search" 
-					   v-model="searchInputVal" 
-					    @input="onShowClose" 
-					   @confirm="initclubList()" 
-					   placeholder="机构名称/联系人" 
-					   maxlength="12"/>
-				<text class="iconfont icon-shanchu1" v-if="isShowClose" @click="delInputText()"></text>
-			</view>
-			<view class="search-btn">
-				<button class="search-btn" type="default" @click.stop="searchClubList">搜索</button>
-			</view>
-		</view>
-		<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" >
-					<view class="list" v-for="(item, index) in clubList" :key="index">
-						<view class="list-left">
-							<view class="list-head"><image :src="item.headpic ? item.headpic : 'https://static.caimei365.com/app/img/icon/icon-club@3x.png'" mode=""></image></view>
-						</view>
-						<view class="list-item">
-							<view class="list-title">
-								<text class="list-name">{{item.name}}</text>
-								<text class="list-hist" @click.stop="_goHistory(item)"><text class="iconfont icon-dingdanxuanzhong"></text>订单列表</text>
-							</view>
-							<view class="list-opea">
-								<view class="btn org" @click.stop="_goImmediately(item)">
-									<text>立即下单</text>
-								</view>
-								<view class="btn gre" @click.stop="_goSecond(item)">
-									<text>二手下单</text>
-								</view>
-								<view class="btn yel" @click.stop="_goBuyagain(item)">
-									<text>再次购买</text>
-								</view>
-							</view>
-						</view>
-					</view>
-					<!--加载loadding-->
-					<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-					<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text='nomoreText'></tui-nomore>
-					<!--加载loadding-->
-				</scroll-view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import authorize from '@/common/config/authorize.js'	
-	import tuiLoadmore from "@/components/tui-components/loadmore/loadmore"
-	import tuiNomore from "@/components/tui-components/nomore/nomore"
-	export default {
-		components:{
-			tuiLoadmore,
-			tuiNomore,
-		},
-		data() {
-			return {
-				serviceProviderId:'',
-				isShowClose:false,
-				searchInputVal:'',
-				isEmpty:false,
-				nomoreText: '上拉显示更多',
-				status:66,
-				pageNum:1,
-				pageSize:10,
-				hasNextPage:false,
-				loadding: false,
-				pullUpOn: true,
-				pullFlag: true,
-				scrollHeight:'',
-				currPage:'',//当前页面
-				prevPage:'',//上一个页面
-				clubList:[],
-			}
-		},
-		onLoad(){				
-			this.setScrollHeight();
-		},
-		methods: {
-			setScrollHeight() {
-				// 窗口高度 - 底部距离
-				setTimeout(()=> {
-					const query = wx.createSelectorQuery().in(this);
-					query.selectAll('.add-btn').boundingClientRect();
-					query.exec(res => {
-						if(res[0][0]){
-							let winHeight = this.$api.getWindowHeight(),
-								eleTop = res[0][0].top - 1;
-								this.scrollHeight =  eleTop;
-						}
-					})
-				}, 500)
-			},
-			searchClubList(){
-				this.pageNum=1
-				this.initclubList()
-			},
-			initclubList(){
-				let params = {userIdentity:'',name:this.searchInputVal,pageNum:1,pageSize:this.pageSize,spId:this.serviceProviderId,status:this.status}
-				this.SellerService.GetSellerClubList(params).then(response =>{
-					let responseData = response.data
-					if(responseData.results&&responseData.results.length > 0){
-						this.isEmpty = false
-						this.hasNextPage = response.data.hasNextPage
-						this.clubList =responseData.results
-						this.pullFlag = false;
-						setTimeout(()=>{this.pullFlag = true;},500)
-						if(this.hasNextPage){
-							this.pullUpOn = false
-							this.nomoreText = '上拉显示更多'
-						}else{
-							this.pullUpOn = true
-							this.loadding = false
-							this.nomoreText = '已至底部'
-						}
-					}else{
-						this.isEmpty = true
-					}
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000)
-				})
-			},	
-			getOnReachBottomData(){
-				this.pageNum+=1
-				let params = {userIdentity:'',name:this.searchInputVal,pageNum:this.pageNum,pageSize:this.pageSize,spId:this.serviceProviderId,status:this.status}
-				this.SellerService.GetSellerClubList(params).then(response =>{
-					let responseData = response.data
-					if(responseData.results&&responseData.results.length > 0){
-						this.hasNextPage = response.data.hasNextPage
-						this.clubList = this.clubList.concat(responseData.results) 
-						this.pullFlag = false;// 防上拉暴滑
-						setTimeout(()=>{this.pullFlag = true;},500)
-						if(this.hasNextPage){
-							this.pullUpOn = false
-							this.nomoreText = '上拉显示更多'
-						}else{
-							this.pullUpOn = false
-							this.loadding = false
-							this.nomoreText = '已至底部'
-						}
-					}
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000)
-				})
-			},
-			onShowClose () {//输入框失去焦点时触发
-				if(this.searchInputVal != ''){
-					this.isShowClose = true
-				}else{					
-					this.isShowClose = false
-				}
-			},
-			delInputText(){//清除输入框内容
-				this.searchInputVal = ''
-				this.isShowClose = false
-			},
-			_goImmediately(item){
-				this.$api.setStorage('orderUserInfo',item)
-				this.$api.navigateTo('/seller/pages/cart/immediately')
-			},
-			_goBuyagain(item ){
-				this.$api.setStorage('orderUserInfo',item)
-				this.$api.navigateTo('/seller/pages/cart/buyagain')
-			},
-			_goSecond(item ){
-				this.$api.setStorage('orderUserInfo',item)
-				this.$api.navigateTo('/seller/pages/cart/second')
-			},
-			_goHistory(item){
-				this.$api.setStorage('orderUserInfo',item)
-				this.$api.navigateTo(`/seller/pages/order/order-historylist?clubID=${item.clubID}&listType=0`)
-			}
-		},
-		onReachBottom() {
-			if(this.hasNextPage){
-				this.loadding = true
-				this.pullUpOn = true
-				this.getOnReachBottomData()
-			}	
-		},
-		onShow() {
-			this.$api.getStorage().then(response =>{
-				this.serviceProviderId = response.serviceProviderID
-				this.pageNum = 1;
-				this.initclubList();
-			})
-		}
-	}
-</script>
-
-<style lang='scss'>
-	page {
-		height: auto;
-	}
-	page,.container{
-		/* padding-bottom: 120upx; */
-		background: #F7F7F7;
-	}
-	.container{
-		position: relative;
-	}
-	.club-search{
-		height: 64rpx;
-		width: 702rpx;
-		padding: 24rpx;
-		background: #FFFFFF;
-		display: flex;
-		align-items: center;
-		position: fixed;
-		top: 0;
-		left: 0;
-		z-index: 999;
-		.search-from{
-			width: 582rpx;
-			height: 64rpx;
-			background: #F7F7F7;
-			border-radius: 32rpx;
-			float: left;
-			position: relative;
-			.icon-iconfonticonfontsousuo1{
-				width: 64rpx;
-				height: 64rpx;
-				line-height: 64rpx;
-				text-align: center;
-				display: block;
-				font-size: $font-size-38;
-				float: left;
-				color: #999999;
-			}
-			.icon-shanchu1{
-				font-size: $font-size-32;
-				color: #999999;
-				position: absolute;
-				width: 64rpx;
-				height: 64rpx;
-				line-height: 64rpx;
-				text-align: center;
-				top: 0;
-				right: 0;
-				z-index: 10;
-			}
-			.input{
-				width: 500rpx;
-				height: 64rpx;
-				float: left;
-				line-height: 64rpx;
-				color: $text-color;
-				font-size: $font-size-24;
-			}
-		}
-		.search-btn{
-			width: 120rpx;
-			line-height: 64rpx;
-			text-align: center;
-			font-size: $font-size-28;
-			color: $color-system;
-			float: left;
-			background: #FFFFFF;
-		}
-	}
-	.club-main{
-		padding-top: 122rpx;
-		.list{
-			align-items: center;
-			width: 702rpx;
-			height: auto;
-			padding: 24rpx;
-			background: #FFFFFF;
-			position: relative;
-			border-bottom: 1px solid #EBEBEB;
-			display: flex;
-			.list-left{
-				height: 140rpx;
-				flex: 2;
-				margin-right: 10rpx;
-				.list-head{
-					width: 140rpx;
-					height: 140rpx;
-					border-radius: 14rpx;
-					image{
-						width: 140rpx;
-						height: 140rpx;
-						border-radius: 14rpx;
-					}
-				}
-			}
-			.list-item{
-				height: 140rpx;
-				flex: 8;
-				display: flex;
-				flex-direction:column ;
-				.list-title{
-					flex: 2;
-					line-height: 80rpx;
-					width: 100%;
-					font-size: $font-size-28;
-					color: $text-color;
-					padding-left: 11rpx;
-					flex-direction: row;
-					justify-content: flex-start;
-					.list-name{
-						width: 400rpx;
-						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;
-					}
-					.list-hist{
-						display: block;
-						float: right;
-						color: #E19B30;
-						font-size: $font-size-24;
-						text-align: right;
-						padding-right: 30rpx;
-						.icon-dingdanxuanzhong{
-							font-size: $font-size-34;
-							color: #E19B30;
-						}
-					}
-				}
-				.list-opea{
-					width: 100%;
-					display: flex;
-					flex: 4;
-					color: #166CE1;
-					flex-direction: row;
-					align-items: center;
-					.btn{
-						width: 156rpx;
-						height: 60rpx;
-						line-height: 60rpx;
-						border-radius: 30rpx;
-						font-size: $font-size-24;
-						color: $text-color;
-						text-align: center;
-						margin: 0 17rpx;
-						&.org{
-							background:rgba(22,225,77,.1);
-							color: #16E14D;
-						}
-						&.gre{
-							background:rgba(22,123,225,.1);
-							color: #167BE1;
-						}
-						&.yel{
-							background:rgba(225,86,22,.1);
-							color: #E15616;
-						}
-					}
-				}
-			}
-		}
-	}
-</style>
-

seller/pages/club/list.vue

@@ -1,518 +0,0 @@
-<template>
-	<view class="container club clearfix" :style="{ paddingBottom:isIphoneX?'140rpx':'98rpx' }">
-		<view class="club-search clearfix">
-			<view class="search-top">
-				<view class="search-from name">
-					<text class="iconfont icon-iconfonticonfontsousuo1"></text>
-					<input class="input" 
-						   type="text" 
-						   confirm-type="search"
-						   v-model="searchInputVal" 
-						   @input="onShowClose" 
-						   @confirm="initclubList()" 
-						   placeholder="机构名称/联系人" 
-						   maxlength="16"/>
-					<text class="iconfont icon-shanchu1" v-if="isShowClose" @click="delInputText()"></text>
-				</view>
-				<view class="search-btn">
-					<button class="search-btn" type="default" @click.stop="searchClubList">搜索</button>
-				</view>
-			</view>
-			<view class="search-tab">
-				<view class="tab-item" v-for="(item,index) in  listTab" :key="index" :class="{ current: tabCurrentNum === index }" @click="tabCurrentClick(index)">
-					<text class="item-text">{{item.name}}<text class="line"></text></text>
-				</view>
-			</view>
-		</view>
-		<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" >
-					<view class="list" v-for="(item, index) in clubList" :key="index">
-						<view class="list-left">
-							<view class="list-head"><image :src="item.headpic ? item.headpic : 'https://static.caimei365.com/app/img/icon/icon-club@3x.png'" mode=""></image></view>
-							<view class="list-tel">
-								<text class="txt">{{item.userIdentity ===2 ? item.name : item.linkMan1}}</text>
-								<text class="txt sm">
-									<text class="txt-le">{{item.linkMan1 ? item.linkMan1 : ''}}</text>
-									{{item.contractMobile1 ? item.contractMobile1 : ''}}</text>
-							</view>
-						</view>
-						<view class="list-opea">
-							<view class="opea-type-dell or" @click.stop="orderHistory(item)">
-								<text class="iconfont icon-dingdanxuanzhong"></text>
-								<text>历史订单</text>
-								<text v-if="item.orderNum >0"
-									  class="opea-badge uni-badge uni-badge-error uni-small uni-badge--small icon-num"
-									  :class="[item.orderNum < 10 ? 'right':'']">
-									  {{showBadge(item.orderNum)}}
-								</text>
-							</view>
-							<view class="opea-type-dell" @click.stop="checkData(item)">
-								<text class="iconfont icon-xieboke"></text>
-								<text>修改资料</text>
-							</view>
-						</view>
-					</view>
-					<!--加载loadding-->
-					<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-					<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text='nomoreText'></tui-nomore>
-				</scroll-view>
-			</view>
-		</view>
-		<view class="tabBar" :style="{height:isIphoneX?'140rpx':'98rpx'}" v-if="tabCurrentNum ===0">
-			<view class="tabBar_list" :style="{paddingBottom:isIphoneX?'40rpx':''}">
-				<view  class="tabBar_item" :class="{ 'current' : tabCurrentIndex === 0}"   @click="tabClick(0)" >
-					<text class="iconfont icon-shenhetongguo"></text>
-					<view class="tabBar_name">待升级</view>
-				</view>
-				<view  class="tabBar_item" :class="{ 'current1' : tabCurrentIndex === 1}"   @click="tabClick(1)" >
-					<text class="iconfont icon-lishidingdan"></text>
-					<view class="tabBar_name">升级中</view>
-				</view>
-				<view  class="tabBar_item" :class="{ 'current2' : tabCurrentIndex === 2}"   @click="tabClick(2)" >
-					<text class="iconfont icon-shenhebutongguo"></text>
-					<view class="tabBar_name">升级失败</view>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import authorize from '@/common/config/authorize.js'	
-	import tuiLoadmore from "@/components/tui-components/loadmore/loadmore"
-	import tuiNomore from "@/components/tui-components/nomore/nomore"
-	export default {
-		components:{
-			tuiLoadmore,
-			tuiNomore,
-		},
-		data() {
-			return {
-				listTab:[{name:'普通机构'},{name:'会员机构'}],
-				serviceProviderId:'',
-				isShowClose:false,
-				searchInputVal:'',
-				isEmpty:false,
-				nomoreText: '上拉显示更多',
-				userIdentity:4,
-				pageNum:1,
-				pageSize:10,
-				hasNextPage:false,
-				loadding: false,
-				pullUpOn: true,
-				pullFlag: true,
-				allowDataStatus:true,
-				wrapperHeight:'100%',
-				scrollHeight:'',
-				deleteAddressId:'',
-				currPage:'',//当前页面
-				prevPage:'',//上一个页面
-				tabCurrentNum:0,
-				tabCurrentIndex:0,
-				listStatus:90,
-				clubList:[],
-				isIphoneX:this.$store.state.isIphoneX,
-				show_index:0,//控制显示那个组件
-				
-			}
-		},
-		onLoad(){				
-			this.setScrollHeight();
-		},
-		methods: {
-			setScrollHeight() {
-				// 窗口高度 - 底部距离
-				setTimeout(()=> {
-					const query = wx.createSelectorQuery().in(this);
-					query.selectAll('.add-btn').boundingClientRect();
-					query.exec(res => {
-						if(res[0][0]){
-							let winHeight = this.$api.getWindowHeight(),
-								eleTop = res[0][0].top - 1;
-								this.scrollHeight =  eleTop;
-						}
-					})
-				}, 500)
-			},
-			searchClubList(){
-				this.pageNum=1
-				this.initclubList()
-			},
-			initclubList(){	
-				let params = {userIdentity:this.userIdentity,name:this.searchInputVal,pageNum:1,pageSize:this.pageSize,spId:this.serviceProviderId,status:this.listStatus}
-				this.SellerService.GetSellerClubList(params).then(response =>{
-					let responseData = response.data
-					if(responseData.results&&responseData.results.length > 0){
-						this.isEmpty = false
-						this.hasNextPage = response.data.hasNextPage
-						this.clubList =responseData.results
-						this.pullFlag = false;
-						setTimeout(()=>{this.pullFlag = true;},500)
-						if(this.hasNextPage){
-							this.pullUpOn = false
-							this.nomoreText = '上拉显示更多'
-						}else{
-							this.pullUpOn = true
-							this.loadding = false
-							this.nomoreText = '已至底部'
-						}
-					}else{
-						this.isEmpty = true
-					}
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000)
-				})
-			},	
-			getOnReachBottomData(){
-				this.pageNum+=1
-				let params = {userIdentity:this.userIdentity,name:this.searchInputVal,pageNum:this.pageNum,pageSize:this.pageSize,spId:this.serviceProviderId,status:this.listStatus}
-				this.SellerService.GetSellerClubList(params).then(response =>{
-					let responseData = response.data
-					if(responseData.results&&responseData.results.length > 0){
-						this.hasNextPage = response.data.hasNextPage
-						this.clubList = this.clubList.concat(responseData.results) 
-						this.pullFlag = false;// 防上拉暴滑
-						setTimeout(()=>{this.pullFlag = true;},500)
-						if(this.hasNextPage){
-							this.pullUpOn = false
-							this.nomoreText = '上拉显示更多'
-						}else{
-							this.pullUpOn = false
-							this.loadding = false
-							this.nomoreText = '已至底部'
-						}
-					}
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000)
-				})
-			},
-			tabClick(index) {//tab切换
-				this.tabCurrentIndex = index;
-				switch(index){
-					case 0:
-						this.listStatus = 90
-						break;
-					case 1:
-						this.listStatus = 1
-						break;
-					case 2:
-						this.listStatus = 92
-						break;
-				}
-				this.initclubList()
-			},
-			tabCurrentClick(index) {//商品详情&&供应商信息tab切换
-				this.tabCurrentNum = index;
-				switch(index){
-					case 0:
-						this.tabCurrentIndex = 0
-						this.userIdentity = 4
-						this.listStatus = 90
-						this.initclubList()
-						break;
-					case 1:
-						this.userIdentity = 2
-						this.listStatus = 90
-						this.initclubList()
-						break
-				}
-			},	
-			checkData(item){
-				switch(this.tabCurrentNum){
-					case 0:
-						this.$api.navigateTo(`/seller/pages/login/apply?userID=${item.userID}`)
-						break;
-					case 1:
-						this.$api.navigateTo(`/seller/pages/login/information?userID=${item.userID}`)
-						break;
-				}
-			},
-			orderHistory(item){
-				this.$api.setStorage('orderUserInfo',item)
-				this.$api.navigateTo(`/seller/pages/order/order-historylist?clubID=${item.clubID}&listType=0`)
-			},
-			onShowClose () {//输入框失去焦点时触发
-				if(this.searchInputVal != ''){
-					this.isShowClose = true
-				}else{					
-					this.isShowClose = false
-				}
-			},
-			delInputText(){//清除输入框内容
-				this.searchInputVal = ''
-				this.isShowClose = false
-			},
-			showBadge(n){
-				let num ='';
-				if(n>100){num = 99}else{num = n;}
-				return num;
-			},
-		},
-		onReachBottom() {
-			if(this.hasNextPage){
-				this.loadding = true
-				this.pullUpOn = true
-				this.getOnReachBottomData()
-			}	
-		},
-		onShow() {
-			this.$api.getStorage().then(response =>{
-				this.serviceProviderId = response.serviceProviderID
-				this.pageNum = 1;
-				this.initclubList();
-			})
-		}
-	}
-</script>
-
-<style lang='scss'>
-	page {
-		height: auto;
-	}
-	page,.container{
-		/* padding-bottom: 120upx; */
-		background: #F7F7F7;
-	}
-	.container{
-		position: relative;
-	}
-	.club-search{
-		height: auto;
-		width: 100%;
-		padding: 24rpx 0 0 0;
-		background: #FFFFFF;
-		display: flex;
-		flex-direction: column;
-		position: fixed;
-		top: 0;
-		left: 0;
-		z-index: 999;
-		.search-top{
-			flex: 1;
-			display: flex;
-			align-items: center;
-			padding: 24rpx;
-			.search-from{
-				width: 582rpx;
-				height: 64rpx;
-				background: #F7F7F7;
-				border-radius: 32rpx;
-				float: left;
-				position: relative;
-				.input{
-					width: 500rpx;
-					height: 64rpx;
-					float: left;
-					line-height: 64rpx;
-					color: $text-color;
-					font-size: $font-size-24;
-				}
-				.icon-iconfonticonfontsousuo1{
-					width: 64rpx;
-					height: 64rpx;
-					line-height: 64rpx;
-					text-align: center;
-					display: block;
-					font-size: $font-size-38;
-					float: left;
-					color: #999999;
-				}
-				.icon-shanchu1{
-					font-size: $font-size-32;
-					color: #999999;
-					position: absolute;
-					width: 64rpx;
-					height: 64rpx;
-					line-height: 64rpx;
-					text-align: center;
-					top: 0;
-					right: 0;
-					z-index: 10;
-				}
-			}
-			.search-btn{
-				width: 120rpx;
-				line-height: 64rpx;
-				text-align: center;
-				font-size: $font-size-28;
-				color: $color-system;
-				float: left;
-				background: #FFFFFF;
-			}
-		}
-		.search-tab{
-			height: 80rpx;
-			display: flex;
-			flex: 1;
-			background: #FFFFFF;
-			border-bottom: 1px solid #EFEFEF;
-			.tab-item{
-				flex: 1;
-				line-height: 80rpx;
-				text-align: center;
-				color: $text-color;
-				font-size: $font-size-28;
-				position: relative;
-				.item-text{
-					padding: 10rpx 0;
-					border-bottom:2px solid #FFFFFF;
-				}
-				&:nth-child(1)::before{
-					content: '';
-					width: 2px;
-					height: 50rpx;
-					position: absolute;
-					right: 0;
-					top: 15rpx;
-					background: #EBEBEB;
-				}
-				&.current{
-					color: $color-system;
-					.item-text{
-						border-color:$color-system;;
-					}
-				}
-			}
-		}
-	}
-	.club-main{
-		padding-top: 224rpx;
-		.list{
-			display: flex;
-			align-items: center;
-			width: 702rpx;
-			height: 92rpx;
-			padding: 24rpx;
-			background: #FFFFFF;
-			position: relative;
-			border-bottom: 1px solid #EBEBEB;
-			.list-left{
-				display: flex;
-				flex: 8;
-				.list-head{
-					width: 92rpx;
-					height: 92rpx;
-					border-radius: 14rpx;
-					image{
-						width: 92rpx;
-						height: 92rpx;
-						border-radius: 14rpx;
-					}
-				}
-				.list-tel{
-					margin-left: 18rpx;
-					.txt{
-						display: flex;
-						flex: 1;
-						font-size: $font-size-28;
-						color: $text-color;
-						line-height: 46rpx;
-						&.sm{
-							font-size: $font-size-24;
-							color: #666666;
-							.txt-le{
-								margin-right: 26rpx;
-							}
-						}
-					}
-				}
-			}
-			.list-opea{
-				display: flex;
-				flex: 2;
-				color: #166CE1;
-				flex-direction: column;
-				.opea-type-cell{
-					font-size: 24rpx;
-					.iconfont{
-						font-size: 34rpx;
-						margin-right: 5rpx;
-					}
-				}
-				.opea-type-dell{
-					line-height: 46rpx;
-					font-size: 24rpx;
-					position: relative;
-					.opea-badge{
-						position: absolute;
-						left: -45rpx;
-						top: -10rpx;
-						&.right{
-							left: -20rpx;
-						}
-					}
-					&.or{
-						color: #E19B16;
-					}
-					.iconfont{
-						font-size: 34rpx;
-						margin-right: 5rpx;
-					}
-				}
-			}
-		}
-	}
-	.tabBar{
-		width:100%;
-		height: 98rpx;
-		background: #fff;
-		border-top:1px solid #E5E5E5;
-		position: fixed;
-		bottom:0px;
-		left:0px;
-		right:0px;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		.tabBar_list{ 
-			width:86%;
-			display: flex;
-			justify-content: space-between;
-			.tabBar_item{ 
-				width:120rpx;
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				flex-direction: column;
-				font-size: 20rpx;
-				color: #999999;
-				&.current{
-					color: #166CE1;
-					.iconfont{
-						color:#166CE1;
-					}
-				}
-				&.current1{
-					color: #16E15C;
-					.iconfont{
-						color:#16E15C;
-					}
-				}
-				&.current2{
-					color: #FF0000;
-					.iconfont{
-						color:#FF0000;
-					}
-				}
-				.iconfont{
-					width:48rpx;
-					height: 48rpx;
-					display: block;
-					margin-bottom:2rpx;
-					text-align: center;
-					font-size: 46rpx;
-					color: #999999;
-				}
-			}
-		 } 
-	}
-	.nav_active{
-		color: $color-system;
-	}
-</style>
-

seller/pages/index/index.vue

@@ -1,143 +0,0 @@
-<template>
-	<view class="content"  :style="{paddingBottom:isIphoneX?'140rpx':'98rpx'}">
-		<!-- 采美采购商城 -->
-		<view :style="{'display':show_index == 0 ?'block':'none'}">
-			<seller-home  ref="home" v-if="isHomeData"></seller-home>
-		</view>
-		<!-- 商品分类 -->
-		<view :style="{'display':show_index == 1? 'block':'none'}">
-			<seller-category  ref="category" v-if="isCategory"></seller-category>
-		</view>
-		<!-- 账户中心 -->
-		<view :style="{'display':show_index == 2 ?'flex':'none'}">
-			<seller-user  ref="user" v-if="isUserData"></seller-user>
-		</view>
-		<!-- isIphoneX判断是否为刘海屏在main.js里，好像uniapp有一个css变量获取刘海屏的安全区域 -->
-		<view class="tabBar" :style="{height:isIphoneX?'140rpx':'98rpx'}">
-			<!-- 导航的中间圆圈 -->
-			<view class="tabBar_list" :style="{paddingBottom:isIphoneX?'40rpx':''}">
-				<view v-for="(item) in tab_nav_list" :key="item.id" class="tabBar_item" @tap="cut_index(item.id)">
-					<image v-if="show_index == item.id" :src="item.iconAc"></image>
-					<image v-else :src="item.icon"></image>
-					<view :class="{'tabBar_name':true,'nav_active':show_index == item.id}">{{item.name}}</view>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import sellerHome from '@/components/cm-module/cm-seller/home.vue'
-	import sellerUser from '@/components/cm-module/cm-seller/user.vue'
-	import sellerCategory from '@/components/cm-module/cm-seller/category.vue'
-	export default {
-		components: {
-			sellerHome,//采美采购商城 0
-			sellerUser,//账户中心     1
-			sellerCategory,//商品分类 2
-		},
-		data() {
-			return {
-				show_index:2,//控制显示那个组件
-				isUserData: false,
-				isCategory: false,
-				isHomeData: false,
-				isIphoneX:this.$store.state.isIphone,
-				tab_nav_list :[//菜单列表
-					{'id':0,'name':'首页',icon:'https://static.caimei365.com/app/img/icon/icon-home@3x.png',iconAc:'https://static.caimei365.com/app/img/icon/icon-home-active@3x.png'},
-					{'id':1,'name':'分类',icon:'https://static.caimei365.com/app/img/icon/icon-sort@3x.png',iconAc:'https://static.caimei365.com/app/img/icon/icon-sort-active@3x.png'},
-					{'id':2,'name':'我的',icon:'https://static.caimei365.com/app/img/icon/icon-user@3x.png',iconAc:'https://static.caimei365.com/app/img/icon/icon-user-active@3x.png'}
-				],
-				nvabarData: {		//顶部自定义导航
-					showCapsule: 0, // 是否显示左上角图标  1表示显示  0表示不显示,
-					showSearch: 0,
-					title: '账户中心',  // 导航栏 中间的标题
-					textLeft:false
-				},
-				isIphoneX:this.$store.state.isIphoneX,
-				CustomBar:this.CustomBar,// 顶部导航栏高度
-			}
-		},
-		onLoad() {
-			this.$nextTick(()=>{// 一定要等视图更新完再调用方法
-				setTimeout(()=>{ this.isUserData = true },100)
-			})
-		},
-		methods: {
-			// 切换组件
-			cut_index(type){
-				this.show_index = type
-				if(this.show_index == 0){
-					this.isHomeData = true
-					this.isUserData = false
-					this.isCategory = false
-				}else if(this.show_index == 1){
-					this.isHomeData = false
-					this.isUserData = false
-					this.isCategory = true
-				}else if(this.show_index == 2){
-					this.isHomeData = false
-					this.isUserData = true
-					this.isCategory = false
-				}
-			},
-			onPullDownRefresh(){
-				if(this.show_index == 0){
-					this.$refs.home.getHomeInformation()
-				}else if(this.show_index == 2){
-					this.$refs.user.initData()
-				}
-				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">
-	.tabBar{
-		width:100%;
-		height: 98rpx;
-		background: #fff;
-		border-top:1px solid #E5E5E5;
-		position: fixed;
-		bottom:0px;
-		left:0px;
-		right:0px;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		z-index: 999;
-		.tabBar_list{
-			width:86%;
-			display: flex;
-			justify-content: space-between;
-			image{
-				width:48rpx;
-				height: 48rpx;
-				margin-bottom:2rpx
-			}
-			.tabBar_item{
-				width:150rpx;
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				flex-direction: column;
-				font-size: 20rpx;
-				color: #999999;
-			}
-		 }
-	}
-	.nav_active{
-		color: $color-system;
-	}
-</style>

seller/pages/login/apply.vue

@@ -1,1196 +0,0 @@
-<template>
-	<view class="container register" :style="{paddingTop:CustomBar+'px'}">
-		<cu-custom :navbar-data='nvabarData'  @navigateBack="hanldNavigateBack"></cu-custom>
-		<view class="register-main first clearfix" v-if="clubStatus == 92">
-			<view class="register-row none clearfix">
-				<view class="error-title">审核未通过原因:</view>
-				<view class="error-main">
-					<text class="error-item" v-for="(item, index) in errorList" :key="index">
-						{{ item }}
-					</text>
-				</view>
-			</view>	
-		</view>	
-		<view class="register-main first clearfix">
-			<view class="register-row clearfix">
-				<text class="register-title">注册信息</text>
-			</view>
-			<view class="register-row clearfix">
-				<view class="register-from">
-					<view class="label">联系人:</view>
-					<input class="row-input" type="text" name="input" v-model="clubContact" placeholder="请输入联系姓名" maxlength="6"/>
-				</view>
-			</view>
-			<view class="register-row clearfix">
-				<view class="register-from">
-					<view class="label">手机号:</view>
-					<view class="row-input">{{ mobile }}</view>
-				</view>
-			</view>
-		</view>
-		<view class="register-main clearfix">
-			<view class="register-row">
-				<view class="register-title">其他信息</view>
-			</view>
-			<view class="register-row clearfix">
-				<view class="register-from">
-					<view class="label">固定电话:</view>
-					<input class="row-input" type="text" v-model="clubTelePhone" placeholder="请填写机构的固定电话" maxlength="15"/>
-				</view>
-			</view>
-			<view class="register-row clearfix">
-				<view class="register-from">
-					<view class="label">传真:</view>
-					<input class="row-input" type="text" v-model="clubFax" placeholder="请填写机构的传真" maxlength="15"/>
-				</view>
-			</view>
-			<view class="register-row text-textarea clearfix">
-				<textarea 	class="textarea" 
-							type="text" 
-							v-model="companyPprofile" 
-							placeholder="请填写公司简介，最多500字" 
-							placeholder-class="placeholder"
-							maxlength="500"
-							@input="onTextareaInputInfo"
-							:class="isShowInput ? '':''"
-				/>
-			</view>
-		</view>	
-		<view class="register-main clearfix" v-if="clubStatus == 90" :class="isUpgrade ? '' : 'detailed'">
-			<view class="register-row clearfix">
-				<view class="register-txt first"><text>您还可以填写更多信息，帮机构直接注册成为会员机构。</text></view>
-				<view class="register-txt"><text>不过这些信息需要审核。</text></view>
-				<view class="register-bet" @tap.stop="showUpgrade()" v-if="isDownUpgrade">
-					<text>展开信息填写<text class="iconfont icon-xiangxiajiantou"></text></text>
-				</view>
-			</view>	
-			<view class="register-fiexd clearfix">
-				<view class="register-bet" @tap.stop="hideUpgrade()" v-if="isUpgrade">
-					<text>收起<text class="iconfont icon-xiangshangjiantou"></text></text>
-				</view>
-				<view class="register-row ">
-					<view class="register-btn sub" @click.stop="organizationUpgradeInfo">{{registerBtnText}}</view>
-				</view>
-			</view>
-		</view>
-		<view class="register-main clearfix" v-else>
-			<view class="register-fiexd clearfix">
-				<view class="register-row ">
-					<view class="register-btn sub" @click.stop="organizationUpdateInfo">提交审核</view>
-				</view>
-			</view>
-		</view>
-		<view class="register-main detailed clearfix" v-if="isShowUpgrade">
-			<view class="register-row">
-				<view class="register-title">升级信息</view>
-			</view>
-			<view class="register-row clearfix">
-				<view class="register-from">
-					<view class="label">邮箱:</view>
-					<input class="row-input" type="text" name="input" v-model="registerEmail" placeholder="请输入您的常用邮箱" maxlength="30"/>
-				</view>
-			</view>
-			<view class="register-row clearfix">
-				<view class="register-from">
-					<view class="label">机构名称:</view>
-					<input class="row-input" type="text" v-model="clubName" placeholder="请输入您的机构名称" maxlength="30"/>
-				</view>
-			</view>
-			<view class="register-row clearfix">
-				<view class="register-from">
-					<view class="label">机构简称:</view>
-					<input class="row-input" type="text" v-model="abbreviation" placeholder="请输入您的机构简称" maxlength="10"/>
-				</view>
-			</view>
-			<view class="register-row clearfix">
-				<view class="register-from"  @click="showMulLinkageThreePicker">
-					<view class="label">机构地址:</view>
-					<text class="row-input" :class="addressData.address === '请选择机构所在地区' ? 'none' : ''">
-						{{addressData.address }}
-					</text>		
-					<text class="iconfont icon-xiayibu"></text>
-				</view>
-			</view>
-			<view class="register-row text-textarea clearfix">
-				<view class="textarea show" v-if="isShowInput" @click="showTextareaFocus">{{addressData.addressDetail ? addressData.addressDetail :'详细地址：如道路、门牌号、小区等'}}</view>
-				<textarea 	v-else
-							class="textarea" 
-							type="text" 
-							v-model="addressData.addressDetail" 
-							placeholder="详细地址：如道路、门牌号、小区等" 
-							placeholder-class="placeholder"
-							maxlength="25"
-							@input="onTextareaInput"
-							@focus="textareaFocus"
-							@blur="hideTextareaFocus"
-							:class="isShowInput ? '':''"
-				/>
-			</view>
-			<view class="register-row clearfix">
-				<view class="register-from">
-					<view class="label">营业执照编号:</view>
-					<input class="row-input" type="text" v-model="socialCreditCode" placeholder="请填写社会统一信用代码" maxlength="18"/>
-				</view>
-			</view>
-			<view class="register-row clearfix">
-				<view class="register-picture">
-					<view class="label">营业执照:</view>
-					<view class="upload-picture">
-						<view class="upload-none" v-if="uploadBusinessImage === ''"  @click="chooseBusinessImage"><text class="iconfont icon-jiahao"></text></view>
-						<view class="upload-image" v-else>
-							<image :src="uploadBusinessImage" mode="" @click="viewBusinessImage"></image>
-							<view class="upload-del" @click="delBusinessImage">
-								<text class='iconfont icon-shanchu1'></text>
-							</view>
-						</view>
-					</view>
-				</view>
-				<view class="register-picture">
-					<view class="label">门头照:</view>
-					<view class="upload-picture">
-						<view class="upload-none" v-if="uploadMentuzImage === ''" @click="chooseMentuzImage"><text class="iconfont icon-jiahao"></text></view>
-						<view class="upload-image" v-else>
-							<image :src="uploadMentuzImage" mode=""  @click="viewMentuzImage"></image>
-							<view class="upload-del" @click="delMentuzImage">
-								<text class='iconfont icon-shanchu1'></text>
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
-			<view class="register-row clearfix">
-				<view class="register-from picker">
-					<view class="label">机构类型:</view>
-					<view class="row-input picker" @click="bindPickerChange">{{ organizationTypeText }}</view>
-					<text class="iconfont icon-xiayibu"></text>
-				</view>
-			</view>
-			<view class="register-row clearfix" v-if="isOrganizationType == 1">
-				<view class="register-from radio">
-					<radio-group @change="radioChange">
-						<label class="row-input" v-for="(item, index) in beautyList" :key="item.value">
-							<radio class="row-radio" :value="item.value" :checked="index === current" color="#E15616"/>
-							<view class="row-text">{{item.name}}</view>
-						</label>
-					</radio-group>
-				</view>
-			</view>
-			<view class="register-row clearfix" v-show="isDepartment">
-				<view class="register-from">
-					<view class="label">科室:</view>
-					<input class="row-input keshi" type="text" v-model="department" placeholder="请填写经营的科室，至少三个，用逗号隔开" maxlength="16"/>
-				</view>
-			</view>
-			<view class="register-row clearfix" v-if="isOrganizationType == 1">
-				<view class="register-picture zz">
-					<view class="label zz">医疗执业许可证:</view>
-					<view class="upload-picture">
-						<view class="upload-none" v-if="uploadMedicalImage === ''" @click="chooseMedicalImage"><text class="iconfont icon-jiahao"></text></view>
-						<view class="upload-image" v-else>
-							<image :src="uploadMedicalImage" mode=""  @click="viewMedicalImage"></image>
-							<view class="upload-del" @click="delMedicalImage">
-								<text class='iconfont icon-shanchu1'></text>
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
-			<view class="register-row clearfix" v-if="isOrganizationType == 1">
-				<view class="register-from group">
-					<view class="label">主营内容:</view>
-					<view class="content-class">
-						<checkbox-group @change="chooseMaleLike" >
-							<label class="item" v-for="(item, index) in mentuzCampList" :key="index" :class="{on: item.checked}">
-							   <checkbox :value="item.value"></checkbox>
-							   <text class="item-text">{{item.name}}</text>
-							</label>
-						</checkbox-group>
-					</view>
-				</view>	
-				<view class="register-from group btn">
-					<view class="content-class btn">
-						<view class="item" @click="showAustomItem">
-							<text class="item-text">其他</text>
-						</view>
-					</view>
-				</view>
-				<view class="register-from group btn" v-show="isShowAustomItem">
-					<view class="content-class btn">
-						<input class="row-input other" type="text" v-model="customItemValue" placeholder="请输入自定义项目"  @blur="onBlurInput" maxlength="5"/>
-						<button type="default" 
-								class="confirm-btn" 
-								:class="[isDisabled === true ? 'disabled' : 'none']" 
-								:disabled="isDisabled"
-								@click.stop="addCustomItem"
-						>确认添加</button>
-					</view>
-				</view>
-			</view>
-			<view class="register-row clearfix" v-if="isOrganizationType == 2">
-				<view class="register-from group">
-					<view class="label">主营内容:</view>
-					<view class="content-class">
-						<checkbox-group @change="chooseMaleLikes">
-							<label class="item" v-for="(item, index) in medicaCampList" :key="index" :class="{on: item.checked}">
-							   <checkbox :value="item.value"></checkbox>
-							   <text class="item-text">{{item.name}}</text>
-							</label>
-						</checkbox-group>
-					</view>
-				</view>	
-				<view class="register-from group btn">
-					<view class="content-class btn">
-						<view class="item" @click="showAustomItem">
-							<text class="item-text">其他</text>
-						</view>
-					</view>
-				</view>
-				<view class="register-from group btn" v-show="isShowAustomItem">
-					<view class="content-class btn">
-						<input class="row-input other" type="text" v-model="customItemValue" placeholder="请输入自定义项目"  @input="onBlurInput" maxlength="5"/>
-						<button type="default" 
-								class="confirm-btn" 
-								:class="[isDisabled === true ? 'disabled' : 'none']" 
-								:disabled="isDisabled"
-								@click.stop="addCustomItem"
-						>确认添加</button>
-					</view>
-				</view>
-			</view>
-			<mpvue-city-picker :themeColor="themeColor"
-								ref="mpvueCityPicker" 
-							    :pickerValueDefault="cityPickerValueDefault"
-								@onCancel="onCancel" 
-								@onConfirm="onConfirm">
-			</mpvue-city-picker>
-		</view>
-	</view>
-</template>
-
-<script>
-import { mapMutations } from 'vuex';
-	import mpvueCityPicker from '@/components/mpvue-citypicker/mpvueCityPicker.vue'
-	import { beautyList,mentuzCampNullList,medicaCampNullList } from '@/common/json/data.json.js' //本地数据
-	import { uploadFileImage } from "@/api/utils.js" 
-	export default{
-		components:{
-			mpvueCityPicker
-		},
-		data() {
-			return{
-				nvabarData: {		//顶部自定义导航
-					showCapsule: 1, // 是否显示左上角图标  1表示显示  0表示不显示,
-					showSearch: 0,
-					title: '修改资料', // 导航栏 中间的标题
-					haveBack:true,
-					textLeft:this.$store.state.isIphone
-				},
-				CustomBar:this.CustomBar,// 顶部导航栏高度
-				errorList:[],
-				tabCurrentIndex:3,	
-				clubStatus:'',			//审核状态
-				isPreviewImage:false,   //预览图片开关
-				userID:'',				//用户ID
-				clubID:'',				//会所ID
-				clubContact:'',			//联系人姓名
-				mobile:'',				//联系人手机号
-				registerEmail:'',		//邮箱
-				clubName:'',	 		//机构名称
-				abbreviation:'',	 	//机构简称
-				socialCreditCode:'',	//统一社会信用代码
-				isDisabled:true,
-				isShowInput:true,
-				textareaFocus:false,
-				isUpgrade:false,
-				isShowUpgrade:false,
-				isDownUpgrade:true,
-				uploadBusinessImage:'',	//营业执照图片
-				uploadMentuzImage:'',  	//门头照图片
-				uploadMedicalImage:'', 	//资质照图片
-				department:'',			//科室
-				isDepartment:false,     //是否显示科室
-				secondClubType:'',		//机构类型二级分类
-				mainpro:'',				//主营内容
-				clubTelePhone:'',		//固定电话
-				clubFax:'',				//传真
-				companyPprofile:'',		//公司简介
-				firstClubType:'',		//机构类型
-				isOrganizationType:0,
-				organizationTypeText:'请选择机构类型',
-				beautyList:beautyList,//医美分类
-				mentuzCampNullList:mentuzCampNullList,//医美分类
-				medicaCampNullList:medicaCampNullList,//生美分类
-				mentuzCampList:[],		//医美主营
-				medicaCampList:[],		//生美主营
-				typtIndex:0,
-				organizationType:0,
-				current:0,
-				isShowAustomItem:false, //是否显示其他添加
-				customItemValue:'', 	//自定义项目
-				isMainproCheck:false,
-				addressData:{
-					address:'请选择机构所在地区',
-					townID:'',			//区ID
-					cityID:'',			//市ID
-					provinceID:'',		//省ID
-					addressDetail: '',	//地址详情
-				},
-				registerBtnText:'确定'
-			}	
-		},
-		onLoad(option) {
-			this.userID = option.userID
-			this.organizationInfo()
-		},
-		methods:{
-			hanldNavigateBack(){
-				this.$util.modal('','资料尚未提交审核，确定放弃升级吗？','确定','取消',true,() =>{
-					uni.navigateBack({
-						delta: 1
-					});
-				})
-			},
-			organizationInfo(){
-				this.UserService.OrganizationUpdateModifyInfo({userID:this.userID}).then(response =>{
-					let organizationClub = response.data.club
-					let organizationUser = response.data.user
-					this.clubStatus = organizationClub.status
-					if(this.clubStatus === 90){
-						this.isShowUpgrade = false
-					}else{
-						this.isShowUpgrade = true
-					}
-					if(organizationUser.auditNoteList!=null){
-						this.errorList =organizationUser.auditNoteList
-					}
-					this.clubContact = organizationClub.linkMan1
-					this.mobile = organizationUser.bindMobile
-					this.registerEmail = organizationUser.email	
-					this.clubID = organizationUser.clubID
-					this.clubName = this.$reg.checkData(organizationClub.name)
-					this.abbreviation = this.$reg.checkData(organizationClub.sname)
-					if( organizationClub.provinceID == null ){
-						this.addressData.provinceID = ''
-					}else{
-						this.addressData.provinceID = organizationClub.provinceID
-					}
-					if( organizationClub.cityID == null ){
-						this.addressData.cityID = ''
-					}else{
-						this.addressData.cityID = organizationClub.cityID
-					}
-					if( organizationClub.townID == null ){
-						this.addressData.townID = ''
-					}else{
-						this.addressData.townID = organizationClub.townID
-					}
-					this.addressData.address = organizationClub.provincialAddress ? organizationClub.provincialAddress:'请选择机构所在地区'
-					this.addressData.addressDetail = this.$reg.checkData(organizationClub.address)
-					this.socialCreditCode = this.$reg.checkData(organizationClub.socialCreditCode)
-					this.firstClubType = organizationClub.firstClubType
-					this.secondClubType = this.$reg.checkData(organizationClub.secondClubType)
-					this.uploadBusinessImage = this.$reg.checkData(organizationClub.businessLicenseImage) 
-					this.uploadMentuzImage = this.$reg.checkData(organizationClub.headpic)
-					this.uploadMedicalImage = this.$reg.checkData(organizationClub.medicalPracticeLicenseImg)
-					this.department = this.$reg.checkData(organizationClub.department)
-					this.clubTelePhone = this.$reg.checkData(organizationClub.contractPhone)
-					this.clubFax = this.$reg.checkData(organizationClub.fax)
-					this.companyPprofile = this.$reg.checkData(organizationClub.info)
-					//机构类型&&主营项目
-					switch(this.firstClubType){
-						case '1':
-							this.organizationTypeText = '医美'
-							this.isOrganizationType = 1
-							break;
-						case '2':
-							this.organizationTypeText = '生美'
-							this.isOrganizationType = 2
-							break;
-						case null:
-							this.organizationTypeText = '请选择机构类型'
-							this.isOrganizationType = 0
-							break;
-					}	
-					if(organizationClub.mainpro == "" || organizationClub.mainpro == null){
-						this.mentuzCampList = this.mentuzCampNullList
-						this.medicaCampList = this.medicaCampNullList
-					}else{
-						if(this.firstClubType == '1'){
-							this.mentuzCampList = this.setNewMainpro(organizationClub.mainpro)
-							this.medicaCampList = this.medicaCampNullList							
-						}else{
-							this.medicaCampList = this.setNewMainpro(organizationClub.mainpro)
-							this.mentuzCampList = this.mentuzCampNullList
-						}
-						this.mainpro = organizationClub.mainpro;
-					}
-					//机构类型
-					switch(this.secondClubType){
-						case '1':this.current = 0;break;
-						case '2':this.current = 1;this.isDepartment=true;break;
-						case '3':this.current = 2;this.isDepartment=true;break;
-					}
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000)
-				})
-			},
-			organizationUpdateInfo(){//普通机构修改资料
-				this.clubUpgradeApi()
-			},
-			organizationUpgradeInfo(){//普通机构提交审核
-				if(this.isUpgrade){
-					this.clubUpgradeApi()
-				}else{
-					 let params = {
-							userID:this.userID,
-							clubID:this.clubID,					//会所ID
-							linkMan1:this.clubContact,
-							fax:this.clubFax,
-							contractPhone:this.clubTelePhone,
-							info : this.companyPprofile,
-						}		
-					this.UserService.OrganizationUpdate(params).then(response =>{
-						this.$util.msg('修改成功',2000,true,'success')
-						setTimeout(()=>{
-							uni.navigateBack({delta: 1})
-						},2000)
-					}).catch(error =>{
-						this.$util.msg(error.msg,2000);
-					})
-				}
-			},
-			clubUpgradeApi(){
-				if(this.isMainproCheck){
-					let mainproList = []
-					if(this.firstClubType == '1'){
-						this.mentuzCampList.forEach(item =>{
-							mainproList.push(item.name)
-						})
-					}else{
-						this.medicaCampList.forEach(item =>{
-							mainproList.push(item.name)
-						})
-					}
-					this.mainpro = mainproList.join('/')
-				}
-				console.log(this.mainpro)
-				if( this.registerEmail == ''){
-					this.$util.msg('请输入邮箱地址',2000);
-					return
-				}
-				if( !this.$reg.isEmail(this.registerEmail)){
-					this.$util.msg('请输入正确的邮箱地址',2000);
-					return
-				}
-				if( this.clubName == ''){
-					this.$util.msg('请输入机构名称',2000);
-					return
-				}
-				if( this.addressData.townID == ''){
-					this.$util.msg('请选择机构地址',2000);
-					return
-				}
-				if( this.addressData.addressDetail == ''){
-					this.$util.msg('请填写机构详细地址',2000);
-					return
-				}
-				if( this.uploadBusinessImage == ''){
-					this.$util.msg('请上传您的营业执照',2000);
-					return
-				}
-				console.log(this.isOrganizationType)
-				if(this.isOrganizationType!=0){
-					if(this.mainpro == ''){
-						this.$util.msg('请选择住机构主营内容',2000);
-						return
-					}
-				}
-				let params = {
-						userID:this.userID,
-						clubID:this.clubID,		//会所ID	
-						linkMan1:this.clubContact,
-						contractEmail1:this.registerEmail,
-						name:this.clubName,
-						sname:this.abbreviation,
-						provinceID:this.addressData.provinceID,
-						cityID:this.addressData.cityID,
-						townID:this.addressData.townID,
-						address:this.addressData.addressDetail,
-						socialCreditCode:this.socialCreditCode,
-						businessLicenseImage:this.uploadBusinessImage,
-						headpic:this.uploadMentuzImage,
-						firstClubType:this.isOrganizationType,  //机构类型分类 医美:0和生美:1
-						secondClubType:this.secondClubType,		//机构类型二级分类 诊所:1,门诊:2,医院:3
-						department:this.department,				//科室
-						medicalPracticeLicenseImg:this.uploadMedicalImage,//资质图片
-						mainpro:this.mainpro,
-						fax:this.clubFax,
-						contractPhone:this.clubTelePhone,
-						info : this.companyPprofile,
-				}
-				this.UserService.OrganizationRegister(params).then(response =>{
-					this.$util.msg('您的升级申请已提交审核',2000);
-					setTimeout(()=>{
-						uni.navigateBack({delta: 1})
-					},2000)
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000);
-				})
-			},
-			// 三级联动选择
-			showMulLinkageThreePicker() {
-				this.isShowInput = true
-				this.$refs.mpvueCityPicker.show()
-			},
-			onConfirm(e) {
-				this.addressData.address = e.name;
-				this.addressData.townID = e.townCode;
-				this.addressData.cityID = e.cityCode;
-				this.addressData.provinceID = e.provinceCode;
-			},	
-			onTextareaInput(e){
-			   this.addressData.addressDetail = e.detail.value;
-			},
-			showTextareaFocus(){//文本框获取焦点
-				this.isShowInput = false
-				this.textareaFocus = true
-			},
-			hideTextareaFocus(){//文本框失去焦点
-				this.isShowInput = true
-				this.textareaFocus = false
-			},
-			chooseBusinessImage() {//营业执照图片上传
-				uploadFileImage().then(res =>{
-					this.uploadBusinessImage = JSON.parse(res.data).data
-				})
-			},
-			chooseMentuzImage() {//门头照图片上传
-				uploadFileImage().then(res =>{
-					this.uploadMentuzImage = JSON.parse(res.data).data
-				})
-			},
-			chooseMedicalImage() {//资质照图片上传
-				uploadFileImage().then(res =>{
-					this.uploadMedicalImage = JSON.parse(res.data).data
-				})
-			},
-			viewBusinessImage(e) {
-				this.myPreviewImageFn(this.uploadBusinessImage)
-			},
-			viewMentuzImage(e) {
-				this.myPreviewImageFn(this.uploadMentuzImage)
-			},
-			viewMedicalImage(e) {
-				this.myPreviewImageFn(this.uploadMedicalImage)
-			},
-			myPreviewImageFn(url){
-				this.isPreviewImage = true
-				let mentuzArray = []
-				mentuzArray.push(url)
-				uni.previewImage({
-					urls: mentuzArray,
-					current: 0
-				});
-			},
-			delBusinessImage(){
-				this.$util.modal('','确定删除营业执照图片吗？','确定','取消',true,() =>{
-					 this.uploadBusinessImage = ''
-				})
-			},
-			delMentuzImage(){
-				this.$util.modal('','确定删除门头照图片吗？','确定','取消',true,() =>{
-					this.uploadMentuzImage = ''
-				})
-			},			
-			delMedicalImage(){
-				this.$util.modal('','确定删除资质图片吗？','确定','取消',true,() =>{
-					this.uploadMedicalImage = ''
-				})
-			},
-			bindPickerChange() {
-				let self = this
-				uni.showActionSheet({
-					title:'标题',
-					itemList: ['医美', '生美'],
-					success: (e) => {
-						self.isOrganizationType = e.tapIndex+1
-						switch(e.tapIndex){
-							case 0:
-								this.organizationTypeText = '医美'
-								break;
-							case 1:
-								this.organizationTypeText = '生美'
-								break;
-						}
-					}
-				})
-			
-			},
-			bindPickerChange2(e) {
-				this.typtIndex = e.target.value
-				this.isOrganizationType = e.target.value
-			},
-			radioChange(e) {
-				this.secondClubType = e.target.value;
-				if( this.secondClubType == '2' || this.secondClubType == '3'){
-					this.isDepartment = true
-				}else{
-					this.isDepartment = false
-				}
-				for (let i = 0; i < this.beautyList.length; i++) {
-					if (this.beautyList[i].value === this.secondClubType) {
-						this.current = i;
-						break;
-					}
-				}
-			},
-			chooseMaleLike(e){
-				this.isMainproCheck = true
-				this.mainpro = this.checkLikes(e,this.mentuzCampList)
-			},
-			chooseMaleLikes(e){
-				this.isMainproCheck = true
-				this.mainpro = this.checkLikes(e,this.medicaCampList)
-			},
-			checkLikes(e,list){
-				let	values = e.detail.value
-				let arr = []
-				list.forEach(item => {
-					if(values.indexOf(item.value) >= 0){
-						this.$set(item,'checked',true)
-						arr.push(item.name)
-					}else{
-						this.$set(item,'checked',false)
-					}
-				})
-				return arr.join('/')
-			},
-			onBlurInput(e){//
-				if(e.detail.value ===''){
-					this.isDisabled = true
-				}else{
-					this.isDisabled = false
-				}
-			},
-			showAustomItem() {
-				this.isShowAustomItem = !this.isShowAustomItem
-			},
-			setNewMainpro(arr){//回显处理主营内容
-				let _ARRAY = []
-				arr.split('/').forEach((item,index) =>{
-					let _OBJ = {value:(index+1).toString(),name:item,checked:true}
-					_ARRAY.push(_OBJ)
-				})
-				console.log(_ARRAY)
-				return _ARRAY
-			},
-			addCustomItem(){
-				if(this.isOrganizationType == 1){
-					let item = {value:`${this.mentuzCampList.length+1}`,name:this.customItemValue,checked:true}
-					this.mentuzCampList.push(item)
-				}else{
-					let item = {value:`${this.medicaCampList.length+1}`,name:this.customItemValue,checked:true}
-					this.medicaCampList.push(item)
-				}
-			},
-			showUpgrade(){
-				this.isUpgrade = true
-				this.isShowUpgrade = true
-				this.isDownUpgrade = false
-				this.registerBtnText = '提交审核'
-			},
-			hideUpgrade(){
-				this.$util.modal('提示','收起后，您填写的升级信息将会被清空确定收起吗？','确定','取消',true,() =>{
-					this.isUpgrade = false
-					this.isShowUpgrade = false
-					this.isDownUpgrade = true
-					this.registerBtnText = '确定'
-				})
-			}
-		},
-		onShow() {
-			if(this.isPreviewImage){
-				this.isPreviewImage = false
-				return
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	.register{
-		width: 100%;
-		height: auto;
-		border-top: 1px solid #F7F7F7;
-		background: #EFEFEF;
-		.register-main{
-			width: 100%;
-			height: auto;
-			background: #FFFFFF;
-			&.detailed{
-				padding-bottom: 200rpx;
-			}
-			&.first{
-				padding-top: 30rpx;
-			}
-			.register-tips{
-				display: flex;
-				flex-direction: column;
-				align-items: center;
-				line-height: 44rpx;
-				font-size: $font-size-24;
-				color: #FF0000;
-				margin-bottom: 40rpx;
-				.iconfont{
-					font-size: $font-size-24;
-				}
-			}
-			.register-row{
-				width: 702rpx;
-				height: auto;
-				padding: 0 24rpx;
-				margin-bottom: 20rpx;
-				&.none{
-					margin-bottom: 0;
-				}
-				.error-title{
-					line-height: 40rpx;
-					font-size: $font-size-28;
-					color: $text-color;
-					text-align: left;
-				}
-				.error-main{
-					padding: 10rpx 0;
-					.error-item{
-						padding:0 20rpx;
-						margin:10rpx;
-						background: #F53636;
-						height: 52rpx;
-						line-height: 52rpx;
-						border-radius: 26rpx;
-						font-size: $font-size-26;
-						color: #FFFFFF;
-						text-align: center;
-						display: inline-block;
-					}
-				}
-				.register-txt{
-					line-height: 44rpx;
-					font-size: $font-size-26;
-					color: $text-color;
-					text-align: left;
-					&.first{
-						margin-top: 20rpx;
-					}
-				}
-				.register-bet{
-					width: 100%;
-					display: flex;
-					line-height: 60rpx;
-					height: 60rpx;
-					align-items: center;
-					flex-direction: column;
-					font-size: $font-size-28;
-					color: $color-system;
-					margin-top: 40rpx;
-					text{
-						margin: 0 5rpx;
-					}
-				}
-				.register-tip{
-					line-height: 64rpx;
-					font-size: $font-size-24;
-					color: #CECECE;
-					text-align: left;
-				}
-				.register-title{
-					font-size: $font-size-32;
-					color: $text-color;
-					text{
-						font-size: $font-size-24;
-					}
-				}
-				.row-btn{
-					position: absolute;
-					right: 24rpx;
-					top: 0;
-					line-height: 88rpx;
-					text-align: center;
-					font-size: $font-size-28;
-					color: $color-system;
-				}
-				.register-from{
-					width: 654rpx;
-					height: 40rpx;
-					padding: 24rpx;
-					background: $sub-bg-color;
-					border-radius: 14rpx;
-					position: relative;
-					.label{
-						text-align: left;
-						font-size: $font-size-28;
-						color: #666666;
-						line-height: 40rpx;
-						float: left;
-					}
-					.row-input{
-						width: 440rpx;
-						padding-left:10rpx;
-						font-size: $font-size-28;
-						color: $text-color;
-						line-height: 40rpx;
-						float: left;
-						height: 40rpx;
-						&.none{
-							color: #999999;
-						}
-						&.picker{
-							text-align: left;
-							color: #999999;
-						}
-						&.keshi{
-							width: 550rpx;
-						}
-					}
-					&.code{
-						width: 410rpx;
-						float: left;
-						margin-right: 20rpx;
-						.row-input{
-							width: 390rpx;
-						}
-					}
-					&.btn{
-						width: 224rpx;
-						height: 88rpx;
-						float: left;
-						background: $btn-confirm;
-						padding: 0;
-						.row-input{
-							width: 224rpx;
-							height: 88rpx;
-							line-height: 88rpx;
-							padding: 0;
-							color: #FFFFFF;
-							background: $btn-confirm;
-							text-align: center;
-							border-radius: 14rpx;
-							&.other{
-								width: 224rpx;
-								background: #F7F7F7;
-								margin-right: 20rpx;
-							}
-							&.none{
-								background: #F7F7F7;
-							}
-						}
-						&.disabled{
-							background: #F7F7F7;
-							.row-input{
-								background: #F7F7F7;
-								color: #999999;
-							}
-						}
-					}
-					&.picker{
-						padding: 0 24rpx;
-						width: 654rpx;
-						height: 88rpx;
-						line-height: 88rpx;
-						.label{
-							line-height: 88rpx;
-						}
-						.row-input{
-							width: 470rpx;
-							height: 88rpx;
-							line-height: 88rpx;
-							padding-left: 30rpx;
-						}
-					}
-					&.radio{
-						padding: 0 24rpx;
-						width: 654rpx;
-						height: 288rpx;
-						.row-input{
-							width: 100%;
-							height: 88rpx;
-							line-height: 88rpx;
-							padding-left: 0;
-						}
-						.row-radio{
-							float: left;
-							transform: scale(0.8);
-						}
-						.row-text{
-							width: 100rpx;
-							text-align: center;
-							float: left;
-						}
-					}
-					&.group{
-						padding: 0 24rpx;
-						width: 654rpx;
-						height: auto;
-						background: #FFFFFF;
-						margin-top: 30rpx;
-						.label{
-							line-height: 76rpx;
-						}
-						.row-input{
-							width: 100%;
-							height: 88rpx;
-							line-height: 88rpx;
-							padding-left: 0;
-						}
-						.row-radio{
-							float: left;
-						}
-						.row-text{
-							width: 100rpx;
-							text-align: center;
-							float: left;
-						}
-					}
-					&.btn{
-						margin-top: 0;
-					}
-					.content-class {
-						margin: 20rpx auto;
-						display: flex;
-						flex-flow: row wrap;
-						justify-content: space-between;
-						align-items: center;
-						&.btn{
-							margin: 0 auto;
-							margin-left: 116rpx;
-						}
-						.row-input{
-							display: flex;
-							width: 220rpx;
-							height: 40rpx;
-							padding: 24rpx;
-							text-align: left;
-							border-radius: 10rpx;
-							font-size: $font-size-28;
-							color: $text-color;
-						}
-						.confirm-btn{
-							width: 200rpx;
-							height: 88rpx;
-							border-radius: 10rpx;
-							line-height: 88rpx;
-							text-align: center;
-							&.other{
-								width: 213rpx;
-							}
-							&.none{
-								color: #FFFFFF;
-								background: $btn-confirm;
-							}
-							&.disabled{
-								color: #999999;
-							}
-						}
-						.item {
-						  width: 155rpx;
-						  height: 60rpx;
-						  font-size:$font-size-28;
-						  line-height: 60rpx;
-						  border-radius:10rpx;
-						  margin: 10rpx;
-						  text-align: center;
-						  box-sizing: border-box;
-						  border: 1rpx solid #EFEFEF;
-						  float: left;
-						  checkbox {
-							display: none;
-						  }
-						}
-						.on {
-						  border-color: $color-system;
-						  color:$color-system;
-						}
-					}
-				}
-				.icon-xiayibu{
-					width: 88rpx;
-					height: 88rpx;
-					position: absolute;
-					right: 0;
-					top: 0;
-					line-height: 88rpx;
-					text-align: center;
-				}
-				&.text-textarea{
-					background: #FFFFFF;
-					.textarea{
-						width: 654rpx;
-						height: 180rpx;
-						background: #F7F7F7;
-						padding: 24rpx;
-						font-size: $font-size-28;
-						color: $text-color;
-						z-index: 1;
-						border-radius: 14rpx;
-					}
-					.textarea.hide{
-						opacity: 0;
-					}
-					.textarea.show{
-						color: #999999;
-					}
-				}
-			}
-			.register-picture{
-				height: 102rpx;
-				margin: 30rpx 0;
-				width: 42%;
-				float: left;
-				&.zz{
-					width: 100%;
-				}
-				.label{
-					float: left;
-					font-size: $font-size-28;
-					color: $text-color;
-					line-height: 102rpx;
-					width: 150rpx;
-					text-align: right;
-					&.zz{
-						width: 230rpx;
-					}
-				}
-				.upload-picture{
-					float: left;
-					height: 100rpx;
-					.upload-none{
-						width: 100rpx;
-						height: 100rpx;
-						text-align: center;
-						line-height: 100rpx;
-						color: #999999;
-						border: 1px solid #999999;
-						border-radius: 10rpx;
-						margin: 0 20rpx;
-						.iconfont{
-							font-size: $font-size-28;
-						}
-					}
-					.upload-image{
-						width: 100rpx;
-						height: 100rpx;
-						border-radius: 10rpx;
-						margin: 0 20rpx;
-						position: relative;
-						image{
-							width: 100rpx;
-							height: 100rpx;
-							border-radius: 10rpx;
-						}
-						.upload-del{
-							width: 40rpx;
-							height: 40rpx;
-							position: absolute;
-							top: -20rpx;
-							right: -20rpx;
-							line-height: 40rpx;
-							text-align: center;
-							.iconfont{
-								font-size: $font-size-32;
-								color: #999999;
-							}
-						}
-					}
-				}
-			}
-			.register-input{
-				width: 654rpx;
-				height: 40rpx;
-				padding: 24rpx;
-				margin: 0 auto;
-				margin-bottom: 60rpx;
-				background: #F7F7F7;
-				border-radius: 14rpx;
-				.input{
-					width: 100%;
-					height: 100%;
-					background: #F7F7F7;
-					font-size: $font-size-28;
-					line-height: 40rpx;
-					color: #333333;
-					border-radius: 14rpx;
-				}
-			}
-			.register-fiexd{
-				width: 100%;
-				height: auto;
-				padding: 20rpx 0;
-				position: fixed;
-				bottom: 0;
-				left: 0;
-				z-index: 99;
-				background: #FFFFFF;
-				.register-bet{
-					width: 100%;
-					display: flex;
-					line-height: 60rpx;
-					height: 60rpx;
-					align-items: center;
-					flex-direction: column;
-					font-size: $font-size-28;
-					color: $color-system;
-					margin-bottom: 20rpx;
-					.icon-xiangxiajiantou{
-						transform:rotate(180deg);
-					}
-					text{
-						margin: 0 5rpx;
-					}
-				}
-				.register-agree{
-					display: flex;
-					flex-direction: column;
-					align-items: center;
-					margin: 32rpx 0;
-					.agree-text{
-						.checkbox{
-							float: left;
-							margin: 4rpx 6rpx 0 0;
-							color: #999999;
-							font-size: $font-size-32;
-							&.icon-gouxuan{
-								color: $color-system;
-							}
-						}
-						font-size: 20rpx;
-						line-height: 44rpx;
-						color: #999999;
-						text{
-							color:#0091FF;
-						}
-					}
-				}
-			}
-			.register-btn{
-				width: 702rpx;
-				height: 88rpx;
-				border-radius: 14rpx;
-				font-size: $font-size-28;
-				line-height: 88rpx;
-				color: #FFFFFF;
-				margin: 0 auto;
-				text-align: center;
-				background: $btn-confirm;
-				margin-top: 96rpx;
-				&.none{
-					background: #FFFFFF;
-					color: $text-color;
-					margin-top: 0;
-				}
-				&.sub{
-					margin-top: 0;
-				}
-			}
-		}
-	}
-</style>

seller/pages/login/information.vue

@@ -1,1043 +0,0 @@
-<template>
-	<view class="container register" :style="{paddingTop:CustomBar+'px'}">
-		<cu-custom :navbar-data='nvabarData'  @navigateBack="hanldNavigateBack"></cu-custom>
-		<view class="register-main first clearfix">
-			<view class="register-row">
-				<view class="register-title">注册信息</view>
-			</view>
-			<view class="register-row clearfix">
-				<view class="register-from">
-					<view class="label">联系人:</view>
-					<input class="row-input" type="text" v-model="clubContact" placeholder="请输入联系姓名" maxlength="6"/>
-				</view>
-			</view>
-			<view class="register-row clearfix">
-				<view class="register-from">
-					<view class="label">手机号:</view>
-					<view class="row-input">{{ mobile }}</view>
-				</view>
-			</view>
-		</view>
-		<view class="register-main clearfix">
-			<view class="register-row">
-				<view class="register-title">其他信息</view>
-			</view>
-			<view class="register-row clearfix">
-				<view class="register-from">
-					<view class="label">固定电话:</view>
-					<input class="row-input" type="text" v-model="clubTelePhone" placeholder="请填写机构的固定电话" maxlength="15"/>
-				</view>
-			</view>
-			<view class="register-row clearfix">
-				<view class="register-from">
-					<view class="label">传真:</view>
-					<input class="row-input" type="text" v-model="clubFax" placeholder="请填写机构的传真" maxlength="15"/>
-				</view>
-			</view>
-			<view class="register-row text-textarea clearfix">
-				<textarea 	class="textarea" 
-							type="text" 
-							v-model="companyPprofile" 
-							placeholder="请填写公司简介，最多500字" 
-							placeholder-class="placeholder"
-							maxlength="500"
-							@input="onTextareaInputInfo"
-							:class="isShowInput ? '':''"
-				/>
-			</view>
-			<view class="register-fiexd clearfix">
-				<view class="register-agree">
-					<view class="agree-text"  @tap.stop="agreeCheck()">
-						<button class="checkbox iconfont" :class="[isCheck ?'icon-gouxuan':'icon-weigouxuan']"></button> 
-						我已阅读并同意
-						<text @click.stop="this.$api.navigateTo('/pages/service/organagree')">《机构协议》</text>
-						<text @click.stop="this.$api.navigateTo('/pages/service/useragree')">《用户协议》</text>及
-						<text @click.stop="this.$api.navigateTo('/pages/service/privacyagree')">《隐私权政策》</text>
-					</view>
-				</view>
-				<view class="register-row">
-					<view class="register-btn sub" @click.stop="organizationUpdateInfo">确定</view>
-				</view>
-			</view>
-		</view>
-		<view class="register-main detailed clearfix">
-			<view class="register-row">
-				<view class="register-title">升级信息</view>
-			</view>
-			<view class="register-row clearfix">
-				<view class="register-from">
-					<view class="label">邮箱:</view>
-					<input class="row-input" type="text" name="input" v-model="email" placeholder="请输入邮箱地址" maxlength="30"/>
-				</view>
-			</view>
-			<view class="register-row clearfix">
-				<view class="register-from">
-					<view class="label">机构名称:</view>
-					<input class="row-input" type="text" v-model="clubName" placeholder="请输入您的机构名称" maxlength="30"/>
-				</view>
-			</view>
-			<view class="register-row clearfix">
-				<view class="register-from">
-					<view class="label">机构简称:</view>
-					<input class="row-input" type="text" v-model="abbreviation" placeholder="请输入您的机构简称" maxlength="10"/>
-				</view>
-			</view>
-			<view class="register-row clearfix">
-				<view class="register-from"  @click="showMulLinkageThreePicker">
-					<view class="label">机构地址:</view>
-					<text class="row-input" :class="addressData.address === '请选择机构所在地区' ? 'none' : ''">
-						{{addressData.address ? addressData.address :''}}
-					</text>		
-					<text class="iconfont icon-xiayibu"></text>
-				</view>
-			</view>
-			<view class="register-row text-textarea clearfix">
-				<view class="textarea show" v-if="isShowInput" @click="showTextareaFocus">{{addressData.addressDetail ? addressData.addressDetail :'详细地址：如道路、门牌号、小区等'}}</view>
-				<textarea 	v-else
-							class="textarea" 
-							type="text" 
-							v-model="addressData.addressDetail" 
-							placeholder="详细地址：如道路、门牌号、小区等" 
-							placeholder-class="placeholder"
-							maxlength="35"
-							@input="onTextareaInput"
-							@focus="textareaFocus"
-							@blur="hideTextareaFocus"
-							:class="isShowInput ? '':''"
-				/>
-			</view>
-			<view class="register-row clearfix">
-				<view class="register-from">
-					<view class="label">营业执照编号:</view>
-					<input class="row-input" type="text" v-model="socialCreditCode" placeholder="请填写社会统一信用代码" maxlength="18"/>
-				</view>
-			</view>
-			<view class="register-row clearfix">
-				<view class="register-picture">
-					<view class="label">营业执照:</view>
-					<view class="upload-picture">
-						<view class="upload-none" v-if="uploadBusinessImage == ''"  @click="chooseBusinessImage"><text class="iconfont icon-jiahao"></text></view>
-						<view class="upload-image" v-else>
-							<image :src="uploadBusinessImage" mode="" @click="viewBusinessImage"></image>
-							<view class="upload-del" @click="delBusinessImage">
-								<text class='iconfont icon-shanchu1'></text>
-							</view>
-						</view>
-					</view>
-				</view>
-				<view class="register-picture">
-					<view class="label">门头照:</view>
-					<view class="upload-picture">
-						<view class="upload-none" v-if="uploadMentuzImage == ''" @click="chooseMentuzImage"><text class="iconfont icon-jiahao"></text></view>
-						<view class="upload-image" v-else>
-							<image :src="uploadMentuzImage" mode=""  @click="viewMentuzImage"></image>
-							<view class="upload-del" @click="delMentuzImage">
-								<text class='iconfont icon-shanchu1'></text>
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
-			<view class="register-row clearfix">
-				<view class="register-from picker">
-					<view class="label">机构类型:</view>
-					<view class="row-input picker" @click="bindPickerChange">{{ organizationTypeText }}</view>
-					<text class="iconfont icon-xiayibu"></text>
-				</view>
-			</view>
-			<view class="register-row clearfix" v-if="isOrganizationType == 1">
-				<view class="register-from radio">
-					<radio-group @change="radioChange">
-						<label class="row-input" v-for="(item, index) in beautyList" :key="item.value">
-							<radio class="row-radio" :value="item.value" :checked="index === current" color="#E15616"/>
-							<view class="row-text">{{item.name}}</view>
-						</label>
-					</radio-group>
-				</view>
-			</view>
-			<view class="register-row clearfix" v-show="isDepartment">
-				<view class="register-from">
-					<view class="label">科室:</view>
-					<input class="row-input keshi" type="text" v-model="department" placeholder="请填写经营的科室，至少三个，用逗号隔开" maxlength="16"/>
-				</view>
-			</view>
-			<view class="register-row clearfix" v-if="isOrganizationType == 1">
-				<view class="register-picture zz">
-					<view class="label zz">医疗执业许可证:</view>
-					<view class="upload-picture">
-						<view class="upload-none" v-if="uploadMedicalImage == ''" @click="chooseMedicalImage"><text class="iconfont icon-jiahao"></text></view>
-						<view class="upload-image" v-else>
-							<image :src="uploadMedicalImage" mode=""  @click="viewMedicalImage"></image>
-							<view class="upload-del" @click="delMedicalImage">
-								<text class='iconfont icon-shanchu1'></text>
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
-			<view class="register-row clearfix" v-if="isOrganizationType == 1">
-				<view class="register-from group">
-					<view class="label">主营内容:</view>
-					<view class="content-class">
-						<checkbox-group @change="chooseMaleLike" >
-							<label class="item" v-for="(item, index) in mentuzCampList" :key="index" :class="{on: item.checked}">
-							   <checkbox :value="item.value"></checkbox>
-							   <text class="item-text">{{item.name}}</text>
-							</label>
-						</checkbox-group>
-					</view>
-				</view>	
-				<view class="register-from group btn">
-					<view class="content-class btn">
-						<view class="item" @click="showAustomItem">
-							<text class="item-text">其他</text>
-						</view>
-					</view>
-				</view>
-				<view class="register-from group btn" v-show="isShowAustomItem">
-					<view class="content-class btn">
-						<input class="row-input other" type="text" v-model="customItemValue" placeholder="请输入自定义项目"  @blur="onBlurInput" maxlength="5"/>
-						<button type="default" 
-								class="confirm-btn" 
-								:class="[isDisabled ? 'disabled' : 'none']" 
-								:disabled="isDisabled"
-								@click.stop="addCustomItem"
-						>确认添加</button>
-					</view>
-				</view>
-			</view>
-			<view class="register-row clearfix" v-if="isOrganizationType == 2">
-				<view class="register-from group">
-					<view class="label">主营内容:</view>
-					<view class="content-class">
-						<checkbox-group @change="chooseMaleLikes">
-							<label class="item" v-for="(item, index) in medicaCampList" :key="index" :class="{on: item.checked}">
-							   <checkbox :value="item.value"></checkbox>
-							   <text class="item-text">{{item.name}}</text>
-							</label>
-						</checkbox-group>
-					</view>
-				</view>	
-				<view class="register-from group btn">
-					<view class="content-class btn">
-						<view class="item" @click="showAustomItem">
-							<text class="item-text">其他</text>
-						</view>
-					</view>
-				</view>
-				<view class="register-from group btn" v-show="isShowAustomItem">
-					<view class="content-class btn">
-						<input class="row-input other" type="text" v-model="customItemValue" placeholder="请输入自定义项目"  @input="onBlurInput" maxlength="5"/>
-						<button type="default" 
-								class="confirm-btn" 
-								:class="[isDisabled ? 'disabled' : 'none']" 
-								:disabled="isDisabled"
-								@click.stop="addCustomItem"
-						>确认添加</button>
-					</view>
-				</view>
-			</view>
-			<mpvue-city-picker :themeColor="themeColor"
-								ref="mpvueCityPicker" 
-							    :pickerValueDefault="cityPickerValueDefault"
-								@onCancel="onCancel" 
-								@onConfirm="onConfirm">
-			</mpvue-city-picker>
-		</view>
-	</view>
-</template>
-
-<script>
-	import { mapMutations } from 'vuex';
-	import mpvueCityPicker from '@/components/mpvue-citypicker/mpvueCityPicker.vue'
-	import { beautyList,mentuzCampNullList,medicaCampNullList } from '@/common/json/data.json.js' //本地数据
-	import { uploadFileImage } from "@/api/utils.js" 
-	export default{
-		components:{
-			mpvueCityPicker
-		},
-		data() {
-			return{
-				nvabarData: {		//顶部自定义导航
-					showCapsule: 1, // 是否显示左上角图标  1表示显示  0表示不显示,
-					showSearch: 0,
-					title: '修改资料', // 导航栏 中间的标题
-					haveBack:true,
-					textLeft:this.$store.state.isIphone
-				},
-				CustomBar:this.CustomBar,// 顶部导航栏高度
-				isPreviewImage:false,   //预览图片开关
-				userID:'',				//机构的userID
-				clubID:'',				//会所ID
-				mobile:'',				//联系人手机号
-				userIdentity:'',		//机构用户类型
-				email:'',				//邮箱
-				clubName:'',	 		//机构名称
-				abbreviation:'',	 	//机构简称
-				clubContact:'',	 		//联系人
-				socialCreditCode:'',	//统一社会信用代码
-				isAgreed:1,				//是否勾选协议
-				isDisabled:true,
-				isShowInput:true,
-				textareaFocus:false,
-				isCheck:true,			//是否勾选协议
-				uploadBusinessImage:'',	//营业执照图片
-				uploadMentuzImage:'',  	//门头照图片
-				uploadMedicalImage:'', 	//资质照图片
-				department:'',			//科室
-				isDepartment:false,     //是否显示科室
-				secondClubType:'',		//机构类型二级分类
-				mainpro:'',				//主营内容
-				clubTelePhone:'',		//固定电话
-				clubFax:'',				//传真
-				companyPprofile:'',		//公司简介
-				firstClubType:'',		//机构类型
-				isOrganizationType:0,
-				organizationTypeText:'请选择机构类型',
-				beautyList:beautyList,
-				mentuzCampNullList:mentuzCampNullList,
-				medicaCampNullList:medicaCampNullList,
-				mentuzCampList:[],
-				medicaCampList:[],
-				typtIndex:0,
-				organizationType:0,
-				current:0,
-				isShowAustomItem:false, //是否显示其他添加
-				customItemValue:'', 	//自定义项目
-				isMainproCheck:false,
-				addressData:{
-					address:'请选择机构所在地区',
-					townID:'',			//区ID
-					cityID:'',			//市ID
-					provinceID:'',		//省ID
-					addressDetail: '',	//地址详情
-				},
-			}	
-		},
-		onLoad(option) {
-			console.log(option)
-			this.userID = option.userID
-			this.organizationInfo()
-		},
-		methods:{
-			hanldNavigateBack(){
-				this.$util.modal('','确定放弃本次修改吗？','确定','取消',true,() =>{
-					uni.navigateBack({
-						delta: 1
-					});
-				})
-			},
-			organizationInfo(){
-				this.UserService.OrganizationUpdateModifyInfo({userID:this.userID}).then(response =>{
-					let organizationClub = response.data.club
-					let organizationUser = response.data.user
-					this.clubID = organizationUser.clubID
-					this.userIdentity = organizationUser.userIdentity
-					this.clubContact = organizationClub.linkMan1
-					this.mobile = organizationUser.bindMobile
-					this.clubTelePhone = organizationClub.contractPhone ? organizationClub.contractPhone : ''
-					this.clubFax = organizationClub.fax ? organizationClub.fax : ''
-					this.companyPprofile = organizationClub.info ? organizationClub.info : ''
-					this.email = organizationUser.email	
-					this.clubName = organizationClub.name
-					this.abbreviation = organizationClub.sname
-					if( organizationClub.provinceID == null ){
-						this.addressData.provinceID = ''
-					}else{
-						this.addressData.provinceID = organizationClub.provinceID
-					}
-					if( organizationClub.cityID == null ){
-						this.addressData.cityID = ''
-					}else{
-						this.addressData.cityID = organizationClub.cityID
-					}
-					if( organizationClub.townID == null ){
-						this.addressData.townID = ''
-					}else{
-						this.addressData.townID = organizationClub.townID
-					}
-					this.addressData.addressDetail = organizationClub.address ? organizationClub.address : ''
-					this.socialCreditCode = this.$reg.checkData(organizationClub.socialCreditCode)
-					this.firstClubType = this.$reg.checkData(organizationClub.firstClubType)
-					this.secondClubType = this.$reg.checkData(organizationClub.secondClubType)
-					this.addressData.address = organizationClub.provincialAddress ? organizationClub.provincialAddress : ''
-					this.uploadBusinessImage = this.$reg.checkData(organizationClub.businessLicenseImage)
-					this.uploadMedicalImage = this.$reg.checkData(organizationClub.medicalPracticeLicenseImg)
-					this.uploadMentuzImage = this.$reg.checkData(organizationClub.headpic)
-					this.department = this.$reg.checkData(organizationClub.department)						
-					//机构类型&&主营项目
-					switch(this.firstClubType){
-						case '1':
-							this.organizationTypeText = '医美'
-							this.isOrganizationType = 1
-							break;
-						case '2':
-							this.organizationTypeText = '生美'
-							this.isOrganizationType = 2
-							break;
-						case null:
-							this.organizationTypeText = '请选择机构类型'
-							this.isOrganizationType = 0
-							break;
-					}	
-					if(organizationClub.mainpro == "" || organizationClub.mainpro == null){
-						this.mentuzCampList = this.mentuzCampNullList
-						this.medicaCampList = this.medicaCampNullList
-					}else{
-						if(this.firstClubType == '1'){
-							this.mentuzCampList = this.setNewMainpro(organizationClub.mainpro)
-							this.medicaCampList = this.medicaCampNullList
-						}else{
-							this.medicaCampList = this.setNewMainpro(organizationClub.mainpro)
-							this.mentuzCampList = this.mentuzCampNullList
-						}
-					}
-					//机构类型
-					switch(this.secondClubType){
-						case '1':this.current = 0;break;
-						case '2':this.current = 1;this.isDepartment=true;break;
-						case '3':this.current = 2;this.isDepartment=true;break;
-					}
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000)
-				})
-			},
-			organizationUpdateInfo(){//提交审核
-				if(!this.isMainproCheck){
-					let mainproList = []
-					if(this.firstClubType == '1'){
-						this.mentuzCampList.forEach(item =>{
-							mainproList.push(item.name)
-						})
-					}else{
-						this.medicaCampList.forEach(item =>{
-							mainproList.push(item.name)
-						})
-					}
-					this.mainpro = mainproList.join('/')
-				}
-				let params = {
-						userID:this.userID,
-						clubID:this.clubID,					//会所ID
-						name:this.clubName,
-						linkMan1:this.clubContact,
-						sname:this.abbreviation,
-						provinceID:this.addressData.provinceID,
-						cityID:this.addressData.cityID,
-						townID:this.addressData.townID,
-						address:this.addressData.addressDetail,
-						socialCreditCode:this.socialCreditCode,
-						businessLicenseImage:this.uploadBusinessImage,
-						headpic:this.uploadMentuzImage,
-						firstClubType:this.isOrganizationType, //机构类型分类 医美:0和生美:1
-						secondClubType:this.secondClubType,		//机构类型二级分类 诊所:1,门诊:2,医院:3
-						department:this.department,				//科室
-						medicalPracticeLicenseImg:this.uploadMedicalImage,//资质图片
-						isAgreed:this.isAgreed,				//是否勾选协议	
-						mainpro:this.mainpro,
-						fax:this.clubFax,
-						contractPhone:this.clubTelePhone,
-						info : this.companyPprofile,
-					}
-				this.UserService.OrganizationUpdate(params).then(response =>{
-					this.$util.msg('修改成功',2000,true,'success')
-					setTimeout(()=>{
-						uni.navigateBack({
-							delta: 1
-						});
-					},2000)
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000);
-				})
-			},
-			// 三级联动选择
-			showMulLinkageThreePicker() {
-				this.isShowInput = true
-				this.$refs.mpvueCityPicker.show()
-			},
-			onConfirm(e) {
-				this.addressData.address = e.name;
-				this.addressData.townID = e.townCode;
-				this.addressData.cityID = e.cityCode;
-				this.addressData.provinceID = e.provinceCode;
-			},	
-			onTextareaInput(e){
-			   this.addressData.addressDetail = e.detail.value;
-			},
-			showTextareaFocus(){//文本框获取焦点
-				this.isShowInput = false
-				this.textareaFocus = true
-			},
-			hideTextareaFocus(){//文本框失去焦点
-				this.isShowInput = true
-				this.textareaFocus = false
-			},
-			onTextareaInputInfo(e){
-			   this.companyPprofile = e.detail.value;
-			},
-			chooseBusinessImage() {//营业执照图片上传
-				uploadFileImage().then(res =>{
-					this.uploadBusinessImage = JSON.parse(res.data).data
-				})
-			},
-			chooseMentuzImage() {//门头照图片上传
-				uploadFileImage().then(res =>{
-					this.uploadMentuzImage = JSON.parse(res.data).data
-				})
-			},
-			chooseMedicalImage() {//资质照图片上传
-				uploadFileImage().then(res =>{
-					this.uploadMedicalImage = JSON.parse(res.data).data
-				})
-			},
-			viewBusinessImage(e) {
-				this.myPreviewImageFn(this.uploadBusinessImage)
-			},
-			viewMentuzImage(e) {
-				this.myPreviewImageFn(this.uploadMentuzImage)
-			},
-			viewMedicalImage(e) {
-				this.myPreviewImageFn(this.uploadMedicalImage)
-			},
-			myPreviewImageFn(url){
-				this.isPreviewImage = true
-				let mentuzArray = []
-				mentuzArray.push(url)
-				uni.previewImage({
-					urls: mentuzArray,
-					current: 0
-				});
-			},
-			delBusinessImage(){
-				this.$util.modal('','确定删除营业执照图片吗？','确定','取消',true,() =>{
-					 this.uploadBusinessImage = ''
-				})
-			},
-			delMentuzImage(){
-				this.$util.modal('','确定删除门头照图片吗？','确定','取消',true,() =>{
-					this.uploadMentuzImage = ''
-				})
-			},			
-			delMedicalImage(){
-				this.$util.modal('','确定删除资质图片吗？','确定','取消',true,() =>{
-					this.uploadMedicalImage = ''
-				})
-			},
-			bindPickerChange() {
-				let self = this
-				uni.showActionSheet({
-					title:'标题',
-					itemList: ['医美', '生美'],
-					success: (e) => {
-						self.isOrganizationType = e.tapIndex+1
-						switch(e.tapIndex){
-							case 0:
-								this.organizationTypeText = '医美'
-								break;
-							case 1:
-								this.organizationTypeText = '生美'
-								break;
-						}
-					}
-				})
-			
-			},
-			bindPickerChange2(e) {
-				this.typtIndex = e.target.value
-				this.isOrganizationType = e.target.value
-			},
-			radioChange(e) {
-				this.secondClubType = e.target.value;
-				if( this.secondClubType == '2' || this.secondClubType == '3'){
-					this.isDepartment = true
-				}else{
-					this.isDepartment = false
-				}
-				for (let i = 0; i < this.beautyList.length; i++) {
-					if (this.beautyList[i].value === this.secondClubType) {
-						this.current = i;
-						break;
-					}
-				}
-			},
-			chooseMaleLike(e){
-				this.isMainproCheck = true
-				this.mainpro = this.checkLikes(e,this.mentuzCampList)
-			},
-			chooseMaleLikes(e){
-				this.isMainproCheck = true
-				this.mainpro = this.checkLikes(e,this.medicaCampList)
-			},
-			checkLikes(e,list){
-				let	values = e.detail.value
-				let arr = []
-				list.forEach(item => {
-					if(values.indexOf(item.value) >= 0){
-						this.$set(item,'checked',true)
-						arr.push(item.name)
-					}else{
-						this.$set(item,'checked',false)
-					}
-				})
-				return arr.join('/')
-			},
-			agreeCheck() {
-				this.isCheck = !this.isCheck
-				if(this.isCheck){
-					this.isAgreed = 1
-				}else{
-					this.isAgreed = 0
-				}
-			},
-			onBlurInput(e){//
-				if(e.detail.value ===''){
-					this.isDisabled = true
-				}else{
-					this.isDisabled = false
-				}
-			},
-			showAustomItem() {
-				this.isShowAustomItem = !this.isShowAustomItem
-			},
-			setNewMainpro(arr){//回显处理主营内容
-				let _ARRAY = []
-				arr.split('/').forEach((item,index) =>{
-					let _OBJ = {value:(index+1).toString(),name:item,checked:true}
-					_ARRAY.push(_OBJ)
-				})
-				return _ARRAY
-			},
-			addCustomItem(){
-				if(this.isOrganizationType == 1){
-					let item = {value:`${this.mentuzCampList.length+1}`,name:this.customItemValue,checked:true}
-					this.mentuzCampList.push(item)
-				}else{
-					let item = {value:`${this.medicaCampList.length+1}`,name:this.customItemValue,checked:true}
-					this.medicaCampList.push(item)
-				}
-			}
-		},
-		onShow() {
-			if(this.isPreviewImage){
-				this.isPreviewImage = false
-				return
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	.register{
-		width: 100%;
-		height: auto;
-		border-top: 1px solid #F7F7F7;
-		.model-warp.none{
-			display: none;			
-		}
-		.model-warp.show{
-			display: block;
-		}
-		.register-main{
-			width: 100%;
-			height: auto;
-			&.detailed{
-				padding-bottom: 300rpx;
-			}
-			&.first{
-				padding-top: 40rpx;
-			}
-			.register-tips{
-				display: flex;
-				flex-direction: column;
-				align-items: center;
-				line-height: 44rpx;
-				font-size: $font-size-24;
-				color: #FF0000;
-				margin-bottom: 40rpx;
-				.iconfont{
-					font-size: $font-size-24;
-				}
-			}
-			.register-row{
-				width: 702rpx;
-				height: auto;
-				padding: 0 24rpx;
-				margin-bottom: 20rpx;
-				.register-title{
-					line-height: 60rpx;
-					font-size: $font-size-32;
-					color: $text-color;
-					text-align: left;
-					padding-left: 20rpx;
-					.txt{
-						font-size: $font-size-26;
-						font-weight: normal;
-					}
-				}
-				.row-btn{
-					position: absolute;
-					right: 24rpx;
-					top: 0;
-					line-height: 88rpx;
-					text-align: center;
-					font-size: $font-size-28;
-					color: $color-system;
-				}
-				.register-from{
-					width: 654rpx;
-					height: 40rpx;
-					padding: 24rpx;
-					background: $sub-bg-color;
-					border-radius: 14rpx;
-					position: relative;
-					.label{
-						text-align: left;
-						font-size: $font-size-28;
-						color: #666666;
-						line-height: 40rpx;
-						float: left;
-					}
-					.row-input{
-						width: 440rpx;
-						padding-left:10rpx;
-						font-size: $font-size-28;
-						color: $text-color;
-						line-height: 40rpx;
-						float: left;
-						height: 40rpx;
-						&.none{
-							color: #999999;
-						}
-						&.picker{
-							text-align: left;
-							color: #999999;
-						}
-						&.keshi{
-							width: 550rpx;
-						}
-					}
-					&.code{
-						width: 410rpx;
-						float: left;
-						margin-right: 20rpx;
-						.row-input{
-							width: 390rpx;
-						}
-					}
-					&.btn{
-						width: 224rpx;
-						height: 88rpx;
-						float: left;
-						background: $btn-confirm;
-						padding: 0;
-						.row-input{
-							width: 224rpx;
-							height: 88rpx;
-							line-height: 88rpx;
-							padding: 0;
-							color: #FFFFFF;
-							background: $btn-confirm;
-							text-align: center;
-							border-radius: 14rpx;
-							&.other{
-								width: 224rpx;
-								background: #F7F7F7;
-								margin-right: 20rpx;
-							}
-							&.none{
-								background: #F7F7F7;
-							}
-						}
-						&.disabled{
-							background: #F7F7F7;
-							.row-input{
-								background: #F7F7F7;
-								color: #999999;
-							}
-						}
-					}
-					&.picker{
-						padding: 0 24rpx;
-						width: 654rpx;
-						height: 88rpx;
-						line-height: 88rpx;
-						.label{
-							line-height: 88rpx;
-						}
-						.row-input{
-							width: 470rpx;
-							height: 88rpx;
-							line-height: 88rpx;
-							padding-left: 30rpx;
-						}
-					}
-					&.radio{
-						padding: 0 24rpx;
-						width: 654rpx;
-						height: 288rpx;
-						.row-input{
-							width: 100%;
-							height: 88rpx;
-							line-height: 88rpx;
-							padding-left: 0;
-						}
-						.row-radio{
-							float: left;
-							transform: scale(0.8);
-						}
-						.row-text{
-							width: 100rpx;
-							text-align: center;
-							float: left;
-						}
-					}
-					&.group{
-						padding: 0 24rpx;
-						width: 654rpx;
-						height: auto;
-						background: #FFFFFF;
-						margin-top: 30rpx;
-						.label{
-							line-height: 70rpx;
-						}
-						.row-input{
-							width: 100%;
-							height: 88rpx;
-							line-height: 88rpx;
-							padding-left: 0;
-						}
-						.row-radio{
-							float: left;
-						}
-						.row-text{
-							width: 100rpx;
-							text-align: center;
-							float: left;
-						}
-					}
-					&.btn{
-						margin-top: 0;
-					}
-					.content-class {
-						margin: 20rpx auto;
-						display: flex;
-						flex-flow: row wrap;
-						justify-content: space-between;
-						align-items: center;
-						&.btn{
-							margin: 0 auto;
-							margin-left: 116rpx;
-						}
-						.row-input{
-							display: flex;
-							width: 220rpx;
-							height: 40rpx;
-							padding: 24rpx;
-							text-align: left;
-							border-radius: 10rpx;
-							font-size: $font-size-28;
-							color: $text-color;
-						}
-						.confirm-btn{
-							width: 200rpx;
-							height: 88rpx;
-							border-radius: 10rpx;
-							line-height: 88rpx;
-							text-align: center;
-							&.other{
-								width: 213rpx;
-							}
-							&.none{
-								color: #FFFFFF;
-								background: $btn-confirm;
-							}
-							&.disabled{
-								color: #999999;
-							}
-						}
-						.item {
-						  width: 155rpx;
-						  height: 60rpx;
-						  font-size:$font-size-28;
-						  line-height: 60rpx;
-						  border-radius:10rpx;
-						  margin: 10rpx;
-						  text-align: center;
-						  box-sizing: border-box;
-						  border: 1rpx solid #EFEFEF;
-						  float: left;
-						  checkbox {
-							display: none;
-						  }
-						}
-						.on {
-						  border-color: $color-system;
-						  color:$color-system;
-						}
-					}
-				}
-				.icon-xiayibu{
-					width: 88rpx;
-					height: 88rpx;
-					position: absolute;
-					right: 0;
-					top: 0;
-					line-height: 88rpx;
-					text-align: center;
-				}
-				&.text-textarea{
-					background: #FFFFFF;
-					.textarea{
-						width: 654rpx;
-						height: 180rpx;
-						background: #F7F7F7;
-						padding: 24rpx;
-						font-size: $font-size-28;
-						color: $text-color;
-						z-index: 1;
-						border-radius: 14rpx;
-					}
-					.textarea.hide{
-						opacity: 0;
-					}
-					.textarea.show{
-						color: #999999;
-					}
-				}
-			}
-			.register-picture{
-				height: 102rpx;
-				margin: 30rpx 0;
-				width: 42%;
-				float: left;
-				&.zz{
-					width: 100%;
-				}
-				.label{
-					float: left;
-					font-size: $font-size-28;
-					color: $text-color;
-					line-height: 102rpx;
-					width: 150rpx;
-					text-align: right;
-					&.zz{
-						width: 230rpx;
-					}
-				}
-				.upload-picture{
-					float: left;
-					height: 100rpx;
-					.upload-none{
-						width: 100rpx;
-						height: 100rpx;
-						text-align: center;
-						line-height: 100rpx;
-						color: #999999;
-						border: 1px solid #999999;
-						border-radius: 10rpx;
-						margin: 0 20rpx;
-						.iconfont{
-							font-size: $font-size-28;
-						}
-					}
-					.upload-image{
-						width: 100rpx;
-						height: 100rpx;
-						border-radius: 10rpx;
-						margin: 0 20rpx;
-						position: relative;
-						image{
-							width: 100rpx;
-							height: 100rpx;
-							border-radius: 10rpx;
-						}
-						.upload-del{
-							width: 40rpx;
-							height: 40rpx;
-							position: absolute;
-							top: -20rpx;
-							right: -20rpx;
-							line-height: 40rpx;
-							text-align: center;
-							.iconfont{
-								font-size: $font-size-32;
-								color: #999999;
-							}
-						}
-					}
-				}
-			}
-			.register-input{
-				width: 654rpx;
-				height: 40rpx;
-				padding: 24rpx;
-				margin: 0 auto;
-				margin-bottom: 60rpx;
-				background: #F7F7F7;
-				border-radius: 14rpx;
-				.input{
-					width: 100%;
-					height: 100%;
-					background: #F7F7F7;
-					font-size: $font-size-28;
-					line-height: 40rpx;
-					color: #333333;
-					border-radius: 14rpx;
-				}
-			}
-			.register-fiexd{
-				width: 100%;
-				height: auto;
-				padding: 20rpx 0;
-				position: fixed;
-				bottom: 0;
-				left: 0;
-				z-index: 9999;
-				background: #FFFFFF;
-				.register-agree{
-					display: flex;
-					flex-direction: column;
-					align-items: center;
-					margin: 32rpx 0;
-					.agree-text{
-						.checkbox{
-							float: left;
-							margin: 4rpx 6rpx 0 0;
-							color: #999999;
-							font-size: $font-size-32;
-							&.icon-gouxuan{
-								color: $color-system;
-							}
-						}
-						font-size: 20rpx;
-						line-height: 44rpx;
-						color: #999999;
-						text{
-							color:#0091FF;
-						}
-					}
-				}
-			}
-			.register-btn{
-				width: 702rpx;
-				height: 88rpx;
-				border-radius: 14rpx;
-				font-size: $font-size-28;
-				line-height: 88rpx;
-				color: #FFFFFF;
-				margin: 0 auto;
-				text-align: center;
-				background: $btn-confirm;
-				margin-top: 96rpx;
-				&.none{
-					background: #FFFFFF;
-					color: $text-color;
-					margin-top: 0;
-				}
-				&.sub{
-					margin-top: 0;
-				}
-			}
-		}
-	}
-</style>

seller/pages/login/login.vue

@@ -1,249 +0,0 @@
-<template>
-	<view class="container login" :style="{paddingTop:CustomBar+'px'}" v-if="isSeller">
-		<cu-custom :navbar-data='nvabarData'  @navigateBack="hanldNavigateBack"></cu-custom>
-		<view class="login-main">
-			<image class="logo" src="https://static.caimei365.com/app/img/icon/login-logo@3x.png" mode=""></image>
-			<text class="logo-text">生美/医美采购服务平台</text>
-		</view>
-		<view class="login-form">
-			<view class="login-input">
-				<input type="number" v-model="accountNumber"  maxlength="11" class="input" placeholder="请输入手机号"/>
-			</view>
-			<view class="login-input">
-				<input v-show="isShowEye" type="text" v-model="password"  maxlength="18" class="input" placeholder="请输入密码" autocomplete="new-password"/>
-				<input v-show="!isShowEye" type="password" v-model="password"  :password="true" maxlength="18" class="input" placeholder="请输入密码" autocomplete="new-password"/>
-				<view class="iconfont" :class="isShowEye ? iconEyen : iconEyes"  @click="passwordClick"></view>
-			</view>
-		</view>
-		<view class="login-btn"  @click="confirmLogin">协销登录</view>
-		<!-- 微信用户已绑定供应商账户 -->
-		<error-alert v-if="iseErrorAlert"></error-alert>
-	</view>
-</template>
-
-<script>
-	import { mapState,mapMutations } from 'vuex';
-	import errorAlert from '@/components/cm-module/modelAlert/errorAlert.vue'
-	import authorize from '@/common/config/authorize.js' 
-	import { userInfoLogin } from "@/api/use.js"
-	var self;
-	export default{
-		components:{
-			errorAlert
-		},
-		data() {
-			return{
-				nvabarData: {		//顶部自定义导航
-					showCapsule: 0, // 是否显示左上角图标  1表示显示  0表示不显示,
-					showSearch: 0,
-					title: '登录',  // 导航栏 中间的标题
-					haveBack:false,
-					textLeft:this.$store.state.isIphone
-				},
-				isIphoneX:this.$store.state.isIphoneX,
-				CustomBar:this.CustomBar,// 顶部导航栏高度
-				isShowEye:false,
-				isSeller:true,
-				iseErrorAlert:false,
-				iconEyes:'icon-yanjing_yincang_o',
-				iconEyen:'icon-yanjing_xianshi_o',
-				accountNumber:'',  //协销用户登录账号
-				password:'',	   //协销登录密码	
-			}
-		},
-		onLoad() {
-			authorize.getSetting().then(wxResponse =>{// console.log('是否已授权',res);//0:为取消授权 1:为已授权 2:为未操作
-				if(wxResponse == 1){
-					this.getWxAuthorize()
-				}else{
-					this.$api.navigateTo('/pages/authorization/authorization')
-					this.isSeller= true
-				}
-			})	
-		},
-		computed: {
-			...mapState(['isWxAuthorize'])
-		},
-		methods:{
-			...mapMutations(['login','logout']),
-			getWxAuthorize(){
-				authorize.getCode('weixin').then(wechatcode =>{
-					// 根据微信的code获取用户登录状态:1已登录过 -1未登录过
-					authorize.getUserInfo('weixin').then(wxResponse =>{
-						userInfoLogin({code:wechatcode,encryptedData:wxResponse.encryptedData,iv:wxResponse.iv}).then(response =>{
-							if(response.code != -6){//判断是否为微信绑定了供应商的账户
-								if(response.data.userIdentity !=1){
-									this.logout()
-									uni.removeStorageSync('sessionid')
-									uni.setStorageSync('sessionid','JSESSIONID='+response.data.sessionId)
-									this.isSeller= true
-								}else{
-									this.login(response.data);
-									this.$store.commit('updateStatus',response.data)
-									uni.setStorageSync('token',response.data.token)
-									uni.removeStorageSync('sessionid')
-									uni.setStorageSync('sessionid','JSESSIONID='+response.data.sessionId)
-									this.$api.navigateTo('/seller/pages/index/index')
-								}
-							}else{
-								this.isSeller= true
-								this.iseErrorAlert= true
-							}
-						}).catch(error =>{
-							this.logout()
-							uni.removeStorageSync('sessionid')
-							uni.setStorageSync('sessionid','JSESSIONID='+error.data)
-							this.isSeller= true
-						})
-					})
-				})	
-			},	
-			confirmLogin(){
-				if( this.accountNumber == ''){
-					this.$util.msg('请输入账户名',2000)
-					return
-				}
-				if( this.password == ''){
-					this.$util.msg('请输入密码',2000)
-					return
-				}
-				authorize.getSetting().then(wxResponse =>{// console.log('是否已授权',res);//0:为取消授权 1:为已授权 2:为未操作
-					if(wxResponse == 1){
-						this.SellerLogin()
-					}else{
-						this.$api.navigateTo('/pages/authorization/authorization?type=1')
-					}
-				})	
-			},
-			SellerLogin(){
-				this.SellerService.SellerLogin({mobile:this.accountNumber,password:this.password}).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.$api.redirectTo('/seller/pages/index/index')
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000);
-				})
-			},
-			storeUpdataeStatus(data){
-				let user_key = {
-						clubID:data.clubID,
-						shopID:data.shopID,
-						userID:data.userID,
-						bindMobile:data.bindMobile,
-				}						
-				uni.setStorageSync('token',data.token)
-				this.$store.commit('updateStatus',user_key)
-				this.login(data);
-			},
-			passwordClick() { //密码显隐操作
-				this.isShowEye = !this.isShowEye;
-			},
-		},
-		onShow() {
-			
-		}
-	}
-</script>
-
-<style lang="scss">
-	.login{
-		width: 100%;
-		height: auto;
-		.model-warp.none{
-			display: none;			
-		}
-		.model-warp.show{
-			display: block;
-		}
-		.login-main{
-			width: 100%;
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-			height: 198rpx;
-			padding: 170rpx 0 60rpx 0;
-			.logo{
-				width: 138rpx;
-				height: 118rpx;
-				display: block;
-			}
-			.logo-text{
-				font-size: 30rpx;
-				line-height: 44rpx;
-				color: $color-system;
-				font-weight: 600;
-				margin-top: 20rpx;
-			}
-		}
-		.login-input{
-			width: 600rpx;
-			height: 40rpx;
-			padding: 24rpx 0;
-			margin: 0 auto;
-			margin-bottom: 20rpx;
-			background: #FFFFFF;
-			position: relative;
-			border-bottom: 1px solid #E1E1E1;
-			.input{
-				width: 100%;
-				height: 100%;
-				background: #FFFFFF;
-				font-size: $font-size-28;
-				line-height: 40rpx;
-				color: #333333;
-			}
-			.iconfont{
-				position: absolute;
-				right: 0;
-				top: 0;
-				font-size: 44rpx;
-				color: #999999;
-				font-weight: bold;
-				z-index: 99;
-				width: 96rpx;
-				height: 96rpx;
-				line-height: 96rpx;
-				text-align: center;
-			}
-			&.link{
-				background: #FFFFFF;
-				margin-bottom: 40rpx;
-				padding: 0 24rpx;
-				line-height: 40rpx;
-				font-size: $font-size-28;
-				.login-reg{
-					float: left;
-					color: $color-system;
-				}
-				.login-pwd{
-					float: right;
-					color: $text-color;
-				}
-			}
-		}
-		.login-btn{
-			width: 600rpx;
-			height: 88rpx;
-			border-radius:44rpx;
-			font-size: $font-size-28;
-			line-height: 88rpx;
-			color: #FFFFFF;
-			margin: 0 auto;
-			text-align: center;
-			background: $btn-confirm;
-			margin-top: 100rpx;
-		}
-		.login-tel{
-			width: 702rpx;
-			font-size: $font-size-28;
-			line-height: 240rpx;
-			margin: 0 auto;
-			color: $text-color;
-			text-align: center;
-			margin-top: 100rpx;
-		}
-	}
-</style>

seller/pages/login/register.vue

@@ -1,1101 +0,0 @@
-<template>
-	<view class="container register" :style="{paddingTop:CustomBar+'px'}">
-		<cu-custom :navbar-data='nvabarData'  @navigateBack="hanldNavigateBack"></cu-custom>
-		<view class="register-main first clearfix">
-			<view class="register-row clearfix">
-				<text class="register-title">注册信息</text>
-			</view>
-			<view class="register-row clearfix">
-				<view class="register-from">
-					<view class="label">联系人:</view>
-					<input class="row-input" type="text" name="input" v-model="clubContact" placeholder="请输入联系姓名" maxlength="6"/>
-				</view>
-			</view>
-			<view class="register-row clearfix">
-				<view class="register-from code">
-					<view class="label">手机号:</view>
-					<input class="row-input phone" type="text" v-model="registerMobile" placeholder="请输入联系人手机号" maxlength="11"/>
-				</view>
-				<view class="register-from btn">
-					<button class="row-input" type="button" @click.stop="registerCheckMobile()">检测</button>
-				</view>
-			</view>
-		</view>
-		<view class="register-main clearfix">
-			<view class="register-row clearfix">
-				<view class="register-txt first"><text>您还可以填写更多信息，帮机构直接注册成为会员机构。</text></view>
-				<view class="register-txt"><text>不过这些信息需要审核。</text></view>
-				<view class="register-bet" @tap.stop="showUpgrade()" v-if="isDownUpgrade">
-					<text>展开信息填写<text class="iconfont icon-xiangxiajiantou"></text></text>
-				</view>
-			</view>	
-			<view class="register-fiexd clearfix" :style="{paddingBottom:isIphoneX ? '68rpx':''}">
-				<view class="register-bet" @tap.stop="hideUpgrade()" v-if="isUpgrade">
-					<text>收起<text class="iconfont icon-xiangshangjiantou"></text></text>
-				</view>
-				<view class="register-agree">
-					<view class="agree-text"  @tap.stop="agreeCheck()">
-						<button class="checkbox iconfont" :class="[isCheck?'icon-gouxuan':'icon-weigouxuan']"></button> 
-						我已阅读并同意
-						<text @click.stop="this.$api.navigateTo('/pages/service/organagree')">《机构协议》</text>
-						<text @click.stop="this.$api.navigateTo('/pages/service/useragree')">《用户协议》</text>及
-						<text @click.stop="this.$api.navigateTo('/pages/service/privacyagree')">《隐私权政策》</text>
-					</view>
-				</view>
-				<view class="register-row ">
-					<view class="register-btn sub" @click.stop="registerStepsSub">{{registerBtnText}}</view>
-				</view>
-			</view>
-		</view>
-		<view class="register-main detailed clearfix" v-show="isUpgrade">
-			<view class="register-row clearfix">
-				<text class="register-title">升级信息</text></text>
-			</view>
-			<view class="register-row clearfix">
-				<view class="register-from">
-					<view class="label">邮箱:</view>
-					<input class="row-input" type="text"  name="input" v-model="registerEmail" placeholder="请输入机构邮箱地址" maxlength="30"/>
-				</view>
-			</view>
-			<view class="register-row clearfix">
-				<view class="register-from">
-					<view class="label">机构名称:</view>
-					<input class="row-input" type="text" name="input" v-model="clubName" placeholder="请输入您的机构名称" maxlength="30"/>
-				</view>
-			</view>
-			<view class="register-row clearfix">
-				<view class="register-from">
-					<view class="label">机构简称:</view>
-					<input class="row-input" type="text" v-model="abbreviation" placeholder="请输入您的机构简称" maxlength="10"/>
-				</view>
-			</view>
-			<view class="register-row clearfix">
-				<view class="register-from"  @click="showMulLinkageThreePicker">
-					<view class="label">机构地址:</view>
-					<text class="row-input" :class="addressData.address === '请选择机构所在地区' ? 'none' : ''">
-						{{addressData.address}}
-					</text>		
-					<text class="iconfont icon-xiayibu"></text>
-				</view>
-			</view>
-			<view class="register-row text-textarea clearfix">
-				<view class="textarea show" v-if="isShowInput" @click="showTextareaFocus">{{addressData.addressDetail ? addressData.addressDetail :'详细地址：如道路、门牌号、小区等'}}</view>
-				<textarea 	v-else
-							class="textarea" 
-							type="text" 
-							v-model="addressData.addressDetail" 
-							placeholder="详细地址：如道路、门牌号、小区等" 
-							placeholder-class="placeholder"
-							maxlength="35"
-							@input="onTextareaInput"
-							@focus="textareaFocus"
-							@blur="hideTextareaFocus"
-							:class="isShowInput ? '':''"
-				/>
-			</view>
-			<view class="register-row clearfix" >
-				<view class="register-from">
-					<view class="label">营业执照编号:</view>
-					<input class="row-input" type="text" v-model="socialCreditCode" placeholder="请填写社会统一信用代码" maxlength="18"/>
-				</view>
-			</view>
-			<view class="register-row clearfix">
-				<view class="register-picture">
-					<view class="label">营业执照:</view>
-					<view class="upload-picture">
-						<view class="upload-none" v-if="uploadBusinessImage === ''"  @click="chooseBusinessImage"><text class="iconfont icon-jiahao"></text></view>
-						<view class="upload-image" v-else>
-							<image :src="uploadBusinessImage" mode="" @click="viewBusinessImage"></image>
-							<view class="upload-del" @click="delBusinessImage">
-								<text class='iconfont icon-shanchu1'></text>
-							</view>
-						</view>
-					</view>
-				</view>
-				<view class="register-picture">
-					<view class="label">门头照:</view>
-					<view class="upload-picture">
-						<view class="upload-none" v-if="uploadMentuzImage === ''" @click="chooseMentuzImage"><text class="iconfont icon-jiahao"></text></view>
-						<view class="upload-image" v-else>
-							<image :src="uploadMentuzImage" mode=""  @click="viewMentuzImage"></image>
-							<view class="upload-del" @click="delMentuzImage">
-								<text class='iconfont icon-shanchu1'></text>
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
-			<view class="register-row clearfix">
-				<view class="register-from picker">
-					<view class="label">机构类型:</view>
-					<view class="row-input picker" @click="bindPickerChange">{{ organizationTypeText }}</view>
-					<text class="iconfont icon-xiayibu"></text>
-				</view>
-			</view>
-			<view class="register-row clearfix" v-if="isOrganizationType == 1" >
-				<view class="register-from radio">
-					<radio-group @change="radioChange">
-						<label class="row-input" v-for="(item, index) in beautyList" :key="item.value">
-							<radio class="row-radio" :value="item.value" :checked="index === current" color="#E15616"/>
-							<view class="row-text">{{item.name}}</view>
-						</label>
-					</radio-group>
-				</view>
-			</view>
-			<view class="register-row clearfix" v-show="isDepartment" >
-				<view class="register-from">
-					<view class="label">科室:</view>
-					<input class="row-input keshi" type="text" v-model="department" placeholder="请填写经营的科室，至少三个，用逗号隔开" maxlength="16"/>
-				</view>
-			</view>
-			<view class="register-row clearfix" v-if="isOrganizationType == 1">
-				<view class="register-picture zz">
-					<view class="label zz">医疗执业许可证:</view>
-					<view class="upload-picture">
-						<view class="upload-none" v-if="uploadMedicalImage === ''" @click="chooseMedicalImage"><text class="iconfont icon-jiahao"></text></view>
-						<view class="upload-image" v-else>
-							<image :src="uploadMedicalImage" mode=""  @click="viewMedicalImage"></image>
-							<view class="upload-del" @click="delMedicalImage">
-								<text class='iconfont icon-shanchu1'></text>
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
-			<view class="register-row clearfix" v-if="isOrganizationType == 1">
-				<view class="register-from group">
-					<view class="label">主营内容:</view>
-					<view class="content-class">
-						<checkbox-group  @change="chooseMaleLike" >
-							<label class="item" v-for="(item, index) in mentuzCampList" :key="index" :class="{on: item.checked}">
-							   <checkbox :value="item.value"></checkbox>
-							   <text class="item-text">{{item.name}}</text>
-							</label>
-						</checkbox-group>
-					</view>
-				</view>	
-				<view class="register-from group btn">
-					<view class="content-class btn">
-						<view class="item" @click="showAustomItem">
-							<text class="item-text">其他</text>
-						</view>
-					</view>
-				</view>
-				<view class="register-from group btn" v-show="isShowAustomItem">
-					<view class="content-class btn">
-						<input class="row-input other" type="text" v-model="customItemValue" placeholder="请输入自定义项目"  @blur="onBlurInput" maxlength="5"/>
-						<button type="default" 
-								class="confirm-btn other" 
-								:class="[isDisabled === true ? 'disabled' : 'none']" 
-								:disabled="isDisabled"
-								@click.stop="addCustomItem"
-						>确认添加</button>
-					</view>
-				</view>
-			</view>
-			<view class="register-row clearfix" v-if="isOrganizationType == 2">
-				<view class="register-from group">
-					<view class="label">主营内容:</view>
-					<view class="content-class">
-						<checkbox-group @change="chooseMaleLikes">
-							<label class="item" v-for="(item, index) in medicaCampList" :key="index" :class="{on: item.checked}">
-							   <checkbox :value="item.value"></checkbox>
-							   <text class="item-text">{{item.name}}</text>
-							</label>
-						</checkbox-group>
-					</view>
-				</view>	
-				<view class="register-from group btn">
-					<view class="content-class btn">
-						<view class="item" @click="showAustomItem">
-							<text class="item-text">其他</text>
-						</view>
-					</view>
-				</view>
-				<view class="register-from group btn" v-show="isShowAustomItem">
-					<view class="content-class btn">
-						<input class="row-input other" type="text" v-model="customItemValue" placeholder="请输入自定义项目"  @blur="onBlurInput" maxlength="5"/>
-						<button type="default" 
-								class="confirm-btn" 
-								:class="[isDisabled === true ? 'disabled' : 'none']" 
-								:disabled="isDisabled"
-								@click.stop="addCustomItem"
-						>确认添加</button>
-					</view>
-				</view>
-			</view>
-			<mpvue-city-picker :themeColor="themeColor"
-								ref="mpvueCityPicker" 
-							    :pickerValueDefault="cityPickerValueDefault"
-								@onCancel="onCancel" 
-								@onConfirm="onConfirm">
-			</mpvue-city-picker>
-		</view>
-	</view>
-</template>
-
-<script>
-	import { mapMutations } from 'vuex';
-	import { beautyList,mentuzCampNullList,medicaCampNullList } from '@/common/json/data.json.js' //本地数据
-	import mpvueCityPicker from '@/components/mpvue-citypicker/mpvueCityPicker.vue'
-	import authorize from '@/common/config/authorize.js' 
-	import { uploadFileImage } from "@/api/utils.js"
-	var self;
-	export default{
-		components:{
-			mpvueCityPicker
-		},
-		data() {
-			return{
-				nvabarData: {		//顶部自定义导航
-					showCapsule: 1, // 是否显示左上角图标  1表示显示  0表示不显示,
-					showSearch: 0,
-					title: '拉机构上线', // 导航栏 中间的标题
-					haveBack:true,
-					textLeft:this.$store.state.isIphone
-				},
-				isIphoneX:this.$store.state.isIphone,
-				CustomBar:this.CustomBar,// 顶部导航栏高度
-				userID:'',//协销ID
-				isPreviewImage:false,   	//预览图片开关
-				registerEmail:'', 		//注册邮箱
-				clubName:'',	 		//机构名称
-				abbreviation:'',	 	//机构简称
-				clubContact:'',	 		//联系人
-				registerMobile:'',		//联系人手机号
-				socialCreditCode:'',	//统一社会信用代码
-				isAgreed:0,				//是否勾选协议
-				isDisabled:true,
-				isShowInput:true,
-				textareaFocus:false,
-				isUpgrade:false,
-				isDownUpgrade:true,
-				isCheck:false,			//是否勾选协议
-				uploadBusinessImage:'',	//营业执照图片
-				uploadMentuzImage:'',  	//门头照图片
-				uploadMedicalImage:'', 	//资质照图片
-				department:'',			//科室
-				isDepartment:false,     //是否显示科室
-				secondClubType:'',		//机构类型二级分类
-				mainpro:'',				//主营内容
-				isOrganizationType:0,
-				organizationTypeText:'请选择机构类型',
-				beautyList:beautyList,
-				mentuzCampList:mentuzCampNullList,
-				medicaCampList:medicaCampNullList,
-				typtIndex:0,
-				organizationType:3,
-				current:0,
-				isShowAustomItem:false, //是否显示其他添加
-				customItemValue:'', 	//自定义项目
-				addressData:{
-					address:'请选择机构所在地区',
-					townID:'',			//区ID
-					cityID:'',			//区ID
-					provinceID:'',		//区ID
-					addressDetail: '',	//地址
-				},
-				registerBtnText:'确定'
-			}
-		},
-		onLoad(option) {
-		},
-		methods:{
-			hanldNavigateBack(){
-				this.$util.modal('','注册尚未完成，确定放弃注册吗？','确定','取消',true,() =>{
-					uni.navigateBack({
-						delta: 1
-					});
-				})
-			},
-			registerCheckMobile(){
-				if( this.registerMobile == ''){
-					this.$util.msg('请输入手机号',2000);
-					return
-				}
-				if(!this.$reg.isMobile(this.registerMobile)){
-					this.$util.msg('请输入正确的手机号',2000);
-					return
-				}
-				this.SellerService.SellerClubCheck({mobileOrEmail:this.registerMobile}).then(response =>{
-					this.$util.msg(response.data,2000);
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000);
-				})
-			},
-			registerStepsSub(){
-				let params = {};
-				if(this.isUpgrade){
-					if( this.clubContact == ''){
-						this.$util.msg('请输入联系人姓名',2000);
-						return
-					}
-					if( this.registerMobile == ''){
-						this.$util.msg('请输入联系人手机号',2000);
-						return
-					}
-					if(!this.$reg.isMobile(this.registerMobile)){
-						this.$util.msg('手机格式不正确',2000);
-						return
-					}	
-					if( this.registerEmail == ''){
-						this.$util.msg('请输入邮箱地址',2000);
-						return
-					}
-					if(!this.$reg.isEmail(this.registerEmail)){
-						this.$util.msg('请输入正确的邮箱地址',2000);
-						return
-					}
-					if( this.clubName == ''){
-						this.$util.msg('请输入机构名称',2000);
-						return
-					}
-					if( this.addressData.townID == ''){
-						this.$util.msg('请选择机构地址',2000);
-						return
-					}
-					if( this.addressData.addressDetail == ''){
-						this.$util.msg('请填写机构详细地址',2000);
-						return
-					}
-					if( this.uploadBusinessImage == ''){
-						this.$util.msg('请上传您的营业执照',2000);
-						return
-					}
-					if(this.isOrganizationType!=0){
-						if(this.mainpro == ''){
-							this.$util.msg('请选择住机构主营内容',2000);
-							return
-						}
-					}
-					if(this.isAgreed == 0){
-						this.$util.msg('请勾选同意协议',2000);
-						return
-					}
-					params ={
-						source:1,
-						email:this.registerEmail,
-						name:this.clubName,
-						linkMan1:this.clubContact,
-						bindMobile:this.registerMobile,
-						sname:this.abbreviation,
-						provinceID:this.addressData.provinceID,
-						cityID:this.addressData.cityID,
-						townID:this.addressData.townID,
-						address:this.addressData.addressDetail,
-						socialCreditCode:this.socialCreditCode,
-						businessLicenseImage:this.uploadBusinessImage,
-						headpic:this.uploadMentuzImage,
-						firstClubType:this.isOrganizationType, //机构类型分类 医美:0和生美:1
-						secondClubType:this.secondClubType,	//机构类型二级分类 诊所:1,门诊:2,医院:3
-						department:this.department,			//科室
-						medicalPracticeLicenseImg:this.uploadMedicalImage,//资质图片
-						isAgreed:this.isAgreed,				//是否勾选协议	
-						mainpro:this.mainpro,
-						userID:this.userID
-					}
-				}else{
-					if( this.clubContact == ''){
-						this.$util.msg('请输入联系人姓名',2000);
-						return
-					}
-					if( this.registerMobile == ''){
-						this.$util.msg('请输入联系人手机号',2000);
-						return
-					}
-					if(!this.$reg.isMobile(this.registerMobile)){
-						this.$util.msg('手机格式不正确',2000);
-						return
-					}	
-					if(this.isAgreed == 0){
-						this.$util.msg('请勾选同意协议',2000);
-						return
-					}
-					params ={
-						source:1,
-						linkMan1:this.clubContact,
-						bindMobile:this.registerMobile,
-						isAgreed:this.isAgreed,				//是否勾选协议	
-						userID:this.userID
-					}
-				}
-				this.SellerService.SellerClubRegister(params).then(response =>{
-					this.$util.msg('注册成功,已短息通知联系人',2000);
-					setTimeout(()=>{
-						uni.navigateBack({
-							delta: 1
-						});
-					},2000)
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000);
-				})
-			},
-			showMulLinkageThreePicker() {//三级地址联动
-				this.isShowInput = true
-				this.$refs.mpvueCityPicker.show()
-			},
-			onConfirm(e) {//获取选择的地址信息
-				console.log('地址',e);
-				this.addressData.address = e.name;
-				this.addressData.townID = e.townCode;
-				this.addressData.cityID = e.cityCode;
-				this.addressData.provinceID = e.provinceCode;
-			},	
-			onTextareaInput(e){//地址详细信息
-			   this.addressData.addressDetail = e.detail.value;
-			},
-			showTextareaFocus(){//文本框获取焦点
-				this.isShowInput = false
-				this.textareaFocus = true
-			},
-			hideTextareaFocus(){//文本框失去焦点
-				this.isShowInput = true
-				this.textareaFocus = false
-			},
-			onTextareaInputInfo(e){//公司简介
-			   this.companyPprofile = e.detail.value;
-			},
-			chooseBusinessImage() {//营业执照图片上传
-				uploadFileImage().then(res =>{
-					this.uploadBusinessImage = JSON.parse(res.data).data
-				})
-			},
-			chooseMentuzImage() {//门头照图片上传
-				uploadFileImage().then(res =>{
-					this.uploadMentuzImage = JSON.parse(res.data).data
-				})
-			},
-			chooseMedicalImage() {//资质照图片上传
-				uploadFileImage().then(res =>{
-					this.uploadMedicalImage = JSON.parse(res.data).data
-				})
-			},
-			viewBusinessImage(e) {//预览营业执照图片
-				this.myPreviewImageFn(this.uploadBusinessImage)
-			},
-			viewMentuzImage(e) {//预览门头照图片
-				this.myPreviewImageFn(this.uploadMentuzImage)
-			},
-			viewMedicalImage(e) {//预览资质照图片
-				this.myPreviewImageFn(this.uploadMedicalImage)
-			},
-			myPreviewImageFn(url){//预览图片公共方法
-				this.isPreviewImage = true
-				let mentuzArray = []
-				mentuzArray.push(url)
-				uni.previewImage({
-					urls: mentuzArray,
-					current: 0
-				});
-			},
-			delBusinessImage(){//删除营业执照图片
-				this.$util.modal('','确定删除营业执照图片吗？','确定','取消',true,() =>{
-					 this.uploadBusinessImage = ''
-				})
-			},
-			delMentuzImage(){//删除门头照图片
-				this.$util.modal('','确定删除门头照图片吗？','确定','取消',true,() =>{
-					this.uploadMentuzImage = ''
-				})
-			},			
-			delMedicalImage(){//删除资质图片
-				this.$util.modal('','确定删除资质图片吗？','确定','取消',true,() =>{
-					this.uploadMedicalImage = ''
-				})
-			},
-			bindPickerChange() {//机构类型选择
-				let self = this
-				uni.showActionSheet({
-					title:'标题',
-					itemList: ['医美', '生美'],
-					success: (e) => {
-						self.isOrganizationType = e.tapIndex+1
-						switch(e.tapIndex){
-							case 0:
-								this.organizationTypeText = '医美'
-								break;
-							case 1:
-								this.organizationTypeText = '生美'
-								break;
-						}
-					}
-				})
-			
-			},
-			bindPickerChange2(e) {
-				this.typtIndex = e.target.value
-				this.isOrganizationType = e.target.value
-			},
-			radioChange(e) {
-				this.secondClubType = e.target.value;
-				if( this.secondClubType == '2' || this.secondClubType == '3'){
-					this.isDepartment = true
-				}else{
-					this.isDepartment = false
-				}
-				for (let i = 0; i < this.beautyList.length; i++) {
-					if (this.beautyList[i].value === this.secondClubType) {
-						this.current = i;
-						break;
-					}
-				}
-			},
-			chooseMaleLike(e){
-				this.mainpro = this.checkLikes(e,this.mentuzCampList)
-			},
-			chooseMaleLikes(e){
-				this.mainpro = this.checkLikes(e,this.medicaCampList)
-			},
-			checkLikes(e,list){
-				let	values = e.detail.value
-				let arr = []
-				list.forEach(item => {
-					if(values.indexOf(item.value) >= 0){
-						this.$set(item,'checked',true)
-						arr.push(item.name)
-					}else{
-						this.$set(item,'checked',false)
-					}
-				})
-				return arr.join('/')
-			},
-			agreeCheck() {
-				this.isCheck = !this.isCheck
-				if(this.isCheck){
-					this.isAgreed = 1
-				}else{
-					this.isAgreed = 0
-				}
-			},
-			onBlurInput(e){//
-				if(e.detail.value ===''){
-					this.isDisabled = true
-				}else{
-					this.isDisabled = false
-				}
-			},
-			showAustomItem() {
-				this.isShowAustomItem = !this.isShowAustomItem
-			},
-			addCustomItem(){
-				if(this.isOrganizationType == 1){
-					let item = {value:`${this.mentuzCampList.length+1}`,name:this.customItemValue}
-					this.mentuzCampList.push(item)
-				}else{
-					let item = {value:`${this.medicaCampList.length+1}`,name:this.customItemValue}
-					this.medicaCampList.push(item)
-				}
-			},
-			showUpgrade(){
-				this.isUpgrade = true
-				this.isDownUpgrade = false
-				this.registerBtnText = '提交审核'
-			},
-			hideUpgrade(){
-				this.$util.modal('提示','收起后，您填写的升级信息将会被清空确定收起吗？','确定','取消',true,() =>{
-					this.isUpgrade = false
-					this.isDownUpgrade = true
-					this.registerBtnText = '确定'
-				})
-			}
-		},
-		onShow() {
-			if(this.isPreviewImage){
-				this.isPreviewImage = false
-				return
-			}
-			this.$api.getStorage().then((resolve) =>{
-				this.userID = resolve.userID
-			})
-		}
-	}
-</script>
-
-<style lang="scss">
-	.register{
-		width: 100%;
-		height: auto;
-		padding-top: 50rpx;
-		.model-warp.none{
-			display: none;			
-		}
-		.model-warp.show{
-			display: block;
-		}
-		.register-tab{
-			width: 570rpx;
-			height: 60rpx;
-			padding: 60rpx 90rpx;
-			position: relative;
-			.nav-item{
-				width: 142rpx;
-				background: #FFFFFF;
-				line-height: 60rpx;
-				border-radius: 30rpx;
-				text-align: center;
-				color: #999999;
-				font-size:$font-size-26;
-				float: left;
-				margin-right: 72rpx;
-				position: relative;
-				.line{
-					height: 3rpx;
-					width: 50rpx;
-					background: #999999;
-					position: absolute;
-					right: -58rpx;
-					top: 32rpx;
-				}
-				&:last-child{
-					margin-right: 0;
-				}
-				&.current{
-					color:#FFFFFF;
-					background: $btn-confirm;
-					
-				}
-			}
-		}
-		.register-main{
-			width: 100%;
-			height: auto;
-			&.detailed{
-				padding-bottom: 330rpx;
-			}
-			&.first{
-				padding-top: 40rpx;
-			}
-			.register-tips{
-				display: flex;
-				flex-direction: column;
-				align-items: center;
-				line-height: 44rpx;
-				font-size: $font-size-24;
-				color: #FF0000;
-				margin-bottom: 40rpx;
-				.iconfont{
-					font-size: $font-size-24;
-				}
-			}
-			.register-row{
-				width: 702rpx;
-				height: auto;
-				padding: 0 24rpx;
-				margin-bottom: 20rpx;
-				.register-title{
-					font-size: $font-size-32;
-					color: $text-color;
-					text{
-						font-size: $font-size-24;
-					}
-				}
-				.register-txt{
-					line-height: 44rpx;
-					font-size: $font-size-26;
-					color: $text-color;
-					text-align: left;
-					&.first{
-						margin-top: 20rpx;
-					}
-				}
-				.register-bet{
-					width: 100%;
-					display: flex;
-					line-height: 60rpx;
-					height: 60rpx;
-					align-items: center;
-					flex-direction: column;
-					font-size: $font-size-28;
-					color: $color-system;
-					margin-top: 40rpx;
-					text{
-						margin: 0 5rpx;
-					}
-				}
-				.register-text{
-					line-height: 44rpx;
-					margin-top: 100rpx;
-					font-size: $font-size-24;
-					color: #999999;
-					text-align: justify;
-					.txt{
-						margin-right: 15rpx;
-					}
-				}
-				.register-from{
-					width: 654rpx;
-					height: 40rpx;
-					padding: 24rpx;
-					background: $sub-bg-color;
-					border-radius: 14rpx;
-					position: relative;
-					.label{
-						text-align: left;
-						font-size: $font-size-28;
-						color: $text-color;
-						line-height: 40rpx;
-						float: left;
-					}
-					.row-input{
-						width: 440rpx;
-						padding-left:10rpx;
-						font-size: $font-size-28;
-						color: $text-color;
-						line-height: 40rpx;
-						float: left;
-						height: 40rpx;
-						&.none{
-							color: #999999;
-						}
-						&.picker{
-							text-align: left;
-							color: #999999;
-						}
-						&.keshi{
-							width: 550rpx;
-						}
-					}
-					&.code{
-						width: 454rpx;
-						float: left;
-						margin-right: 20rpx;
-						.row-input{
-							width: 380rpx;
-							&.phone{
-								width: 340rpx;
-							}
-						}
-					}
-					&.btn{
-						width: 180rpx;
-						height: 88rpx;
-						float: left;
-						background: $btn-confirm;
-						padding: 0;
-						.row-input{
-							width: 180rpx;
-							height: 88rpx;
-							line-height: 88rpx;
-							padding: 0;
-							color: #FFFFFF;
-							background: $btn-confirm;
-							text-align: center;
-							border-radius: 14rpx;
-							&.other{
-								width: 180rpx;
-								background: #F7F7F7;
-								margin-right: 20rpx;
-							}
-							&.none{
-								background: #F7F7F7;
-							}
-						}
-						&.disabled{
-							background: #F7F7F7;
-							.row-input{
-								background: #F7F7F7;
-								color: #999999;
-							}
-						}
-					}
-					&.picker{
-						padding: 0 24rpx;
-						width: 654rpx;
-						height: 88rpx;
-						line-height: 88rpx;
-						.label{
-							line-height: 88rpx;
-						}
-						.row-input{
-							width: 470rpx;
-							height: 88rpx;
-							line-height: 88rpx;
-							padding-left: 30rpx;
-						}
-					}
-					&.radio{
-						padding: 0 24rpx;
-						width: 654rpx;
-						height: 288rpx;
-						.row-input{
-							width: 100%;
-							height: 88rpx;
-							line-height: 88rpx;
-							padding-left: 0;
-						}
-						.row-radio{
-							float: left;
-							transform: scale(0.8);
-						}
-						.row-text{
-							width: 100rpx;
-							text-align: center;
-							float: left;
-						}
-					}
-					&.group{
-						padding: 0 24rpx;
-						width: 654rpx;
-						height: auto;
-						background: #FFFFFF;
-						margin-top: 30rpx;
-						.label{
-							line-height: 76rpx;
-						}
-						.row-input{
-							width: 100%;
-							height: 88rpx;
-							line-height: 88rpx;
-							padding-left: 0;
-						}
-						.row-radio{
-							float: left;
-						}
-						.row-text{
-							width: 100rpx;
-							text-align: center;
-							float: left;
-						}
-					}
-					&.btn{
-						margin-top: 0;
-					}
-					.content-class {
-						margin: 20rpx auto;
-						display: flex;
-						flex-flow: row wrap;
-						justify-content: space-between;
-						align-items: center;
-						&.btn{
-							margin: 0 auto;
-							margin-left: 116rpx;
-						}
-						.row-input{
-							display: flex;
-							width: 220rpx;
-							height: 40rpx;
-							padding: 24rpx;
-							text-align: left;
-							border-radius: 10rpx;
-							font-size: $font-size-28;
-							color: $text-color;
-						}
-						.confirm-btn{
-							width: 200rpx;
-							height: 88rpx;
-							border-radius: 10rpx;
-							line-height: 88rpx;
-							text-align: center;
-							&.other{
-								width: 213rpx;
-							}
-							&.none{
-								color: #FFFFFF;
-								background: $btn-confirm;
-							}
-							&.disabled{
-								color: #999999;
-							}
-						}
-						.item {
-						  width: 155rpx;
-						  height: 60rpx;
-						  font-size:$font-size-28;
-						  line-height: 60rpx;
-						  border-radius:10rpx;
-						  margin: 10rpx;
-						  text-align: center;
-						  box-sizing: border-box;
-						  border: 1rpx solid #EFEFEF;
-						  float: left;
-						  checkbox {
-							display: none;
-						  }
-						}
-						.on {
-						  border-color: $color-system;
-						  color:$color-system;
-						}
-					}
-				}
-				.icon-xiayibu{
-					width: 88rpx;
-					height: 88rpx;
-					position: absolute;
-					right: 0;
-					top: 0;
-					line-height: 88rpx;
-					text-align: center;
-				}
-				&.text-textarea{
-					background: #FFFFFF;
-					.textarea{
-						width: 654rpx;
-						height: 180rpx;
-						background: #F7F7F7;
-						padding: 24rpx;
-						font-size: $font-size-28;
-						color: $text-color;
-						z-index: 1;
-						border-radius: 14rpx;
-					}
-					.textarea.hide{
-						opacity: 0;
-					}
-					.textarea.show{
-						color: #999999;
-					}
-				}
-			}
-			.register-picture{
-				height: 102rpx;
-				margin: 30rpx 0;
-				width: 42%;
-				float: left;
-				&.zz{
-					width: 100%;
-				}
-				.label{
-					float: left;
-					font-size: $font-size-28;
-					color: $text-color;
-					line-height: 102rpx;
-					width: 150rpx;
-					text-align: right;
-					&.zz{
-						width: 230rpx;
-					}
-				}
-				.upload-picture{
-					float: left;
-					height: 100rpx;
-					.upload-none{
-						width: 100rpx;
-						height: 100rpx;
-						text-align: center;
-						line-height: 100rpx;
-						color: #999999;
-						border: 1px solid #999999;
-						border-radius: 10rpx;
-						margin: 0 20rpx;
-						.iconfont{
-							font-size: $font-size-28;
-						}
-					}
-					.upload-image{
-						width: 100rpx;
-						height: 100rpx;
-						border-radius: 10rpx;
-						margin: 0 20rpx;
-						position: relative;
-						image{
-							width: 100rpx;
-							height: 100rpx;
-							border-radius: 10rpx;
-						}
-						.upload-del{
-							width: 40rpx;
-							height: 40rpx;
-							position: absolute;
-							top: -20rpx;
-							right: -20rpx;
-							line-height: 40rpx;
-							text-align: center;
-							.iconfont{
-								font-size: $font-size-32;
-								color: #999999;
-							}
-						}
-					}
-				}
-			}
-			.register-input{
-				width: 654rpx;
-				height: 40rpx;
-				padding: 24rpx;
-				margin: 0 auto;
-				margin-bottom: 60rpx;
-				background: #F7F7F7;
-				border-radius: 14rpx;
-				.input{
-					width: 100%;
-					height: 100%;
-					background: #F7F7F7;
-					font-size: $font-size-28;
-					line-height: 40rpx;
-					color: #333333;
-					border-radius: 14rpx;
-				}
-			}
-			.register-fiexd{
-				width: 100%;
-				height: auto;
-				position: fixed;
-				bottom: 0;
-				left: 0;
-				z-index: 999;
-				background: #FFFFFF;
-				.register-bet{
-					width: 100%;
-					display: flex;
-					line-height: 60rpx;
-					height: 60rpx;
-					align-items: center;
-					flex-direction: column;
-					font-size: $font-size-28;
-					color: $color-system;
-					margin-top: 20rpx;
-					.icon-xiangxiajiantou{
-						transform:rotate(180deg);
-					}
-					text{
-						margin: 0 5rpx;
-					}
-				}
-				.register-agree{
-					display: flex;
-					flex-direction: column;
-					align-items: center;
-					margin: 32rpx 0;
-					.agree-text{
-						.checkbox{
-							float: left;
-							margin: 4rpx 6rpx 0 0;
-							color: #999999;
-							font-size: $font-size-32;
-							&.icon-gouxuan{
-								color: $color-system;
-							}
-						}
-						font-size: 20rpx;
-						line-height: 44rpx;
-						color: #999999;
-						text{
-							color:#0091FF;
-						}
-					}
-				}
-			}
-			.register-btn{
-				width: 702rpx;
-				height: 88rpx;
-				border-radius: 44rpx;
-				font-size: $font-size-28;
-				line-height: 88rpx;
-				color: #FFFFFF;
-				margin: 0 auto;
-				text-align: center;
-				background: $btn-confirm;
-				margin-top: 96rpx;
-				&.none{
-					background: #FFFFFF;
-					color: $text-color;
-					margin-top: 0;
-				}
-				&.sub{
-					margin-top: 0;
-				}
-			}
-		}
-	}
-</style>

seller/pages/order/create-order.vue

@@ -1,665 +0,0 @@
-<template>
-	<view class="container order clearfix" :style="{paddingBottom :isIphoneX ? '170rpx' : '134rpx'}">
-		<!-- 透明模态层 -->
-		<modal-layer v-if='modallayer'></modal-layer>
-		<!-- 地址选择 -->
-		<choice-address ref="choiceAddress" v-if="isAddress" :addressData="addressData"></choice-address>
-		<!-- 商品 -->
-		<seller-goodsList ref='goods' v-if="isRequest" :goodsData="goodsData" @handleGoodList="handChangeInputGoodsList"></seller-goodsList>
-		<!-- 发票信息 -->
-		<seller-invoice ref="invoice" 
-						v-if="isRequest && isDepositFlg" 
-						:invoiceDatas="invoiceData" 
-						@handleChoiceaInvoice="handleChoiceaInvoiceData">
-		</seller-invoice>
-		<!-- 运费 -->
-		<seller-freight ref="freight" 
-						v-if="isFreight && isDepositFlg" 
-						:freightDatas="freightData" 
-						@handleChoiceaFreight="handleChoiceaFreightData" 
-						@showFreightAlert="handFreightAlertShow">
-		</seller-freight>
-		<freight-alert v-if="isfreightTip" ref="csPhone"></freight-alert>
-		<!-- 余额抵扣 -->
-		<view class="invoice-balance" v-if="!rechargeGoods">
-			<view class="balabce-t">
-				<view class="balabce-t-le">余额抵扣</view>
-				<view class="balabce-t-ri">
-					<view class="money">
-						<text>可用余额：</text>
-						<text>￥{{ userMoney | NumFormat }}</text>
-					</view>
-					<view class="checkbox-box">
-						<button class="checkbox iconfont" 
-								hover-class="btn-hover"
-								v-if="userMoney!=0"
-								@click.stop="checkedBalabce"
-								:class="[ischecked ?'icon-gouxuanl':'icon-weigouxuan']"
-						>
-						</button>
-					</view>
-				</view>
-			</view>
-			<view class="balabce-b" :class="{'balabce-b--hide':!ischecked}">	
-				<view class="balabce-b-text animation" :style="{'transform':ischecked?'translateY(0)':'translateY(-50%)','-webkit-transform':ischecked?'translateY(0)':'translateY(-50%)'}">
-					<text>当前使用：￥{{deductMoney | NumFormat}}，剩余：￥{{ surplusMoney | NumFormat }}</text>
-				</view>
-			</view>
-		</view>
-		<!-- 售后条例 -->
-		<seller-regulations  ref="regulations"
-							 v-if="isRequest && isDepositFlg&&seconDepositFlg" 
-							:regulaDatas="regulationsData" 
-							@handleData="claData">
-		</seller-regulations>
-		<regula-alert v-if="isregulaTip" ref="csPhone"></regula-alert>
-		<!-- 返佣订单 -->
-		<view class="Rebate" @click="RebateChang" v-if="goodsData.length==1 && secondflag && isDepositFlg">
-			<text class="rebate-title">返佣订单</text>
-			<text class="iconfont" :class="rebatecheck?'icon-yixuanze':'icon-weixuanze'" ></text>
-		</view>
-		<!-- 底部 -->
-		<view class="footer" :style="{paddingBottom :isIphoneX ? '68rpx' : '0rpx'}">
-			<view class="footer-le">
-				<view class="footer-count">
-					<text>共{{allCount}}件商品</text>
-				</view>
-				<view class="footer-price">
-					<view class="sum-none" v-if="reducedPrice > 0">
-						<text class="money-sign">￥</text>
-						<text class="money">{{ totalOriginalPrice | NumFormat }}</text>
-						<text class="money-reduced">减<text>￥{{ reducedPrice | NumFormat}}</text></text>
-					</view>
-					<view class="sum" :class="reducedPrice == 0 ? 'none' : ''">总价:<text class="price">￥{{payAllPrice | NumFormat}}</text></view>
-				</view>
-			</view>
-			<view class="footer-submit" @click.stop="orderSubmitMit">
-				<view class="btn">提交订单</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import choiceAddress from '@/components/cm-module/creatOrder/sellerAddress'  
-	import sellerGoodsList from '@/components/cm-module/creatOrder/sellerGoodsList'
-	import sellerInvoice from '@/components/cm-module/creatOrder/sellerInvoice'
-	import sellerFreight from '@/components/cm-module/creatOrder/sellerFreight'
-	import freightAlert from '@/components/cm-module/modelAlert/freightAlert.vue'
-	import sellerRegulations from '@/components/cm-module/creatOrder/sellerRegulations.vue'
-	import modalLayer from "@/components/modal-layer"
-	export default {
-		components:{
-			choiceAddress,
-			sellerGoodsList,
-			sellerInvoice,
-			sellerFreight,
-			freightAlert,
-			modalLayer,
-			sellerRegulations
-		},
-		data() {
-			return {
-				modallayer:false,
-				orderID:0,
-				clubID:'',
-				productIds:'',			  //获取上一级页面商品信息
-				productCount:'',		  //获取上一级页面商品数量
-				classifyIDS:'',			  //获取上一级页面商品分类
-				serviceProviderId:'',	  //协销ID
-				cartType:3,			  	  //购买类型（1购物车提交，2直接购买提交,3协销下单）
-				submitState:'',  		  //提交状态
-				balanceDeductionFlag:2,   //勾选余额的状态(1使用，2不使用)
-				allCount:1,				  //订单提交总数量
-				totalOriginalPrice:0,	  //订单总原价(划线部分)
-				reducedPrice:0,			  //满减金额
-				payAllPrice:0.00,		  //订单提交总金额
-				allPrice:0.00,			  //订单总金额
-				surplusMoney:0.00,		  //显示勾选后的剩余抵扣
-				userMoney:0.00,			  //显示可使用余额
-				deductMoney:0.00,		  //显示已使用的余额
-				addressID:'',			  //地址ID
-				townID:'',				  //区ID
-				isRequest:false,		  //是否加载完成渲染子组件
-				isFreight:false,		  //是否加载完成渲染子组件
-				isAddress:false,		  //是否加载完成地址
-				isfreightTip:false,		  //控制邮费弹窗
-				ischecked:false,	      //是否勾选余额
-				addressData:{},			  //初始化地址信息
-				goodsData:[],			  //初始化商品信息
-				invoiceData:{type:0},	  //初始化发票信息
-				freightData:{},			  //邮费数据
-				orderInfo:[],			  //提交的商品信息
-				payInfo:{},				  //订单信息
-				rechargeGoods:false,
-				isDepositFlg:true,
-				depositIds : [6060,6061,6062,6063,6064,6065,6066,6067,6068,6069],//定金&充值余额商品ID
-				isIphoneX:this.$store.state.isIphoneX,
-				regulationsData:[],
-				clauseId:0,
-				seconDepositFlg:true,
-				rebateFlag:0,
-				rebatecheck:false,
-				productsList:[],
-				secondflag:true
-			}
-		},
-		onLoad(option){//商品数据
-			let data = JSON.parse(option.data);
-			this.allPrice = data.data.allPrice;
-			this.allCount = data.data.allCount;
-			this.payAllPrice = this.allPrice;
-			this.clubId = data.data.clubId
-			this.productCount = data.data.productCount
-			this.productIds = data.data.productID
-			if(option.type =='prodcut'){
-				this.getInitProdcutCrearOrder();
-			}else{
-				this.getInitCrearOrder();
-			}
-			
-			this.$api.getComStorage('orderUserInfo').then((resolve) =>{
-				this.clubUserId = resolve.userID
-			})
-		},
-		filters:{
-			NumFormat(value) {//处理金额
-				return Number(value).toFixed(2);
-			},
-		},
-		methods: {
-			RebateChang(){
-				this.rebatecheck = !this.rebatecheck;
-				if(this.rebatecheck){
-					this.rebateFlag=1;
-				}else{
-					this.rebateFlag=0;
-				}
-				console.log(this.rebateFlag)
-			},
-			getInitProdcutCrearOrder(option){//二手下单初始化查询
-				this.$api.getStorage().then((resolve) =>{
-					this.seconDepositFlg = false;
-					this.serviceProviderId = resolve.serviceProviderID
-					let params ={clubId:this.clubId,serviceProviderId:this.serviceProviderId,productCount:this.productCount,productId:this.productIds}
-					this.SellerService.GetSettlementBySencondProduct(params).then(response =>{
-						let resData = response.data
-						this.isRequest = true
-						this.goodsData = resData.shopList
-						this.userMoney = resData.userMoney
-						this.secondflag = false
-					}).catch(error =>{
-						this.$util.msg(error.msg,2000)
-					})
-				})
-			},
-			getInitCrearOrder(option){//协销购物车跳转确认订单初始化信息
-				this.$api.getStorage().then((resolve) =>{
-					this.serviceProviderId = resolve.serviceProviderID
-					let params ={clubId:this.clubId,serviceProviderId:this.serviceProviderId,count:this.productCount,productIds:this.productIds}
-					this.SellerService.SellerSettlement(params).then(response =>{
-						let data = response.data
-						let productIds = []
-						this.isRequest = true
-						this.goodsData = data.shopList
-						this.userMoney = data.userMoney
-						this.reducedPrice = data.reducedPrice
-						this.totalOriginalPrice = data.reducedPrice + data.totalAmount
-						this.rechargeGoods = data.rechargeGoods
-						this.allPrice = this.payAllPrice = data.totalAmount
-						this.regulationsData = data.clauseList
-						this.goodsData.forEach(item =>{
-							this.productsList = item.productsList
-							item.productsList.forEach(pros =>{
-								if(this.depositIds.indexOf(pros.productID)>=0){
-									this.isDepositFlg = false
-								}
-							})
-						})
-						console.log(this.isDepositFlg)
-					}).catch(error =>{
-						this.$util.msg(error.msg,2000)
-					})
-				})
-			},
-			getFreightData(){//获取邮费信息
-				this.$api.getComStorage('orderUserInfo').then((resolve) =>{
-					let params ={
-							userId:resolve.userID,
-							productIds:this.productIds,
-							totalPrice:this.allPrice,
-							townId:this.addressData.townID
-						}
-					this.OrderService.GetOrderPostage(params).then(response =>{
-						this.isFreight = true
-						this.freightData = response.data
-						if(response.data.freePostFlag== 1){
-							this.payAllPrice = this.allPrice+response.data.freight
-						}else{
-							this.payAllPrice = this.allPrice
-						}
-					})
-				})
-			},
-			getAddressData(){//获取地址信息
-				this.$api.getComStorage('orderUserInfo').then((resolve) =>{
-					this.UserService.QueryAddressList({pageNum:1,pageSize:1,userID:resolve.userID}).then(response =>{
-						this.isAddress = true
-						this.addressData = {}
-						if(response.data.results != ''){
-							this.addressID = response.data.results[0].addressID;
-							this.townID = response.data.results[0].townID;
-							this.addressData = response.data.results[0];
-							this.getFreightData()
-						}else{
-							this.addressData = this.addressData;
-						}
-					})
-				})
-			},
-			handChangeInputGoodsList(data){//对应供应商的留言信息
-				this.goodsData = data;
-			},
-			handleChoiceaInvoiceData(data){//获取发票信息
-				this.invoiceData = data
-			},
-			handleChoiceaFreightData(data){//获取运费信息
-				if(data.freePostFlag == '1'){
-					this.freightData = data
-					this.payAllPrice = this.allPrice+parseInt(data.freight)
-					this.attributePallPrice()
-				}else{
-					this.freightData = data
-					this.payAllPrice = this.allPrice
-					this.attributePallPrice()
-				}
-			},
-			claData(id){
-				this.clauseId = id;
-			},
-			checkedBalabce(){//勾选使用余额
-				if(this.userMoney > 0){
-					this.ischecked = !this.ischecked
-					if(this.ischecked){
-						this.balanceDeductionFlag =1
-						this.attributePallPrice()
-					}else{
-						this.balanceDeductionFlag = 2
-						if(this.freightData.freePostFlag == 1 || this.freightData.freePostFlag == '1'){
-							this.payAllPrice = this.allPrice+parseInt(this.freightData.freight)
-						}else{
-							this.payAllPrice = this.allPrice
-						}
-					}
-				}else{
-					return
-				}
-			},	
-			attributePallPrice(){//计算价格
-				if(this.freightData.freePostFlag == 1 || this.freightData.freePostFlag == '1'){
-					this.attributeHashfreight(this.freightData.freight)
-				}else{
-					this.attributeNofreight()
-				}
-			},
-			attributeNofreight(){//计算没有邮费的支付价格
-				if(this.ischecked){
-					if(this.userMoney>this.payAllPrice){
-						this.payAllPrice = 0.00
-						this.deductMoney = this.allPrice							//勾选后使用抵余额
-						this.surplusMoney = this.userMoney - this.deductMoney	    //勾选后的剩余抵扣
-					}else{
-						this.payAllPrice = this.allPrice - this.userMoney       	//勾选后的总价
-						this.deductMoney = this.userMoney				            //勾选后使用抵余额
-						this.surplusMoney = this.userMoney - this.deductMoney	    //勾选后的剩余抵扣
-					}
-				}else{
-					this.payAllPrice = this.allPrice;
-					this.deductMoney = 0.00;
-					this.surplusMoney = this.userMoney;
-				}
-			},
-			attributeHashfreight(freight){//计算需要邮费的支付价格
-				this.payAllPrice = this.allPrice+parseInt(freight)//计算不包邮的价格 总价等于商品价格+邮费
-				if(this.ischecked){
-					if(this.userMoney>this.payAllPrice){							//余额大于支付金额
-						this.payAllPrice =0.00
-						this.deductMoney = this.allPrice+parseInt(freight)			//勾选后使用抵余额
-						this.surplusMoney = this.userMoney - this.deductMoney	    //勾选后的剩余抵扣
-					}else{
-						this.payAllPrice = this.allPrice+parseInt(freight) - this.userMoney       	//勾选后的总价
-						this.deductMoney = this.userMoney				            //勾选后使用抵余额
-						this.surplusMoney = this.userMoney - this.deductMoney	    //勾选后的剩余抵扣
-					}
-				}else{
-					this.payAllPrice = this.allPrice+parseInt(freight)
-					this.deductMoney = 0.00
-					this.surplusMoney = this.userMoney
-				}
-			},
-			orderSubmitMit(){//提交订单
-				if(this.addressID == ''){
-					this.$util.msg('请先添加收货地址～',2000)
-					return
-				}
-				// 处理商品信息及留言
-				this.orderInfo = this.goodsData.map(el => {
-					let productInfo = [];
-					el.productsList.forEach(item => {
-						productInfo.push({
-							productId:item.productID,
-							productNum:item.productCount,
-							productType:item.giftType ? Number(item.giftType) : 0,
-							presentNum:0,
-						})
-					})				
-					return {shopId:el.shopID,note:el.note?el.note:'',productInfo:productInfo}
-				})
-				//订单信息
-				this.payInfo = {
-						orderShouldPayFee:this.payAllPrice.toFixed(2),//提交的总价
-						balancePayFlag:this.balanceDeductionFlag,//余额抵扣的状态
-						freight:parseInt(this.freightData.freight).toFixed(2),//邮费
-						freePostFlag:parseInt(this.freightData.freePostFlag),//运费形式
-						clauseId:this.clauseId,//售后条款
-						rebateFlag:this.rebateFlag,//返佣
-					}
-					console.log(this.payInfo)
-				let params = {
-						orderSource:6,				  //提交来源
-						clubUserId:this.clubUserId,   //机构UserID
-						cartType:this.cartType,		  //从购物车提交
-						serviceProviderId:this.serviceProviderId,//帮下单协销ID
-						addressId:this.addressID,	  //地址ID
-						orderInfo:this.orderInfo,	  //商品信息
-						payInfo:this.payInfo,		  //订单信息
-						orderInvoice:this.invoiceData //发票信息
-					}
-				this.modalLayer = true;	
-				if(this.rebateFlag == 1){
-					this.$util.modal('','确定该订单为返佣订单吗？点击确定按钮继续提交订单','确定','取消',true,() =>{
-						this.SellerService.SellerCreateOrderSubmit({'params':JSON.stringify(params)}).then(response =>{
-							const data = response.data;
-							if(data.code === '1'){
-								this.$util.msg('支付成功',2000,true,'success')
-								setTimeout(() =>{
-									this.$api.redirectTo(`/seller/pages/order/order-details?type=cash&orderID=${data.orderID}`)
-								},2000)
-							}else{
-								this.$util.msg('订单提交成功',2000,true,'success')
-								setTimeout(()=>{
-									this.$api.redirectTo(`/seller/pages/order/order-details?type=cash&orderID=${data.orderID}`)
-								},2000)
-							}
-						}).catch(error =>{
-							this.$util.msg(error.msg,2000);
-						})
-					})
-					return
-				}else{
-					this.SellerService.SellerCreateOrderSubmit({'params':JSON.stringify(params)}).then(response =>{
-						const data = response.data;
-						if(data.code === '1'){
-							this.$util.msg('支付成功',2000,true,'success')
-							setTimeout(() =>{
-								this.$api.redirectTo(`/seller/pages/order/order-details?type=cash&orderID=${data.orderID}`)
-							},2000)
-						}else{
-							this.$util.msg('订单提交成功',2000,true,'success')
-							setTimeout(()=>{
-								this.$api.redirectTo(`/seller/pages/order/order-details?type=cash&orderID=${data.orderID}`)
-							},2000)
-						}
-					}).catch(error =>{
-						this.$util.msg(error.msg,2000);
-					})
-				}
-			},
-			handFreightAlertShow(){//显示邮费弹窗
-				this.isfreightTip = true;
-			},
-			hideFreight(){//关闭邮费弹窗
-				this.isfreightTip = false;
-			},
-		},
-		onShow() {
-			// this.addressID = ''		
-			let pages = getCurrentPages();
-			let currPage = pages[pages.length-1];
-			if(currPage.data.select =='select'){
-				this.isAddress = true
-				let SelectData = uni.getStorageSync('selectAddress');
-				this.addressID = SelectData.addressID;
-				this.addressData = SelectData
-				this.getFreightData()
-			}else{
-				this.getAddressData()
-			}
-		}
-	}
-</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-freight{
-		width: 702rpx;
-		padding: 0 24rpx;
-		height: 86rpx;
-		line-height: 86rpx;
-		font-size: $font-size-28;
-		color: $text-color;
-		background: #FFFFFF;
-		float: left;
-		font-weight: bold;
-		.freight-left{
-			float: left;
-			.icon-yunfeishuoming{
-				height: 100%;
-				padding: 0 15rpx;
-				color: $color-system;
-				font-weight: normal;
-			}
-		}
-		.freight-right{
-			float: right;
-			color: #2A81FF;
-		}
-	}
-	.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;
-						color: $color-system;
-						padding: 5rpx;
-					}
-				}	
-			}
-		}
-		.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;
-			}	
-		}
-	}
-	.footer{
-		position: fixed;
-		left: 0;
-		bottom: 0;
-		z-index: 995;
-		display: flex;
-		align-items: center;
-		width: 100%;
-		height: 110rpx;
-		line-height: 110rpx;
-		justify-content: space-between;
-		font-size: $font-size-28;
-		background-color: #FFFFFF;
-		z-index: 998;
-		color: $text-color;
-		.footer-le{
-			width:570rpx;
-			height:100%;
-			float: left;
-		}
-		.footer-count{
-			float: left;
-			padding-left: 24rpx;
-			width:190rpx;
-			box-sizing: border-box;
-			font-size: $font-size-26;
-		}
-		.footer-price{
-			width:370rpx;
-			float: right;
-			text-align: right;
-			color: $text-color;
-			padding: 10rpx 20rpx 10rpx 0;
-			box-sizing: border-box;
-			.sum-none{
-				width: 100%;
-				height: 45rpx;
-				line-height: 45rpx;
-				color: $text-color;
-				float: left;
-				text-align: right;
-				.money{
-					font-size: $font-size-26;
-					color: #999999;
-					text-decoration: line-through;
-				}
-				.money-sign{
-					font-size: $font-size-26;
-					color: #999999;
-					text-decoration: line-through;
-				}
-				.money-reduced{
-					margin-left: 10rpx;
-					font-size: $font-size-26;
-					color:$color-system;
-				}
-			}
-			.sum{
-				width: 100%;
-				height: 45rpx;
-				line-height: 45rpx;
-				float: left;
-				&.none{
-					height: 90rpx;
-					line-height: 90rpx;
-				}
-				.price{
-					font-size: $font-size-32;
-					color: #FF2A2A;
-				}
-			}
-			
-		}
-		.footer-submit{
-			display:flex;
-			align-items:center;
-			justify-content: center;
-			width: 180rpx;
-			height: 100%;
-			box-sizing: border-box;
-			padding: 15rpx 5rpx;
-			.btn{
-				width: 100%;
-				height: 100%;
-				color: #FFFFFF;
-				background:linear-gradient(135deg,rgba(242,143,49,1) 0%,rgba(225,86,22,1) 100%);
-				font-size: $font-size-26;
-				text-align: center;
-				line-height: 80rpx;
-				border-radius: 40rpx;
-			}
-		}
-	}
-	.Rebate{
-		width: 702rpx;
-		height: auto;
-		padding: 0 24rpx;
-		background: #FFFFFF;
-		float: left;
-		margin-bottom: 24rpx;
-		margin-bottom: 24rpx;
-		line-height: 86rpx;
-		.rebate-title{
-			float: left;
-			font-weight: bold;
-			color: #333333;
-			font-size: $font-size-28;
-		}
-		.iconfont{
-			float: right;
-			color: #b2b2b2;
-			font-size: 40rpx;
-			&.icon-yixuanze{
-				color: $color-system;
-			}
-		}
-	}
-	
-</style>

seller/pages/order/myOrder.vue

@@ -1,626 +0,0 @@
-<template>
-	<view class="container" :style="{paddingTop:navbarHeight+'px'}">
-		<!-- 自定义返回 -->
-		<header-back :systeminfo='systeminfo' :navbar-data='nvabarData' :headerBtnPosi ="headerBtnPosi" :isDelete="isDelete"></header-back>
-		<view class="container-order">
-			<view class="search-input">
-				<template>
-					<view class="gosearch-btn" @click="goSearch()">
-						<text class="iconfont icon-iconfonticonfontsousuo1"></text>
-						<text>美白/润肤</text>
-					</view>
-				</template>
-			</view>
-			<!--选项卡逻辑自己实现即可，此处未做处理-->
-			<tui-tabs :tabs="tabs" 
-					  :isFixed="scrollTop>=0" 
-					  :currentTab="currentTab" 
-					  selectedColor="$color-system" 
-					  sliderBgColor="$color-system"
-					  @change="change"
-					  :marginTop="navbarHeight">
-			</tui-tabs>
-			<view  :class="{'tui-order-list':scrollTop >= 0}" class="clearfix">
-				<!-- 空白页 -->
-				<empty v-if="isEmpty" :typeIndex="currentTab" :navbarHeight="navbarHeight"></empty>
-				<!-- 列表 -->
-				<view v-else class="tui-order-content">
-					<view  class="tui-order-item" v-for="(order,orderIndex) in orderData" :key="orderIndex" >
-						<view class="order-title">
-							<view class="order-title-t">
-								<view class="order-title-num">订单号：{{order.orderNo}}</view>
-								<view class="order-title-tip">{{orderStateExp(order.status)}}</view>
-							</view>
-							<view class="order-title-b">下单时间：{{order.orderTime}}</view>
-						</view>
-						<block v-for="(item,index) in order.shopOrderList" :key="index">
-							<view class="goods-title">
-								<view class="title-logo"><image :src="item.shopLogo" mode=""></image></view>
-								<view class="title-text">{{item.shopName}}</view>
-							</view>
-							<view class="goods-item" v-for="(pros,prosIndex) in item.cmOrderProducts" :key="prosIndex" @click.stop="detail(order.orderID)">
-								<view class="goods-pros-t">
-									<view class="pros-img"><image :src="pros.productImage" alt="" /></view>
-									<view class="pros-product">
-										<view class="producttitle">{{pros.name}}</view>
-										<view class="productspec">规格:{{pros.productUnit}}</view>
-										<view class="productprice">
-											<view class="price">
-												<text>￥{{pros.price}}</text>
-											</view>
-											<view class="count">
-												<text class="small">x</text>{{pros.num}}
-											</view>
-										</view>
-									</view>	
-								</view>
-							</view>	
-						</block>
-						<view class="order-footer">
-							<view class="order-footer-top" v-if="order.discountFee!=0">经理折扣：¥{{orderPriceToFixed(order.discountFee)}}</view>
-							<view class="order-footer-bot">
-								<view class="count">共{{order.productCount}}件商品</view>
-								<view class="money">合计：¥{{orderPriceToFixed(order.payableAmount)}}</view>
-							</view>
-						</view>
-						<!-- 底部button -->
-						<order-button ref="orderButton" 
-									  :status="order.status" 
-									  :orderID="order.orderID" 
-									  @buttonConfirm="handButtonConfirm">
-						</order-button>
-					</view>
-					<!--加载loadding-->
-					<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-					<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text='nomoreText'></tui-nomore>
-					<!--加载loadding-->
-				</view>
-			</view>
-		</view>
-		<!-- 分享弹窗 -->
-		<share-alert   v-if="isShareModal"
-					   :orderID="btnoRderID" 
-					   @shareConfirm ='onShareAppMessage'>
-		</share-alert>
-		<!-- 删除订单弹窗 -->
-		<model-alert v-if="isShowDelModal"
-					 :alertText='alertText'
-					 @btnConfirm ='handOrderDetele'>
-		</model-alert>
-		<!-- 取消订单弹窗 -->
-		<cancel-alert v-if="isCenceModal"
-					 :cenceAlertText='cenceAlertText'
-					 @cenceConfirm ='handCenceConfirm'>
-		</cancel-alert>
-		<!-- 透明模态层 -->
-		<modal-layer v-if='isModalLayer'></modal-layer>
-	</view>
-</template>
-
-<script>
-	import headerBack from '@/components/cm-module/headerNavbar/header-back' 		 	 //自定义导航
-	import tuiTabs from "@/components/tui-components/tui-tabs/tui-tabs"
-	import tuiLoadmore from "@/components/tui-components/loadmore/loadmore"
-	import tuiNomore from "@/components/tui-components/nomore/nomore"
-	import orderButton from '@/components/cm-module/orderDetails/orderListButton'		 //按钮
-	import modalLayer from "@/components/modal-layer"
-	import empty from "@/components/empty";
-	import shareAlert from '@/components/cm-module/modelAlert/shareAlert'			 //分享弹窗
-	import modelAlert from '@/components/cm-module/modelAlert/modelAlert'			 //删除弹窗
-	import cancelAlert from '@/components/cm-module/modelAlert/cancelAlert'		 //取消弹窗
-	export default {
-		components: {
-			empty,
-			tuiTabs,
-			tuiLoadmore,
-			tuiNomore,
-			orderButton,
-			modalLayer,
-			modelAlert,
-			shareAlert,
-			cancelAlert,
-			headerBack
-		},
-		data() {
-			return {
-				userID:0,
-				orderData: [],
-				btnoRderID: 0, //点击按钮传入的的订单ID
-				currentTab: 0,
-				pageNum: 1,	  //页数
-				pageSize: 10,  //条数
-				scrollTop: 0,
-				deteleType:'',
-				skeletonShow: true,
-				isEmpty: false,
-				isDelete:false,
-				isShareModal: false,//控制分享弹窗
-				isCenceModal: false,//控制取消订单弹窗
-				isShowDelModal: false,//控制删除订单弹窗
-				isModalLayer: false,
-				loadding: false,
-				pullUpOn: true,
-				hasNextPage: false,
-				pullFlag: true,
-				navbarHeight:'',
-				alertText: '确认删除订单吗？',
-				cenceAlertText: '确认取消该订单吗？',
-				nomoreText: '上拉显示更多',
-				tabs: [
-					{name: "全部"},
-					{name: "待付款"}, 
-					{name: "待发货"}, 
-					{name: "已发货"}, 
-					{name: "退货/款"},
-				],
-				headerBtnPosi:	this.setHeaderBtnPosi(), //获取设备顶部胶囊高度
-				systeminfo:  this.setSysteminfo(),		 //获取设备信息
-				nvabarData: {							 //顶部自定义导航
-					showCapsule: 1, // 是否显示左上角图标  1表示显示  0表示不显示
-					title: '我的订单', // 导航栏 中间的标题
-				}
-			}
-		},
-		onLoad(option) {
-			if(option.type ==='detele'){this.isDelete = true}
-			this.currentTab = option.state
-			this.getHeaderTopHeight()//设置自定义导航高度
-		},
-		methods: {
-			getOrderDatainit(index){
-				/**
-				 * @订单初始化加载  仅加载第一页码
-				 * @param：orderState(订单状态:0全部,1待付款,2待发货,3已发货,4退货款)
-				 * @param：userID(用户ID)
-				 * @param：index(页码数)
-				 * @param：pageSize(每页条数)
-				 * @param：organizeID(全局变量组织ID)
-				 */ 
-				// setTimeout(()=>{this.skeletonShow = false},1500)
-				this.$api.getStorage().then((resolve) =>{
-					this.userID = resolve.userID
-					let param = {orderState:index,userID:this.userID,index:1,pageSize:this.pageSize,organizeID:this.userOrganizeID}
-					this.$api.lodingGet('/order/myOrder',param,
-						response => {
-							if(response.code === '1'){
-								let resData = response.data.results
-								this.hasNextPage = response.data.hasNextPage;
-								if(resData && resData.length > 0){
-									this.isEmpty = false;
-									this.orderData = [...resData];
-								}else{
-									this.isEmpty = true
-								}
-								if(this.hasNextPage){
-									this.pullUpOn = false
-									this.nomoreText = '上拉显示更多'
-								}else{
-									if(this.orderData.length < 2){
-										this.pullUpOn = true
-									}else{
-										this.pullUpOn = false
-										this.nomoreText = '已至底部'
-									}
-								}
-							}else{
-								this.$util.msg(response.msg,2000);
-							}
-						}
-					)	
-				})	
-			}, 
-			getOnReachBottomData(index){//上拉加载
-				this.pageNum+=1
-				let param = {orderState:index,userID:this.userID,index:this.pageNum,pageSize:this.pageSize,organizeID:this.userOrganizeID}
-				this.$api.get('/order/myOrder',param,
-					response => {
-						if(response.code === '1'){
-							let resData = response.data.results
-							this.hasNextPage = response.data.hasNextPage;
-							this.orderData = this.orderData.concat(resData)
-							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 = '已至底部'
-							}
-						}else{
-							this.$util.msg(response.msg,2000);
-						}
-					}
-				)	
-			},
-			change(e) {//切换tab传递当前tab[index]执行初始化方法
-				this.currentTab = e.index
-				this.pageNum = 1
-				this.orderData = []
-				this.pullUpOn = true //切换时隐藏
-				this.loadding =  false //切换时隐藏
-				this.getOrderDatainit(this.currentTab)
-			},
-			detail(id) {//订单详情跳转
-				this.isModalLayer = true;	
-				this.$api.navigateTo(`/pages/user/order/order-details?state=${this.currentTab}&orderID=${id}`)
-			},
-			handButtonConfirm(data) {//获取点击
-				this.handShowAlert(data)
-				this.btnoRderID = data.orderId
-			},
-			handShowAlert(data) {//执行
-				switch(data.type){
-					case 'delete':
-						this.isShowDelModal = true;
-						break
-					case 'cancel':
-						this.isCenceModal = true;
-						break
-					case 'query':
-						this.isModalLayer = true;
-						this.$api.navigateTo('/pages/user/order/order-logistics?orderID='+data.orderId)
-						break
-					case 'confirm':
-						this.handOrderConfirm(data.orderId);
-						break
-				}
-			},
-			handOrderConfirm (id){//确认收货
-				this.$api.get('/order/affirm',{orderID:id},
-					response => {
-						if(response.code === '1'){
-							this.$util.msg(response.msg,2000,true,'success');
-							this.isShowDelModal = false
-							setTimeout(() => {
-								this.getOrderDatainit(this.currentTab)
-							},2000)
-						}else{
-							this.$util.msg(response.msg,2000);
-						}
-					}
-				)
-			},
-			handOrderDetele (){//删除订单
-				this.$api.get('/order/delete',{orderID:this.btnoRderID},
-					response => {
-						if(response.code === '1'){
-							this.$util.msg(response.msg,2000,true,'success');
-							this.isShowDelModal = false
-							setTimeout(() => {
-								this.orderData = [];
-								this.getOrderDatainit(this.currentTab)
-							},2000)
-						}else{
-							this.$util.msg(response.msg,2000);
-						}
-					}
-				)
-			},
-			handCenceConfirm (){//取消订单
-				this.$api.get('/order/cancel',{orderID:this.btnoRderID},
-					response => {
-						if(response.code === '1'){
-							this.$util.msg(response.msg,2000,true,'success');
-							this.isCenceModal = false
-							setTimeout(() => {
-								this.orderData = [];
-								this.getOrderDatainit(this.currentTab)
-							},2000)
-						}else{
-							this.$util.msg(response.msg,2000);
-						}
-					}
-				)
-			},
-			onShareAppMessage (res){//分享转发
-				this.isShareModal = false
-				if (res.from === 'button') {// 来自页面内转发按钮
-			    }
-				return {
-					title: '您有新的分享订单，快来查看吧~',
-					path: `/pages/user/order/order-sharelogin?orderID=${this.btnoRderID}&userID=${this.userID}`,
-					imageUrl:'https://static.caimei365.com/app/img/bg/min-banner.jpg'
-				}
-			},
-			//订单状态文字和颜色
-			orderStateExp (state){
-				let stateText = '',
-					stateTextObject={
-						4:'交易完成',
-						5:'订单完成',
-						6:'已关闭',
-						7:'交易全退',
-						77:'交易全退',
-						11:'待付款待发货',
-						12:'待付款部分发货',
-						13:'待付款已发货',
-						21:'部分付款待发货',
-						22:'部分付款部分发货',
-						23:'部分付款已发货',
-						31:'已付款待发货',
-						32:'已付款部分发货',
-						33:'已付款已发货',
-						111:'待付款待发货',
-					}
-				Object.keys(stateTextObject).forEach(key => {
-					if(key == state){
-						stateText = stateTextObject[key]
-					}
-				})
-				return stateText;
-			},
-			orderPriceToFixed (n){
-				let price ='';
-				price = n.toFixed(2);
-				return price
-			},
-			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
-			}
-		},
-		// onPullDownRefresh() {
-		// 	if(!this.isEmpty){
-		// 		setTimeout(() => {
-		// 			this.pageNum = 1,
-		// 			this.getOrderDatainit(this.currentTab)
-		// 			uni.stopPullDownRefresh()				
-		// 		}, 200);
-		// 	}
-		// },
-		onReachBottom() {//上滑加载更多
-			if(this.hasNextPage){
-				this.loadding = true
-				this.pullUpOn = true
-				this.getOnReachBottomData(this.currentTab);
-			}	
-		},
-		onPageScroll(e) {
-			this.scrollTop = e.scrollTop;
-		},
-		onShow() {
-			this.isModalLayer = false;	
-			this.getOrderDatainit(this.currentTab)
-		}
-	}
-</script>
-
-<style lang="scss">
-	page{
-		background: #F7F7F7;
-	}
-	.container {
-		padding-bottom: env(safe-area-inset-bottom);
-		height: auto;
-		position: relative;
-	}
-	.tui-order-content{
-		width: 100%;
-		height: auto;
-	}
-	.tui-order-list {
-		margin-top: 80rpx;
-		width: 100%;
-		position: relative;
-	}
-	.tui-order-item {
-		display: flex;
-		flex-direction: column;
-		width: 702rpx;
-		padding:20rpx 24rpx 0 24rpx;
-		background: #fff;
-		border-bottom: 20rpx solid #F7F7F7;
-	}
-	.search-input{
-		width: 100%;
-		height: 80rpx;
-		margin-bottom: 20rpx;
-		.gosearch-btn{
-			/* #ifndef APP-NVUE */
-			display: flex;
-			/* #endif */
-			flex: 1;
-			flex-direction: row;
-			justify-content: center;
-			align-items: center;
-			width: 662rpx;
-			height: 100%;
-			border-radius: 40rpx;
-			background: #F7F7F7;
-			margin: 0 auto;
-			padding:0 20rpx;
-			font-size: 28rpx;
-			line-height: 80rpx;
-			color: #8A8A8A;
-			.icon-iconfonticonfontsousuo1{
-				margin:0 6rpx;
-				font-size: 34rpx;
-				color: #F29857;
-				z-index: 10;
-			}
-		}
-	}
-	.order-title{
-		width: 100%;
-		height: auto;
-		.order-title-t{
-			width: 100%;
-			height: 40rpx;
-			float: left;
-			font-size: $font-size-28;
-			line-height: 40rpx;
-			font-weight: bold;
-			.order-title-num{
-				float: left;
-				text-align: left;
-				color: $color-system;
-			}
-			.order-title-tip{
-				float: right;
-				text-align: right;
-				color: #FF2A2A;
-			}
-		}
-		.order-title-b{
-			width: 100%;
-			height: 40rpx;
-			float: left;
-			margin-top: 8rpx;
-			font-size: $font-size-28;
-			line-height: 40rpx;
-			color: #999999;
-			text-align: left;
-		}
-	}
-	.goods-title{
-		width: 100%;
-		height: 48rpx;
-		float: left;
-		margin-top: 24rpx;
-		.title-logo{
-			width: 48rpx;
-			height: 48rpx;
-			float: left;
-			image{
-				width: 48rpx;
-				height: 48rpx;
-			}
-		}
-		.title-text{
-			float: left;
-			margin-left: 16rpx;
-			font-size: $font-size-28;
-			color: $text-color;
-			text-align: left;
-			line-height: 48rpx;
-			font-weight: bold;
-		}
-	}
-	.goods-item{
-		width: 100%;
-		height: auto;
-	}	
-	.goods-pros-t{
-		display: flex;
-		align-items: center;
-		width: 100%;
-		height: 217rpx;
-		padding:24rpx 0;
-		.pros-img{
-			width: 210rpx;
-			height: 100%;
-			border-radius: 10rpx;
-			margin:0 26rpx 0 0;
-			border:1px solid #f3f3f3;
-			image{
-				width: 100%;
-				height: 100%;
-				border-radius: 10rpx;
-			}
-		}
-	}
-	.pros-product{
-		width: 468rpx;
-		height: 100%;
-		line-height: 36rpx;
-		font-size: $font-size-26;	
-		position: relative;
-		.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;
-		}
-		.productprice{
-			height: 48rpx;
-			position: absolute;
-			width: 100%;
-			bottom: 0;
-			.price{
-				line-height: 48rpx;
-				font-size: $font-size-28;
-				width: 48%;
-				color: #FF2A2A;
-				float: left;
-				font-weight: bold;
-			}
-			.count{
-				height: 100%;
-				float: right;
-				position: relative;
-				.small{
-					color: #666666;
-				}
-			}
-		}
-	}
-	.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;
-			}
-		}
-	}
-</style>

seller/pages/order/order-details.vue

@@ -1,514 +0,0 @@
-<template>
-	<view class="container details clearfix" :style="{paddingBottom :isIphoneX ? (130+68)+'rpx' : '130rpx'}">
-		<!-- 自定义返回 -->
-		<header-back :systeminfo='systeminfo' :navbar-data='nvabarData' :headerBtnPosi ="headerBtnPosi" :isShare='isOrderShare'></header-back>
-		<view class="container-details" :style="{paddingTop:navbarHeight+'px'}">
-			<view class="status-text">
-				<view class="view-type">{{ information.status | TextFormat }}</view>
-					<view class="Rebate " v-if="information.rebateFlag==1">返佣</view>
-					<text class="bage-buss btn" v-if="information.orderSubmitType == 3 || information.orderSubmitType == 4">协销</text>
-					<text class="bage-auto btn" v-if="information.orderSubmitType == 0 || information.orderSubmitType == 1 ||information.orderSubmitType == 2">自主</text>
-					
-			</view>
-			<!-- 地址选择 -->
-			<order-address ref="orderAddress" v-if="isRequest" :addressData="addressData"></order-address>
-			<!-- 商品 -->
-			<goods-list ref='goods' v-if="isRequest" :shopOrderData="shopOrderData" :information="information" @popupClick="hanldePopupFn"></goods-list>
-			<!-- 订单信息 -->
-			<order-information ref="information" v-if="isRequest" :information="information"></order-information>
-			<!-- 发票信息 -->
-			<invoice-tent ref="invoice" v-if="isRequest" :orderInvoice="orderInvoice"></invoice-tent>
-			<!-- 转账信息 -->
-			<!-- <transfe-record ref="transfe" v-if="isRequest"></transfe-record> -->
-			<!-- 支付记录 -->
-			<payment-record ref="payment" v-if="isRequest" :discernReceiptList="discernReceiptList" :receiptAmount="receiptAmount"></payment-record>
-			<!-- 退款记录 -->
-			<refund-record ref="refund" v-if="isRequest" :returnedPurchaseList="returnedPurchaseList" :returnedPurchaseFee="returnedPurchaseFee"></refund-record>
-			<view class="clause" v-if="information.secondHandOrderFlag!=1" @click="openclauseConten(clauseData.id)" :class="clauseData.name=='无条款'?'noclick':''">
-				售后条款：<label class="text" :class="clauseData.name=='无条款'?'color-bg':''">{{clauseData.name}}</label>
-			</view>
-			<!-- 底部button -->
-			<order-button ref="orderButton" 
-						  v-if= "isRequest" 
-						  :status= "btnStatus" 
-						  :order="information" 
-						  :rechargeGoods = "rechargeGoods"
-						  :ableUserMoney = "ableUserMoney"
-						  :shareCode= "shareCode"
-						  :serviceProviderId = "serviceProviderId"
-						  :secondHandOrderFlag = "information.secondHandOrderFlag"
-						   @buttonConfirm="handButtonConfirm">
-			</order-button>
-		</view>
-		<!-- 付款弹窗 -->
-		<order-model v-if="isPayModel" 
-					:payModelData="payModelData" 
-					:modelType='modelType' 
-					@paymentConfirm ='hanldPaymentConfirm'/>
-		<!-- 分享弹窗 -->			
-		<share-alert  :orderID="orderID" 
-					  v-if="isShareModal"  
-					  @shareConfirm ='onShareAppMessage'>
-		</share-alert>		
-		<!-- 促销活动弹窗 -->
-		<activi-popup :Promotion="handlerPros" :popupShow="popupShow"></activi-popup>
-	</view>
-</template>
-
-<script>
-	import headerBack from '@/components/cm-module/headerNavbar/header-back' 		 	 //自定义导航
-	import orderAddress from '@/components/cm-module/orderDetails/orderAddress' 		 //地址信息
-	import goodsList from '@/components/cm-module/orderDetails/goodsList'		 		 //商品列表
-	import invoiceTent from '@/components/cm-module/orderDetails/invoiceTent'	 		 //发票信息
-	import orderInformation from '@/components/cm-module/orderDetails/orderInformation' //订单信息
-	import transfeRecord from '@/components/cm-module/orderDetails/transfeRecord'		 //转账信息
-	import paymentRecord from '@/components/cm-module/orderDetails/paymentRecord'		 //支付记录
-	import refundRecord from '@/components/cm-module/orderDetails/refundRecord'		 //退款记录
-	import orderButton from '@/components/cm-module/orderDetails/sellerDetaileButton'	 //底部按钮
-	import shareAlert from '@/components/cm-module/modelAlert/sellerShareAlert.vue'			 //分享弹窗
-	import orderModel from '@/components/cm-module/modelAlert/order-alert'			 //付款弹窗
-	import activiPopup from "@/components/cm-module/orderDetails/activipopu"		//促销活动弹窗
-	
-	export default {
-		components:{
-			headerBack,
-			orderInformation,
-			orderAddress,
-			invoiceTent,
-			goodsList,
-			transfeRecord,
-			paymentRecord,
-			refundRecord,
-			orderButton,
-			shareAlert,
-			orderModel,
-			activiPopup
-		},
-		data() {
-			return {
-				state:0,
-				userID:'',
-				orderID:'',
-				serviceProviderId:'',		//协销ID
-				shareCode:'',				//分享码
-				shareType:'',               //分享登录页过来记录的状态
-				cellPhone:'',				//客服电话
-				payStatus:0,
-				btnStatus:0,				//按钮组件状态
-				isRequest:false,			//是否加载完成渲染子组件
-				isOrderShare:false,
-				isShareModal:false,
-				isPayModel:false,
-				modelType:0,
-				ableUserMoney:'',			//机构余额
-				payModelData:{},
-				addressData:{},				//地址信息初始化
-				information:{},				//订单信息初始化
-				shopOrderData:{},			//商品信息初始化
-				orderInvoice:{},			//发票信息初始化
-				returnedPurchaseList:{},	//退款信息初始化
-				discernReceiptList:{},		//支付信息初始化
-				receiptAmount:0,			//支付金额
-				returnedPurchaseFee:0,		//退款金额
-				navbarHeight:'',
-				rechargeGoods:false,
-				headerBtnPosi:	this.setHeaderBtnPosi(), //获取设备顶部胶囊高度
-				systeminfo: this.setSysteminfo(),		 //获取设备信息
-				isIphoneX:this.$store.state.isIphoneX,
-				CustomBar:this.CustomBar,// 顶部导航栏高度
-				popupShow:false,
-				handlerPros:{},
-				nvabarData: {							 //顶部自定义导航
-					showCapsule: 1, // 是否显示左上角图标   1表示显示    0表示不显示
-					title: '订单详情', // 导航栏 中间的标题
-				},
-				clauseData:{},
-				againUserId:0,//用户id
-			}
-		},
-		onLoad(option){
-			console.log(option)
-			this.shareType = option.type;
-			this.orderID = option.orderID
-			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.$api.getStorage().then((resolve) =>{
-				this.againUserId = resolve.userID
-			})
-			this.getHeaderTopHeight()
-			this.initOrderDetaileData()
-		},
-		filters:{
-			NumFormat(value) {//处理金额
-				return Number(value).toFixed(2);
-			},
-			TextFormat(status) {//处理金额
-				let HtmlText,
-					typeTextObject={
-						0:'待确认',
-						4:'交易完成',
-						5:'订单完成',
-						6:'已关闭',
-						7:'交易全退',
-						77:'交易全退',
-						11:'待付款待发货',
-						12:'待付款部分发货',
-						13:'待付款已发货',
-						21:'部分付款待发货',
-						22:'部分付款部分发货',
-						23:'部分付款已发货',
-						31:'已付款待发货',
-						32:'已付款部分发货',
-						33:'已付款已发货',
-						111:'待付款待发货',
-					};
-				
-				Object.keys(typeTextObject).forEach(key => {
-					if(key == status){
-						HtmlText = typeTextObject[key]
-					}
-				})
-				return HtmlText
-			},
-		},
-		methods: {
-			openclauseConten(id){
-				this.$api.navigateTo(`/pages/service/sellconten?clauseId=${id}`)
-			},
-			initOrderDetaileData(){//初始化页面数据@参数：订单ID
-				this.OrderService.QueryOrderDetails({ orderID : this.orderID }).then(response =>{
-					let resData = response.data;
-					this.isRequest = true
-					this.rechargeGoods = resData.rechargeGoods
-					this.userID = resData.order.userID
-					this.shareCode = resData.shareCode
-					this.addressData = resData.userInfo
-					this.information = resData.order
-					this.btnStatus = resData.order.status
-					this.payStatus = resData.order.payStatus
-					this.shopOrderData = resData.shopOrderList
-					this.orderInvoice = resData.orderInvoice
-					this.returnedPurchaseList = resData.returnedPurchaseList
-					this.discernReceiptList = resData.discernReceiptList
-					this.receiptAmount = resData.order.receiptAmount
-					this.returnedPurchaseFee = resData.order.returnedPurchaseFee
-					this.ableUserMoney = resData.ableUserMoney
-					this.clauseData = resData.clause
-					if(this.clauseData && this.clauseData.name.length>10){
-						this.clauseData.name = this.clauseData.name.substr(0,10)+'...'
-					}
-				}).catch(error =>{
-					this.$util.modal('提示','订单查询失败，请稍后重试~','确定','',false,() =>{
-						this.$api.switchTabTo('/seller/pages/index/index')
-					})
-				})
-			},
-			handButtonConfirm(data){//监听点击时间的按钮类型并执行...
-				this.handShowAlert(data)
-			},
-			handShowAlert(data){//判断点击的按钮类型并执行...
-				switch(data.type){
-					case 'delete':
-						this.handOrderDetele();
-						break;
-					case 'cancel':
-						this.handCenceConfirm();
-						break;
-					case 'confirm':
-						this.handOrderConfirm(data)
-						break;
-					case 'balance':
-						this.getOrderPaymentValidation(data)
-						break;
-					case 'again':
-						this.handOrderAgain(data.orderId);
-						break		
-				}
-			},
-			handOrderAgain(id){
-				this.aganOrderID = id;
-				this.SellerService.SellerCreateOrderAgain({orderId:this.aganOrderID,userId:this.againUserId,confirmFlag:0}).then(res =>{
-					if(res.code==0){
-						this.$api.setStorage('orderUserInfo',{clubID:res.data.clubId,againBuyProductIds:res.data.againBuyProductIds,userID:res.data.userId})
-						this.$api.navigateTo('/seller/pages/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)
-					}
-					})
-			},
-			handOrderConfirm(data){//确认订单
-				this.$util.modal('提示','确认此订单？','确定','取消',true,() =>{
-					this.OrderService.AffirmOrder({orderID:this.orderID}).then(response =>{
-						this.$util.msg(response.msg,2000,true,'success');
-						this.initOrderDetaileData()
-					}).catch(error =>{
-						this.$util.msg(error.msg,2000)
-					})
-				})
-			},
-			hanldPaymentConfirm(data){//监听余额抵扣按钮
-				switch(data.type){
-					case 3:
-						this.OrderService.OrderBalanceDeduction({orderId:this.orderID}).then(response =>{
-							this.$util.msg('余额抵扣成功',2000)
-							this.initOrderDetaileData()
-						}).catch(error =>{
-							this.$util.msg(error.msg,2000)
-						})	
-						break;
-				}
-			},
-			getOrderPaymentValidation(data){//监听根据付款状态做操作
-				this.OrderService.OrderPaymentValidation({orderId:data.orderId}).then(response =>{
-					let dataCode = response.data.code
-					this.payModelData = response.data
-					if(dataCode == -1){
-						this.$util.modal('','订单已申请全部退款，无需再付款！','确定','',false,() =>{})
-					}else{
-						this.isPayModel = true;
-						this.modelType = 3
-					}
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000)
-				})	
-			},
-			
-			handOrderDetele(){//删除订单
-				this.$util.modal('提示','确认删除该订单吗？','确定','取消',true,() =>{
-					this.OrderService.DeleteOrder({orderID:this.orderID}).then(response =>{
-						this.$util.msg(response.msg,2000,true,'success');
-						setTimeout(() => {
-							if(this.shareType ==='share'){
-								this.$api.navigateTo('/seller/pages/index/index')
-							}else{
-								this.$api.navigateTo(`/seller/pages/order/order-list?type=detele&listType=${this.listType}`)
-							}
-						},500)
-					}).catch(error =>{
-						this.$util.msg(error.msg,2000)
-					})
-				})
-			},
-			handCenceConfirm(){//取消订单
-				this.$util.modal('提示','确认取消该订单吗？','确定','取消',true,() =>{
-					this.OrderService.CancelOrder({orderID:this.orderID}).then(response =>{
-						this.$util.msg(response.msg,2000,true,'success');
-						this.initOrderDetaileData()
-					}).catch(error =>{
-						this.$util.msg(error.msg,2000)
-					})
-				})
-			},
-			hanldePopupFn(data){//监听活动内容
-				this.popupShow = true
-				this.handlerPros = data
-			},
-			onShareAppMessage(res){//分享转发
-				this.isShareModal = false
-				if (res.from === 'button') {
-					// 来自页面内转发按钮
-			    }
-				return {
-					title: '您有新的订单，请点击查看~',
-					path: `/pages/user/order/order-sharelogin?orderID=${this.orderID}&userID=${this.userID}&serviceProviderId=${this.serviceProviderId}`,
-					imageUrl:'https://img.caimei365.com/group1/M00/03/95/Cmis216Sk_SABnOFABZCgCzFV_g063.png'
-				}
-			},
-			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
-			},
-		},
-		onShow() {
-			this.$api.getStorage().then((resolve) =>{
-				this.serviceProviderId = resolve.serviceProviderID
-			})
-		}
-	}
-</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;
-		}
-		.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: 6rpx;
-			line-height: 32rpx;
-			text-align: center;
-			color: #FFFFFF;
-			margin-top: 10rpx;
-			float: right;
-			font-size: $font-size-24;
-		}
-		.bage-auto{
-			display: inline-block;
-			width: 72rpx;
-			height: 32rpx;
-			background:radial-gradient(circle,rgba(255,180,39,1) 0%,rgba(245,142,77,1) 100%);
-			border-radius: 6rpx;
-			line-height: 32rpx;
-			text-align: center;
-			color: #FFFFFF;
-			margin-top: 10rpx;
-			float: right;
-			font-size: $font-size-24;
-		}
-		.Rebate{
-			display: inline-block;
-			width: 72rpx;
-			height: 32rpx;
-			background:#ff7a51;
-			border-radius: 6rpx;
-			line-height: 32rpx;
-			text-align: center;
-			color: #FFFFFF;
-			margin-top: 10rpx;
-			float: right;
-			font-size: $font-size-24;
-			margin-left: 20rpx;
-		}
-	}
-</style>

seller/pages/order/order-historylist.vue

@@ -1,825 +0,0 @@
-<template>
-	<view class="container" :style="{paddingTop:82+'px'}">
-		<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 class="tab-screen">
-				<view v-for="(item,index) in screenTabBar" :key="index" class="tab-screen-item" :class="[screenTab == index ? 'active' : '']"
-				 :data-current="index" @tap.stop="onClickScreenTab(index)">{{item.text}}</view>
-			</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">
-				<tui-skeleton v-if="skeletonShow" backgroundColor="#fafafa" borderRadius="10rpx" :isLoading	="false" :loadingType="5"></tui-skeleton>
-				<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"></empty>
-						<!-- 列表 -->
-						<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.orderID)">
-								<view class="order-title">
-									<view class="order-title-name">{{order.clubName}}</view>
-									<view class="order-title-t">
-										<text class="bage-buss tui-skeleton-fillet" v-if="order.orderSubmitType == 3 || order.orderSubmitType == 4">协销</text>
-										<text class="bage-auto tui-skeleton-fillet" v-if="order.orderSubmitType == 0 || order.orderSubmitType == 1 || order.orderSubmitType == 2">自主</text>
-										<text class="bage-text tui-skeleton-fillet">订单编号：{{order.orderNo}}({{order.orderID}})</text>
-										<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 tui-skeleton-fillet">下单时间：{{order.orderTime}}</view>
-										<view class="order-title-tip tui-skeleton-fillet">{{StateExpFormat(order.status)}}</view>
-									</view>
-								</view>
-								<block v-for="(shop,index) in order.shopOrderList" :key="index">
-									<view class="goods-title">
-										<view v-if="shop.shopPromotion" class="floor-item-act">
-											<view class="floor-tags">{{shop.shopPromotion.name}}</view>	
-										</view>
-										<view class="title-text tui-skeleton-fillet">{{shop.shopName}}</view>
-									</view>
-									<view class="goods-item" v-for="(pros,prosIndex) in shop.orderProductList" :key="prosIndex">
-										<view class="goods-pros-t">
-											<view class="pros-img tui-skeleton-fillet">
-												<image :src="pros.productImage" alt="" />
-												<text class="tips" v-if="pros.productType ==2 || pros.productType ==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">
-														<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" v-if="pros.productPromotion!=null">
-													<view v-if="PromotionsFormat(pros.productPromotion)"  class="floor-tags">
-														{{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">{{pros.productPromotion.name}}</view>	
-												</view>
-											</view>	
-										</view>
-									</view>	
-								</block>
-								<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.productCount}}件商品</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.pendingPayments | NumFormat }}</label></view>
-									</view>
-								</view>
-								<!-- 底部button -->
-								<order-button ref="orderButton" 
-											  :status="order.status" 
-											  :orderID="order.orderID" 
-											  :userID = "order.userID"
-											  :secondHandOrderFlag = "order.secondHandOrderFlag"
-											  @buttonConfirm="handButtonConfirm">
-								</order-button>
-							</view>
-							<!--加载loadding-->
-							<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-							<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text='nomoreText'></tui-nomore>
-							<!--加载loadding-->
-						</view>
-					</view>
-				</scroll-view>
-			</swiper-item>
-		</swiper>
-		<!-- 分享弹窗 -->
-		<share-alert   v-if="isShareModal"
-					   :orderID="btnoRderID" 
-					   @shareConfirm ='onShareAppMessage'>
-		</share-alert>
-		<!-- 透明模态层 -->
-		<modal-layer v-if='isModalLayer'></modal-layer>
-	</view>
-</template>
-
-<script>
-	import headerBack from '@/components/cm-module/headerNavbar/header-back' 		//自定义顶部导航
-	import btSearch from '@/components/uni-search/bt-search.vue'				//搜索
-	import tuiSkeleton from "@/components/tui-skeleton/tui-skeleton"
-	import tuiLoadmore from "@/components/tui-components/loadmore/loadmore"
-	import tuiNomore from "@/components/tui-components/nomore/nomore"
-	import orderButton from '@/components/cm-module/orderDetails/sellerOrderButton' //操作按钮
-	import modalLayer from "@/components/modal-layer"
-	import empty from "@/components/empty";
-	import shareAlert from '@/components/cm-module/modelAlert/shareAlert'			 //分享弹窗
-	
-	export default {
-		components: {
-			headerBack,
-			empty,
-			btSearch,
-			tuiLoadmore,
-			tuiNomore,
-			orderButton,
-			tuiSkeleton,
-			modalLayer,
-			shareAlert
-		},
-		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:'协销订单'}
-							],			 
-				winHeight: "", //窗口高度
-				clubID:'',		//机构ID
-				currentTab: 0, //预设当前项的值
-				screenTab:0,   //筛选预设当前项的值
-				scrollLeft: 0 ,//tab标题的滚动条位置
-				serviceProviderId:0,//协销用户ID
-				orderData: [],
-				btnClubUserID:0,
-				btnoRderID: 0, //点击按钮传入的的订单ID
-				pageNum: 1,	  //页数
-				pageSize: 10,  //条数
-				scrollTop: 0,
-				deteleType:'',
-				skeletonShow: true,
-				isClickChange: false,
-				isShareModal: false,//控制分享弹窗
-				isSeller:false,
-				isModalLayer: false,
-				loadding: false,
-				pullUpOn: true,
-				hasNextPage: false,
-				pullFlag: true,
-				navbarHeight:'',
-				nomoreText: '上拉显示更多',
-				userID:0
-			}
-		},
-		onLoad(option) {
-			let self = this
-			this.clubID = option.clubID
-			this.currentTab = option.listType
-			//  高度自适应
-			uni.getSystemInfo({
-				success: function(res) {
-					let calc = res.windowHeight;
-					self.winHeight = calc-82;
-				}
-			});
-			this.$api.getStorage().then((resolve) =>{
-				this.userID = resolve.userID
-			})
-		},
-		filters:{
-			NumFormat(value) {//处理金额
-				return Number(value).toFixed(2);
-			},
-		},
-		methods: {
-			// 滚动切换标签样式
-			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.checkCor();
-				this.pageNum = 1
-				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.pageNum = 1
-					this.pullUpOn = true //切换时隐藏
-					this.loadding =  false //切换时隐藏
-					this.getOrderDatainit(this.currentTab)
-				}
-			},
-			onClickScreenTab(index){
-				console.log(index)
-				this.screenTab = index
-				this.pageNum = 1
-				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
-				}
-			},
-			getOrderDatainit(index,source){
-				setTimeout(()=>{this.skeletonShow = false},1500)
-				let orderItem = this.orderTabBar[index];
-				let listType = orderItem.listType;
-				if(source === 'tabChange' && orderItem.loaded === true){//tab切换只有第一次需要加载数据
-					return;
-				}
-				setTimeout(()=>{
-					this.$api.getComStorage('orderUserInfo').then((resolve) =>{
-						let params = {listType:index,clubID:resolve.clubID,orderSubmitType:this.screenTab,serviceProviderId:this.serviceProviderId,pageNum:1,pageSize:this.pageSize};
-						this.SellerService.GetSellerClubOrderList(params).then(response =>{
-							let orderList = response.data.results.filter(item=>{
-								//添加不同状态下订单的表现形式
-								item = Object.assign(item, this.StateExpFormat(item.listType));
-								return item;
-							});
-							orderItem.orderList =[];
-							orderList.forEach(item=>{
-								orderItem.orderList.push(item);
-							})
-							//loaded新字段用于表示数据加载完毕，如果为空可以显示空白页
-							this.$set(orderItem, 'loaded', true);
-							this.hasNextPage = response.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 = '已至底部'
-								}
-							}
-						}).catch(error =>{
-							this.$util.msg(error.msg,2000);
-						})
-					})
-				}, 600);	
-			}, 
-			getOnReachBottomData(index){//上拉加载
-				this.pageNum += 1
-				this.$api.getComStorage('orderUserInfo').then((resolve) =>{
-					let params = {listType:index,clubID:resolve.clubID,orderSubmitType:this.screenTab,serviceProviderId:this.serviceProviderId,pageNum:this.pageNum,pageSize:this.pageSize};
-					this.SellerService.GetSellerClubOrderList(params).then(response =>{
-						let orderItem = this.orderTabBar[index];
-						let resData = response.data.results
-						this.hasNextPage = response.data.hasNextPage;
-						orderItem.orderList = orderItem.orderList.concat(resData)
-						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)
-					})
-				})	
-			},
-			scrolltolower() {
-				if(this.hasNextPage){
-					this.loadding = true
-					this.pullUpOn = true
-					this.getOnReachBottomData(this.currentTab);
-				}	
-			},
-			detail(id) {//订单详情跳转
-				this.isModalLayer = true;	
-				this.$api.navigateTo(`/seller/pages/order/order-details?listType=${this.currentTab}&orderID=${id}`)
-			},
-			handButtonConfirm(data) {//获取点击
-				this.handShowAlert(data)
-				this.btnoRderID = data.orderId
-			},
-			handShowAlert(data) {//执行
-				switch(data.type){
-					case 'delete':
-						this.handOrderDetele(data.orderId);
-						break
-					case 'cancel':
-						this.handCenceConfirm(data.orderId)
-						break
-					case 'confirm':
-						this.handOrderConfirm(data.orderId);
-						break
-					case 'again':
-						this.handOrderAgain(data.orderId);
-						break		
-				}
-			},
-			handOrderAgain(id){
-				this.aganOrderID = id;
-				this.SellerService.SellerCreateOrderAgain({orderId:this.aganOrderID,userId:this.userID,confirmFlag:0}).then(res =>{
-					if(res.code==0){
-						this.$api.setStorage('orderUserInfo',{clubID:res.data.clubId,againBuyProductIds:res.data.againBuyProductIds,userID:res.data.userId})
-						this.$api.navigateTo('/seller/pages/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)
-					}
-					})
-			},
-			handOrderConfirm (id){//确认订单
-				this.$util.modal('提示','确认此订单？','确定','取消',true,() =>{
-					this.OrderService.AffirmOrder({orderID:id}).then(response =>{
-						this.$util.msg(response.msg,2000,true,'success');
-						setTimeout(() => {
-							this.getOrderDatainit(this.currentTab)
-						},2000)
-					}).catch(error =>{
-						this.$util.msg(error.msg,2000)
-					})
-				})
-			},
-			handOrderDetele(id){//删除订单
-				this.$util.modal('提示','确认删除该订单吗？','确定','取消',true,() =>{
-					this.OrderService.DeleteOrder({orderID:id}).then(response =>{
-						this.$util.msg(response.msg,2000,true,'success');
-						setTimeout(() => {
-							this.getOrderDatainit(this.currentTab)
-						},2000)
-					}).catch(error =>{
-						this.$util.msg(error.msg,2000)
-					})
-				})
-			},
-			handCenceConfirm(id){//取消订单
-				this.$util.modal('提示','确认取消该订单吗？','确定','取消',true,() =>{
-					this.OrderService.CancelOrder({orderID:id}).then(response =>{
-						this.$util.msg(response.msg,2000,true,'success');
-						setTimeout(() => {
-							this.getOrderDatainit(this.currentTab)
-						},2000)
-					}).catch(error =>{
-						this.$util.msg(error.msg,2000)
-					})
-				})
-			},
-			handlSearchPath(){
-				this.$api.navigateTo('/seller/pages/search/search-order')
-			},
-			onShareAppMessage (res){//分享转发
-				this.isShareModal = false
-				if (res.from === 'button') {// 来自页面内转发按钮
-					// console.log(res.target)
-			    }
-				return {
-					title: '您有新的分享订单，快来查看吧~',
-					path: `/pages/user/order/order-sharelogin?orderID=${this.btnoRderID}&userID=${this.btnClubUserID}&serviceProviderId=${this.serviceProviderId}`,
-					imageUrl:'https://img.caimei365.com/group1/M00/03/95/Cmis216Sk_SABnOFABZCgCzFV_g063.png'
-				}
-			},
-			PromotionsFormat(promo){//促销活动类型数据处理
-				if(promo!=null){
-					if(promo.type == 1 && promo.mode == 1){
-						return true
-					}else{
-						return false
-					}
-				}
-				return false
-			},
-			//订单状态文字和颜色
-			StateExpFormat (state){
-				let stateText = '',
-					stateTextObject={
-						0:'待确认',
-						4:'交易完成',
-						5:'订单完成',
-						6:'已关闭',
-						7:'交易全退',
-						77:'交易全退',
-						11:'待付款待发货',
-						12:'待付款部分发货',
-						13:'待付款已发货',
-						21:'部分付款待发货',
-						22:'部分付款部分发货',
-						23:'部分付款已发货',
-						31:'已付款待发货',
-						32:'已付款部分发货',
-						33:'已付款已发货',
-						111:'待付款待发货',
-					}
-				Object.keys(stateTextObject).forEach(key => {
-					if(key == state){
-						stateText = stateTextObject[key]
-					}
-				})
-				return stateText;
-			},
-			orderPriceToFixed (n){
-				let price ='';
-				price = n.toFixed(2);
-				return price
-			},
-		},
-		onPageScroll(e) {
-			this.scrollTop = e.scrollTop;
-		},
-		onShow() {
-			this.isModalLayer = false;
-			this.getOrderDatainit(this.currentTab)
-		}
-	}
-</script>
-
-<style lang="scss">
-	/*tabbar end*/
-	page{
-		background: #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-screen{
-			height: 60rpx;
-			width: 702rpx;
-			padding: 10rpx 24rpx;
-			border-top: 1px solid #F7F7F7;
-			border-bottom: 1px solid #F7F7F7;
-			display: flex;
-			justify-content: center;
-			justify-items: center;
-			.tab-screen-item{
-				flex: 1;
-				height: 60rpx;
-				border-radius: 10rpx;
-				background: #F7F7F7;
-				margin-right: 22rpx;
-				line-height: 66rpx;
-				font-size: $font-size-28;
-				color: #333333;
-				text-align: center;
-				&.active{
-					color: $color-system;
-				}
-				&:last-child{
-					margin-right: 0;
-				}
-			}
-		}
-	}
-	.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;
-	}
-	.tui-order-list {
-		width: 100%;
-		position: relative;
-	}
-	.tui-order-item {
-		display: flex;
-		flex-direction: column;
-		width: 702rpx;
-		padding:0 24rpx;
-		background: #fff;
-		border-bottom: 20rpx solid #F7F7F7;
-	}
-	.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;
-		}
-		.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: 0;
-				top: 9rpx;
-			}
-			.bage-buss{
-				display: inline-block;
-				width: 72rpx;
-				height: 30rpx;
-				background:radial-gradient(circle,rgba(255,39,180,1) 0%,rgba(193,77,245,1) 100%);
-				border-radius: 4rpx;
-				line-height: 30rpx;
-				font-size: $font-size-22;
-				text-align: center;
-				color: #FFFFFF;
-				margin-top: 8rpx;
-			}
-			.bage-auto{
-				display: inline-block;
-				width: 72rpx;
-				height: 30rpx;
-				background:radial-gradient(circle,rgba(255,180,39,1) 0%,rgba(245,142,77,1) 100%);
-				border-radius: 4rpx;
-				line-height: 30rpx;
-				font-size: $font-size-22;
-				text-align: center;
-				color: #FFFFFF;
-				margin-top: 8rpx;
-			}
-			.bage-text{
-				display: inline-block;
-				font-size: $font-size-28;
-				line-height: 68rpx;
-				text-align: left;
-				color: $color-system;
-				margin-left: 15rpx;
-			}
-		}
-		.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: lef
-			}
-			.order-title-tip{
-				float: right;
-				font-size: $font-size-28;
-				line-height: 40rpx;
-				text-align: right;
-				color: #FF2A2A;
-			}
-		}
-	}
-	.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;
-			.floor-tags{
-				height: 28rpx;
-				border-radius: 6rpx;
-				background-color: #FFFFFF;
-				line-height: 28rpx;
-				color: $color-system;
-				text-align: center;
-				display: inline-block;
-				padding:0 16rpx;
-				font-size: $font-size-20;
-				border: 1px solid #E15616;
-				float: left;
-			}
-		}
-		.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: 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-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;
-		}
-		.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;
-			}
-			.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;
-			.floor-tags{
-				height: 28rpx;
-				border-radius: 6rpx;
-				background-color: #FFFFFF;
-				line-height: 28rpx;
-				color: $color-system;
-				text-align: center;
-				display: inline-block;
-				padding:0 16rpx;
-				font-size: $font-size-20;
-				border: 1px solid #E15616;
-				float: left;
-			}
-		}
-	}
-	.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;
-			}
-		}
-	}
-</style>

seller/pages/order/order-list.vue

@@ -1,998 +0,0 @@
-<template>
-	<view class="container" :style="{paddingTop:(navbarHeight+82)+'px'}">
-		<!-- 自定义返回 -->
-		<header-back :systeminfo='systeminfo' 
-					 :navbar-data='nvabarData' 
-					 :headerBtnPosi ="headerBtnPosi" 
-					 :isDelete="isDelete" 
-					 :isUsertype="1"
-					 @goSearchPath="handlSearchPath">
-		</header-back>
-		<view class="order-section-top" :style="{marginTop:navbarHeight+'px'}">
-			<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 class="tab-screen">
-				<view v-for="(item,index) in screenTabBar" :key="index" class="tab-screen-item" :class="[screenTab == index ? 'active' : '']"
-				 :data-current="index" @tap.stop="onClickScreenTab(index)">{{item.text}}</view>
-			</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">
-				<tui-skeleton v-if="skeletonShow" backgroundColor="#fafafa" borderRadius="10rpx" :isLoading	="false" :loadingType="5"></tui-skeleton>
-				<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"></empty>
-						<!-- 列表 -->
-						<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.orderID)">
-								<view class="order-title">
-									<view class="order-title-name">{{order.clubName}}</view>
-									<view class="order-title-t">
-										<view class="Rebate " 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>
-										<text class="bage-text tui-skeleton-fillet">订单编号：{{order.orderNo}}({{order.orderID}})</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 tui-skeleton-fillet">下单时间：{{order.orderTime}}</view>
-										<view class="order-title-tip tui-skeleton-fillet">{{StateExpFormat(order.status)}}</view>
-									</view>
-								</view>
-								<block v-for="(shop,index) in order.shopOrderList" :key="index">
-									<view class="goods-title">
-										<view v-if="shop.shopPromotion" class="floor-item-act">
-											<view class="floor-tags">{{shop.shopPromotion.name}}</view>	
-										</view>
-										<view class="title-text tui-skeleton-fillet">{{shop.shopName}}</view>
-									</view>
-									<view class="goods-item" v-for="(pros,prosIndex) in shop.orderProductList" :key="prosIndex">
-										<view class="goods-pros-t">
-											<view class="pros-img tui-skeleton-fillet">
-												<image :src="pros.productImage" alt="" />
-												<text class="tips" v-if="pros.productType ==2 || pros.productType ==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">
-														<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" v-if="pros.productPromotion!=null">
-													<view v-if="PromotionsFormat(pros.productPromotion)"  class="floor-tags">
-														{{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">{{pros.productPromotion.name}}</view>	
-												</view>
-											</view>	
-										</view>
-									</view>	
-								</block>
-								<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.productCount}}件商品</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.pendingPayments | NumFormat }}</label></view>
-									</view>
-								</view>
-								<!-- 底部button -->
-								<order-button ref="orderButton" 
-											  :status="order.status" 
-											  :orderID="order.orderID" 
-											  :userID = "order.userID"
-											  :secondHandOrderFlag = "order.secondHandOrderFlag"
-											  @buttonConfirm="handButtonConfirm">
-								</order-button>
-							</view>
-							<!--加载loadding-->
-							<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-							<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text='nomoreText'></tui-nomore>
-							<!--加载loadding-->
-						</view>
-					</view>
-				</scroll-view>
-			</swiper-item>
-		</swiper>
-		<!-- 分享弹窗 -->
-		<share-alert   v-if="isShareModal"
-					   :orderID="btnoRderID" 
-					   @shareConfirm ='onShareAppMessage'>
-		</share-alert>
-		<!-- 透明模态层 -->
-		<modal-layer v-if='isModalLayer'></modal-layer>
-		<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.mainImage"></image>
-						<view class="name-right">{{item.name}}</view>
-					</view>
-				</view>
-				<view class="BtnAll">
-					<view class="closebtn btn" @click="closeBtn">取消</view>
-					<view class="cancel btn" @click="cancelBtn">确定</view>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import headerBack from '@/components/cm-module/headerNavbar/header-back' 		//自定义顶部导航
-	import btSearch from '@/components/uni-search/bt-search.vue'				//搜索
-	import tuiSkeleton from "@/components/tui-skeleton/tui-skeleton"
-	import tuiLoadmore from "@/components/tui-components/loadmore/loadmore"
-	import tuiNomore from "@/components/tui-components/nomore/nomore"
-	import orderButton from '@/components/cm-module/orderDetails/sellerOrderButton' //操作按钮
-	import modalLayer from "@/components/modal-layer"
-	import empty from "@/components/empty";
-	import shareAlert from '@/components/cm-module/modelAlert/sellerShareAlert'			 //分享弹窗
-
-	
-	export default {
-		components: {
-			headerBack,
-			empty,
-			btSearch,
-			tuiLoadmore,
-			tuiNomore,
-			orderButton,
-			tuiSkeleton,
-			modalLayer,
-			shareAlert
-		},
-		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标题的滚动条位置
-				serviceProviderId:0,//协销用户ID
-				orderData: [],
-				btnClubUserID:0,
-				btnoRderID: 0, //点击按钮传入的的订单ID
-				pageNum: 1,	  //页数
-				pageSize: 10,  //条数
-				scrollTop: 0,
-				deteleType:'',
-				skeletonShow: true,
-				isClickChange: false,
-				isShareModal: false,//控制分享弹窗
-				isSeller:false,
-				isModalLayer: false,
-				loadding: false,
-				pullUpOn: true,
-				hasNextPage: false,
-				pullFlag: true,
-				navbarHeight:'',
-				nomoreText: '上拉显示更多',
-				showAgan:false,
-				failList:[],//失效商品
-				promptitle:'',
-				aganOrderID:0,//再来一单商品id
-				userID:0
-				
-			}
-		},
-		onLoad(option) {
-			let self = this;
-			if(option.type ==='detele'){self.isDelete = true}
-			self.currentTab = option.listType
-			self.getHeaderTopHeight()//设置自定义导航高度
-			//  高度自适应
-			uni.getSystemInfo({
-				success: function(res) {
-					let calc = res.windowHeight;
-					self.winHeight = calc-self.CustomBar-82;
-				}
-			});
-			this.$api.getStorage().then((resolve) =>{
-				this.userID = resolve.userID
-			})
-		},
-		filters:{
-			NumFormat(value) {//处理金额
-				return Number(value).toFixed(2);
-			},
-		},
-		methods: {
-			closeBtn(){//
-				this.showAgan = false;
-			},
-			cancelBtn(){
-				this.SellerService.SellerCreateOrderAgain({orderId:this.aganOrderID,confirmFlag:1}).then(res =>{
-					if(res.code==0){
-						this.$api.navigateTo('/seller/pages/cart/cart');
-						this.showAgan = false;
-					}
-				})
-			},
-			// 滚动切换标签样式
-			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.checkCor()
-				this.pageNum = 1
-				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.pageNum = 1
-					this.pullUpOn = true //切换时隐藏
-					this.loadding =  false //切换时隐藏
-					this.getOrderDatainit(this.currentTab)
-				}
-			},
-			onClickScreenTab(index){
-				this.screenTab = index
-				this.pageNum = 1
-				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
-				}
-			},
-			getOrderDatainit(index,source){
-				setTimeout(()=>{this.skeletonShow = false},1500)
-				let orderItem = this.orderTabBar[index];
-				let listType = orderItem.listType;
-				if(source === 'tabChange' && orderItem.loaded === true){//tab切换只有第一次需要加载数据
-					return;
-				}
-				setTimeout(()=>{
-					this.$api.getStorage().then((resolve) =>{
-						this.serviceProviderId = resolve.serviceProviderID
-						let params = {
-								listType:index,
-								orderSubmitType:this.screenTab,
-								serviceProviderId:this.serviceProviderId,
-								pageNum:1,
-								pageSize:this.pageSize,
-							};
-						this.SellerService.GetSellerOrderList(params).then(response =>{
-							let orderList = response.data.results.filter(item=>{
-								//添加不同状态下订单的表现形式
-								item = Object.assign(item, this.StateExpFormat(item.listType));
-								return item;
-							});
-							orderItem.orderList =[];
-							orderList.forEach(item=>{
-								orderItem.orderList.push(item);
-							})
-							//loaded新字段用于表示数据加载完毕，如果为空可以显示空白页
-							this.$set(orderItem, 'loaded', true);
-							this.hasNextPage = response.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 = '已至底部'
-								}
-							}
-						}).catch(error =>{
-							this.$util.msg(error.msg,2000);
-						})
-					})
-				}, 600);	
-			}, 
-			getOnReachBottomData(index){//上拉加载
-				let params = {
-						listType:index,
-						orderSubmitType:this.screenTab,
-						serviceProviderId:this.serviceProviderId,
-						pageNum:this.pageNum+=1,
-						pageSize:this.pageSize,
-					};
-				this.SellerService.GetSellerOrderList(params).then(response =>{
-					let orderItem = this.orderTabBar[index];
-					let resData = response.data.results
-					this.hasNextPage = response.data.hasNextPage;
-					orderItem.orderList = orderItem.orderList.concat(resData)
-					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)
-				})
-			},
-			scrolltolower() {
-				if(this.hasNextPage){
-					this.loadding = true
-					this.pullUpOn = true
-					this.getOnReachBottomData(this.currentTab);
-				}	
-			},
-			detail(id) {//订单详情跳转
-				this.isModalLayer = true;	
-				this.$api.navigateTo(`/seller/pages/order/order-details?listType=${this.currentTab}&orderID=${id}`)
-			},
-			handButtonConfirm(data) {//获取点击
-				this.handShowAlert(data)
-				this.btnoRderID = data.orderId
-			},
-			handShowAlert(data) {//执行
-				switch(data.type){
-					case 'delete':
-						this.handOrderDetele(data.orderId);
-						break
-					case 'cancel':
-						this.handCenceConfirm(data.orderId)
-						break
-					case 'confirm':
-						this.handOrderConfirm(data.orderId);
-						break
-					case 'again':
-						this.handOrderAgain(data.orderId);
-						break	
-				}
-			},
-			handOrderAgain(id){
-				this.aganOrderID = id;
-				this.SellerService.SellerCreateOrderAgain({orderId:this.aganOrderID,userId:this.userID,confirmFlag:0}).then(res =>{
-					if(res.code==0){
-						this.$api.setStorage('orderUserInfo',{clubID:res.data.clubId,againBuyProductIds:res.data.againBuyProductIds,userID:res.data.userId})
-						this.$api.navigateTo('/seller/pages/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)
-					}
-					})
-			},
-			handOrderConfirm (id){//确认订单
-				this.$util.modal('提示','确认此订单？','确定','取消',true,() =>{
-					this.OrderService.AffirmOrder({orderID:id}).then(response =>{
-						this.$util.msg(response.msg,2000,true,'success');
-						setTimeout(() => {
-							this.getOrderDatainit(this.currentTab)
-						},2000)
-					}).catch(error =>{
-						this.$util.msg(error.msg,2000)
-					})
-				})
-			},
-			handOrderDetele(id){//删除订单
-				this.$util.modal('提示','确认删除该订单吗？','确定','取消',true,() =>{
-					this.OrderService.DeleteOrder({orderID:id}).then(response =>{
-						this.$util.msg(response.msg,2000,true,'success');
-						setTimeout(() => {
-							this.getOrderDatainit(this.currentTab)
-						},2000)
-					}).catch(error =>{
-						this.$util.msg(error.msg,2000)
-					})
-				})
-			},
-			handCenceConfirm(id){//取消订单
-				this.$util.modal('提示','确认取消该订单吗？','确定','取消',true,() =>{
-					this.OrderService.CancelOrder({orderID:id}).then(response =>{
-						this.$util.msg(response.msg,2000,true,'success');
-						setTimeout(() => {
-							this.getOrderDatainit(this.currentTab)
-						},2000)
-					}).catch(error =>{
-						this.$util.msg(error.msg,2000)
-					})
-				})
-			},
-			handlSearchPath(){
-				this.$api.navigateTo('/seller/pages/search/search-order')
-			},
-			onShareAppMessage (res){//分享转发
-				this.isShareModal = false
-				if (res.from === 'button') {// 来自页面内转发按钮
-					// console.log(res.target)
-			    }
-				return {
-					title: '您有新的订单，请点击查看~',
-					path: `/pages/user/order/order-sharelogin?orderID=${this.btnoRderID}&userID=${this.btnClubUserID}&serviceProviderId=${this.serviceProviderId}`,
-					imageUrl:'https://img.caimei365.com/group1/M00/03/95/Cmis216Sk_SABnOFABZCgCzFV_g063.png'
-				}
-			},
-			PromotionsFormat(promo){//促销活动类型数据处理
-				if(promo!=null){
-					if(promo.type == 1 && promo.mode == 1){
-						return true
-					}else{
-						return false
-					}
-				}
-				return false
-			},
-			//订单状态文字和颜色
-			StateExpFormat (state){
-				let stateText = '',
-					stateTextObject={
-						0:'待确认',
-						4:'交易完成',
-						5:'订单完成',
-						6:'已关闭',
-						7:'交易全退',
-						77:'交易全退',
-						11:'待付款待发货',
-						12:'待付款部分发货',
-						13:'待付款已发货',
-						21:'部分付款待发货',
-						22:'部分付款部分发货',
-						23:'部分付款已发货',
-						31:'已付款待发货',
-						32:'已付款部分发货',
-						33:'已付款已发货',
-						111:'待付款待发货',
-					}
-				Object.keys(stateTextObject).forEach(key => {
-					if(key == state){
-						stateText = stateTextObject[key]
-					}
-				})
-				return stateText;
-			},
-			orderPriceToFixed (n){
-				let price ='';
-				price = n.toFixed(2);
-				return price
-			},
-			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
-			}
-		},
-		onPageScroll(e) {
-			this.scrollTop = e.scrollTop;
-		},
-		onShow() {
-			this.isModalLayer = false;
-			this.getOrderDatainit(this.currentTab)
-		}
-	}
-</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-screen{
-			height: 60rpx;
-			width: 702rpx;
-			padding: 10rpx 24rpx;
-			border-top: 1px solid #F7F7F7;
-			border-bottom: 1px solid #F7F7F7;
-			display: flex;
-			justify-content: center;
-			justify-items: center;
-			.tab-screen-item{
-				flex: 1;
-				height: 60rpx;
-				border-radius: 10rpx;
-				background: #F7F7F7;
-				margin-right: 22rpx;
-				line-height: 66rpx;
-				font-size: $font-size-28;
-				color: #333333;
-				text-align: center;
-				&.active{
-					color: $color-system;
-				}
-				&:last-child{
-					margin-right: 0;
-				}
-			}
-		}
-	}
-	.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;
-	}
-	.tui-order-list {
-		width: 100%;
-		position: relative;
-	}
-	.tui-order-item {
-		display: flex;
-		flex-direction: column;
-		width: 702rpx;
-		padding:20rpx 24rpx 0 24rpx;
-		background: #fff;
-		border-bottom: 20rpx solid #F7F7F7;
-	}
-	.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;
-		}
-		.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: 0;
-				top: 9rpx;
-			}
-			.bage-buss{
-				display: inline-block;
-				width: 72rpx;
-				height: 30rpx;
-				background:radial-gradient(circle,rgba(255,39,180,1) 0%,rgba(193,77,245,1) 100%);
-				border-radius: 4rpx;
-				line-height: 30rpx;
-				font-size: $font-size-22;
-				text-align: center;
-				color: #FFFFFF;
-			}
-			.bage-auto{
-				display: inline-block;
-				width: 72rpx;
-				height: 30rpx;
-				background:radial-gradient(circle,rgba(255,180,39,1) 0%,rgba(245,142,77,1) 100%);
-				border-radius: 4rpx;
-				line-height: 30rpx;
-				font-size: $font-size-22;
-				text-align: center;
-				color: #FFFFFF;
-			}
-			.Rebate{
-				display: inline-block;
-				width: 72rpx;
-				height: 32rpx;
-				background:#ff7a51;
-				border-radius: 6rpx;
-				line-height: 32rpx;
-				text-align: center;
-				color: #FFFFFF;
-				margin-top: 10rpx;
-				font-size: $font-size-22;
-				margin-right: 20rpx;
-			}
-			.bage-text{
-				display: inline-block;
-				font-size: $font-size-28;
-				line-height: 68rpx;
-				text-align: left;
-				color: $text-color;
-				margin-left: 10rpx;
-			}
-		}
-		.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: lef
-			}
-			.order-title-tip{
-				float: right;
-				font-size: $font-size-28;
-				line-height: 40rpx;
-				text-align: right;
-				color: #FF2A2A;
-			}
-		}
-	}
-	.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;
-			.floor-tags{
-				height: 28rpx;
-				border-radius: 6rpx;
-				background-color: #FFFFFF;
-				line-height: 28rpx;
-				color: $color-system;
-				text-align: center;
-				display: inline-block;
-				padding:0 16rpx;
-				font-size: $font-size-20;
-				border: 1px solid #E15616;
-				float: left;
-			}
-		}
-		.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: 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-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;
-		}
-		.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;
-			}
-			.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;
-			.floor-tags{
-				height: 28rpx;
-				border-radius: 6rpx;
-				background-color: #FFFFFF;
-				line-height: 28rpx;
-				color: $color-system;
-				text-align: center;
-				display: inline-block;
-				padding:0 16rpx;
-				font-size: $font-size-20;
-				border: 1px solid #E15616;
-				float: left;
-			}
-		}
-	}
-	.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, .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>

seller/pages/order/order-sharedetails.vue

@@ -1,214 +0,0 @@
-<template>
-	<view class="container details clearfix">
-		<!-- 地址选择 -->
-		<order-address ref="orderAddress" v-if="isRequest" :addressData="addressData" ></order-address>
-		<!-- 订单信息 -->
-		<order-information ref="information" v-if="isRequest" :information="information"></order-information>
-		<!-- 商品 -->
-		<goods-list ref='goods' v-if="isRequest" :shopOrderData="shopOrderData"></goods-list>
-		<!-- 发票信息 -->
-		<invoice-tent ref="invoice" v-if="isRequest" :orderInvoice="orderInvoice"></invoice-tent>
-		<!-- 转账记录 -->
-		<transfe-record ref="transfe" v-if="isRequest"></transfe-record>
-		<!-- 支付记录 -->
-		<payment-record ref="payment" v-if="isRequest" :discernReceiptList="discernReceiptList" :receiptAmount="receiptAmount"></payment-record>
-		<!-- 退款记录 -->
-		<refund-record ref="refund" v-if="isRequest" :returnedPurchaseList="returnedPurchaseList" :returnedPurchaseFee="returnedPurchaseFee"></refund-record>
-		<!-- 底部button -->
-		<view class="button-content" :style="{paddingBottom :isIphoneX ? '68rpx' : '0rpx'}">
-			<view class="btn btn-query" v-if="btnState.isQuery" @click.stop="queryLogistics">查看物流</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import orderAddress from '@/components/cm-module/orderDetails/orderAddress' 		 //地址信息
-	import goodsList from '@/components/cm-module/orderDetails/goodsList'		 		 //商品列表
-	import invoiceTent from '@/components/cm-module/orderDetails/invoiceTent'	 		 //发票信息
-	import orderInformation from '@/components/cm-module/orderDetails/orderInformation' //订单信息
-	import transfeRecord from '@/components/cm-module/orderDetails/transfeRecord'		 //转账信息
-	import paymentRecord from '@/components/cm-module/orderDetails/paymentRecord'		 //支付记录
-	import refundRecord from '@/components/cm-module/orderDetails/refundRecord'		 //退款记录
-	
-	export default {
-		components:{
-			orderInformation,
-			orderAddress,
-			invoiceTent,
-			goodsList,
-			transfeRecord,
-			paymentRecord,
-			refundRecord,
-		},
-		data() {
-			return {
-				status:'',
-				userID:'',
-				orderID:'',
-				cellPhone:'',				//客服电话
-				btnStatus:0,				//按钮组件状态
-				isRequest:false,			//是否加载完成渲染子组件
-				addressData:{},				//地址信息初始化
-				information:{},				//订单信息初始化
-				shopOrderData:{},			//商品信息初始化
-				orderInvoice:{},			//发票信息初始化
-				returnedPurchaseList:{},	//退款信息初始化
-				discernReceiptList:{},		//支付信息初始化
-				receiptAmount:0,			//支付金额
-				returnedPurchaseFee:0,		//退款金额
-				isIphoneX:this.$store.state.isIphoneX,
-				btnState:{
-					isQuery:false
-				},
-				mapStateArr:[
-					{label:'isQuery',val:[4,5,12,13,33,22,23,32,77],status: true},
-				]
-			}
-		},
-		onLoad(option){
-			this.orderID = option.orderID
-			// this.orderID = 11315
-			this.initOrderDetaileData()
-		},
-		methods: {
-			initOrderDetaileData(){//初始化页面数据@参数：订单ID
-				this.OrderService.QueryOrderDetails({ orderID : this.orderID }).then(response =>{
-					let resData = response.data;
-					this.isRequest = true
-					this.userID = resData.order.userID
-					this.status = resData.order.status
-					this.addressData = resData.userInfo
-					this.information = resData.order
-					this.shopOrderData = resData.shopOrderList
-					this.orderInvoice = resData.orderInvoice
-					this.returnedPurchaseList = resData.returnedPurchaseList
-					this.discernReceiptList = resData.discernReceiptList
-					this.receiptAmount = resData.order.receiptAmount
-					this.returnedPurchaseFee = resData.order.returnedPurchaseFee
-					this.mapStateArr.forEach(el => {
-						el.val.forEach(value => {
-							if(this.status === value){
-								this.btnState[el.label] = el.status
-							}
-						})
-					})
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000);
-				})
-			},
-			queryLogistics(){//跳转查询物流页面
-				this.$api.navigateTo('/pages/user/order/order-logistics?orderID='+this.orderID)
-			},
-		},
-		onShow() {
-
-		}
-	}
-</script>
-
-<style lang="scss">
-	page {
-		height: auto;
-		background:#F7F7F7;
-	}
-	.details{
-		padding-bottom: 130rpx;
-	}
-	.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;
-			}	
-		}
-	}
-	.button-content{
-		width: 702rpx;
-		padding:0 24rpx;
-		height: auto;
-		background: #ffffff;
-		position: fixed;
-		bottom: 0;
-		left:0 ;
-		.btn{
-			width: 160rpx;
-			height:  64rpx;
-			margin:22rpx;
-			line-height: 64rpx;
-			font-size:$font-size-26;
-			color: #FFFFFF;
-			text-align: center;
-			float: right;
-		}
-		.btn-query{
-			background:linear-gradient(135deg,rgba(255,212,129,1) 0%,rgba(198,129,0,1) 100%);
-		}
-	}
-	
-</style>

seller/pages/search/search-order.vue

@@ -1,891 +0,0 @@
-<template>
-	<view class="search-container">
-		<!-- <or-search :theme="themeClass" @getSearchText="getSearchText"></or-search> -->
-		<view class="search-main">
-			<view class="search">
-				<view class="search-input">
-					<text class="iconfont icon-iconfonticonfontsousuo1"></text>
-					<input maxlength="20" focus type="text" value="" confirm-type="search" @focus="onFocus" @input="onShowClose" @confirm="subMitSearch()" placeholder="请输入商品关键词" v-model.trim="searchInputVal"/>
-					<text class="iconfont icon-shanchu1" v-if="isShowClose" @click="delInputText()"></text>
-				</view>
-				<view class="search-btn" @click="subMitSearch()">搜索</view>
-			</view>
-		</view>
-		<view class="search-container-history" v-if="!isShowWrapper">
-			<view :class="'s-' + themeClass" v-if="serachRecordList.length>0">
-				<view class="header">
-					搜索历史<text class="iconfont icon-shanchu" @click="confirmDetele"></text>
-				</view>
-				<view class="list">
-					<view v-for="(item,index) in serachRecordList" :key="index" @click="keywordsClick(item.searchWord)">{{item.searchWord}}</view>
-				</view>
-			</view>
-		</view>
-		<view class=" order-container" v-if="isShowWrapper" :style="{'overflow' : 'auto','height': (showSkeleton? windowHeight + 'px' : 'auto')}">
-			<scroll-view  class="tui-skeleton" :style="{'height':scrollHeight+'px'}"  @scrolltolower="scrolltolower" scroll-y >
-				<view  :class="{'tui-order-list':scrollTop >= 0}" class="tui-skeleton clearfix">
-					<!-- 空白页 -->
-					<empty v-if="isShowEmpty" :navbarHeight="navbarHeight"></empty>
-					<!-- 列表 -->
-					<view v-else class="tui-order-content">
-						<view  class="tui-order-item" v-for="(order,orderIndex) in orderList" :key="orderIndex" @click.stop="detail(order.orderID)">
-							<view class="order-title">
-								<view class="order-title-name">{{order.clubName}}</view>
-								<view class="order-title-t">
-									<text class="bage-buss tui-skeleton-fillet" v-if="order.orderSubmitType == 3 || order.orderSubmitType == 4">协销</text>
-									<text class="bage-auto tui-skeleton-fillet" v-if="order.orderSubmitType == 0 || order.orderSubmitType == 1 || order.orderSubmitType == 2">自主</text>
-									<text class="bage-text tui-skeleton-fillet">订单号：{{order.orderNo}}({{order.orderID}})</text>
-									<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 tui-skeleton-fillet">下单时间：{{order.orderTime}}</view>
-									<view class="order-title-tip tui-skeleton-fillet">{{StateExpFormat(order.status)}}</view>
-								</view>
-							</view>
-							<block v-for="(shop,index) in order.shopOrderList" :key="index">
-								<view class="goods-title">
-									<view v-if="shop.shopPromotion" class="floor-item-act">
-										<view class="floor-tags">{{shop.shopPromotion.name}}</view>	
-									</view>
-									<view class="title-text tui-skeleton-fillet">{{shop.shopName}}</view>
-								</view>
-								<view class="goods-item" v-for="(pros,prosIndex) in shop.orderProductList" :key="prosIndex">
-									<view class="goods-pros-t">
-										<view class="pros-img tui-skeleton-fillet">
-											<image :src="pros.productImage" alt="" />
-											<text class="tips" v-if="pros.productType ==2 || pros.productType ==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}}</view>
-											<view class="productprice">
-												<view class="price tui-skeleton-fillet">
-													<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" v-if="pros.productPromotion!=null">
-												<view v-if="PromotionsFormat(pros.productPromotion)"  class="floor-tags">
-													{{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">{{pros.productPromotion.name}}</view>	
-											</view>
-										</view>	
-									</view>
-								</view>	
-							</block>
-							<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.productCount}}件商品</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.pendingPayments | NumFormat }}</label></view>
-								</view>
-							</view>
-							<!-- 底部button -->
-							<order-button ref="orderButton" 
-										  :status="order.status" 
-										  :orderID="order.orderID" 
-										  :userID="order.userID" 
-										  @buttonConfirm="handButtonConfirm">
-							</order-button>
-						</view>
-						<!--加载loadding-->
-						<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-						<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text='nomoreText'></tui-nomore>
-						<!--加载loadding-->
-					</view>
-				</view>
-			</scroll-view>
-		</view>
-		<!-- 分享弹窗 -->
-		<share-alert   v-if="isShareModal"
-					   :orderID="btnoRderID" 
-					   @shareConfirm ='onShareAppMessage'>
-		</share-alert>
-		<!-- 透明模态层 -->
-		<modal-layer v-if='isModalLayer'></modal-layer>
-	</view>
-</template>
-
-<script>
-	import orSearch from '@/components/uni-search/or-search.vue'
-	import tuiLoadmore from "@/components/tui-components/loadmore/loadmore"
-	import tuiNomore from "@/components/tui-components/nomore/nomore"
-	import orderButton from '@/components/cm-module/orderDetails/sellerOrderButton' //按钮
-	import modalLayer from "@/components/modal-layer"
-	import empty from "@/components/empty";
-	import shareAlert from '@/components/cm-module/modelAlert/shareAlert' //分享弹窗
-	import authorize from '@/common/config/authorize.js'
-	export default {
-		components: {
-			orSearch,
-			tuiLoadmore,
-			tuiNomore,
-			orderButton,
-			empty,
-			shareAlert,
-		},
-		data() {
-			return {
-				themeClass: 'block',
-				searchInputVal:'',
-				serviceProviderId:'',//协销ID
-				isShowClose:false,							//是否显示清空输入框图标
-				isSearchHistory:false,						//是都显示搜索历史
-				serachRecordList:[],
-				isShowWrapper:false,
-				isModallayer:false,
-				isShowEmpty:false,
-				windowHeight: '',
-				showSkeleton: true,
-				userID:0,
-				orderList: [],
-				btnClubUserID:0,
-				btnoRderID: 0, //点击按钮传入的的订单ID
-				pageNum: 1,	  //页数
-				pageSize: 10,  //条数
-				scrollTop: 0,
-				deteleType:'',
-				skeletonShow: true,
-				isShareModal: false,//控制分享弹窗
-				isCenceModal: false,//控制取消订单弹窗
-				isShowDelModal: false,//控制删除订单弹窗
-				isModalLayer: false,
-				loadding: false,
-				pullUpOn: true,
-				hasNextPage: false,
-				pullFlag: true,
-				navbarHeight:'',
-				nomoreText: '上拉显示更多',
-				scrollHeight:''
-			}
-		},
-		onLoad() {
-		  this.initGetSerachRecord()
-		},
-		filters:{
-			NumFormat(value) {//处理金额
-				return Number(value).toFixed(2);
-			},
-		},
-		methods:{
-			subMitSearch() {
-				if (this.searchInputVal == '') {
-					this.$util.msg('请输入订单编号',2000);
-				}else{
-					this.commodityList =[]
-					this.getOrderDatainit()
-				}
-			},
-			initGetSerachRecord(){
-				this.$api.getComStorage('userInfo').then((resolve) =>{
-					this.userID = resolve.userID
-					this.OrderService.SearchOrderHistory({userId:this.userID}).then(response =>{
-						this.serachRecordList = response.data
-						if(this.serachRecordList.length>0){
-							this.isSearchHistory = true
-						}else{
-							this.isSearchHistory = false
-						}
-					}).catch(error =>{
-						this.$util.msg(error.msg,2000)
-					})
-				})	
-			},
-			onShowClose () { //输入框失去焦点时触发
-				this.inputEmpty(this.searchInputVal)
-			},
-			onFocus () { //输入框获取焦点时触发
-				this.inputEmpty(this.searchInputVal)
-				this.initGetSerachRecord()
-			},
-			delInputText () { //清除输入框内容
-				this.searchInputVal = ''
-				this.isShowClose = false
-				this.isShowWrapper = false
-				this.inputEmpty(this.searchInputVal)
-				this.initGetSerachRecord()
-			},
-			keywordsClick (item) {	//关键词搜索与历史搜索
-				this.searchInputVal = item;
-				this.isShowClose = true;
-				this.subMitSearch();
-			},
-			confirmDetele () {//清空历史记录
-				this.$util.modal('提示','确定删除历史记录？','确定','取消',true,() =>{
-					this.OrderService.ClearOrderHistory({userId:this.userID}).then(response =>{
-						this.$util.msg('删除记录成功',2000,true,'success')
-						this.serachRecordList=[]
-					}).catch(error =>{
-						this.$util.msg(error.msg,2000)
-					})
-				})
-			},
-			inputEmpty(val){
-				this.isShowWrapper = false
-				if(val != ''){
-					this.isShowClose = true
-				}else{					
-					this.isShowClose = false
-				}
-			},
-			getOrderDatainit(index,source){
-				/**
-				 * @订单初始化加载  仅加载第一页码
-				 * @param：searchWord(关键词)
-				 * @param：serviceProviderId(用户ID)
-				 * @param：pageNum(页码数)
-				 * @param：pageSize(每页条数)
-				 * @param：organizeID(全局变量组织ID)
-				 */ 
-				let params = {searchWord:this.searchInputVal,userId:this.userID,pageNum:1,pageSize:this.pageSize};
-				this.SellerService.getSellerOrderList(params).then(response =>{
-					this.isShowWrapper = true
-					this.showSkeleton = true
-					const _responseData = response.data.results;
-					if(_responseData && _responseData.length > 0){
-						let filrerData = _responseData.filter(item=>{
-							//添加不同状态下订单的表现形式
-							item = Object.assign(item, this.StateExpFormat(item.state));
-							return item;
-						});
-						this.orderList =[];
-						filrerData.forEach(item=>{
-							this.orderList.push(item);
-						})
-						this.hasNextPage = response.data.hasNextPage;
-						if(this.hasNextPage){
-							this.pullUpOn = false
-							this.nomoreText = '上拉显示更多'
-						}else{
-							if(this.orderList.length < 2){
-								this.pullUpOn = true
-							}else{
-								this.pullUpOn = false
-								this.nomoreText = '已至底部'
-							}
-						}
-						this.isShowEmpty = false
-					}else{
-						this.isShowEmpty = true
-					}
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000)
-				})
-			}, 
-			getOnReachBottomData(index){//上拉加载
-				this.pageNum+=1
-				let params = {searchWord:this.searchInputVal,userId:this.userID,pageNum:this.pageNum,pageSize:this.pageSize}
-				this.SellerService.getSellerOrderList(params).then(response =>{
-					let resData = response.data.results
-					this.hasNextPage = response.data.hasNextPage;
-					this.orderList = this.orderList.concat(resData)
-					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)
-				})
-			},
-			scrolltolower() {
-				if(this.hasNextPage){
-					this.loadding = true
-					this.pullUpOn = true
-					this.showSkeleton = false
-					this.getOnReachBottomData();
-				}	
-			},
-			detail(id) {//订单详情跳转
-				this.isModalLayer = true;	
-				this.$api.navigateTo(`/seller/pages/order/order-details?type=seacrch&orderID=${id}`)
-			},
-			handButtonConfirm(data) {//获取点击
-				this.handShowAlert(data)
-				this.btnoRderID = data.orderId
-			},
-			handShowAlert(data) {//执行
-				switch(data.type){
-					case 'delete':
-						this.handOrderDetele(data.orderId);
-						break
-					case 'cancel':
-						this.handCenceConfirm(data.orderId)
-						break
-					case 'confirm':
-						this.handOrderConfirm(data.orderId);
-						break
-				}
-			},
-			handOrderConfirm (id){//确认订单
-				this.$util.modal('提示','确认此订单？','确定','取消',true,() =>{
-					this.OrderService.AffirmOrder({orderID:id}).then(response =>{
-						this.$util.msg(response.msg,2000,true,'success');
-						setTimeout(() => {
-							this.getOrderDatainit()
-						},2000)
-					}).catch(error =>{
-						this.$util.msg(error.msg,2000)
-					})
-				})
-			},
-			handOrderDetele(id){//删除订单
-				this.$util.modal('提示','确认删除该订单吗？','确定','取消',true,() =>{
-					this.OrderService.DeleteOrder({orderID:id}).then(response =>{
-						this.$util.msg(response.msg,2000,true,'success');
-						setTimeout(() => {
-							this.getOrderDatainit()
-						},2000)
-					}).catch(error =>{
-						this.$util.msg(error.msg,2000)
-					})
-				})
-			},
-			handCenceConfirm(id){//取消订单
-				this.$util.modal('提示','确认取消该订单吗？','确定','取消',true,() =>{
-					this.OrderService.CancelOrder({orderID:id}).then(response =>{
-						this.$util.msg(response.msg,2000,true,'success');
-						setTimeout(() => {
-							this.getOrderDatainit()
-						},2000)
-					}).catch(error =>{
-						this.$util.msg(error.msg,2000)
-					})
-				})
-			},
-			onShareAppMessage (res){//分享转发
-				this.isShareModal = false
-				if (res.from === 'button') {// 来自页面内转发按钮
-			    }
-				return {
-					title: '您有新的分享订单，快来查看吧~',
-					path: `/pages/user/order/order-sharelogin?orderID=${this.btnoRderID}&userID=${this.btnClubUserID}&serviceProviderId=${this.serviceProviderId}`,
-					imageUrl:'https://img.caimei365.com/group1/M00/03/95/Cmis216Sk_SABnOFABZCgCzFV_g063.png'
-				}
-			},
-			PromotionsFormat(promo){//促销活动类型数据处理
-				if(promo!=null){
-					if(promo.type == 1 && promo.mode == 1){
-						return true
-					}else{
-						return false
-					}
-				}
-				return false
-			},
-			//订单状态文字和颜色
-			StateExpFormat (state){
-				let stateText = '',
-					stateTextObject={
-						4:'交易完成',
-						5:'订单完成',
-						6:'已关闭',
-						7:'交易全退',
-						77:'交易全退',
-						11:'待付款待发货',
-						12:'待付款部分发货',
-						13:'待付款已发货',
-						21:'部分付款待发货',
-						22:'部分付款部分发货',
-						23:'部分付款已发货',
-						31:'已付款待发货',
-						32:'已付款部分发货',
-						33:'已付款已发货',
-						111:'待付款待发货',
-					}
-				Object.keys(stateTextObject).forEach(key => {
-					if(key == state){
-						stateText = stateTextObject[key]
-					}
-				})
-				return stateText;
-			},
-			orderPriceToFixed (n){
-				let price ='';
-				price = n.toFixed(2);
-				return price
-			},
-			setScrollHeight() {
-				const {windowHeight, pixelRatio} = wx.getSystemInfoSync();
-				this.windowHeight = windowHeight - 1;
-				this.scrollHeight = windowHeight - 1;
-			}
-		},
-		onPageScroll(e) {
-			this.scrollTop = e.scrollTop;
-		},
-		onShow() {
-			this.setScrollHeight();
-			this.$api.getStorage().then((resolve) =>{
-				this.serviceProviderId = resolve.serviceProviderID
-			})
-		}
-	}
-</script>
-
-<style lang="scss">
-	@import "@/uni.scss";
-	page{
-		background-color: #F7F7F7 !important;
-	}
-	.search{
-		width: 702rpx;
-		height: 70rpx;
-		padding: 12rpx 24rpx;
-		border-bottom: 1px solid #F0F0F0;
-		position: fixed;
-		top: 0;
-		left: 0;
-		background: #FFFFFF;
-		z-index: 1001;
-		.search-input{
-			width: 448rpx;
-			height: 70rpx;
-			padding: 0 68rpx;
-			line-height: 70rpx;
-			border-radius: 40rpx;
-			position: relative;
-			background: #F0F0F0;
-			float: left;
-			.icon-iconfonticonfontsousuo1{
-				font-size: 36rpx;
-				color: #8A8A8A;
-				position: absolute;
-				left: 24rpx;
-				z-index: 10;
-			}
-			.icon-shanchu1{
-				font-size: 36rpx;
-				color: #8A8A8A;
-				position: absolute;
-				right: 24rpx;
-				top: 0;
-				padding: 0 10rpx;
-				z-index: 10;
-			}
-			input{
-				width: 448rpx;
-				height: 70rpx;
-				background-color: #F0F0F0;
-				font-size: 26rpx;
-			}
-		}
-		.search-btn{
-			width: 118rpx;
-			height: 70rpx;
-			line-height: 70rpx;
-			color: $color-system;
-			font-size: 30rpx;
-			text-align: center;
-			float: left;
-		}
-		.voice-icon{
-			width: 36rpx;
-			height: 36rpx;
-			padding: 16rpx 20rpx 16rpx 0;
-			position: absolute;
-			left: 16rpx;
-			top: 4rpx;
-			z-index: 10;
-		}
-		
-	}
-	.search-container{
-		padding-top: 106rpx;
-	}
-	.s-block{
-		background: #FFFFFF;
-		.header{
-			font-size: 32rpx;
-			padding:40rpx 24rpx 22rpx 24rpx;
-			line-height: 42rpx;
-			font-size: 30rpx;
-			font-weight: bold;
-			position: relative;
-			.icon-shanchu{
-				font-size: 36rpx;
-				color: #333333;
-				float: right;
-				padding: 0 10rpx;
-				z-index: 10;
-				font-weight: normal;
-			}
-		}
-		.list{
-			display: flex;
-			flex-wrap: wrap;
-			padding-bottom: 40rpx;
-			view{
-				color: #8A8A8A;
-				font-size: 24rpx;
-				box-sizing: border-box;
-				text-align: center;
-				height: 48rpx;
-				line-height: 48rpx;
-				border-radius: 24rpx;
-				margin:12rpx;
-				padding:.0 30rpx;
-				overflow: hidden;
-				white-space: nowrap;
-				text-overflow: ellipsis;
-				background-color: #F3F3F3;
-			}
-		}
-	}
-	.s-circle{
-		margin-top: 30rpx;
-		.header{
-			font-size: 32rpx;
-			padding: 30rpx;
-			border-bottom: 2rpx solid #F9F9F9;
-			position: relative;
-			image{
-				width: 36rpx;
-				height: 36rpx;
-				padding: 10rpx;
-				position: absolute;
-				right: 40rpx;
-				top: 24rpx;
-			}
-		}
-		.list{
-			display: flex;
-			flex-wrap: wrap;
-			padding: 0 30rpx 20rpx;
-			view{
-				padding: 8rpx 30rpx;
-				margin: 20rpx 30rpx 0 0;
-				font-size: 28rpx;
-				color: #8A8A8A;
-				background-color: #F7F7F7;
-				box-sizing: border-box;
-				text-align: center;
-				border-radius: 20rpx;
-			}
-		}
-	}
-	.wanted-block{
-		margin-top: 30rpx;
-		.header{
-			font-size: 32rpx;
-			padding: 30rpx;
-		}
-		.list{
-			display: flex;
-			flex-wrap: wrap;
-			view{
-				width: 50%;
-				color: #8A8A8A;
-				font-size: 28rpx;
-				box-sizing: border-box;
-				text-align: center;
-				padding: 20rpx 0;
-				border-top: 2rpx solid #FFF;
-				border-left: 2rpx solid #FFF;
-				background-color: #F7F7F7;
-				overflow: hidden;
-				white-space: nowrap;
-				text-overflow: ellipsis;
-			}
-		}
-	}
-	.wanted-circle{
-		margin-top: 30rpx;
-		.header{
-			font-size: 32rpx;
-			padding: 30rpx;
-		}
-		.list{
-			display: flex;
-			flex-wrap: wrap;
-			padding: 0 30rpx 20rpx;
-			view{
-				padding: 8rpx 30rpx;
-				margin: 20rpx 30rpx 0 0;
-				font-size: 28rpx;
-				color: #8A8A8A;
-				background-color: #F7F7F7;
-				box-sizing: border-box;
-				text-align: center;
-				border-radius: 20rpx;
-			}
-		}
-	}
-	.order-container {
-		scroll-view {
-			height: 100%;
-			overflow: scroll;
-		}	
-	}	
-	.container {
-		padding-bottom: env(safe-area-inset-bottom);
-		height: auto;
-		position: relative;
-	}
-	.tui-order-content{
-		width: 100%;
-		height: auto;
-	}
-	.tui-order-list {
-		width: 100%;
-		position: relative;
-	}
-	.tui-order-item {
-		display: flex;
-		flex-direction: column;
-		width: 702rpx;
-		padding:20rpx 24rpx 0 24rpx;
-		background: #fff;
-		border-bottom: 20rpx solid #F7F7F7;
-	}
-	.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;
-		}
-		.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: 0;
-				top: 9rpx;
-			}
-			.bage-buss{
-				display: inline-block;
-				width: 72rpx;
-				height: 30rpx;
-				background:radial-gradient(circle,rgba(255,39,180,1) 0%,rgba(193,77,245,1) 100%);
-				border-radius: 4rpx;
-				line-height: 30rpx;
-				font-size: $font-size-22;
-				text-align: center;
-				color: #FFFFFF;
-			}
-			.bage-auto{
-				display: inline-block;
-				width: 72rpx;
-				height: 30rpx;
-				background:radial-gradient(circle,rgba(255,180,39,1) 0%,rgba(245,142,77,1) 100%);
-				border-radius: 4rpx;
-				line-height: 30rpx;
-				font-size: $font-size-22;
-				text-align: center;
-				color: #FFFFFF;
-			}
-			.bage-text{
-				display: inline-block;
-				font-size: $font-size-28;
-				line-height: 68rpx;
-				text-align: left;
-				color: $color-system;
-				margin-left: 10rpx;
-			}
-		}
-		.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: lef
-			}
-			.order-title-tip{
-				float: right;
-				font-size: $font-size-28;
-				line-height: 40rpx;
-				text-align: right;
-				color: #FF2A2A;
-			}
-		}
-	}
-	.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;
-			.floor-tags{
-				height: 28rpx;
-				border-radius: 6rpx;
-				background-color: #FFFFFF;
-				line-height: 28rpx;
-				color: $color-system;
-				text-align: center;
-				display: inline-block;
-				padding:0 16rpx;
-				font-size: $font-size-20;
-				border: 1px solid #E15616;
-				float: left;
-			}
-		}
-		.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{
-		display: flex;
-		align-items: center;
-		width: 100%;
-		height: 217rpx;
-		padding:24rpx 0;
-		.pros-img{
-			width: 210rpx;
-			height: 100%;
-			border-radius: 10rpx;
-			margin:0 26rpx 0 0;
-			border:1px solid #f3f3f3;
-			image{
-				width: 100%;
-				height: 100%;
-				border-radius: 10rpx;
-			}
-		}
-	}
-	.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;
-		}
-		.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;
-			}
-			.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;
-			.floor-tags{
-				height: 28rpx;
-				border-radius: 6rpx;
-				background-color: #FFFFFF;
-				line-height: 28rpx;
-				color: $color-system;
-				text-align: center;
-				display: inline-block;
-				padding:0 16rpx;
-				font-size: $font-size-20;
-				border: 1px solid #E15616;
-				float: left;
-			}
-		}
-	}
-	.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;
-			}
-		}
-	}
-</style>

supplier/pages/deliver/add-logistics.vue

@@ -1,587 +0,0 @@
-<template>
-	<view class="container logistics" :style="{paddingBottom :isIphoneX ? (236+68)+'rpx' : '236rpx'}" v-if="isChange">
-		<view class="logistics-list" v-for="(item,index) in logisticsList" :key="index">
-			<view class="item-title">
-				<view class="title-left">物流{{index+1}}</view>
-				<view class="title-right" v-if="(index+1) > 1" @click="deleteLogistItemFn(item,index)">
-					<text class="iconfont icon-shanchu" ></text>删除
-				</view>
-			</view>
-			<view class="item-main">
-				<view class="item-main-cell" @click.stop="pageNavigateTo(index)">
-					<input class="input" type="text" v-model="item.label" placeholder="物流公司" disabled="true">
-					<text class="iconfont icon-xiayibu"></text>
-				</view>
-				<view class="item-main-cell">
-					<input class="input" type="text" v-model="item.number" placeholder="物流单号">
-				</view>
-				<view class="item-main-cell none" @click.stop="AddScanCode(item)" >
-					<text class="iconfont icon-icon-test" ></text><text>扫码录入</text>
-				</view>
-			</view>
-		</view>
-		<view class="logistics-btn">
-			<view class="btn add-btn" @click="addListFn">添加物流</view>
-		</view>
-		<view class="logistics-btn-fiexd" :style="{paddingBottom :isIphoneX ? '68rpx' : '34rpx'}">
-			<view class="btn-tips" @click.stop="showShowRemarksFn">
-				<text class="iconfont icon-xiangxiajiantou" v-if="isShowRemarks"></text>
-				<text class="iconfont icon-xiangshangjiantou" v-else></text>
-				添加备注
-			</view>
-			<view class="logistics-remarks" :class="specClass" v-show="isShowRemarks">
-				<view class="label">拍照备注</view>
-				<view class="remarks-photo clearfix">
-					<view class="photo-item" v-for="(item, index) in photoLists" :key="index">
-						<image :src="item" mode="aspectFill" @click.stop="previewImg(index)"></image>
-						<text class="iconfont icon-iconfontguanbi" @click.stop="deletePhotoFn(index)"></text>
-					</view>
-					<view class="photo-item add" @click.stop="uploadPhotoFn" v-if="photoLists.length<10 || photoLists.length == 0">
-						<text class="iconfont icon-jiahao"></text>
-					</view>
-				</view>
-				<view class="label">文字备注</view>
-				<view class="remarks-textarea">
-					<textarea class="textarea" v-model="info.note" value="" placeholder="文字备注，200字以内" maxlength="200" @input="conInput"/>
-					<text class="limit-text"><text class="red">{{min}}</text>/{{max}}</text>
-				</view>
-				<view class="remarks-tips">请备注快递单、发货现场和货物的照片，最多10张</view>
-			</view>
-			<view class="btn confim-btn" @click="confirmDeliverFn">确认发货</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import { mapState,mapMutations } from 'vuex'
-	import authorize from '@/common/config/authorize.js' 
-	import { uploadFileImage } from "@/api/utils.js"
-	var isPreviewImg;
-	export default{
-		data() {
-			return{
-				logisticsBatchId:'',
-				isIphoneX:this.$store.state.isIphoneX,
-				isChange:true,
-				isShowRemarks:false,
-				specClass:'',
-				photoLists:[],
-				checkLogicsIndex:0,
-				selectID:0,
-				addLogisticsType:'',
-				info:{
-					image:'',
-					note:'',
-					shopOrderId:''
-				},//备注信息
-				record:[],//子订单商品信息
-				logisticsList:[{
-					label:'',
-					number:'',
-					value:'',
-				}],
-				min:0,
-				max:200
-			}
-		},
-		watch: {
-			logisticsList: {
-				handler: function (el) {//监听对象的变换使用 function，箭头函数容易出现this指向不正确
-					this.logisticsList = el
-				},
-				deep: true
-			}
-		},
-		onLoad(option) {
-			if(option.type == 'add'){
-				this.addLogisticsType = option.type
-				this.info.shopOrderId = option.shopOrderId;
-				this.record = JSON.parse(option.data)
-			}else{
-				let queryData = JSON.parse(option.data);
-				this.addLogisticsType = option.type
-				this.logisticsBatchId = queryData.logisticsBatchId
-				this.info.shopOrderId = option.shopOrderId;
-				this.initGetLogisticsInfo()
-			}
-		},
-		methods:{
-			...mapMutations(['login']),
-			initGetLogisticsInfo(){
-				this.ShopService.GetLogisticsInfo({ logisticsBatchId : this.logisticsBatchId, shopOrderId:this.info.shopOrderId }).then(response =>{
-					const data = response.data.logisticsBatch
-					if(data.remarkImages!=null){
-						this.photoLists = data.remarkImages
-					}else{
-						this.photoLists =[]
-					}
-					this.info.note = data.remark
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000);
-				})
-			},
-			AddScanCode(item){
-				let self = this;
-				uni.scanCode({
-				    onlyFromCamera: true,
-				    success: function (res) {
-						item.number= res.result
-						self.ShopService.GetExpressInformation({number:res.result}).then(response =>{
-							item.label= response.data.label
-							item.value= response.data.value
-							self.selectID = response.data.id
-						}).catch(error =>{
-							self.$util.msg(error.msg,2000);
-						})
-				    }
-				});
-			},
-			addListFn(){//添加
-				this.isShowRemarks = false
-				let obj ={name:'',number:'',value:''};
-				this.logisticsList.push(obj)
-			},
-			deleteLogistItemFn(item,index){
-				this.$util.modal('提示','确认删除物流信息吗？','确定','取消',true,() =>{
-					this.logisticsList.splice(index, 1);
-				})
-			},
-			pageNavigateTo(index){//选择物流公司
-				this.isChange = false
-				this.checkLogicsIndex = index
-				this.$api.navigateTo(`/supplier/pages/deliver/logistics-list?selectID=${this.selectID}`)
-			},
-			showShowRemarksFn(){//显示发货备注
-				this.isShowRemarks = !this.isShowRemarks 
-				if(this.isShowRemarks){
-					this.specClass = 'show';
-				}else{
-					this.specClass = 'hide';
-				}
-			},
-			uploadPhotoFn(){//添加发货备注图片
-				uploadFileImage().then(res =>{
-					this.photoLists.push(JSON.parse(res.data).data)
-				})
-			},
-			deletePhotoFn(index){//删除发货备注图片
-				this.photoLists.splice(index, 1);
-			},
-			confirmDeliverFn(){//确认发货
-				switch(this.addLogisticsType){
-					case 'add':
-						this.isNewAddLogisticsFn()
-						break;
-					case 'reple':
-						this.isRepleAddLogisticsFn()
-						break;
-				}
-			},
-			isRepleAddLogisticsFn(){//重新添加物流信息
-				// 校验物流公司不能为空
-				let isLogisticsLabel = false
-				let isLogisticsNumber = false
-				this.logisticsList.forEach(el =>{
-					if(el.label == ''){
-						isLogisticsLabel = true
-					}
-					if(el.number == ''){
-						isLogisticsNumber = true
-					}
-				})
-				if(isLogisticsLabel){
-					this.$util.msg('请选择物流公司',2000);
-					return
-				}
-				if(isLogisticsNumber){
-					this.$util.msg('请输入物流单号',2000);
-					return
-				}
-				//统一处理物流单号
-				let logisticsArray = []
-				let checkRepeat = false
-				for (const el of this.logisticsList) {
-					 // 检查缓存中是否已经存在
-					if (logisticsArray.find(c => c.number === el.number && c.number === el.number)) {
-					   // 已经存在
-					  checkRepeat = true
-					}else{
-						// 不存在就说明以前没遇到过，把它记录下来
-						let logisticsObj = {
-								number:el.number,
-								logisticsCompanyName:el.label,
-								logisticsCompanyCode:el.value 
-							}
-						logisticsArray.push(logisticsObj)
-					}
-				}
-				if(checkRepeat){
-					this.$util.msg('物流单号重复',2000);
-					return
-				}
-				//统一处理备注图片
-				this.photoLists.forEach(el =>{
-					this.info.image += el+'##'
-				})
-				let params = {
-						logistics:logisticsArray,
-						remarkImage:this.info.image,
-						remark:this.info.note,
-						logisticsBatchID:this.logisticsBatchId
-					}
-				this.ShopService.ShopAddLogisticsInfo({params:JSON.stringify(params)}).then(response =>{
-					this.$util.msg('添加物流成功',2000,true,'success')
-					setTimeout(()=>{
-						this.$api.navigateTo(`/supplier/pages/deliver/deliver-record?shopOrderId=${this.info.shopOrderId}`)
-					},2000)
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000);
-				})
-			},
-			isNewAddLogisticsFn(){//第一次添加发货物流信息
-				// 校验物流公司不能为空
-				let isLogisticsLabel = false
-				let isLogisticsNumber = false
-				this.logisticsList.forEach(el =>{
-					if(el.label == ''){
-						isLogisticsLabel = true
-					}
-					if(el.number == ''){
-						isLogisticsNumber = true
-					}
-				})
-				if(isLogisticsLabel){
-					this.$util.msg('请选择物流公司',2000);
-					return
-				}
-				if(isLogisticsNumber){
-					this.$util.msg('请输入物流单号',2000);
-					return
-				}
-				//统一处理物流单号
-				let logisticsArray = []
-				let checkRepeat = false
-				for (const el of this.logisticsList) {
-					 // 检查缓存中是否已经存在
-					if (logisticsArray.find(c => c.number === el.number && c.number === el.number)) {
-					   // 已经存在
-					  checkRepeat = true
-					}else{
-						// 不存在就说明以前没遇到过，把它记录下来
-						let logisticsObj = {
-								number:el.number,
-								logisticsCompanyName:el.label,
-								logisticsCompanyCode:el.value 
-							}
-						logisticsArray.push(logisticsObj)
-					}
-				}
-				if(checkRepeat){
-					this.$util.msg('物流单号重复',2000);
-					return
-				}
-				//统一处理备注图片
-				this.info.image = ''
-				this.photoLists.forEach(el =>{
-					this.info.image += el+'##'
-				})
-				let params = {
-						logistics:logisticsArray,
-						record:this.record,
-						info:this.info
-					}
-				this.ShopService.ShopAddLogistics({params:JSON.stringify(params)}).then(response =>{
-					this.$util.msg('发货成功',2000,true,'success')
-					setTimeout(()=>{
-						this.$api.redirectTo(`/supplier/pages/deliver/deliver-record?shopOrderId=${this.info.shopOrderId}`)
-					},2000)
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000);
-				})
-			},
-			previewImg (index) {//顶部商品图片预览
-				isPreviewImg = true
-				let previewUrls = this.photoLists
-				uni.previewImage({
-					current: index, 	//图片索引
-					urls: previewUrls, //必须是http图片，本地图片无效
-					longPressActions:''
-				})
-			},
-			conInput(e){//备注文字字数限制
-				let value = e.detail.value;
-				let len = parseInt(value.length);
-				if (len > this.max) return;
-				this.min = len;
-				if(this.min == 200){
-					this.$util.msg('您输入的字数已达上限',2000);
-				}
-			}
-		},
-		onShow() {
-			//处理选择物流公司
-			let pages = getCurrentPages();
-			let currPage = pages[pages.length-1];
-			if(currPage.data.select =='select'){
-				let SelectData = uni.getStorageSync('selectLogics')
-				this.selectID = SelectData.id
-				let setNewLogisticsList = this.logisticsList
-				setNewLogisticsList.forEach((el,index,arr) =>{
-					if(index == this.checkLogicsIndex ){
-						arr[this.checkLogicsIndex] = Object.assign({},arr[this.checkLogicsIndex],SelectData)
-					}
-				})
-				this.logisticsList = setNewLogisticsList
-			}
-			this.isChange = true
-		}
-	}
-</script>
-
-<style lang="scss">
-	page {
-		height: auto;
-		background:#F7F7F7;
-	}
-	@keyframes showRemarks {
-		0% {opacity: 0;}
-		20% {opacity: 0.2;}
-		40% {opacity: 0.4;}
-		60% {opacity: 0.6;}
-		80% {opacity: 0.8;}
-		100% {opacity: 1;}
-	}
-	@keyframes hideRemarks {
-		0% {opacity: 1;}
-		20% {opacity: 0.8;}
-		40% {opacity: 0.6;}
-		60% {opacity: 0.4;}
-		80% {opacity: 0.2;}
-		100% {opacity: 0;}
-	}
-	.logistics{
-		border-top: 1px solid #EBEBEB;
-	}
-	.logistics-list{
-		width: 100%;
-		height: auto;
-		padding: 10rpx 0;
-		background-color: #FFFFFF;
-		margin-bottom: 24rpx;
-		.item-title{
-			width: 702rpx;
-			height: 80rpx;
-			padding: 0 24rpx;
-			line-height: 80rpx;
-			text-align: left;
-			font-size: $font-size-28;
-			color: $text-color;
-			border-bottom: 1px solid #EBEBEB;
-			.title-left{
-				float: left;
-			}
-			.title-right{
-				float: right;
-				.icon-shanchu{
-					font-size: $font-size-30;
-					color: #FF2A2A;
-				}
-			}
-		}
-		.item-main{
-			width: 702rpx;
-			padding: 0 24rpx;
-			.item-main-cell{
-				width: 100%;
-				height: 80rpx;
-				line-height: 80rpx;
-				border-bottom: 1px solid #EBEBEB;
-				position: relative;
-				&.none{
-					border-bottom: none;
-					text-align: center;
-					font-size: $font-size-28;
-					color: $color-system;
-				}
-				.icon-xiayibu{
-					width: 40rpx;
-					height: 80rpx;
-					display: block;
-					position: absolute;
-					right: 0;
-					top: 0;
-					font-size: $font-size-32;
-					color: $text-color;
-					text-align: center;
-				}
-				.icon-icon-test{
-					color: $color-system;
-					font-size: $font-size-28;
-					margin-right: 10rpx;
-				}
-				.input{
-					width: 100%;
-					height: 44rpx;
-					line-height: 44rpx;
-					padding: 18rpx 0;
-					font-size: $font-size-28;
-					color: $text-color;
-				}
-			}
-		}
-	}
-	.logistics-btn{
-		width: 702rpx;
-		height: 88rpx;
-		margin: 0 auto;
-		.btn{
-			width: 100%;
-			height: 100%;
-			background-color: #FFF;
-			border-radius: 44rpx;
-			border: 1px solid $color-system;
-			line-height: 88rpx;
-			text-align: center;
-			color: $color-system;
-		}
-	}
-	.logistics-btn-fiexd{
-		width: 702rpx;
-		padding: 0 24rpx;
-		height:auto;
-		position: fixed;
-		bottom: 0;
-		left: 0;
-		background-color: #FFF;
-		border-radius: 20rpx 20rpx 0 0;
-		box-shadow:0px 3px 10px rgba(51, 51, 51,0.5);
-		z-index: 999;
-		.btn-tips{
-			height: 80rpx;
-			line-height: 80rpx;
-			text-align: center;
-			font-size: $font-size-28;
-			color: #999999;
-		}
-		.confim-btn{
-			width: 702rpx;
-			height: 88rpx;
-			background: $btn-confirm;
-			line-height: 88rpx;
-			text-align: center;
-			color: #FFF;
-			font-size: $font-size-28;
-			border-radius: 44rpx;
-		}
-		.logistics-remarks{
-			width: 100%;
-			height: auto;
-			&.show {
-				animation: showRemarks 0.2s linear both;
-			}
-			&.hide {
-				animation: hideRemarks 0.2s linear both;
-			}
-			.label{
-				height: 44rpx;
-				line-height: 44rpx;
-				font-size: $font-size-28;
-				color: $text-color;
-			}
-			.remarks-photo{
-				width: 100%;
-				height: auto;	
-				padding: 10rpx 0;
-				.photo-item{
-					display: inline-block;
-					width: 112rpx;
-					height: 112rpx;
-					margin: 10rpx 0;
-					margin-right: 25rpx;
-					border-radius: 10rpx;
-					border:1px solid #F5F5F5;
-					position: relative;
-					float: left;
-					&.add{
-						width: 112rpx;
-						height: 112rpx;
-						border-color: #FFC684;
-						text-align: center;
-						line-height: 112rpx;
-						margin-right: 0rpx;
-						.icon-jiahao{
-							font-size: $font-size-44;
-							color:#FFC684 ;
-							font-weight: bold;
-						}
-					}
-					.icon-iconfontguanbi{
-						width: 24rpx;
-						height: 24rpx;
-						border-radius: 0 10rpx 0 0;
-						display: block;
-						position: absolute;
-						right: 0;
-						top: 0;
-						background: rgba(51, 51, 51, 0.7);
-						text-align: center;
-						line-height: 24rpx;
-						color: #FFF;
-						font-size: $font-size-22;
-					}
-					image{
-						width: 112rpx;
-						height: 112rpx;
-						border-radius: 10rpx;
-					}
-				}	
-				.photo-list{
-					width: 100%;
-					height: 116rpx;
-					overflow: hidden;
-					white-space: nowrap;
-					display: flex;
-					align-items: flex-start;
-				}
-				.scoll-wrapper{
-					display:flex;
-					align-items: flex-start;
-				}
-			}
-			.remarks-textarea{
-				width: 652rpx;
-				height: 124rpx;
-				padding:10rpx 24rpx 24rpx 24rpx;
-				margin-top: 20rpx;
-				background-color: #F5F5F5;
-				border-radius: 10rpx;
-				position: relative;
-				.textarea{
-					width: 100%;
-					height: 100%;
-					line-height: 36rpx;
-					font-size: $font-size-24;
-					color: $text-color;
-					z-index: 1;
-				}
-				.limit-text{
-					position: absolute;
-					right: 20rpx;
-					bottom: 0;
-					line-height: 44rpx;
-					font-size: $font-size-24;
-					color: #D0D0D0;
-					.red{
-						color: $color-system;
-					}
-				}
-			}
-			.remarks-tips{
-				width: 100%;
-				line-height: 70rpx;
-				font-size: $font-size-24;
-				color: #999999;
-			}
-		}
-	}
-</style>

supplier/pages/deliver/deliver-goods.vue

@@ -1,537 +0,0 @@
-<template>
-	<view class="container cart clearfix"> 
-		<view class="record-content-empty" v-if="isEmpty" :style="{'height': windowHeight ? windowHeight - CustomBar+'px' : 'auto'}">
-			<view class="record-container clearfix">
-				<image class="club-empty-image" src="https://img.caimei365.com/group1/M00/03/B7/Cmis2178OfaAEjhLAABqsz9OXM0847.png" mode="aspectFit"></image>
-				<view class="txt">未发货商品已全部取消,无需再发货~</view>
-			</view>
-		</view>
-		<view class="container-cart-main" v-else>
-			<view class="container-cart">
-				<view class="cart-content" :style="{paddingBottom :isIphoneX ? '130rpx' : '100rpx'}">
-					<view class="goods-title">请选择合适的商品数量进行发货</view>
-					<view class="goods-list">
-						<view 	class="goods-pros" v-for="(pros,idx) in productsList" :key="idx" >
-							<view class="goods-pros-t"  @click.stop="ischeck(pros)">
-								<!--选择商品-->
-								<view class="checkbox-box">
-									<button class="checkbox iconfont" :class="[pros.checked ?'icon-gouxuanl':'icon-weigouxuan']"></button>
-								</view>
-								<view class="pros-img"><image :src="pros.productImage ? pros.productImage:''" alt="" /></view>
-								<view class="pros-product">
-									<view class="producttitle">{{pros.name}}</view>
-									<view class="productspec">规格:{{pros.productUnit ? pros.productUnit : ''}}</view>
-									<view class="productspec">商品编码:{{pros.productNo ? pros.productNo : ''}}</view>
-									<view class="product-view">
-										<view class="view-num">数量：{{pros.num+pros.presentNum}}</view>
-									</view>
-									<view class="product-view">
-										<view class="view-num">已发货：{{pros.shipmentsNum}}</view>
-										<view class="view-num">未发货：{{pros.notOutStore-pros.actualCancelNum}}</view>
-									</view>
-									<view class="product-view">
-										<view class="view-num">已退货：{{pros.returnedNum}}</view>
-										<view class="view-num">已取消：{{pros.actualCancelNum}}</view>
-									</view>
-								</view>	
-							</view>
-							<view class="goods-pros-b">
-								<view class="productprice">
-									<view class="text">本次发货</view>
-									<view class="count">
-										<view class="number-box">
-											<view  class="iconfont icon-jianhao" :class="[pros.isReduceNum ? 'disabled':'']" @click="changeCountSub(pros)"></view>
-											<input class="btn-input" type="number" maxlength='4' v-model="pros.shipmentCount" @blur="changeNnmber($event,pros)">
-											<view  class="iconfont icon-jiahao"  :class="[pros.isPlusNum ?'disabled':'']" @click="changeCountAdd(pros)"></view>
-										</view>
-									</view>
-								</view>
-							</view>
-						</view>
-					</view>	
-				</view>
-				<!-- 脚部菜单 -->
-				<view class="footer" :style="{paddingBottom :isIphoneX ? '68rpx' : '0rpx'}">
-					<view class="footer-le">
-						<view class="foot-check checkbox-box" @tap.stop="checkAll()">
-							<button class="checkbox iconfont" :class="[isCheckAll?'icon-gouxuan':'icon-weigouxuan']"></button> 
-							<view class="text">全选</view>
-						</view>
-					</view>
-					<view class="footer-ri" >
-						<view class="btn" @tap="toConfirmDeliver">去发货</view>
-					</view>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-<script>
-	import authorize from '@/common/config/authorize.js'
-	import { mapState,mapMutations } from 'vuex';
-	
-	export default{
-		data(){
-			return{
-				isEmpty:false,
-				CustomBar:this.CustomBar,// 顶部导航栏高度
-				isIphoneX:this.$store.state.isIphoneX,
-				shopOrderId:'',
-				productsList:[],//发货的商品
-				isCheckAll:false,//是否全选
-				scrollHeight: '',
-				windowHeight: '',
-			}
-		},
-		onLoad(option){
-			this.shopOrderId = option.shopOrderId
-			this.setScrollHeight()
-			this.initShopOrderShipmentsInfo();
-		},
-		computed: {
-			...mapState(['hasLogin','userInfo'])
-		},
-		methods:{
-			initShopOrderShipmentsInfo(){//初始化
-				this.ShopService.ShopOrderShipmentsInfo({ shopOrderId : this.shopOrderId }).then(response =>{
-					if( response.data.orderProductList.length>0){
-						let orderProductList = response.data.orderProductList
-						let elObject = {}
-						let isReduceNum = false
-						let creatProductList = []
-						this.isEmpty = false
-						orderProductList.forEach(el =>{
-							let uninNum = el.notOutStore - el.actualCancelNum//未发货数量
-							if(uninNum == 1){
-								isReduceNum = true
-							}else{
-								isReduceNum = false
-							}
-							elObject = {
-								shipmentCount:uninNum,
-								isReduceNum:isReduceNum,
-								checked:false
-							}
-							creatProductList.push(Object.assign({},el,elObject))
-						})
-						this.productsList = creatProductList
-						console.log(this.productsList)
-					}else{
-						this.isEmpty = true
-					}
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000);
-				})
-				
-			},		
-			setScrollHeight() {
-				const {windowHeight, pixelRatio} = wx.getSystemInfoSync();
-				this.windowHeight = windowHeight - 1;
-				this.scrollHeight = windowHeight - 1;
-			},
-			ischeck(pro){//为未选中的时候改变为true，反之为true
-				pro.checked = !pro.checked;
-				this.updateCheckAllBtn();
-			},
-			updateCheckAllBtn() {// 全选勾选判断
-				let goodsCheckedLength = 0,
-					productsList = this.productsList;
-				productsList.forEach(item => {
-					if(item.checked) { goodsCheckedLength++; }
-				})
-				this.isCheckAll = goodsCheckedLength === productsList.length;
-			},
-			updateBothCheckBtn() {//
-				this.productsList.forEach((item)=>{
-					item.checked = this.isCheckAll ;
-				})
-			},
-			checkAll(){//全选方法内调用方法
-			    this.isCheckAll = !this.isCheckAll;
-				this.updateBothCheckBtn();     
-			},
-			changeCountAdd(pros){//商品数量加加
-				let uninNum = pros.notOutStore-pros.actualCancelNum//未发货数量
-				if(pros.shipmentCount == uninNum){
-					this.isNoneNum =true
-					return
-				}else{
-					pros.shipmentCount++
-					this.isNoneNum =false
-				}
-			},
-			changeCountSub(pros){//商品数量减减
-				let uninNum = pros.notOutStore-pros.actualCancelNum//未发货数量
-				if(pros.shipmentCount == 1){
-					pros.shipmentCount = pros.shipmentCount
-					return
-				}else{
-					pros.shipmentCount--
-				}
-			},
-			changeNnmber(e,pros){//输入商品数量更新
-				let uninNum = pros.notOutStore-pros.actualCancelNum//未发货数量
-				let _value = e.detail.value;
-				if(!this.$api.isNumber(_value) || uninNum == 1){
-					pros.shipmentCount = uninNum
-				}else if(_value > uninNum){	
-					pros.shipmentCount = uninNum
-				}else{
-					pros.shipmentCount = e.detail.value
-				}
-			},
-			toConfirmDeliver(){//添加物流页面
-				let setProductList=[];
-				this.productsList.forEach(el=>{
-					if(el.checked){
-						let elObject = {
-								orderProductId:el.orderProductID.toString(),
-								num:el.shipmentCount.toString()
-						}
-						setProductList.push(elObject)
-					}
-				})
-				if(setProductList == ''){
-					this.$util.msg("请先选择商品~",2000);
-					return
-				}else{
-					this.$api.navigateTo(`/supplier/pages/deliver/add-logistics?type=add&shopOrderId=${this.shopOrderId}&data=${JSON.stringify(setProductList)}`)
-				}
-			},
-		},
-		onPullDownRefresh() {//下拉刷新
-			this.initShopOrderShipmentsInfo()
-			uni.stopPullDownRefresh()
-		},
-		onShow(){
-		
-		},
-	}
-</script>
-
-<style lang="scss">
-	page{
-		background: #f7f7f7;
-		height: auto;
-	}
-	.record-content-empty{
-		width: 100%;
-		height: 100%;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		.record-container{
-			width: 465rpx;
-			height: auto;
-			image{
-				width: 400rpx;
-				height: 400rpx;
-				display: block;
-				margin: 0 auto;
-			}
-			.txt{
-				font-size: $font-size-28;
-				text-align: center;
-				color: #333;
-				line-height: 30rpx;
-				margin-bottom: 20rpx;
-			}
-			.btn{
-				width: 400rpx;
-				height: 80rpx;
-				background: $btn-confirm;
-				border-radius: 10rpx;
-				line-height: 80rpx;
-				font-size: $font-size-28;
-				text-align: center;
-				color: #FFFFFF;
-			}
-		}
-	}
-	.cart-content{
-		position: relative;
-	}
-	.goods-title{
-		width: 702rpx;
-		padding: 0 24rpx;
-		height: 80rpx;
-		line-height: 80rpx;
-		text-align: left;
-		font-size: $font-size-28;
-		color: $color-system;
-		background-color: rgba(225, 86, 22, 0.17);
-	}
-	.checkbox-box{
-		display: flex;
-		align-items: center;
-		.checkbox{
-			display: flex;
-			margin: 0;
-			padding: 0;
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-			box-sizing: border-box;
-			text-align: center;
-			text-decoration: none;
-			border-radius: 0;
-			-webkit-tap-highlight-color: transparent;
-			overflow: hidden;
-			background-color:#FFFFFF;
-			font-size: 36rpx;
-			color:$color-system;
-		}
-		&.disabled{
-			.checkbox{
-				color:#999999
-			}
-		}
-		.text{
-			font-size: $font-size-24;
-			margin-left: 10rpx;
-		}
-	}
-	.goods-list{
-		width: 100%;
-		height: auto;
-		background-color: #F7F7F7;
-		margin-top: 24rpx;
-		.goods-item{
-			width: 702rpx;
-			padding: 0 24rpx;
-			background: #FFFFFF;
-			margin-bottom: 24rpx;
-		}
-		.goods-pros{
-			width: 702rpx;
-			padding: 0 24rpx;
-			background: #FFFFFF;
-			margin-bottom: 24rpx;
-		}	
-		.goods-pros-t{
-			display: flex;
-			width: 100%;
-			height: auto;
-			padding:20rpx 0;
-			.checkbox-box{
-				padding: 10rpx;
-			}
-			.pros-img{
-				width: 210rpx;
-				height: 210rpx;
-				border-radius: 10rpx;
-				margin:0 20rpx;
-				border:1px solid #f3f3f3;
-				image{
-					width: 100%;
-					height: 100%;
-					border-radius: 10rpx;
-				}
-			}
-		}
-		.goods-pros-b{
-			width:622rpx;
-			height: 80rpx;
-			margin-left: 84rpx;
-			border-top: 1px solid #F7F7F7;
-			position: relative;
-			.productprice{
-				height: 48rpx;
-				width: 100%;
-				margin-top: 15rpx;
-				.text{
-					line-height: 48rpx;
-					float: left;
-					color: $text-color;
-					font-size: $font-size-28;
-				}
-				.count{
-					height: 100%;
-					float: right;
-					position: relative;
-					&.show{
-						display: block;
-					}
-					&.none{
-						display: none;
-					}
-					.number-box{
-						display: flex;
-						justify-content: center;
-						align-items: center;
-						.iconfont{
-							font-size: $font-size-24;
-							padding:0 18rpx;
-							color: $text-color;
-							text-align: center;
-							line-height: 48rpx;
-							font-weight: bold;
-							background-color: #ffe6dc;
-							&.disabled{
-								color: #999999;
-							}
-						}
-						.btn-input{
-							width: 62rpx;
-							height: 48rpx;
-							line-height: 48rpx;
-							background: #F8F8F8;
-							border-radius: 4rpx;
-							text-align: center;
-							font-size: $font-size-24;
-						}
-					}
-					.uni-numbox{
-						position: absolute;
-						left: 45rpx;
-						bottom: 0;
-						.uni-numbox-minus, .uni-numbox-plus{
-							width: 50rpx;
-							line-height: 40rpx;
-						}
-						.uni-numbox-value {
-							font-size: $font-size-28;
-							width: 60rpx;
-						}
-					}
-				}
-			}
-		}
-		.pros-product{
-			width: 402rpx;
-			height: 100%;
-			line-height: 36rpx;
-			font-size: $font-size-28;	
-			position: relative;
-			.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: 44rpx;
-				color: #999999;
-				line-height: 44rpx;
-				font-size: $font-size-26;
-			}
-			.product-view{
-				width: 100%;
-				height: auto;
-				display: flex;
-				.view-num{
-					flex: 1;
-					text-align: left;
-					font-size: $font-size-26;
-					color: #666666;
-					line-height: 44rpx;
-				}
-			}
-		}
-	}
-	.footer{
-		width: 100%;
-		background-color: #FFFFFF;
-		height: 110rpx;
-		position: fixed;
-		bottom: 0rpx;
-		z-index: 100;
-		.footer-le{
-			width: 450rpx;
-			height: 100%;
-			padding:0 30rpx;
-			float: left;
-			.text{
-				font-weight: bold;
-			}
-			.foot-check{
-				width: 100rpx;
-				float: left;
-				line-height: 110rpx;
-				font-size: $font-size-24;
-				.checkbox{
-					width: 40rpx;
-					text-align: center;
-				}
-				.text{
-					width: 60rpx;
-					float: right;
-				}
-			}
-			.foot-check-delbtn{
-				float: left;
-				.delBtn{
-					margin: 0;
-					padding: 0;
-					display: flex;
-					flex-direction: column;
-					align-items: center;
-					box-sizing: border-box;
-					font-size: $font-size-24;
-					text-align: center;
-					text-decoration: none;
-					border-radius: 0;
-					-webkit-tap-highlight-color: transparent;
-					overflow: hidden;
-					background-color:#FFFFFF;
-					color: #FF2A2A;
-					padding: 0 24rpx;
-					display: flex;
-					justify-content: center;
-					align-items: center;
-					line-height: 110rpx;
-					font-weight: bold;
-					&.none{
-						display: none;	
-					}
-				}
-			}
-			.sum{
-				font-size: $font-size-28;
-				line-height: 110rpx;
-				color: $text-color;
-				display: flex;
-				justify-content: flex-end;
-				.money{
-					color: #FF2A2A;
-				}
-				.money-sign{
-					font-size: $font-size-24;
-					color: #FF2A2A;
-				}
-			}
-		}
-		.footer-ri{
-			width: 200rpx;
-			height: 64rpx;
-			background:linear-gradient(135deg,rgba(242,143,49,1) 0%,rgba(225,86,22,1) 100%);
-			float: right;
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			z-index: 999;
-			margin-top: 20rpx;
-			margin-right: 24rpx;
-			border-radius: 32rpx;
-			&.none{
-				display: none;
-			}
-			.btn{
-				width: 200rpx;
-				height: 64rpx;
-				font-size: $font-size-28;
-				line-height: 64rpx;
-				color: #FFFFFF;
-				display: flex;
-				justify-content: center;
-				align-items: center;
-			}
-		}
-	}
-</style>

supplier/pages/deliver/deliver-record.vue

@@ -1,479 +0,0 @@
-<template>
-	<view class="container record clearfix" :style="{paddingTop:CustomBar+'px'}"> 
-		<cd-custom :systeminfo='systeminfo' :navbar-data='nvabarData' :headerBtnPosi ="headerBtnPosi" :page='1' @pageDetails="hanldPageDetails"></cd-custom>
-		<view class="record-content-empty" v-if="isEmpty" :style="{'height': windowHeight ? windowHeight - CustomBar+'px' : 'auto'}">
-			<view class="record-container clearfix">
-				<image class="club-empty-image" src="https://img.caimei365.com/group1/M00/03/B7/Cmis2178OfaAEjhLAABqsz9OXM0847.png" mode="aspectFit"></image>
-				<view class="txt">此订单暂无发货记录~</view>
-				<view class="btn" @click="pageGoLink">去发货</view>
-			</view>
-		</view>
-		<view class="record-content" v-else>
-			<scroll-view scroll-y="true" class="scroll-view">
-				<view class="record-list clearfix"  v-for="(item,index) in RecordList" :key="index">
-					<view class="record-top clearfix">
-						<view class="top-view">
-							<view class="top-viewlabel">发货时间:</view>
-							<view class="top-viewtext">{{item.deliveryTime}}</view>
-						</view>
-						<view class="top-view" v-for="(logist,idx) in item.logisticsInformationList" :key="logist.id">
-							<view class="top-viewlabel">{{logist.logisticsCompanyName}}:</view>
-							<view class="top-viewtext">
-								<text>{{logist.nu}}</text>
-							</view>
-						</view>
-					</view>
-					<view class="goods-pros">
-						<view class="goods-pros-t" v-for="(pros,idx) in item.logisticsRecordList" :key="pros.id">
-							<view class="pros-img"><image :src="pros.image ? pros.image:''" alt="" mode="aspectFill"/></view>
-							<view class="pros-product">
-								<view class="producttitle">{{pros.productName}}</view>
-								<view class="productspec">规格:{{pros.unit ? pros.unit : ''}}</view>
-								<view class="productspec">商品编码:{{pros.productCode ? pros.productCode : ''}}</view>
-								<view class="product-view">
-									<view class="view-num">数量：{{pros.buyNum}}</view>
-								</view>
-								<view class="product-view">
-									<view class="view-num">本次发货：{{pros.num}}</view>
-									<view class="view-num">已发货：{{pros.shipmentsNum}}</view>
-								</view>
-								<view class="product-view">
-									<view class="view-num">未发货：{{pros.notShippedNum}}</view>
-									<view class="view-num">已退货：{{pros.returnedNum}}</view>
-								</view>
-							</view>	
-						</view>
-						<view class="goods-pros-b clearfix" v-show="item.remarkImages.length>0">
-							<view class="b-label">拍照备注</view>
-							<view class="b-photo">
-								<view class="b-imageView" v-for="(imgItem,imgIdx) in item.remarkImages" :key="imgIdx" >
-									<image :src="imgItem" mode="aspectFill"  @click="previewImg(imgIdx,item.remarkImages)"></image>
-								</view>
-							</view>
-						</view>
-						<view class="goods-pros-b clearfix" v-if="item.remark!=''">
-							<view class="b-label">文字备注</view>
-							<view class="b-photo">
-								<view class="text">{{item.remark ? item.remark : ''}}</view>
-							</view>
-						</view>
-					</view>
-					<!-- 底部button -->
-					<order-button ref="orderButton" 
-								  :hanldData="item" 
-								  @buttonConfirm="handButtonConfirm">
-					</order-button>
-				</view>
-				<!--加载loadding-->
-				<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-				<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text='nomoreText'></tui-nomore>
-				<!--加载loadding-->
-			</scroll-view>	
-		</view>
-	</view>
-</template>
-<script>
-	import { mapState,mapMutations } from 'vuex';
-	import orderButton from '@/components/cm-module/orderDetails/supplierRecorgButton.vue'	//底部按钮
-	import tuiLoadmore from "@/components/tui-components/loadmore/loadmore"
-	import tuiNomore from "@/components/tui-components/nomore/nomore"
-	import cdCustom from "@/components/cm-custom/custom-d"
-	
-	var isPreviewImg 
-	export default{
-		components:{
-			orderButton,
-			tuiLoadmore,
-			tuiNomore,
-			cdCustom
-		},
-		data(){
-			return{
-				nvabarData: {//顶部自定义导航
-					showCapsule: 1, // 是否显示左上角图标   1表示显示    0表示不显示
-					title: '发货记录', // 导航栏 中间的标题
-				},
-				headerBtnPosi:	this.setHeaderBtnPosi(),//获取设备顶部胶囊高度
-				systeminfo:this.setSysteminfo(),		 //获取设备信息
-				CustomBar:this.CustomBar,// 顶部导航栏高度
-				isIphoneX:this.$store.state.isIphoneX,
-				shopOrderId:'',
-				lgisList:[],
-				ramkesList:[],
-				RecordList:[],	//发货记录
-				pageNum:1,
-				pageSize:10,
-				hasNextPage:false,
-				loadding: false,
-				pullUpOn: true,
-				pullFlag: true,
-				isEmpty:false,
-				nomoreText: '上拉显示更多',
-				scrollHeight: '',
-				windowHeight: '',
-			}
-		},
-		onLoad(option){
-			this.shopOrderId = option.shopOrderId
-			this.setScrollHeight()
-			this.initShopShipmentsRecord();
-		},
-		computed: {
-			...mapState(['hasLogin','userInfo'])
-		},
-		methods:{
-			initShopShipmentsRecord(){//初始化发货记录 index:1
-				this.ShopService.ShopShipmentsRecord({ shopOrderId : this.shopOrderId,pageSize:this.pageSize,pageNum:this.pageNum }).then(response =>{
-					console.log(response)
-					let responseData = response.data.logisticsBatchPage
-					if(responseData.results&&responseData.results.length > 0){
-						this.isEmpty = false
-						this.hasNextPage = responseData.hasNextPage
-						this.RecordList =responseData.results
-						this.pullFlag = false;
-						setTimeout(()=>{this.pullFlag = true;},500)
-						if(this.hasNextPage){
-							this.pullUpOn = false
-							this.nomoreText = '上拉显示更多'
-						}else{
-							if(this.RecordList.length < 2){
-								this.pullUpOn = true
-								this.loadding = false
-							}else{
-								this.pullUpOn = false
-								this.loadding = false
-								this.nomoreText = '已至底部'
-							}
-						}
-					}else{
-						this.isEmpty = true
-					}
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000);
-				})
-			},	
-			getOnReachBottomData(){
-				this.ShopService.ShopShipmentsRecord({ shopOrderId : this.shopOrderId,pageSize:this.pageSize,pageNum:this.pageNum+=1 }).then(response =>{
-					let responseData = response.data.logisticsBatchPage
-					if(responseData.results&&responseData.results.length > 0){
-						this.hasNextPage = responseData.hasNextPage
-						this.RecordList = this.RecordList.concat(responseData.results) 
-						this.pullFlag = false;// 防上拉暴滑
-						setTimeout(()=>{this.pullFlag = true;},500)
-						if(this.hasNextPage){
-							this.pullUpOn = false
-							this.nomoreText = '上拉显示更多'
-						}else{
-							this.pullUpOn = false
-							this.loadding = false
-							this.nomoreText = '已至底部'
-						}
-					}
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000)
-				})
-			},
-			setHeaderBtnPosi(){// 获得胶囊按钮位置信息
-				let headerBtnPosi = uni.getMenuButtonBoundingClientRect();
-				return headerBtnPosi
-			},
-			setSysteminfo(){ // 获取设备信息
-				let systeminfo;
-				uni.getSystemInfo({
-					success: (res) => {
-						systeminfo = res
-					},
-				})
-				return systeminfo
-			},
-			setScrollHeight() {
-				const {windowHeight, pixelRatio} = wx.getSystemInfoSync();
-				this.windowHeight = windowHeight - 1;
-				this.scrollHeight = windowHeight - 1;
-			},
-			previewImg (index,previewUrls) {//顶部商品图片预览
-				isPreviewImg = true
-				uni.previewImage({
-					current: index, 	//图片索引
-					urls: previewUrls, //必须是http图片，本地图片无效
-					longPressActions:''
-				})
-			},
-			handButtonConfirm(data){//监听点击时间的按钮类型并执行...
-				// console.log(data)
-				this.handShowAlert(data)
-			},
-			handShowAlert(data){//判断点击的按钮类型并执行...
-				let hanldType = data.hanldType
-				let hanldData = data.hanldData
-				switch(hanldType){
-					case 'cancel':
-						this.handCenceConfirm(hanldData)
-						break
-					case 'add':
-						let setProductList =[]
-						let repleArray =hanldData.logisticsRecordList
-						repleArray.forEach(el=>{
-							let elObject = {
-									orderProductId:el.orderProductID.toString(),
-									num:el.num.toString()
-							}
-							setProductList.push(elObject)
-						})
-						let data = {
-								logisticsBatchId:hanldData.id,
-								logisticsBatchData:setProductList
-							}
-						this.$api.navigateTo(`/supplier/pages/deliver/add-logistics?type=reple&shopOrderId=${this.shopOrderId}&data=${JSON.stringify(data)}`)
-						break
-				}
-			},
-			handCenceConfirm(data){//取消订单
-				this.$util.modal('提示','确定要撤销本次发货吗？撤销后需重新发货','确定','取消',true,() =>{
-					this.ShopService.ShopCancelShipment({ logisticsBatchId : data.id }).then(response =>{
-						this.$util.msg('撤销成功',2000,true,'success');
-						setTimeout(()=>{
-							this.initShopShipmentsRecord()
-						},2000)
-					}).catch(error =>{
-						this.$util.msg(error.msg,2000)
-					})
-				})
-			},
-			pageGoLink(){
-				this.$api.navigateTo('/supplier/pages/deliver/deliver-goods?shopOrderId='+this.shopOrderId)
-			},
-			hanldPageDetails(){
-				this.$api.navigateTo('/supplier/pages/order/order-details?shopOrderId='+this.shopOrderId)
-			}
-		},
-		onPullDownRefresh() {//下拉刷新
-			this.initShopShipmentsRecord()
-			uni.stopPullDownRefresh()
-		},
-		onReachBottom() {
-			if(this.hasNextPage){
-				this.loadding = true
-				this.pullUpOn = true
-				this.getOnReachBottomData()
-			}	
-		},
-		onShow(){
-			
-		},
-	}
-</script>
-
-<style lang="scss">
-	page{
-		background: #f7f7f7;
-		height: auto;
-	}
-	.record-content{
-		position: relative;
-		border-top: 1px solid #EBEBEB;
-		.scroll-view{
-			height: 100%;
-		}
-	}
-	.record-content-empty{
-		width: 100%;
-		height: 100%;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		.record-container{
-			width: 400rpx;
-			height: auto;
-			image{
-				width: 400rpx;
-				height: 400rpx;
-				display: block;
-			}
-			.txt{
-				font-size: $font-size-28;
-				text-align: center;
-				color: #333;
-				line-height: 30rpx;
-				margin-bottom: 20rpx;
-			}
-			.btn{
-				width: 400rpx;
-				height: 80rpx;
-				background: $btn-confirm;
-				border-radius: 40rpx;
-				line-height: 80rpx;
-				font-size: $font-size-28;
-				text-align: center;
-				color: #FFFFFF;
-			}
-		}
-	}
-	.record-list{
-		width: 100%;
-		height: auto;
-		background-color: #F7F7F7;
-		margin-bottom: 24rpx;
-		.record-top{
-			width: 702rpx;
-			padding: 20rpx 24rpx;
-			height: auto;
-			border-bottom: 2px solid #FF9100;
-			background-color: #FFF;
-			.top-view{
-				width: 100%;
-				height: auto;
-				float: left;
-				line-height: 50rpx;
-				font-size: $font-size-28;
-				color: #333333;
-				display: flex;
-				.top-viewlabel{
-					width: 130rpx;
-					margin-right: 10rpx;
-				}
-				.top-viewtext{
-					width:562rpx;
-					height: auto;
-					text{
-						display: inline-block;
-						margin-right: 30rpx;
-					}
-				}
-			}
-		}
-		.goods-pros{
-			width: 702rpx;
-			padding: 0 24rpx;
-			background: #FFFFFF;
-		}	
-		.goods-pros-t{
-			display: flex;
-			width: 100%;
-			height: auto;
-			padding:20rpx 0;
-			.pros-img{
-				width: 210rpx;
-				height: 210rpx;
-				border-radius: 10rpx;
-				margin:0 20rpx;
-				border:1px solid #f3f3f3;
-				margin-left: 0;
-				image{
-					width: 100%;
-					height: 100%;
-					border-radius: 10rpx;
-				}
-			}
-			.pros-product{
-				width: 492rpx;
-				height: 100%;
-				line-height: 36rpx;
-				font-size: $font-size-28;	
-				position: relative;
-				.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: 44rpx;
-					color: #999999;
-					line-height: 44rpx;
-					font-size: $font-size-26;
-				}
-				.product-view{
-					width: 100%;
-					height: auto;
-					display: flex;
-					.view-num{
-						flex: 1;
-						text-align: left;
-						font-size: $font-size-26;
-						color: #666666;
-						line-height: 44rpx;
-					}
-				}
-			}
-		}
-		.goods-pros-b{
-			width:100%;
-			height: auto;
-			padding: 10rpx 0;
-			border-top: 1px solid #F7F7F7;
-			border-bottom: 1px solid #F7F7F7;
-			position: relative;
-			.b-label{
-				width: 100%;
-				line-height: 70rpx;
-				font-size: $font-size-28;
-				color: $text-color;
-			}
-			.b-photo{
-				width: 100%;
-				height: auto;
-				padding: 10rpx 0;
-				.b-imageView{
-					width: 112rpx;
-					height: 112rpx;
-					margin: 0 20rpx 20rpx 0;
-					float: left;
-					image{
-						width: 112rpx;
-						height: 112rpx;
-						display: block;
-					}
-				}
-				.text{
-					line-height: 44rpx;
-					font-size: $font-size-28;
-					color: $text-color;
-				}
-			}
-			.goods-pros-m{
-				width: 100%;
-				height: auto;
-				line-height: 76rpx;
-				font-size: $font-size-26;
-				color: $text-color;
-				float: left;
-				padding: 10rpx 0;
-				border-top: 1px solid #F7F7F7;
-				border-bottom: 1px solid #F7F7F7;
-				.m-text{
-					width: 62rpx;
-					float: left;
-					padding-right: 20rpx;
-					font-weight:bold;
-				}
-				.m-input{
-					display: -webkit-box;
-					display: -webkit-flex;
-					display: flex;
-					-webkit-box-align: center;
-					-webkit-align-items: center;
-					align-items: center;
-					position: relative;
-					width: 620rpx;
-					height: auto;
-					padding: 20rpx 0 10rpx 0;
-					background: #FFFFFF;
-					.text{
-						width: 100%;
-						height: 100%;
-						font-size: $font-size-26;
-						line-height: 36rpx;
-						color: #333333;
-					}
-				}
-			}
-		}
-	}
-</style>

supplier/pages/deliver/logistics-list.vue

@@ -1,97 +0,0 @@
-<template>
-	<view class="container logistics clearfix"> 
-		<view class="list-cell-item" :class="selectID == item.id  ? 'active' : ''" v-for="(item,index) in companyList" :key="item.id" @click="checkLogics(item)">
-			<view class="item-name">{{item.label}}</view>
-			<view class="item-icon" v-show="selectID == item.id"><text class="iconfont icon-gou"></text></view>
-		</view>
-	</view>
-</template>
-<script>
-	import authorize from '@/common/config/authorize.js'
-	import { mapState,mapMutations } from 'vuex';
-	
-	export default{
-		data(){
-			return{
-				CustomBar:this.CustomBar,// 顶部导航栏高度
-				isIphoneX:this.$store.state.isIphoneX,
-				isACtive:false,
-				companyList:[],
-				selectID:'',
-			}
-		},
-		onLoad(option){
-			this.selectID = option.selectID
-			this.initGetLogisticsCompany();
-		},
-		computed: {
-			...mapState(['hasLogin','userInfo'])
-		},
-		methods:{
-			initGetLogisticsCompany(){//查询物流公司列表
-				let params = {userID:this.userID}
-				this.ShopService.GetLogisticsCompany({}).then(response =>{
-					this.companyList = response.data
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000);
-				})
-			},	
-			checkLogics(item){//选择物流
-				uni.setStorageSync('selectLogics',item)
-				var pages = getCurrentPages();
-				var prevPage = pages[pages.length - 2];  //上一个页面	
-					prevPage.setData({select:'select'})
-				uni.navigateBack();
-			}
-		},
-		onPullDownRefresh() {//下拉刷新
-			this.initGetLogisticsCompany()
-			uni.stopPullDownRefresh()
-		},
-		onShow(){
-			
-		},
-	}
-</script>
-
-<style lang="scss">
-	page{
-		background: #f7f7f7;
-		height: auto;
-	}
-	.logistics{
-		width: 702rpx;
-		padding: 0 24rpx;
-		border-top: 1px solid #F7F7F7;
-		background-color: #FFFFFF;
-		.list-cell-item{
-			width: 702rpx;
-			height: 88rpx;
-			line-height: 88rpx;
-			border-bottom: 1px solid #F7F7F7;
-			&.active{
-				.item-name{
-					color: $color-system;
-				}
-				.item-icon{
-					color: $color-system;
-				}
-			}
-			.item-name{
-				float: left;
-				font-size: $font-size-28;
-				color: $text-color;
-			}
-			.item-icon{
-				width:88rpx;
-				height: 88rpx;
-				float: right;
-				line-height: 88rpx;
-				text-align: center;
-				.icon-gou{
-					font-size: $font-size-44;
-				}
-			}
-		}
-	}
-</style>

supplier/pages/index/index.vue

@@ -1,143 +0,0 @@
-<template>
-	<view class="content"  :style="{paddingBottom:isIphoneX?'140rpx':'98rpx'}">
-		<!-- 采美采购商城 -->
-		<view :style="{'display':show_index == 0 ?'block':'none'}">
-			<supplier-home  ref="home" v-if="isHomeData"></supplier-home>
-		</view>
-		<!-- 商品分类 -->
-		<view :style="{'display':show_index == 1? 'block':'none'}">
-			<supplier-category  ref="category" v-if="isCategory"></supplier-category>
-		</view>
-		<!-- 账户中心 -->
-		<view :style="{'display':show_index == 2 ?'flex':'none'}">
-			<supplier-user  ref="user" v-if="isUserData"></supplier-user>
-		</view>
-		<!-- isIphoneX判断是否为刘海屏在main.js里，好像uniapp有一个css变量获取刘海屏的安全区域 -->
-		<view class="tabBar" :style="{height:isIphoneX?'140rpx':'98rpx'}">
-			<!-- 导航的中间圆圈 -->
-			<view class="tabBar_list" :style="{paddingBottom:isIphoneX?'40rpx':''}">
-				<view v-for="(item) in tab_nav_list" :key="item.id" class="tabBar_item" @tap="cut_index(item.id)">
-					<image v-if="show_index == item.id" :src="item.iconAc"></image>
-					<image v-else :src="item.icon"></image>
-					<view :class="{'tabBar_name':true,'nav_active':show_index == item.id}">{{item.name}}</view>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import supplierHome from '@/components/cm-module/supplier/home.vue'
-	import supplierUser from '@/components/cm-module/supplier/user.vue'
-	import supplierCategory from '@/components/cm-module/supplier/category.vue'
-	export default {
-		components: {
-			supplierHome,//采美采购商城 0
-			supplierUser,//账户中心     1
-			supplierCategory,//商品分类 2
-		},
-		data() {
-			return {
-				show_index:2,//控制显示那个组件
-				isUserData: false,
-				isCategory: false,
-				isHomeData: false,
-				isIphoneX:this.$store.state.isIphone,
-				tab_nav_list :[//菜单列表
-					{'id':0,'name':'首页',icon:'https://static.caimei365.com/app/img/icon/icon-home@3x.png',iconAc:'https://static.caimei365.com/app/img/icon/icon-home-active@3x.png'},
-					{'id':1,'name':'分类',icon:'https://static.caimei365.com/app/img/icon/icon-sort@3x.png',iconAc:'https://static.caimei365.com/app/img/icon/icon-sort-active@3x.png'},
-					{'id':2,'name':'我的',icon:'https://static.caimei365.com/app/img/icon/icon-user@3x.png',iconAc:'https://static.caimei365.com/app/img/icon/icon-user-active@3x.png'}
-				],
-				nvabarData: {		//顶部自定义导航
-					showCapsule: 0, // 是否显示左上角图标  1表示显示  0表示不显示,
-					showSearch: 0,
-					title: '账户中心',  // 导航栏 中间的标题
-					textLeft:false
-				},
-				isIphoneX:this.$store.state.isIphoneX,
-				CustomBar:this.CustomBar,// 顶部导航栏高度
-			}
-		},
-		onLoad() {
-			this.$nextTick(()=>{// 一定要等视图更新完再调用方法
-				setTimeout(()=>{ this.isUserData = true },100)
-			})
-		},
-		methods: {
-			// 切换组件
-			cut_index(type){
-				this.show_index = type
-				if(this.show_index == 0){
-					this.isHomeData = true
-					this.isUserData = false
-					this.isCategory = false
-				}else if(this.show_index == 1){
-					this.isHomeData = false
-					this.isUserData = false
-					this.isCategory = true
-				}else if(this.show_index == 2){
-					this.isHomeData = false
-					this.isUserData = true
-					this.isCategory = false
-				}
-			},
-			onPullDownRefresh(){
-				if(this.show_index == 0){
-					this.$refs.home.getHomeInformation()
-				}else if(this.show_index == 2){
-					this.$refs.user.initData()
-				}
-				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">
-	.tabBar{
-		width:100%;
-		height: 98rpx;
-		background: #fff;
-		border-top:1px solid #E5E5E5;
-		position: fixed;
-		bottom:0px;
-		left:0px;
-		right:0px;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		z-index: 999;
-		.tabBar_list{
-			width:86%;
-			display: flex;
-			justify-content: space-between;
-			image{
-				width:48rpx;
-				height: 48rpx;
-				margin-bottom:2rpx
-			}
-			.tabBar_item{
-				width:150rpx;
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				flex-direction: column;
-				font-size: 20rpx;
-				color: #999999;
-			}
-		 }
-	}
-	.nav_active{
-		color: $color-system;
-	}
-</style>

supplier/pages/login/bind-operator.vue

@@ -1,371 +0,0 @@
-<template>
-	<view class="container login">
-		<view class="login-main">
-			<text class="logo-text">您的微信尚未绑定供应商账号，填写以下资料进行绑定后，您能通过微信快速登录</text>
-		</view>
-		<view class="login-form clearfix">
-			<view class="login-input">
-				<input type="text" 
-					   v-model="bindLinkName"  
-					   maxlength="30" 
-					   class="input" 
-					   placeholder="请输入供应商联系人姓名"
-				/>
-			</view>
-		</view>
-		<view class="login-form clearfix">
-			<view class="login-input">
-				<input type="number" 
-					   v-model="bindLinkPhone"  
-					   maxlength="11" 
-					   class="input" 
-					   placeholder="请输入手机号"
-				/>
-			</view>
-		</view>
-		<view class="login-form clearfix">
-			<view class="login-input code">
-				<input type="text" 
-					   v-model="imageCode"  
-					   maxlength="4" 
-					   class="input" 
-					   placeholder="请输入右侧图形验证码"
-				/>
-			</view>
-			<view class="login-input img-btn">
-				<view class="vscodeimg">
-					<image :src="imageCodeUrl" mode=""></image>
-				</view>
-				<view class="vscod-refresh"  @click.stop="getVerificationCode">
-					<text class="iconfont icon-shuaxin"></text>
-					<text class="ref-text">刷新</text>
-				</view>
-			</view>
-		</view>
-		<view class="login-form clearfix">
-			<view class="login-input code">
-				<input type="number" 
-					   v-model="mobildeCode"  
-					   maxlength="6" 
-					   class="input" 
-					   placeholder="请输入短信验证码"
-				/>
-			</view>
-			<view class="login-input btn" :class="[isMobileDisabled  ? 'disabled' : '']" >
-				<button type="button"
-						@click.stop="getMobileCodeFn"
-						:disabled="isMobileDisabled"
-					    class="input">
-						{{ mobileCodeText }}
-				</button>
-			</view>
-		</view>
-		<view class="login-form clearfix">
-			<view class="login-btn"  @click="bindWechatInfo">绑定</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import { mapState,mapMutations } from 'vuex'
-	import authorize from '@/common/config/authorize.js' 
-	import wxLogin from "@/common/config/wxLogin.js"
-	import { getbindOperatorCode } from "@/api/utils.js"
-	export default{
-		data() {
-			return{
-				shopOrderId:'',
-				userID:'',
-				bindLinkName:'',  		//供应商联系人姓名
-				bindLinkPhone:'',  		//用户手机号
-				mobildeCode:'',  		//手机验证码
-				imageCode:'',			//图形验证码
-				imageCodeUrl:'',		//图形验证码地址
-				imageCodetoken:'',		//图形校验token
-				isMobileDisabled:false, //获取手机短信按钮
-				count: '',				//倒计时
-				mobileCodeText: '获取验证码',
-				codeTime: null,
-				bind_supplierInfo:{}
-			}
-		},
-		onLoad(option) {
-			this.shopOrderId = option.shopOrderId
-			// console.log(this.shopOrderId);
-			this.bind_supplierInfo = uni.getStorageSync('bind_supplierInfo');
-			this.getVerificationCode()
-		},
-		methods:{
-			...mapMutations(['login']),
-			bindWechatInfo(){
-				if( this.bindLinkName == ''){
-					this.$util.msg('请输入姓名',2000)
-					return
-				}
-				if( this.bindLinkPhone == ''){
-					this.$util.msg('请输入手机号',2000)
-					return
-				}
-				if(!this.$reg.isMobile(this.bindLinkPhone)){
-					this.$util.msg('请输入正确的手机号',2000)
-					return
-				}
-				if( this.mobildeCode == ''){
-					this.$util.msg('请输入手机验证码',2000)
-					return
-				}
-				if(!this.$reg.isMobileCode(this.mobildeCode)){
-					this.$util.msg('验证码格式不正确',2000)
-					return
-				}
-				this.bindingWechatLogin()
-			},
-			getVerificationCode(){//图形验证
-				this.PublicService.GetImgVerifyCode().then(res => {
-					this.imageCodeUrl = res.data.baseImage
-					this.imageCodetoken = res.data.token
-				})
-			},
-			getMobileCodeFn(){//获取手机验证码
-				if( this.bindLinkPhone == ''){
-					this.$util.msg('请输入手机号',2000);
-					return
-				}
-				if(!this.$reg.isMobile(this.bindLinkPhone)){
-					this.$util.msg('请输入正确的手机号',2000);
-					return
-				}
-				if( this.imageCode == ''){
-					this.$util.msg('请输入图形验证码',2000);
-					return
-				}
-				let params = {
-						userId:this.bind_supplierInfo.userId,
-						mobile:this.bindLinkPhone,
-						platformType:2,
-						imgCode:this.imageCode,
-						token:this.imageCodetoken,
-					}
-				this.isMobileDisabled = true;
-				getbindOperatorCode(params).then(res =>{
-					const TIME_COUNT = 60;
-					this.$util.msg('验证短信已发送',2000)
-			     	if (!this.codeTime) {
-			       		this.count = TIME_COUNT;
-						this.isMobileDisabled = true;
-			       		this.codeTime = setInterval(() => {
-			       			if (this.count > 1 && this.count <= TIME_COUNT) {
-			         			this.count--
-			         			this.mobileCodeText = this.count +'s重新发送'
-			        		} else {
-				         		this.isMobileDisabled = false;
-				         		clearInterval(this.codeTime)
-				         		this.codeTime = null
-								this.mobileCodeText = '获取验证码'
-			        		}
-			       		},1000)
-			      	}
-				}).catch( error =>{
-					this.$util.msg(error.msg,2000)
-					this.isMobileDisabled = false;
-				})
-			},
-			bindingWechatLogin(){//获取用户基本信息登录
-				wx.getUserInfo({
-					success: res => {
-						this.isUserInfo = false;
-						this.userInfo = res.userInfo;
-						let params ={
-								userID:this.bind_supplierInfo.userId,
-								mobile:this.bindLinkPhone,
-								linkName:this.bindLinkName,
-								verificationCode:this.mobildeCode,
-								nickName:res.userInfo.nickName,
-								headimgurl:res.userInfo.avatarUrl,
-								openid:this.bind_supplierInfo.openid,
-								shopID:this.bind_supplierInfo.shopId,
-								unionId:this.bind_supplierInfo.unionId
-						}
-						this.ShopService.BindShopOperator(params).then(response =>{
-							this.$api.navigateTo(`/supplier/pages/order/order-details?shopOrderId=${this.shopOrderId}`)
-						}).catch(error =>{
-							this.$util.msg(error.msg,2000)
-						})	
-					}
-				})
-			},
-			//关闭未授权用户授权提示弹窗
-			hideModel(){
-				this.isUserInfo = false;
-			}
-		},
-		onShow() {
-			
-		}
-	}
-</script>
-
-<style lang="scss">
-	.login{
-		width: 100%;
-		height: auto;
-		border-top: 1px solid #F7F7F7;
-		.model-warp.none{
-			display: none;			
-		}
-		.model-warp.show{
-			display: block;
-		}
-		.login-main{
-			width: 702rpx;
-			background: rgba(225, 86, 22, 0.1);
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-			height: 68rpx;
-			padding: 20rpx 24rpx;
-			margin: 24rpx 0 118rpx 0;
-			.logo-text{
-				font-size: 24rpx;
-				line-height: 34rpx;
-				color: $color-system;
-			}
-		}
-		.login-form{
-			width: 702rpx;
-			height: auto;
-			padding: 0 24rpx;
-			.login-input{
-				width: 654rpx;
-				height: 40rpx;
-				padding: 24rpx;
-				margin-bottom: 20rpx;
-				background: #F7F7F7;
-				border-radius: 14rpx;
-				display: flex;
-				flex-direction: column;
-				align-items: center;
-				&.code{
-					width: 370rpx;
-					float: left;
-					margin-right: 20rpx;
-				}
-				&.btn{
-					width: 258rpx;
-					height: 88rpx;
-					padding: 0;
-					float: left;
-					background: $btn-confirm;
-					.input{
-						width: 258rpx;
-						height: 88rpx;
-						line-height: 88rpx;
-						padding: 0;
-						border-radius: 14rpx;
-						color: #FFFFFF;
-						background: $btn-confirm;
-					}
-					&.disabled{
-						background: #F7F7F7;
-						.input{
-							background: #F7F7F7;
-							color: #999999;
-						}
-					}
-				}
-				&.img-btn{
-					width: 250rpx;
-					height: 88rpx;
-					padding: 0;
-					float: left;
-					background: #FFFFFF;
-					display: block;
-					.vscodeimg{
-						width: 180rpx;
-						height: 88rpx;
-						float: left;
-						display: flex;
-						flex-direction: column;
-						align-items: center;
-						border-radius: 14rpx;
-						image{
-							width: 180rpx;
-							height: 88rpx;
-							border-radius: 14rpx;
-						}
-					}
-					.vscod-refresh{
-						width: 70rpx;
-						float: right;
-						display: flex;
-						flex-direction: column;
-						align-items: center;
-						.icon-shuaxin{
-							font-size: 48rpx;
-							color: #333333;
-						}
-						.ref-text{
-							font-size: 24rpx;
-							color: #333333;
-						}
-					}
-				}
-				.input{
-					width: 100%;
-					height: 100%;
-					background: #F7F7F7;
-					font-size: $font-size-28;
-					line-height: 40rpx;
-					color: #333333;
-					border-radius: 14rpx;
-				}
-			}
-		}
-		.login-btn{
-			width: 702rpx;
-			height: 88rpx;
-			border-radius: 14rpx;
-			font-size: $font-size-28;
-			line-height: 88rpx;
-			color: #FFFFFF;
-			margin: 0 auto;
-			text-align: center;
-			background: $btn-confirm;
-			margin-top: 100rpx;
-		}
-		.model-authorization{
-			width: 100%;
-			height: 100%;
-			position: fixed;
-			top: 0;
-			left: 0;
-			z-index: 999;
-			.authorization{
-				width: 518rpx;
-				height: 320rpx;
-				position: absolute;
-				background: rgba(255,255,255,.7);
-				left: 0;
-				right: 0;
-				bottom: 0;
-				top: 0;
-				margin: auto;
-				.to-btn{
-					position: absolute;
-					top: 0;
-					left: 0;
-					right: 0;
-					bottom: 0;
-					margin: auto;
-					width: 70%;
-					height: 88rpx;
-					font-size: $font-size-28;
-					line-height: 88rpx;
-					color: #FFFFFF;
-					text-align: center;
-					border-radius: 44rpx;
-				}
-			}
-		}
-	}
-</style>

supplier/pages/login/share-info.vue

@@ -1,129 +0,0 @@
-<template>
-	<view class="container share" v-if="isRequest">
-		<view class="share-empty">
-			<view class="icon"><image :src="imagePath" mode="widthFix"></image></view>
-			<view class="text">暂无权限查看</view>
-		</view>
-	</view>
-</template>
-<script>
-	import authorize from '@/common/config/authorize.js' 
-	export default{
-		data() {
-			return{
-				isRequest:false,
-				invitationCode:'',
-				imagePath:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/06/%E6%97%A0%E6%9D%83%E9%99%90%402x.png',
-				serviceProviderId:'',
-				shopOrderId:null,
-				source:1,
-				shareCode:'',
-				authority:'',//用户权限
-			}
-		},
-		onLoad(option) {
-			// scene 需要使用 decodeURIComponent 才能获取到生成二维码时传入的 scene
-			console.log(option);
-			if(option.scene){
-				this.shopOrderId = Number(decodeURIComponent(option.scene))
-			}else{
-				this.shopOrderId = option.shopOrderId
-				this.authority = option.authority
-				if(this.authority == '2'){
-					this.source = 2
-				}else if(this.authority == '3'){
-					this.source = 3
-				}
-			}
-			authorize.getSetting().then(wxResponse =>{// console.log('是否已授权',res);//0:为取消授权 1:为已授权 2:为未操作
-				if(wxResponse != 1){
-					this.$api.navigateTo('/pages/authorization/authorization?type=4')
-					setTimeout(()=>{
-						this.isRequest = true
-					},2000)
-				}else{
-					this.infoMiniShipments();
-				}
-			})	
-		},
-		methods:{
-			infoMiniShipments(){
-				authorize.getCode('weixin').then(wechatcode =>{
-					authorize.getUserInfo('weixin').then(wxResponse =>{
-						let params = {
-								code:wechatcode,
-								encryptedData:wxResponse.encryptedData,
-								iv:wxResponse.iv,
-								shopOrderId:this.shopOrderId,
-								source:this.source,
-								shareCode:this.shareCode
-						}
-						this.ShopService.MiniShipments(params).then(res =>{
-							switch(res.data.resultCode){
-								case 1:
-									this.shopOrderId = res.data.shopOrderId;
-									this.$api.navigateTo(`/supplier/pages/order/order-service-details?shopOrderId=${this.shopOrderId}`)
-									break;
-								case 2:
-									console.log('供应商联系人');
-									this.$api.navigateTo(`/supplier/pages/order/order-details?shopOrderId=${this.shopOrderId}`)
-									break;
-								case 3:
-									console.log('供应商发货人员');
-									this.$api.navigateTo(`/supplier/pages/order/order-details?shopOrderId=${this.shopOrderId}`)
-									break;
-							}
-						}).catch(err =>{
-							if(this.source == 2){
-								this.$api.setStorage('bind_supplierInfo', err.data)
-								this.$api.navigateTo(`/supplier/pages/login/bind-operator?shopOrderId=${this.shopOrderId}`)
-							}else if(this.source == 3){
-								this.$api.navigateTo(`/supplier/pages/login/share-login?shopOrderId=${this.shopOrderId}`)
-							}else{
-								this.isRequest = true;
-							}
-						})	
-					})
-				})		
-			}
-		},
-		onShow() {
-			authorize.getSetting().then(wxResponse =>{// console.log('是否已授权',res);//0:为取消授权 1:为已授权 2:为未操作
-				if(wxResponse == 1){
-					this.isRequest = false;
-					this.infoMiniShipments();
-				}
-			})	
-		}
-	}
-</script>
-
-<style lang="scss">
-	.share{
-		width: 100%;
-		height:100%;
-		background: #FFFFFF;
-		display: flex;
-		align-items: center;
-		justify-content:center;
-		.share-empty{
-			width: 376rpx;
-			height: 460rpx;
-			.icon{
-				width: 376rpx;
-				height: 400rpx;
-				image{
-					width: 100%;
-					height: 100%;
-					display: block;
-				}
-			}
-			.text{
-				font-size: $font-size-28;
-				line-height: 60rpx;
-				color: $text-color;
-				text-align: center;
-			}
-		}
-	}
-</style>

supplier/pages/login/share-login.vue

@@ -1,145 +0,0 @@
-<template>
-	<view class="container login">
-		<view class="login-main">
-			<image class="logo" src="https://static.caimei365.com/app/img/icon/login-logo@3x.png" mode=""></image>
-			<text class="logo-text">生美/医美采购服务平台</text>
-		</view>
-		<view class="login-input">
-			<input type="number" 
-				   v-model="shareCode"  
-				   maxlength="6" 
-				   class="input" 
-				   placeholder="请输入邀请码"
-			/>
-		</view>
-		<view class="login-btn"  @click.stop="goLogin">查看订单</view>
-	</view>
-</template>
-<script>
-	import authorize from '@/common/config/authorize.js' 
-	export default{
-		data() {
-			return{
-				imagePath:'https://img.caimei365.com/group1/M00/03/83/Cmis214FbbCAQhKoAAKWfqqSIds292.png',
-				shareCode:'',  		//获取用户登录的邀请码
-				isUserInfo:false,	//控制显示授权弹窗
-				nickName:'',		//存储用户名
-				userInfo:'',		//存储微信用户授权信息
-				shopOrderId:0,			//订单ID
-				userID:0			,//分享人的用户ID
-				isShareStatus:false,
-				serviceProviderId:''
-			}
-		},
-		onLoad(option) {
-			this.shopOrderId = option.shopOrderId
-			console.log(this.shopOrderId)
-		},
-		methods:{
-			goLogin() {
-				if(this.shareCode == ''){
-					this.$util.msg('请联系分享人获取分享码',2000);
-					return
-				}
-				if(!this.$api.isNumber(this.shareCode)){
-					this.$util.msg('分享码格式不正确',2000);
-					return
-				}
-				authorize.getCode('weixin').then(wechatcode =>{
-					authorize.getUserInfo('weixin').then(wxResponse =>{
-						let params ={
-								code:wechatcode,
-								encryptedData:wxResponse.encryptedData,
-								iv:wxResponse.iv,
-								shopOrderId:this.shopOrderId,
-								source:3,
-								shareCode:this.shareCode
-							}
-						this.ShopService.MiniShipments(params).then(res =>{
-							if(res.data.resultCode ==3){
-								console.log('供应商发货人员');
-								this.$api.navigateTo(`/supplier/pages/order/order-details?shopOrderId=${this.shopOrderId}`)
-							}
-						}).catch(error =>{
-							this.$util.msg(error.msg,2000);
-						})	
-					})	
-				})
-			},
-		},
-		onShow() {
-			
-		}
-	}
-</script>
-
-<style lang="scss">
-	.login{
-		width: 100%;
-		height:100%;
-		background: #FFFFFF;
-		.model-warp.none{
-			display: none;			
-		}
-		.model-warp.show{
-			display: block;
-		}
-		.login-main{
-			width: 100%;
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-			height: 198rpx;
-			padding: 170rpx 0 90rpx 0;
-			.logo{
-				width: 138rpx;
-				height: 118rpx;
-				display: block;
-			}
-			.logo-text{
-				font-size: 40rpx;
-				line-height: 44rpx;
-				color: $color-system;
-				font-weight: 600;
-				margin-top: 20rpx;
-			}
-		}
-		.login-input{
-			width: 654rpx;
-			height: 40rpx;
-			padding: 24rpx;
-			margin: 0 auto;
-			margin-bottom: 24rpx;
-			background: #F7F7F7;
-			border-radius: 14rpx;
-			.input{
-				width: 100%;
-				height: 100%;
-				background: #F7F7F7;
-				font-size: $font-size-28;
-				line-height: 40rpx;
-				color: #333333;
-				border-radius: 14rpx;
-			}
-		}
-		.login-row{
-			padding: 0 24rpx;
-			font-size: $font-size-28;
-			line-height: 40rpx;
-			color: #E15616;
-			margin-bottom: 48rpx;
-		}
-		.login-btn{
-			width: 702rpx;
-			height: 88rpx;
-			border-radius: 14rpx;
-			font-size: $font-size-28;
-			line-height: 88rpx;
-			color: #FFFFFF;
-			margin: 0 auto;
-			text-align: center;
-			background: $btn-confirm;
-			margin-top: 48rpx;
-		}
-	}
-</style>

supplier/pages/order/order-details.vue

@@ -1,741 +0,0 @@
-<template>
-	<view class="details clearfix">
-		<view class="container-details" v-show="isRequest">
-			<!-- 地址信息 -->
-			<view class="address-section clearfix">
-				<view class="address-content">
-					<view class="info-item">
-						<text class="label">买家名称：{{orderInfo.userInfo.name}}</text>
-					</view>
-					<view class="info-item">
-						<text class="label">收货人：{{orderInfo.userInfo.shouHuoRen}}</text>
-						<text class="label" :style="{marginLeft:40+'rpx'}">联系方式：{{orderInfo.userInfo.mobile}}</text>
-					</view>
-					<view class="info-item">
-						<text class="label">收货地址：<text style="color: #666666;">{{orderInfo.userInfo.address}}</text></text>
-					</view>
-				</view>
-				<image  src="../../../static/temp/line@3x.png" mode=""></image>
-			</view>
-			<!-- 商品 -->
-			<view class="goods-list">
-				<view class="goods-item clearfix">
-					<view class="productlist" v-for="(pros,idx) in orderInfo.orderProductList" :key="idx">
-						<view class="goods-pros-t">
-							<view class="pros-left">
-								<view class="pros-img"><image :src="pros.productImage" alt="" mode="aspectFill"/></view>
-							</view>
-							<view class="pros-product">
-								<view class="producttitle">{{pros.aliasName ? pros.aliasName : ''}}</view>
-								<view class="productspec">规格：{{pros.productUnit ? pros.productUnit : ''}}</view>
-								<view class="product-view">
-									<view class="view-num price">¥{{ pros.price | NumFormat }}</view>
-									<view class="view-num num"> <text class="small">X</text> {{pros.num+pros.presentNum}}</view>
-								</view>
-								<view class="product-view">
-									<view class="view-num">已发货：{{pros.shipmentsNum}}</view>
-									<view class="view-num">已退货：{{pros.returnedNum}}</view>
-									<view class="view-num">已取消：{{pros.actualCancelNum}}</view>
-								</view>
-							</view>	
-						</view>
-						<view class="product-total">
-							<view class="total">
-								合计： <text>¥{{ pros.totalAmount | NumFormat }}</text>
-							</view>
-						</view>	
-					</view>	
-					
-					<view class="goods-pros-m" v-if="orderInfo.note">
-						<view class="m-text">留言：</view>
-						<view class="m-input">
-							<view class="text">{{orderInfo.note ? orderInfo.note : ''}}</view>
-						</view>	
-					</view>
-					<view class="goods-pros-b">
-						<view class="count">共{{orderInfo.itemCount}}件商品</view>
-						<view class="money">商品总额：<text class="red">¥{{orderInfo.productAmount | NumFormat}}</text> </view>
-					</view>
-				</view>
-			</view>
-			<!-- 订单信息 -->
-			<view class="information-content clearfix">
-				<view class="order-title">
-					<view class="order-title-t">
-						<view class="order-title-num">订单编号：{{ orderInfo.shopOrderNo }}</view>
-						<view class="order-title-tip">结算状态：<text :style="{color:setStatusText(orderInfo.payStatus)}">{{ orderInfo.payStatus | payStatusType }}</text></view>
-					</view>
-					<view class="order-title-t">
-						<view class="order-title-num">下单时间：{{ orderInfo.orderTime }}</view>
-						<view class="order-title-tip">发货状态：<text class="status" :style="{color:setStatusText(orderInfo.receiptStatus)}">{{ orderInfo.sendOutStatus | sendOutStatusType }}</text></view>
-					</view>
-					<template v-if="isOpenInfoFlag">
-						<view class="order-title-t">
-							<view class="order-title-num">结算商品金额：<text class="red">¥{{orderInfo.shopProductAmount | NumFormat}}</text></view>
-							<view class="order-title-tip">结算税费：<text class="red">¥{{orderInfo.shopTaxFee | NumFormat}}</text></view>
-						</view>
-						<view class="order-title-t">
-							<view class="order-title-num">结算运费：<text class="red">¥{{orderInfo.shopPostFee | NumFormat}}</text></view>
-							<view class="order-title-tip">总结算金额：<text class="red">¥{{orderInfo.shouldPayShopAmount | NumFormat}}</text></view>
-						</view>
-						<view class="order-title-t">
-							<view class="order-title-num">已结算金额：<text class="red">¥{{orderInfo.payedShopAmount | NumFormat}}</text></view>
-							<view class="order-title-tip"></view>
-						</view>
-					</template>	
-				</view>
-				<view class="order-more" v-if="isOpenFlag">
-					<view class="btnInfo" @click="OpenFlagShow">查看更多<label class="iconfont icon-xiangxiajiantou"></label></view>
-				</view>
-			</view>
-			<!-- 结算记录 -->
-			<view class="information-record clearfix">
-				<view class="record-title">
-					<view class="record-title-l">结算记录</view>
-				</view>
-				<view class="record-list" v-if="payShopRecord.length>0">
-					<view class="record-item" v-for="(item,index) in payShopRecord" :key="index">
-						<view class="item-time mm">￥{{item.payAmount | NumFormat}}</view>
-						<view class="item-time tt">{{item.payTime ? item.payTime : '无'}}</view>
-					</view>
-				</view>
-				<view class="record-empty" v-else>
-				 	<text>暂无结算记录</text>
-				</view>
-			</view>	
-			<!-- 底部button -->
-			<order-button ref="orderButton" 
-						  v-if= "isRequest" 
-						  :status= "btnStatus" 
-						  :shareCode= "shareCode"
-						   @buttonConfirm="handButtonConfirm">
-			</order-button>
-		</view>
-		<share-alert  :shopOrderID="shopOrderId" 
-					  v-if="isShareModal"  
-					  @shareConfirm ='onShareAppMessage'>
-		</share-alert>		
-	</view>
-</template>
-
-<script>
-	import headerBack from '@/components/cm-module/headerNavbar/header-back' 		 	 //自定义导航
-	import orderAddress from '@/components/cm-module/orderDetails/orderAddress' 		 //地址信息
-	import goodsList from '@/components/cm-module/orderDetails/goodsList'		 		 //商品列表
-	import orderButton from '@/components/cm-module/orderDetails/supplierDetaileButton'	//底部按钮
-	import shareAlert from '@/components/cm-module/modelAlert/supplierShareAlert'	  //分享弹窗
-	export default {
-		components:{
-			headerBack,
-			orderAddress,
-			goodsList,
-			orderButton,
-			shareAlert,
-		},
-		data() {
-			return {
-				nvabarData: {		//顶部自定义导航
-					showCapsule: 1, // 是否显示左上角图标  1表示显示  0表示不显示,
-					showSearch: 0,
-					title: '订单详情', // 导航栏 中间的标题
-					haveBack:false,
-					textLeft:this.$store.state.isIphone
-				},
-				windowHeight: '',
-				isIphoneX:this.$store.state.isIphoneX,
-				CustomBar:this.CustomBar,// 顶部导航栏高度
-				state:0,
-				userID:'',
-				shopOrderId:'',
-				shareCode:'',				//分享码
-				payStatus:0,
-				btnStatus:0,				//按钮组件状态
-				isRequest:false,			//是否加载完成渲染子组件
-				isOrderShare:false,
-				isShareModal:false,
-				orderInfo:{},				//订单信息
-				payShopRecord:[],			//结算记录
-				isOpenInfoFlag:false,
-				isOpenFlag:true
-				
-			}
-		},
-		onLoad(option){
-			console.log(option.shopOrderId)
-			this.shopOrderId = option.shopOrderId;
-			this.initShopOrderDetails()
-		},
-		filters:{
-			sendOutStatusType(value) {
-				if (value === null) {
-				  return '未发货';
-				} else if(value === '1') {
-				  return '待发货';
-				} else if(value === '2') {
-				  return '部分发货';
-				} else{
-				  return '已发货';
-				}
-			},
-			payStatusType(value) {
-				if (value === '1') {
-				  return '待结算';
-				} else if (value === '2') {
-				  return '部分结算';
-				} else {
-				  return '已结算';
-				}
-			},
-			NumFormat(value) {//处理金额
-				return Number(value).toFixed(2);
-			},
-		},	
-		methods: {
-			initShopOrderDetails(){//初始化页面数据@参数：订单ID
-				this.ShopService.GetShopOrderDetails({ shopOrderId : this.shopOrderId }).then(response =>{
-					this.orderInfo  = response.data.shopOrder
-					this.btnStatus = this.orderInfo.sendOutStatus
-					this.payShopRecord = response.data.payShopRecord
-					this.isRequest = true
-				}).catch(err =>{
-					this.$util.msg(err.msg,2000);
-				})
-			},
-			handButtonConfirm(data){//监听点击时间的按钮类型并执行...
-				this.handShowAlert(data)
-			},
-			handShowAlert(type){//判断点击的按钮类型并执行...
-				switch(type){
-					case 'record':
-						this.$api.navigateTo('/supplier/pages/deliver/deliver-record?shopOrderId='+this.shopOrderId)
-						break
-					case 'deliver':
-						this.$api.navigateTo('/supplier/pages/deliver/deliver-goods?shopOrderId='+this.shopOrderId)
-						break
-				}
-			},
-			setStatusTextHtml(status){
-				let TextHtml='';
-				switch(status){
-					case '1':
-						TextHtml = '待付款'
-						break;
-					case '2':
-						TextHtml = '部分付款'
-						break;
-					case '3':
-						TextHtml = '已付款'
-						break;
-				}
-				return TextHtml
-			},
-			setStatusTextHtml1(status){
-				let TextHtml='';
-				switch(status){
-					case '1':
-						TextHtml = '待结算'
-						break;
-					case '2':
-						TextHtml = '部分结算'
-						break;
-					case '3':
-						TextHtml = '已结算'
-						break;
-				}
-				return TextHtml
-			},
-			setStatusTextHtml2(status){
-				let TextHtml='';
-				switch(status){
-					case '1':
-						TextHtml = '待发货'
-						break;
-					case '2':
-						TextHtml = '部分发货'
-						break;
-					case '3':
-						TextHtml = '已发货'
-						break;
-				}
-				return TextHtml
-			},
-			setStatusText(status){
-				let textColor='';
-				switch(status){
-					case '1':
-						textColor = '#FF2A2A'
-						break;
-					case '2':
-						textColor = '#E15616'
-						break;
-					case '3':
-						textColor = '#38CB3D'
-						break;
-				}
-				return textColor
-			},
-			OpenFlagShow(){//查看更多
-				this.isOpenInfoFlag = true
-				this.isOpenFlag = false
-			},
-			onShareCode(){
-				this.isShareModal = true
-			},
-			onShareAppMessage(res){//分享转发
-				this.isShareModal = false
-				if (res.from === 'button') {
-					// 来自页面内转发按钮
-			    }
-				return {
-					title: '您有订单待处理，请点击查看~',
-					path: `/supplier/pages/login/share-info?authority=3&shopOrderId=${this.shopOrderId}`,
-					imageUrl:'https://img.caimei365.com/group1/M00/03/95/Cmis216Sk_SABnOFABZCgCzFV_g063.png'
-				}
-			}
-		},
-		onPullDownRefresh() {//下拉刷新
-			this.initShopOrderDetails()
-			uni.stopPullDownRefresh()
-		},
-		onShow() {
-
-		}
-	}
-</script>
-
-<style lang="scss">
-	page {
-		background:#F7F7F7;
-	}
-	.details{
-		padding-bottom: 130rpx;
-		width: 100%;
-		height: auto;
-	}
-	.container-details{
-		background:#F7F7F7;
-	}
-	.information-content{
-		width: 702rpx;
-		height: auto;
-		padding:10rpx 24rpx;
-		background: #FFFFFF;
-		margin: 24rpx 0;
-		.order-more{
-			width: 100%;
-			height: auto;
-			float: left;
-			.btnInfo{
-				width: 140rpx;
-				height: 40rpx;
-				border: 2rpx solid #e1e1e1;
-				border-radius: 6rpx;
-				padding: 5rpx;
-				text-align: center;
-				color: #b2b2b2;
-				margin: 20rpx auto;
-				font-size:  $font-size-24;
-				.iconfont{
-					position: relative;
-					top: 5rpx;
-					right: -3rpx;
-				}
-			}
-		}
-		.order-title{
-			width: 100%;
-			height: auto;
-			float: left;
-			.order-title-t{
-				width: 100%;
-				height: 58rpx;
-				float: left;
-				font-size: $font-size-28;
-				line-height: 58rpx;
-				.order-title-num{
-					float: left;
-					text-align: left;
-					color: #666666;
-					.red{
-						color: #f94b4b;
-						font-weight: bold;
-					}
-				}
-				.order-title-tip{
-					float: right;
-					text-align: right;
-					font-size: $font-size-28;
-					color: #666666;
-					.red{
-						color: #f94b4b;
-						font-weight: bold;
-					}
-					.status{
-						color: $color-system;
-					}
-				}
-			}
-			.order-title-b{
-				width: 100%;
-				height: 40rpx;
-				float: left;
-				margin-top: 8rpx;
-				font-size: $font-size-28;
-				line-height: 40rpx;
-				color: #999999;
-				text-align: left;
-			}
-		}
-		.info-item{
-			height: 58rpx;
-			width: 100%;
-			display: flex;
-			.item-view{
-				flex: 1;
-				line-height: 58rpx;
-				font-size: $font-size-28;
-				color: #333333;
-			}
-		}
-	}
-	.address-section{
-		width: 100%;
-		margin-bottom: 24rpx;
-		.address-content{
-			width: 100%;
-			height: auto;
-			padding:10rpx 24rpx;
-			background: #FFFFFF;
-			box-sizing: border-box;
-			float: left;
-			.info-item{
-				width: 100%;
-				display: flex;
-				line-height: 50rpx;
-				font-size: $font-size-28;
-				color: #333333;
-			}
-		}
-		image{
-			float: left;
-			width: 100%;
-			height: 6rpx;
-		}
-	}
-	
-	.goods-list{
-		width: 100%;
-		height: auto;
-		background: #F7F7F7;
-		.goods-item{
-			width: 702rpx;
-			padding:24rpx;
-			height: auto;
-			background: #FFFFFF;
-			margin-bottom: 24rpx;
-			&:last-child{
-				margin-bottom: 0;
-			}
-		}
-		.productlist{
-			width: 100%;
-			height: auto;
-		}	
-		.goods-pros-t{
-			display: flex;
-			width: 100%;
-			height: auto;
-			padding: 12rpx 0;
-			.pros-left{
-				width: 210rpx;
-				height: 100%;
-				margin:0 26rpx 0 0;
-			}
-			.pros-img{
-				width: 210rpx;
-				height: 210rpx;
-				border-radius: 10rpx;
-				border:1px solid #f3f3f3;
-				image{
-					width: 100%;
-					height: 100%;
-					border-radius: 10rpx;
-				}
-			}
-		}
-		.product-total{
-			width: 100%;
-			height: 60rpx;
-			float: left;
-			border-bottom: 1px solid #E1E1E1;
-			.total{
-				float: right;
-				font-size: 28rpx;
-				line-height: 60rpx;
-				color: #333333;
-				font-weight: bold;
-				text{
-					color: #f94b4b;
-				}
-			}
-		}
-		.pros-product{
-			width: 468rpx;
-			height: 100%;
-			line-height: 36rpx;
-			font-size: $font-size-26;	
-			position: relative;
-			.icon-genghuan{
-				position: absolute;
-				top: 50%;
-				right: 0;
-				font-size: $font-size-44;
-				color: $color-system;
-			}
-			.product-view{
-				width: 100%;
-				height: auto;
-				display: flex;
-				.view-num{
-					flex: 1;
-					text-align: left;
-					font-size: $font-size-26;
-					color: #666666;
-					line-height: 44rpx;
-					.small{
-						font-size: $font-size-20;
-						color: #999999;
-					}
-					&.price{
-						flex: 9;
-						color: #f94b4b;
-						font-weight: bold;
-					}
-					&.num{
-						flex: 1;
-						text-align: right;
-					}
-				}
-			}
-			.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;
-				font-size: $font-size-28;
-			}
-			.productspec{
-				height: 44rpx;
-				color: #666666;
-				line-height: 44rpx;
-			}
-			.productprice{
-				height: 48rpx;
-				position: absolute;
-				width: 100%;
-				bottom: 0;
-				.price{
-					line-height: 48rpx;
-					font-size: $font-size-28;
-					width: 48%;
-					color: #f94b4b;
-					float: left;
-				}
-				.count{
-					height: 100%;
-					float: right;
-					position: relative;
-					.small{
-						color: #666666;
-					}
-				}
-			}
-		}
-		.goods-pros-m{
-			width: 100%;
-			height: auto;
-			line-height: 76rpx;
-			font-size: $font-size-26;
-			color: $text-color;
-			float: left;
-			padding: 10rpx 0;
-			border-bottom: 1px solid #F7F7F7;
-			.m-text{
-				width: 82rpx;
-				float: left;
-				padding-right: 20rpx;
-				font-weight:bold;
-			}
-			.m-input{
-				display: -webkit-box;
-				display: -webkit-flex;
-				display: flex;
-				-webkit-box-align: center;
-				-webkit-align-items: center;
-				align-items: center;
-				position: relative;
-				width: 600rpx;
-				height: auto;
-				padding: 20rpx 0 10rpx 0;
-				background: #FFFFFF;
-				.text{
-					width: 100%;
-					height: 100%;
-					font-size: $font-size-26;
-					line-height: 36rpx;
-					color: #333333;
-				}
-			}
-		}
-		.goods-pros-b{
-			width:100%;
-			height: 40rpx;
-			margin-top: 12rpx;
-			float: left;
-			.count{
-				float: left;
-				font-size: $font-size-28;
-				line-height: 40rpx;
-				color: $text-color;
-				display: flex;
-				justify-content: flex-end;
-			}
-			.money{
-				float: right;
-				font-size: $font-size-28;
-				line-height: 40rpx;
-				color: $text-color;
-				display: flex;
-				justify-content: flex-end;
-				.red{
-					color: #f94b4b;
-					font-weight: bold;
-				}
-			}
-		}
-	}
-	.information-record{
-		width: 100%;
-		height: auto;
-		padding: 20rpx 24rpx;
-		box-sizing: border-box;
-		background-color: #FFFFFF;
-		.record-title{
-			width: 100%;
-			font-size: $font-size-28;
-			color: $text-color;
-			text-align: left;
-			line-height: 40rpx;
-			margin-bottom: 12rpx;
-			float: left;
-			.record-title-l{
-				font-weight: bold;
-				float: left;
-			}
-			.record-title-r{
-				float: right;
-				.red{
-					color: #FF2A2A;
-					font-weight: bold;
-				}
-			}
-		}
-		.record-empty{
-			font-size: $font-size-26;
-			color: #999999;
-			text-align: left;
-			line-height: 40rpx;
-		}
-		.record-list{
-			width: 100%;
-			height: auto;
-			float: left;
-			margin-top: 12rpx;
-			.record-item{
-				height: 40rpx;
-				width: 100%;
-				padding: 12rpx 0;
-				font-size: $font-size-28;
-				line-height: 40rpx;
-				float: left;
-				display: flex;
-				justify-content: center;
-				flex-direction: row;
-				.item-time{
-					&.mm{
-						flex: 1;
-						color: $text-color;
-						text-align: left;
-					}
-					&.tt{
-						flex: 1;
-						color: #999999;
-						text-align: right;
-					}
-				}
-			}
-		}
-	}
-	.button-template{
-		width: 100%;
-		height: auto;
-		position: fixed;
-		bottom: 0;
-		left: 0;
-		background: #FFFFFF;
-		.button-content{
-			width: 702rpx;
-			padding:0 24rpx;
-			height: auto;
-			float: left;
-			position: relative;
-			.btn{
-				width: 160rpx;
-				height:  64rpx;
-				margin:22rpx;
-				line-height: 64rpx;
-				font-size:$font-size-26;
-				color: #FFFFFF;
-				text-align: center;
-				border-radius: 10rpx;
-				float: right;
-			}
-			.btn-color{
-				background: $btn-confirm;
-				margin: 22rpx 0 22rpx 22rpx;
-				.tips{
-					width: 160rpx;
-					height: 34rpx;
-					padding: 10rpx 10rpx;
-					background:linear-gradient(45deg,rgba(0,0,0,1) 0%,rgba(87,87,87,1) 100%);
-					box-shadow:0px 2px 4px 0px rgba(0,0,0,0.2);
-					border-radius: 8rpx;
-					position: absolute;
-					color: #FFFFFF;
-					line-height: 34rpx;
-					font-size: $font-size-24;
-					text-align: left;
-					right: 24rpx;
-					top: -45rpx;
-					&:before{
-						content: "";
-						width: 25rpx;
-						height: 25rpx;
-						background:linear-gradient(45deg,rgba(0,0,0,1) 0%,rgba(87,87,87,1) 100%);
-						position: absolute;
-						bottom: -8rpx;
-						right: 30rpx;
-						z-index: -1;
-						transform:rotate(45deg);
-					}
-				}
-			}
-		}
-	}
-</style>

supplier/pages/order/order-list.vue

@@ -1,719 +0,0 @@
-<template>
-	<view class="container mine clearfix">
-		<view class="tui-header-box first">
-			<view class="tui-header-search" @click.stop="rDrawer">
-				<view class="inner">
-					<text class="iconfont icon-sousuo"></text>
-					<view class="input">筛选我的订单</view>
-				</view>
-			</view>
-		</view>
-		<view class="user-section">
-			<view  :class="{'tui-order-list':scrollTop >= 0}" class="clearfix">
-				<!-- 空白页 -->
-				<view class="empty-container" v-if="isEmpty">
-					<image class="empty-container-image" src="https://img.caimei365.com/group1/M00/03/71/Cmis2F3wna6AcewRAAEtqt4jZmU397.png"></image>
-					<text class="error-text">暂无数据^_^</text>
-				</view>
-				<!-- 列表 -->
-				<view v-else class="tui-order-content">
-					<view  class="tui-order-item" v-for="(order,orderIndex) in orderData" :key="orderIndex"  @click.stop="detail(order.shopOrderID)">
-						<view class="order-title">
-							<view class="order-title-n">
-								<view class="order-title-name">收货人：{{order.userInfo.shouHuoRen}}</view>
-								<view class="order-title-phone">手机号：{{order.userInfo.mobile}}</view>
-							</view>
-							<view class="order-title-t first">
-								<view class="order-title-num">订单编号：{{ order.shopOrderNo }}</view>
-								<view class="order-title-tip">结算状态：{{ order.payStatus | payStatusType }}</view>
-							</view>
-							<view class="order-title-t">
-								<view class="order-title-num">下单时间：{{ order.orderTime }}</view>
-								<view class="order-title-tip">发货状态：<text class="status">{{ order.sendOutStatus | sendOutStatusType }}</text></view>
-							</view>
-						</view>
-						<view class="order-product">
-							<view class="goods-pros-t clearfix" v-for="(pros,prosIndex) in order.orderProductList" :key="prosIndex">
-								<view class="pros-product">
-									<view class="pros-product-img">
-										<image :src="pros.productImage" mode=""></image>
-									</view>
-									<view class="pros-product-msg">
-										<view class="name">{{ pros.name }}</view>
-										<view class="unit">规格：{{ pros.productUnit }}</view>
-										<view class="price">
-											<view class="red">¥{{ pros.price | NumFormat}}</view>
-											<view class="count"><text class="small">X</text> {{ pros.num }}</view>
-										</view>
-										<view class="number">
-											<text>已发货：{{ pros.shipmentsNum }}</text>
-											<text v-if="order.returnedNum!=null&&order.returnedNum!=0">已退货：{{ pros.actualCancelNum }}</text>
-											<text v-if="order.returnedNum!=null&&order.returnedNum!=0">取消：{{ pros.actualCancelNum }}</text>
-										</view>
-									</view>
-								</view>
-								<view class="pros-product-uss">合计：<text class="text">¥{{ pros.totalAmount | NumFormat}}</text></view>
-							</view>
-						</view>
-						<!-- 底部button -->
-						<order-button ref="orderButton" 
-									  :status="order.sendOutStatus"
-									  :orderInfo ="order"
-									  @buttonConfirm="handButtonConfirm">
-						</order-button>
-					</view>
-					<!--加载loadding-->
-					<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-					<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text='nomoreText'></tui-nomore>
-					<!--加载loadding-->
-				</view>
-			</view>
-		</view>	
-		<!--右抽屉-->
-		<tui-drawer mode="right" :visible="rightDrawer" @close="closeDrawer">
-			<view class="d-container clearfix" :style="{paddingTop:20+'px'}">
-				<view class="d-label">订单编号:</view>
-				<view class="d-input">
-					<input class="input" type="text" value="" v-model="listQuery.shopOrderNo" placeholder="输入订单编号"/>
-				</view>
-				<view class="d-label">收货人姓名:</view>
-				<view class="d-input">
-					<input class="input" type="text" value="" v-model="listQuery.shouHuoRen" placeholder="输入收货人姓名"/>
-				</view>
-				<view class="d-label">发货状态:</view>
-				<view class="d-input">
-					<picker @change="bindPickerChange($event)" :value="index" :range="StatusArray" range-key="name">
-						<input class="input" type="text" disabled="false" v-model="showSendOutStatus" value="" placeholder="请选择发货状态"/>
-						<text class="iconfont icon-xiangyou"></text>
-					</picker>
-				</view>
-				<view class="d-label">结算状态:</view>
-				<view class="d-input">
-					<picker @change="bindPickerChange1($event)" :value="index" :range="PayArray" range-key="name">
-						<input class="input" type="text" disabled="false" v-model="showpayStatus" value="" placeholder="请选择结算状态"/>
-						<text class="iconfont icon-xiangyou"></text>
-					</picker>
-				</view>
-				<view class="d-input btn">
-					<view class="d-btn comfrim" @click="handSearchList">确定</view>
-					<view class="d-btn clear" @click="handSearchClear">重置</view>
-				</view>
-			</view>
-		</tui-drawer>
-		<!-- 分享弹窗 -->
-		<share-alert  :shopOrderID="btnoRderID"
-					  v-if="isShareModal"  
-					  @shareConfirm ='onShareAppMessage'>
-		</share-alert>		
-	</view>
-</template>
-<script>
-	import tuiLoadmore from "@/components/tui-components/loadmore/loadmore"
-	import tuiNomore from "@/components/tui-components/nomore/nomore"
-	import orderButton from '@/components/cm-module/orderDetails/supplierListButton'//底部按钮
-	import shareAlert from '@/components/cm-module/modelAlert/supplierShareAlert'	  //分享弹窗
-	import modalLayer from "@/components/modal-layer"
-	import empty from "@/components/empty";
-	import { mapState,mapMutations } from 'vuex'
-	const defaultListQuery = {
-			shopID:'',
-			pageNum: 1,
-			pageSize: 10,
-			sendOutStatus: '',//发货状态
-			payStatus:'',//结算状态
-			shopOrderNo:'',//订单编号
-			shouHuoRen: '',//买家名称
-	 };
-	export default{
-		components: {
-			tuiLoadmore,
-			tuiNomore,
-			empty,
-			shareAlert,
-			orderButton
-		},
-		data() {
-			return{	
-				StatusArray:[
-					{name:'所有',value:'0'},
-					{name:'待发货',value:'1'},
-					{name:'部分发货',value:'2'},
-					{name:'已发货',value:'3'},
-				],
-				PayArray:[
-					{name:'所有',value:'0'},
-					{name:'待结算',value:'1'},
-					{name:'部分结算',value:'2'},
-					{name:'已结算',value:'3'},
-				],
-				shopID:0,
-				showSendOutStatus:'',
-				showpayStatus:'',
-				CustomBar:this.CustomBar,// 顶部导航栏高度
-				userID:0,
-				openId:'',
-				isShareModal:false,
-				listQuery:Object.assign({}, defaultListQuery),
-				orderData: [],
-				btnoRderID: 0, //点击按钮传入的的订单ID
-				scrollTop: 0,
-				deteleType:'',
-				skeletonShow: true,
-				isEmpty: false,
-				isDelete:false,
-				isModalLayer: false,
-				loadding: false,
-				pullUpOn: true,
-				pullFlag: true,
-				hasNextPage: false,
-				navbarHeight:'',
-				nomoreText: '上拉显示更多',
-				contentModalText:'',//操作文字提示语句
-				modal:false,
-				rightDrawer: false,
-				OperationType:'',//操作类型
-			}
-		},
-		onLoad(){
-			
-		},
-		filters: {
-			sendOutStatusType(value) {
-				if (value === null) {
-				  return '未发货';
-				} else if(value === '1') {
-				  return '待发货';
-				} else if(value === '2') {
-				  return '部分发货';
-				} else{
-				  return '已发货';
-				}
-			},
-			payStatusType(value) {
-				if (value === '1') {
-				  return '待结算';
-				} else if (value === '2') {
-				  return '部分结算';
-				} else {
-				  return '已结算';
-				}
-			},
-			NumFormat:function(text) {//处理金额
-				return Number(text).toFixed(2);
-			},
-		},
-		computed: {
-			...mapState(['hasLogin','userInfo'])
-		},
-		methods:{
-			getOrderDatainit(index){
-				this.listQuery.pageNum = 1
-				this.ShopService.GetSupplierMyOrderList(this.listQuery).then(response =>{
-					let data = response.data
-					this.hasNextPage = data.hasNextPage
-					if(data.results && data.results.length > 0){
-						this.isEmpty = false;
-						this.orderData = [...data.results];
-						if(hasNextPage){
-							this.pullUpOn = false
-							this.nomoreText = '上拉显示更多'
-						}else{
-							if(this.orderData.length < 5){
-								this.pullUpOn = true
-							}else{
-								this.pullUpOn = false
-								this.nomoreText = '已至底部'
-							}
-						}
-					}else{
-						this.isEmpty = true
-					}
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000);
-				})
-			}, 
-			getOnReachBottomData(index){//上拉加载
-				this.listQuery.pageNum += 1
-				this.ShopService.GetSupplierMyOrderList(this.listQuery).then(response =>{
-					let data = response.data
-					this.hasNextPage = data.hasNextPage
-					this.orderData = this.orderData.concat(data.results)
-					this.pullFlag = false;// 防上拉暴滑
-					setTimeout(()=>{this.pullFlag = true;},500)
-					if(this.total > this.orderData.length){
-						this.pullUpOn = false
-						this.nomoreText = '上拉显示更多'
-					}else{
-						this.loadding = false
-						this.pullUpOn = false
-						this.nomoreText = '已至底部'
-					}
-				})	
-			},
-			detail(shopOrderId) {//订单详情跳转
-				this.isModalLayer = true;	
-				this.$api.navigateTo(`/supplier/pages/order/order-details?shopOrderId=${shopOrderId}`)
-			},
-			handButtonConfirm(data) {//获取点击
-				console.log(data)
-				this.btnoRderID = data.orderInfo.shopOrderID
-				console.log(this.btnoRderID )
-				this.OperationType = data.type
-				this.handShowAlert(data)
-			},
-			handShowAlert(data){//判断点击的按钮类型并执行...
-				switch(data.type){
-					case 'record':
-						this.$api.navigateTo('/supplier/pages/deliver/deliver-record?shopOrderId='+this.btnoRderID)
-						break
-					case 'deliver':
-						this.$api.navigateTo('/supplier/pages/deliver/deliver-goods?shopOrderId='+this.btnoRderID)
-						break
-				}
-			},
-			rDrawer() {//弹出抽屉
-				this.rightDrawer = true;
-			},
-			closeDrawer(e) {//关闭抽屉
-				this.leftDrawer = false;
-				this.rightDrawer = false;
-			},
-			bindPickerChange: function(e) {//选择结算状态筛选
-				this.showSendOutStatus = this.StatusArray[e.target.value].name
-				this.listQuery.sendOutStatus = this.StatusArray[e.target.value].value
-			},
-			bindPickerChange1: function(e) {//选择发货状态筛选
-				this.showpayStatus = this.PayArray[e.target.value].name
-				this.listQuery.payStatus = this.PayArray[e.target.value].value
-			},
-			handSearchList(){//搜索
-				this.getOrderDatainit()
-				this.leftDrawer = false;
-				this.rightDrawer = false;
-			},
-			handSearchClear(){//重置搜索条件
-				this.listQuery = Object.assign({}, defaultListQuery)
-				this.listQuery.shopID = this.shopID
-				this.showSendOutStatus='';
-				this.showpayStatus='';
-			},
-		},
-		onShareAppMessage(res){//分享转发
-			this.isShareModal = false
-			if (res.from === 'button') {
-				// 来自页面内转发按钮
-		    }
-			return {
-				title: '您有订单待处理，请点击查看~',
-				path: `/supplier/pages/login/share-info?authority=3&shopOrderId=${this.btnoRderID}`,
-				imageUrl:'https://img.caimei365.com/group1/M00/03/95/Cmis216Sk_SABnOFABZCgCzFV_g063.png'
-			}
-		},
-		onReachBottom() {
-			if(this.hasNextPage){
-				this.loadding = true
-				this.pullUpOn = true
-				this.getOnReachBottomData()
-			}	
-		},
-		onPullDownRefresh() {
-			setTimeout(() => {
-				this.listQuery.pageNum = 1
-				this.listQuery.payStatus=''
-				this.listQuery.showSendOutStatus=''
-				this.getOrderDatainit()
-				uni.stopPullDownRefresh()
-			}, 200)
-		},
-		onShow(){
-			this.$api.getComStorage('userInfo').then((resolve) =>{
-				this.listQuery.shopID = this.shopID = resolve.shopID
-				this.getOrderDatainit()
-			})
-		}	
-	}
-</script>
-
-<style lang="scss">
-	@import "@/uni.scss";
-	page{
-		background:#F7F7F7;
-	}
-	.d-container {
-		width: 560rpx;
-		padding: 80rpx 30rpx;
-		.d-title{
-			width: 100%;
-			height:80rpx;
-			line-height: 80rpx;
-			text-align: center;
-			color: #4688fa;
-			font-size: $font-size-32;
-			float: left;
-		}
-		.d-time{
-			width: 100%;
-			height: 70rpx;
-			float: left;
-			box-sizing: border-box;
-			padding: 0 10rpx;
-			border: 1px solid rgba(0,0,0,0.2);
-			border-radius: 4rpx;
-			margin-bottom: 30rpx;
-			.iconfont{
-				width:70rpx;
-				height: 60rpx;
-				display: block;
-				float: left;
-				font-size: 50rpx;
-				color: #666666;
-				line-height: 70rpx;
-				text-align: left;
-			}
-			.input{
-				width: 220rpx;
-				height: 70rpx;
-				line-height: 70rpx;
-				float: left;
-				box-sizing: border-box;
-				font-size: $font-size-24;
-				color: #333333;
-				padding: 0 10rpx;
-			}
-		}
-		.d-label{
-			width: 100%;
-			height: 44rpx;
-			line-height: 44rpx;
-			text-align: left;
-			color: #666666;
-			font-size: $font-size-26;
-			float: left;
-		}
-		.d-input{
-			width: 100%;
-			height: 70rpx;
-			float: left;
-			box-sizing: border-box;
-			padding: 0 10rpx;
-			border: 1px solid rgba(0,0,0,0.2);
-			border-radius: 4rpx;
-			margin-bottom: 30rpx;
-			position: relative;
-			&.btn{
-				border: none;
-				margin-top: 40rpx;
-			}
-			.input{
-				width: 100%;
-				height: 70rpx;
-				line-height: 70rpx;
-				float: left;
-				box-sizing: border-box;
-				font-size: $font-size-24;
-				color: #333333;
-				padding: 0 10rpx;
-				padding-right: 68rpx;
-			}
-			.iconfont{
-				width: 50rpx;
-				height: 68rpx;
-				display: block;
-				line-height: 68rpx;
-				text-align: center;
-				font-size: 30rpx;
-				color: #999999;
-				position: absolute;
-				right: 0;
-				top: 0;
-			}
-			.d-btn{
-				width: 210rpx;
-				height: 84rpx;
-				border-radius: 42rpx;
-				background: $btn-confirm;
-				line-height: 84rpx;
-				text-align: center;
-				font-size: $font-size-26;
-				color: #FFFFFF;
-				float: right;
-				&.comfrim{
-					background: $btn-confirm;
-					margin-left: 20rpx;
-				}
-				&.clear{
-					background: #e1e1e1;   
-				}
-			}
-		}
-	}
-	.tui-header-box {
-		width: 100%;
-		height: 84rpx;
-		box-sizing: border-box;
-		padding:10rpx 24rpx;
-		display: flex;
-		align-items: center;
-		position: fixed;
-		top: 0;
-		left: 0;
-		z-index: 999;
-		background-color: #FFFFFF;
-		.tui-header-search{
-			width: 100%;
-			height: 100%;
-			background: #F7F7F7;
-			border-radius: 32rpx;
-			position: relative;
-			.inner{
-				width: 210rpx;
-				margin: 0 auto;
-				.icon-sousuo{
-					width: 64rpx;
-					height: 64rpx;
-					line-height: 64rpx;
-					text-align: center;
-					display: block;
-					font-size: $font-size-38;
-					float: left;
-					color: #999999;
-				}
-				.input{
-					height: 64rpx;
-					float: left;
-					line-height: 64rpx;
-					color: #999999;
-					font-size: $font-size-24;
-				}
-			}
-		}
-	}
-	.tui-header {
-		width: 100%;
-		font-size: 16px;
-		font-weight: 500;
-		height: 32px;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		position: relative;
-		padding: 0 40rpx;
-	}
-	.user-section{
-		width: 100%;
-		padding-top: 94rpx;
-	}
-	.tui-order-content{
-		width: 100%;
-		height: auto;
-	}
-	.tui-order-list {
-		width: 100%;
-		position: relative;
-	}
-	.tui-order-item {
-		display: flex;
-		flex-direction: column;
-		width: 100%;
-		padding:20rpx 24rpx 0 24rpx;
-		background: #fff;
-		border-bottom: 20rpx solid #F7F7F7;
-		box-sizing: border-box;
-	}
-	.order-title{
-		width: 100%;
-		height: auto;
-		.order-title-n{
-			width: 100%;
-			height: 70rpx;
-			float: left;
-			font-size: $font-size-28;
-			line-height: 70rpx;
-			border-bottom: 1px solid #e1e1e1;
-			.order-title-name{
-				float: left;
-				text-align: left;
-				color: $text-color;
-			}
-			.order-title-phone{
-				float: right;
-				text-align: right;
-				font-size: $font-size-28;
-				color: $text-color;
-			}
-		}
-		.order-title-t{
-			width: 100%;
-			height: 50rpx;
-			float: left;
-			font-size: $font-size-28;
-			line-height: 50rpx;
-			&.first{
-				padding-top: 20rpx;
-			}
-			.order-title-num{
-				float: left;
-				text-align: left;
-				color: #666666;
-			}
-			.order-title-tip{
-				float: right;
-				text-align: right;
-				font-size: $font-size-28;
-				color: #666666;
-				.status{
-					color: $color-system;
-				}
-			}
-		}
-		.order-title-b{
-			width: 100%;
-			height: 40rpx;
-			float: left;
-			margin-top: 8rpx;
-			font-size: $font-size-28;
-			line-height: 40rpx;
-			color: #999999;
-			text-align: left;
-		}
-	}
-	.order-product{
-		width: 100%;
-		height: auto;
-		float: left;
-		margin-top: 15rpx;
-		.goods-pros-t{
-			width: 100%;
-			height: auto;
-			padding: 15rpx 0;
-			border-bottom: 1px solid #e1e1e1;
-			.pros-product{
-				width: 100%;
-				height: 184rpx;
-				float: left;
-				.pros-product-img{
-					width: 182rpx;
-					height: 182rpx;
-					border:1px solid #e1e1e1;
-					border-radius: 6rpx;
-					float: left;
-					margin-right: 17rpx;
-					image{
-						width: 182rpx;
-						height: 182rpx;
-						display: block;
-						border-radius: 6rpx;
-					}
-				}
-				.pros-product-msg{
-					width: 500rpx;
-					height: 184rpx;
-					float: left;
-					.name{
-						width: 100%;
-						height: auto;
-						float: left;
-						font-size: $font-size-28;
-						line-height: 38rpx;
-						color: $text-color;
-						text-align: left;
-						white-space: normal;
-						word-break: break-all;
-						overflow: hidden;
-						text-overflow: ellipsis;
-						display: -webkit-box;
-						-webkit-box-orient: vertical;
-						-webkit-line-clamp: 2;
-					}
-					.unit{
-						width: 100%;
-						float: left;
-						height: 38rpx;
-						font-size: $font-size-22;
-						color: #999999;
-						line-height: 38rpx;
-					}
-					.price{
-						width: 100%;
-						float: left;
-						height: 38rpx;
-						font-size: $font-size-28;
-						color: #666666;
-						line-height: 38rpx;
-						.red{
-							color: #f94b4b;
-							float: left;
-							font-weight: bold;
-						}
-						.count{
-							float: right;
-							.small{
-								font-size: $font-size-20;
-							}
-						}
-					}
-					.number{
-						width: 100%;
-						float: left;
-						height: 38rpx;
-						font-size: $font-size-24;
-						color: #999999;
-						line-height: 38rpx;
-						text{
-							margin-right: 30rpx;
-						}
-					}
-				}
-			}
-			.pros-product-uss{
-				width: 100%;
-				float: left;
-				height: 44rpx;
-				font-size: $font-size-28;
-				color: #999999;
-				line-height: 44rpx;
-				text-align: right;
-				font-weight: bold;
-				text{
-					color: #f94b4b;
-					margin-left: 10rpx;
-				}
-			}
-		}
-	}
-	.order-footer{
-		width: 100%;
-		height: 78rpx;
-		float: left;
-		border-bottom: 1px solid #EFEFEF;
-		.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;
-			color: #999999;
-			.name{
-				width: 50%;
-				float: left;
-				text-align: left;
-			}
-			.money{
-				width: 50%;
-				float: right;
-				text-align: right;
-				.txt{
-					color: #FF5000;
-				}
-			}
-		}
-	}
-</style>

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

@@ -1,592 +0,0 @@
-<template>
-	<view class="details clearfix" :style="{paddingBottom :isIphoneX ? (130+68)+'rpx' : '130rpx'}">
-		<cu-custom :navbar-data='nvabarData'></cu-custom>
-		<view class="container-details" :style="{paddingTop:CustomBar+'px'}" v-show="isRequest">
-			<!-- 订单信息 -->
-			<view class="information-content">
-				<view class="info-item"><view class="item-view"><text class="label">供应商：{{orderInfo.shopName ? orderInfo.shopName :''}}</text></view></view>
-				<view class="info-item"><view class="item-view"><text class="label">订单号：{{orderInfo.shopOrderNo}}</text></view></view>
-				<view class="info-item"><view class="item-view"><text class="label">下单时间：{{orderInfo.orderTime}}</text></view></view>
-				<view class="info-item">
-					<view class="item-view"><text class="label">收款状态：<text :style="{color:setStatusText(orderInfo.receiptStatus)}">{{setStatusTextHtml(orderInfo.receiptStatus)}}</text></text></view>
-					<view class="item-view"><text class="label">结算状态：<text :style="{color:setStatusText(orderInfo.payStatus)}">{{setStatusTextHtml1(orderInfo.payStatus)}}</text></text></view>
-				</view>
-				<view class="info-item">
-					<view class="item-view"><text class="label">发货状态：<text :style="{color:setStatusText(orderInfo.sendOutStatus)}">{{setStatusTextHtml2(orderInfo.sendOutStatus)}}</text></text></view>
-				</view>
-			</view>
-			<!-- 地址信息 -->
-			<view class="address-content">
-				<view class="info-item"><text class="label">收货人：{{orderInfo.userInfo.shouHuoRen}}</text></view>
-				<view class="info-item"><text class="label">联系方式：{{orderInfo.userInfo.mobile}}</text></view>
-				<view class="info-item"><text class="label">收货地址：<text style="color: #666666;">{{orderInfo.userInfo.address}}</text></text></view>
-			</view>
-			<!-- 商品 -->
-			<view class="goods-list">
-				<view class="goods-item clearfix">
-					<view class="productlist" v-for="(pros,idx) in orderInfo.orderProductList" :key="idx">
-						<view class="goods-pros-t" @click="hanldOperationConfim(pros)">
-							<view class="pros-left">
-								<view class="pros-img"><image :src="pros.productImage" alt="" mode="aspectFill" /></view>
-							</view>
-							<view class="pros-product">
-								<view class="producttitle">{{pros.aliasName ? pros.aliasName : ''}}</view>
-								<view class="productspec">规格：{{pros.productUnit ? pros.productUnit : ''}}</view>
-								<view class="productspec">商品编码：{{pros.productNo ? pros.productNo : ''}}</view>
-								<view class="product-view">
-									<view class="view-num">数量：{{pros.num+pros.presentNum}}</view>
-								</view>
-								<view class="product-view">
-									<view class="view-num">已发货：{{pros.shipmentsNum}}</view>
-									<view class="view-num">未发货：{{pros.notOutStore-pros.actualCancelNum}}</view>
-								</view>
-								<view class="product-view">
-									<view class="view-num" v-if="pros.returnedNum>0">已退货：{{pros.returnedNum}}</view>
-									<view class="view-num" v-if="pros.actualCancelNum>0">已取消：{{pros.actualCancelNum}}</view>
-								</view>
-								<text class="iconfont icon-genghuan"></text>
-							</view>	
-						</view>
-					</view>	
-					<view class="goods-pros-m" v-if="orderInfo.note!=null || orderInfo.note!=''">
-						<view class="m-text">留言:</view>
-						<view class="m-input">
-							<view class="text">{{orderInfo.note ? orderInfo.note : ''}}</view>
-						</view>	
-					</view>
-					<view class="goods-pros-b">
-						<view class="count">共{{orderInfo.itemCount}}件商品</view>
-					</view>
-				</view>
-			</view>	
-			<!-- 底部按钮 -->
-			<view class="button-template" :style="{paddingBottom :isIphoneX ? '68rpx' : '0rpx'}">
-				<view class="button-content">
-					<!-- #ifdef MP-WEIXIN -->
-					<button class="btn btn-color" open-type="share" @click="onShareAppMessage">分享订单</button>
-					<!-- #endif -->
-				</view>
-			</view>
-			<!--底部选择模态层弹窗组件 -->
-			<view class="popup spec" :class="specClass"  @touchmove.stop.prevent="discard" @tap="hideSpec">
-				<!-- 遮罩层 -->
-				<view class="mask"></view>
-				<view class="layer" @tap.stop="discard" :style="{paddingBottom :isIphoneX ? '68rpx' : '36rpx',bottom:isIphoneX ?'-332rpx' : '-294rpx'}">
-					<view class="content">
-						<view class="layer-title">商品显示名：</view>
-						<view class="layer-name">{{handleData.name}}</view>
-						<view class="layer-text">
-							<view class="layer-text-fl">
-								售价:<text style="color: #666;">￥{{toFixedFn(handleData.discountPrice)}}</text>
-							</view>
-							<view class="layer-text-fr">
-								<text style="color: #666;">共计{{handleData.num+handleData.presentNum}}件商品</text>
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import headerBack from '@/components/cm-module/headerNavbar/header-back' 		 	 //自定义导航
-	import orderAddress from '@/components/cm-module/orderDetails/orderAddress' 		 //地址信息
-	import goodsList from '@/components/cm-module/orderDetails/goodsList'		 		 //商品列表
-	import orderButton from '@/components/cm-module/orderDetails/orderButton'			 //底部按钮
-	export default {
-		components:{
-			headerBack,
-			orderAddress,
-			goodsList,
-			orderButton,
-		},
-		data() {
-			return {
-				nvabarData: {		//顶部自定义导航
-					showCapsule: 1, // 是否显示左上角图标  1表示显示  0表示不显示,
-					showSearch: 0,
-					title: '订单详情', // 导航栏 中间的标题
-					haveBack:false,
-					textLeft:this.$store.state.isIphone
-				},
-				isIphoneX:this.$store.state.isIphoneX,
-				CustomBar:this.CustomBar,// 顶部导航栏高度
-				specClass: '',//规格弹窗css类，控制开关动画
-				handleData:{},
-				state:0,
-				userID:'',
-				shopOrderId:'',
-				shareCode:'',				//分享码
-				orderInfo:{},				//订单信息
-				payStatus:0,
-				btnStatus:0,				//按钮组件状态
-				isRequest:false,			//是否加载完成渲染子组件
-				isOrderShare:false,
-				addressData:{},				//地址信息初始化
-				information:{},				//订单信息初始化
-			}
-		},
-		onLoad(option){
-			console.log(option)
-			this.shopOrderId = option.shopOrderId
-			this.initShopOrderDetails()
-		},
-		methods: {
-			initShopOrderDetails(){//初始化页面数据@参数：订单ID
-				this.ShopService.GetShopOrderDetails({ shopOrderId : this.shopOrderId }).then(res =>{
-					this.orderInfo  = res.data.shopOrder
-					this.isRequest = true
-				}).catch(err =>{
-					this.$util.msg(err.msg,2000);
-				})
-			},
-			handButtonConfirm(data){//监听点击时间的按钮类型并执行...
-				this.handShowAlert(data)
-			},
-			setStatusTextHtml(status){
-				let TextHtml='';
-				switch(status){
-					case '1':
-						TextHtml = '待付款'
-						break;
-					case '2':
-						TextHtml = '部分付款'
-						break;
-					case '3':
-						TextHtml = '已付款'
-						break;
-				}
-				return TextHtml
-			},
-			setStatusTextHtml1(status){
-				let TextHtml='';
-				switch(status){
-					case '1':
-						TextHtml = '待结算'
-						break;
-					case '2':
-						TextHtml = '部分结算'
-						break;
-					case '3':
-						TextHtml = '已结算'
-						break;
-				}
-				return TextHtml
-			},
-			setStatusTextHtml2(status){
-				let TextHtml='';
-				switch(status){
-					case '1':
-						TextHtml = '待发货'
-						break;
-					case '2':
-						TextHtml = '部分发货'
-						break;
-					case '3':
-						TextHtml = '已发货'
-						break;
-				}
-				return TextHtml
-			},
-			setStatusText(status){
-				let textColor='';
-				switch(status){
-					case '1':
-						textColor = '#FF2A2A'
-						break;
-					case '2':
-						textColor = '#E15616'
-						break;
-					case '3':
-						textColor = '#38CB3D'
-						break;
-				}
-				return textColor
-			},
-			hanldOperationConfim(data){//显示选择数量确认弹窗
-				this.specClass = 'show';
-				this.handleData = data
-			},
-			toFixedFn(text){
-				return Number(text).toFixed(2);
-			},
-			hideSpec() {//关闭选择数量确认弹窗
-				this.specClass = 'hide';
-				setTimeout(() => {
-					this.specClass = 'none';
-				}, 200);
-			},
-			onShareAppMessage(res){//分享转发
-				if (res.from === 'button') {
-					// 来自页面内转发按钮
-			    }
-				return {
-					title: '您有订单待处理，请点击查看~',
-					path: `/supplier/pages/login/share-info?authority=2&shopOrderId=${this.shopOrderId}`,
-					imageUrl:'https://img.caimei365.com/group1/M00/03/95/Cmis216Sk_SABnOFABZCgCzFV_g063.png'
-				}
-			},
-			discard(){
-				//丢弃
-			}
-		},
-		onPullDownRefresh() {//下拉刷新
-			this.initShopOrderDetails()
-			uni.stopPullDownRefresh()
-		},
-		onShow() {
-
-		}
-	}
-</script>
-
-<style lang="scss">
-	page {
-		height: 100%;
-		background:#F7F7F7;
-	}
-	.details{
-		padding-bottom: 130rpx;
-		width: 100%;
-		height: auto;
-	}
-	.container-details{
-		background:#F7F7F7;
-	}
-	.information-content{
-		width: 702rpx;
-		height: auto;
-		padding:10rpx 24rpx;
-		background: #FFFFFF;
-		margin-bottom: 24rpx;
-		.info-item{
-			height: 58rpx;
-			width: 100%;
-			display: flex;
-			.item-view{
-				flex: 1;
-				line-height: 58rpx;
-				font-size: $font-size-28;
-				color: #333333;
-			}
-		}
-	}
-	.address-content{
-		width: 702rpx;
-		height: auto;
-		padding:10rpx 24rpx;
-		background: #FFFFFF;
-		margin-bottom: 24rpx;
-		.info-item{
-			width: 100%;
-			display: flex;
-			line-height: 50rpx;
-			font-size: $font-size-28;
-			color: #333333;
-		}
-	}
-	.goods-list{
-		width: 100%;
-		height: auto;
-		background: #F7F7F7;
-		.goods-item{
-			width: 702rpx;
-			padding:24rpx;
-			height: auto;
-			background: #FFFFFF;
-			margin-bottom: 24rpx;
-			&:last-child{
-				margin-bottom: 0;
-			}
-		}
-		.productlist{
-			width: 100%;
-			height: auto;
-		}	
-		.goods-pros-t{
-			display: flex;
-			width: 100%;
-			height: auto;
-			padding: 12rpx 0;
-			.pros-left{
-				width: 210rpx;
-				height: 100%;
-				margin:0 26rpx 0 0;
-			}
-			.pros-img{
-				width: 210rpx;
-				height: 210rpx;
-				border-radius: 10rpx;
-				border:1px solid #f3f3f3;
-				image{
-					width: 100%;
-					height: 100%;
-					border-radius: 10rpx;
-				}
-			}
-		}
-		.pros-product{
-			width: 468rpx;
-			height: 100%;
-			line-height: 36rpx;
-			font-size: $font-size-26;	
-			position: relative;
-			.icon-genghuan{
-				position: absolute;
-				top: 50%;
-				right: 0;
-				font-size: $font-size-44;
-				color: $color-system;
-			}
-			.product-view{
-				width: 100%;
-				height: auto;
-				display: flex;
-				.view-num{
-					flex: 1;
-					text-align: left;
-					font-size: $font-size-26;
-					color: #666666;
-					line-height: 44rpx;
-				}
-			}
-			.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: 44rpx;
-				color: #666666;
-				line-height: 44rpx;
-			}
-			.productprice{
-				height: 48rpx;
-				position: absolute;
-				width: 100%;
-				bottom: 0;
-				.price{
-					line-height: 48rpx;
-					font-size: $font-size-28;
-					width: 48%;
-					color: #FF2A2A;
-					float: left;
-				}
-				.count{
-					height: 100%;
-					float: right;
-					position: relative;
-					.small{
-						color: #666666;
-					}
-				}
-			}
-		}
-		.goods-pros-m{
-			width: 100%;
-			height: auto;
-			line-height: 76rpx;
-			font-size: $font-size-26;
-			color: $text-color;
-			float: left;
-			padding: 10rpx 0;
-			border-top: 1px solid #F7F7F7;
-			border-bottom: 1px solid #F7F7F7;
-			.m-text{
-				width: 62rpx;
-				float: left;
-				padding-right: 20rpx;
-				font-weight:bold;
-			}
-			.m-input{
-				display: -webkit-box;
-				display: -webkit-flex;
-				display: flex;
-				-webkit-box-align: center;
-				-webkit-align-items: center;
-				align-items: center;
-				position: relative;
-				width: 620rpx;
-				height: auto;
-				padding: 20rpx 0 10rpx 0;
-				background: #FFFFFF;
-				.text{
-					width: 100%;
-					height: 100%;
-					font-size: $font-size-26;
-					line-height: 36rpx;
-					color: #333333;
-				}
-			}
-		}
-		.goods-pros-b{
-			width:100%;
-			height: 40rpx;
-			margin-top: 12rpx;
-			float: left;
-			.count{
-				float: right;
-				font-size: $font-size-28;
-				line-height: 40rpx;
-				color: $text-color;
-				display: flex;
-				justify-content: flex-end;
-			}
-		}
-	}
-	.button-template{
-		width: 100%;
-		height: auto;
-		position: fixed;
-		bottom: 0;
-		left: 0;
-		background: #FFFFFF;
-		-webkit-border-radius: 20rpx 20rpx 0 0;
-		border-radius: 20rpx 20rpx 0 0;
-		-webkit-box-shadow: 0px 3px 10px rgba(51, 51, 51, 0.5);
-		box-shadow: 0px 3px 10px rgba(51, 51, 51, 0.5);
-		.button-content{
-			width: 702rpx;
-			padding:0 24rpx;
-			height: auto;
-			float: left;
-			position: relative;
-			.btn{
-				width: 160rpx;
-				height:  64rpx;
-				margin:22rpx;
-				line-height: 64rpx;
-				font-size:$font-size-26;
-				color: #FFFFFF;
-				text-align: center;
-				border-radius: 10rpx;
-				float: right;
-			}
-			.btn-color{
-				background: $btn-confirm;
-				margin: 22rpx 0 22rpx 22rpx;
-				.tips{
-					width: 160rpx;
-					height: 34rpx;
-					padding: 10rpx 10rpx;
-					background:linear-gradient(45deg,rgba(0,0,0,1) 0%,rgba(87,87,87,1) 100%);
-					box-shadow:0px 2px 4px 0px rgba(0,0,0,0.2);
-					border-radius: 8rpx;
-					position: absolute;
-					color: #FFFFFF;
-					line-height: 34rpx;
-					font-size: $font-size-24;
-					text-align: left;
-					right: 24rpx;
-					top: -45rpx;
-					&:before{
-						content: "";
-						width: 25rpx;
-						height: 25rpx;
-						background:linear-gradient(45deg,rgba(0,0,0,1) 0%,rgba(87,87,87,1) 100%);
-						position: absolute;
-						bottom: -8rpx;
-						right: 30rpx;
-						z-index: -1;
-						transform:rotate(45deg);
-					}
-				}
-			}
-		}
-	}
-	.popup {
-		position: fixed;
-		top: 0;
-		width: 100%;
-		height: 100%;
-		z-index: 999;
-		display: none;
-		.mask{
-			position: fixed;
-			top: 0;
-			width: 100%;
-			height: 100%;
-			z-index: 21;
-			background-color: rgba(0, 0, 0, 0.6);
-		}
-		.layer {
-			position: fixed;
-			z-index: 22;
-			bottom: -294rpx;
-			width: 702rpx;
-			padding: 24rpx 24rpx 36rpx 24rpx;
-			height: 236rpx;
-			border-radius: 20rpx 20rpx 0 0;
-			background-color: #fff;
-			display: flex;
-			flex-wrap: wrap;
-			align-content: space-between;
-			.content {
-				width: 100%;
-				.layer-title{
-					font-size: $font-size-28;
-					color: $text-color;
-					line-height: 58rpx;
-				}
-				.layer-name{
-					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;
-					font-size: $font-size-28;
-					color: #666;
-				}
-				.layer-text{
-					margin-top: 10rpx;
-					font-size: $font-size-28;
-					color: $text-color;
-					line-height: 58rpx;
-					.layer-text-fl{
-						float: left;
-					}
-					.layer-text-fr{
-						float: right;
-					}
-				}
-			}
-		}
-		
-		&.show {
-			display: block;
-			.mask{
-				animation: showPopup 0.2s linear both;
-			}
-			.layer {
-				animation: showLayer 0.2s linear both;
-			}
-		}
-		&.hide {
-			display: block;
-			.mask{
-				animation: hidePopup 0.2s linear both;
-			}
-			
-			.layer {
-				animation: hideLayer 0.2s linear both;
-			}
-		}
-		&.none {
-			display: none;
-		}
-	}	
-</style>

supplier/pages/user/information.vue

@@ -1,1062 +0,0 @@
-<template name='information'>
-	<view class="container" :style="{paddingBottom :isIphoneX ? '218rpx' : '184rpx'}">
-		<view class="wrap-info">
-			<view class="row">
-				<view class="info-title">基本信息</view>
-			</view>
-			<view class="info-from">
-				<view class="label">公司名称</view>
-				<input class="row-input" type="text"  v-model="params.name" placeholder="请与营业执照的注册名称保持一致" placeholder-class="placeholder" maxlength="30"/>
-			</view>
-			<view class="info-from">
-				<view class="label">公司简称</view>
-				<input class="row-input" type="text" v-model="params.sname" placeholder="请输入公司简称" placeholder-class="placeholder" maxlength="10"/>
-			</view>
-			<view class="info-from">
-				<view class="label">公司地址</view>
-				<view class="row-input" @click="showMulLinkageThreePicker">
-					 <text :class="addressData.address === '请选择公司所在地区' ? 'none' : ''">
-					 	{{addressData.address}}
-					 </text>	
-					 <text class="iconfont icon-xiayibu"></text>
-				</view> 
-			</view>
-			<textarea value="" v-model="params.address"  placeholder="请填写详细地址，如街道/小区/门牌等" maxlength="50" placeholder-class="placeholder" class="address-details"/>
-			<view class="info-from">
-				<view class="label">联系人</view>
-				<input class="row-input"  v-model="params.linkMan" type="text" placeholder="请输入联系人姓名" placeholder-class="placeholder" maxlength="6"/>
-			</view>
-			<view class="info-from">
-				<view class="label">邮箱</view>
-				<input class="row-input" v-model="params.email" type="text" placeholder="请输入邮箱地址" placeholder-class="placeholder"/>
-			</view>
-			 <text class="info-email">邮箱可用作登录账号，请使用公司邮箱或法人邮箱</text>
-			<view class="info-from">
-				<view class="label">固定电话</view>
-				<input class="row-input" v-model="params.contractPhone" type="text" placeholder="请在号码前加区" placeholder-class="placeholder" maxlength="11"/>
-			</view>
-			<view class="info-from">
-				<view class="label">传真</view>
-				<input class="row-input" v-model="params.fax" type="text" placeholder="请输入公司传真号" placeholder-class="placeholder"/>
-			</view>
-			<view class="info-from">
-				<view class="label">法人代表</view>
-				<input class="row-input" v-model="params.legalPerson" type="text" placeholder="请输入公司法人代表姓名" placeholder-class="placeholder" maxlength="6"/>
-			</view>
-			<view class="info-from">
-				<view class="label">注册资本</view>
-				<input class="row-input"  v-model="params.registeredCapital" type="text" placeholder="请填写公司注册资本 " placeholder-class="placeholder" />
-			</view>
-			<view class="info-from">
-				<view class="label">公司性质</view>
-				<input class="row-input" v-model="params.nature" type="text" placeholder="请填写公司性质" placeholder-class="placeholder"/>
-			</view>
-			<view class="info-from">
-				<view class="label">年营业额</view>
-				<input class="row-input" v-model="params.turnover" type="text" placeholder="请输入公司年营业额" placeholder-class="placeholder"/>
-			</view>
-		</view>
-		
-		<view class="wrap-content">
-			<view class="row">
-				<view class="info-title">经营信息</view>	
-			</view>
-			<view class="info-from" style="border: 0;">
-				<view class="label">公司类型</view>
-				<view class="row-input ShopTyperadio">
-				 <radio-group @change="radioChange">
-					 <label class="radio" v-for="(item, index) in typename" :key="item.value">
-						 <radio :value="item.value" :checked="item.value == params.firstShopType" color='#E15616'/>{{item.name}}
-					 </label>
-				 </radio-group>
-				 </view>
-			</view>
-			<view class="secondTyperadio"  v-if="params.firstShopType==1" >
-				 <view class="radio" v-for="(item,index) in secondtype" :key="index" @click="secondypeRidio(item)" :class="item.value==params.secondShopType?'active':''">
-				 	<view class="secondRadio" >{{item.name}}</view>
-				 </view>
-			</view>
-			<view class="zizhi" v-if="params.secondShopType==3">
-				<view class="info2-title zizhi-title">资质</view>
-				<view class="uploadImage">
-					 <view class="form-upload-image"  v-if="params.medicalPracticeLicenseImg1!=''&&params.medicalPracticeLicenseImg1!=null">
-						   <image class="upload-img" :src="params.medicalPracticeLicenseImg1" alt="" ></image>
-						   <view class="iconfont icon-shanchu1" @click="deleteMedicalImage()"></view>
-					 </view>
-					 <view class="formLine-file" @click="uploadzizhiImageFn" v-else>
-						   <view class="file-zizhi"></view>
-					  </view>
-					  <view class="form-upload-tips">
-						  <text class="iconfont icon-wenhao"></text>
-						  <view class="wen-tips">点击图片可放大图片</view>
-					  </view>
-				</view>
-			</view>
-			<view class="business">
-				<view class="info2-title business-title">主营内容</view>
-				<view class="business-info">
-					 <checkbox-group class="row-group" @change="chooseMaleLike">
-								<label class="diyBox" v-for="(item, index) in mentuzCampList" :key="item.value" >
-									<checkbox :value="item.value" :checked="item.checked"></checkbox>
-									<view class="row-text">{{item.name}}</view>
-								</label>
-					 </checkbox-group>
-					 <view class="addbusiness">
-					 	<input class="row-input other" type="text" placeholder="请输入自定义项目"  v-model="mainProEdit"placeholder-class="placeholder" maxlength="5"/>
-					 	<button type="default" class="button" @click.stop="mainProAdd">确认添加</button>
-					 </view>
-				</view>
-			</view>
-			<view class="business">
-				<view class="info2-title business-title">经营范围</view>
-				<view class="business-info">
-					   <checkbox-group class="row-group" @change="chooseMaleLikes">
-							<label class="row-input" v-for="(item, index) in medicaCampList" :key="item.value" >
-								<checkbox :value="item.value" :checked="item.checked" ></checkbox>
-								<view class="row-text">{{item.name}}</view>
-							</label>
-					   </checkbox-group>
-					 <view class="addbusiness">
-					 	<input class="row-input other" type="text" placeholder="请输入自定义经营范围" v-model="shopScopeEdit" placeholder-class="placeholder" maxlength="5"/>
-					 	<button type="default" class="button" @click.stop="shopScopeAdd">确认添加</button>
-					 </view>
-				</view>
-			</view>
-			<view class="info">
-				<view class="info2-title">公司介绍</view>
-				 <textarea  v-model="params.info"  maxlength="2000" placeholder="公司简介会在公司介绍页面展示，有助于机构更好的了解您， 建议从个人规模、代理产品、机构服务、荣誉资质这4方面进行介绍" placeholder-class="placeholder" name="textarea"/>
-			</view>
-			<view class="info">
-				<view class="info2-title">主打系列商品说明</view>
-				 <textarea placeholder="请输入主打系列商品说明" v-model="params.productDesc" maxlength="500" placeholder-class="placeholder" name="textarea"/>
-			</view>
-		</view>
-		
-		<view class="wrap-image">
-			<view class="row">
-				<view class="info-title">资质证明</view>
-			</view>
-			<view class="info-from">
-				<view class="label Code">营业执照编号</view>
-				<input class="row-input Code" v-model.trim="params.socialCreditCode" type="text" placeholder="请输入公司营业执照编号" placeholder-class="placeholder" maxlength="18"/>
-			</view>
-			<view class="zizhi">
-				<view class="info2-title zizhi-title">营业执照图片</view>
-				<view class="uploadImage">
-					 <view class="form-upload-image"  v-if="params.businessLicenseImage!=''&&params.businessLicenseImage!=null">
-						   <image class="upload-img" :src="params.businessLicenseImage" @click="showViewerImageFn()" ></image>
-						   <view class="iconfont icon-shanchu1" @click="deleteBusinessImage()"></view>
-					 </view>
-					 <view class="formLine-file" @click="uploadBusinessLicenseImageFn" v-else>
-						   <view class="file-biss iconImage"></view>
-					  </view>
-				</view>
-			</view>
-			<view class="zizhi">
-				<view class="info2-title zizhi-title">公司LOGO</view>
-				<view class="uploadImage">
-					 <view class="form-upload-image"  v-if="params.logo!=''&&params.logo!=null">
-						   <image class="upload-img" :src="params.logo" alt="" @click="showViewerImageFn1()"></image>
-						   <view class="iconfont icon-shanchu1"  @click="deletelogoImage()"></view>
-					 </view>
-					 <view class="formLine-file" @click="uploadlogoImageFn" v-else>
-						   <view class="file-logo iconImage"></view>
-					  </view>
-				</view>
-			</view>
-			<view class="zizhi">
-				<view class="info2-title zizhi-title">生产许可证</view>
-				<view class="uploadImage">
-					 <view class="form-upload-image"  v-if="params.productionLicence!=''&&params.productionLicence!=null">
-						   <image class="upload-img" :src="params.productionLicence" alt="" @click="showViewerImageFn2()"></image>
-						   <view class="iconfont icon-shanchu1" @click="deleteproducImage()"></view>
-					 </view>
-					 <view class="formLine-file" @click="uploadproductionLicenceImageFn" v-else>
-						   <view class="file-produce iconImage"></view>
-					  </view>
-				</view>
-			</view>
-			<view class="zizhi">
-				<view class="info2-title zizhi-title">卫生许可证</view>
-				<view class="uploadImage">
-					 <view class="form-upload-image"  v-if="params.hygienicLicense!=''&&params.hygienicLicense!=null">
-						   <image class="upload-img" :src="params.hygienicLicense" alt="" @click="showViewerImageFn3()"></image>
-						   <view class="iconfont icon-shanchu1" @click="deletehygienicImage()"></view>
-					 </view>
-					 <view class="formLine-file" @click="uploadhygienicLicenseImageFn" v-else>
-						   <view class="file-health iconImage"></view>
-					  </view>
-				</view>
-			</view>
-			<view class="zizhi">
-				<view class="info2-title zizhi-title">税务许可证</view>
-				<view class="uploadImage">
-					 <view class="form-upload-image"  v-if="params.taxLicense!=''&&params.taxLicense!=null">
-						   <image class="upload-img" :src="params.taxLicense" alt="" @click="showViewerImageFn4()"></image>
-						   <view class="iconfont icon-shanchu1" @click="deletaxImage()"></view>
-					 </view>
-					 <view class="formLine-file" @click="uploadtaxLicenseImageFn" v-else>
-						   <view class="file-tax iconImage"></view>
-					  </view>
-				</view>
-			</view>
-			<view class="zizhi">
-				<view class="info2-title zizhi-title hoor">荣誉证书</view>
-					<view class="uploadImage list-image">
-						<view class="formLine-file" @click="uploadHonorImageFn" v-if="HonorImagesList.length<5" >
-								<view class="file-honor iconImage"></view>
-						 </view>
-						 <view class="form-upload-image" v-for="(item, index) in HonorImagesList" :key="index">
-							   <image class="upload-img" :src="item" alt="" @click="showViewerImageFn5()"></image>
-							   <view class="iconfont icon-shanchu1" @click="removeGoodsImagesFn(HonorImagesList)"></view>
-						 </view>
-					</view>
-			</view>
-			<view class="zizhi">
-				<view class="info2-title zizhi-title hoor">产品证书</view>
-				<view class="uploadImage list-image">
-					<view class="formLine-file" @click="uploadproductImageFn" v-if="productImagesList.length<5" >
-							<view class="file-product iconImage"></view>
-					 </view>
-					 <view class="form-upload-image" v-for="(item, index) in productImagesList" :key="index">
-						   <image class="upload-img" :src="item" alt="" @click="showViewerImageFn6()"></image>
-						   <view class="iconfont icon-shanchu1" @click="removeproductImagesFn(index)"></view>
-					 </view>
-				</view>
-			</view>
-		</view>
-		<view class="wrap-Btn" :style="{paddingBottom :isIphoneX ? '68rpx' : '34rpx'}">
-			<button type="default" class="confirmBbtn" @click="shopSubmit">保存</button>
-		</view>
-		<mpvue-city-picker :themeColor="themeColor"
-							ref="mpvueCityPicker" 
-						    :pickerValueDefault="cityPickerValueDefault"
-							@onCancel="onCancel" 
-							@onConfirm="onConfirm">
-		</mpvue-city-picker>
-	</view>
-</template>
-
-<script>
-	import mpvueCityPicker from '@/components/mpvue-citypicker/mpvueCityPicker.vue'
-	import { uploadFileImage } from "@/api/utils.js"
-	import { mapState,mapMutations } from 'vuex';
-	export default{
-		name:'information',
-		components:{
-			mpvueCityPicker,
-		},
-		data(){
-			return{
-				isShowInput:false,
-				firsttype:0,
-				secontype:0,
-				isfirstShow:false,
-				issecondshow:false,
-				addressData:{
-					address:'请选择公司所在地区',
-					townID:'',			//区ID
-					cityID:'',			//区ID
-					provinceID:'',		//区ID
-					addressDetail: '',	//地址
-				},
-				typename:[
-					{name:'医疗',value:'1'},
-					{name:'非医疗',value:'2'}
-				],
-				secondtype:[
-					{name:'一类器械',value:'1'},
-					{name:'二类器械',value:'2'},
-					{name:'三类器械',value:'3'},
-					{name:'其它',value:'4'}
-				],
-				mentuzCampNullList:[
-					{value:'1',name:'产品'},
-					{value:'2',name:'仪器'},
-					{value:'3',name:'服务'}
-				],
-				medicaCampNullList:[
-					{value:'1',name:'仪器护理类'},
-					{value:'2',name:'护肤品类'},
-					{value:'3',name:'纹绣类'},
-					{value:'4',name:'美体内衣'},
-					{value:'5',name:'整形耗材'},
-					{value:'6',name:'国际品牌'},
-					{value:'7',name:'美胸类'},
-					{value:'8',name:'健康保健类'},
-					{value:'9',name:'面膜类'},
-					{value:'10',name:'抗衰老'},
-					{value:'11',name:'生殖保养'},
-					{value:'12',name:'健康养生'},
-					{value:'13',name:'纤体减肥'}
-				],
-				params:{
-					userID:'',
-					shopID:'',
-					townID:'',
-					provinceID: '',//省id
-					cityID: '',
-					address:'',
-					name:'',//公司名称
-					sname:'',//公司简称
-					linkMan:'',//联系人
-					email:'',//
-					contractPhone:'',//固定电话
-					fax:'',//传真
-					legalPerson:'',//法人代表
-					registeredCapital:'',//注册资本
-					nature:'',//公司性质
-					turnover:'',//年营业额
-					firstShopType:'',//公司类型 1医疗  2非医疗
-					secondShopType:'',//医疗下的二级分类
-					medicalPracticeLicenseImg1:'',//资质
-					mainpro:'',//主营产品
-					businessScope:'',//经营内容
-					info:'',//公司介绍
-					productDesc:'',//主打说明
-					medicalPracticeLicenseImg1:'',//三级器械/医疗执照
-					socialCreditCode:'',//营业执照编号
-					businessLicenseImage:'',//营业执照
-					logo:'',//公司logo
-					productionLicence:'',//生产
-					hygienicLicense:'',//卫生
-					taxLicense:'',//税务
-					certificateHonor:'',//荣誉
-					productCertification:'',//产品
-				},
-				mentuzCampList:[],
-				medicaCampList:[],
-				shopMainPros:[],
-				shopScope:[],
-				mainProEdit: '',
-				shopScopeEdit:'',
-				HonorImagesList:[],
-				productImagesList:[],
-				isPreviewImage:false,   	//预览图片开关
-				isMainproCheck:false,
-				isIphoneX:this.$store.state.isIphoneX,
-			}
-		},
-		onLoad() {
-		},
-		created() {
-			this.shopInfo();
-		},
-		methods:{
-			chooseMaleLike(e){
-				this.isMainproCheck = true
-				this.params.mainpro = this.checkLikes(e,this.mentuzCampList)
-			},
-			chooseMaleLikes(e){
-				this.isMainproCheck = true
-				this.params.businessScope = this.checkLikes(e,this.medicaCampList)
-			},
-			checkLikes(e,list){
-				let	values = e.detail.value;
-				let arr = []
-				list.forEach(item => {
-					if(values.indexOf(item.value) >= 0){
-						this.$set(item,'checked',true)
-						arr.push(item.name)
-					}else{
-						this.$set(item,'checked',false)
-					}
-				})
-				console.log(arr)
-				return arr.join('/')
-			},
-			setNewMainpro(arr){//回显处理主营内容
-				let _ARRAY = [];
-				arr.split('/').forEach((item,index) =>{
-					if(item != ""){
-						let _OBJ = {value:(index+1).toString(),name:item,checked:true}
-						_ARRAY.push(_OBJ)
-					}
-				})
-				return _ARRAY
-			},
-		  shopInfo(){
-			  this.$api.getStorage().then((resolve) =>{
-				  this.params.userID = resolve.userID;
-				  this.params.shopID = resolve.shopID;
-				  	console.log(resolve)
-				  this.UserService.SupplierShopInfo({userId:this.params.userID}).then(response =>{
-					if(response.code==0){
-						console.log(response)
-						let shop = response.data.shop;
-						let user = response.data.user;
-						this.params.name = shop.name;
-						this.params.sname = shop.sname;
-						this.params.linkMan = shop.linkMan;
-						this.params.email = user.email;
-						this.addressData.address =  shop.provincialAddress;
-						this.params.address = shop.address;
-						this.params.provinceID = shop.provinceID;
-						this.params.cityID = shop.cityID;
-						this.params.townID = shop.townID;
-						if(shop.contractPhone!=""&&shop.contractPhone!=null){
-							this.params.contractPhone = shop.contractPhone;
-						}
-						if(shop.fax!=""&&shop.fax!=null){
-							this.params.fax = shop.fax;
-						}
-						this.params.legalPerson = shop.legalPerson;
-						this.params.registeredCapital = shop.registeredCapital;
-						this.params.nature = shop.nature;
-						this.params.turnover = shop.turnover;
-						this.params.firstShopType = shop.firstShopType ? shop.firstShopType:'';
-						this.params.secondShopType = shop.secondShopType ? shop.secondShopType : '';
-						this.params.medicalPracticeLicenseImg1 = shop.medicalPracticeLicenseImg1;
-						this.params.info = shop.info;
-						this.params.productDesc = shop.productDesc;
-						this.params.socialCreditCode = shop.socialCreditCode;
-						this.params.businessLicenseImage = shop.businessLicenseImage;
-						this.params.logo = shop.logo;
-						this.params.productionLicence = shop.productionLicence;
-						this.params.hygienicLicense = shop.hygienicLicense;
-						this.params.taxLicense = shop.taxLicense;
-						this.HonorImagesList = response.data.certificateHonor;
-						this.productImagesList = response.data.productCertification;
-						if( response.data.certificateHonor!=''&& response.data.certificateHonor!=null){
-							this.params.certificateHonor =this.HonorImagesList.toString()+',';
-						}
-						if( response.data.productCertification!=''&& response.data.productCertification!=null){
-							this.params.productCertification =this.productImagesList.toString()+',';
-						}
-						if(shop.mainpro == "" || shop.mainpro == null){
-							this.mentuzCampList = this.mentuzCampNullList
-						}else{
-							this.mentuzCampList = this.setNewMainpro(shop.mainpro)
-							this.params.mainpro = shop.mainpro
-						}
-						if(shop.businessScope == "" || shop.businessScope == null){
-								this.medicaCampList = this.medicaCampNullList
-						}else{
-							this.medicaCampList = this.setNewMainpro(shop.businessScope)
-							this.params.businessScope = shop.businessScope
-						}
-					}
-				 })
-				 })
-			 },
-			shopSubmit(){//提交修改
-				console.log(this.params);
-				if(this.params.name==''||this.params.name==null){
-					this.$util.msg('请输入公司名称',2000);
-					return
-				}else if(this.params.townID==''||this.params.townID==null){
-					this.$util.msg('请选择联系地址',2000);
-					return
-				}else if(this.params.address==''||this.params.address==null){
-					this.$util.msg('请输入正确的联系地址',2000);
-					return
-				}else if(this.params.linkMan==''||this.params.linkMan==null){
-					this.$util.msg('请输入正确的联系人姓名',2000);
-					return
-				}else if(this.params.legalPerson==''||this.params.legalPerson==null){
-					this.$util.msg('请输入法人代表姓名',2000);
-					return
-				}else if(this.params.registeredCapital==''||this.params.registeredCapital==null){
-					this.$util.msg('请输入注册资本',2000);
-					return
-				}else if(this.params.nature==''||this.params.nature==null){
-					this.$util.msg('请输入公司性质',2000);
-					return
-				}else if(this.params.turnover==''||this.params.turnover==null){
-					this.$util.msg('请输入年营业额',2000);
-					return
-				}else if(this.params.firstShopType==''||this.params.firstShopType==null){
-					this.$util.msg('请选择公司类型',2000);
-					return
-				}else if(this.params.firstShopType==1 && this.params.secondShopType==""){
-					this.$util.msg('请选择公司类型',2000);
-					return
-				}else if(this.params.mainpro==''||this.params.mainpro==null){
-					this.$util.msg('请选择主营内容',2000);
-					return
-				}else if(this.params.businessScope==''||this.params.businessScope==null){
-					this.$util.msg('请选择经营内容',2000);
-					return
-				}else if(this.params.info==''||this.params.info==null){
-					this.$util.msg('请填写公司介绍',2000);
-					return
-				}else if(this.params.productDesc==''||this.params.productDesc==null){
-					this.$util.msg('请填系列商品说明',2000);
-					return
-				}else if(this.params.socialCreditCode==''||this.params.socialCreditCode==null){
-					this.$util.msg('请输入正确的统一社会信用代码',2000);
-					return
-				}else if(this.params.businessLicenseImage==''||this.params.businessLicenseImage==null){
-					this.$util.msg('请上传营业执照图片',2000);
-					return
-				}else if(this.params.logo==''||this.params.logo==null){
-					this.$util.msg('请上传公司logo',2000);
-					return
-				}else if(this.params.productionLicence==''||this.params.productionLicence==null){
-					this.$util.msg('请上传生产许可证',2000);
-					return
-				}else if(this.params.hygienicLicense==''||this.params.hygienicLicense==null){
-					this.$util.msg('请上传卫生许可证',2000);
-					return
-				}else if(this.params.taxLicense==''||this.params.taxLicense==null){
-					this.$util.msg('请上传税务许可证',2000);
-					return
-				}else if(this.params.certificateHonor==''||this.params.certificateHonor==null){
-					this.$util.msg('请上传荣誉证书',2000);
-					return
-				}else if(this.params.productCertification==''||this.params.productCertification==null){
-					this.$util.msg('请上传产品证书',2000);
-					return
-				}else{
-					this.UserService.SupplierModifiedData(this.params).then(res=>{
-						if(res.code === 0){
-							  this.$util.msg('保存成功',2000,true,'success')
-							  setTimeout(()=>{
-								uni.navigateBack();
-							  },2000)
-						} else {
-							this.$util.msg(res.msg,2000);
-							this.loginLoading = false;
-						}
-					})
-				}
-			},
-			 mainProAdd(){//添加主营内容
-					if (this.mainProEdit.length>0) {
-						let obj = {name:this.mainProEdit,value:`${this.mentuzCampList.length+1}`};
-						if(this.checkedArray(this.mainProEdit,this.mentuzCampList)){
-							this.$util.msg('主营内容已存在!',2000)
-						}else {
-							this.mentuzCampList.push(obj);
-						}
-					}
-				},
-			shopScopeAdd(){ //经营内容
-				if (this.shopScopeEdit.length>0) {
-					let obj = {name:this.shopScopeEdit,value:`${this.medicaCampList.length+1}`};
-					if(this.checkedArray(this.shopScopeEdit,this.medicaCampList)){
-						this.$util.msg('主营内容已存在!',2000)
-					}else {
-						this.medicaCampList.push(obj);
-						
-					}
-				}
-			},
-			 checkedArray(content,arr){//判断主营内容是否已存在
-			 console.log(content,arr)
-						 for(var i in arr){
-								if(arr[i].name == content){
-									return true;
-								}
-							}
-			            return false;
-			        },
-			radioChange(e){
-				this.params.firstShopType = e.target.value;
-				// if (e.target.value==1){
-				// 	this.isfirstShow = true;
-				// }else {
-				// 	this.isfirstShow = false;
-				// }
-				console.log(e.target.value)
-			},
-			showViewerImageFn6(e) {//预览产品
-				this.myPreviewImageFnlist(this.productImagesList)
-			},
-			showViewerImageFn5(e) {//预览荣誉
-				this.myPreviewImageFnlist(this.HonorImagesList)
-			},
-			showViewerImageFn4(e) {//预览税务
-				this.myPreviewImageFn(this.params.taxLicense)
-			},
-			showViewerImageFn3(e) {//预览卫生
-				this.myPreviewImageFn(this.params.hygienicLicense)
-			},
-			showViewerImageFn2(e) {//预览生产
-				this.myPreviewImageFn(this.params.productionLicence)
-			},
-			showViewerImageFn1(e) {//预览logo
-				this.myPreviewImageFn(this.params.logo)
-			},
-			showViewerImageFn(e) {//预览营业执照
-				this.myPreviewImageFn(this.params.businessLicenseImage)
-			},
-			myPreviewImageFnlist(arr){//多张预览
-				this.isPreviewImage = true;
-				uni.previewImage({
-					urls: arr,
-					current: 0
-				})
-				},
-			myPreviewImageFn(url){//单张预览
-				this.isPreviewImage = true
-				let mentuzArray = []
-				mentuzArray.push(url)
-				uni.previewImage({
-					urls: mentuzArray,
-					current: 0
-				});
-			},
-			uploadproductImageFn(event){//产品证书
-					 uploadFileImage().then(res =>{
-						 this.productImagesList.push(JSON.parse(res.data).data);
-						 this.params.productCertification =this.productImagesList.toString()+',';
-					 })
-			       },
-			 uploadHonorImageFn(event){//荣誉证书上传
-					 uploadFileImage().then(res =>{
-						 this.HonorImagesList.push(JSON.parse(res.data).data);
-						 this.params.certificateHonor =this.HonorImagesList.toString()+',';
-					 })
-			        },
-			 uploadlogoImageFn(event){//上传公司logo
-					uploadFileImage().then(res =>{
-						this.params.logo = JSON.parse(res.data).data;
-					})
-			},
-			uploadproductionLicenceImageFn(event){//上传生产
-					uploadFileImage().then(res =>{
-						this.params.productionLicence = JSON.parse(res.data).data;
-					})
-			},
-			 uploadhygienicLicenseImageFn(event){//上传卫生
-					uploadFileImage().then(res =>{
-						this.params.hygienicLicense = JSON.parse(res.data).data;
-					})
-			},
-			 uploadtaxLicenseImageFn(event){//上传税务
-				   uploadFileImage().then(res =>{
-					this.params.taxLicense = JSON.parse(res.data).data;
-				   })
-			},
-			uploadBusinessLicenseImageFn(event){//上传营业执照图片
-					uploadFileImage().then(res =>{
-						this.params.businessLicenseImage = JSON.parse(res.data).data;
-					})
-			},
-			uploadzizhiImageFn(event){//上传医疗图片
-					uploadFileImage().then(res =>{
-						this.params.medicalPracticeLicenseImg1 = JSON.parse(res.data).data;
-					})
-			},
-			 removeGoodsImagesFn(index){//删除荣誉图片
-					this.HonorImagesList.splice(index,1);
-					this.params.certificateHonor = this.HonorImagesList.toString()+',';
-				 },
-			removeproductImagesFn(index){//删除产品图片
-				this.productImagesList.splice(index,1);
-				this.params.productCertification = this.productImagesList.toString()+',';
-			 },
-			deletaxImage(){//删除卫生
-			      this.params.taxLicense = '';
-			   },
-			 deletehygienicImage(){//删除卫生
-				this.params.hygienicLicense = '';
-			},
-			deleteproducImage(){//删除生产
-				this.params.productionLicence = '';
-			},
-			 deletelogoImage(){//删除logo图片
-				this.params.logo = '';
-			},
-			 deleteBusinessImage(){//删除营业执照图片
-				this.params.businessLicenseImage = '';
-			},
-			 deleteMedicalImage(){//删除商品图片
-			   this.medicalPracticeLicenseImg1 = '';
-			 },
-			secondypeRidio(item){
-				this.params.secondShopType = item.value;
-				// if (item.value==3){
-				// this.issecondshow = true;
-				// }else {
-				//  this.issecondshow = false;
-				// }
-			},
-			showMulLinkageThreePicker() {//三级地址联动
-				this.isShowInput = true
-				this.$refs.mpvueCityPicker.show()
-				},
-			onConfirm(e) {//获取选择的地址信息
-				console.log('地址',e);
-				this.addressData.address = e.name;
-				this.addressData.townID = e.townCode;
-				this.addressData.cityID = e.cityCode;
-				this.addressData.provinceID = e.provinceCode;
-				this.params.townID = this.addressData.townID;
-				this.params.provinceID = this.addressData.provinceID;
-				this.params.cityID = this.addressData.cityID;
-				this.params.address = this.addressData.address;
-			},
-			onConfirmbrand(e){
-				this.brandname = e.name;
-			},
-		},
-	}
-</script>
-
-<style  lang="scss">
-	.container{
-		width: 100%;
-		height: auto;
-	}
-	.row{
-		line-height: 80rpx;
-		background: #f7f7f7;
-		padding: 0 24rpx;
-		.info-title{
-			font-size: $font-size-30;
-			color: $text-color;
-			font-weight: bold;
-		}
-	}
-	.placeholder{
-		 color: #b2b2b2;
-	}
-	.info-from{
-		width: 702rpx;
-		height: 90rpx;
-		line-height: 90rpx;
-		border-bottom: 2rpx solid #e1e1e1;
-		margin: auto;
-		position: relative;
-		.label{
-			width: 112rpx;
-			text-align: left;
-			font-size: $font-size-28;
-			color: #666666;
-			line-height: 90rpx;
-			float: left;
-			&.Code{
-				width: 170rpx;
-			}
-		}
-		.row-input{
-			width: 520rpx;
-			padding-left:10rpx;
-			font-size: $font-size-28;
-			color: $text-color;
-			line-height: 90rpx;
-			float: left;
-			height: 90rpx;
-			margin-left: 50rpx;
-			&.Code{
-				width: 470rpx;
-			}
-			.icon-xiayibu{
-				position: absolute;
-				right: 0;
-				color: #b2b2b2;
-			}
-			.none{
-				color: #b2b2b2;
-			}
-		}
-	}
-	.address-details{
-		height: 146rpx;
-		border-bottom: 2rpx solid #e1e1e1;
-		width: 702rpx;
-		margin: auto;
-		font-size: $font-size-28;
-		padding-top: 20rpx;
-	}
-	 input[type="text"]::placeholder,textarea::placeholder {color: #b2b2b2;font-size: $font-size-28;}
-	 .info-email{
-		 color: #fea785;
-		 font-size: $font-size-20;
-		 padding-left: 24rpx ;
-	 }
-	 .ShopTyperadio{
-		 overflow: hidden;
-		 height: auto;
-		 border: 0;
-		 .radio{
-			 float: left;
-			 margin-right: 77rpx;
-			 .iconfont{
-				 margin-right: 10rpx;
-				 font-size: $font-size-36;
-			 }
-			 .icon-weixuanze{
-				 color: #b2b2b2;
-			 }
-			 .icon-yixuanze{
-				  color: $color-system;
-			 }
-		 }
-	 }
-	 .active{
-		 color: $color-system;
-	 }
-	 .secondTyperadio{
-		 overflow: hidden;
-		 height: auto;
-		 padding: 20rpx 24rpx;
-		 margin-bottom: 20rpx;
-		 color: #999999;
-		 .radio{
-				float: left;
-				margin-right: 20rpx;
-				.secondRadio{
-					 border: 2rpx solid #e1e1e1;
-					 padding: 0 30rpx;
-					 text-align: center;
-					 line-height: 42rpx;
-					 font-size: $font-size-26;
-					 border-radius: 21rpx;
-				}
-			}
-	 }
-	 .zizhi{
-		 .uploadImage{
-			 padding: 0 24rpx;
-			 &.list-image{
-				 overflow: hidden;
-				 display: flex;
-				 overflow-x: auto;
-				 flex-shrink: 0;
-				 padding-top: 15rpx;
-				 
-				 max-width: 702rpx;
-				 .formLine-file{
-					 float: left;
-					 display: flex;
-					 flex-shrink: 0;
-					 margin:15rpx 15rpx 15rpx 0rpx;
-				 }
-				 .form-upload-image{
-					  float: left;
-					  -webkit-flex-shrink: 0;
-					  flex-shrink: 0;
-					  position: relative;
-					  display: inline-block;
-					  margin:15rpx 15rpx 15rpx 0rpx;
-					  display: flex;
-					  align-items: center;
-				 }
-			 }
-			 .form-upload-image{
-				 width: 200rpx;
-				 height:180rpx; 
-				 position: relative;
-				 .upload-img{
-					 width: 100%;
-					 height: 100%;
-				 }
-				 .icon-shanchu1{
-					position: absolute;
-					top: -20rpx;
-					right:-15rpx;
-					color: #f94b4b;
-					font-size: $font-size-36;
-				}
-			 }
-			 .formLine-file{
-					width:200rpx;
-					height: 180rpx;
-					display: inline-block;
-				 .file-zizhi{
-					background: url('https://static.caimei365.com/app/img/upload/club-yiliao.png') no-repeat;
-					width:100%;
-					height:100%;
-					background-size: 100% 100%;
-				 }
-				 .iconImage{
-					width: 100%;
-					height:100%; 
-					&.file-biss{
-						background: url('https://static.caimei365.com/app/img/upload/club-zizhi.png') no-repeat;
-						background-size: 100% 100%;
-						}
-					&.file-logo{
-						background: url('https://static.caimei365.com/app/img/upload/icon-logo.png') no-repeat;
-						background-size: 100% 100%;
-						}
-					&.file-produce{
-						background: url('https://static.caimei365.com/app/img/upload/icon-produce.png') no-repeat;
-						background-size: 100% 100%;
-						}
-					&.file-health{
-						background: url('https://static.caimei365.com/app/img/upload/icon-health.png') no-repeat;
-						background-size: 100% 100%;
-						}
-					&.file-tax{
-						background: url('https://static.caimei365.com/app/img/upload/icon-tax.png') no-repeat;
-						background-size: 100% 100%;
-						}
-					&.file-honor{
-						background: url('https://static.caimei365.com/app/img/upload/icon-honor.png') no-repeat;
-						background-size: 100% 100%;
-						}
-					&.file-product{
-						background: url('https://static.caimei365.com/app/img/upload/icon-product.png') no-repeat;
-						background-size: 100% 100%;
-						}
-						
-				 }
-			 }
-			 .form-upload-tips{
-				 display: inline-block;
-				 vertical-align: top;
-				 position: relative;
-				 margin-left: 20rpx;
-				 .icon-wenhao{
-					font-size: 41rpx;
-					 color:#1890f9 ;
-				 }
-				 .wen-tips{
-						width: 360rpx;
-					     height: 64rpx;
-					     line-height: 64rpx;
-					     text-align: center;
-					     color: #FFF;
-					     font-size: 28rpx;
-					     background-color: #1890f9;
-					     position: absolute;
-					     bottom: -80rpx;
-					     left: -4rpx;
-					     border-radius: 2rpx;
-						 display: none ;
-				 }
-				 .wen-tips:before {
-				     content: '';
-				     width: 0px;
-				     height: 0px;
-				     border-width: 20rpx;
-				     border-style: solid;
-				     border-color: transparent transparent #1890f9 transparent;
-				     position: absolute;
-				     top: -35rpx;
-				     left: 10rpx;
-				 }
-			 }
-		 }
-	 }
-	 .form-upload-tips:hover .wen-tips {display: block;}
-	 .business{overflow: hidden;margin: 20rpx 0;}
-	 .business-info{
-		 float: left;
-		 margin-left: 60rpx;
-		 width: 550rpx;
-		 }
-	 .info2-title{
-	 	padding: 0 0 24rpx 24rpx;
-	 	font-size: $font-size-28;
-	 	color: #666666;
-		&.zizhi-title{
-			padding: 24rpx;	
-			 &.hoor{padding: 24rpx 24rpx 0 24rpx;}
-			 }
-			 &.business-title{
-			 float: left;
-		 }
-		 
-	 }
-	 .addbusiness{
-		 margin: 20rpx 0;
-		 .other{
-			 width: 350rpx;
-			 height: 64rpx;
-			 border: 2rpx solid #b2b2b2;
-			 border-radius: 45rpx;
-			 text-align: center;
-			 line-height: 64rpx;
-			 padding-left: 10rpx;
-			 font-size: 28rpx;
-			 display: inline-block;
-		 }
-		 .button{
-			 width: 160rpx;
-			 height: 64rpx;
-			 text-align: center;
-			 line-height: 64rpx;
-			 display: inline-block;
-			 color: $color-system;
-			 background:#ffe6dc ;
-			 margin-left: 15rpx;
-			 border-radius: 45rpx;
-		 }
-	 }
-	 .row-group{
-		 .row-text{
-		 	display: inline-block;
-			font-size: 28rpx;
-			color: #333333;
-		 }
-		 .row-input{
-			width: 50%;
-			display: inline-block;
-			margin-bottom: 10rpx;
-		 }
-		 .diyBox{
-			margin-bottom: 5px;
-			// width: 33%;
-			margin-right: 70rpx;
-			display: inline-block;
-		 }
-		 
-	 }
-	 radio .wx-radio-input{
-		 border-radius: 50%;
-		 width: 36rpx; 
-		 height: 36rpx;
-	 }
-	 radio .wx-radio-input.wx-radio-input-checked::before{
-		 font-size:28rpx; 
-	 }
-	 checkbox .wx-checkbox-input{
-	   border-radius: 50%;
-	   width: 36rpx; 
-	   height: 36rpx;
-	 }
-	 /* 选中后的 背景样式 */
-	 checkbox .wx-checkbox-input.wx-checkbox-input-checked{
-	   background: #E15616;
-	   border: 2rpx solid #e15616;
-	 }
-	 checkbox .wx-checkbox-input.wx-checkbox-input-checked::before{
-	   border-radius: 50%;
-	   width: 36rpx;
-	   height: 36rpx;
-	   line-height: 36rpx;
-	   text-align: center;
-	   font-size:20rpx; 
-	   color:#fff;
-	   // background: transparent;
-	   transform:translate(-50%, -50%) scale(1);
-	   -webkit-transform:translate(-50%, -50%) scale(1);
-	 }
-	 .info{
-		 margin: 20rpx 0;
-		 textarea{
-			width: 680rpx;
-			height: 200rpx; 
-			border: 2rpx solid #b2b2b2;
-			border-radius: 6rpx;
-			font-size: $font-size-28;
-			padding: 10rpx;
-			margin: auto;
-			line-height: 48rpx;
-		 }
-	 }
-	 .wrap-Btn{
-		 width: 100%;
-		 height: 90rpx;
-		 position: fixed;
-		 left: 0;
-		 bottom: 0;
-		 padding-top: 40rpx;
-		 background-color: #FFFFFF;
-		 z-index: 999;
-		 .confirmBbtn{
-			 width: 600rpx;
-			 height: 90rpx;
-			 line-height: 90rpx;
-			 text-align: center;
-			color: #fff;
-			background:$btn-confirm;
-			border-radius: 45rpx;
-		 }
-	 }
-</style>

supplier/pages/user/my-product.vue

@@ -1,1136 +0,0 @@
-<template>
-	<view class="container product clearfix">
-		<view class="superv-header">
-			<view class="superv-header-click" v-if="!isSuperv">
-				<view class="oltext" @click="supervClickFn">管理</view>
-				<view class="ortext" @click="searchClickFn">筛选</view>
-			</view>
-			<view class="superv-header-checked" v-else>
-				<view class="oltext" @click="isCheckedAll">
-					<view class="checkbox iconfont" :class="[isAllChecked ?'icon-yixuanze':'icon-weixuanze']"></view>
-					<view class="text">全选</view>
-				</view>
-				<view class="ortext" @click="closeSupervFn">完成</view>
-			</view>
-		</view>
-		<view class="product-content">
-			<view  :class="{'tui-order-list':scrollTop >= 0}" class="clearfix">
-				<!-- 空白页 -->
-				<view class="empty-container" v-if="isEmpty">
-					<image class="empty-container-image" src="https://img.caimei365.com/group1/M00/03/71/Cmis2F3wna6AY2ZjAABpmnBICH4247.png"></image>
-					<text class="error-text">暂未发布任何商品~</text>
-				</view>
-				<!-- 列表 -->
-				<checkbox-group @change="buyChange" class="tui-group">
-					<view class="tui-cart-cell  tui-mtop" v-for="(item,index) in dataList" :key="index">
-						<tui-swipe-actions :actions="item.actions" @click="handlerButton($event,item)" :params="item">
-							<template v-slot:content>
-								<view class="tui-goods-item">
-									<view class="tui-goods-checkBox" v-if="isSuperv">
-										<view class="checkbox iconfont" :class="[item.isChecked ?'icon-yixuanze':'icon-weixuanze']" @click="checkedSoperv(item)"></view>
-									</view>
-									<view class="tui-goods-image">
-										<image :src="item.mainImage" class="tui-goods-img"/>
-									</view>
-									<view class="tui-goods-info" :style="{width:isSuperv ? '360rpx' : '420rpx'}"> 
-										<view class="tui-goods-title">{{ item.name }}</view>
-										<view class="tui-price-box">
-											<view class="tui-goods-price">￥{{item.price1 | NumFormat}}</view>
-										</view>
-										<view class="tui-goods-pip">市场价:￥{{item.normalPrice | NumFormat}}</view>
-										<view class="tui-goods-pip">分类:{{ item.typeName }}</view>
-									</view>
-									<view class="tui-goods-status">
-										<view class="status-text" :style="{ color: verifyColorFilter(item.validFlag)}">
-											{{ item.validFlag | verifyStatusFilter }}
-										</view>
-									</view>
-								</view>
-							</template>
-						</tui-swipe-actions>
-					</view>
-				</checkbox-group>
-				<!--加载loadding-->
-				<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-				<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text='nomoreText'></tui-nomore>
-				<!--加载loadding-->
-			</view>
-		</view>
-		<tui-modal :show="modal" @click="handleClick" @cancel="hideMobel" :content="contentModalText" color="#333" :size="32" shape="circle" :maskClosable="false"></tui-modal>
-		<!--右抽屉-->
-		<tui-drawer mode="right" :visible="rightDrawer" @close="closeDrawer">
-			<view class="d-container clearfix" :style="{paddingTop:CustomBar+10+'px'}">
-				<view class="d-label">商品名称:</view>
-				<view class="d-input">
-					<input class="input" type="text" value="" v-model="listQuery.name" placeholder="输入商品名称"/>
-				</view>
-				<view class="d-label">商品货号:</view>
-				<view class="d-input">
-					<input class="input" type="text" value="" v-model="listQuery.productCode" placeholder="输入商品货号"/>
-				</view>
-				<view class="d-label">状态:</view>
-				<view class="d-input">
-					<picker @change="bindPickerChange(1,$event)" :value="index" :range="statusActions" range-key="name">
-						<input class="input" type="text" disabled="false" v-model="validFlagText" value="" placeholder="请选择审核状态"/>
-						<text class="iconfont icon-xiangyou"></text>
-					</picker>
-				</view>
-				<view class="d-label">主推商品:</view>
-				<view class="d-input">
-					<picker @change="bindPickerChange(2,$event)" :value="index" :range="recommendActions" range-key="name">
-						<input class="input" type="text" disabled="false" v-model="featuredFlagText" value="" placeholder="请选择"/>
-						<text class="iconfont icon-xiangyou"></text>
-					</picker>
-				</view>
-				<view class="d-label">分类:</view>
-				<view class="d-input">
-					<picker @change="bindPickerChange(3,$event)" :value="index" :range="classificationFirstList" range-key="name">
-						<input class="input" type="text" disabled="false" v-model="firstClassificationText" value="" placeholder="请选择一分类"/>
-						<text class="iconfont icon-xiangyou"></text>
-					</picker>
-				</view>
-				<view class="d-input">
-					<picker @change="bindPickerChange(4,$event)" :value="index" :range="classificationTwoList" range-key="name">
-						<input class="input" type="text" disabled="false" v-model="twoClassificationText" value="" placeholder="请选择二级分类"/>
-						<text class="iconfont icon-xiangyou"></text>
-					</picker>
-				</view>
-				<view class="d-input">
-					<picker @change="bindPickerChange(5,$event)" :value="index" :range="classificationThreeList" range-key="name">
-						<input class="input" type="text" disabled="false" v-model="threeClassificationText" value="" placeholder="请选择三级分类"/>
-						<text class="iconfont icon-xiangyou"></text>
-					</picker>
-				</view>
-				<view class="d-input btn">
-					<view class="d-btn comfrim" @click="handSearchList">确定</view>
-					<view class="d-btn clear" @click="handSearchClear">重置</view>
-				</view>
-			</view>
-		</tui-drawer>
-		<!-- 批量操作 -->
-		<tui-bottom-popup :radius="false" :mask="false" :show="isSuperv">
-			<view class="tui-popup-box clearfix">
-				<view class="tui-right-flex tui-popup-btn" :style="{ paddingBottom :isIphoneX ? '68rpx' : '0rpx' }">
-					<view class="tui-flex-1">
-						<view class="tui-button" :class="isProductChecked ? 'active' : ''" @click="handleAllUnder()">批量下架</view>
-					</view>
-				</view>
-			</view>	
-		</tui-bottom-popup>	
-	</view>
-</template>
-<script>
-	import tuiLoadmore from "@/components/tui-components/loadmore/loadmore"
-	import tuiNomore from "@/components/tui-components/nomore/nomore"
-	import modalLayer from "@/components/modal-layer"
-	import { mapState,mapMutations } from 'vuex'
-	const defaultListQuery = {
-			shopID:'',
-			pageNum:1,
-			pageSize:10,
-			productCode:'',//货号
-			name:'',//商品名称
-			validFlag:'',//状态
-			featuredFlag:'',//是否主推
-			bigTypeID:0,//一级
-			smallTypeID:0,//二级
-			tinyTypeID:0//三级
-	 };
-	export default{
-		components: {
-			tuiLoadmore,
-			tuiNomore
-		},
-		data() {
-			return{	
-				shopID:0,
-				isSuperv:false,
-				isProductChecked:false,
-				validFlagText:'',
-				featuredFlagText:'',
-				firstClassificationText:'',
-				twoClassificationText:'',
-				threeClassificationText:'',
-				recommendActions: [{name:'是',value:1},{name: '否',value:0}],
-				statusActions: [
-					{name:'全部',value:''},
-					{name: '未审核',value:1},
-					{name: '审核未通过',value:8},
-					{name: '已上架',value:2},
-					{name: '已下架',value:3},
-					{name: '已冻结',value:10},
-					{name: '已隐身',value:9},
-					{name: '已删除',value:0},
-				],
-				classificationFirstList:[],
-				classificationTwoList:[],
-				classificationThreeList:[],
-				currents:0,
-				userID:0,
-				listQuery:Object.assign({}, defaultListQuery),
-				dataList: [],
-				btnoRderID: 0, //点击按钮传入的的订单ID
-				scrollTop: 0,
-				deteleType:'',
-				skeletonShow: true,
-				isEmpty: false,
-				isDelete:false,
-				isAllChecked:false,
-				isModalLayer: false,
-				loadding: false,
-				pullUpOn: true,
-				pullFlag: true,
-				hasNextPage: false,
-				navbarHeight:'',
-				nomoreText: '上拉显示更多',
-				contentModalText:'',//操作文字提示语句
-				modal:false,
-				rightDrawer: false,
-				handlerProduct:{},//储存监听商品信息
-				OperationType:'',//操作类型
-				isCmcustomClass : 'left',
-				featuredNum:0,
-				productIds:'',//批量下架操作商品ID
-				
-			}
-		},
-		onLoad(option){
-			switch(option.listType){
-				case '0':
-					this.listQuery.validFlag =''
-					break;
-				case '1':
-					this.listQuery.validFlag = 2
-					break;
-				case '2':
-					this.listQuery.validFlag = 3
-					break;
-			}
-			this.$api.getComStorage('userInfo').then((resolve) =>{
-				this.listQuery.shopID = this.shopID = resolve.shopID
-				this.GetProductListInfo()
-				this.GetPrimaryClassification()
-			})
-		},
-		filters: {
-			NumFormat:function(text) {//处理金额
-				return Number(text).toFixed(2);
-			},
-			verifyStatusFilter: function(state){
-				let stateText = '',
-					stateTextObject={
-						'2':'已上架',
-						'3':'已下架',
-						'1':'待审核',
-						'8':'审核未通过',
-						'9':'已隐身',
-						'10':'已冻结',
-						'0':'已删除'
-					};
-				Object.keys(stateTextObject).forEach(function(key) {
-					if(key == state){
-						stateText = stateTextObject[key]
-					}
-				});
-				return stateText;
-			},
-		},
-		computed: {
-			...mapState(['hasLogin','userInfo'])
-		},
-		methods:{
-			...mapMutations(['login','logout']),
-			GetProductListInfo(){
-				this.listQuery.pageNum = 1
-				this.ShopService.GetSupplierPyProduct(this.listQuery).then(response =>{
-					let data = response.data.productPage
-					this.featuredNum = response.data.featuredNum
-					this.hasNextPage = data.hasNextPage
-					if(data.results && data.results.length > 0){
-						this.isEmpty = false;
-						this.dataList = data.results;
-						this.handleDataList()
-						if(this.hasNextPage){
-							this.pullUpOn = false
-							this.nomoreText = '上拉显示更多'
-						}else{
-							if(this.dataList.length < 5){
-								this.pullUpOn = true
-							}else{
-								this.pullUpOn = false
-								this.nomoreText = '已至底部'
-							}
-						}
-					}else{
-						this.dataList = []
-						this.isEmpty = true
-						this.pullUpOn = true
-					}
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000);
-				})
-			}, 
-			GetOnReachBottomData(index){//上拉加载
-				this.listQuery.pageNum += 1
-				this.ShopService.GetSupplierPyProduct(this.listQuery).then(response =>{
-					let data = response.data.productPage
-					this.featuredNum = response.data.featuredNum
-					this.hasNextPage = data.hasNextPage;
-					this.dataList = this.dataList.concat(data.results)
-					this.handleDataList()
-					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 = '已至底部'
-					}
-				})	
-			},	
-			handleDataList(){//根据商品状态set不同的tabAction返回新的数据
-				this.dataList.forEach(item =>{
-					if(item.validFlag === '0' || item.validFlag === '3' || item.validFlag === '8' || item.validFlag === '9'){
-						item.actions = [
-							{name: '无操作',color: '#fff',fontsize: 26,width: 50,background: '#e1e1e1'},
-						]
-					}else if(item.validFlag === '1' || item.validFlag === '10'){
-						item.actions = [
-							{name: '查看详情',color: '#fff',fontsize: 26,width: 50,background: '#f9a94b'},
-						]
-					}else if(item.validFlag === '2'){
-						if(item.featuredFlag ==='1'){
-							item.actions = [
-								{name: '查看详情',color: '#fff',fontsize: 26,width: 50,background: '#f9a94b'},
-								{name: '删除主页推荐',color: '#fff',fontsize: 26,width: 50,background: '#ff7a51'},
-								{name: '下架',color: '#fff',fontsize: 26,width: 50,background: '#fea785'},
-							]
-						}else{
-							item.actions = [
-								{name: '查看详情',color: '#fff',fontsize: 26,width: 50,background: '#f9a94b'},
-								{name: '添加主页推荐',color: '#fff',fontsize: 26,width: 50,background: '#ff7a51'},
-								{name: '下架',color: '#fff',fontsize: 26,width: 50,background: '#fea785'},
-							]
-						}
-					}
-				})
-			},
-			handSearchList(){//搜索
-				this.GetProductListInfo()
-				this.leftDrawer = false;
-				this.rightDrawer = false;
-			},	
-			handSearchClear(){//重置搜索条件
-				this.listQuery = Object.assign({}, defaultListQuery)
-				this.listQuery.shopID = this.shopID
-				this.validFlagText='';
-				this.featuredFlagText='';
-				this.firstClassificationText='';
-				this.twoClassificationText='';
-				this.threeClassificationText='';
-				this.classificationTwoList = [];
-				this.classificationThreeList = [];
-			},
-			handlerButton(e,item){//监听侧滑按钮点击事件
-				if(item.validFlag === '0' || item.validFlag === '3' || item.validFlag === '8' || item.validFlag === '9'){
-					if(e.index == 0){
-						return
-					}
-				}else if(item.validFlag === '1' || item.validFlag === '10'){
-					if(e.index == 0){
-						this.$api.navigateTo(`/pages/goods/product?id=${item.productID}`)
-					}
-				}else if(item.validFlag === '2'){
-					switch(e.index){
-						case 0:
-							this.$api.navigateTo(`/pages/goods/product?id=${item.productID}`)
-							break;
-						case 1:
-							if(item.featuredFlag ==='1'){
-								this.handleDeleteShopRemb(item)
-							}else{
-								this.handleAddShopRemb(item)
-							}
-							break;
-						case 2:
-							this.handleUnder(item)
-					}
-				}
-			},
-			handleAddShopRemb(item){//添加主页推荐
-				console.log(this.featuredNum);
-				let num = 4- this.featuredNum;
-				console.log(num);
-				this.OperationType = 'add'
-				this.handlerProduct = item
-				this.modal = true;
-				this.contentModalText = `总共能添加4个主推商品，您还能添加${num}个确定将该商品添加为主推商品吗？`;
-			},
-			
-			handleDeleteShopRemb(item){//删除主页推荐
-				this.OperationType = 'delete'
-				this.handlerProduct = item
-				this.modal = true;
-				this.contentModalText = '是否把该商品从主推商品中删除？';
-			},
-			handleUnder(item){//下架操作
-				this.OperationType = 'under'
-				this.handlerProduct = item
-				this.modal = true;
-				this.contentModalText = '确定下架该商品吗？';
-			},
-			handleAllUnder(){//批量下架操作
-				let isValidFlag = false
-				if(this.isProductChecked){
-					this.dataList.forEach(el => {
-						if(el.isChecked) { 
-							if(el.validFlag != 2){ 
-								isValidFlag = true; 
-							}else{
-								isValidFlag = false
-								this.productIds += el.productID+','
-							}
-						}
-					})
-					if(isValidFlag){
-						this.$util.modal('','部分选中的商品暂未上架，不能进行下架操作','确定','',false,() =>{})
-					}else{	
-						this.OperationType = 'allunder'
-						this.modal = true;
-						this.contentModalText = '确定下架选中的商品吗？';												
-					}
-				}else{
-					return;
-				}
-			},
-			handleClick(e) {//弹窗提示用户操作
-				if(e.index == 1){
-					switch(this.OperationType){
-						case 'delete'://删除主页推荐
-							this.SupplierDeleteSwitchFeatured(this.handlerProduct)
-							break;
-						case 'add'://添加主页推荐
-							this.SupplierAddSwitchFeatured(this.handlerProduct)
-							break;
-						case 'under'://下架商品
-							this.SupplierSoldOutProduct(this.handlerProduct)
-							break;
-						case 'allunder'://批量下架
-							this.SupplierAllSoldOutProduct(this.productIds)
-							break;
-					}
-				}
-				this.modal = false;
-			},
-			SupplierDeleteSwitchFeatured(item){//操作删除主页推荐
-				this.ShopService.SupplierSwitchFeaturedyProduct({productId:item.productID,featuredFlag:0}).then(response =>{
-					this.$util.msg('删除成功',2000,true,'success');
-					setTimeout(() => {
-						this.GetProductListInfo()
-					},2000)
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000)
-				})
-			},
-			SupplierAddSwitchFeatured(item){//操作添加主页推荐
-				this.ShopService.SupplierSwitchFeaturedyProduct({productId:item.productID,featuredFlag:1}).then(response =>{
-					this.$util.msg('添加成功',2000,true,'success');
-					setTimeout(() => {
-						this.GetProductListInfo()
-					},2000)
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000)
-				})
-			},
-			SupplierSoldOutProduct(item){//操作下架商品
-				this.ShopService.SupplierSoldOutProduct({productIds:item.productID}).then(response =>{
-					this.$util.msg('下架成功',2000,true,'success');
-					setTimeout(() => {
-						this.GetProductListInfo()
-					},2000)
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000)
-				})
-			},
-			SupplierAllSoldOutProduct(ids){//操作批量下架商品
-				this.ShopService.SupplierSoldOutProduct({productIds:ids}).then(response =>{
-					this.$util.msg('下架成功',2000,true,'success');
-					setTimeout(() => {
-						this.GetProductListInfo()
-					},2000)
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000)
-				})
-			},
-			bindPickerChange: function(type,e) {//选择筛选条件
-				switch(type){
-					case 1:
-						this.validFlagText = this.statusActions[e.target.value].name
-						this.listQuery.validFlag = this.statusActions[e.target.value].value
-						break;
-					case 2:
-						this.featuredFlagText = this.recommendActions[e.target.value].name
-						this.listQuery.featuredFlag = this.recommendActions[e.target.value].value
-						break;
-					case 3:					
-						this.firstClassificationText = this.classificationFirstList[e.target.value].name
-						this.listQuery.bigTypeID = this.classificationFirstList[e.target.value].value
-						this.GetPrimarySecondaryClassification(this.listQuery.bigTypeID)
-						this.twoClassificationText = ''
-						this.threeClassificationText=''
-						break;
-					case 4:
-						if(this.listQuery.bigTypeID == 0){
-							this.$util.msg('请先选择一级分类',2000)
-							return
-						}
-						this.twoClassificationText = this.classificationTwoList[e.target.value].name
-						this.listQuery.smallTypeID = this.classificationTwoList[e.target.value].value
-						this.GetPrimaryThreeLevelClassification(this.listQuery.smallTypeID)
-						break;
-					case 5:
-						if(this.listQuery.smallTypeID == 0){
-							this.$util.msg('请先选择二级分类',2000)
-							return
-						}
-						this.threeClassificationText = this.classificationThreeList[e.target.value].name
-						this.listQuery.tinyTypeID = this.classificationThreeList[e.target.value].value
-						break;
-				}
-			},
-			GetPrimaryClassification(){//获取筛选条件一级分类
-				this.ShopService.GetPrimaryClassification().then(response =>{
-					const data = response.data
-					data.forEach(item =>{
-						let _obj = {name:item.name,value:item.bigTypeID} 
-						this.classificationFirstList.push(_obj)
-					})
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000)
-				})
-			},
-			GetPrimarySecondaryClassification(value){//获取筛选条件二级分类
-				this.classificationTwoList = []
-				this.ShopService.GetPrimarySecondaryClassification({bigTypeId:value}).then(response =>{
-					const data = response.data
-					data.forEach(item =>{
-						let _obj = {name:item.name,value:item.smallTypeID} 
-						this.classificationTwoList.push(_obj)
-					})
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000)
-				})
-			},
-			GetPrimaryThreeLevelClassification(value){//获取筛选条件三级分类
-				this.classificationThreeList = []
-				this.ShopService.GetPrimaryThreeLevelClassification({smallTypeId:value}).then(response =>{
-					const data = response.data
-					data.forEach(item =>{
-						let _obj = {name:item.name,value:item.tinyTypeID} 
-						this.classificationThreeList.push(_obj)
-					})
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000)
-				})
-			},
-			hideMobel(){
-				this.modal = false;
-			},
-			updateCheckAllBtn() {//勾选单个判断全选
-				let goodsCheckedLength = 0
-				this.dataList.forEach(item => {
-					if(item.isChecked) { goodsCheckedLength++; }
-				})
-				this.isAllChecked = goodsCheckedLength === this.dataList.length;
-				if(goodsCheckedLength>0){
-					this.isProductChecked = true
-				}else{
-					this.isProductChecked = false
-				}
-			},
-			updateBothCheckBtn() {//全选勾选判断
-				this.dataList.forEach((item)=>{
-					item.isChecked = this.isAllChecked				
-				})
-			},
-			isCheckedAll(){//全选
-				this.isAllChecked = !this.isAllChecked
-				if(this.isAllChecked){
-					this.isProductChecked = true
-				}else{
-					this.isProductChecked = false
-				}
-				this.updateBothCheckBtn()
-			},
-			checkedSoperv(item){//选择
-				item.isChecked = !item.isChecked
-				this.updateCheckAllBtn()
-			},
-			supervClickFn(){//管理全选
-				this.isSuperv = true
-			},
-			closeSupervFn(){
-				this.isSuperv = false
-			},
-			searchClickFn() {//弹出抽屉
-				this.rightDrawer = true;
-			},
-			closeDrawer(e) {//关闭抽屉
-				this.leftDrawer = false;
-				this.rightDrawer = false;
-			},
-			orderPriceToFixed (n){
-				let price ='';
-				price = Number(n).toFixed(2);
-				return price
-			},
-			verifyColorFilter: function(state){
-				let stateColor = '',
-					stateColorObject={
-						'2':'#1890f9',
-						'1':'#f9a94b',
-						'0':'#FFB12A',
-						'3':'#627386',
-						'8':'#FF2A2A',
-						'9':'#f94b4b'
-					};
-				Object.keys(stateColorObject).forEach(function(key){
-					if(key == state){
-						stateColor = stateColorObject[key]
-					}
-				});
-				return stateColor;
-			},
-		},
-		onPageScroll(e){//实时获取到滚动的值
-			if(e.scrollTop>30){
-				this.isCmcustomClass = 'fiexd'
-			}else{
-				this.isCmcustomClass = 'left'
-			}	
-		},
-		onReachBottom() {
-			if(this.hasNextPage){
-				this.loadding = true
-				this.pullUpOn = true
-				this.GetOnReachBottomData()
-			}	
-		},
-		onPullDownRefresh() {
-			setTimeout(() => {
-				this.listQuery.pageNum = 1
-				uni.stopPullDownRefresh()
-			}, 200)
-		},
-		onShow(){
-			
-		}	
-	}
-</script>
-
-<style lang="scss">
-	@import "@/uni.scss";
-	page{
-		background:#FFF;
-	}
-	.empty-container{
-		z-index: 9999;
-	}
-	.superv-header{
-		width: 100%;
-		height: 80rpx;
-		background-color: #F7F7F7;
-		line-height: 80rpx;
-		position: fixed;
-		top: 0;
-		left: 0;
-		box-sizing: border-box;
-		padding: 0 24rpx;
-		z-index: 999;
-		.superv-header-click{
-			width: 100%;
-			height: 80rpx;
-			font-size: $font-size-30;
-			.oltext{
-				width: 120rpx;
-				float: left;
-				color: #666666;
-			}
-			.ortext{
-				width: 120rpx;
-				float: right;
-				color: $color-system;
-				text-align: right;
-			}
-		}
-		.superv-header-checked{
-			width: 100%;
-			height: 80rpx;
-			font-size: $font-size-30;
-			.oltext{
-				width: 120rpx;
-				float: left;
-				color: #666666;
-				display: flex;
-				margin-left: 10rpx;
-				.checkbox{
-					display: flex;
-					margin: 0;
-					padding: 0;
-					display: flex;
-					flex-direction: column;
-					align-items: center;
-					box-sizing: border-box;
-					text-align: center;
-					text-decoration: none;
-					border-radius: 0;
-					-webkit-tap-highlight-color: transparent;
-					overflow: hidden;
-					font-size: 34rpx;
-					color:$color-system;
-					line-height: 80rpx;
-				}
-				.text{
-					float: left;
-					line-height: 80rpx;
-					margin-left: 15rpx;
-				}
-			}
-			.ortext{
-				width: 120rpx;
-				float: right;
-				color: $color-system;
-				text-align: right;
-			}
-		}
-	}
-	.d-container {
-		width: 560rpx;
-		padding: 80rpx 30rpx;
-		.d-title{
-			width: 100%;
-			height:80rpx;
-			line-height: 80rpx;
-			text-align: center;
-			color: #4688fa;
-			font-size: $font-size-32;
-			float: left;
-		}
-		.d-time{
-			width: 100%;
-			height: 70rpx;
-			float: left;
-			box-sizing: border-box;
-			padding: 0 10rpx;
-			border: 1px solid rgba(0,0,0,0.2);
-			border-radius: 4rpx;
-			margin-bottom: 30rpx;
-			.iconfont{
-				width:70rpx;
-				height: 60rpx;
-				display: block;
-				float: left;
-				font-size: 50rpx;
-				color: #666666;
-				line-height: 70rpx;
-				text-align: left;
-			}
-			.input{
-				width: 220rpx;
-				height: 70rpx;
-				line-height: 70rpx;
-				float: left;
-				box-sizing: border-box;
-				font-size: $font-size-24;
-				color: #333333;
-				padding: 0 10rpx;
-			}
-		}
-		.d-label{
-			width: 100%;
-			height: 44rpx;
-			line-height: 44rpx;
-			text-align: left;
-			color: #666666;
-			font-size: $font-size-26;
-			float: left;
-		}
-		.d-input{
-			width: 100%;
-			height: 70rpx;
-			float: left;
-			box-sizing: border-box;
-			padding: 0 10rpx;
-			border: 1px solid rgba(0,0,0,0.2);
-			border-radius: 4rpx;
-			margin-bottom: 30rpx;
-			position: relative;
-			&.btn{
-				border: none;
-				margin-top: 40rpx;
-			}
-			.input{
-				width: 100%;
-				height: 70rpx;
-				line-height: 70rpx;
-				float: left;
-				box-sizing: border-box;
-				font-size: $font-size-24;
-				color: #333333;
-				padding: 0 10rpx;
-				padding-right: 68rpx;
-			}
-			.iconfont{
-				width: 50rpx;
-				height: 68rpx;
-				display: block;
-				line-height: 68rpx;
-				text-align: center;
-				font-size: 30rpx;
-				color: #999999;
-				position: absolute;
-				right: 0;
-				top: 0;
-			}
-			.d-btn{
-				width: 210rpx;
-				height: 84rpx;
-				border-radius: 42rpx;
-				background: $btn-confirm;
-				line-height: 84rpx;
-				text-align: center;
-				font-size: $font-size-26;
-				color: #FFFFFF;
-				float: right;
-				&.comfrim{
-					background: $btn-confirm;
-					margin-left: 20rpx;
-				}
-				&.clear{
-					background: #e1e1e1;   
-				}
-			}
-		}
-	}
-	.tui-header {
-		width: 100%;
-		font-size: 16px;
-		font-weight: 500;
-		height: 32px;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		position: relative;
-		padding: 0 40rpx;
-	}
-	.header-sit{
-		width:100%;
-		box-sizing: border-box;
-		height: 80rpx;
-		line-height: 80rpx;
-		box-sizing: border-box;
-		padding:0 40rpx;
-		text-align: left;
-		font-size: $font-size-40;
-		color: #FFFFFF;
-		font-weight: 600;
-		font-family: '正楷';
-		margin-top: 30rpx;
-		.iconfont{
-			font-size: 42rpx;
-			margin-left: 30rpx;
-		}
-	}
-	.mine{
-		width: 100%;
-		height: 100%;
-		position:relative;
-	}
-	.product-content{
-		width: 100%;
-		height: auto;
-		position: relative;
-		padding:0;
-		padding-top: 80rpx;
-		box-sizing: border-box;
-		.header-tabs{
-			width: 100%;
-			height: auto;
-			margin-bottom: 40rpx;
-			padding: 20rpx;
-			border-radius: 20rpx;
-			background:#4688fa;
-			box-sizing: border-box;
-			&.day{
-				background:#FFFFFF;
-				padding:40rpx 20rpx;
-				box-shadow:0px 3px 6px rgba(0,0,0,0.2);
-			}
-			.title{
-				font-size: $font-size-36;
-				line-height: 60rpx;
-				color: #FFF;
-				font-weight: bold;
-				margin-bottom: 20rpx;
-			}
-			.main{
-				width: 100%;
-				height: 110rpx;
-				.main-item{
-					float: left;
-					width:20%;
-					text-align: center;
-					color: #FFFFFF;
-					box-sizing: border-box;
-					&.active{
-						.iconfont{
-							color: #576efa;
-						}
-						.text{
-							font-weight: bold;
-							color:#576efa ;
-							font-size: $font-size-28;
-						}
-					}
-					.text{
-						width: 100%;
-						height:60rpx;
-						line-height: 60rpx;
-						display: block;
-						float: left;
-						font-size:$font-size-24;
-						color: #666666;
-						text-align: center;
-						&.nm{
-							color: #222222;
-							height:40rpx;
-							line-height: 40rpx;
-							font-size: $font-size-32;
-							font-weight: bold;
-						}
-					}
-					.iconfont{
-						font-size:50rpx;
-						color: #7aa5fa ;
-						position: relative;
-						.badg{
-							padding: 0 10rpx;
-							height: 30rpx;
-							display: inline-block;
-							font-size: $font-size-24;
-							text-align: center;
-							line-height: 30rpx;
-							background-color: #ff4759;
-							color: #FFF;
-							position: absolute;
-							top: -15rpx;
-							right:20rpx;
-							border-radius: 15rpx;
-						}
-					}
-				}
-			}
-		}
-		.tui-header-btm {
-			width: 100%;
-			padding: 0 30rpx;
-			box-sizing: border-box;
-			display: flex;
-			align-items: center;
-			justify-content: space-between;
-			color: #fff;
-		}
-		.tui-btm-item {
-			flex: 1;
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-			justify-content: center;
-		}
-		
-		.tui-btm-num {
-			font-size: 32rpx;
-			font-weight: 600;
-			position: relative;
-		}
-		.tui-btm-text {
-			font-size: 24rpx;
-			opacity: 0.85;
-			padding-top: 4rpx;
-		}
-	}	
-	.tui-goods-item {
-		display: flex;
-		padding: 30rpx 20rpx;
-		box-sizing: border-box;
-		border-bottom: 1px solid #EBEBEB;
-		position: relative;
-	}
-	.tui-goods-checkBox{
-		display: flex;
-		align-items: center;
-		margin: 0 15rpx;
-		.checkbox{
-			display: flex;
-			margin: 0;
-			padding: 0;
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-			box-sizing: border-box;
-			text-align: center;
-			text-decoration: none;
-			border-radius: 0;
-			-webkit-tap-highlight-color: transparent;
-			overflow: hidden;
-			background-color:#FFFFFF;
-			font-size: 36rpx;
-			color:$color-system;
-		}
-		.text{
-			font-size: $font-size-24;
-			margin-left: 10rpx;
-		}
-	}
-	.tui-goods-image{
-		width: 180rpx;
-		height: 180rpx !important;
-		border-radius: 12rpx;
-		.tui-goods-img {
-			width: 180rpx;
-			height: 180rpx !important;
-			border-radius: 12rpx;
-			flex-shrink: 0;
-			display: block;
-		}
-	}
-	.tui-goods-info {
-		padding-left: 20rpx;
-		display: flex;
-		flex-direction: column;
-		align-items: flex-start;
-		justify-content: space-between;
-		box-sizing: border-box;
-		overflow: hidden;
-		position: relative;
-	}
-	.tui-goods-status{
-		width: 160rpx;
-		position: absolute;
-		right: 0;
-		.status-text{
-			font-size: $font-size-24;
-			line-height: 44rpx;
-			text-align: center;
-			color: #666666;
-		}
-	}
-	.tui-goods-title {
-		white-space: normal;
-		word-break: break-all;
-		overflow: hidden;
-		text-overflow: ellipsis;
-		display: -webkit-box;
-		-webkit-box-orient: vertical;
-		-webkit-line-clamp: 2;
-		font-size: 26rpx;
-		color: #333;
-		line-height: 44rpx;
-	}
-	.tui-goods-pip{
-		white-space: normal;
-		word-break: break-all;
-		overflow: hidden;
-		text-overflow: ellipsis;
-		display: -webkit-box;
-		-webkit-box-orient: vertical;
-		-webkit-line-clamp: 2;
-		font-size: 24rpx;
-		color: #999;
-		line-height: 44rpx;
-	}
-	.tui-goods-ediet{
-		width: 60rpx;
-		height: 60rpx;
-		background: linear-gradient(90deg,rgba(122,165,250,1) 0%,rgba(87,110,250,1) 100%);
-		border-radius: 50%;
-		line-height: 60rpx;
-		text-align: center;
-		position: absolute;
-		right: 0;
-		top: 50%;
-		.icon-bianji1 {
-			flex-shrink: 0;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			color: #FFFFFF;
-			font-size: 24rpx;
-		}	
-	}
-	.tui-goods-model {
-		max-width: 100%;
-		color: #FFFFFF;
-		background: #4688fa;
-		border-radius: 40rpx;
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		padding: 0 20rpx;
-		box-sizing: border-box;
-		margin-top: 10rpx;
-	}
-	
-	.tui-model-text {
-		max-width: 100%;
-		transform: scale(0.9);
-		transform-origin: 0 center;
-		font-size: 24rpx;
-		line-height: 40rpx;
-		white-space: nowrap;
-		overflow: hidden;
-		text-overflow: ellipsis;
-	}
-	
-	.tui-price-box {
-		width: 100%;
-		display: flex;
-		align-items: flex-end;
-		justify-content: space-between;
-	}
-	
-	.tui-goods-price {
-		font-size: $font-size-28;
-		font-weight: 500;
-		color: #FF201F;
-	}
-	.tui-popup-box {
-		position: relative;
-		box-sizing: border-box;
-		min-height: 200rpx;
-		padding:6rpx 24rpx;
-	}
-	.tui-popup-btn {
-		width: 100%;
-		height: auto;
-		float: left;
-		box-sizing: border-box;
-		padding: 0 75rpx;
-		margin-top: 30rpx;
-		.tui-button{
-			width: 600rpx;
-			height: 88rpx;
-			background: #e1e1e1;
-			line-height: 88rpx;
-			text-align: center;
-			color: #FFFFFF;
-			font-size: $font-size-28;
-			border-radius: 44rpx;
-			&.active{
-				background: $btn-confirm;
-			}
-		}
-	}
-</style>

supplier/pages/user/my-shop.vue

@@ -1,806 +0,0 @@
-<template>
-	<view class="container shop clearfix" :style="{paddingTop:CustomBar+'px'}">
-		<!-- 主页内容 -->
-		<tui-skeleton v-if="skeletonShow" backgroundColor="#fafafa" borderRadius="10rpx" :isLoading	="true" :loadingType="5"></tui-skeleton>
-		<template v-else>
-			<view class="shop-search-main">
-				<view class="shop-search">
-					<text class="iconfont icon-sousuo"></text>
-					<input class="input" maxlength="20" type="text" value=""  @focus="onFocus" @input="onShowClose" v-model.trim="listQuery.keyword" confirm-type="search" @confirm="SubMitSearch()" placeholder="搜索本店铺商品" />
-					<text class="iconfont icon-shanchu1" v-if="isShowClose" @click.stop="delInputText()"></text>
-				</view>
-			</view>
-			<view class="container-shop tui-skeleton">
-				<!-- 轮播 -->
-				<view class="product-supplier" @click="goSupplier">
-					<view class="logo"><img :src="shopLogo ? shopLogo : 'https://static.caimei365.com/app/img/icon/icon-shoplogo.png'" alt=""></view>
-					<view class="main">
-						<view class="name">{{ shopName }}</view>
-						<view class="massgs">
-							<view class="label">满意度:</view>
-							<view class="p-stars">
-								<uni-stars :stars="6" :iconClass="iconClass" :iconColor="iconColor" :fontSize="36" :widthInfo="176"></uni-stars>
-							</view>
-							<view class="acount">
-								<text> {{ normalNum }} </text>件商品
-							</view>
-						</view>
-					</view>
-					<view class="right"><text class="iconfont icon-xiayibu"></text></view>
-				</view>
-				<banner :list="bannerImageList"></banner>
-			</view>	
-			<view class="container-section tui-skeleton" v-if="!isEmpty">
-				<view class="tab-title">主推商品</view>
-				<view class="section-product clearfix">
-					<view class="floor-item-none"  v-if="isHomeProduct">
-						<image class="none-image" :src="iconNoneData" mode=""></image>
-						<view class="none-text">暂无主推商品~</view>
-					</view>
-					<view v-else class="floor-item" v-for="(item, index) in recommendList" :key="index" @click.stop="navToDetailPage(item.id)">
-						<image class="item-img tui-skeleton-fillet" :src="item.image" mode="aspectFill"></image>
-						<view class="floor-item-content">
-							<view class="title tui-skeleton-rect">
-								<text class="mclap-tag" v-if="item.beautyActFlag == '1'">美博会</text>
-								<text class="mclap" :class="item.beautyActFlag =='1' ? 'indent' : ''">{{isInterceptHtmlFn(item.name)}}</text>
-							</view>
-							<view class="floor-item-act">
-								<template v-if="userIdentity === 3">
-									<template v-if="item.actStatus===1">
-										<view class="floor-tags" v-if="PromotionsFormat(item.promotions)">
-											{{item.promotions.name}}
-											<text v-if="hasLogin && item.p_price_flag != 1 && item.supplierId == shopId">:￥{{item.price | NumFormat}}</text>
-										</view>
-										<view class="floor-tags" v-else>{{item.promotions.name}}</view>	
-									</template>
-									<template v-if="item.actStatus ===0  &&  item.ladderPriceFlag===1">
-										<view class="floor-tags">阶梯价格</view>	
-									</template>
-								</template>	
-								<template v-else>
-									<template v-if="item.actStatus===1">
-										<view class="floor-tags" v-if="PromotionsFormat(item.promotions)">
-											{{item.promotions.name}}
-											<text v-if="hasLogin && item.p_price_flag != 1">:￥{{item.price | NumFormat}}</text>
-										</view>
-										<view class="floor-tags" v-else>{{item.promotions.name}}</view>	
-									</template>
-									<template v-if="item.actStatus ===0  &&  item.ladderPriceFlag===1">
-										<view class="floor-tags">阶梯价格</view>	
-									</template>
-								</template>
-							</view>	
-							<view class="" v-if="hasLogin">
-								<template v-if="userIdentity == 3">
-									<template v-if="item.supplierId == shopId">
-										<view class="title-none" v-if="item.p_price_flag === '1'">
-											<text class="p big">￥未公开价格</text>
-										</view>
-										<view class="price tui-skeleton-rect" v-else :class="PromotionsFormat(item.promotions) ? 'none' : ''">
-											<text class="p sm">￥</text>
-											<text class="p big">{{ (PromotionsFormat(item.promotions) ? item.originalPrice : item.price ) | NumFormat}}</text>
-										</view>
-									</template>	
-									<template v-else>
-										<view class="no-price">
-											<view class="p-stars">
-												<text class="p-no">￥</text>
-												<uni-grader :grade="Number(item.priceGrade)" :margin="14"></uni-grader>
-											</view>
-										</view>	
-									</template>
-								</template>
-								<template v-else-if="userIdentity ===4">
-									<view class="title-none" v-if="item.p_price_flag === '1'">
-										<text class="p big">￥未公开价格</text>
-									</view>
-									<view class="title-none"  v-if="item.p_price_flag === '2'">
-										<text class="p big">￥价格仅会员可见</text>
-									</view>
-									<view class="price tui-skeleton-rect" v-if="item.p_price_flag === '0'" :class="PromotionsFormat(item.promotions) ? 'none' : ''">
-										<text class="p sm">￥</text>
-										<text class="p big">{{ (PromotionsFormat(item.promotions) ? item.originalPrice : item.price ) | NumFormat}}</text>
-									</view>
-								</template>
-								<template v-else>
-									<view class="title-none" v-if="item.p_price_flag === '1'">
-										<text class="p big">￥未公开价格</text>
-									</view>
-									<view class="price tui-skeleton-rect" v-else :class="PromotionsFormat(item.promotions) ? 'none' : ''">
-										<text class="p sm">￥</text>
-										<text class="p big">{{ (PromotionsFormat(item.promotions) ? item.originalPrice : item.price ) | NumFormat}}</text>
-									</view>
-								</template>	
-							</view>
-							<view v-else class="no-price">
-								<view class="p-stars">
-									<text class="p-no">￥</text>
-									<uni-grader :grade="Number(item.priceGrade)"></uni-grader>
-									<template v-if="item.actStatus==1">
-										<view class="floor-tags" v-if="PromotionsFormat(item.promotions)">
-											{{item.promotions.name}}<text v-if="hasLogin && item.p_price_flag != '1'">:￥{{item.price | NumFormat}}</text>
-										</view>
-										<view class="floor-tags" v-else>{{item.promotions.name}}</view>	
-									</template>
-									<template v-if="item.actStatus ==0  &&  item.ladderPriceFlag==1">
-										<view class="floor-tags">阶梯价格</view>	
-									</template>
-								</view>
-							</view>	
-						</view>
-					</view>
-				</view>
-			</view>
-			<view class="container-section tui-skeleton">
-				<view class="tab-title" v-if="!isEmpty">全部商品</view>
-				<view class="section-product clearfix">
-					<view class="floor-item-none" v-if="isEmpty">
-						<image class="none-image" :src="iconNoneData1" mode=""></image>
-						<view class="none-text">暂未发布任何商品~</view>
-					</view>
-					<view v-else class="floor-item" v-for="(item, index) in productList" :key="index" @click.stop="navToDetailPage(item.p_id)">
-						<image class="item-img tui-skeleton-fillet" :src="item.p_image" mode="aspectFill"></image>
-						<view class="floor-item-content">
-							<view class="title tui-skeleton-rect">
-								<text class="mclap-tag" v-if="item.p_act_flag == '1'">美博会</text>
-								<text class="mclap" :class="item.p_act_flag =='1' ? 'indent' : ''">{{isInterceptHtmlFn(item.p_name)}}</text>
-							</view>
-							<view class="floor-item-act">
-								<template v-if="userIdentity === 3">
-									<template v-if="item.actStatus===1">
-										<view class="floor-tags" v-if="PromotionsFormat(item.promotions)">
-											{{item.promotions.name}}
-											<text v-if="hasLogin && item.p_price_flag != 1 && item.supplierId == shopId">:￥{{item.price | NumFormat}}</text>
-										</view>
-										<view class="floor-tags" v-else>{{item.promotions.name}}</view>	
-									</template>
-									<template v-if="item.actStatus ===0  &&  item.ladderPriceFlag===1">
-										<view class="floor-tags">阶梯价格</view>	
-									</template>
-								</template>	
-								<template v-else>
-									<template v-if="item.actStatus===1">
-										<view class="floor-tags" v-if="PromotionsFormat(item.promotions)">
-											{{item.promotions.name}}
-											<text v-if="hasLogin && item.p_price_flag != 1">:￥{{item.price | NumFormat}}</text>
-										</view>
-										<view class="floor-tags" v-else>{{item.promotions.name}}</view>	
-									</template>
-									<template v-if="item.actStatus ===0  &&  item.ladderPriceFlag===1">
-										<view class="floor-tags">阶梯价格</view>	
-									</template>
-								</template>
-							</view>	
-							<view class="" v-if="hasLogin">
-								<template v-if="userIdentity == 3">
-									<template v-if="item.supplierId == shopId">
-										<view class="title-none" v-if="item.p_price_flag === '1'">
-											<text class="p big">￥未公开价格</text>
-										</view>
-										<view class="price tui-skeleton-rect" v-else :class="PromotionsFormat(item.promotions) ? 'none' : ''">
-											<text class="p sm">￥</text>
-											<text class="p big">{{ (PromotionsFormat(item.promotions) ? item.originalPrice : item.price ) | NumFormat}}</text>
-										</view>
-									</template>	
-									<template v-else>
-										<view class="no-price">
-											<view class="p-stars">
-												<text class="p-no">￥</text>
-												<uni-grader :grade="Number(item.priceGrade)" :margin="14"></uni-grader>
-											</view>
-										</view>	
-									</template>
-								</template>
-								<template v-else-if="userIdentity ===4">
-									<view class="title-none" v-if="item.p_price_flag === '1'">
-										<text class="p big">￥未公开价格</text>
-									</view>
-									<view class="title-none"  v-if="item.p_price_flag === '2'">
-										<text class="p big">￥价格仅会员可见</text>
-									</view>
-									<view class="price tui-skeleton-rect" v-if="item.p_price_flag === '0'" :class="PromotionsFormat(item.promotions) ? 'none' : ''">
-										<text class="p sm">￥</text>
-										<text class="p big">{{ (PromotionsFormat(item.promotions) ? item.originalPrice : item.price ) | NumFormat}}</text>
-									</view>
-								</template>
-								<template v-else>
-									<view class="title-none" v-if="item.p_price_flag === '1'">
-										<text class="p big">￥未公开价格</text>
-									</view>
-									<view class="price tui-skeleton-rect" v-else :class="PromotionsFormat(item.promotions) ? 'none' : ''">
-										<text class="p sm">￥</text>
-										<text class="p big">{{ (PromotionsFormat(item.promotions) ? item.originalPrice : item.price ) | NumFormat}}</text>
-									</view>
-								</template>	
-							</view>
-							<view v-else class="no-price">
-								<view class="p-stars">
-									<text class="p-no">￥</text>
-									<uni-grader :grade="Number(item.p_price_grade)"></uni-grader>
-								</view>
-							</view>	
-						</view>
-					</view>
-				</view>
-			</view>
-		</template>
-		<!-- 侧边 -->
-		<scroll-top :isScrollTop="isScrollTop" :bottom="200"></scroll-top>
-	</view>
-</template>
-
-<script>
-	import { mapState,mapMutations} from 'vuex';
-	import banner from '@/components/cm-module/supplier/banner.vue'
-	import uniGrader from '@/components/uni-grade/uni-grade.vue'
-	import authorize from '@/common/config/authorize.js'
-	import wxLogin from "@/common/config/wxLogin.js"
-	
-	export default {
-		components:{
-			banner,
-			uniGrader
-		},
-		data() {
-			return {
-				userID:0,
-				supplierId:0,
-				shopId:0,
-				iconClass:'icon-aixin',
-				iconColor:'#ff9100',
-				iconNoneData:'https://static.caimei365.com/app/img/icon/icon-prnone.png',
-				iconNoneData1:'https://static.caimei365.com/app/img/icon/icon-pbnone.png',
-				isScrollTop:false,
-				shopName:'',
-				shopLogo:'',
-				normalNum:0,
-				isFocus:false,
-				isEmpty:false,
-				isShowClose:false,	//是否显示清空输入框图标
-				skeletonShow: true,
-				bannerImageList:[],
-				recommendList:[],
-				productList:[],
-				userIdentity:'',
-				listQuery:{
-					keyword: '',
-					pageSize: 10,
-					pageNum: 1,
-					id:0
-				},
-				isHomeProduct:false,
-				total:0
-			}
-		},
-		onLoad(option) {
-			if(option.type =='share'){
-				authorize.getSetting().then(wxResponse =>{// console.log('是否已授权',res);//0:为取消授权 1:为已授权 2:为未操作
-					console.log(wxResponse)
-					if(wxResponse == 1){
-						wxLogin.wxLoginAuthorize()
-					}else{
-						console.log(new Date +'用户未授权微信信息')
-					}
-				})	
-			}
-			this.listQuery.id = this.supplierId = option.shopId
-			this.$api.getStorage().then((resolve) =>{
-				this.shopId = resolve.shopID ? resolve.shopID : 0
-				this.userID = resolve.userID ? resolve.userID : 0
-				this.userIdentity = resolve.userIdentity
-				this.InitShopDataInfo()
-			}).catch( error =>{
-				this.InitShopDataInfo()
-			})
-		},
-		filters: {
-			NumFormat:function(text) {//处理金额
-				return Number(text).toFixed(2);
-			},
-		},
-		computed: {
-			...mapState(['hasLogin','userInfo','isActivity'])
-		},
-		methods: {
-			...mapMutations(['login','logout']),
-			InitShopDataInfo(){//初始化请求数据
-				this.GetSupplierHomeBanner()
-				this.GetSupplierHomeDeatils()
-				this.GetSupplierHomeProduct()
-				this.GetSupplierHomeProductList()
-				this.skeletonShow =false
-			},
-			GetSupplierHomeBanner(){//轮播图
-				this.ShopService.GetSupplierHomeBanner({supplierId:this.supplierId}).then(response =>{
-					this.bannerImageList = response.data;
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000)
-				})
-			},
-			GetSupplierHomeDeatils(){//商铺详情
-				this.ShopService.GetSupplierHomeDeatils({supplierId:this.supplierId}).then(response =>{
-					let data = response.data
-					this.normalNum = data.normalNum
-					this.shopName = data.name
-					this.shopLogo = data.logo
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000)
-				})
-			},
-			GetSupplierHomeProduct(){//主推商品
-				this.ShopService.GetSupplierHomeProduct({supplierId:this.supplierId}).then(response =>{
-					let data = response.data
-					console.log('主推商品',data)
-					if(data.length>0){
-						this.isHomeProduct = false
-						this.QueryProductPrice(data)
-					}else{
-						this.isHomeProduct = true
-					}
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000)
-				})
-			},
-			GetSupplierHomeProductList(){//全部商品
-				this.ShopService.GetSupplierHomeProductList(this.listQuery).then(response =>{
-					let data = JSON.parse(response.data)
-					console.log('全部商品',data)
-					let dataList = data.items
-					this.total = data.total
-					if(this.total>0){
-						this.isEmpty = false
-						this.productList = dataList
-						this.QueryProductPrice1(this.productList)
-					}else{
-						this.isEmpty = true
-					}
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000)
-				})
-			},
-			GetMoreSupplierHomeProductList(){//加载分页
-				this.listQuery.pageNum +=1
-				this.ShopService.GetSupplierHomeProductList(this.listQuery).then(response =>{
-					let data = JSON.parse(response.data)
-					this.total = data.total
-					this.productList = this.productList.concat(data.items) 
-					this.QueryProductPrice1(this.productList)
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000)
-				})
-			},
-			QueryProductPrice(data){//处理主推商品商品或者活动价格
-				let productIdArr = [];
-				let productIds ='';
-				data.map(item=>{// 0公开价格 1不公开价格 2仅对会员机构公开
-					productIdArr.push(item.id)
-				})
-				productIds = productIdArr.join(",");
-				this.ProductService.querySearchProductPrice({userId: this.userID,productIds:productIds}).then(response =>{
-					this.recommendList = this.ReturnNewProducts(data,response.data);
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000)
-				})
-			},
-			QueryProductPrice1(data){//获取商品或者活动价格
-				let productIdArr = [];
-				let productIds ='';
-				data.map(item=>{// 0公开价格 1不公开价格 2仅对会员机构公开
-					productIdArr.push(item.p_id)
-				})
-				productIds = productIdArr.join(",");
-				this.ProductService.querySearchProductPrice({userId: this.userID,productIds:productIds}).then(response =>{
-					this.productList = this.ReturnNewProducts1(data,response.data);
-					console.log('合并价格后',this.productList)
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000)
-				})
-			},
-			ReturnNewProducts(listA,listB){
-				let NewArray = []
-				listA.map(item=>{
-					for (let i = 0; i < listB.length; i++) {
-						if( item.id == listB[i].productId ){
-							NewArray.push(Object.assign(item,listB[i])) 
-						}
-					}
-				});
-				return NewArray
-			},
-			ReturnNewProducts1(listA,listB){
-				let NewArray = []
-				listA.map(item=>{
-					for (let i = 0; i < listB.length; i++) {
-						if( item.p_id == listB[i].productId ){
-							NewArray.push(Object.assign(item,listB[i])) 
-						}
-					}
-				});
-				return NewArray
-			},
-			SubMitSearch() {//搜索
-				this.listQuery.pageNum = 1
-				this.GetSupplierHomeProductList()
-			},
-			PromotionsFormat(promo){//促销活动类型数据处理
-				if(promo!=null){
-					if(promo.type == 1 && promo.mode == 1){
-						return true
-					}else{
-						return false
-					}
-				}
-				return false
-			},
-			onShowClose () {//输入框输入时触发
-				this.inputEmpty(this.listQuery.keyword)
-			},
-			onFocus () { //输入框获取焦点时触发
-				this.inputEmpty(this.listQuery.keyword)
-			},
-			delInputText () { //清除输入框内容
-				this.listQuery.keyword = ''
-				this.isShowClose = false
-				this.isShowWrapper = false
-				this.inputEmpty(this.listQuery.keyword)
-				this.initGetSerachRecord()
-			},
-			inputEmpty(val){
-				if(val != ''){
-					this.isShowClose = true
-					this.isFocus = true
-				}else{					
-					this.isShowClose = false
-					this.isFocus = true
-				}
-			},
-			isInterceptHtmlFn(text){
-				let name = this.$reg.interceptHtmlFn(text)
-				return name
-			},
-			goSupplier(){//跳供应商资料页
-				this.$api.navigateTo('/supplier/pages/user/supplier?shopId='+this.supplierId)
-			},
-			navToDetailPage(id) {//跳转商品详情页
-				this.$api.navigateTo(`/pages/goods/product?id=${id}`)
-			}
-		},
-		onPageScroll(e){//实时获取到滚动的值
-			if(e.scrollTop>400){
-				this.isScrollTop = true
-			}else{
-				this.isScrollTop = false
-			}	
-		},
-		onPullDownRefresh() {//下拉刷新
-			this.listQuery.pageNum = 1
-			this.productList =[]
-			this.InitShopDataInfo()
-			uni.stopPullDownRefresh()
-		},
-		onReachBottom() {//上滑加载分页
-			if(this.total > this.productList.length){
-				this.loadding = true
-				this.pullUpOn = true
-				this.GetMoreSupplierHomeProductList()
-			}	
-		},
-		onShareAppMessage(res){//分享转发
-			if (res.from === 'button') {
-		      // 来自页面内转发按钮
-		    }
-			return {
-			  title: `进入店铺，发现惊喜`,
-			  path: `supplier/pages/user/my-shop?type=share&shopId=${this.listQuery.id}`
-			}
-		},
-		onShow(){
-			
-		}
-	}
-</script>
-
-<style lang="scss">
-	page{
-		background-color: #F7F7F7;
-	}
-	.shop{
-		width: 100%;
-		height: auto;
-	}
-	.shop-search-main{
-		width: 100%;
-		height: 86rpx;
-		background-color: #FFFFFF;
-		box-sizing: border-box;
-		padding:10rpx 24rpx;
-		position: fixed;
-		top:0;
-		left: 0;
-		z-index: 999;
-		.shop-search{
-			width: 100%;
-			height: 66rpx;
-			border-radius: 33rpx;
-			background-color: #F7F7F7;
-			box-sizing: border-box;
-			position: relative;
-			.icon-sousuo{
-				width: 80rpx;
-				height: 66rpx;
-				display: block;
-				float: left;
-				color: #707070;
-				line-height: 66rpx;
-				text-align: center;
-				font-size: 36rpx;
-			}
-			.icon-shanchu1{
-				width: 80rpx;
-				height: 66rpx;
-				display: block;
-				color: #8A8A8A;
-				line-height: 66rpx;
-				text-align: center;
-				font-size: 36rpx;
-				position: absolute;
-				right: 0;
-				top: 0;
-				z-index: 100;
-			}
-			.input{
-				width: 580rpx;
-				height: 66rpx;
-				box-sizing: border-box;
-				color: #666666;
-				overflow: hidden;
-				font-size: $font-size-24;
-			}
-		}
-	}
-	.container-shop{
-		width: 100%;
-		height: auto;
-		padding:24rpx;
-		box-sizing: border-box;
-		background-color: #FFFFFF;
-		margin-top: 96rpx;
-	}
-	.product-supplier{
-		width: 100%;
-		height: 140rpx;
-		padding: 30rpx 0 10rpx 0;
-		box-sizing: border-box;
-		background-color: #FFFFFF;
-		position: relative;
-		box-sizing: border-box;
-		.logo{
-			width: 128rpx;
-			height: 92rpx;
-			float: left;
-			border: 1px solid #efefef;
-			border-radius: 6rpx;
-			image{
-				width: 100%;
-				height: 100%;
-				display: block;
-				border-radius: 6rpx;
-			}
-		}
-		.main{
-			width: 470rpx;
-			height: 92rpx;
-			float: left;
-			margin-left: 20rpx;
-			.name{
-				width: 100%;
-				line-height: 46rpx;
-				float: left;
-				font-size: $font-size-28;
-				color: $text-color;
-				float: right;
-				overflow: hidden;
-				text-overflow:ellipsis;
-				white-space: nowrap;
-				text-align: left;
-			}
-			.massgs{
-				width: 100%;
-				line-height: 46rpx;
-				float: left;
-				font-size: $font-size-24;
-				color: #999999;
-				.label{
-					float: left;
-				}
-				.p-stars{
-					float: left;
-					margin-left: 20rpx;
-				}
-				.acount{
-					float: right;
-					text{
-						color: $color-system;
-					}
-				}
-			}
-		}
-		.icon-xiayibu{
-			line-height: 154rpx;
-			display: inline-block;
-			position: absolute;
-			width: 48rpx;
-			top: 0;
-			right: 0;
-			color: #b2b2b2;
-		}
-	}
-	.container-section{
-		width: 100%;
-		height: auto;
-		background-color: #F7F7F7;
-		box-sizing: border-box;
-		padding: 0 24rpx;
-		.tab-title{
-			width: 100%;
-			height: 88rpx;
-			line-height: 88rpx;
-			font-size: $font-size-30;
-			font-weight: bold;
-		}
-		.section-product{
-			width: 100%;
-			height: auto;
-			.floor-item-none{
-				min-height: 300rpx;
-				display: flex;
-				flex-direction: column;
-				align-items: center;
-				.none-image{
-					width: 260rpx;
-					height: 260rpx;
-				}
-				.none-text{
-					text-align: center;
-					font-size: $font-size-28;
-					color: #999999;
-					line-height: 40rpx;
-				}
-			}
-			.floor-item{
-				width: 341rpx;
-				height: auto;
-				margin-right: 20rpx;
-				font-size: $font-size-24;
-				color: $text-color;
-				background: #FFFFFF;
-				line-height: 36rpx;
-				border-radius: 20rpx;
-				margin-bottom: 20rpx;
-				float: left;
-				box-sizing: border-box;
-				padding-bottom: 10rpx;
-				&:nth-child(2n){
-					margin-right: 0;
-				}
-				.item-img{
-					width: 341rpx;
-					height: 341rpx;
-					border-radius: 20rpx 20rpx 0 0;
-					display: block;
-					margin-bottom: 20rpx;
-				}
-				.floor-item-content{
-					width: 311rpx;
-					padding: 0 15rpx;
-				}
-				.floor-item-act{
-					display: block;
-					width: 100%;
-					height: 68rpx;
-					text-align: center;
-					box-sizing: border-box;
-					padding: 16rpx 0;
-					margin-top: 8rpx;
-				}
-				.floor-tags{
-					height: 28rpx;
-					border-radius: 6rpx;
-					background-color: #FFFFFF;
-					line-height: 28rpx;
-					color: $color-system;
-					text-align: center;
-					display: inline-block;
-					padding:0 16rpx;
-					font-size: $font-size-20;
-					border: 1px solid #E15616;
-					float: left;
-				}
-				.title-none{
-					font-size: $font-size-26;
-					color: #FF2A2A;
-					line-height: 54rpx;
-					.btn{
-						display: inline-block;
-						float: right;
-						width: 112rpx;
-						height: 44rpx;
-						background: $btn-confirm;
-						line-height: 44rpx;
-						font-size: $font-size-24;
-						color: #FFFFFF;
-						text-align: center;
-						border-radius: 22rpx;
-						margin-top: 17rpx;
-					}
-				}
-				.title{
-					width: 100%;
-					height: 72rpx;
-					display: flex;
-					flex-direction: column;
-					margin-bottom: 15rpx;
-					padding: 0;
-					position: relative;
-					.mclap{
-						width: 100%;
-						line-height:40rpx;
-						text-overflow:ellipsis;
-						display: -webkit-box;
-						word-break: break-all;
-						-webkit-box-orient: vertical;
-						-webkit-line-clamp: 2;
-						overflow: hidden;
-						font-size: 26rpx;
-						&.indent{
-							text-indent: 95rpx;
-						}
-					}
-					.mclap-tag{
-						display: block;
-						width: 84rpx;
-						height: 32rpx;
-						background-image: linear-gradient(270deg, #f9c023 0%, #f83600 100%);
-						border-radius: 4rpx 48rpx 4px 4px;
-						line-height: 32rpx;
-						font-size: $font-size-22;
-						color: #FFFFFF;
-						text-align: center;
-						position: absolute;
-						left: 0;
-						top: 0;
-					}
-				}
-				.no-price{
-					height: 54rpx;
-					line-height: 54rpx;
-					display: flex;
-					box-sizing: border-box;
-					.p-no{
-						font-size: $font-size-30;
-						color: $text-color;
-						display: block;
-						float: left;
-					}
-					.p-stars{
-						float: left;
-					}
-				}
-				.price{
-					color: #FF2A2A;
-					line-height:54rpx;
-					&.none{
-						text-decoration: line-through;
-						color: #999999;
-					}
-					.sm{
-						font-size: $font-size-24;
-					}
-					.big{
-						font-size: $font-size-28;
-					}
-				}
-			}
-		}
-	}
-</style>

supplier/pages/user/operator/addoperator.vue

@@ -1,160 +0,0 @@
-<template>
-	<view class="container operator clearfix">
-		<view class="operator-content">
-			<view class="operator-from">
-				<view class="from-row">
-					<input class="input" type="text" v-model="params.linkName" placeholder="请输入运营人员姓名" maxlength="6"/>
-				</view>
-				<view class="from-row">
-					<input class="input" type="text" v-model="params.mobile" placeholder="请输入运营人员手机号" maxlength="11"/>
-				</view>
-				<button class="add-btn" @click="AddConfirm">确定</button>
-			</view>
-			<view class="operator-text">
-				<view class="text-main">
-					<view>1. 添加运营人员后，运营人员会收到一条邀请码短信</view>
-					<view>2. 运营人员在微信搜索【采美采购商城】小程序，或者搜索关注【采美365网】公众号，从底部菜单进入【采美采购商城】小程序</view>
-					<view>3. 使用邀请码进行登录并绑定微信</view>
-					<view>4. 绑定后，运营人员可通过微信直接登录采美365网</view>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>	
-	import authorize from '@/common/config/authorize.js'	
-	export default {
-		data() {
-			return {
-				params:{
-					shopID:'',
-					userID:'',
-					mobile:'',
-					linkName:'',
-					configFlag:2
-				}
-			}
-		},
-		onLoad(option){
-			
-		},
-		methods: {			
-			//提交
-			AddConfirm(){
-				let data = this.addressData;
-				if(this.params.linkName== ''){
-					this.$util.msg('请输入运营人员姓名');
-					return;
-				}
-				if(this.params.mobile == ''){
-					this.$util.msg('请输入运营人员手机号');
-					return;
-				}
-				if(!/(^1[0-9][0-9]{9}$)/.test(this.params.mobile)){
-					this.$util.msg('请输入正确的手机号码');
-					return;
-				}
-				this.UserService.PostAddOperator(this.params).then(response =>{
-					this.$util.msg('添加成功',2000,true,'success')
-					setTimeout(() =>{
-						uni.navigateBack();
-					},2000)
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000);
-				})
-			}
-		},
-		onShow() {
-			this.$api.getStorage().then((resolve) =>{
-				this.params.userID = resolve.userID
-				this.params.shopID = resolve.shopID
-			})
-		}
-	}
-</script>
-
-<style lang="scss">
-	page{
-		height: auto;
-		background: $bg-color;
-		border-top: 1px solid #EBEBEB;
-	}
-	.operator{
-		padding-top: 160rpx;
-		.operator-content{
-			width: 100%;
-			padding: 0 75rpx;
-			box-sizing: border-box;
-			.operator-from{
-				width: 100%;
-				height: auto;
-				.from-row{
-					height: 40rpx;
-					padding: 24rpx 0;
-					background: #FFFFFF;
-					margin-bottom: 40rpx;
-					font-size: $font-size-28;
-					color: $text-color;
-					border-bottom: 1px solid #E1E1E1;
-					.input{
-						width: 100%;
-						height: 100%;
-						text-align: left;
-					}
-				}
-			}
-			.operator-text{
-				width: 100%;
-				height: auto;
-				margin-top: 50rpx;
-				line-height: 40rpx;
-				.title{
-					margin-bottom: 50rpx;
-					.icon-gantanhao-yuankuang{
-						font-size: $font-size-32;
-						color: #166CE1;
-						margin-right: 10rpx;
-					}
-					.text-m{
-						font-size: $font-size-30;
-						color: #166CE1;
-					}
-					.text-s{
-						font-size: $font-size-24;
-						color: #999999;
-					}
-				}
-				.text-main{
-					width: 100%;
-					height: auto;
-					view{
-						line-height: 40rpx;
-						font-size: $font-size-28;
-						color: $text-color;
-						text-align: justify;
-						margin-bottom: 10rpx;
-					}
-				}
-			}
-			
-		}
-		.add-btn{
-			width: 600rpx;
-			height: 88rpx;
-			font-size: $font-size-28;
-			line-height: 88rpx;
-			color: #FFFFFF;
-			margin: 0 auto;
-			text-align: center;
-			background: $btn-confirm;
-			border-radius: 44rpx;
-			margin-top: 80rpx;
-		}
-		.add-btn.disabled{
-			background: #F8F8F8;
-			border-radius: 44rpx;
-		}
-	}
-</style>
-

supplier/pages/user/operator/list.vue

@@ -1,598 +0,0 @@
-<template>
-	<view class="container operator clearfix">
-		<view class="operator-top clearfix">
-			<view class="operator-title">
-				<view class="head"><image :src="shopLogo ? shopLogo : defalutLogo" mode=""></image></view>
-				<view class="title">{{shopName}}</view>
-			</view>
-			<view class="operator-search">
-				<view class="search-wrap">
-					<view class="search-from name">
-						<input class="input" type="text" v-model="listQuery.linkName" placeholder="请输入姓名" maxlength="6"/>
-					</view>
-					<view class="search-from phone">
-						<input class="input" type="text" v-model="listQuery.mobile" placeholder="请输入手机号" maxlength="11"/>
-					</view>
-					<view class="search-from search">
-						<button class="search-btn" type="default" @click.stop="searchOpertor">搜索</button>
-					</view>
-				</view>
-			</view>
-		</view>
-		<view class="operator-main">
-			<view v-if="isEmpty" class="empty-container">
-				<view class="txt">暂无运营人员</view>
-			</view>
-			<view v-else class="operator-list">
-				<scroll-view scroll-y="true" >
-					<view class="list" v-for="(item, index) in operatorList" :key="index" @click.stop="showOperatorModel(item)">
-						<view class="list-left">
-							<view class="list-head"><image :src="item.headimgurl ? item.headimgurl : defalutLogo" mode=""></image></view>
-							<view class="list-tel">
-								<text class="txt">{{item.linkName}}</text>
-								<text class="txt">{{item.mobile}}</text>
-							</view>
-						</view>
-						<view class="list-opea">
-							<view class="opea-type">
-								<view class="opea-type-cell" v-if="item.effectiveFlag != null">
-									<text class="iconfont icon-iconfontweixin" :style="{color: iconStautsColor(item.status)}"></text>
-									<text :style="{color: rexpStautsColor(item.effectiveFlag)}">{{ rexpStautsText(item.effectiveFlag) }}</text>
-								</view>
-								<view class="opea-type-cell none" v-else>
-									<text>- -</text>
-								</view>
-							</view>
-							<view class="opea-del">
-								<view class="opea-type-cell" @click.stop="deleteOperator(item.id)">
-									<text class="iconfont icon-shanchu"></text>
-									<text>删除</text>
-								</view>
-							</view>
-						</view>
-					</view>
-					<!--加载loadding-->
-					<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-					<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text='nomoreText'></tui-nomore>
-					<!--加载loadding-->
-				</scroll-view>
-			</view>
-		</view>
-		<div class="operator-btn" :style="{paddingBottom :isIphoneX ? '68rpx' : '0rpx'}">
-			<view class="add-btn" @click="this.$api.navigateTo('/supplier/pages/user/operator/addoperator')">添加运营人员</view>
-		</div>
-		<view class="operator-model" v-if="isOperatorModel" @click.stop="closeModel">
-			<view class="operator-alert">
-				<text class="iconfont icon-iconfontguanbi" @click.stop="closeModel"></text>
-				<view class="content">
-					<view class="ciew-t">姓名：{{modelData.linkName}}</view>
-					<view class="ciew-t">手机号：{{modelData.mobile}}</view>
-					<view class="ciew-t">邀请码：{{modelData.invitationCode ? modelData.invitationCode : '无'}}<text :style="{color: rexpStautsColor(modelData.status)}">{{modelStautsText(modelData.effectiveFlag)}}</text></view>
-					<view class="ciew-t">邀请码有效期：{{modelData.effectiveDays}}天</view>
-					<view class="ciew-t">状态：{{modelData.status == '2' ? '已绑定' : '未绑定'}}</view>
-					<view class="ciew-t">添加时间：{{modelData.addTime}}</view>
-					<view class="ciew-t">绑定时间：{{modelData.bindTime == null ? '无' : modelData.bindTime }}</view>
-				</view>
-				<view class="btn" v-if="modelData.status != '2'" @click.stop="updateInvitationCode(modelData)">更新邀请码</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import authorize from '@/common/config/authorize.js'	
-	import tuiLoadmore from "@/components/tui-components/loadmore/loadmore"
-	import tuiNomore from "@/components/tui-components/nomore/nomore"
-	export default {
-		components:{
-			tuiLoadmore,
-			tuiNomore,
-		},
-		data() {
-			return {
-				shopId:'',
-				shopName:'',
-				shopLogo:'',
-				defalutLogo:'https://static.caimei365.com/app/img/icon/logo@3x.png',
-				isEmpty:false,
-				nomoreText: '上拉显示更多',
-				hasNextPage:false,
-				loadding: false,
-				pullUpOn: true,
-				pullFlag: true,
-				allowDataStatus:true,
-				wrapperHeight:'100%',
-				scrollHeight:'',
-				deleteAddressId:'',
-				currPage:'',//当前页面
-				prevPage:'',//上一个页面
-				isOperatorModel:false,
-				operatorList:[],
-				isIphoneX:this.$store.state.isIphoneX,
-				modelData:'',
-				listQuery:{
-					userID:0,
-					linkName:'',
-					mobile:'',
-					pageNum:1,
-					pageSize:10,
-				}
-			}
-		},
-		onLoad(){				
-			this.setScrollHeight();
-		},
-		methods: {
-			setScrollHeight() {
-				// 窗口高度 - 底部距离
-				setTimeout(()=> {
-					const query = wx.createSelectorQuery().in(this);
-					query.selectAll('.add-btn').boundingClientRect();
-					query.exec(res => {
-						if(res[0][0]){
-							let winHeight = this.$api.getWindowHeight(),
-								eleTop = res[0][0].top - 1;
-								this.scrollHeight =  eleTop;
-						}
-					})
-				}, 500)
-			},
-			GetHomePageData(){//初始化供应商信息
-				this.$api.getStorage().then((resolve) =>{
-					this.userId = resolve.userID
-					this.ShopService.GetHomePageData({userId:this.userId}).then(response =>{
-						console.log(response)
-						let data = response.data
-						this.shopId = data.shop.shopID
-						this.shopName = data.shop.name
-						this.shopLogo = data.shop.logo
-						this.listQuery.userID = data.shop.userID
-						this.initOperatorList()
-					}).catch(error =>{
-						this.$util.msg(error.msg,2000)
-					})
-				})	
-			},
-			searchOpertor(){//搜索
-				this.listQuery.pageNum=1
-				this.initOperatorList()
-			},
-			initOperatorList(){	//查询列表
-				this.UserService.QueryOperatorList(this.listQuery).then(response =>{
-					let responseData = response.data
-					if(responseData.results&&responseData.results.length > 0){
-						this.isEmpty = false
-						this.hasNextPage = response.data.hasNextPage
-						this.operatorList = responseData.results
-						this.pullFlag = false;
-						setTimeout(()=>{this.pullFlag = true;},500)
-						if(this.hasNextPage){
-							this.pullUpOn = false
-							this.nomoreText = '上拉显示更多'
-						}else{
-							this.pullUpOn = true
-							this.loadding = false
-							this.nomoreText = '已至底部'
-						}
-					}else{
-						this.isEmpty = true
-					}
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000)
-				})
-			},	
-			getOnReachBottomData(){//上滑加载
-				this.listQuery.pageNum+=1
-				this.UserService.QueryOperatorList(this.listQuery).then(response =>{
-					let responseData = response.data
-					if(responseData.results&&responseData.results.length > 0){
-						this.hasNextPage = response.data.hasNextPage
-						this.operatorList = this.operatorList.concat(responseData.results) 
-						this.pullFlag = false;// 防上拉暴滑
-						setTimeout(()=>{this.pullFlag = true;},500)
-						if(this.hasNextPage){
-							this.pullUpOn = false
-							this.nomoreText = '上拉显示更多'
-						}else{
-							this.pullUpOn = false
-							this.loadding = false
-							this.nomoreText = '已至底部'
-						}
-					}
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000)
-				})
-			},
-			showOperatorModel(item){
-				this.isOperatorModel = true
-				this.modelData = item
-			},
-			closeModel(){
-				this.isOperatorModel = false
-			},
-			deleteOperator(id){//删除运营人员
-				this.$util.modal('','确定删除运营人员吗？','确定删除','取消',true,() =>{
-					this.UserService.PostDeleteOperator({id:id}).then(response =>{
-						this.$util.msg('删除成功',2000,true,'success')
-						setTimeout(()=>{
-							this.initOperatorList()
-						},2000)
-					}).catch(error =>{
-						this.$util.msg(error.msg,2000)
-					})
-				})
-			},
-			updateInvitationCode(item){	//更新邀请码	
-				this.$util.modal('','确定更新邀请码并发送给运营人员？','确定更新','取消',true,() =>{
-					this.UserService.PostUpdateOperatorCode({id:item.id,status:item.status}).then(response =>{
-						this.$util.msg('更新邀请码成功',2000)
-						this.isOperatorModel = false
-						setTimeout(()=>{
-							this.initOperatorList()
-						},2000)
-					}).catch(error =>{
-						this.$util.msg(error.msg,2000)
-					})
-				})
-			},
-			rexpStautsText(n) {
-			      let text = ''
-			      switch (n) {
-					case '':
-						text = '--'
-						break
-			        case '1':
-			          text = '邀请码有效'
-			          break
-			        case '2':
-			          text = '邀请码已使用'
-			          break
-			        case '3':
-			          text = '邀请码已过期'
-			          break
-			      }
-			      return text
-			},
-			modelStautsText(n) {
-			      let text = ''
-			      switch (n) {
-			        case '1':
-			          text = '(有效)'
-			          break
-			        case '2':
-			          text = '(已使用)'
-			          break
-			        case '3':
-			          text = '(已过期)'
-			          break
-			      }
-			      return text
-			},
-			rexpStautsColor(status) {
-			  let textColor = ''
-			  switch (status) {
-				case '1':
-				  textColor = '#55BB00'
-				  break
-				case '2':
-				  textColor = '#0056BB'
-				  break
-				case '3':
-				  textColor = '#BB0000'
-				  break
-			  }
-			  return textColor
-			},  
-			iconStautsColor(status) {
-			  let textColor = ''
-			  if(status == '2'){
-				   textColor = '#09BB07'
-			  }else{
-				   textColor = '#DDDDDD'
-			  }
-			  return textColor
-			},
-		},
-		onReachBottom() {
-			if(this.hasNextPage){
-				this.loadding = true
-				this.pullUpOn = true
-				this.getOnReachBottomData()
-			}	
-		},
-		onShow() {
-			this.GetHomePageData()
-		}
-	}
-</script>
-
-<style lang='scss'>
-	page {
-		height: auto;
-	}
-	page,.container{
-		/* padding-bottom: 120upx; */
-		background: #F7F7F7;
-		border-top: 1px solid #EBEBEB;
-	}
-	.container{
-		position: relative;
-	}
-	.operator-top{
-		width: 702rpx;
-		padding: 0 24rpx;
-		height: 282rpx;
-		background: #FFFFFF;
-		position:fixed ;
-		top: 0;
-		left: 0;
-		z-index: 999;
-		.operator-title{
-			width: 100%;
-			height: 92rpx;
-			padding: 34rpx 0;
-			.title{
-				width: 420rpx;
-				float: left;
-				font-size: $font-size-32;
-				color: $text-color;
-				line-height: 92rpx;
-				text-align: left;
-				margin-left: 20rpx;
-				-o-text-overflow: ellipsis;
-				text-overflow: ellipsis;
-				display: -webkit-box;
-				word-break: break-all;
-				-webkit-box-orient: vertical;
-				-webkit-line-clamp: 1;
-				overflow: hidden;
-			}
-			.head{
-				width: 92rpx;
-				height: 92rpx;
-				border-radius: 50%;
-				border: 1px solid #ebebeb;
-				float: left;
-				image{
-					width: 92rpx;
-					height: 92rpx;
-					border-radius: 50%;
-				}
-			}
-		}
-		.operator-search{
-			width: 100%;
-			height: auto;
-			.search-from{
-				width: 300rpx;
-				height: 40rpx;
-				padding: 20rpx;
-				background: $sub-bg-color;
-				border-radius: 40rpx;
-				position: relative;
-				margin-bottom: 20rpx;
-				float: left;
-				&.name{
-					width: 180rpx;
-					margin-right: 20rpx;
-					.input{
-						width: 180rpx;
-						font-size: $font-size-28;
-						color: $text-color;
-						line-height: 40rpx;
-						float: left;
-						height: 40rpx;
-					}
-				}
-				&.phone{
-					width: 228rpx;
-					margin-right: 20rpx;
-					.input{
-						width: 228rpx;
-						padding-left:10rpx;
-						font-size: $font-size-28;
-						color: $text-color;
-						line-height: 40rpx;
-						float: left;
-						height: 40rpx;
-					}
-				}
-				&.search{
-					width: 175rpx;
-					padding: 0;
-					background: #FFFFFF;
-					.search-btn{
-						width: 170rpx;
-						height: 78rpx;
-						border-radius: 39rpx;
-						font-size: $font-size-28;
-						color: #FFFFFF;
-						line-height: 78rpx;
-						background: $btn-confirm;
-					}
-				}
-				.label{
-					text-align: left;
-					font-size: $font-size-28;
-					color:$text-color;
-					line-height: 40rpx;
-					float: left;
-				}
-				
-			}
-			
-		}
-	}
-	.operator-main{
-		padding-top: 282rpx;
-		padding-bottom: 120rpx;
-	}
-	.list{
-		display: flex;
-		align-items: center;
-		width: 702rpx;
-		height: 92rpx;
-		padding: 24rpx;
-		background: #FFFFFF;
-		position: relative;
-		border-bottom: 1px solid #EBEBEB;
-		.list-left{
-			display: flex;
-			flex: 4;
-			.list-head{
-				width: 92rpx;
-				height: 92rpx;
-				border-radius: 50%;
-				image{
-					width: 92rpx;
-					height: 92rpx;
-					border-radius: 50%;
-				}
-			}
-			.list-tel{
-				margin-left: 18rpx;
-				.txt{
-					display: flex;
-					flex: 1;
-					font-size: $font-size-28;
-					color: $text-color;
-					line-height: 46rpx;
-				}
-			}
-		}
-		.list-opea{
-			flex:6;
-			.opea-type{
-				flex-direction: column;
-				align-items: center;
-				margin-left: 35rpx;
-				float: left;
-				.opea-type-cell{
-					width: 186rpx;
-					height: 64rpx;
-					padding:0 16rpx;
-					border-radius: 32rpx;
-					border: 1px solid #DDDDDD;
-					line-height: 64rpx;
-					font-size: $font-size-24;
-					.icon-iconfontweixin{
-						margin-right: 8rpx;
-						font-size: $font-size-32;
-					}
-					&.none{
-						text-align: center;
-					}
-				}
-			}
-			.opea-del{
-				float: right;
-				flex-direction: column;
-				align-items: center;
-				.opea-type-cell{
-					width: 86rpx;
-					height: 64rpx;
-					padding:0 24rpx;
-					border-radius: 32rpx;
-					border: 1px solid #DDDDDD;
-					line-height: 64rpx;
-					font-size: $font-size-24;
-					color: #FF0000;
-					.icon-shanchu{
-						font-size: $font-size-32;
-						margin-right: 6rpx;
-					}
-				}
-			}
-		}
-	}
-	.operator-model{
-		width: 100%;
-		height: 100%;
-		background: rgba(0,0,0,.1);
-		position: fixed;
-		top: 0;
-		left: 0;
-		bottom: 0;
-		right: 0;
-		margin: auto;
-		z-index: 1000;
-		.operator-alert{
-			width: 435rpx;
-			height: 360rpx;
-			padding: 68rpx 32rpx;
-			background: #FFFFFF;
-			border-radius: 14rpx;
-			position: absolute;
-			top: 0;
-			left: 0;
-			bottom: 0;
-			right: 0;
-			margin: auto;
-			z-index: 1001;
-			.icon-iconfontguanbi{
-				width: 68rpx;
-				height: 68rpx;
-				text-align: center;
-				line-height: 68rpx;
-				position: absolute;
-				right: 0;
-				top: 0;
-				font-size: $font-size-36;
-				color: #999999;
-			}
-			.content{
-				.ciew-t{
-					font-size: $font-size-28;
-					color: $text-color;
-					line-height: 48rpx;
-				}
-			}
-			.btn{
-				width: 100%;
-				height: 68rpx;
-				border-top: 1px solid #F7F7F7;
-				line-height: 68rpx;
-				font-size: $font-size-26;
-				text-align: center;
-				color: $color-system;
-				position: absolute;
-				bottom:0 ;
-				left: 0;
-			}
-		}
-	}
-	.operator-btn{
-		position: fixed;
-		width: 100%;
-		height: 140rpx;
-		left: 0;
-		bottom: 0;
-		background: #FFFFFF;
-		z-index: 95;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		.add-btn{
-			width: 600rpx;
-			height: 88rpx;
-			font-size: $font-size-28;
-			line-height: 88rpx;
-			color: #FFFFFF;
-			text-align: center;
-			background: $btn-confirm;
-			border-radius: 44rpx;
-		}
-	}
-	.adds-btn{
-		width: 600rpx;
-		height: 88rpx;
-		font-size: 28rpx;
-		line-height: 88rpx;
-		color: #FFFFFF;
-		margin: 0 auto;
-		text-align: center;
-		background: #000000;
-		border-radius: 44rpx;
-	}
-</style>
-

supplier/pages/user/setting/password.vue

@@ -1,470 +0,0 @@
-<template>
-	<view class="container login">
-		<view class="login-main">
-			<!-- <view class="line"></view> -->
-			<view class="nav-item"
-				  :class="{ current: tabCurrentIndex === 1 }" 
-				  @click="tabClick(1)">
-				  使用手机修改
-			</view>					
-			<view class="nav-item" 
-				  :class="{ current: tabCurrentIndex === 2 }" 
-				  @click="tabClick(2)">
-				  使用邮箱修改
-			</view>
-		</view>
-		<!-- 手机修改 -->
-		<view class="content" v-if="tabCurrentIndex === 1">
-			<view class="login-form clearfix">
-				<view class="login-input">
-					<input type="number" v-model="mobile"  maxlength="11" class="input" placeholder="请输入手机号" placeholder-class="placeholder"/>
-				</view>
-			</view>
-			<view class="login-form clearfix">
-				<view class="login-input code">
-					<input type="text" v-model="imageCode"  maxlength="4" class="input" placeholder="请输入右侧图形验证码"  placeholder-class="placeholder"/>
-				</view>
-				<view class="login-input img-btn">
-					<view class="vscodeimg">
-						<image :src="imageCodeUrl" mode=""></image>
-					</view>
-					<view class="vscod-refresh" @click.stop="getVerificationCode">
-						<text class="iconfont icon-shuaxin"></text>
-						<text class="ref-text">刷新</text>
-					</view>
-				</view>
-			</view>
-			<view class="login-form clearfix">
-				<view class="login-input code">
-					<input type="number" v-model="mobileCode"  maxlength="6" class="input" placeholder="请输入短信验证码"  placeholder-class="placeholder"/>
-				</view>
-				<view class="login-input btn" :class="[isMobileDisabled  ? 'disabled' : '']" >
-					<button type="button"
-							@click.stop="getMobileCodeFn"
-							:disabled="isMobileDisabled" 
-							class="input" >
-							{{ mobileCodeText }}
-					</button>
-				</view>
-			</view>
-			<view class="login-form clearfix">
-				<view class="login-input pwd">
-					<input v-show="isShowEye" type="text" v-model="password"  maxlength="16" class="input" placeholder="请输入新密码，必须为8-16位字母数字的组合" autocomplete="new-password"  placeholder-class="placeholder"/>
-					<input v-show="!isShowEye" type="password" v-model="password"  :password="true" maxlength="16" class="input" placeholder="请输入新密码，必须为8-16位字母数字的组合" autocomplete="new-password"  placeholder-class="placeholder"/>
-					<view class="iconfont" :class="isShowEye ? 'icon-kejian1' : 'icon-bukejian'"  @click="passwordEye"></view>
-				</view>
-			</view>
-			<view class="login-form clearfix">
-				<view class="login-input pwd">
-					<input v-show="isShowEyes" type="text" v-model="passwordCheck"  maxlength="16" class="input" placeholder="请确认密码" autocomplete="new-password"  placeholder-class="placeholder"/>
-					<input v-show="!isShowEyes" type="password" v-model="passwordCheck"  :password="true" maxlength="16" class="input" placeholder="请确认密码" autocomplete="new-password"  placeholder-class="placeholder"/>
-					<view class="iconfont" :class="isShowEyes ? 'icon-kejian1' : 'icon-bukejian'"  @click="passwordEyes"></view>
-				</view>
-			</view>
-			<view class="login-form clearfix" style="border: 0;">
-				<view class="login-btn"  @click="confirmMobilePassword">修改密码</view>
-			</view>
-		</view>
-		<!-- 邮箱修改 -->
-		<view class="content" v-else>
-			<view class="login-form clearfix">
-				<view class="login-input">
-					<input class="input" type="text" v-model="email"  maxlength="30" placeholder="请输入邮箱地址"  placeholder-class="placeholder"/>
-				</view>
-			</view>
-			<view class="login-form clearfix">
-				<view class="login-input code">
-					<input class="input" type="number" v-model="emailCode" maxlength="4"  placeholder="请输入邮箱验证码"  placeholder-class="placeholder"/>
-				</view>
-				<view class="login-input btn" :class="[isEmialDisabled ? 'disabled' : '']">
-					<button class="input"  
-							type="button"  
-							@click.stop="getEmailCodeFn"
-							:disabled="isEmialDisabled">
-							{{ emailCodeText }}
-					</button>
-				</view>
-			</view>
-			<view class="login-form clearfix">
-				<view class="login-input pwd">
-					<input v-show="isShowEye" type="text" v-model="password"  maxlength="16" class="input" placeholder="请输入新密码，必须为8-16位字母数字的组合" autocomplete="new-password"  placeholder-class="placeholder"/>
-					<input v-show="!isShowEye" type="password" v-model="password"  :password="true" maxlength="16" class="input" placeholder="请输入新密码，必须为8-16位字母数字的组合" autocomplete="new-password"  placeholder-class="placeholder"/>
-					<view class="iconfont" :class="isShowEye ? 'icon-kejian1' : 'icon-bukejian'"  @click="passwordEye"></view>
-				</view>
-			</view>
-			<view class="login-form clearfix">
-				<view class="login-input pwd">
-					<input v-show="isShowEyes" type="text" v-model="passwordCheck"  maxlength="16" class="input" placeholder="请确认密码" autocomplete="new-password"  placeholder-class="placeholder"/>
-					<input v-show="!isShowEyes" type="password" v-model="passwordCheck"  :password="true" maxlength="16" class="input" placeholder="请确认密码" autocomplete="new-password"  placeholder-class="placeholder"/>
-					<view class="iconfont" :class="isShowEyes ? 'icon-kejian1' : 'icon-bukejian'"  @click="passwordEyes"></view>
-				</view>
-			</view>
-			<view class="login-form clearfix" style="border: 0;">
-				<view class="login-btn"  @click="confirmEmailPassword">修改密码</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import authorize from '@/common/config/authorize.js' 
-	import { mobilePassword , emailPassword } from "@/api/use.js"
-	import { getEmailCode } from "@/api/utils.js"
-	
-	export default{
-		data() {
-			return{
-				tabCurrentIndex: 1,
-				mobile:'',  		//用户手机号
-				email:'',			//邮箱地址
-				emailCode:'',		//油箱验证码
-				mobileCode:'',  	//手机验证码
-				password:'',		//新密码
-				passwordCheck:'',   //二次校验新密码
-				isShowEye:false,	//控显
-				isShowEyes:false,	//控显
-				iconEyes:'icon-yanjing_yincang_o',
-				iconEyen:'icon-yanjing_xianshi_o',
-				isEmialDisabled:false,//获取邮箱验证码按钮
-				isMobileDisabled:false,//获取手机短信按钮
-				imageCode:'',			//图形验证码
-				imageCodeUrl:'',		//图形验证码地址
-				imageCodetoken:'',		//图形校验token
-				count: '',				//倒计时
-				emailCodeText: '获取验证码',
-				mobileCodeText: '获取验证码',
-				codeTime: null,
-			}
-		},
-		onLoad(option) {
-			this.getVerificationCode()
-		},
-		methods:{
-			confirmMobilePassword(){//手机号修改
-				let params = {
-						mobileOrEmail : this.mobile,
-						activateCode : this.mobileCode,
-						passWord : this.password,
-						confirmPwd : this.passwordCheck,
-						status:1
-					}
-				mobilePassword(params).then(res =>{
-					this.$util.msg(res.msg,2000);
-					setTimeout(()=>{
-						uni.navigateBack({
-							delta: 1
-						});
-					},2000)
-				}).catch( error =>{
-					this.$util.msg(error.msg,2000);
-				})
-			},
-			confirmEmailPassword(){//邮箱修改密码
-				 let params = {
-						mobileOrEmail : this.email,
-						activateCode : this.emailCode,
-						passWord : this.password,
-						confirmPwd : this.passwordCheck,
-						status:2
-					}
-				emailPassword(params).then(res =>{
-					this.$util.msg(res.msg,2000);
-					setTimeout(()=>{
-						uni.navigateBack({
-							delta: 1
-						});
-					},2000)
-				}).catch( error =>{
-					this.$util.msg(error.msg,2000);
-				})
-			},
-			getVerificationCode(){//图形验证
-				this.PublicService.GetImgVerifyCode().then(res => {
-					this.imageCodeUrl = res.data.baseImage
-					this.imageCodetoken = res.data.token
-				})
-			},
-			getEmailCodeFn(){//获取邮箱验证码
-				if( this.email == ''){
-					this.$util.msg('请输入邮箱地址',2000);
-					return
-				}
-				if(!this.$reg.isEmail(this.email)){
-					this.$util.msg('请输入正确的邮箱地址',2000);
-					return
-				}
-				this.isEmialDisabled = true;
-				getEmailCode({email:this.email,status:3}).then(res =>{
-					this.$util.msg('邮箱验证码已发送',2000);
-					const TIME_COUNT = 60;
-			     	if (!this.codeTime) {
-			       		this.count = TIME_COUNT;
-			       		this.isEmialDisabled = true;
-			       		this.codeTime = setInterval(() => {
-			       			if (this.count > 1 && this.count <= TIME_COUNT) {
-			         			this.count--
-			         			this.emailCodeText = this.count +'s重新发送'
-			        		} else {
-				         		this.isEmialDisabled = false;
-				         		clearInterval(this.codeTime)
-				         		this.codeTime = null
-								this.emailCodeText = '获取验证码'
-			        		}
-			       		},1000)
-			      	}
-				}).catch( error =>{
-					this.$util.msg(error.msg,2000);
-					this.isEmialDisabled = false;
-				})
-			},
-			getMobileCodeFn(){//获取手机验证码
-				if( this.mobile == ''){
-					this.$util.msg('请输入手机号',2000);
-					return
-				}
-				if(!this.$reg.isMobile(this.mobile)){
-					this.$util.msg('请输入正确的手机号',2000);
-					return
-				}
-				if( this.imageCode == ''){
-					this.$util.msg('请输入图形验证码',2000);
-					return
-				}
-				let params = {
-						mobile:this.mobile,
-						activateCodeType:1,
-						platformType:2,
-						imgCode:this.imageCode,
-						token:this.imageCodetoken,
-					}
-				this.isMobileDisabled = true;
-				this.PublicService.GetMobileCode(params).then(res =>{
-					this.$util.msg('验证短信已发送',2000);
-					const TIME_COUNT = 60;
-			     	if (!this.codeTime) {
-			       		this.count = TIME_COUNT;
-			       		this.isMobileDisabled = true;
-			       		this.codeTime = setInterval(() => {
-			       			if (this.count > 1 && this.count <= TIME_COUNT) {
-			         			this.count--
-			         			this.mobileCodeText = this.count +'s重新发送'
-			        		} else {
-				         		this.isMobileDisabled = false;
-				         		clearInterval(this.codeTime)
-				         		this.codeTime = null
-								this.mobileCodeText = '获取验证码'
-			        		}
-			       		},1000)
-			      	}
-				}).catch( error =>{
-					this.$util.msg(error.msg,2000);
-					this.isMobileDisabled = false;
-				})
-			},
-			tabClick(index) {//tab切换
-				this.tabCurrentIndex = index;
-				this.password = ''
-				this.passwordCheck = ''
-				if(this.tabCurrentIndex == 1){
-					this.getVerificationCode()
-				}
-			},
-			passwordEye() {//密码显隐操作
-				this.isShowEye = !this.isShowEye;
-			},
-			passwordEyes() {//密码显隐操作
-				this.isShowEyes = !this.isShowEyes;
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	.login{
-		width: 100%;
-		height: auto;
-		.login-main{
-			width: 100%;
-			display: flex;
-			height: 80rpx;
-			border-top: 1px solid #F7F7F7;
-			margin-bottom: 80rpx;
-			position: relative;
-			.nav-item{
-				display: flex;
-				flex: 1;
-				flex-direction: column;
-				align-items: center;
-				line-height: 80rpx;
-				color: #666666;
-				font-size: $font-size-28;
-				background: #F7F7F7;
-				&.current{
-					color:$color-system;
-					background: #FFFFFF;
-					
-				}
-			}
-		}
-		.login-form{
-			width: 702rpx;
-			height: auto;
-			margin: auto;
-			border-bottom: 2rpx solid #e1e1e1;
-			.login-input{
-				width: 100%;
-				height: 60rpx;
-				padding: 24rpx 0;
-				border-radius: 14rpx;
-				display: flex;
-				flex-direction: column;
-				align-items: center;
-				position: relative;
-				&.pwd{
-					.iconfont{
-						position: absolute;
-						right: 0;
-						top: 0;
-						font-size: 44rpx;
-						color: #999999;
-						z-index: 99;
-						width: 96rpx;
-						height: 96rpx;
-						line-height: 96rpx;
-						text-align: center;
-					}
-				}
-				&.code{
-					width: 310rpx;
-					float: left;
-					margin-right: 20rpx;
-				}
-				&.btn{
-					width: 220rpx;
-					height: 64rpx;
-					float: right;
-					background: $btn-confirm;
-					padding: 0;
-					border-radius: 44rpx;
-					margin-top: 20rpx;
-					.input{
-						width: 220rpx;
-						height: 64rpx;
-						line-height: 64rpx;
-						padding: 0;
-						color: #FFFFFF;
-						background: $btn-confirm;
-						text-align: center;
-						border-radius: 44rpx;
-						&.none{
-							background: #F7F7F7;
-						}
-					}
-					&.disabled{
-						background: #F7F7F7;
-						.input{
-							background: #F7F7F7;
-							color: #999999;
-						}
-					}
-				}
-				&.img-btn{
-					width: 290rpx;
-					height: 64rpx;
-					padding: 0;
-					float: right;
-					background: #FFFFFF;
-					display: block;
-					margin-top: 10rpx;
-					.vscodeimg{
-						width: 160rpx;
-						height: 64rpx;
-						float: left;
-						display: flex;
-						flex-direction: column;
-						align-items: center;
-						border-radius: 6rpx;
-						margin-top: 10rpx;
-						image{
-							width: 180rpx;
-							height: 88rpx;
-							border-radius: 6rpx;
-						}
-					}
-					.vscod-refresh{
-						width: 100rpx;
-						float: right;
-						margin-top: 25rpx;
-						.icon-shuaxin{
-							font-size: 36rpx;
-							color: #999999;
-							float: left
-						}
-						.ref-text{
-							font-size: 24rpx;
-							color: #333333;
-							float: right;
-						}
-					}
-				}
-				.input{
-					width: 100%;
-					height: 100%;
-					font-size: $font-size-28;
-					line-height: 40rpx;
-					color: #333333;
-					border-radius: 14rpx;
-				}
-			}
-		}
-		.login-btn{
-			width: 600rpx;
-			height: 88rpx;
-			border-radius: 44rpx;
-			font-size: $font-size-28;
-			line-height: 88rpx;
-			color: #FFFFFF;
-			margin: 0 auto;
-			text-align: center;
-			background: $btn-confirm;
-			margin-top: 100rpx;
-		}
-		.model-authorization{
-			width: 100%;
-			height: 100%;
-			position: fixed;
-			top: 0;
-			left: 0;
-			z-index: 999;
-			.authorization{
-				width: 518rpx;
-				height: 320rpx;
-				position: absolute;
-				background: rgba(255,255,255,.7);
-				left: 0;
-				right: 0;
-				bottom: 0;
-				top: 0;
-				margin: auto;
-				.to-btn{
-					position: absolute;
-					top: 0;
-					left: 0;
-					right: 0;
-					bottom: 0;
-					margin: auto;
-					width: 70%;
-					height: 88rpx;
-					font-size: $font-size-28;
-					line-height: 88rpx;
-					color: #FFFFFF;
-					text-align: center;
-					border-radius: 44rpx;
-				}
-			}
-		}
-	}
-	.placeholder{
-		color: #b2b2b2;
-	}
-</style>

supplier/pages/user/setting/phone.vue

@@ -1,316 +0,0 @@
-<template>
-	<view class="container register">
-		<view class="register-main first clearfix">
-			<view class="register-row clearfix">
-				<view class="register-from">
-					<view class="label">原手机号:</view>
-					<view class="row-input">{{bindMobile}}</view>
-				</view>
-			</view>
-			<view class="register-row clearfix">
-				<view class="register-from code">
-					<input class="row-input" type="number" v-model="mobileCode" placeholder="请输入原手机号的验证码" placeholder-class="place-holder" maxlength="6"/>
-				</view>
-				<view class="register-from btn" :class="[isMobileDisabled  ? 'disabled' : '']">
-					<button class="row-input"  type="button" @click.stop="getMobileCodeFn" :disabled="isMobileDisabled">{{ mobileCodeText }}</button>
-				</view>
-			</view>
-			<view class="register-row clearfix">
-				<view class="register-from">
-					<input class="row-input" type="number" v-model="contractMobile" placeholder="请输入新手机号" placeholder-class="place-holder" maxlength="11"/>
-				</view>
-			</view>
-			<view class="register-row clearfix">
-				<view class="register-from code">
-					<input class="row-input" type="number" v-model="newMobileCode" placeholder="请输入新手机号的验证码" placeholder-class="place-holder" maxlength="6"/>
-				</view>
-				<view class="register-from btn" :class="[isNewMobileDisabled  ? 'disabled' : '']" >
-					<button class="row-input"  type="button" @click.stop="getNewMobileCodeFn" :disabled="isNewMobileDisabled">{{ newMobileCodeText }}</button>
-				</view>
-			</view>
-			<view class="register-row clearfix" style="border: 0;">
-				<view class="register-btn"  @click="bindMobileCheck">确定</view>
-			</view>
-			<view class="register-text clearfix">
-				<view >注意：本操作更换的是供应商联系人的手机号，不是运营人员的手机号！</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import { mapMutations } from 'vuex';
-	import { getClubMobileCode,getClubNewMobileCode } from "@/api/utils.js" 
-	import { changeMobile } from "@/api/use.js" 
-	var self;
-	export default{
-		data() {
-			return{
-				userID:'',					//用户ID
-			    count: '',					//倒计时
-			    newCount: '',				//倒计时
-			    codeTime: null,
-			    codeTimeNew: null,
-				bindMobile:'',				//联系人手机号
-				contractMobile:'',			//新联系人手机号
-				mobileCode:'',				//手机号验证码
-				newMobileCode:'',			//新手机号手机验证码
-				mobileCodeText: '获取验证码',
-				newMobileCodeText: '获取验证码',
-				isMobileDisabled: false,	//手机验证码按钮控制
-				isNewMobileDisabled: false,	//手机验证码按钮控制
-			}	
-		},
-		onLoad(option) {
-			this.bindMobile = option.phone
-		},
-		methods:{
-			bindMobileCheck(){
-				let params = {
-						contractMobile2:this.bindMobile,
-						contractMobile:this.contractMobile,
-						mobileCode:this.mobileCode,
-						newMobileCode:this.newMobileCode,
-						userID:this.userID
-				}
-				changeMobile(params).then(response =>{
-					this.$util.msg('修改成功',1500,true,'success')
-					setTimeout(()=>{
-						uni.navigateBack({delta: 1})
-					},2000)
-				}).catch( error =>{
-					this.$util.msg(error.msg,2000);
-				})
-			},
-			getMobileCodeFn(){
-				if( this.bindMobile == ''){
-					this.$util.msg('请输入手机号',2000);
-					return
-				}
-				if(!this.$reg.isMobile(this.bindMobile)){
-					this.$util.msg('请输入正确的手机号',2000);
-					return
-				}
-				let params = { mobile : this.bindMobile }
-				this.isMobileDisabled = true;
-				getClubMobileCode(params).then(response =>{
-					this.$util.msg('验证短信已发送',2000);
-					const TIME_COUNT = 60;
-			     	if (!this.codeTime) {
-			       		this.count = TIME_COUNT;
-			       		this.isMobileDisabled = true;
-			       		this.codeTime = setInterval(() => {
-			       			if (this.count > 1 && this.count <= TIME_COUNT) {
-			         			this.count--
-			         			this.mobileCodeText = this.count +'s重新发送'
-			        		} else {
-				         		this.isMobileDisabled = false;
-				         		clearInterval(this.codeTime)
-				         		this.codeTime = null
-								this.mobileCodeText = '获取验证码'
-			        		}
-			       		},1000)
-			      	}		
-				}).catch( error =>{
-					this.$util.msg(error.msg,2000);
-					this.isMobileDisabled = false;
-				})
-			},
-			getNewMobileCodeFn(){
-				if( this.contractMobile == ''){
-					this.$util.msg('请输入手机号',2000);
-					return
-				}
-				if(!this.$reg.isMobile(this.contractMobile)){
-					this.$util.msg('请输入正确的手机号',2000);
-					return
-				}
-				let params = { newMobile : this.contractMobile }
-				this.isNewMobileDisabled = true;
-				getClubNewMobileCode(params).then(response =>{
-					this.$util.msg('验证短信已发送',2000);
-					const TIME_COUNT = 60;
-			     	if (!this.codeTimeNew) {
-			       		this.newCount = TIME_COUNT;
-			       		this.isNewMobileDisabled = true;
-			       		this.codeTimeNew = setInterval(() => {
-			       			if (this.newCount > 1 && this.newCount <= TIME_COUNT) {
-			         			this.newCount--
-			         			this.newMobileCodeText = this.newCount +'s重新发送'
-			        		} else {
-				         		this.isNewMobileDisabled = false;
-				         		clearInterval(this.codeTimeNew)
-				         		this.codeTimeNew = null
-								this.newMobileCodeText = '获取验证码'
-			        		}
-			       		},1000)
-			      	}
-				}).catch( error =>{
-					this.$util.msg(error.msg,2000);
-					this.isNewMobileDisabled = false;
-				})
-			}
-		},
-		onShow() {
-			this.$api.getStorage().then((resolve) =>{
-				this.userID = resolve.userID
-			})
-		}
-	}
-</script>
-
-<style lang="scss">
-	.register{
-		width: 100%;
-		height: auto;
-		border-top: 1px solid #F7F7F7;
-		.model-warp.none{
-			display: none;			
-		}
-		.model-warp.show{
-			display: block;
-		}
-		.register-main{
-			width: 100%;
-			height: auto;
-			&.detailed{
-				padding-bottom: 300rpx;
-			}
-			&.first{
-				padding-top: 40rpx;
-			}
-			.register-tips{
-				display: flex;
-				flex-direction: column;
-				align-items: center;
-				line-height: 44rpx;
-				font-size: $font-size-24;
-				color: #FF0000;
-				margin-bottom: 40rpx;
-				.iconfont{
-					font-size: $font-size-24;
-				}
-			}
-			.register-row{
-				width: 702rpx;
-				height: auto;
-				margin: auto;
-				// margin-bottom: 20rpx;
-				border-bottom: 2rpx solid #e1e1e1;
-				.register-title{
-					line-height: 64rpx;
-					font-size: $font-size-32;
-					color: $text-color;
-					text-align: left;
-					padding-left: 20rpx;
-					.txt{
-						font-size: $font-size-26;
-						font-weight: normal;
-					}
-				}
-				.row-btn{
-					position: absolute;
-					right: 24rpx;
-					top: 0;
-					line-height: 88rpx;
-					text-align: center;
-					font-size: $font-size-28;
-					color: $color-system;
-				}
-				.register-from{
-					width: 702rpx;
-					height: 64rpx;
-					padding: 24rpx 0;
-					position: relative;
-					.label{
-						text-align: left;
-						font-size: $font-size-28;
-						color: #666666;
-						line-height: 64rpx;
-						float: left;
-					}
-					.row-input{
-						width: 440rpx;
-						padding-left:10rpx;
-						font-size: $font-size-28;
-						color: $text-color;
-						line-height: 64rpx;
-						float: left;
-						height: 64rpx;
-						&.none{
-							color: #999999;
-						}
-					}
-					&.code{
-						width: 410rpx;
-						float: left;
-						margin-right: 20rpx;
-						.row-input{
-							width: 390rpx;
-						}
-					}
-					&.btn{
-						width: 180rpx;
-						height:64rpx;
-						float: right;
-						padding: 0;
-						border: 2rpx solid #e15616;
-						border-radius: 45rpx;
-						.row-input{
-							width: 180rpx;
-							height: 64rpx;
-							line-height: 64rpx;
-							padding: 0;
-							color:#E15616;
-							text-align: center;
-							border-radius: 45rpx;
-							font-size: $font-size-24;
-							&.none{
-								background: #F7F7F7;
-							}
-						}
-						&.disabled{
-							background: #F7F7F7;
-							border: 2rpx solid #F7F7F7;
-							.row-input{
-								background: #F7F7F7;
-								color: #999999;
-							}
-						}
-					}
-					&.btn{
-						margin-top: 20rpx;
-					}
-				}
-				
-			}
-			.register-btn{
-				width: 600rpx;
-				height: 90rpx;
-				border-radius: 45rpx;
-				font-size: $font-size-28;
-				line-height: 88rpx;
-				color: #FFFFFF;
-				margin: 0 auto;
-				text-align: center;
-				background: $btn-confirm;
-				margin-top: 96rpx;
-				&.sub{
-					margin-top: 0;
-				}
-			}
-		}
-	}
-	.register-text{
-		width: 506rpx;
-		color: #fea785;
-		font-size: 22rpx;
-		line-height: 32rpx;
-		margin: 30rpx auto;
-		text-align: center
-	}
-	.place-holder{
-		color: #b2b2b2;
-	}
-</style>
-

supplier/pages/user/setting/setting.vue

@@ -1,107 +0,0 @@
-<template>
-	<view class="container clearfix">
-		<view class="foot-list">
-			<view class="list-cell-item">
-				<view class="list-cell" @click="navigator(`/supplier/pages/user/setting/phone?phone=${bindMobile}`)" hover-class="cell-hover" :hover-stay-time="50">
-					<text class="cell-tit">更换手机号</text>
-					<text class="cell-more">
-						<text class="txt">{{hidePhone(bindMobile)}}</text>
-						<text class="iconfont icon-xiayibu"></text>
-					</text>
-				</view>
-				<view class="list-cell" @click="navigator('/supplier/pages/user/setting/password')" hover-class="cell-hover" :hover-stay-time="50">
-					<text class="cell-tit">修改密码</text>
-					<text class="cell-more iconfont icon-xiayibu"></text>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				bindMobile:''
-			}
-		},
-		onLoad(option) {
-			
-		},
-		methods:{
-			initSetting(){
-				this.$api.getStorage().then((resolve) =>{
-					this.ShopService.GetHomePageData({userId:resolve.userID}).then(response =>{
-						this.bindMobile=response.data.user.bindMobile
-					}).catch(error =>{
-						this.$util.msg(error.msg,2000)
-					})
-				})
-			},
-			navigator(url){
-				this.$api.navigateTo(url)
-			},
-			hidePhone(val){
-				let phone = this.$reg.hidePhone(val) 
-				return phone
-			}
-		},
-		onShow() {
-			this.initSetting()
-		}
-	}
-</script>
-
-<style lang='scss'>
-	page {
-		height: auto;
-	}
-	.foot-list{
-		width: 100%;
-		margin-top: 30rpx;
-	}	
-	.list-cell-item{
-		width: 702rpx;
-		height: auto;
-		margin-bottom: 24rpx;
-		padding:0 24rpx;
-		background: $bg-color;
-	}
-	.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;
-		&.cell-hover{
-			background:#fafafa;
-		}
-		.cell-more{
-			align-self: baseline;
-			font-size:$font-size-28;
-			color:$text-color;
-			margin-left:10rpx;
-			.txt{
-				color: #999999;
-				padding-right: 10rpx;
-			}
-		}
-		.cell-tit{
-			flex: 1;
-			font-size: $font-size-28;
-			color: $text-color;
-			margin-right:10rpx;
-		}
-		.cell-tip{
-			font-size: $font-size-28;
-			color: $text-color;
-		}
-	}	
-	.list-cell.last{
-		border-bottom: none;
-	}
-</style>
-

supplier/pages/user/supplier.vue

@@ -1,41 +0,0 @@
-<template>
-	<view class="container all-type-list-wrapper">
-		<supplier-details :shopId="shopId" v-if="isLoading"></supplier-details>
-	</view>
-</template>
-
-<script>
-	import supplierDetails from "@/components/cm-module/supplier/supplierDetails.vue" //供应商详情
-	export default{
-		components:{
-			supplierDetails
-		},
-		data(){
-			return{
-				shopId:0,
-				shopInfo:{},
-				isLoading:false
-			}
-		},		
-		onLoad(option) {
-			this.shopId = option.shopId
-			this.isLoading = true
-		},
-		methods:{
-			
-		},
-		onShow() {
-
-		}
-	}
-</script>
-
-<style lang="scss">
-	page {
-		background: $sub-bg-color;
-		.all-type-list-wrapper {
-			display: flex;
-			flex-direction: column;
-		}
-	}
-</style>