供应商发货

common/config/config.js

@@ -4,8 +4,8 @@ if(process.env.NODE_ENV === 'development'){
 	// URL_CONFIG = 'http://192.168.1.24:8008'	 //俊俊联调地址
 	// URL_CONFIG = 'http://192.168.1.22:8008'	 //裴裴联调地址
 	// URL_CONFIG = 'http://192.168.1.26:8008'	 //超超联调地址
-    URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
-	// URL_CONFIG = 'https://spi.caimei365.com'
+    // URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
+	URL_CONFIG = 'https://spi.caimei365.com'
 }else{
     // 生产环境
     URL_CONFIG = 'https://spi.caimei365.com'

components/cm-module/listTemplate/buyagainList.vue

@@ -12,8 +12,8 @@
 						<view class="list-details-price">
 							<view class="list-shop">
 								<view class="list-price" >
-									<text class="price-view activity" v-if="item.isShowActFlg">活动价</text>
-									<text class="price-view ladder" v-if="item.ladderPriceFlag == 1">阶梯价</text>
+									<text class="price-view activity" v-if="item.isShowActFlg">活</text>
+									<text class="price-view ladder" v-if="item.ladderPriceFlag == 1">阶</text>
 									<text class="price-larger">￥{{item.retailPrice.toFixed(2)}}</text>
 								</view>
 								<view class="list-price-none" v-if="item.repurchasePriceState">
@@ -323,9 +323,9 @@
 				}
 				.price-view{
 					display: inline-block;
-					width: 78rpx;
-					border-radius: 18rpx;
-					font-size: $font-size-20;
+					width: 40rpx;
+					border-radius: 10rpx;
+					font-size: $font-size-22;
 					text-align: center;
 					color: #FFFFFF;
 					height: 36rpx;

components/cm-module/listTemplate/commodityList.vue

@@ -208,9 +208,9 @@
 								}
 							}
 						});
-						console.log(this.listData)
 					}
 					this.priceLoading = false;
+					this.showSkeleton = false;
 				}).catch(error =>{
 					this.$util.msg(error.msg,2000)
 				})

components/cm-module/listTemplate/immediatelyList.vue

@@ -31,7 +31,7 @@
 		<view class="product-container" v-else >
 			<view :class="tabIndex" v-if="tabIndex === 0"  :style="{paddingTop:searchStatus?'128rpx':''}">
 				<scroll-view :style="{'height':scrollHeight+'px'}" @scrolltolower="scrolltolower(tabIndex)" scroll-y v-if="listData.length > 0">
-					<view v-for="(item,index) in listData" :key="index" :id="item.id" class="all-type-list-content commodity-list" @click.stop="navToDetailPage(item.productID)"  >
+					<view v-for="(item,index) in listData" :key="index" :id="item.id" class="all-type-list-content commodity-list" @click.stop="navToDetailPage(item.pid)"  >
 					    <image mode='widthFix' :src="item.image"  class="list-img" alt="list-img"></image>
 						<view class="list-details-info">
 							<text class="list-details-title">{{isInterceptHtmlFn(item.name)}}</text>
@@ -44,8 +44,8 @@
 								<view v-if="priceLoading" class="list-price-loding">正在获取价格...</view>
 								<view v-else class="list-shop">
 									<view class="list-price">
-										<text class="price-view activity" v-if="item.isShowActFlg">活动价</text>
 										<text class="price-larger">￥{{item.price}}</text>
+										<text class="price-view activity" v-if="item.isShowActFlg">活</text>
 										<text class="price-view ladder" v-if="item.ladderPriceFlag == '1'" @click.stop="alertjieti(item)">阶</text>
 									</view>
 									<view class="list-price-none" v-if="item.repurchasePriceState">
@@ -65,8 +65,8 @@
 			</view>
 			<!-- 组合商品 -->
 			<view :class="tabIndex"  v-if="tabIndex === 1">
