Merge branch 'developerB' of git.caimei365.com:caimei-repository/caimei-applets-caimei into developerB

components/cm-module/modelAlert/supplierShareAlert.vue

@@ -6,7 +6,7 @@
 				<view class="text-content">
 					<view class="text-t">分享码</view>
 					<view class="text-c">{{shareCode}} <text class="clipboard" @click.stop="clipboard(shareCode)">复制</text></view>
-					<view class="text-h1">有效期为72小时。如果对方还么有绑定采美账号，需要输入该分享码才能查看本订单</view>
+					<view class="text-h1">有效期为72小时。如果对方还没有绑定采美账号，需要输入该分享码才能查看本订单</view>
 				</view>
 				<view class="text-btn">
 					<!-- #ifdef MP-WEIXIN -->

components/cm-module/orderDetails/orderInformation.vue

@@ -21,34 +21,34 @@
 				<view class="view-man"></view>
 			</view>
 			<template v-if="openShowflag">
-			<view class="information-view">
-				<view class="view-num time">下单时间：<label class="label">{{ orderData.orderTime =='undefined' ? '' : orderData.orderTime }}</label></view>
-				<!-- <view class="view-type">{{ orderData.status | TextFormat }}</view> -->
-			</view>
-			<view class="information-view same">
-				<view class="view-man">应付总额：<label class="red">￥{{ orderData.payableAmount =='undefined' ? '0.00' : orderData.payableAmount | NumFormat }}</label></view>
-			</view>
-			<view class="information-view">
-				<view class="view-num">余额抵扣：<label class="label">￥{{ orderData.balancePayFee =='undefined' ? '' : orderData.balancePayFee | NumFormat}}</label></view>
-			</view>
-			<view class="information-view same">
-				<view class="view-num" v-if="orderData.freePostFlag == '0'">运费：<label class="label">包邮</label></view>
-				<view class="view-num" v-if="orderData.freePostFlag == '-1'">运费：<label class="label">到付</label></view>
-				<view class="view-num" v-if="orderData.freePostFlag == '1'">运费：<label class="label">￥{{ orderData.freight | NumFormat}}</label></view>
-			</view>
-			<view class="information-view" v-show="orderData.promotionFullReduction>0">
-				<view class="view-man" >促销满减：<label class="label">￥{{ orderData.promotionFullReduction | NumFormat}}</label></view>
-			</view>
-			<view class="information-view same">
-				<view class="view-man">赠品总数：<label class="label">{{ orderData.presentCount + orderData.promotionalGiftsCount}}</label></view>
-			</view>
-			<view class="information-view">
-				<view class="view-num">经理折扣：<label class="label">￥{{ orderData.discountFee =='undefined' ? '' : orderData.discountFee | NumFormat}}</label></view>
-			</view>
-			<view class="information-view same">
-				<view class="view-num">已支付：<label class="red">￥{{ orderData.receiptAmount == null ? '0.00' : orderData.receiptAmount | NumFormat }}</label></view>
-				<view class="view-man"></text></view>
-			</view>
+				<view class="information-view">
+					<view class="view-num time">下单时间：<label class="label">{{ orderData.orderTime =='undefined' ? '' : orderData.orderTime }}</label></view>
+					<!-- <view class="view-type">{{ orderData.status | TextFormat }}</view> -->
+				</view>
+				<view class="information-view same">
+					<view class="view-man">应付总额：<label class="red">￥{{ orderData.payableAmount =='undefined' ? '0.00' : orderData.payableAmount | NumFormat }}</label></view>
+				</view>
+				<view class="information-view">
+					<view class="view-num">余额抵扣：<label class="label">￥{{ orderData.balancePayFee =='undefined' ? '' : orderData.balancePayFee | NumFormat}}</label></view>
+				</view>
+				<view class="information-view same">
+					<view class="view-num" v-if="orderData.freePostFlag == '0'">运费：<label class="label">包邮</label></view>
+					<view class="view-num" v-if="orderData.freePostFlag == '-1'">运费：<label class="label">到付</label></view>
+					<view class="view-num" v-if="orderData.freePostFlag == '1'">运费：<label class="label">￥{{ orderData.freight | NumFormat}}</label></view>
+				</view>
+				<view class="information-view" v-show="orderData.promotionFullReduction>0">
+					<view class="view-man" >促销满减：<label class="label">￥{{ orderData.promotionFullReduction | NumFormat}}</label></view>
+				</view>
+				<view class="information-view same">
+					<view class="view-man">赠品总数：<label class="label">{{ orderData.presentCount + orderData.promotionalGiftsCount}}</label></view>
+				</view>
+				<view class="information-view">
+					<view class="view-num">经理折扣：<label class="label">￥{{ orderData.discountFee =='undefined' ? '' : orderData.discountFee | NumFormat}}</label></view>
+				</view>
+				<view class="information-view same">
+					<view class="view-num">已支付：<label class="red">￥{{ orderData.receiptAmount == null ? '0.00' : orderData.receiptAmount | NumFormat }}</label></view>
+					<view class="view-man"></text></view>
+				</view>
 			</template>
 		 </view>
 		 <view class="openinfo" v-if="infoflag">

