供应商模块

common/css/common.scss

@@ -300,4 +300,61 @@ button::after{
 .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;
+		}
+	}

components/cm-module/orderDetails/supplierDetaileButton.vue

@@ -0,0 +1,211 @@
+<template name="button">
+	<view class="button-template" :style="{paddingBottom :isIphoneX ? '68rpx' : '0rpx'}">
+		<!-- 底部按钮 -->
+		<view class="button-content">
+			<view class="btn btn-color" @click.stop="onShareCode">
+				<view class="tips" v-if="shareCode">分享码：{{shareCode}}</view>
+				分享订单
+			</view>	
+			<view class="btn btn-color" v-if="btnState.isRecord"  @click.stop="btnConfirm('record')">发货记录</view>
+			<view class="btn btn-color" v-if="btnState.isDeliver"  @click.stop="btnConfirm('deliver')">发货</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default{
+		name:"button",
+		props:{
+			status:{
+				type:Number
+			},
+			shareCode:{
+				type:String,
+				default: '4564'
+			}
+		},
+		watch:{
+			status:{
+				handler:function(val){
+					this.initData(val)
+				},
+				deep:true//对象内部的属性监听，也叫深度监听
+			}
+		},
+		data() {
+			return{
+				btnState:this.initStatus(),
+				isIphoneX:this.$store.state.isIphoneX,
+				mapStateArr:[
+					{label:'isDeliver',val:[0],status: true},
+					{label:'isRecord',val:[0,111],status: true},
+				]
+			}
+		},
+		created(){
+			this.initData(this.status)
+		},
+		computed: {
+
+		},
+		methods:{
+			initData(resVal) {
+				/**
+				 * @分享按钮统一显示
+				 * @按钮根据状态显示
+				 * @(4、5、7、12、22、23、32)显示[查看物流]按钮,其他隐藏
+				 * @(6)显示[删除订单],其他隐藏
+				 * @(0、111)显示[取消订单],其他隐藏
+				 * @(21,31)只显示分享
+				 * @(13,33)显示[确认收货]和[查看物流]
+				 */
+				this.btnState = this.initStatus()
+				this.mapStateArr.forEach(el => {
+					el.val.forEach(value => {
+						if(resVal === value){
+							this.btnState[el.label] = el.status
+							//console.log(this.btnState[el.label]);
+						}
+					})
+				})
+			},
+			initStatus(){
+				let btnState= {
+						isQuery: false,
+						isDelete: false,
+						isCancel: false,
+						isConfirm: false,
+					}
+				return 	btnState
+			},
+			getShareCode(code){
+				this.shareCode = code
+			},
+			onShareCode(){
+				this.$parent.isShareModal = true
+				this.$emit('shareConfirm')
+			},
+			btnConfirm(type){
+				this.$emit('buttonConfirm',type)
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.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;
+			.share-code{
+				width: 200rpx;
+				height:  64rpx;
+				line-height: 64rpx;
+				color: #2A45FF;
+				text-align: left;
+				position: absolute;
+				font-size: $font-size-28;
+				font-weight: bold;
+				left: 24rpx;
+				top: 24rpx;
+			}
+			.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);
+					}
+				}
+			}
+			.btn-cancel{
+				background:#FFFFFF;
+				color: #999999;
+				float: left;
+				margin: 22rpx 0;
+				text-align: left;
+			}
+			.btn-delete{
+				background:linear-gradient(315deg,rgba(255,163,3,1) 0%,rgba(255,53,1,1) 100%);
+			}
+			.btn-query{
+				background:linear-gradient(135deg,rgba(255,212,129,1) 0%,rgba(198,129,0,1) 100%);
+			}
+			.btn-confirm{
+				background:linear-gradient(315deg,rgba(231,0,0,1) 0%,rgba(255,104,1,1) 100%);
+			}
+			.btn-share{
+				background:linear-gradient(315deg,rgba(0,212,150,1) 0%,rgba(126,243,174,1) 100%);
+				margin-right: 0;
+				position: relative;
+				.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: 0;
+					top: -65rpx;
+					&: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>

pages.json

@@ -408,7 +408,55 @@
 					}
 				}
 			]	