-				<scroll-view :style="{'height':scrollHeight+'px'}" @scrolltolower="scrolltolower(tabIndex)" scroll-y>
-					<view class="all-zuhe-list" v-for="(item,index) in combinationProduct" :key="index" :id="item.id" :style="{paddingTop:searchStatus?'112rpx':''}" >
+				<scroll-view :style="{'height':scrollHeight+'px',paddingTop:searchStatus?'112rpx':''}" @scrolltolower="scrolltolower(tabIndex)" scroll-y>
+					<view class="all-zuhe-list" v-for="(item,index) in combinationProduct" :key="index" :id="item.id">
 						<view class="zuhe_title" :class="index%2==0 ? 'active' : ''">{{item.name}}</view>
 						<view v-for="(pros,proIndex) in item.combinationProductList" :class="index%2==0 ? 'stylecontent' : ''" :key="proIndex" :id="pros.productID" class="zuhe-list-content commodity-list" >
 							<view class="list-details-info" >
@@ -160,7 +160,8 @@
 				priceLoading:true,
 				isShowEmpty: false,
 				isShowEmptyText: '搜索相关商品',
-				clubUserId: '',
+				clubUserId: '',
+				identity:'',
 				scrollHeight: '',
 				listData: [],
 				combinationProduct:[],