components/cm-module/orderDetails/supplierDetaileButton.vue

@@ -6,7 +6,7 @@
 			<view class="tips" v-if="shareCode">分享码：{{shareCode}}</view>
 			分享订单
 		</view>	
-		<view class="btn btn-cancel" @click.stop="btnConfirm('record')">发货记录</view>
+		<view class="btn btn-cancel" v-if="btnState.isRecord" @click.stop="btnConfirm('record')">发货记录</view>
 	</view>
 </template>
 
@@ -36,6 +36,7 @@
 				isIphoneX:this.$store.state.isIphoneX,
 				mapStateArr:[
 					{label:'isDeliver',val:[1,2],status: true},
+					{label:'isRecord',val:[3],status: true},
 				]
 			}
 		},
@@ -64,10 +65,8 @@
 			},
 			initStatus(){
 				let btnState= {
-						isQuery: false,
-						isDelete: false,
-						isCancel: false,
-						isConfirm: false,
+						isDeliver: false,
+						isRecord: false,
 					}
 				return 	btnState
 			},
@@ -123,9 +122,9 @@
 			background: #ff7a51;
 		}
 		.btn-cancel{
-			background:#FFE6DC;
-			color: #E15616;
-			border: 1px solid #E15616;
+			background:#FFFFFF;
+			color: #666666;
+			border: 1px solid #666666;
 			.tips{
 				width: 160rpx;
 				height: 34rpx;
@@ -170,8 +169,7 @@
 				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);
+				background:#E15616;
 				border-radius: 8rpx;
 				position: absolute;
 				color: #FFFFFF;
@@ -184,10 +182,10 @@
 					content: "";
 					width: 25rpx;
 					height: 25rpx;
-					background:linear-gradient(45deg,rgba(0,0,0,1) 0%,rgba(87,87,87,1) 100%);
+					background:#E15616;
 					position: absolute;
 					bottom: -8rpx;
-					right: 30rpx;
+					left: 30rpx;
 					z-index: -1;
 					transform:rotate(45deg);
 				}

components/cm-module/orderDetails/supplierListButton.vue

@@ -6,7 +6,7 @@
 			<view class="tips" v-if="shareCode">分享码：{{shareCode}}</view>
 			分享订单
 		</view>	
-		<view class="btn btn-cancel" @click.stop="btnConfirm('record',orderInfo)">发货记录</view>
+		<view class="btn btn-cancel" v-if="btnState.isRecord" @click.stop="btnConfirm('record',orderInfo)">发货记录</view>
 	</view>
 </template>
 
@@ -39,10 +39,12 @@
 				isIphoneX:this.$store.state.isIphoneX,
 				mapStateArr:[
 					{label:'isDeliver',val:[1,2],status: true},
+					{label:'isRecord',val:[3],status: true},
 				]
 			}
 		},
 		created(){
+			console.log(this.status)
 			this.initData(this.status)
 		},
 		computed: {
@@ -60,17 +62,15 @@
 					el.val.forEach(value => {
 						if(resVal === value){
 							this.btnState[el.label] = el.status
-							//console.log(this.btnState[el.label]);
+							console.log(this.btnState[el.label]);
 						}
 					})
 				})
 			},
 			initStatus(){
 				let btnState= {
-						isQuery: false,
-						isDelete: false,
-						isCancel: false,
-						isConfirm: false,
+						isDeliver: false,
+						isRecord: false,
 					}
 				return 	btnState
 			},