-		}			
+		},
+		{
+			"root": "supplier",
+			"pages": [
+				{
+					"path": "pages/login/bind-operator",
+					"style": {
+						"navigationBarTitleText": "绑定微信"
+					}
+				},{
+					"path": "pages/login/share-login",
+					"style": {
+						"navigationBarTitleText": "查看订单"
+					}
+				},{
+					"path": "pages/order/order-details",
+					"style": {
+						"navigationBarTitleText": "订单详情",
+						"navigationStyle":"custom"
+					}
+				},{
+					"path": "pages/order/order-service-details",
+					"style": {
+						"navigationBarTitleText": "订单详情",
+						"navigationStyle":"custom"
+					}
+				},{
+					"path": "pages/deliver/add-logistics",
+					"style": {
+						"navigationBarTitleText": "添加物流"
+					}
+				},{
+					"path": "pages/deliver/deliver-goods",
+					"style": {
+						"navigationBarTitleText": "发货"
+					}
+				},{
+					"path": "pages/deliver/deliver-record",
+					"style": {
+						"navigationBarTitleText": "发货记录"
+					}
+				},{
+					"path": "pages/deliver/logistics-list",
+					"style": {
+						"navigationBarTitleText": "物流公司"
+					}
+				}
+			]	
+		}	
 	],
 	"tabBar": {
 		"height":"80",

supplier/pages/deliver/add-logistics.vue

@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

supplier/pages/deliver/deliver-goods.vue

@@ -0,0 +1,601 @@
+<template>
+	<view class="container cart clearfix"> 	
+		<view class="container-cart-main">
+			<view class="container-cart">
+				<view class="cart-content" :style="{paddingBottom :isIphoneX ? '130rpx' : '100rpx'}">
+					<view class="goods-list">
+						<view 	class="goods-pros" v-for="(pros,idx) in productsList" :key="idx"  @click.stop="ischeck(pros)" >
+							<view class="goods-pros-t">
+								<!--选择商品-->
+								<view class="checkbox-box">
+									<button class="checkbox iconfont" :class="[pros.checked ?'icon-gouxuanl':'icon-weigouxuan']"></button>
+								</view>
+								<view class="pros-img"><image :src="pros.mainImage ? pros.mainImage:''" alt="" /></view>
+								<view class="pros-product">
+									<view class="producttitle">{{pros.name}}</view>
+									<view class="productspec">规格:{{pros.productUnit ? pros.productUnit : ''}}</view>
+									<view class="productspec">商品编码:{{pros.productCode ? pros.productCode : ''}}</view>
+									<view class="product-view">
+										<view class="view-num">数量：{{pros.num}}</view>
+									</view>
+									<view class="product-view">
+										<view class="view-num">已发货：{{pros.taxRate}}</view>
+										<view class="view-num">未发货：{{pros.discount == null ? '0' : pros.discount}}</view>
+									</view>
+									<view class="product-view">
+										<view class="view-num">已退货：{{pros.discountPrice}}</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.validFlag == '3'?'disabled':'']" @click="changeCountSub(item,pros)"></view>
+											<input class="btn-input" type="number" maxlength='4' v-model="pros.productCount" @blur="changeNnmber($event,item,pros)">
+											<view  class="iconfont icon-jiahao"  :class="[pros.validFlag == '3'?'disabled':'']" @click="changeCountAdd(item,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="toConfirmation">去发货</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+<script>
+	import authorize from '@/common/config/authorize.js'
+	import { mapState,mapMutations } from 'vuex';
+	import { queryShoppingCartList,shoppingCartUpdate,shoppingCartDelete } from "@/api/cart.js" 
+	
+	export default{
+		data(){
+			return{
+				CustomBar:this.CustomBar,// 顶部导航栏高度
+				isIphoneX:this.$store.state.isIphoneX,
+				userID:'',
+				alertType:'',
+				isStock:'',
+				productsList:[
+					{
+						mainImage:'https://img14.360buyimg.com/n7/jfs/t1/114670/38/7458/171560/5ec3b80fE5c5f15f9/549ceeeca82f0d02.jpg',
+						name:'华西生物奥斯卡等级阿奥术大师大所打撒大啊萨达时代萨德',
+						productUnit:'盒',
+						productCode:'FXSW2131231231',
+						num:20,
+						taxRate:5,
+						discount:5,
+						discountPrice:3,
+						price:'200.00',
+						checked:false
+					},{
+						mainImage:'https://img14.360buyimg.com/n7/jfs/t1/114670/38/7458/171560/5ec3b80fE5c5f15f9/549ceeeca82f0d02.jpg',
+						name:'华西生物奥斯卡等级阿奥术大师大所打撒大啊萨达时代萨德',
+						productUnit:'盒',
+						productCode:'FXSW2131231231',
+						num:20,
+						taxRate:5,
+						discount:5,
+						discountPrice:3,
+						price:'200.00',
+						checked:false
+					}
+				],	//购物车的商品
+				setGoodData:'', //确认订单的商品
+				isCheckAll:false,//是否全选
+				isModallayer:false,
+				isDisabled: false, // 供应商/店铺全选是否禁用状态
+				isNoConfim:false,
+			}
+		},
+		onLoad(option){
+			console.log(option)
+			// this.initGetCartGoodsList();
+		},
+		computed: {
+			...mapState(['hasLogin','userInfo'])
+		},
+		methods:{
+			initGetCartGoodsList(){//初始化购物车 index:1
+				let params = {userID:this.userID}
+				queryShoppingCartList(params).then(response =>{
+					this.$store.commit('updateAllNum',response.data.cartQuantity)
+					const responseData = response.data
+					if(responseData.pageDate && responseData.pageDate.length > 0 ){
+						this.productsList = responseData.pageDate;
+						this.productsList.forEach((item,index) => {
+							let productsListLength = item.productsList.length,
+								invalidLength = 0;
+							item.productsList.forEach(pros => {
+								pros.shopID = item.shopID;
+								if(pros.validFlag == '3' ) {invalidLength++;}
+							})
+							item.isDisabled = invalidLength === productsListLength;
+						})
+					} else {
+						this.productsList = [];
+					}
+				}).catch(error =>{
+					this.$util.msg(error.msg,2000);
+				})
+			},		
+			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.lengt;
+			},
+			updateBothCheckBtn() {
+				this.productsList.forEach((item)=>{
+					item.checked = this.isCheckAll ;
+				})
+			},
+			checkAll(){//全选方法内调用方法
+			    this.isCheckAll = !this.isCheckAll;
+				this.updateBothCheckBtn();     
+			},
+			changeCountAdd(item,pros){//商品数量加加
+				if(pros.productCount>=pros.stock){
+					pros.productCount= pros.stock
+					this.isStock =true
+					return
+				}else{
+					pros.productCount++
+					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{
+					pros.productCount--
+				}
+				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{
+					pros.productCount = e.detail.value
+				}
+				this.updateShoppogNum(pros)
+				this.totalShopPeice();
+			},
+			updateShoppogNum(pros){//加减购物车商品更新到后台
+				let params ={userID:this.userID,productID:pros.productID,productCount:pros.productCount}
+				shoppingCartUpdate(params).then(response =>{
+					this.isshowDelbtn = false;
+					this.initGetCartGoodsList();
+				}).catch(error =>{
+					this.$util.msg(error.msg,2000);
+				})
+			 },
+			toConfirmation(){//跳转确认订单页面
+				let setGoodsList=[];
+				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{
+					this.isNoConfim = false
+					this.goodsList.forEach(el=>{
+						el.productsList.forEach(pros=>{
+							if(pros.productsChecked){
+							   if(pros.productCount<pros.minBuyNumber){
+								   this.isNoConfim = true
+							   }
+							}
+						})
+					})
+					if(this.isNoConfim){
+						this.$util.modal('','有商品的购买量没达到最小起订量，请修改数量后再次提交结算','去修改','',false,() =>{})
+						return;
+					}else{
+						let productID = '';
+						this.goodsList.forEach(el=>{//获取勾选的商品ID拼接字符串逗号隔开，最后一个逗号去掉
+							el.productsList.forEach(pros=>{
+								if(pros.productsChecked){
+								   productID += pros.productID+','
+								}
+							})
+						})
+						let cartPramsData={
+								allPrice:this.allPrice,
+								allCount:this.allCount,
+								productID:productID.substring(0,productID.lastIndexOf(',')),
+								productCount:''
+						    }
+						this.$api.navigateTo(`/pages/user/order/create-order?data=${JSON.stringify({data:cartPramsData})}`)
+					}
+				}
+			},
+		},
+		onPullDownRefresh() {//下拉刷新
+			// this.initGetCartGoodsList()
+			// uni.stopPullDownRefresh()
+		},
+		onShow(){
+			
+		},
+	}
+</script>
+
+<style lang="scss">
+	page{
+		background: #f7f7f7;
+		height: auto;
+	}
+	.cart-content{
+		position: relative;
+		margin-top: 24rpx;
+	}
+	.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;
+		border-top: 1px solid #F7F7F7;
+		.goods-item{
+			width: 702rpx;
+			padding: 0 24rpx;
+			background: #FFFFFF;
+			margin-bottom: 24rpx;
+		}
+		.shoptitle{
+			display: flex;
+			align-items: center;
+			height: 80rpx;
+			// border-bottom: 1px solid #EBEBEB;
+			line-height: 80rpx;
+			.checkbox-box{
+				padding: 10rpx;
+			}
+			.text{
+				margin-left: 37rpx;
+				font-size: $font-size-28;
+				color: $text-color;
+				text-align: left;
+				font-weight: bold;
+			}
+		}
+		.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 20rpx;
+							color: $text-color;
+							text-align: center;
+							line-height: 48rpx;
+							font-weight: bold;
+						}
+						.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: 490rpx;
+			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: 100%;
+			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;
+			&.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);
+				}
+			}
+		}
+	}
+</style>

