commit -m 订单模块接口联调

components/cm-module/modelAlert/supplierShareAlert.vue

@@ -24,7 +24,7 @@
 	export default{
 		name:'alert',
 		props:{
-			shopOrderID:{
+			shopOrderId:{
 				type:Number
 			}
 		},
@@ -34,7 +34,7 @@
 			}
 		},
 		created() {
-			this.getShareCode(this.shopOrderID)
+			this.getShareCode(this.shopOrderId)
 		},
 		onLoad(){
 			

components/cm-module/orderDetails/supplierListButton.vue

@@ -2,7 +2,7 @@
 	<view class="button-template clearfix">
 		<!-- 底部按钮 -->
 		<view class="btn btn-color" v-if="btnState.isDeliver"  @click.stop="btnConfirm('deliver',orderInfo)">发货</view>
-		<view class="btn btn-cancel" @click.stop="onShareCode(orderInfo.shopOrderID)">
+		<view class="btn btn-cancel" @click.stop="onShareCode(orderInfo.shopOrderId)">
 			<view class="tips" v-if="shareCode">分享码：{{shareCode}}</view>
 			分享订单
 		</view>	
@@ -44,7 +44,6 @@
 			}
 		},
 		created(){
-			console.log(this.status)
 			this.initData(this.status)
 		},
 		computed: {
@@ -77,14 +76,12 @@
 			getShareCode(code){
 				this.shareCode = code
 			},
-			onShareCode(shopOrderID){
-				console.log(shopOrderID)
+			onShareCode(shopOrderId){
 				this.$parent.isShareModal = true
-				this.$parent.btnoRderID = shopOrderID
+				this.$parent.btnoRderID = shopOrderId
 				this.$emit('shareConfirm')
 			},
 			btnConfirm(type,orderInfo){
-				console.log(orderInfo)
 				let data = {type:type, orderInfo:orderInfo}
 				this.$emit('buttonConfirm',data)
 			}

pages/supplier/deliver/add-logistics.vue

@@ -42,7 +42,7 @@
 				</view>
 				<view class="label">文字备注</view>
 				<view class="remarks-textarea">
-					<textarea class="textarea" v-model="info.note" value="" placeholder="文字备注，200字以内" maxlength="200" @input="conInput"/>
+					<textarea class="textarea" v-model="deliveryParam.note" value="" placeholder="文字备注，200字以内" maxlength="200" @input="conInput"/>
 					<text class="limit-text"><text class="red">{{min}}</text>/{{max}}</text>
 				</view>
 				<view class="remarks-tips">请备注快递单、发货现场和货物的照片，最多10张</view>
@@ -57,6 +57,13 @@
 	import authorize from '@/common/config/authorize.js' 
 	import { uploadFileImage } from "@/services/public.js"
 	var isPreviewImg;
+	const defaultDeliveryParam = {
+			shopOrderId:0,	// 子订单Id
+			note:'',		// 备注
+			image:'',		// 备注图片
+			logistics:'',	// 物流信息
+			products:''		//子订单商品信息
+	}
 	export default{
 		data() {
 			return{
@@ -69,19 +76,15 @@
 				checkLogicsIndex:0,
 				selectID:0,
 				addLogisticsType:'',
-				info:{
-					image:'',
-					note:'',
-					shopOrderId:''
-				},//备注信息
-				record:[],//子订单商品信息
+				deliveryParam: Object.assign({}, defaultDeliveryParam), 	// 提交确认发货参数
 				logisticsList:[{
 					label:'',
 					number:'',
 					value:'',
 				}],
 				min:0,
-				max:200
+				max:200,
+				mobile:0
 			}
 		},
 		watch: {
@@ -93,15 +96,17 @@
 			}
 		},
 		onLoad(option) {
+			console.log('1111',option)
+			this.mobile = option.mobile
 			if(option.type == 'add'){
 				this.addLogisticsType = option.type
-				this.info.shopOrderId = option.shopOrderId;
-				this.record = JSON.parse(option.data)
+				this.deliveryParam.shopOrderId = option.shopOrderId;
+				this.deliveryParam.products = JSON.parse(option.data)
 			}else{
 				let queryData = JSON.parse(option.data);
 				this.addLogisticsType = option.type
 				this.logisticsBatchId = queryData.logisticsBatchId
-				this.info.shopOrderId = option.shopOrderId;
+				this.deliveryParam.shopOrderId = option.shopOrderId;
 				this.initGetLogisticsInfo()
 			}
 		},
@@ -111,7 +116,7 @@
 				this.ShopService.GetLogisticsInfo(
 				{ 
 					logisticsBatchId : this.logisticsBatchId, 
-					shopOrderId:this.info.shopOrderId ,
+					shopOrderId:this.deliveryParam.shopOrderId ,
 				}
 				).then(response =>{
 					const data = response.data.logisticsBatch
@@ -120,7 +125,7 @@
 					}else{
 						this.photoLists =[]
 					}
-					this.info.note = data.remark
+					this.deliveryParam.note = data.remark
 				})
 				.catch(error =>{
 					this.$util.msg(error.msg,2000);
@@ -131,8 +136,11 @@
 				uni.scanCode({
 				    onlyFromCamera: true,
 				    success: function (res) {
+						console.log('res',res)
 						item.number= res.result
-						self.ShopService.GetExpressInformation({number:res.result}).then(response =>{
+						console.log('item.number',item.number)
+						console.log('mobile',this.mobile)
+						self.ShopService.GetExpressInformation({number:res.result,mobile:this.mobile}).then(response =>{
 							item.label= response.data.label
 							item.value= response.data.value
 							self.selectID = response.data.id
@@ -227,18 +235,18 @@
 				}
 				//统一处理备注图片
 				this.photoLists.forEach(el =>{
-					this.info.image += el+'##'
+					this.deliveryParam.image += el+'##'
 				})
 				let params = {
-						logistics:logisticsArray,
-						remarkImage:this.info.image,
-						remark:this.info.note,
-						logisticsBatchID:this.logisticsBatchId
+						logistics:JSON.stringify(logisticsArray),
+						remarkImage:this.deliveryParam.image,
+						remark:this.deliveryParam.note,
+						logisticsBatchId:this.logisticsBatchId
 					}
-				this.ShopService.ShopAddLogisticsInfo({params:JSON.stringify(params)}).then(response =>{
+				this.ShopService.ShopAddLogisticsInfo(params).then(response =>{
 					this.$util.msg('添加物流成功',2000,true,'success')
 					setTimeout(()=>{
-						this.$api.navigateTo(`/pages/supplier/deliver/deliver-record?shopOrderId=${this.info.shopOrderId}`)
+						this.$api.navigateTo(`/pages/supplier/deliver/deliver-record?shopOrderId=${this.deliveryParam.shopOrderId}`)
 					},2000)
 				}).catch(error =>{
 					this.$util.msg(error.msg,2000);
@@ -286,21 +294,18 @@
 					this.$util.msg('物流单号重复',2000);
 					return
 				}
+				this.deliveryParam.logistics = JSON.stringify(logisticsArray)
+				this.deliveryParam.products = JSON.stringify(this.deliveryParam.products)
 				//统一处理备注图片
-				this.info.image = ''
+				this.deliveryParam.image = ''
 				this.photoLists.forEach(el =>{
-					this.info.image += el+'##'
+					this.deliveryParam.image += el+'##'
 				})
-				let params = {
-						logistics:logisticsArray,
-						record:this.record,
-						info:this.info
-					}
-				this.ShopService.ShopAddLogistics({params:JSON.stringify(params)}).then(response =>{
+				this.ShopService.ShopAddLogistics(this.deliveryParam).then(response =>{
 					this.$util.msg('发货成功',2000,true,'success')
 					let logisticsBatchId = response.data
 					setTimeout(()=>{
-						this.$api.navigateTo(`/pages/supplier/deliver/qualifications-add?logisticsBatchId=${logisticsBatchId}&shopOrderId=${this.info.shopOrderId}`)
+						this.$api.navigateTo(`/pages/supplier/deliver/qualifications-add?logisticsBatchId=${logisticsBatchId}&shopOrderId=${this.deliveryParam.shopOrderId}`)
 					},2000)
 				}).catch(error =>{
 					this.$util.msg(error.msg,2000);

pages/supplier/deliver/deliver-goods.vue

@@ -15,9 +15,9 @@
 							<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>
+									<button class="checkbox iconfont" :class="[pros.checked ?'icon-yixuanze':'icon-weixuanze']"></button>
 								</view>
-								<view class="pros-img"><image :src="pros.productImage ? pros.productImage:''" alt="" /></view>
+								<view class="pros-img"><image :src="pros.image ? pros.image:''" alt="" /></view>
 								<view class="pros-product">
 									<view class="producttitle">{{pros.name}}</view>
 									<view class="productspec">规格:{{pros.productUnit ? pros.productUnit : ''}}</view>
@@ -54,7 +54,7 @@
 				<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> 
+							<button class="checkbox iconfont" :class="[isCheckAll?'icon-yixuanze':'icon-weixuanze']"></button> 
 							<view class="text">全选</view>
 						</view>
 					</view>
@@ -81,6 +81,7 @@
 				isCheckAll:false,//是否全选
 				scrollHeight: '',
 				windowHeight: '',
+				mobile:0
 			}
 		},
 		onLoad(option){
@@ -94,8 +95,10 @@
 		methods:{
 			initShopOrderShipmentsInfo(){//初始化
 				this.ShopService.ShopOrderShipmentsInfo({ shopOrderId : this.shopOrderId }).then(response =>{
-					if( response.data.orderProductList.length>0){
-						let orderProductList = response.data.orderProductList
+					let data = response.data
+					this.mobile = data.userInfo.mobile
+					if( data.orderProductList.length>0){
+						let orderProductList = data.orderProductList
 						let elObject = {}
 						let isReduceNum = false
 						let creatProductList = []
@@ -180,13 +183,13 @@
 					pros.shipmentCount = e.detail.value
 				}
 			},
-			toConfirmDeliver(){//添加物流页面
+			toConfirmDeliver(){//跳转添加物流页面
 				let setProductList=[];
 				this.productsList.forEach(el=>{
 					if(el.checked){
 						let elObject = {
-								orderProductId:el.orderProductID.toString(),
-								num:el.shipmentCount.toString()
+								orderProductId:el.orderProductId,
+								num:el.shipmentCount
 						}
 						setProductList.push(elObject)
 					}
@@ -195,7 +198,7 @@
 					this.$util.msg("请先选择商品~",2000);
 					return
 				}else{
-					this.$api.navigateTo(`/pages/supplier/deliver/add-logistics?type=add&shopOrderId=${this.shopOrderId}&data=${JSON.stringify(setProductList)}`)
+					this.$api.navigateTo(`/pages/supplier/deliver/add-logistics?type=add&shopOrderId=${this.shopOrderId}&mobile=${this.mobile}&data=${JSON.stringify(setProductList)}`)
 				}
 			},
 		},

pages/supplier/deliver/deliver-record.vue

@@ -97,12 +97,14 @@
 				systeminfo:this.setSysteminfo(),		 //获取设备信息
 				CustomBar:this.CustomBar,// 顶部导航栏高度
 				isIphoneX:this.$store.state.isIphoneX,
-				shopOrderId:'',
+				listQuery:{
+					shopOrderId:0,
+					pageNum:1,
+					pageSize:10,
+				},
 				lgisList:[],
 				ramkesList:[],
 				RecordList:[],	//发货记录
-				pageNum:1,
-				pageSize:10,
 				hasNextPage:false,
 				loadding: false,
 				pullUpOn: true,
@@ -111,10 +113,11 @@
 				nomoreText: '上拉显示更多',
 				scrollHeight: '',
 				windowHeight: '',
+				mobile:0
 			}
 		},
 		onLoad(option){
-			this.shopOrderId = option.shopOrderId
+			this.listQuery.shopOrderId = option.shopOrderId
 			this.setScrollHeight()
 			this.initShopShipmentsRecord();
 		},
@@ -123,13 +126,15 @@
 		},
 		methods:{
 			initShopShipmentsRecord(){//初始化发货记录 index:1
-				this.ShopService.ShopShipmentsRecord({ shopOrderId : this.shopOrderId,pageSize:this.pageSize,pageNum:this.pageNum }).then(response =>{
+				this.ShopService.ShopShipmentsRecord(this.listQuery).then(response =>{
 					console.log(response)
-					let responseData = response.data.logisticsBatchPage
-					if(responseData.results&&responseData.results.length > 0){
+					let data = response.data
+					let logisticsBatchPage = data.logisticsBatchPage
+					this.mobile = data.userInfo.mobile
+					if(logisticsBatchPage.list&&logisticsBatchPage.list.length > 0){
 						this.isEmpty = false
-						this.hasNextPage = responseData.hasNextPage
-						this.RecordList =responseData.results
+						this.hasNextPage = logisticsBatchPage.hasNextPage
+						this.RecordList =logisticsBatchPage.list
 						this.pullFlag = false;
 						setTimeout(()=>{this.pullFlag = true;},500)
 						if(this.hasNextPage){
@@ -153,11 +158,12 @@
 				})
 			},	
 			getOnReachBottomData(){
-				this.ShopService.ShopShipmentsRecord({ shopOrderId : this.shopOrderId,pageSize:this.pageSize,pageNum:this.pageNum+=1 }).then(response =>{
-					let responseData = response.data.logisticsBatchPage
-					if(responseData.results&&responseData.results.length > 0){
-						this.hasNextPage = responseData.hasNextPage
-						this.RecordList = this.RecordList.concat(responseData.results) 
+				this.listQuery.pageNum+=1
+				this.ShopService.ShopShipmentsRecord(this.listQuery).then(response =>{
+					let data = response.data.logisticsBatchPage
+					if(data.list&&data.list.length > 0){
+						this.hasNextPage = data.hasNextPage
+						this.RecordList = this.RecordList.concat(data.list) 
 						this.pullFlag = false;// 防上拉暴滑
 						setTimeout(()=>{this.pullFlag = true;},500)
 						if(this.hasNextPage){
@@ -216,8 +222,8 @@
 						let repleArray =hanldData.logisticsRecordList
 						repleArray.forEach(el=>{
 							let elObject = {
-									orderProductId:el.orderProductID.toString(),
-									num:el.num.toString()
+									orderProductId:el.orderProductId,
+									num:el.num
 							}
 							setProductList.push(elObject)
 						})
@@ -225,10 +231,10 @@
 								logisticsBatchId:hanldData.id,
 								logisticsBatchData:setProductList
 							}
-						this.$api.navigateTo(`/pages/supplier/deliver/add-logistics?type=reple&shopOrderId=${this.shopOrderId}&data=${JSON.stringify(data)}`)
+						this.$api.navigateTo(`/pages/supplier/deliver/add-logistics?type=reple&mobile=${this.mobile}&shopOrderId=${this.listQuery.shopOrderId}&data=${JSON.stringify(data)}`)
 						break
 					case 'qualifications':
-						this.$api.navigateTo(`/pages/supplier/deliver/qualifications-details?logisticsBatchId=${hanldData.id}&shopOrderId=${this.shopOrderId}`)
+						this.$api.navigateTo(`/pages/supplier/deliver/qualifications-details?logisticsBatchId=${hanldData.id}&shopOrderId=${this.listQuery.shopOrderId}`)
 						break
 						
 				}
@@ -246,10 +252,10 @@
 				})
 			},
 			pageGoLink(){
-				this.$api.navigateTo('/pages/supplier/deliver/deliver-goods?shopOrderId='+this.shopOrderId)
+				this.$api.navigateTo('/pages/supplier/deliver/deliver-goods?shopOrderId='+this.listQuery.shopOrderId)
 			},
 			hanldPageDetails(){
-				this.$api.navigateTo('/pages/supplier/order/order-details?shopOrderId='+this.shopOrderId)
+				this.$api.navigateTo('/pages/supplier/order/order-details?shopOrderId='+this.listQuery.shopOrderId)
 			}
 		},
 		onPullDownRefresh() {//下拉刷新

pages/supplier/deliver/qualifications-add.vue

@@ -181,7 +181,7 @@
 					}
 				)
 				.then(response =>{
-					this.$util.msg('保存成功',2000);
+					this.$util.msg('保存成功',3000,true,'success')
 					setTimeout(()=>{
 						this.$api.navigateTo(`/pages/supplier/deliver/deliver-record?shopOrderId=${this.shopOrderId}`)
 					},2000)

pages/supplier/login/bind-operator.vue

@@ -73,8 +73,8 @@
 	export default{
 		data() {
 			return{
-				shopOrderId:'',
-				userID:'',
+				shopOrderId:0,
+				wxUserInfo:{},			//储存用户微信信息
 				bindLinkName:'',  		//供应商联系人姓名
 				bindLinkPhone:'',  		//用户手机号
 				mobildeCode:'',  		//手机验证码
@@ -89,13 +89,46 @@
 			}
 		},
 		onLoad(option) {
+			console.log(this.shopOrderId);
 			this.shopOrderId = option.shopOrderId
-			// console.log(this.shopOrderId);
 			this.bind_supplierInfo = uni.getStorageSync('bind_supplierInfo');
 			this.getVerificationCode()
+			this.getWxAuthorize()
 		},
 		methods:{
-			...mapMutations(['login']),
+			...mapMutations(['login','logout','wxLogin']),
+			async getWxAuthorize(){
+				const wechatCode = await authorize.getCode('weixin');// 根据微信的code获取用户登录状态:1已登录过 -1未登录过
+				const getUserInfo = await authorize.getUserInfo('weixin');
+				this.UserService.UserLoginAuthApplets({ 
+					code:wechatCode,
+					encryptedData:getUserInfo.encryptedData,
+					iv:getUserInfo.iv ,
+				})
+				.then(response =>{
+					this.login(response.data);
+					this.$store.commit('updateStatus',response.data)
+					uni.setStorageSync('token',response.data.token)
+					uni.setStorageSync('unionId',response.data.unionId)
+					setTimeout(()=>{
+						if(response.data.userIdentity === 1){
+							this.$api.navigateTo('/pages/seller/index/index')
+						}else if(response.data.userIdentity === 2 || response.data.userIdentity === 4){
+							this.$api.switchTabTo('/pages/tabBar/user/user')
+						}else if(response.data.userIdentity === 3){
+							this.$api.navigateTo('/pages/supplier/index/index')
+						}else{
+							this.isUserInfo= true
+						}
+					},1000)
+				})
+				.catch(error =>{
+					this.logout()
+					uni.setStorageSync('unionId',error.data.unionId)
+					this.$store.commit('updateStatus',error.data)
+					this.isUserInfo = true
+				})
+			},	
 			bindWechatInfo(){
 				if( this.bindLinkName == ''){
 					this.$util.msg('请输入姓名',2000)
@@ -117,7 +150,7 @@
 					this.$util.msg('验证码格式不正确',2000)
 					return
 				}
-				this.bindingWechatLogin()
+				this.GetUserProfile()
 			},
 			getVerificationCode(){//图形验证
 				this.PublicService.GetImgVerifyCode().then(res => {
@@ -171,30 +204,40 @@
 					this.isMobileDisabled = false;
 				})
 			},
-			bindingWechatLogin(){//获取用户基本信息登录
-				wx.getUserInfo({
-					success: res => {
-						this.isUserInfo = false;
-						this.userInfo = res.userInfo;
-						let params ={
-								userID:this.bind_supplierInfo.userId,
-								mobile:this.bindLinkPhone,
-								linkName:this.bindLinkName,
-								verificationCode:this.mobildeCode,
-								nickName:res.userInfo.nickName,
-								headimgurl:res.userInfo.avatarUrl,
-								openid:this.bind_supplierInfo.openid,
-								shopID:this.bind_supplierInfo.shopId,
-								unionId:this.bind_supplierInfo.unionId
-						}
-						this.ShopService.BindShopOperator(params).then(response =>{
-							this.$api.navigateTo(`/pages/supplier/order/order-details?shopOrderId=${this.shopOrderId}`)
-						}).catch(error =>{
-							this.$util.msg(error.msg,2000)
-						})	
+			GetUserProfile(){//获取用户微信个人信息
+				const self = this
+				wx.getUserProfile({
+					desc: '采美采购商城小程序获取您的信息', // 声明获取用户个人信息后的用途，后续会展示在弹窗中，请谨慎填写
+					success(res) {
+						console.log('微信获取用户信息新API',res)	
+						self.wxLogin(res.userInfo)	
+						self.wxUserInfo.nickName = res.userInfo.nickName
+						self.wxUserInfo.avatarUrl = res.userInfo.avatarUrl
+						self.BindingWechat()
+					},
+					fail() {
+						self.$util.msg('授权失败', 2000)
 					}
 				})
 			},
+			BindingWechat(){//绑定微信并登录
+				let params ={
+						userId:this.bind_supplierInfo.userId,
+						mobile:this.bindLinkPhone,
+						linkName:this.bindLinkName,
+						smsCode:this.mobildeCode,
+						unionId:uni.getStorageSync('unionId'),
+						nickName:this.wxUserInfo.nickName,
+						avatarUrl:this.wxUserInfo.avatarUrl,
+				}
+				this.UserService.BindingWechat(params).then(response =>{
+					this.login(response.data)
+					this.$api.navigateTo(`/pages/supplier/order/order-details?shopOrderId=${this.shopOrderId}`)
+				}).catch(error =>{
+					this.$util.msg(error.msg,2000)
+					this.isUserInfo = true
+				})	
+			},
 			//关闭未授权用户授权提示弹窗
 			hideModel(){
 				this.isUserInfo = false;
@@ -242,7 +285,7 @@
 				padding: 24rpx;
 				margin-bottom: 20rpx;
 				background: #F7F7F7;
-				border-radius: 14rpx;
+				border-radius: 50rpx;
 				display: flex;
 				flex-direction: column;
 				align-items: center;
@@ -262,7 +305,7 @@
 						height: 88rpx;
 						line-height: 88rpx;
 						padding: 0;
-						border-radius: 14rpx;
+						border-radius: 50rpx;
 						color: #FFFFFF;
 						background: $btn-confirm;
 					}
@@ -288,11 +331,11 @@
 						display: flex;
 						flex-direction: column;
 						align-items: center;
-						border-radius: 14rpx;
+						border-radius: 10rpx;
 						image{
 							width: 180rpx;
 							height: 88rpx;
-							border-radius: 14rpx;
+							border-radius: 10rpx;
 						}
 					}
 					.vscod-refresh{
@@ -325,7 +368,7 @@
 		.login-btn{
 			width: 702rpx;
 			height: 88rpx;
-			border-radius: 14rpx;
+			border-radius: 50rpx;
 			font-size: $font-size-28;
 			line-height: 88rpx;
 			color: #FFFFFF;

pages/supplier/login/share-info.vue

@@ -20,6 +20,14 @@
 				source:1,
 				shareCode:'',
 				authority:'',//用户权限
+				params:{
+					code:'',
+					encryptedData:'',
+					iv:'',
+					shopOrderId:0,
+					source:1,
+					shareCode:''
+				}
 			}
 		},
 		computed: {
@@ -29,62 +37,53 @@
 			// scene 需要使用 decodeURIComponent 才能获取到生成二维码时传入的 scene
 			console.log(option);
 			if(option.scene){
-				this.shopOrderId = Number(decodeURIComponent(option.scene))
+				this.params.shopOrderId = Number(decodeURIComponent(option.scene))
 			}else{
-				this.shopOrderId = option.shopOrderId
+				this.params.shopOrderId = option.shopOrderId
 				this.authority = option.authority
 				if(this.authority == '2'){
-					this.source = 2
+					this.params.source = 2
 				}else if(this.authority == '3'){
-					this.source = 3
+					this.params.source = 3
 				}
 			}
 			this.infoMiniShipments();
 		},
 		methods:{
-			infoMiniShipments(){
-				authorize.getCode('weixin').then(wechatcode =>{
-					authorize.getUserInfo('weixin').then(wxResponse =>{
-						let params = {
-								code:wechatcode,
-								encryptedData:wxResponse.encryptedData,
-								iv:wxResponse.iv,
-								shopOrderId:this.shopOrderId,
-								source:this.source,
-								shareCode:this.shareCode
+			async infoMiniShipments(){
+					const WeiXin =  await authorize.getUserInfo('weixin')
+					this.params.iv = WeiXin.iv
+					this.params.encryptedData = WeiXin.encryptedData
+					this.params.code = await authorize.getCode('weixin')
+					this.ShopService.MiniShipments(this.params).then(res =>{
+						switch(res.data.resultCode){
+							case 1:
+								this.params.shopOrderId = res.data.shopOrderId;
+								this.$api.navigateTo(`/pages/supplier/order/order-service-details?shopOrderId=${this.params.shopOrderId}`)
+								break;
+							case 2:
+								console.log('供应商联系人');
+								this.$api.navigateTo(`/pages/supplier/order/order-details?shopOrderId=${this.params.shopOrderId}`)
+								break;
+							case 3:
+								console.log('供应商发货人员');
+								this.$api.navigateTo(`/pages/supplier/order/order-details?shopOrderId=${this.params.shopOrderId}`)
+								break;
+						}
+					}).catch(err =>{
+						if(this.params.source == 2){
+							this.$api.setStorage('bind_supplierInfo', err.data)
+							this.$api.navigateTo(`/pages/supplier/login/bind-operator?shopOrderId=${this.params.shopOrderId}`)
+						}else if(this.params.source == 3){
+							this.$api.navigateTo(`/pages/supplier/login/share-login?shopOrderId=${this.params.shopOrderId}`)
+						}else{
+							this.isRequest = true;
 						}
-						this.ShopService.MiniShipments(params).then(res =>{
-							switch(res.data.resultCode){
-								case 1:
-									this.shopOrderId = res.data.shopOrderId;
-									this.$api.navigateTo(`/pages/supplier/order/order-service-details?shopOrderId=${this.shopOrderId}`)
-									break;
-								case 2:
-									console.log('供应商联系人');
-									this.$api.navigateTo(`/pages/supplier/order/order-details?shopOrderId=${this.shopOrderId}`)
-									break;
-								case 3:
-									console.log('供应商发货人员');
-									this.$api.navigateTo(`/pages/supplier/order/order-details?shopOrderId=${this.shopOrderId}`)
-									break;
-							}
-						}).catch(err =>{
-							if(this.source == 2){
-								this.$api.setStorage('bind_supplierInfo', err.data)
-								this.$api.navigateTo(`/pages/supplier/login/bind-operator?shopOrderId=${this.shopOrderId}`)
-							}else if(this.source == 3){
-								this.$api.navigateTo(`/pages/supplier/login/share-login?shopOrderId=${this.shopOrderId}`)
-							}else{
-								this.isRequest = true;
-							}
-						})	
-					})
-				})		
+					})	
 			}
 		},
 		onShow() {
 			this.isRequest = false;
-			this.infoMiniShipments();
 		}
 	}
 </script>

pages/supplier/order/order-details.vue

@@ -8,7 +8,7 @@
 						<text class="label">买家名称：{{orderInfo.userInfo.name}}</text>
 					</view>
 					<view class="info-item">
-						<text class="label">收货人：{{orderInfo.userInfo.shouHuoRen}}</text>
+						<text class="label">收货人：{{orderInfo.userInfo.receiver}}</text>
 						<text class="label" :style="{marginLeft:40+'rpx'}">联系方式：{{orderInfo.userInfo.mobile}}</text>
 					</view>
 					<view class="info-item">
@@ -23,7 +23,7 @@
 					<view class="productlist" v-for="(pros,idx) in orderInfo.orderProductList" :key="idx">
 						<view class="goods-pros-t">
 							<view class="pros-left">
-								<view class="pros-img"><image :src="pros.productImage" alt="" mode="aspectFill"/></view>
+								<view class="pros-img"><image :src="pros.image" alt="" mode="aspectFill"/></view>
 							</view>
 							<view class="pros-product">
 								<view class="producttitle">{{pros.aliasName ? pros.aliasName : ''}}</view>
@@ -111,7 +111,7 @@
 						   @buttonConfirm="handButtonConfirm">
 			</order-button>
 		</view>
-		<share-alert  :shopOrderID="shopOrderId" 
+		<share-alert  :shopOrderId="shopOrderId" 
 					  v-if="isShareModal"  
 					  @shareConfirm ='onShareAppMessage'>
 		</share-alert>		
@@ -169,18 +169,18 @@
 			sendOutStatusType(value) {
 				if (value === null) {
 				  return '未发货';
-				} else if(value === '1') {
+				} else if(value === 1) {
 				  return '待发货';
-				} else if(value === '2') {
+				} else if(value === 2) {
 				  return '部分发货';
 				} else{
 				  return '已发货';
 				}
 			},
 			payStatusType(value) {
-				if (value === '1') {
+				if (value === 1) {
 				  return '待结算';
-				} else if (value === '2') {
+				} else if (value === 2) {
 				  return '部分结算';
 				} else {
 				  return '已结算';
@@ -214,61 +214,16 @@
 						break
 				}
 			},
-			setStatusTextHtml(status){
-				let TextHtml='';
-				switch(status){
-					case '1':
-						TextHtml = '待付款'
-						break;
-					case '2':
-						TextHtml = '部分付款'
-						break;
-					case '3':
-						TextHtml = '已付款'
-						break;
-				}
-				return TextHtml
-			},
-			setStatusTextHtml1(status){
-				let TextHtml='';
-				switch(status){
-					case '1':
-						TextHtml = '待结算'
-						break;
-					case '2':
-						TextHtml = '部分结算'
-						break;
-					case '3':
-						TextHtml = '已结算'
-						break;
-				}
-				return TextHtml
-			},
-			setStatusTextHtml2(status){
-				let TextHtml='';
-				switch(status){
-					case '1':
-						TextHtml = '待发货'
-						break;
-					case '2':
-						TextHtml = '部分发货'
-						break;
-					case '3':
-						TextHtml = '已发货'
-						break;
-				}
-				return TextHtml
-			},
 			setStatusText(status){
 				let textColor='';
 				switch(status){
-					case '1':
+					case 1:
 						textColor = '#FF2A2A'
 						break;
-					case '2':
+					case 2:
 						textColor = '#E15616'
 						break;
-					case '3':
+					case 3:
 						textColor = '#38CB3D'
 						break;
 				}

pages/supplier/order/order-list.vue

@@ -17,10 +17,10 @@
 				</view>
 				<!-- 列表 -->
 				<view v-else class="tui-order-content">
-					<view  class="tui-order-item" v-for="(order,orderIndex) in orderData" :key="orderIndex"  @click.stop="detail(order.shopOrderID)">
+					<view  class="tui-order-item" v-for="(order,orderIndex) in orderData" :key="orderIndex"  @click.stop="detail(order.shopOrderId)">
 						<view class="order-title">
 							<view class="order-title-n">
-								<view class="order-title-name">收货人：{{order.userInfo.shouHuoRen}}</view>
+								<view class="order-title-name">收货人：{{order.userInfo.receiver}}</view>
 								<view class="order-title-phone">手机号：{{order.userInfo.mobile}}</view>
 							</view>
 							<view class="order-title-t first">
@@ -36,7 +36,7 @@
 							<view class="goods-pros-t clearfix" v-for="(pros,prosIndex) in order.orderProductList" :key="prosIndex">
 								<view class="pros-product">
 									<view class="pros-product-img">
-										<image :src="pros.productImage" mode=""></image>
+										<image :src="pros.image" mode=""></image>
 									</view>
 									<view class="pros-product-msg">
 										<view class="name">{{ pros.name }}</view>
@@ -78,7 +78,7 @@
 				</view>
 				<view class="d-label">收货人姓名:</view>
 				<view class="d-input">
-					<input class="input" type="text" value="" v-model="listQuery.shouHuoRen" placeholder="输入收货人姓名"/>
+					<input class="input" type="text" value="" v-model="listQuery.receiver" placeholder="输入收货人姓名"/>
 				</view>
 				<view class="d-label">发货状态:</view>
 				<view class="d-input">
@@ -101,7 +101,7 @@
 			</view>
 		</tui-drawer>
 		<!-- 分享弹窗 -->
-		<share-alert  :shopOrderID="btnoRderID"
+		<share-alert  :shopOrderId="btnoRderID"
 					  v-if="isShareModal"  
 					  @shareConfirm ='onShareAppMessage'>
 		</share-alert>		
@@ -116,13 +116,13 @@
 	import empty from "@/components/empty";
 	import { mapState,mapMutations } from 'vuex'
 	const defaultListQuery = {
-			shopID:'',
+			shopId:0,
 			pageNum: 1,
 			pageSize: 10,
 			sendOutStatus: '',	// 发货状态
 			payStatus:'',		// 结算状态
 			shopOrderNo:'',		// 订单编号
-			shouHuoRen: '',		// 买家名称
+			receiver: '',		// 买家名称
 	 };
 	export default{
 		components: {
@@ -135,18 +135,18 @@
 		data() {
 			return{	
 				StatusArray:[
-					{name:'所有',value:'0'},
-					{name:'待发货',value:'1'},
-					{name:'部分发货',value:'2'},
-					{name:'已发货',value:'3'},
+					{name:'所有',value:0},
+					{name:'待发货',value:1},
+					{name:'部分发货',value:2},
+					{name:'已发货',value:3},
 				],
 				PayArray:[
-					{name:'所有',value:'0'},
-					{name:'待结算',value:'1'},
-					{name:'部分结算',value:'2'},
-					{name:'已结算',value:'3'},
+					{name:'所有',value:0},
+					{name:'待结算',value:1},
+					{name:'部分结算',value:2},
+					{name:'已结算',value:3},
 				],
-				shopID:0,
+				shopId:0,
 				showSendOutStatus:'',
 				showpayStatus:'',
 				CustomBar:this.CustomBar,// 顶部导航栏高度
@@ -181,18 +181,18 @@
 			sendOutStatusType(value) {
 				if (value === null) {
 				  return '未发货';
-				} else if(value === '1') {
+				} else if(value === 1) {
 				  return '待发货';
-				} else if(value === '2') {
+				} else if(value === 2) {
 				  return '部分发货';
 				} else{
 				  return '已发货';
 				}
 			},
 			payStatusType(value) {
-				if (value === '1') {
+				if (value === 1) {
 				  return '待结算';
-				} else if (value === '2') {
+				} else if (value === 2) {
 				  return '部分结算';
 				} else {
 				  return '已结算';
@@ -211,9 +211,9 @@
 				this.ShopService.GetSupplierMyOrderList(this.listQuery).then(response =>{
 					let data = response.data
 					this.hasNextPage = data.hasNextPage
-					if(data.results && data.results.length > 0){
+					if(data.list && data.list.length > 0){
 						this.isEmpty = false;
-						this.orderData = [...data.results];
+						this.orderData = [...data.list];
 						if(hasNextPage){
 							this.pullUpOn = false
 							this.nomoreText = '上拉显示更多'
@@ -237,7 +237,7 @@
 				this.ShopService.GetSupplierMyOrderList(this.listQuery).then(response =>{
 					let data = response.data
 					this.hasNextPage = data.hasNextPage
-					this.orderData = this.orderData.concat(data.results)
+					this.orderData = this.orderData.concat(data.list)
 					this.pullFlag = false;// 防上拉暴滑
 					setTimeout(()=>{this.pullFlag = true;},500)
 					if(this.total > this.orderData.length){
@@ -256,7 +256,7 @@
 			},
 			handButtonConfirm(data) {//获取点击
 				console.log(data)
-				this.btnoRderID = data.orderInfo.shopOrderID
+				this.btnoRderID = data.orderInfo.shopOrderId
 				console.log(this.btnoRderID )
 				this.OperationType = data.type
 				this.handShowAlert(data)
@@ -293,7 +293,7 @@
 			},
 			handSearchClear(){//重置搜索条件
 				this.listQuery = Object.assign({}, defaultListQuery)
-				this.listQuery.shopID = this.shopID
+				this.listQuery.shopId = this.shopId
 				this.showSendOutStatus='';
 				this.showpayStatus='';
 			},
@@ -327,7 +327,7 @@
 		},
 		onShow(){
 			this.$api.getComStorage('userInfo').then((resolve) =>{
-				this.listQuery.shopID = this.shopID = resolve.shopId
+				this.listQuery.shopId = this.shopId = resolve.shopId
 				this.getOrderDatainit()
 			})
 		}	

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

@@ -17,7 +17,7 @@
 			</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.receiver}}</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>
@@ -27,7 +27,7 @@
 					<view class="productlist" v-for="(pros,idx) in orderInfo.orderProductList" :key="idx">
 						<view class="goods-pros-t" @click="hanldOperationConfim(pros)">
 							<view class="pros-left">
-								<view class="pros-img"><image :src="pros.productImage" alt="" mode="aspectFill" /></view>
+								<view class="pros-img"><image :src="pros.image" alt="" mode="aspectFill" /></view>
 							</view>
 							<view class="pros-product">
 								<view class="producttitle">{{pros.aliasName ? pros.aliasName : ''}}</view>
@@ -148,13 +148,13 @@
 			setStatusTextHtml(status){
 				let TextHtml='';
 				switch(status){
-					case '1':
+					case 1:
 						TextHtml = '待付款'
 						break;
-					case '2':
+					case 2:
 						TextHtml = '部分付款'
 						break;
-					case '3':
+					case 3:
 						TextHtml = '已付款'
 						break;
 				}
@@ -163,13 +163,13 @@
 			setStatusTextHtml1(status){
 				let TextHtml='';
 				switch(status){
-					case '1':
+					case 1:
 						TextHtml = '待结算'
 						break;
-					case '2':
+					case 2:
 						TextHtml = '部分结算'
 						break;
-					case '3':
+					case 3:
 						TextHtml = '已结算'
 						break;
 				}
@@ -178,13 +178,13 @@
 			setStatusTextHtml2(status){
 				let TextHtml='';
 				switch(status){
-					case '1':
+					case 1:
 						TextHtml = '待发货'
 						break;
-					case '2':
+					case 2:
 						TextHtml = '部分发货'
 						break;
-					case '3':
+					case 3:
 						TextHtml = '已发货'
 						break;
 				}
@@ -193,13 +193,13 @@
 			setStatusText(status){
 				let textColor='';
 				switch(status){
-					case '1':
+					case 1:
 						textColor = '#FF2A2A'
 						break;
-					case '2':
+					case 2:
 						textColor = '#E15616'
 						break;
-					case '3':
+					case 3:
 						textColor = '#38CB3D'
 						break;
 				}

services/shop.service.js

@@ -92,89 +92,160 @@ export default class ShopService {
 	/* 发货-添加商品资质初始化查询商品 */
 	GetSupplierLogisticsRecord (data = {}) {
 		return this.AjaxService.get({ 
-			url:'/supplier/logisticsRecord', 
+			url:'/order/shop/ship/logistics/record', 
 			data, 
-			isLoading: false 
+			isLoading: false ,
+			isHost:true
 		})
 	}
 	/* 发货-商品资质回显 */
 	GetSupplierQualificationData (data = {}) {
 		return this.AjaxService.get({ 
-			url:'/supplier/qualification/data', 
+			url:'/order/shop/qualification/list', 
 			data, 
-			isLoading: false 
+			isLoading: false ,
+			isHost:true
 		})
 	}
 	/* 发货-保存商品资质 */
 	GetSupplierQualificationUpdata (data = {}) {
 		return this.AjaxService.post({ 
-			url:'/supplier/qualification', 
+			url:'/order/shop/qualification/save', 
 			data, 
-			isLoading: false 
+			isLoading: false ,
+			isHost:true
 		})
 	}
 	/* 小程序供应商我的订单 */
 	GetSupplierMyOrderList (data = {}) {
-		return this.AjaxService.get({ url:'/supplier/myOrderList', data, isLoading: true })
+		return this.AjaxService.get({ 
+			url:'/order/shop/list', 
+			data, 
+			isLoading: true ,
+			isHost:true
+		})
 	}
 	/* 小程序发货-权限控制 */
 	MiniShipments (data = {}) {
-		return this.AjaxService.post({ url:'/supplier/miniShipments', data, isLoading: true })
+		return this.AjaxService.get({ 
+			url:'/order/shop/share/code/check', 
+			data, 
+			isLoading: true ,
+			isHost:true
+		})
 	}
 	/* 小程序发货-查询供应商子订单详情 */
 	GetShopOrderDetails (data = {}) {
-		return this.AjaxService.get({ url:'/supplier/shopOrderDetails', data, isLoading: true })
-	}
-	/* 小程序发货-绑供应商运营人员 */
-	BindShopOperator (data = {}) {
-		return this.AjaxService.post({ url:'/supplier/shopBindingWx', data, isLoading: true })
+		return this.AjaxService.get({ 
+			url:'/order/shop/detail', 
+			data, 
+			isLoading: true ,
+			isHost:true
+		})
 	}
 	/* 小程序发货-供应商订单详情获取订单分享码 */
 	ShopOrderShareCode (data = {}) {
-		return this.AjaxService.post({ url:'/supplier/shopShareShipments', data, isLoading: false })
+		return this.AjaxService.get({ 
+			url:'/order/shop/share/code', 
+			data, 
+			isLoading: false ,
+			isHost:true
+		})
 	}
 	/* 小程序发货-供应商订单发货商品查询 */
 	ShopOrderShipmentsInfo (data = {}) {
-		return this.AjaxService.get({ url:'/supplier/shipmentsInfo', data, isLoading: true })
+		return this.AjaxService.get({ 
+			url:'/order/shop/ship/info', 
+			data, 
+			isLoading: true ,
+			isHost:true
+		})
 	}
 	/* 小程序发货-物流公司查询 */
 	GetLogisticsCompany (data = {}) {
-		return this.AjaxService.get({ url:'/supplier/logisticsCompany', data, isLoading: true })
+		return this.AjaxService.get({ 
+			url:'/order/shop/ship/company', 
+			data, 
+			isLoading: true ,
+			isHost:true
+		})
 	}
 	/* 小程序发货-查看发货记录物流信息 */
 	GetLogisticsInfo (data = {}) {
-		return this.AjaxService.get({ url:'/supplier/logisticsInfo', data, isLoading: true })
+		return this.AjaxService.get({ 
+			url:'/order/shop/ship/logistics/info', 
+			data, 
+			isLoading: true ,
+			isHost:true
+		})
 	}
 	/* 小程序发货-查看发货记录-添加物流 */
 	ShopAddLogisticsInfo (data = {}) {
-		return this.AjaxService.post({ url:'/supplier/addLogisticsInfo', data, isLoading: true })
+		return this.AjaxService.post({ 
+			url:'/order/shop/ship/logistics/add', 
+			data, 
+			isLoading: true,
+			isHost:true
+		})
 	}
 	/* 小程序发货-扫码获取物流公司信息 */
 	GetExpressInformation (data = {}) {
-		return this.AjaxService.get({ url:'/supplier/scanLogistics', data, isLoading: false })
+		return this.AjaxService.post({ 
+			url:'/order/shop/ship/logistics/scan', 
+			data, 
+			isLoading: false,
+			isHost:true
+		})
 	}
 	/* 小程序发货-确认发货 */
 	ShopAddLogistics (data = {}) {
-		return this.AjaxService.post({ url:'/supplier/addLogistics', data, isLoading: true })
+		return this.AjaxService.post({ 
+			url:'/order/shop/ship/delivery',
+			 data, 
+			 isLoading: true ,
+			 isHost:true
+		})
 	}
 	/* 小程序发货-发货记录 */
 	ShopShipmentsRecord (data = {}) {
-		return this.AjaxService.get({ url:'/supplier/shipmentsRecord', data, isLoading: true })
+		return this.AjaxService.get({ 
+			url:'/order/shop/ship/delivery/record', 
+			data, 
+			isLoading: true ,
+			isHost:true
+		})
 	}
 	/* 小程序发货-撤销发货 */
 	ShopCancelShipment (data = {}) {
-		return this.AjaxService.post({ url:'/supplier/cancelShipment', data, isLoading: true })
+		return this.AjaxService.post({ 
+			url:'/order/shop/ship/delivery/cancel', 
+			data, 
+			isLoading: true ,
+			isHost:true
+		})
 	}
 	/* 一级分类 */
 	GetPrimaryClassification (data = {}) {
-		return this.AjaxService.get({ url:'/supplier/primaryClassification', data, isLoading: false })
+		return this.AjaxService.get({ 
+			url:'/supplier/primaryClassification',
+			data, 
+			isLoading: false ,
+		})
 	}
 	/* 二级级分类 */
 	GetPrimarySecondaryClassification (data = {}) {
-		return this.AjaxService.get({ url:'/supplier/secondaryClassification', data, isLoading: false })
+		return this.AjaxService.get({ 
+			url:'/supplier/secondaryClassification', 
+			data, 
+			isLoading: false ,
+		})
 	}
 	/* 三级分类 */
 	GetPrimaryThreeLevelClassification (data = {}) {
-		return this.AjaxService.get({ url:'/supplier/threeLevelClassification', data, isLoading: false })
+		return this.AjaxService.get({ 
+			url:'/supplier/threeLevelClassification', 
+			data, 
+			isLoading: false ,
+		})
 	}
 }