@@ -129,9 +129,9 @@
 			background: #ff7a51;
 		}
 		.btn-cancel{
-			background:#FFE6DC;
-			color: #E15616;
-			border: 1px solid #E15616;
+			background:#FFFFFF;
+			color: #666666;
+			border: 1px solid #666666;
 			.tips{
 				width: 160rpx;
 				height: 34rpx;

pages/goods/product.vue

@@ -177,7 +177,7 @@
 					</view>	
 				</tui-bottom-popup>	
 				<!-- 底部按钮 -->
-				<view class="menu" v-if="userIdentity != 1 && userIdentity !=3 ">
+				<view class="menu" v-if="isShowButton">
 					<view class="bottom-btn" :style="{paddingBottom :isIphoneX ? '68rpx' : '0rpx'}">
 						<view class="bottom-le">
 							<view class="item-bt" @click="this.$api.switchTabTo('/pages/tabBar/home/index')">
@@ -311,7 +311,7 @@
 				userID:'',
 				shopID:'',
 				productID:0,
-				userIdentity:'',//用户类型
+				userIdentity:0,//用户类型
 				goodsData:{},//自定义数据
 				shop:{},//供应商信息
 				product:{},//采美
@@ -735,8 +735,13 @@
 		onShow() {
 			this.$api.getStorage().then((resolve) => {
 				this.userID = resolve.userID ? resolve.userID : '';	
-				this.userIdentity = resolve.userIdentity ? resolve.userIdentity : 3
-				this.shopID =  resolve.shopID ? resolve.shopID : '';					
+				this.userIdentity = resolve.userIdentity ? resolve.userIdentity : 0
+				this.shopID =  resolve.shopID ? resolve.shopID : '';
+				if(this.userIdentity == 0 || this.userIdentity == 2 || this.userIdentity == 4){
+					this.isShowButton = true
+				}else{
+					this.isShowButton = false
+				}					
 				if (isPreviewImg) {
 					isPreviewImg = false;
 					return;

pages/login/apply-supplier.vue

@@ -187,7 +187,7 @@
 				auditStatus:'',			//审核状态
 				isPreviewImage:false,   //预览图片开关
 				shopInfo:{
-					userId:'',				//用户ID
+					userID:'',				//用户ID
 					shopID:'',				//供应商ID
 					linkMan:'',				//联系人
 					name:'',				//公司名称
@@ -203,7 +203,6 @@
 					secondShopType: '',
 					mainpro:'',				//公司主营内容
 					isAgreed:0,				//勾选协议状态
-					whichStep:3
 				},
 				addressText:'请选择公司所在地区',
 				isDisabled:true,
@@ -236,8 +235,8 @@
 			},
 			GetSupplierInfo(){
 				this.$api.getStorage().then((resolve) =>{
-					this.shopInfo.userId = resolve.userID
-					this.ShopService.shopInfo({userId:this.shopInfo.userId}).then(response =>{
+					this.shopInfo.userID = resolve.userID
+					this.UserService.SupplierShopInfo({userId:this.shopInfo.userID}).then(response =>{
 						let responseData = response.data
 						let supplierShop = responseData.shop
 						let supplierUser = responseData.user
@@ -339,7 +338,7 @@
 					this.$util.msg('请勾选同意协议',2000);
 					return
 				}
-				this.UserService.appSupplierRegister(this.shopInfo).then(response =>{
+				this.UserService.SupplierUpdateCompanyInfo(this.shopInfo).then(response =>{
 					this.$util.modal('','您的资料已提交成功，系统将在1-2个工作日内进行审核~','知道了','',false,() =>{
 						this.$api.switchTabTo('/pages/tabBar/home/index')
 					})
@@ -600,10 +599,11 @@
 					margin-bottom: 0;
 				}
 				.error-title{
-					line-height: 40rpx;
+					line-height: 60rpx;
 					font-size: $font-size-28;
 					color: $text-color;
 					text-align: left;
+					padding-top: 20rpx;
 				}
 				.error-main{
 					padding: 10rpx 0;
@@ -653,7 +653,7 @@
 						float: left;
 					}
 					.row-input{
-						width: 440rpx;
+						width: 560rpx;
 						padding-left:10rpx;
 						font-size: $font-size-28;
 						color: $text-color;

pages/login/login.vue

@@ -38,8 +38,8 @@
 				isShowEye:false,
 				iconEyes:'icon-yanjing_yincang_o',
 				iconEyen:'icon-yanjing_xianshi_o',
-				accountNumber:'18857775555',  //用户登录账号
-				password:'1111aaaa',	   //用户登录密码	
+				accountNumber:'',  //用户登录账号
+				password:'',	   //用户登录密码	
 				toestText:'',
 				telPhone:'',
 				loginType:'',		//跳转类型

services/shop.service.js

@@ -98,14 +98,6 @@ export default class ShopService {
 	ShopCancelShipment (data = {}) {
 		return this.AjaxService.post({ url:'/supplier/cancelShipment', data, isLoading: true })
 	}
-	/* 资料信息-数据回显 */
-	shopInfo (data = {}) {
-		return this.AjaxService.get({ url:'/supplier/shopInfo', data, isLoading: true })
-	}
-	/* 资料信息-提交修改 */
-	modifiedData (data = {}) {
-		return this.AjaxService.post({ url:'/supplier/modifiedData', data, isLoading: true })
-	}
 	/* 一级分类 */
 	GetPrimaryClassification (data = {}) {
 		return this.AjaxService.get({ url:'/supplier/primaryClassification', data, isLoading: false })

services/user.service.js

@@ -83,6 +83,18 @@ export default class UserService {
 	OrganizationUpdate (data = {}) {
 		return this.AjaxService.post({ url:'/operation/modifiedData', data, isLoading: true })
 	}
+	/* 供应商资料信息-数据回显 */
+	SupplierShopInfo (data = {}) {
+		return this.AjaxService.get({ url:'/supplier/shopInfo', data, isLoading: true })
+	}
+	/* 供应商资料信息-提交修改 */
+	SupplierModifiedData (data = {}) {
+		return this.AjaxService.post({ url:'/supplier/modifiedData', data, isLoading: true })
+	}
+	/* 供应商修改申请信息保存 */
+	SupplierUpdateCompanyInfo (data = {}) {
+		return this.AjaxService.post({ url:'/supplier/updateCompanyInfo', data, isLoading: true })
+	}
 	
 	
 }

supplier/pages/order/order-details.vue

@@ -1,63 +1,108 @@
 <template>
 	<view class="details clearfix">
-		<!-- <cu-custom :navbar-data='nvabarData'></cu-custom> -->
 		<view class="container-details" v-show="isRequest">
-			<!-- 订单信息 -->
-			<view class="information-content">
-				<view class="info-item"><view class="item-view"><text class="label">供应商：{{orderInfo.shopName ? orderInfo.shopName :''}}</text></view></view>
-				<view class="info-item"><view class="item-view"><text class="label">订单号：{{orderInfo.shopOrderNo}}</text></view></view>
-				<view class="info-item"><view class="item-view"><text class="label">下单时间：{{orderInfo.orderTime}}</text></view></view>
-				<view class="info-item">
-					<view class="item-view"><text class="label">收款状态：<text :style="{color:setStatusText(orderInfo.receiptStatus)}">{{setStatusTextHtml(orderInfo.receiptStatus)}}</text></text></view>
-					<view class="item-view"><text class="label">结算状态：<text :style="{color:setStatusText(orderInfo.payStatus)}">{{setStatusTextHtml1(orderInfo.payStatus)}}</text></text></view>
-				</view>
-				<view class="info-item">
-					<view class="item-view"><text class="label">发货状态：<text :style="{color:setStatusText(orderInfo.sendOutStatus)}">{{setStatusTextHtml2(orderInfo.sendOutStatus)}}</text></text></view>
-				</view>
-			</view>
 			<!-- 地址信息 -->
-			<view class="address-content">
-				<view class="info-item"><text class="label">收货人：{{orderInfo.userInfo.shouHuoRen}}</text></view>
-				<view class="info-item"><text class="label">联系方式：{{orderInfo.userInfo.mobile}}</text></view>
-				<view class="info-item"><text class="label">收货地址：<text style="color: #666666;">{{orderInfo.userInfo.address}}</text></text></view>
+			<view class="address-section clearfix">
+				<view class="address-content">
+					<view class="info-item">
+						<text class="label">买家名称：{{orderInfo.userInfo.name}}</text>
+					</view>
+					<view class="info-item">
+						<text class="label">收货人：{{orderInfo.userInfo.shouHuoRen}}</text>
+						<text class="label" :style="{marginLeft:40+'rpx'}">联系方式：{{orderInfo.userInfo.mobile}}</text>
+					</view>
+					<view class="info-item">
+						<text class="label">收货地址：<text style="color: #666666;">{{orderInfo.userInfo.address}}</text></text>
+					</view>
+				</view>
+				<image  src="../../../static/temp/line@3x.png" mode=""></image>
 			</view>
 			<!-- 商品 -->
 			<view class="goods-list">
 				<view class="goods-item clearfix">
 					<view class="productlist" v-for="(pros,idx) in orderInfo.orderProductList" :key="idx">
-						<view class="goods-pros-t" @click="hanldOperationConfim(pros)">
+						<view class="goods-pros-t">
 							<view class="pros-left">
 								<view class="pros-img"><image :src="pros.productImage" alt="" mode="aspectFill"/></view>
 							</view>
 							<view class="pros-product">
 								<view class="producttitle">{{pros.aliasName ? pros.aliasName : ''}}</view>
 								<view class="productspec">规格：{{pros.productUnit ? pros.productUnit : ''}}</view>
-								<view class="productspec">商品编码：{{pros.productNo ? pros.productNo : ''}}</view>
 								<view class="product-view">
-									<view class="view-num">数量：{{pros.num+pros.presentNum}}</view>
+									<view class="view-num price">¥{{ pros.price1 | NumFormat }}</view>
+									<view class="view-num num"> <text class="small">X</text> {{pros.num+pros.presentNum}}</view>
 								</view>
 								<view class="product-view">
 									<view class="view-num">已发货：{{pros.shipmentsNum}}</view>
-									<view class="view-num">未发货：{{pros.notOutStore-pros.actualCancelNum}}</view>
-								</view>
-								<view class="product-view">
-									<view class="view-num" v-if="pros.returnedNum>0">已退货：{{pros.returnedNum}}</view>
-									<view class="view-num" v-if="pros.actualCancelNum>0">已取消：{{pros.actualCancelNum}}</view>
+									<view class="view-num">已退货：{{pros.returnedNum}}</view>
+									<view class="view-num">已退货：{{pros.actualCancelNum}}</view>
 								</view>
 							</view>	
 						</view>
+						<view class="product-total">
+							<view class="total">
+								合计： <text>¥{{ pros.totalAmount | NumFormat }}</text>
+							</view>
+						</view>	
 					</view>	
-					<view class="goods-pros-m" v-show="orderInfo.note!=null">
-						<view class="m-text">留言:</view>
+					
+					<view class="goods-pros-m" v-if="orderInfo.note">
+						<view class="m-text">留言：</view>
 						<view class="m-input">
 							<view class="text">{{orderInfo.note ? orderInfo.note : ''}}</view>
 						</view>	
 					</view>
 					<view class="goods-pros-b">
 						<view class="count">共{{orderInfo.itemCount}}件商品</view>
+						<view class="money">商品总额：<text class="red">¥{{orderInfo.productAmount | NumFormat}}</text> </view>
+					</view>
+				</view>
+			</view>
+			<!-- 订单信息 -->
+			<view class="information-content clearfix">
+				<view class="order-title">
+					<view class="order-title-t">
+						<view class="order-title-num">订单编号：{{ orderInfo.shopOrderNo }}</view>
+						<view class="order-title-tip">结算状态：<text :style="{color:setStatusText(orderInfo.payStatus)}">{{ orderInfo.payStatus | payStatusType }}</text></view>
+					</view>
+					<view class="order-title-t">
+						<view class="order-title-num">下单时间：{{ orderInfo.orderTime }}</view>
+						<view class="order-title-tip">发货状态：<text class="status" :style="{color:setStatusText(orderInfo.receiptStatus)}">{{ orderInfo.sendOutStatus | sendOutStatusType }}</text></view>
 					</view>
+					<template v-if="isOpenInfoFlag">
+						<view class="order-title-t">
+							<view class="order-title-num">结算商品金额：<text class="red">¥{{orderInfo.shopProductAmount | NumFormat}}</text></view>
+							<view class="order-title-tip">结算税费：<text class="red">¥{{orderInfo.shopTaxFee | NumFormat}}</text></view>
+						</view>
+						<view class="order-title-t">
+							<view class="order-title-num">结算运费：<text class="red">¥{{orderInfo.shopPostFee | NumFormat}}</text></view>
+							<view class="order-title-tip">总结算金额：<text class="red">¥{{orderInfo.shouldPayShopAmount | NumFormat}}</text></view>
+						</view>
+						<view class="order-title-t">
+							<view class="order-title-num">已结算金额：<text class="red">¥{{orderInfo.payedShopAmount | NumFormat}}</text></view>
+							<view class="order-title-tip"></view>
+						</view>
+					</template>	
+				</view>
+				<view class="order-more" v-if="isOpenFlag">
+					<view class="btnInfo" @click="OpenFlagShow">查看更多<label class="iconfont icon-xiangxiajiantou"></label></view>
 				</view>
 			</view>
+			<!-- 结算记录 -->
+			<view class="information-record clearfix">
+				<view class="record-title">
+					<view class="record-title-l">结算记录</view>
+				</view>
+				<view class="record-list" v-if="payShopRecord.length>0">
+					<view class="record-item" v-for="(item,index) in payShopRecord" :key="index">
+						<view class="item-time mm">￥{{item.payAmount | NumFormat}}</view>
+						<view class="item-time tt">{{item.payTime}}</view>
+					</view>
+				</view>
+				<view class="record-empty" v-else>
+				 	<text>暂无结算记录</text>
+				</view>
+			</view>	
 			<!-- 底部button -->
 			<order-button ref="orderButton" 
 						  v-if= "isRequest" 
@@ -109,6 +154,9 @@
 				isOrderShare:false,
 				isShareModal:false,
 				orderInfo:{},				//订单信息
+				payShopRecord:[],			//结算记录
+				isOpenInfoFlag:false,
+				isOpenFlag:true
 				
 			}
 		},
@@ -117,11 +165,37 @@
 			this.shopOrderId = option.shopOrderId;
 			this.initShopOrderDetails()
 		},
+		filters:{
+			sendOutStatusType(value) {
+				if (value === null) {
+				  return '未发货';
+				} else if(value === '1') {
+				  return '待发货';
+				} else if(value === '2') {
+				  return '部分发货';
+				} else{
+				  return '已发货';
+				}
+			},
+			payStatusType(value) {
+				if (value === '1') {
+				  return '待结算';
+				} else if (value === '2') {
+				  return '部分结算';
+				} else {
+				  return '已结算';
+				}
+			},
+			NumFormat(value) {//处理金额
+				return Number(value).toFixed(2);
+			},
+		},	
 		methods: {
 			initShopOrderDetails(){//初始化页面数据@参数：订单ID
-				this.ShopService.GetShopOrderDetails({ shopOrderId : this.shopOrderId }).then(res =>{
-					this.orderInfo  = res.data.shopOrder
+				this.ShopService.GetShopOrderDetails({ shopOrderId : this.shopOrderId }).then(response =>{
+					this.orderInfo  = response.data.shopOrder
 					this.btnStatus = this.orderInfo.sendOutStatus
+					this.payShopRecord = response.data.payShopRecord
 					this.isRequest = true
 				}).catch(err =>{
 					this.$util.msg(err.msg,2000);
@@ -201,6 +275,10 @@
 				}
 				return textColor
 			},
+			OpenFlagShow(){//查看更多
+				this.isOpenInfoFlag = true
+				this.isOpenFlag = false
+			},
 			onShareCode(){
 				this.isShareModal = true
 			},
@@ -243,7 +321,72 @@
 		height: auto;
 		padding:10rpx 24rpx;
 		background: #FFFFFF;
-		margin-bottom: 24rpx;
+		margin: 24rpx 0;
+		.order-more{
+			width: 100%;
+			height: auto;
+			float: left;
+			.btnInfo{
+				width: 140rpx;
+				height: 40rpx;
+				border: 2rpx solid #e1e1e1;
+				border-radius: 6rpx;
+				padding: 5rpx;
+				text-align: center;
+				color: #b2b2b2;
+				margin: 20rpx auto;
+				font-size:  $font-size-24;
+				.iconfont{
+					position: relative;
+					top: 5rpx;
+					right: -3rpx;
+				}
+			}
+		}
+		.order-title{
+			width: 100%;
+			height: auto;
+			float: left;
+			.order-title-t{
+				width: 100%;
+				height: 58rpx;
+				float: left;
+				font-size: $font-size-28;
+				line-height: 58rpx;
+				.order-title-num{
+					float: left;
+					text-align: left;
+					color: #666666;
+					.red{
+						color: #f94b4b;
+						font-weight: bold;
+					}
+				}
+				.order-title-tip{
+					float: right;
+					text-align: right;
+					font-size: $font-size-28;
+					color: #666666;
+					.red{
+						color: #f94b4b;
+						font-weight: bold;
+					}
+					.status{
+						color: $color-system;
+					}
+				}
+			}
+			.order-title-b{
+				width: 100%;
+				height: 40rpx;
+				float: left;
+				margin-top: 8rpx;
+				font-size: $font-size-28;
+				line-height: 40rpx;
+				color: #999999;
+				text-align: left;
+			}
+		}
 		.info-item{
 			height: 58rpx;
 			width: 100%;
@@ -256,20 +399,31 @@
 			}
 		}
 	}
-	.address-content{
-		width: 702rpx;
-		height: auto;
-		padding:10rpx 24rpx;
-		background: #FFFFFF;
+	.address-section{
+		width: 100%;
 		margin-bottom: 24rpx;
-		.info-item{
+		.address-content{
 			width: 100%;
-			display: flex;
-			line-height: 50rpx;
-			font-size: $font-size-28;
-			color: #333333;
+			height: auto;
+			padding:10rpx 24rpx;
+			background: #FFFFFF;
+			box-sizing: border-box;
+			float: left;
+			.info-item{
+				width: 100%;
+				display: flex;
+				line-height: 50rpx;
+				font-size: $font-size-28;
+				color: #333333;
+			}
+		}
+		image{
+			float: left;
+			width: 100%;
+			height: 6rpx;
 		}
 	}
+	
 	.goods-list{
 		width: 100%;
 		height: auto;
@@ -310,6 +464,22 @@
 				}
 			}
 		}
+		.product-total{
+			width: 100%;
+			height: 60rpx;
+			float: left;
+			border-bottom: 1px solid #E1E1E1;
+			.total{
+				float: right;
+				font-size: 28rpx;
+				line-height: 60rpx;
+				color: #333333;
+				font-weight: bold;
+				text{
+					color: #f94b4b;
+				}
+			}
+		}
 		.pros-product{
 			width: 468rpx;
 			height: 100%;
@@ -333,6 +503,19 @@
 					font-size: $font-size-26;
 					color: #666666;
 					line-height: 44rpx;
+					.small{
+						font-size: $font-size-20;
+						color: #999999;
+					}
+					&.price{
+						flex: 9;
+						color: #f94b4b;
+						font-weight: bold;
+					}
+					&.num{
+						flex: 1;
+						text-align: right;
+					}
 				}
 			}
 			.producttitle{
@@ -346,6 +529,7 @@
 				-webkit-line-clamp: 2;
 				overflow: hidden;
 				margin-bottom: 8rpx;
+				font-size: $font-size-28;
 			}
 			.productspec{
 				height: 44rpx;
@@ -361,7 +545,7 @@
 					line-height: 48rpx;
 					font-size: $font-size-28;
 					width: 48%;
-					color: #FF2A2A;
+					color: #f94b4b;
 					float: left;
 				}
 				.count{
@@ -382,10 +566,9 @@
 			color: $text-color;
 			float: left;
 			padding: 10rpx 0;
-			border-top: 1px solid #F7F7F7;
 			border-bottom: 1px solid #F7F7F7;
 			.m-text{
-				width: 62rpx;
+				width: 82rpx;
 				float: left;
 				padding-right: 20rpx;
 				font-weight:bold;
@@ -398,7 +581,7 @@
 				-webkit-align-items: center;
 				align-items: center;
 				position: relative;
-				width: 620rpx;
+				width: 600rpx;
 				height: auto;
 				padding: 20rpx 0 10rpx 0;
 				background: #FFFFFF;
@@ -417,12 +600,86 @@
 			margin-top: 12rpx;
 			float: left;
 			.count{
+				float: left;
+				font-size: $font-size-28;
+				line-height: 40rpx;
+				color: $text-color;
+				display: flex;
+				justify-content: flex-end;
+			}
+			.money{
 				float: right;
 				font-size: $font-size-28;
 				line-height: 40rpx;
 				color: $text-color;
 				display: flex;
 				justify-content: flex-end;
+				.red{
+					color: #f94b4b;
+					font-weight: bold;
+				}
+			}
+		}
+	}
+	.information-record{
+		width: 100%;
+		height: auto;
+		padding: 20rpx 24rpx;
+		box-sizing: border-box;
+		background-color: #FFFFFF;
+		.record-title{
+			width: 100%;
+			font-size: $font-size-28;
+			color: $text-color;
+			text-align: left;
+			line-height: 40rpx;
+			margin-bottom: 12rpx;
+			float: left;
+			.record-title-l{
+				font-weight: bold;
+				float: left;
+			}
+			.record-title-r{
+				float: right;
+				.red{
+					color: #FF2A2A;
+					font-weight: bold;
+				}
+			}
+		}
+		.record-empty{
+			font-size: $font-size-26;
+			color: #999999;
+			text-align: left;
+			line-height: 40rpx;
+		}
+		.record-list{
+			width: 100%;
+			height: auto;
+			float: left;
+			margin-top: 12rpx;
+			.record-item{
+				height: 40rpx;
+				width: 100%;
+				padding: 12rpx 0;
+				font-size: $font-size-28;
+				line-height: 40rpx;
+				float: left;
+				display: flex;
+				justify-content: center;
+				flex-direction: row;
+				.item-time{
+					&.mm{
+						flex: 1;
+						color: $text-color;
+						text-align: left;
+					}
+					&.tt{
+						flex: 1;
+						color: #999999;
+						text-align: right;
+					}
+				}
 			}
 		}
 	}

supplier/pages/order/order-list.vue

@@ -43,7 +43,7 @@
 										<view class="unit">规格：{{ pros.productUnit }}</view>
 										<view class="price">
 											<view class="red">¥{{ pros.price | NumFormat}}</view>
-											<view class="count">X{{ pros.num }}</view>
+											<view class="count"><text class="small">X</text> {{ pros.num }}</view>
 										</view>
 										<view class="number">
 											<text>已发货：{{ pros.shipmentsNum }}</text>
@@ -57,7 +57,7 @@
 						</view>
 						<!-- 底部button -->
 						<order-button ref="orderButton" 
-									  :status="order.status"
+									  :status="order.sendOutStatus"
 									  :orderInfo ="order"
 									  @buttonConfirm="handButtonConfirm">
 						</order-button>
@@ -591,25 +591,25 @@
 			border-bottom: 1px solid #e1e1e1;
 			.pros-product{
 				width: 100%;
-				height: 180rpx;
+				height: 184rpx;
 				float: left;
 				.pros-product-img{
-					width: 178rpx;
-					height: 178rpx;
+					width: 182rpx;
+					height: 182rpx;
 					border:1px solid #e1e1e1;
 					border-radius: 6rpx;
 					float: left;
 					margin-right: 17rpx;
 					image{
-						width: 178rpx;
-						height: 178rpx;
+						width: 182rpx;
+						height: 182rpx;
 						display: block;
 						border-radius: 6rpx;
 					}
 				}
 				.pros-product-msg{
-					width: 504rpx;
-					height: 180rpx;
+					width: 500rpx;
+					height: 184rpx;
 					float: left;
 					.name{
 						width: 100%;
@@ -630,18 +630,18 @@
 					.unit{
 						width: 100%;
 						float: left;
-						height: 44rpx;
+						height: 38rpx;
 						font-size: $font-size-22;
 						color: #999999;
-						line-height: 44rpx;
+						line-height: 38rpx;
 					}
 					.price{
 						width: 100%;
 						float: left;
-						height: 44rpx;
+						height: 38rpx;
 						font-size: $font-size-28;
 						color: #666666;
-						line-height: 44rpx;
+						line-height: 38rpx;
 						.red{
 							color: #f94b4b;
 							float: left;
@@ -649,15 +649,18 @@
 						}
 						.count{
 							float: right;
+							.small{
+								font-size: $font-size-20;
+							}
 						}
 					}
 					.number{
 						width: 100%;
 						float: left;
-						height: 44rpx;
+						height: 38rpx;
 						font-size: $font-size-24;
 						color: #999999;
-						line-height: 44rpx;
+						line-height: 38rpx;
 						text{
 							margin-right: 30rpx;
 						}

supplier/pages/user/information.vue

@@ -379,7 +379,7 @@
 				  this.params.userID = resolve.userID;
 				  this.params.shopID = resolve.shopID;
 				  	console.log(resolve)
-				  this.ShopService.shopInfo({userId:this.params.userID}).then(response =>{
+				  this.UserService.SupplierShopInfo({userId:this.params.userID}).then(response =>{
 					if(response.code==0){
 						console.log(response)
 						let shop = response.data.shop;
@@ -503,8 +503,8 @@
 					this.$util.msg('请上传产品证书',2000);
 					return
 				}else{
-					this.ShopService.modifiedData(this.params).then(res=>{
-						  if(res.code === 0){
+					this.UserService.SupplierModifiedData(this.params).then(res=>{
+						if(res.code === 0){
 							  this.$util.msg('修改成功',2000,true,'success')
 							  setTimeout(()=>{
 								uni.navigateBack();