supplier/pages/deliver/deliver-record.vue

@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

supplier/pages/deliver/logistics-list.vue

@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

supplier/pages/login/bind-operator.vue

@@ -0,0 +1,369 @@
+<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 { bindingWechat } from "@/api/use.js"
+	import { getImageCode, getbindWechatCode } from "@/api/utils.js"
+	export default{
+		data() {
+			return{
+				userID:'',
+				bindMobile:'',
+				bindLinkName:'',  		//供应商联系人姓名
+				bindLinkPhone:'',  		//用户手机号
+				mobildeCode:'',  		//手机验证码
+				imageCode:'',			//图形验证码
+				imageCodeUrl:'',		//图形验证码地址
+				imageCodetoken:'',		//图形校验token
+				isMobileDisabled:false, //获取手机短信按钮
+				count: '',				//倒计时
+				mobileCodeText: '获取验证码',
+				codeTime: null,
+			}
+		},
+		onLoad(option) {
+			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(){//图形验证
+				getImageCode().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 = {
+						mobile:this.bindLinkPhone,
+						mobileOrEmail:this.bindMobile,
+						platformType:2,
+						imgCode:this.imageCode,
+						token:this.imageCodetoken,
+				}
+				this.isMobileDisabled = true;
+				getbindWechatCode(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.userID,
+								mobile:this.bindLinkPhone,
+								linkName:this.bindLinkName,
+								verificationCode:this.mobildeCode,
+								nickName:res.userInfo.nickName,
+								headimgurl:res.userInfo.avatarUrl,
+						}
+						// console.log(params)
+						bindingWechat(params).then(response =>{
+							this.$api.switchTabTo('/pages/tabBar/user/user')
+						}).catch(error =>{
+							this.$util.msg(error.msg,2000)
+						})							
+					}
+				})
+			},
+			//关闭未授权用户授权提示弹窗
+			hideModel(){
+				this.isUserInfo = false;
+			}
+		},
+		onShow() {
+			this.$api.getStorage().then((resolve) => {
+				this.userID = resolve.userID
+				this.bindMobile = resolve.bindMobile
+			})
+		}
+	}
+</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-login.vue