@@ -189,10 +190,18 @@
 			}
 		},
 		created() {
-			this.setScrollHeight();		
+			this.setScrollHeight();		
+			this.$api.getComStorage('userInfo').then((resolve) =>{
+				if(resolve.userIdentity = 1){
+					this.identity = 1
+				}
+			}).catch(error =>{
+				console.log(error)
+			})
 			this.$api.getComStorage('orderUserInfo').then((resolve) =>{
 				this.clubUserId = resolve.userID
-			})
+			})
+			this.getProductAgainInfo()
 		},
 		computed: {
 			...mapState(['hasLogin','userInfo'])
@@ -215,23 +224,22 @@
 				this.scrollHeight = windowHeight - 1;
 			},
 			getProductAgainInfo(loadMore) {
-				this.showLoading = true;
+				this.showLoading = true;
+				this.priceLoading = true;
 				this.loadingNow = true;
 				this.loadingText = '加载中';
 				this.isShowEmpty = false;				
 				if(loadMore) {this.pageNum += 1;}
-				let params = {keyword:this.searchInputVal,pageNum:this.pageNum,pageSize:this.pageSize,sortField:'',sortType:''}
+				let params = {identity:this.identity,keyword:this.searchInputVal,pageNum:this.pageNum,pageSize:this.pageSize,sortField:'',sortType:''}
 				queryNewSearchProduct(params).then(response =>{
 					this.isShowWrapper = true
 					const resData = JSON.parse(response.data);
-					console.log(resData)
 					const resList = resData.items;
 					if(resList && resList.length > 0){
 						this.totalPage = resData.total;
 						this.showEmpty = false;
 						if(loadMore) {
 							this.listData = [...this.listData,...resList];
-							console.log(this.listData)
 							this.setProductPrice()
 						} else {
 							this.listData = [...resList];
@@ -263,7 +271,6 @@
 				this.listData.map(item=>{
 					productIdArr.push(item.pid) 
 				})
-				console.log(productIdArr)
 				this.productIds = productIdArr.join(",");
 				querySearchProductPrice({userId: this.clubUserId,productIds:this.productIds}).then(response =>{
 					if (response.data) {
@@ -292,7 +299,6 @@
 								}
 							}
 						});
-						console.log(this.listData)
 					}
 					this.priceLoading = false;
 				}).catch(error =>{
@@ -451,11 +457,11 @@
 			changeTab(index){
 				this.tabIndex = index;
 				if(index == 0){
-					this.loadingNow = false
-					this.isShowEmpty = true;
-					this.isShowEmptyText ='暂无相关商品'
+					this.getProductAgainInfo()
+				}else{
+					this.getcombinationProduct()
 				}
-				this.$emit('changetab',index);
+				// this.$emit('changetab',index);
 			},
 			navToDetailPage(id) {
 				this.isModallayer = true;
@@ -815,7 +821,7 @@
 					display: inline-block;
 					width: 40rpx;
 					border-radius: 10rpx;
-					font-size: $font-size-24;
+					font-size: $font-size-22;
 					text-align: center;
 					color: #FFFFFF;
 					height: 36rpx;

components/cm-module/orderDetails/supplierRecorgButton.vue

@@ -0,0 +1,127 @@
+<template name="button">
+	<view class="button-template">
+		<!-- 底部按钮 -->
+		<view class="button-content">
+			<view class="btn btn-color" @click.stop="btnConfirm('cancel',orderID)">撤销发货</view>
+			<view class="btn btn-color" @click.stop="btnConfirm('add',orderID)">添加物流</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default{
+		name:"button",
+		props:{
+			orderID: {
+				type:Number
+			}
+		},
+		data() {
+			return{
+
+			}
+		},
+		created(){
+			
+		},
+		computed: {
+			
+		},
+		methods:{
+			btnConfirm(type,id){
+				let data = { type:type,orderId:id }
+				this.$emit('buttonConfirm',data)
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.button-template{
+		width: 100%;
+		height: auto;
+		float: left;
+		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;
+			}
+			.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>

seller/pages/cart/immediately.vue

@@ -265,7 +265,7 @@
 			},
 			getAddProductCart(){//增加购物车成功和toast弹窗提示成功
 				let params ={
-						productId:this.handleData.productID,
+						productId:this.handleData.pid,
 						clubId:this.clubID,
 						serviceProviderId:this.serviceProviderId,
 						num:this.number

services/common.service.js

@@ -6,11 +6,7 @@ export default class CommonService {
 		Object.assign(this, { AjaxService })
 		this.name = 'CommonService'
 	}
-	/* api公用定义 */
-	getQueryCategory (data = {}) {
-		return this.AjaxService.get({ url:'/product/classify', data, isLoading: true })
-	}
-	/* 首页banner */
+	/* 扫码后去快递信息 */
 	getExpressInformation (data = {}) {
 		return this.AjaxService.get({ url:'https://www.kuaidi100.com/autonumber/autoComNum', data, isLoading: false })
 	}

supplier/pages/deliver/deliver-goods.vue

@@ -321,22 +321,6 @@
 			background: #FFFFFF;
 			margin-bottom: 24rpx;
 		}
-		.shoptitle{
-			display: flex;
-			align-items: center;
-			height: 80rpx;
-			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;

supplier/pages/deliver/deliver-record.vue

@@ -1,60 +1,59 @@
 <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-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.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(pros)"></view>
-											<input class="btn-input" type="number" maxlength='4' v-model="pros.productCount" @blur="changeNnmber($event,pros)">
-											<view  class="iconfont icon-jiahao"  :class="[pros.validFlag == '3'?'disabled':'']" @click="changeCountAdd(pros)"></view>
-										</view>
-									</view>
-								</view>
-							</view>
+	<view class="container record clearfix"> 
+		<view class="record-content">
+			<view class="record-list clearfix"  v-for="(pros,index) in productsList" :key="index" >
+				<view class="record-top clearfix">
+					<view class="top-view">
+						<view class="top-viewlabel">发货时间:</view>
+						<view class="top-viewtext">2019-07-11 13:52:23</view>
+					</view>
+					<view class="top-view">
+						<view class="top-viewlabel">申通快递:</view>
+						<view class="top-viewtext">
+							<text v-for="(item,idx) in lgisList" :key="idx">{{item}}</text>
 						</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 class="goods-pros">
+					<view class="goods-pros-t">
+						<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 class="view-num">已退货：{{pros.discountPrice}}</view>
+							</view>
+						</view>	
+					</view>
+					<view class="goods-pros-b clearfix">
+						<view class="b-label">拍照备注</view>
+						<view class="b-photo">
+							<view class="b-imageView" v-for="(imgItem,imgIdx) in ramkesList" :key="imgIdx" >
+								<image :src="imgItem" mode="widthFix"  @click="previewImg(imgIdx)"></image>
+							</view>
 						</view>
 					</view>
-					<view class="footer-ri" >
-						<view class="btn" @tap="toConfirmDeliver">去发货</view>
+					<view class="goods-pros-b clearfix">
+						<view class="b-label">拍照备注</view>
+						<view class="b-photo">
+							<view class="text">{{pros.note ? pros.note : ''}}</view>
+						</view>
 					</view>
 				</view>
+				<!-- 底部button -->
+				<order-button ref="orderButton" 
+							  :orderID="item.id" 
+							  @buttonConfirm="handButtonConfirm">
+				</order-button>
 			</view>
 		</view>
 	</view>
@@ -62,9 +61,13 @@
 <script>
 	import authorize from '@/common/config/authorize.js'
 	import { mapState,mapMutations } from 'vuex';
+	import orderButton from '@/components/cm-module/orderDetails/supplierRecorgButton.vue'	//底部按钮
 	import { queryShoppingCartList,shoppingCartUpdate,shoppingCartDelete } from "@/api/cart.js" 
-	
+	var isPreviewImg;
 	export default{
+		components:{
+			orderButton
+		},
 		data(){
 			return{
 				CustomBar:this.CustomBar,// 顶部导航栏高度
@@ -72,6 +75,19 @@
 				userID:'',
 				alertType:'',
 				isStock:'',
+				lgisList:['ST465464646','SF656565656','YD12541545454'],
+				ramkesList:[
+					'https://img14.360buyimg.com/n7/jfs/t1/114670/38/7458/171560/5ec3b80fE5c5f15f9/549ceeeca82f0d02.jpg',
+					'https://img14.360buyimg.com/n7/jfs/t1/114670/38/7458/171560/5ec3b80fE5c5f15f9/549ceeeca82f0d02.jpg',
+					'https://img14.360buyimg.com/n7/jfs/t1/114670/38/7458/171560/5ec3b80fE5c5f15f9/549ceeeca82f0d02.jpg',
+					'https://img14.360buyimg.com/n7/jfs/t1/114670/38/7458/171560/5ec3b80fE5c5f15f9/549ceeeca82f0d02.jpg',
+					'https://img14.360buyimg.com/n7/jfs/t1/114670/38/7458/171560/5ec3b80fE5c5f15f9/549ceeeca82f0d02.jpg',
+					'https://img14.360buyimg.com/n7/jfs/t1/114670/38/7458/171560/5ec3b80fE5c5f15f9/549ceeeca82f0d02.jpg',
+					'https://img14.360buyimg.com/n7/jfs/t1/114670/38/7458/171560/5ec3b80fE5c5f15f9/549ceeeca82f0d02.jpg',
+					'https://img14.360buyimg.com/n7/jfs/t1/114670/38/7458/171560/5ec3b80fE5c5f15f9/549ceeeca82f0d02.jpg',
+					'https://img14.360buyimg.com/n7/jfs/t1/114670/38/7458/171560/5ec3b80fE5c5f15f9/549ceeeca82f0d02.jpg',
+					'https://img14.360buyimg.com/n7/jfs/t1/114670/38/7458/171560/5ec3b80fE5c5f15f9/549ceeeca82f0d02.jpg'
+				],
 				productsList:[
 					{
 						mainImage:'https://img14.360buyimg.com/n7/jfs/t1/114670/38/7458/171560/5ec3b80fE5c5f15f9/549ceeeca82f0d02.jpg',
@@ -79,24 +95,28 @@
 						productUnit:'盒',
 						productCode:'FXSW2131231231',
 						num:20,
+						id:233,
 						taxRate:5,
 						discount:5,
 						discountPrice:3,
 						productCount:6,
 						price:'200.00',
-						checked:false
+						checked:false,
+						note:'华西生物奥斯卡等级阿奥术大师大所打撒大啊萨达时代萨德华西生物奥斯卡等级阿奥术大师大所打撒大啊萨达时代萨德'
 					},{
 						mainImage:'https://img14.360buyimg.com/n7/jfs/t1/114670/38/7458/171560/5ec3b80fE5c5f15f9/549ceeeca82f0d02.jpg',
 						name:'华西生物奥斯卡等级阿奥术大师大所打撒大啊萨达时代萨德',
 						productUnit:'盒',
 						productCode:'FXSW2131231231',
 						num:20,
+						id:255,
 						taxRate:5,
 						discount:5,
 						productCount:6,
 						discountPrice:3,
 						price:'200.00',
-						checked:false
+						checked:false,
+						note:'华西生物奥斯卡等级阿奥术大师大所打撒大啊萨达时代萨德华西生物奥斯卡等级阿奥术大师大所打撒大啊萨达时代萨德'
 					}
 				],	//购物车的商品
 				setGoodData:'', //确认订单的商品
@@ -136,120 +156,38 @@
 				}).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++; }
+			},	
+			previewImg (index) {//顶部商品图片预览
+				isPreviewImg = true
+				let previewUrls = this.ramkesList
+				uni.previewImage({
+					current: index, 	//图片索引
+					urls: previewUrls, //必须是http图片，本地图片无效
+					longPressActions:''
 				})
-				this.isCheckAll = goodsCheckedLength === productsList.length;
-			},
-			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();
+			handButtonConfirm(data){//监听点击时间的按钮类型并执行...
+				this.handShowAlert(data)
 			},
-			changeNnmber(e,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
+			handShowAlert(data){//判断点击的按钮类型并执行...
+				switch(data.type){
+					case 'cancel':
+						this.handCenceConfirm()
+						break
+					case 'add':
+						this.$api.navigateTo('/supplier/pages/deliver/add-logistics?orderID='+this.orderID)
+						break
 				}
-				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);
-				})
-			 },
-			toConfirmDeliver(){//添加物流页面
-				this.$api.navigateTo(`/supplier/pages/deliver/add-logistics`)
-				return
-				let setGoodsList=[];
-				this.goodsList.forEach(res=>{
-					let products = res.productsList
-					products.forEach(pros=>{
-						if(pros.productsChecked){
-						    setGoodsList.push(pros.productID)
-						}
+			handCenceConfirm(){//取消订单
+				this.$util.modal('提示','确定要撤销本次发货吗？撤销后需重新发货','确定','取消',true,() =>{
+					cancelOrder({orderID:this.orderID}).then(response =>{
+						this.$util.msg(response.msg,2000,true,'success');
+						this.initOrderDetaileData()
+					}).catch(error =>{
+						this.$util.msg(error.msg,2000)
 					})
 				})
-				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() {//下拉刷新
@@ -267,299 +205,176 @@
 		background: #f7f7f7;
 		height: auto;
 	}
-	.cart-content{
+	.record-content{
 		position: relative;
+		border-top: 1px solid #EBEBEB;
 	}
-	.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{
+	.record-list{
 		width: 100%;
 		height: auto;
 		background-color: #F7F7F7;
-		margin-top: 24rpx;
-		.goods-item{
+		margin-bottom: 24rpx;
+		.record-top{
 			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{
-				margin-left: 37rpx;
+			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: $text-color;
-				text-align: left;
-				font-weight: bold;
+				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;
-			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;
+				margin-left: 0;
 				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;
+			.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;
 				}
-				.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;
-						}
+				.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;
 					}
 				}
 			}
 		}
-		.pros-product{
-			width: 402rpx;
-			height: 100%;
-			line-height: 36rpx;
-			font-size: $font-size-28;	
+		.goods-pros-b{
+			width:100%;
+			height: auto;
+			padding: 10rpx 0;
+			border-top: 1px solid #F7F7F7;
+			border-bottom: 1px solid #F7F7F7;
 			position: relative;
-			.producttitle{
+			.b-label{
 				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;
+				line-height: 70rpx;
+				font-size: $font-size-28;
+				color: $text-color;
 			}
-			.product-view{
+			.b-photo{
 				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;
+				padding: 10rpx 0;
+				.b-imageView{
+					width: 112rpx;
+					height: 112rpx;
+					margin: 0 20rpx 20rpx 0;
+					float: left;
+					image{
+						width: 112rpx;
+						height: 112rpx;
+						display: block;
+					}
 				}
 				.text{
-					width: 60rpx;
-					float: right;
+					line-height: 44rpx;
+					font-size: $font-size-28;
+					color: $text-color;
 				}
 			}
-			.foot-check-delbtn{
+			.goods-pros-m{
+				width: 100%;
+				height: auto;
+				line-height: 76rpx;
+				font-size: $font-size-26;
+				color: $text-color;
 				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;
+				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;
-					justify-content: center;
+					-webkit-box-align: center;
+					-webkit-align-items: center;
 					align-items: center;
-					line-height: 110rpx;
-					font-weight: bold;
-					&.none{
-						display: none;	
+					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;
 					}
 				}
 			}
-			.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;
-			}
 		}
+		
 	}
 </style>