@@ -0,0 +1,172 @@
+<template>
+	<view class="container login">
+		<view class="login-main">
+			<image class="logo" src="@/static/login-logo@3x.png" mode=""></image>
+			<text class="logo-text">生美/医美采购服务平台</text>
+		</view>
+		<view class="login-input">
+			<input type="number" 
+				   v-model="invitationCode"  
+				   maxlength="6" 
+				   class="input" 
+				   placeholder="请输入邀请码"
+			/>
+		</view>
+		<view class="login-btn"  @click.stop="goLogin">查看订单</view>
+	</view>
+</template>
+<script>
+	import authorize from '@/common/config/authorize.js' 
+	import { orderShareCode } from "@/api/order.js" 
+	export default{
+		data() {
+			return{
+				invitationCode:'',
+				imagePath:'https://img.caimei365.com/group1/M00/03/83/Cmis214FbbCAQhKoAAKWfqqSIds292.png',
+				shareCode:'',  		//获取用户登录的邀请码
+				isUserInfo:false,	//控制显示授权弹窗
+				nickName:'',		//存储用户名
+				userInfo:'',		//存储微信用户授权信息
+				orderID:0,			//订单ID
+				userID:0			,//分享人的用户ID
+				isShareStatus:false,
+				serviceProviderId:''
+			}
+		},
+		onLoad(e) {
+			console.log(e)
+			this.orderID = e.orderID
+			this.userID = e.userID
+			if(e.serviceProviderId){
+				this.serviceProviderId = e.serviceProviderId
+			}
+		},
+		methods:{
+			initQueryUser(){
+				authorize.getCode('weixin').then(wechatcode =>{
+					let params ={
+							code:wechatcode,
+							orderID:this.orderID,
+							userID:this.userID,
+							shareCode:this.shareCode,
+							serviceProviderId:this.serviceProviderId
+						}
+					orderShareCode(params).then(response =>{
+						if(response.code === 2){
+							this.$api.navigateTo(`/seller/pages/order/order-details?type=share&orderID=${this.orderID}`)
+						}else if(response.code === 0) {
+							if(response.data == true){//同为会所运营人员查看订单详情
+								this.$api.navigateTo(`/pages/user/order/order-details?type=share&orderID=${this.orderID}`)
+							}else{//游客第二次查看订单详情
+								this.$api.redirectTo(`/pages/user/order/order-sharedetails?orderID=${this.orderID}`)
+							}
+						}else if(response.code === -2){
+							this.$util.modal('提示',response.msg,'确定','',false,() =>{})
+						}else{
+							this.isShareStatus = true
+						}
+					})
+				})
+			},
+			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 =>{
+					let params ={
+							code:wechatcode,
+							orderID:this.orderID,
+							userID:this.userID,
+							shareCode:this.shareCode
+						}
+					orderShareCode(params).then(response =>{
+						if (response.code === 0) {//游客第一次查看订单详情
+							this.$api.redirectTo('/pages/user/order/order-sharedetails?orderID='+this.orderID)
+						}else{
+							this.$util.msg(response.msg,2000);
+						}
+					})
+				})
+			},
+		},
+		onShow() {
+			this.initQueryUser()
+		}
+	}
+</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

@@ -0,0 +1,462 @@
+<template>
+	<view class="container details clearfix" :style="{paddingBottom :isIphoneX ? (130+68)+'rpx' : '130rpx'}">
+		<cu-custom :navbar-data='nvabarData'></cu-custom>
+		<view class="container-details" :style="{paddingTop:CustomBar+'px'}">
+			<!-- 订单信息 -->
+			<view class="information-content">
+				<view class="info-item"><view class="item-view"><text class="label">供应商：广州优斐斯生物科技有限公司</text></view></view>
+				<view class="info-item"><view class="item-view"><text class="label">订单号：W159013087369197</text></view></view>
+				<view class="info-item"><view class="item-view"><text class="label">下单时间：2019-11-11 16:17:08</text></view></view>
+				<view class="info-item">
+					<view class="item-view"><text class="label">收款状态：<text :style="{color:setStatusText(1)}">已收款</text></text></view>
+					<view class="item-view"><text class="label">结算状态：<text :style="{color:setStatusText(2)}">部分结算</text></text></view>
+				</view>
+				<view class="info-item">
+					<view class="item-view"><text class="label">发货状态：<text :style="{color:setStatusText(3)}">待发货</text></text></view>
+				</view>
+			</view>
+			<!-- 地址信息 -->
+			<view class="address-content">
+				<view class="info-item"><text class="label">收货人：张能</text></view>
+				<view class="info-item"><text class="label">联系方式：18823666651</text></view>
+				<view class="info-item"><text class="label">收货地址：<text style="color: #666666;">安徽省蚌埠市蚌山区淮河路东海大瀚林银海大道瀚林银座小区B栋404</text></text></view>
+			</view>
+			<!-- 商品 -->
+			<view class="goods-list">
+				<view class="goods-item clearfix">
+					<view class="productlist" v-for="(pros,idx) in shopOrderData.orderProductList" :key="idx">
+						<view class="goods-pros-t" @click="hanldOperationConfim(pros)">
+							<view class="pros-left">
+								<view class="pros-img"><image :src="pros.productImage" alt="" /></view>
+							</view>
+							<view class="pros-product">
+								<view class="producttitle">{{pros.name}}</view>
+								<view class="productspec">规格：{{pros.productUnit ? pros.productUnit : ''}}</view>
+								<view class="productspec">商品编码：{{pros.productCode ? pros.productCode : ''}}</view>
+								<view class="product-view">
+									<view class="view-num">数量：{{pros.num}}</view>
+								</view>
+								<view class="product-view">
+									<view class="view-num">已发货：{{pros.taxRate}}</view>
+									<view class="view-num">未发货：{{pros.discount == null ? '0' : pros.discount}}</view>
+								</view>
+								<view class="product-view">
+									<view class="view-num">已退货：{{pros.discountPrice}}</view>
+								</view>
+							</view>	
+						</view>
+					</view>	
+					<view class="goods-pros-m" v-if="shopOrderData.note!=''">
+						<view class="m-text">留言:</view>
+						<view class="m-input">
+							<view class="text">{{shopOrderData.note ? shopOrderData.note : ''}}</view>
+						</view>	
+					</view>
+					<view class="goods-pros-b">
+						<view class="count">共{{shopOrderData.itemCount}}件商品(含赠品{{shopOrderData.zeng}}件</view>
+					</view>
+				</view>
+			</view>	
+			<!-- 底部button -->
+			<order-button ref="orderButton" 
+						  v-if= "isRequest" 
+						  :status= "btnStatus" 
+						  :shareCode= "shareCode"
+						   @buttonConfirm="handButtonConfirm">
+			</order-button>
+		</view>
+		<share-alert  :orderID="orderID" 
+					  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/shareAlert.vue'			 //分享弹窗
+	import { queryOrderDetails,cancelOrder,deleteOrder,confirmReceipt,affirmOrder } from "@/api/order.js" 
+	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
+				},
+				isIphoneX:this.$store.state.isIphoneX,
+				CustomBar:this.CustomBar,// 顶部导航栏高度
+				state:0,
+				userID:'',
+				orderID:'',
+				shareCode:'',				//分享码
+				payStatus:0,
+				btnStatus:0,				//按钮组件状态
+				isRequest:true,			//是否加载完成渲染子组件
+				isOrderShare:false,
+				isShareModal:false,
+				addressData:{},				//地址信息初始化
+				information:{},				//订单信息初始化
+				shopOrderData:{
+					note:'奥斯卡就打开是件大事的空间啊奥斯卡就打开是件大事的空间啊奥斯卡就打开是件大事的空间啊奥斯卡就打开是件大事的空间啊d',
+					itemCount:9,
+					zeng:2,
+					orderProductList:[
+						{
+							productImage:'https://img14.360buyimg.com/n7/jfs/t1/114670/38/7458/171560/5ec3b80fE5c5f15f9/549ceeeca82f0d02.jpg',
+							name:'华西生物奥斯卡等级阿奥术大师大所打撒大啊萨达时代萨德',
+							productUnit:'盒',
+							productCode:'FXSW2131231231',
+							num:20,
+							taxRate:5,
+							discount:5,
+							discountPrice:3,
+							price:'200.00'
+						}
+					]
+				},//商品信息初始化
+			}
+		},
+		onLoad(){
+			// this.initOrderDetaileData()
+		},
+		methods: {
+			initOrderDetaileData(){//初始化页面数据@参数：订单ID
+				queryOrderDetails({ orderID : this.orderID }).then(response =>{
+					let resData = response.data;
+					this.isRequest = true
+					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
+				}).catch(error =>{
+					this.$util.modal('提示','订单查询失败，请稍后重试~','确定','',false,() =>{
+						this.$api.switchTabTo('/pages/tabBar/home/home')
+					})
+				})
+			},
+			handButtonConfirm(data){//监听点击时间的按钮类型并执行...
+				this.handShowAlert(data)
+			},
+			handShowAlert(type){//判断点击的按钮类型并执行...
+				switch(type){
+					case 'record':
+						this.$api.navigateTo('/supplier/pages/deliver/deliver-record?orderID='+this.orderID)
+						break
+					case 'deliver':
+						this.$api.navigateTo('/supplier/pages/deliver/deliver-goods?orderID='+this.orderID)
+						break
+				}
+			},
+			setStatusText(status){
+				let textColor='';
+				switch(status){
+					case 1:
+						textColor = '#FF2A2A'
+						break;
+					case 2:
+						textColor = '#E15616'
+						break;
+					case 3:
+						textColor = '#38CB3D'
+						break;
+				}
+				return textColor
+			},
+			onShareCode(){
+				this.isShareModal = true
+			},
+			onShareAppMessage(res){//分享转发
+				this.isShareModal = false
+				if (res.from === 'button') {
+					// 来自页面内转发按钮
+			    }
+				return {
+					title: '您有新的分享订单，快来查看吧~',
+					path: `/pages/user/order/orderShareLogin?orderID=${this.orderID}&userID=${this.userID}`,
+					imageUrl:'https://img.caimei365.com/group1/M00/03/95/Cmis216Sk_SABnOFABZCgCzFV_g063.png'
+				}
+			}
+		},
+		onShow() {
+
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		height: auto;
+		background:#F7F7F7;
+	}
+	.details{
+		padding-bottom: 130rpx;
+	}
+	.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;
+		.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-service-details.vue

@@ -0,0 +1,560 @@
+<template>
+	<view class="container details clearfix" :style="{paddingBottom :isIphoneX ? (130+68)+'rpx' : '130rpx'}">
+		<cu-custom :navbar-data='nvabarData'></cu-custom>
+		<view class="container-details" :style="{paddingTop:CustomBar+'px'}">
+			<!-- 订单信息 -->
+			<view class="information-content">
+				<view class="info-item"><view class="item-view"><text class="label">供应商：广州优斐斯生物科技有限公司</text></view></view>
+				<view class="info-item"><view class="item-view"><text class="label">订单号：W159013087369197</text></view></view>
+				<view class="info-item"><view class="item-view"><text class="label">下单时间：2019-11-11 16:17:08</text></view></view>
+				<view class="info-item">
+					<view class="item-view"><text class="label">收款状态：<text :style="{color:setStatusText(1)}">已收款</text></text></view>
+					<view class="item-view"><text class="label">结算状态：<text :style="{color:setStatusText(2)}">部分结算</text></text></view>
+				</view>
+				<view class="info-item">
+					<view class="item-view"><text class="label">发货状态：<text :style="{color:setStatusText(3)}">待发货</text></text></view>
+				</view>
+			</view>
+			<!-- 地址信息 -->
+			<view class="address-content">
+				<view class="info-item"><text class="label">收货人：张能</text></view>
+				<view class="info-item"><text class="label">联系方式：18823666651</text></view>
+				<view class="info-item"><text class="label">收货地址：<text style="color: #666666;">安徽省蚌埠市蚌山区淮河路东海大瀚林银海大道瀚林银座小区B栋404</text></text></view>
+			</view>
+			<!-- 商品 -->
+			<view class="goods-list">
+				<view class="goods-item clearfix">
+					<view class="productlist" v-for="(pros,idx) in shopOrderData.orderProductList" :key="idx">
+						<view class="goods-pros-t" @click="hanldOperationConfim(pros)">
+							<view class="pros-left">
+								<view class="pros-img"><image :src="pros.productImage" alt="" /></view>
+							</view>
+							<view class="pros-product">
+								<view class="producttitle">{{pros.name}}</view>
+								<view class="productspec">规格：{{pros.productUnit ? pros.productUnit : ''}}</view>
+								<view class="productspec">商品编码：{{pros.productCode ? pros.productCode : ''}}</view>
+								<view class="product-view">
+									<view class="view-num">数量：{{pros.num}}</view>
+								</view>
+								<view class="product-view">
+									<view class="view-num">已发货：{{pros.taxRate}}</view>
+									<view class="view-num">未发货：{{pros.discount == null ? '0' : pros.discount}}</view>
+								</view>
+								<view class="product-view">
+									<view class="view-num">已退货：{{pros.discountPrice}}</view>
+								</view>
+								<text class="iconfont icon-genghuan"></text>
+							</view>	
+						</view>
+					</view>	
+					<view class="goods-pros-m" v-if="shopOrderData.note!=''">
+						<view class="m-text">留言:</view>
+						<view class="m-input">
+							<view class="text">{{shopOrderData.note ? shopOrderData.note : ''}}</view>
+						</view>	
+					</view>
+					<view class="goods-pros-b">
+						<view class="count">共{{shopOrderData.itemCount}}件商品</view>
+					</view>
+				</view>
+			</view>	
+			<!-- 底部按钮 -->
+			<view class="button-template" :style="{paddingBottom :isIphoneX ? '68rpx' : '0rpx'}">
+				<view class="button-content">
+					<view class="btn btn-color" @click.stop="onShareCode">
+						<view class="tips" v-if="shareCode">分享码：{{shareCode}}</view>分享订单
+					</view>	
+				</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">售价:<text style="color: #666;">￥{{handleData.price}}</text></view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<share-alert  :orderID="orderID" 
+					  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/orderButton'			 //底部按钮
+	import shareAlert from '@/components/cm-module/modelAlert/shareAlert.vue'			 //分享弹窗
+	import { queryOrderDetails,cancelOrder,deleteOrder,confirmReceipt,affirmOrder } from "@/api/order.js" 
+	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
+				},
+				isIphoneX:this.$store.state.isIphoneX,
+				CustomBar:this.CustomBar,// 顶部导航栏高度
+				specClass: '',//规格弹窗css类，控制开关动画
+				handleData:{},
+				state:0,
+				userID:'',
+				orderID:'',
+				shareCode:'',				//分享码
+				payStatus:0,
+				btnStatus:0,				//按钮组件状态
+				isRequest:false,			//是否加载完成渲染子组件
+				isOrderShare:false,
+				isShareModal:false,
+				addressData:{},				//地址信息初始化
+				information:{},				//订单信息初始化
+				shopOrderData:{
+					note:'奥斯卡就打开是件大事的空间啊奥斯卡就打开是件大事的空间啊奥斯卡就打开是件大事的空间啊奥斯卡就打开是件大事的空间啊d',
+					itemCount:9,
+					orderProductList:[
+						{
+							productImage:'https://img14.360buyimg.com/n7/jfs/t1/114670/38/7458/171560/5ec3b80fE5c5f15f9/549ceeeca82f0d02.jpg',
+							name:'华西生物奥斯卡等级阿奥术大师大所打撒大啊萨达时代萨德',
+							productUnit:'盒',
+							productCode:'FXSW2131231231',
+							num:20,
+							taxRate:5,
+							discount:5,
+							discountPrice:3,
+							price:'200.00'
+						}
+					]
+				},//商品信息初始化
+			}
+		},
+		onLoad(){
+			// this.initOrderDetaileData()
+		},
+		methods: {
+			initOrderDetaileData(){//初始化页面数据@参数：订单ID
+				queryOrderDetails({ orderID : this.orderID }).then(response =>{
+					let resData = response.data;
+					this.isRequest = true
+					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
+				}).catch(error =>{
+					this.$util.modal('提示','订单查询失败，请稍后重试~','确定','',false,() =>{
+						this.$api.switchTabTo('/pages/tabBar/home/home')
+					})
+				})
+			},
+			handButtonConfirm(data){//监听点击时间的按钮类型并执行...
+				this.handShowAlert(data)
+			},
+			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
+			},
+			hideSpec() {//关闭选择数量确认弹窗
+				this.specClass = 'hide';
+				setTimeout(() => {
+					this.specClass = 'none';
+				}, 200);
+			},
+			onShareCode(){
+				this.isShareModal = true
+			},
+			onShareAppMessage(res){//分享转发
+				this.isShareModal = false
+				if (res.from === 'button') {
+					// 来自页面内转发按钮
+			    }
+				return {
+					title: '您有新的分享订单，快来查看吧~',
+					path: `/pages/user/order/orderShareLogin?orderID=${this.orderID}&userID=${this.userID}`,
+					imageUrl:'https://img.caimei365.com/group1/M00/03/95/Cmis216Sk_SABnOFABZCgCzFV_g063.png'
+				}
+			},
+			discard(){
+				//丢弃
+			}
+		},
+		onShow() {
+
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		height: auto;
+		background:#F7F7F7;
+	}
+	.details{
+		padding-bottom: 130rpx;
+	}
+	.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;
+		.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: 30rpx 30rpx 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;
+				}
+			}
+		}
+		
+		&.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>