V1.0.1

components/cm-module/headerNavbar/header-back.vue

@@ -1,214 +1,211 @@
 <template name="headerNavbar">
 	<!-- 自定义导航栏 -->
-	<view class='navbar-wrap' :style="{height:navbarHeight+'px',paddingTop:statusBarHeight+'px'}"> 
-	  	<view class="navbar-text" :style="{lineHeight:(navbarHeight - statusBarHeight)+'px;',fontSize:fontSizeSetting+'px;'}" :class="platformClass">
-	    	{{navbarData.title ? navbarData.title : " "}}
-	  	</view>
-	  	<view class="navbar-icon" v-if="navbarData.showCapsule == 1 ? true : false" 
-			  :style="{top:navbarBtn.top + statusBarHeight+'px;',left:(navbarBtn.right)+'px;',height:navbarBtn.height+'px;',lineHeight:navbarBtn.height+'px;'}">
-			  <text v-if='haveBack' @click="_goBack" class="iconfont icon-fanhui"></text>
-			  <text v-if='isShare' @click="_goBack" class="iconfont icon-shouye"></text>
-	  	</view>
-		<view class="navbar-icon" v-if="navbarData.showSearch == 1 ? true : false"
-			  :style="{top:navbarBtn.top + statusBarHeight+'px;',right:(navbarBtn.width)+'px;',height:navbarBtn.height+'px;',lineHeight:navbarBtn.height+'px;'}">
-			  <text @click.stop="_goSearchPath" class="iconfont icon-iconfonticonfontsousuo1"></text>
-			  <text v-if="screenTab === 3" @click.stop="_showRightDrawer" class="iconfont icon-shaixuan"></text>
-	  	</view>
+	<view class="navbar-wrap" :style="{ height: navbarHeight + 'px', paddingTop: statusBarHeight + 'px' }">
+		<view
+			class="navbar-text"
+			:style="{ lineHeight: navbarHeight - statusBarHeight + 'px;', fontSize: fontSizeSetting + 'px;' }"
+			:class="platformClass"
+		>
+			{{ navbarData.title ? navbarData.title : ' ' }}
+		</view>
+		<view
+			class="navbar-icon"
+			v-if="navbarData.showCapsule == 1 ? true : false"
+			:style="{
+				top: navbarBtn.top + statusBarHeight + 'px;',
+				left: navbarBtn.right + 'px;',
+				height: navbarBtn.height + 'px;',
+				lineHeight: navbarBtn.height + 'px;'
+			}"
+		>
+			<text v-if="haveBack" @click="_goBack" class="iconfont icon-fanhui"></text>
+			<text v-if="isShare" @click="_goBack" class="iconfont icon-shouye"></text>
+		</view>
+		<view
+			class="navbar-icon"
+			v-if="navbarData.showSearch == 1 ? true : false"
+			:style="{
+				top: navbarBtn.top + statusBarHeight + 'px;',
+				right: navbarBtn.width + 'px;',
+				height: navbarBtn.height + 'px;',
+				lineHeight: navbarBtn.height + 'px;'
+			}"
+		>
+			<text @click.stop="_goSearchPath" class="iconfont icon-iconfonticonfontsousuo1"></text>
+			<text v-if="screenTab === 3" @click.stop="_showRightDrawer" class="iconfont icon-shaixuan"></text>
+		</view>
 	</view>
 </template>
 
 <script>
-	var self
-	export default{
-		name:'headerNavbar',
-		props:{ 
-		    navbarData: { // 由父页面传递的数据
-				type: Object
-		    },
-			systeminfo:{
-				type:Object
-			},
-			headerBtnPosi:{
-				type:Object
-			},
-			isShare:{
-				type:Boolean
-			},
-			isDelete:{
-				type:Boolean
-			},
-			isUsertype:{
-				type:Number
-			},
-			screenTab:{
-				type:Number
-			}
+var self
+export default {
+	name: 'headerNavbar',
+	props: {
+		navbarData: {
+			// 由父页面传递的数据
+			type: Object
 		},
-		data() {
-			return{
-				haveBack: true,     // 是否有返回按钮，true 有 false 没有 若从分享页进入则为 false
-			    statusBarHeight: 0, // 状态栏高度
-			    navbarHeight: 0,    // 顶部导航栏高度
-			    navbarBtn: {        // 胶囊位置信息
-			      height: 0,
-			      width: 0,
-			      top: 0,
-			      bottom: 0,
-			      right: 0
-				},
-				platformClass:'',
-				fontSizeSetting:0,
-				
-			}
+		systeminfo: {
+			type: Object
 		},
-		created() {
-			let statusBarHeight = this.systeminfo.statusBarHeight // 状态栏高度
-			let headerPosi = this.headerBtnPosi // 胶囊位置信息
-			this.fontSizeSetting = this.systeminfo.fontSizeSetting
-			if(this.systeminfo.platform == 'android'){
-				this.platformClass = 'left'
-			}else{
-				this.platformClass = 'center'
-			}
-		    /**
-		     * wx.getMenuButtonBoundingClientRect() 坐标信息以屏幕左上角为原点
-		     * 菜单按键宽度： 87
-		     * 菜单按键高度： 32
-		     * 菜单按键左边界坐标： 278
-		     * 菜单按键上边界坐标： 26
-		     * 菜单按键右边界坐标： 365
-		     * 菜单按键下边界坐标： 58
-		     */
-			let btnPosi = { // 胶囊实际位置，坐标信息不是左上角原点
-			      height: headerPosi.height,
-			      width: headerPosi.width,
-			      // 胶囊top - 状态栏高度
-			      top: headerPosi.top - statusBarHeight,
-			      // 胶囊bottom - 胶囊height - 状态栏height （现胶囊bottom 为距离导航栏底部的长度）
-			      bottom: headerPosi.bottom - headerPosi.height - statusBarHeight,
-			      // 屏幕宽度 - 胶囊right
-			      right: this.systeminfo.screenWidth - headerPosi.right
-			}
-			let haveBack
-			if (getCurrentPages().length === 1) { // 当只有一个页面时
-			     haveBack = false
+		headerBtnPosi: {
+			type: Object
+		},
+		isShare: {
+			type: Boolean
+		},
+		isDelete: {
+			type: Boolean
+		},
+		isUsertype: {
+			type: Number
+		},
+		screenTab: {
+			type: Number
+		}
+	},
+	data() {
+		return {
+			haveBack: true, // 是否有返回按钮，true 有 false 没有 若从分享页进入则为 false
+			statusBarHeight: 0, // 状态栏高度
+			navbarHeight: 0, // 顶部导航栏高度
+			navbarBtn: {
+				// 胶囊位置信息
+				height: 0,
+			 width: 0,
+				top: 0,
+				bottom: 0,
+				right: 0
+			},
+			platformClass: '',
+			fontSizeSetting: 0
+		}
+	},
+	created() {
+		let statusBarHeight = this.systeminfo.statusBarHeight // 状态栏高度
+		let headerPosi = this.headerBtnPosi // 胶囊位置信息
+		this.fontSizeSetting = this.systeminfo.fontSizeSetting
+		if (this.systeminfo.platform == 'android') {
+			this.platformClass = 'left'
+		} else {
+			this.platformClass = 'center'
+		}
+		/**
+		 * wx.getMenuButtonBoundingClientRect() 坐标信息以屏幕左上角为原点
+		 * 菜单按键宽度： 87
+		 * 菜单按键高度： 32
+		 * 菜单按键左边界坐标： 278
+		 * 菜单按键上边界坐标： 26
+		 * 菜单按键右边界坐标： 365
+		 * 菜单按键下边界坐标： 58
+		 */
+		let btnPosi = {
+			// 胶囊实际位置，坐标信息不是左上角原点
+			height: headerPosi.height,
+			width: headerPosi.width, // 胶囊top - 状态栏高度
+			top: headerPosi.top - statusBarHeight, // 胶囊bottom - 胶囊height - 状态栏height （现胶囊bottom 为距离导航栏底部的长度）
+			bottom: headerPosi.bottom - headerPosi.height - statusBarHeight, // 屏幕宽度 - 胶囊right
+			right: this.systeminfo.screenWidth - headerPosi.right
+		}
+		let haveBack
+		if (getCurrentPages().length === 1) {
+			// 当只有一个页面时
+			haveBack = false
+		} else {
+			haveBack = true
+		}
+		;(this.haveBack = haveBack), // 获取是否是通过分享进入的小程序
+			(this.statusBarHeight = statusBarHeight),
+			(this.navbarHeight = headerPosi.bottom + btnPosi.bottom), // 原胶囊bottom + 现胶囊bottom
+			(this.navbarBtn = btnPosi)
+	},
+	watch: {
+		screenTab(newVal, oldVal) {
+			// newVal是新值，oldVal是旧值
+			this.screenTab = newVal
+		}
+	},
+	methods: {
+		_goBack() {
+			if (this.isShare) {
+				this._goHome()
+			} else if (this.isDelete) {
+				this._goUser()
 			} else {
-			     haveBack = true
+				uni.navigateBack({
+					delta: 1
+				})
 			}
-		    this.haveBack=haveBack, // 获取是否是通过分享进入的小程序
-		    this.statusBarHeight=statusBarHeight,
-		    this.navbarHeight= headerPosi.bottom + btnPosi.bottom, // 原胶囊bottom + 现胶囊bottom
-		    this.navbarBtn=btnPosi
 		},
-		watch: {
-		  screenTab(newVal, oldVal){
-		    // newVal是新值，oldVal是旧值
-		    this.screenTab = newVal
-		  }
+		_goHome() {
+			uni.switchTab({
+				url: '/pages/tabBar/home/index'
+			})
 		},
-		methods:{
-			_goBack() {
-				if(this.isShare){
-					this._goHome()
-				}else if(this.isDelete){
-					this._goUser()
-				}else{
-					uni.navigateBack({
-			        	delta: 1
-			      	})
-				}
-		    },
-		    _goHome() {
-		      	uni.switchTab({
-		        	url: '/pages/tabBar/home/index'
-		      	})
-		    },
-		    _goUser() {
-		      	uni.switchTab({
-		        	url: '/pages/tabBar/user/user'
-		      	})
-		    },
-			_goSearchPath() {
-				this.$emit('goSearchPath')
-			},
-			_showRightDrawer() {
-				//显示筛选抽屉
-				this.$parent.rightDrawer = true
-			},
+		_goUser() {
+			uni.switchTab({
+				url: '/pages/tabBar/user/user'
+			})
 		},
-		onShow(){
-	
+		_goSearchPath() {
+			this.$emit('goSearchPath')
+		},
+		_showRightDrawer() {
+			//显示筛选抽屉
+			this.$parent.rightDrawer = true
 		}
-	}
+	},
+	onShow() {}
+}
 </script>
 
 <style lang="scss">
-	.navbar-wrap {
-		 position: fixed;
-		 width: 100%;
-		 top: 0;
-		 z-index: 100000;
-		 box-sizing: border-box;
-		 background: #FFFFFF;
-	}
-	.navbar-text {
-		 font-size: 30rpx;
-		 color: #000000;
-		 font-weight: 500;
-	}
-	.navbar-text.center{
-		text-align: center;
-	}
-	.navbar-text.left{
-		text-align: left;
-		padding-left: 38px;
-	}
-	.navbar-icon {
-		 position: fixed;
-		 display: flex;
-		 box-sizing: border-box;
-	}
-	.navbar-icon .iconfont {
-		 display: inline-block;
-		 overflow: hidden;
-		 font-size: 42rpx;
-		 padding-right:40rpx;
-		 margin-top: 1px;
-	}
-	.navbar-icon .icon-iconfonticonfontsousuo1 {
-		color: #000000;
-	}
-	.navbar-icon .icon-shaixuan {
-		color: #000000;
-	}
-	.navbar-icon view {
-		 height: 18px;
-		 border-left: 0.5px solid rgba(0,0,0, 0.3);
-		 margin-top: 6px;
-	}
-	.navbar-loading {
-		 background: #fff;
-		 text-align: center;
-	}
+.navbar-wrap {
+	position: fixed;
+	width: 100%;
+	top: 0;
+	z-index: 100000;
+	box-sizing: border-box;
+	background: #ffffff;
+}
+.navbar-text {
+	font-size: 30rpx;
+	color: #000000;
+	font-weight: 500;
+}
+.navbar-text.center {
+	text-align: center;
+}
+.navbar-text.left {
+	text-align: left;
+	padding-left: 38px;
+}
+.navbar-icon {
+	position: fixed;
+	display: flex;
+	box-sizing: border-box;
+}
+.navbar-icon .iconfont {
+	display: inline-block;
+	overflow: hidden;
+	font-size: 42rpx;
+	padding-right: 40rpx;
+	margin-top: 1px;
+}
+.navbar-icon .icon-iconfonticonfontsousuo1 {
+	color: #000000;
+}
+.navbar-icon .icon-shaixuan {
+	color: #000000;
+}
+.navbar-icon view {
+	height: 18px;
+	border-left: 0.5px solid rgba(0, 0, 0, 0.3);
+	margin-top: 6px;
+}
+.navbar-loading {
+	background: #fff;
+	text-align: center;
+}
 </style>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

pages/login/register.vue

@@ -376,16 +376,16 @@ export default {
 			//获取用户微信个人信息
 			const self = this
 			wx.getUserProfile({
-				desc: '联合丽格集采商城小程序获取您的信息', // 声明获取用户个人信息后的用途，后续会展示在弹窗中，请谨慎填写
+				desc: '丽格集采商城获取您的信息', // 声明获取用户个人信息后的用途，后续会展示在弹窗中，请谨慎填写
 				success(res) {
 					console.log('微信获取用户信息新API', res)
 					self.wxLogin(res.userInfo)
 					self.params.nickName = res.userInfo.nickName
 					self.params.avatarUrl = res.userInfo.avatarUrl
-					
 					self.userAccountRegister(self.params)
 				},
-				fail() {
+				fail(error) {
+					console.log('error', error)
 					self.$util.msg('授权失败', 2000)
 				}
 			})

pages/seller/order/components/cm-invice-popup.vue

@@ -271,7 +271,7 @@ export default {
 		async updateInvoiceFn() {
 			try {
 				const resolve = await this.$api.getComStorage('orderUserInfo')
-				const res = await this.OrderService.UpdateInvoice({ ...this.invoiceData,...{userId: resolve.userId }})
+				const res = await this.OrderService.updateOrganize({ ...this.invoiceData,...{userId: resolve.userId }})
 				this.invoiceText = this.setInvoiceText(this.invoiceData)
 				this.$emit('handleChoiceaInvoice', this.invoiceData)
 				this.popupShow = false

pages/seller/order/components/details/cm-goods-temp.vue

@@ -90,10 +90,10 @@
 						</view>
 					</view>
 				</view>
-				<view class="goods-pros-m" v-if="item.note">
+				<view class="goods-pros-m" v-if="orderInfo.note">
 					<view class="m-text">留言:</view>
 					<view class="m-input">
-						<view class="text">{{ item.note ? item.note : '' }}</view>
+						<view class="text">{{ orderInfo.note ? orderInfo.note : '' }}</view>
 					</view>
 				</view>
 			</view>
@@ -136,7 +136,6 @@
 export default {
 	name: 'goods',
 	props: {
-		
 		list: {
 			type: Array
 		},

pages/seller/order/order-search.vue

@@ -12,18 +12,18 @@
 						confirm-type="search"
 						@focus="onFocus"
 						@input="onShowClose"
-						@confirm="subMitSearch()"
+						@confirm="subMitSearch"
 						placeholder="请输入商品关键词"
 						v-model.trim="listQuery.searchWord"
 					/>
-					<text class="iconfont icon-shanchu1" v-if="isShowClose" @click="delInputText()"></text>
+					<text class="iconfont icon-shanchu" v-if="isShowClose" @click="delInputText()"></text>
 				</view>
-				<view class="search-btn" @click="subMitSearch()">搜索</view>
+				<view class="search-btn" @click="subMitSearch">搜索</view>
 			</view>
 		</view>
 		<view class="search-container-history" v-if="!isShowWrapper">
 			<view :class="'s-' + themeClass" v-if="serachRecordList.length > 0">
-				<view class="header"> 搜索历史<text class="iconfont icon-shanchu" @click="confirmDetele"></text> </view>
+				<view class="header"> 搜索历史<text class="iconfont icon-shanchu1" @click="confirmDetele"></text> </view>
 				<view class="list">
 					<view
 						v-for="(item, index) in serachRecordList"
@@ -288,6 +288,7 @@ export default {
 			isCenceModal: false, //控制取消订单弹窗
 			isShowDelModal: false, //控制删除订单弹窗
 			isModalLayer: false,
+			isShareType: 2,
 			loadding: false,
 			pullUpOn: true,
 			hasNextPage: false,
@@ -306,11 +307,10 @@ export default {
 	methods: {
 		subMitSearch() {
 			if (this.listQuery.searchWord == '') {
-				this.$util.msg('请输入订单编号', 2000)
-			} else {
-				this.commodityList = []
-				this.getOrderDatainit()
+				this.$util.msg('请输入订单关键词', 2000)
+				return
 			}
+			this.getOrderDatainit()
 		},
 		async initGetSerachRecord() {
 			try{
@@ -342,6 +342,8 @@ export default {
 		// 搜索订单列表
 		async getOrderDatainit() {
 			try{
+				this.orderList = []
+				this.listQuery.pageNum = 1
 				const res = await this.SellerService.getSellerSearchOrderList(this.listQuery)
 				const data = res.data
 				if (data && data.list.length > 0) {
@@ -527,7 +529,7 @@ page {
 			left: 24rpx;
 			z-index: 10;
 		}
-		.icon-shanchu1 {
+		.icon-shanchu {
 			font-size: 36rpx;
 			color: #8a8a8a;
 			position: absolute;
@@ -574,7 +576,7 @@ page {
 		font-size: 30rpx;
 		font-weight: bold;
 		position: relative;
-		.icon-shanchu {
+		.icon-shanchu1 {
 			font-size: 36rpx;
 			color: #333333;
 			float: right;

pages/user/collection/collection.vue

@@ -87,7 +87,7 @@
 			:popupShow="popupShow1"
 			:skuProduct="handleData"
 			@skuClick="handleSkuClick"
-		></cm-unit-popup>
+		/>
 		<!-- 弹窗提示 -->
 		<tui-modal
 			:show="modal"
@@ -99,8 +99,7 @@
 			:size="32"
 			shape="circle"
 			:maskClosable="false"
-		>
-		</tui-modal>
+		/>
 		<!-- 可拖动悬浮按钮 -->
 		<cm-drag
 			:cartNum="cartQuantity"
@@ -109,8 +108,7 @@
 			@btnClick="btnClick"
 			@btnTouchstart="btnTouchstart"
 			@btnTouchend="btnTouchend"
-		>
-		</cm-drag>
+		/>
 	</view>
 </template>
 <script>

pages/user/order/components/details/cm-goods-temp.vue

@@ -2,60 +2,57 @@
 	<view class="goods-template">
 		<!-- 商品列表 -->
 		<view class="goods-list">
-			<view v-for="(item, index) in list" :key="index" class="goods-item clearfix">
+			<view v-for="(pros, index) in dataList" :key="index" class="goods-item clearfix">
 				<view class="shoptitle">
-<!-- 					<view class="title-text" v-if="information.secondHandOrderFlag == 1"
-						>{{ item.shopName }}
-					</view> -->
-					<view class="title-text" @click="goShophome(item)">
-						{{ item.shopName }} <label class="iconfont icon-jinrudianpu"></label>
+					<view class="title-text">
+						{{ pros.shopName }}
 					</view>
 				</view>
-				<view class="productlist" v-for="(i, o) in item.orderProductList" :key="o">
-					<view class="goods-pros-t " @click="details(i)">
+				<view class="productlist">
+					<view class="goods-pros-t" @click="details(pros)">
 						<view class="pros-left">
 							<view class="pros-img">
-								<image :src="i.image" alt="" />
+								<image :src="pros.image" alt="" />
 							</view>
 						</view>
 						<view class="pros-product">
-							<view class="producttitle">{{ i.name }}</view>
-							<view class="productspec product-view" v-if="i.productCategory != 2"
-								>规格：{{ i.productUnit ? i.productUnit : '' }}</view
+							<view class="producttitle">{{ pros.name }}</view>
+							<view class="productspec product-view" v-if="pros.productCategory != 2"
+								>规格：{{ pros.productUnit ? pros.productUnit : '' }}</view
 							>
 							<view class="product-view">
-								<view class="view-num red">￥{{ i.price | NumFormat }}</view>
-								<view class="view-num right">x {{ i.num }}</view>
+								<view class="view-num red">￥{{ pros.price | NumFormat }}</view>
+								<view class="view-num right">x {{ pros.num }}</view>
 							</view>
 						</view>
 					</view>
 				</view>
-				<view class="goods-pros-m" v-if="item.note">
+				<view class="goods-pros-m" v-if="orderInfo.note">
 					<view class="m-text">留言:</view>
 					<view class="m-input">
-						<view class="text">{{ item.note ? item.note : '' }}</view>
+						<view class="text">{{ orderInfo.note ? orderInfo.note : '' }}</view>
 					</view>
 				</view>
 				<view class="goods-pros-b clearfix">
 					<view class="pros-price-view">
 						<view class="price-view-le">商品总额：</view>
-						<view class="price-view-ri">￥{{ item.totalAmount | NumFormat }}</view>
+						<view class="price-view-ri">￥{{ orderInfo.totalAmount | NumFormat }}</view>
 					</view>
                     <view class="pros-price-view" @click="popupShow = true">
                     	<view class="price-view-le">运费：</view>
-                    	<view class="price-view-ri">{{ item.postageInfo }}</view>
+                    	<view class="price-view-ri">{{ orderInfo.postageInfo }}</view>
                     </view>
 					<view class="pros-price-view">
 						<view class="price-view-le">应付金额：</view>
-						<view class="price-view-ri">￥{{ item.realPay | NumFormat }}</view>
+						<view class="price-view-ri">￥{{ orderInfo.realPay | NumFormat }}</view>
 					</view>
 					<view class="pros-price-view">
 						<view class="price-view-le">已付金额：</view>
-						<view class="price-view-ri">￥{{ item.receiptAmount | NumFormat }}</view>
+						<view class="price-view-ri">￥{{ orderInfo.receiptAmount | NumFormat }}</view>
 					</view>
 					<view class="pros-price-view">
 						<view class="price-view-le">待付金额：</view>
-						<view class="price-view-ri red">￥{{ item.obligation | NumFormat }}</view>
+						<view class="price-view-ri red">￥{{ orderInfo.obligation | NumFormat }}</view>
 					</view>
 				</view>
 			</view>
@@ -67,21 +64,21 @@
 export default {
 	name: 'goods',
 	props: {
-		shopOrderData: {
+		list: {
 			type: Object
 		},
-		information: {
+		orderInfo: {
 			type: Object
 		}
 	},
 	data() {
 		return {
-			list: [],
+			dataList: [],
 			vipFlag: 0,
 		}
 	},
 	created() {
-		this.initGetStotage(this.shopOrderData)
+		this.initGetStotage(this.list)
 	},
 	filters: {
 		NumFormat(value) {
@@ -103,13 +100,7 @@ export default {
 		async initGetStotage(data) {
 			const userInfo = await this.$api.getStorage()
 			this.vipFlag = userInfo.vipFlag ? userInfo.vipFlag : 0
-			this.list = [data]
-		},
-		goShophome(shop) {
-			if(shop.shopType === 2){
-				return
-			}
-			this.$api.navigateTo(`/pages/supplier/user/my-shop?shopId=${shop.shopId}`)
+			this.dataList = data
 		},
 		details(pros) {
 			if (pros.validFlag == 9) {

pages/user/order/order-details.vue

@@ -31,9 +31,9 @@
 			<!-- 地址选择 -->
 			<cm-address-temp ref="orderAddress" v-if="skeletonShow" :addressData="addressData" />
 			<!-- 商品 -->
-			<cm-goods-temp ref="goods" v-if="skeletonShow" :shopOrderData="shopOrderData" :information="information" />
+			<cm-goods-temp ref="goods" v-if="skeletonShow" :list="orderInfo.orderProductList" :orderInfo="orderInfo" />
 			<!-- 订单信息 -->
-			<cm-order-temp ref="information" v-if="skeletonShow" :information="shopOrderData" />
+			<cm-order-temp ref="information" v-if="skeletonShow" :information="orderInfo" />
 			<!-- 发票信息 -->
 			<cm-invice-temp ref="invoice" v-if="skeletonShow" :orderInvoice="orderInvoice" />
 			<!-- 支付记录 -->
@@ -159,7 +159,6 @@ export default {
 			alertOrderInfo: {},
 			addressData: {}, //地址信息初始化
 			information: {}, //订单信息初始化
-			shopOrderData: {}, //商品信息初始化
 			orderInvoice: {}, //发票信息初始化
 			returnedPurchaseList: [], //退款信息初始化
 			discernReceiptList: [], //支付信息初始化
@@ -244,11 +243,9 @@ export default {
 				this.orderInfo = data.shopOrder
 				// this.shareCode = data.shareCode
 				this.addressData = data.userInfo
-				this.information = data.shopOrder
 				this.btnStatus = data.shopOrder.status
 				this.payStatus = data.shopOrder.payStatus
 				this.payableAmount = data.shopOrder.payableAmount
-				this.shopOrderData = data.shopOrder
 				this.orderInvoice = data.orderInvoice
 				this.onlinePayFlag = data.shopOrder.onlinePayFlag
 				this.returnedPurchaseList = data.returnedPurchaseList

pages/user/order/order-search.vue

@@ -56,7 +56,7 @@
 							class="tui-order-item"
 							v-for="(order, orderIndex) in orderList"
 							:key="orderIndex"
-							@click.stop="detail(order.orderId)"
+							@click.stop="detail(order.shopOrderId)"
 						>
 							<view class="order-title">
 								<view class="order-title-t">
@@ -85,7 +85,7 @@
 										{{ shop.shopName }} <label class="iconfont icon-jinrudianpu"></label>
 									</view>
 								</view>
-								<view class="goods-item" @click.stop="detail(shop.shopOrderId, shop.orderId)">
+								<view class="goods-item">
 									<view class="goods-pros-t">
 										<view class="pros-img tui-skeleton-fillet">
 											<image :src="shop.image" alt="" />

pages/user/order/order-sharedetails.vue

@@ -1,40 +1,47 @@
 <template>
 	<view class="container details clearfix">
-		<!-- 地址选择 -->
-		<cm-address-temp ref="orderAddress" v-if="isRequest" :addressData="addressData" />
-		<!-- 商品 -->
-		<cm-goods-temp ref="goods" v-if="isRequest" :shopOrderData="shopOrderData" @popupClick="hanldePopupFn" />
-		<!-- 订单信息 -->
-		<cm-order-temp ref="information" v-if="isRequest" :information="information" />
-		<!-- 发票信息 -->
-		<cm-invice-temp ref="invoice" v-if="isRequest" :orderInvoice="orderInvoice" />
-		<!-- 支付记录 -->
-		<cm-payment-temp
-			ref="payment"
-			v-if="isRequest"
-			:discernReceiptList="discernReceiptList"
-			:receiptAmount="receiptAmount"
+		<tui-skeleton
+			v-if="!skeletonShow"
+			backgroundColor="#fafafa"
+			borderRadius="10rpx"
+			:isLoading="true"
+			:loadingType="5"
 		/>
-		<!-- 退款记录 -->
-		<cm-refund-temp
-			ref="refund"
-			v-if="isRequest"
-			:returnedPurchaseList="returnedPurchaseList"
-			:returnedPurchaseFee="returnedPurchaseFee"
-		/>
-		<!-- 支付凭证记录 -->
-		<cm-voucher-temp
-			ref="voucher"
-			v-if="skeletonShow && voucherList && voucherList.length > 0"
-			:list="voucherList"
-		/>
-		<!-- 底部button -->
-		<view class="button-content" :style="{ paddingBottom: isIphoneX ? '68rpx' : '34rpx' }">
-			<view class="btn btn-query" v-if="btnState.isQuery" @click.stop="queryLogistics">查看物流</view>
-			<view class="btn btn-cancel" v-if="btnState.isPay" @click.stop="btnConfirmPay">立即支付</view>
-		</view>
-		<!-- 促销活动弹窗 -->
-		<activi-popup :Promotion="handlerPros" :popupShow="popupShow" />
+		<template v-else>
+			<!-- 地址选择 -->
+			<cm-address-temp ref="orderAddress" v-if="skeletonShow" :addressData="addressData" />
+			<!-- 商品 -->
+				<cm-goods-temp ref="goods" v-if="skeletonShow" :list="orderInfo.orderProductList" :orderInfo="orderInfo" />
+			<!-- 订单信息 -->
+			<cm-order-temp ref="information" v-if="skeletonShow" :information="orderInfo" />
+			<!-- 发票信息 -->
+			<cm-invice-temp ref="invoice" v-if="skeletonShow" :orderInvoice="orderInvoice" />
+			<!-- 支付记录 -->
+			<cm-payment-temp
+				ref="payment"
+				v-if="skeletonShow"
+				:discernReceiptList="discernReceiptList"
+				:receiptAmount="receiptAmount"
+			/>
+			<!-- 退款记录 -->
+			<cm-refund-temp
+				ref="refund"
+				v-if="skeletonShow"
+				:returnedPurchaseList="returnedPurchaseList"
+				:returnedPurchaseFee="returnedPurchaseFee"
+			/>
+			<!-- 支付凭证记录 -->
+			<cm-voucher-temp
+				ref="voucher"
+				v-if="skeletonShow && voucherList && voucherList.length > 0"
+				:list="voucherList"
+			/>
+			<!-- 底部button -->
+			<view class="button-content" :style="{ paddingBottom: isIphoneX ? '68rpx' : '34rpx' }">
+				<view class="btn btn-query" v-if="btnState.isQuery" @click.stop="queryLogistics">查看物流</view>
+				<view class="btn btn-cancel" v-if="btnState.isPay" @click.stop="btnConfirmPay">立即支付</view>
+			</view>
+		</template>
 	</view>
 </template>
 
@@ -46,7 +53,6 @@ import cmOrderTemp from './components/details/cm-order-temp' //订单信息
 import cmPaymentTemp from './components/details/cm-payment-temp' //支付记录
 import cmRefundTemp from './components/details/cm-refund-temp' //退款记录
 import cmVoucherTemp from './components/details/cm-voucher-temp' //支付凭证记录
-import activiPopup from './components/details/activipopu' //促销活动弹窗
 
 export default {
 	components: {
@@ -57,7 +63,6 @@ export default {
 		cmPaymentTemp,
 		cmRefundTemp,
 		cmVoucherTemp,
-		activiPopup
 	},
 	data() {
 		return {
@@ -65,12 +70,11 @@ export default {
 			userId: '',
 			orderId: '',
 			shopOrderId: '',
+			skeletonShow: false,
 			cellPhone: '', //客服电话
 			btnStatus: 0, //按钮组件状态
-			isRequest: false, //是否加载完成渲染子组件
 			addressData: {}, //地址信息初始化
-			information: {}, //订单信息初始化
-			shopOrderData: {}, //商品信息初始化
+			orderInfo: {}, //订单信息初始化
 			orderInvoice: {}, //发票信息初始化
 			returnedPurchaseList: {}, //退款信息初始化
 			discernReceiptList: {}, //支付信息初始化
@@ -96,33 +100,31 @@ export default {
 		this.initOrderDetaileData()
 	},
 	methods: {
-		initOrderDetaileData() {
-			//初始化页面数据@参数：订单ID
-			this.OrderService.QueryOrderDetails({ shopOrderId: this.shopOrderId, userId: this.userId })
-				.then(response => {
-					let data = response.data
-					this.status = data.order.status
-					this.addressData = data.userInfo
-					this.information = data.order
-					this.shopOrderData = data.shopOrderList
-					this.orderInvoice = data.orderInvoice
-					this.returnedPurchaseList = data.returnedPurchaseList
-					this.discernReceiptList = data.discernReceiptList
-					this.receiptAmount = data.order.receiptAmount
-					this.returnedPurchaseFee = data.order.returnedPurchaseFee
-					this.voucherList = data.voucher
-					this.isRequest = true
-					this.mapStateArr.forEach(el => {
-						el.val.forEach(value => {
-							if (this.status === value) {
-								this.btnState[el.label] = el.status
-							}
-						})
+		async initOrderDetaileData() {
+			try{
+				const res = await this.OrderService.QueryOrderDetails({ shopOrderId: this.shopOrderId, userId: this.userId })
+				const data = res.data
+				this.skeletonShow = true
+				this.status = data.shopOrder.status
+				this.addressData = data.userInfo
+				this.orderInfo = data.shopOrder
+				this.orderInvoice = data.orderInvoice
+				this.returnedPurchaseList = data.returnedPurchaseList
+				this.discernReceiptList = data.discernReceiptList
+				this.receiptAmount = data.order.receiptAmount
+				this.returnedPurchaseFee = data.shopOrder.returnedPurchaseFee
+				this.voucherList = data.voucher
+				this.mapStateArr.forEach(el => {
+					el.val.forEach(value => {
+						if (this.status === value) {
+							this.btnState[el.label] = el.status
+						}
 					})
 				})
-				.catch(error => {
-					this.$util.msg(error.msg, 2000)
-				})
+				
+			}catch(error){
+				this.$util.msg(error.msg, 2000)
+			}
 		},
 		hanldePopupFn(data) {
 			//监听活动内容
@@ -131,30 +133,21 @@ export default {
 		},
 		queryLogistics() {
 			//跳转查询物流页面
-			this.$api.navigateTo('/pages/user/order/order-logistics?orderId=' + this.orderId)
+			this.$api.navigateTo('/pages/user/order/order-logistics?shopOrderId=' + this.shopOrderId)
 		},
 		btnConfirmPay() {
 			// 立即支付点击事件
-			this.getOrderPaymentValidation(this.orderId)
+			this.getOrderPaymentValidation()
+		},
+		//监听根据付款状态做操作
+		async getOrderPaymentValidation() {
+			try{
+				const res = await this.OrderService.OrderPaymentValidation({ shopOrderId: this.shopOrderId })
+				this.$api.navigateTo(`/pages/user/order/order-pay-list?shopOrderId=${res.data.shopOrderId}`)
+			}catch(error){
+				this.$util.msg(error.msg, 2000)
+			}
 		},
-		getOrderPaymentValidation(orderId) {
-			//监听根据付款状态做操作
-			this.OrderService.OrderPaymentValidation({ shopOrderId: orderId })
-				.then(response => {
-					if (response.data.code == -1) {
-						this.$util.modal('', '订单已申请全部退款，无需再付款！', '确定', '', false, () => {})
-					} else {
-						if (response.data.onlinePayFlag === 1) {
-							this.$api.navigateTo(`/pages/user/pay/card-under?orderId=${orderId}`)
-						} else {
-							this.$api.navigateTo(`/pages/user/order/order-pay-list?orderId=${orderId}`)
-						}
-					}
-				})
-				.catch(error => {
-					this.$util.msg(error.msg, 2000)
-				})
-		}
 	},
 	onShow() {}
 }

pages/user/pay/card-under.vue

@@ -1,53 +1,49 @@
 <template>
-    <view class="container cashier">
-        <tui-skeleton
-            v-if="skeletonShow"
-            backgroundColor="#fafafa"
-            borderRadius="10rpx"
-            :isLoading="true"
-            :loadingType="5"
-        ></tui-skeleton>
-        <view class="container-cash clearfix" v-else>
-            <view class="container-wrapper">
-                <view class="pay-content">
-                    <view class="pay-p"><text>待付金额</text></view>
-                    <view class="pay-money">
-                        <text class="pay-sm">￥</text>
-                        <text class="pay-bg">{{ payableAmount | NumFormat }}</text>
-                    </view>
-                </view>
-            </view>
-            <view class="pay-bring-wrapper clearfix">
-                <view class="pay-bring-content">
-                    <view class="text-v-title title">
-                        <text class="account">转账信息</text>
-                        <text
-                            class="clipboard"
-                            v-if="bankInfo.bankAccountName || bankInfo.bankAccount || bankInfo.bankName"
-                            @click.stop="clipboard(clipboardtEXT)"
-                        >
-                            复制信息
-                        </text>
-                    </view>
-                    <view class="text-v">
-                        <text class="label">开户行：</text>
-                        {{ bankInfo.bankAccountName || '暂无' }}
-                    </view>
-                    <view class="text-v">
-                        <text class="label">银行卡号：</text>
-                        {{ bankInfo.bankAccount || '暂无' }}
-                    </view>
-                    <view class="text-v">
-                        <text class="label">公司名称：</text>
-                        {{ bankInfo.bankName || '暂无' }}
-                    </view>
-                    <view class="text-content">
-                        请将订单款项转账至上述账号，转账完成后截图支付凭证，并在订单页面上传支付凭证。
-                    </view>
-                </view>
-            </view>
-        </view>
-    </view>
+	<view class="container cashier">
+		<tui-skeleton
+			v-if="skeletonShow"
+			backgroundColor="#fafafa"
+			borderRadius="10rpx"
+			:isLoading="true"
+			:loadingType="5"
+		></tui-skeleton>
+		<view class="container-cash clearfix" v-else>
+			<view class="container-wrapper">
+				<view class="pay-content">
+					<view class="pay-p"><text>待付金额</text></view>
+					<view class="pay-money">
+						<text class="pay-sm">￥</text> <text class="pay-bg">{{ payableAmount | NumFormat }}</text>
+					</view>
+				</view>
+			</view>
+			<view class="pay-bring-wrapper clearfix">
+				<view class="pay-bring-content">
+					<view class="text-v-title title">
+						<text class="account">转账信息</text>
+						<text
+							class="clipboard"
+							v-if="bankInfo.bankAccountName || bankInfo.bankAccount || bankInfo.bankName"
+							@click.stop="clipboard(clipboardtEXT)"
+						>
+							复制信息
+						</text>
+					</view>
+					<view class="text-v">
+						<text class="label">开户行：</text> {{ bankInfo.bankAccountName || '暂无' }}
+					</view>
+					<view class="text-v">
+						<text class="label">银行卡号：</text> {{ bankInfo.bankAccount || '暂无' }}
+					</view>
+					<view class="text-v">
+						<text class="label">公司名称：</text> {{ bankInfo.bankName || '暂无' }}
+					</view>
+					<view class="text-content">
+						请将订单款项转账至上述账号，转账完成后截图支付凭证，并在订单页面上传支付凭证。
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
 </template>
 
 <script>
@@ -55,528 +51,528 @@ const thorui = require('@/components/clipboard/clipboard.thorui.js')
 import bankMixins from './mixins/bankMixins.js'
 
 export default {
-    mixins: [bankMixins],
-    data() {
-        return {
-            bankInfo: {
-                bankAccountName: '江苏银行北京朝阳门支行',
-                bankAccount: '32250188000060717',
-                name: '联合丽格（北京）医疗美容投资连锁集团股份有限公司'
-            },
-            clipboardtEXT:
-                '开户行：江苏银行北京朝阳门支行，银行卡号：32250188000060717，公司名称：联合丽格（北京）医疗美容投资连锁集团股份有限公司',
-            orderId: '',
-            shopOrderId: '',
-            payableAmount: 0,
-            payOrderId: '',
-            isIphoneX: this.$store.state.isIphoneX,
-            CustomBar: this.CustomBar, // 顶部导航栏高度
-            skeletonShow: true,
-            productImage: ['https://static.caimei365.com/app/img/icon/icon-vxkecode.png']
-        }
-    },
-    onLoad(option) {
-        this.initData(option)
-    },
-    filters: {
-        NumFormat(value) {
-            if (!value) return '0.00'
-            /*原来用的是Number(value).toFixed(0)，这样取整时有问题，例如0.51取整之后为1，感谢Nils指正*/
-            /*后来改成了 Number(value)|0,但是输入超过十一位就为负数了，具体见评论 */
-            var intPart = Number(value) - (Number(value) % 1) //获取整数部分（这里是windy93的方法）
-            var intPartFormat = intPart.toString().replace(/(\d)(?=(?:\d{3})+$)/g, '$1,') //将整数部分逢三一断
-            var floatPart = '.00' //预定义小数部分
-            var value2Array = value.toString().split('.')
-            //=2表示数据有小数位
-            if (value2Array.length == 2) {
-                floatPart = value2Array[1].toString() //拿到小数部分
+	mixins: [bankMixins],
+	data() {
+		return {
+			bankInfo: {
+				bankAccountName: '江苏银行北京朝阳门支行',
+				bankAccount: '32250188000060717',
+				name: '联合丽格（北京）医疗美容投资连锁集团股份有限公司'
+			},
+			clipboardtEXT:
+				'开户行：江苏银行北京朝阳门支行，银行卡号：32250188000060717，公司名称：联合丽格（北京）医疗美容投资连锁集团股份有限公司',
+			orderId: '',
+			shopOrderId: '',
+			payableAmount: 0,
+			payOrderId: '',
+			isIphoneX: this.$store.state.isIphoneX,
+			CustomBar: this.CustomBar, // 顶部导航栏高度
+			skeletonShow: true,
+			productImage: ['https://static.caimei365.com/app/img/icon/icon-vxkecode.png']
+		}
+	},
+	onLoad(option) {
+		this.initData(option)
+	},
+	filters: {
+		NumFormat(value) {
+			if (!value) return '0.00'
+			/*原来用的是Number(value).toFixed(0)，这样取整时有问题，例如0.51取整之后为1，感谢Nils指正*/
+			/*后来改成了 Number(value)|0,但是输入超过十一位就为负数了，具体见评论 */
+			var intPart = Number(value) - (Number(value) % 1) //获取整数部分（这里是windy93的方法）
+			var intPartFormat = intPart.toString().replace(/(\d)(?=(?:\d{3})+$)/g, '$1,') //将整数部分逢三一断
+			var floatPart = '.00' //预定义小数部分
+			var value2Array = value.toString().split('.')
+			//=2表示数据有小数位
+			if (value2Array.length == 2) {
+				floatPart = value2Array[1].toString() //拿到小数部分
 
-                if (floatPart.length == 1) {
-                    //补0,实际上用不着
-                    return intPartFormat + '.' + floatPart + '0'
-                } else {
-                    return intPartFormat + '.' + floatPart
-                }
-            } else {
-                return intPartFormat + floatPart
-            }
-        }
-    },
-    methods: {
-        initData(e) {
-            this.shopOrderId = e.shopOrderId
-            this.payOrderId = '#' + e.orderId + '#'
-            // this.cmGetBankTypeLists()
-            this.PayOrderCheckoutCounter(this.shopOrderId)
-        },
-        async PayOrderCheckoutCounter(shopOrderId) {
-            try {
-                const { data } = await this.PayService.PayOrderCheckoutCounter({ shopOrderId: shopOrderId })
-                this.payableAmount = data.shopOrder.obligation
-                const { data: bankData } = await this.PayService.getShopBank({ shopId: data.shopOrder.shopId })
-                this.bankInfo = bankData
-                this.clipboardtEXT = `开户行：${bankData.bankAccountName}，银行卡号：${
-                    bankData.bankAccount
-                }，公司名称：${bankData.bankName}`
-                setTimeout(() => {
-                    this.skeletonShow = false
-                }, 500)
-            } catch (error) {
-                console.log('error', error)
-            }
-        },
-        clipboard(data) {
-            thorui.getClipboardData(data, res => {
-                if (res) {
-                    this.$util.msg('复制成功', 2000, true, 'success')
-                } else {
-                    this.$util.msg('复制失败', 2000, true, 'none')
-                }
-            })
-        },
-        previewImg(index) {
-            //顶部商品图片预览
-            let previewUrls = this.productImage
-            uni.previewImage({
-                current: 0, //图片索引
-                urls: previewUrls, //必须是http图片，本地图片无效
-                longPressActions: ''
-            })
-        }
-    },
-    onShow() {}
+				if (floatPart.length == 1) {
+					//补0,实际上用不着
+					return intPartFormat + '.' + floatPart + '0'
+				} else {
+					return intPartFormat + '.' + floatPart
+				}
+			} else {
+				return intPartFormat + floatPart
+			}
+		}
+	},
+	methods: {
+		initData(e) {
+			this.shopOrderId = e.shopOrderId
+			this.payOrderId = '#' + e.orderId + '#'
+			// this.cmGetBankTypeLists()
+			this.PayOrderCheckoutCounter(this.shopOrderId)
+		},
+		async PayOrderCheckoutCounter(shopOrderId) {
+			try {
+				const { data } = await this.PayService.PayOrderCheckoutCounter({ shopOrderId: shopOrderId })
+				this.payableAmount = data.shopOrder.obligation
+				const { data: bankData } = await this.PayService.getShopBank({ shopId: data.shopOrder.shopId })
+				this.bankInfo = bankData
+				this.clipboardtEXT = `开户行：${bankData.bankAccountName}银行卡号：${bankData.bankAccount}公司名称：${
+					bankData.bankName
+				}`
+				setTimeout(() => {
+					this.skeletonShow = false
+				}, 500)
+			} catch (error) {
+				console.log('error', error)
+			}
+		},
+		clipboard(data) {
+			thorui.getClipboardData(data, res => {
+				if (res) {
+					this.$util.msg('复制成功', 2000, true, 'success')
+				} else {
+					this.$util.msg('复制失败', 2000, true, 'none')
+				}
+			})
+		},
+		previewImg(index) {
+			//顶部商品图片预览
+			let previewUrls = this.productImage
+			uni.previewImage({
+				current: 0, //图片索引
+				urls: previewUrls, //必须是http图片，本地图片无效
+				longPressActions: ''
+			})
+		}
+	},
+	onShow() {}
 }
 </script>
 
 <style lang="scss">
 page {
-    height: auto !important;
-    background-color: #ffffff;
+	height: auto !important;
+	background-color: #ffffff;
 }
 .container-cash {
-    width: 100%;
-    padding-bottom: 250rpx;
-    .pay-bring-title {
-        box-sizing: border-box;
-        width: 100%;
-        min-height: 96rpx;
-        padding: 20rpx 24rpx;
-        line-height: 48rpx;
-        text-align: left;
-        font-size: $font-size-24;
-        background: rgba(255, 234, 221, 1);
-        color: $color-system;
-    }
-    .container-wrapper {
-        width: 662rpx;
-        margin: 0 auto;
-        .pay-title {
-            font-size: $font-size-32;
-            line-height: 44rpx;
-            text-align: center;
-            color: #2a86ff;
-            margin: 40rpx 0 0 0;
-            width: 100%;
-            float: left;
-        }
-        .pay-content {
-            width: 574rpx;
-            height: 136rpx;
-            padding: 52rpx 44rpx;
-            background: url(https://static.caimei365.com/app/mini-mcare/icon/icon_payUnd@2x.png) no-repeat;
-            background-size: cover;
-            float: left;
-            margin-top: 40rpx;
-            .pay-p {
-                font-size: $font-size-26;
-                color: #ffffff;
-                line-height: 36rpx;
-            }
-            .pay-money {
-                color: #ffffff;
-                line-height: 84rpx;
-                font-weight: bold;
-                .pay-sm {
-                    font-size: 40rpx;
-                }
-                .pay-bg {
-                    font-size: 40rpx;
-                }
-            }
-        }
-        .pay-check {
-            width: 100%;
-            height: auto;
-            float: left;
-            .check-title {
-                width: 622rpx;
-                height: 40rpx;
-                line-height: 40rpx;
-                padding: 0 20rpx;
-                margin-top: 24rpx;
-                .text {
-                    font-size: $font-size-28;
-                    color: $text-color;
-                    text-align: left;
-                    float: left;
-                }
-                .icon {
-                    width: 40rpx;
-                    height: 40rpx;
-                    border-radius: 50%;
-                    line-height: 40rpx;
-                    text-align: center;
-                    color: #ffffff;
-                    font-size: $font-size-24;
-                    background: radial-gradient(
-                        circle,
-                        rgba(225, 86, 22, 1) 0%,
-                        rgba(255, 170, 0, 1) 67%,
-                        rgba(249, 185, 156, 1) 100%
-                    );
-                    float: right;
-                }
-            }
-            .pay-checked {
-                width: 100%;
-                height: auto;
-                .pay-item {
-                    width: 618rpx;
-                    height: 96rpx;
-                    border: 2px solid #f5f5f5;
-                    border-radius: 30rpx;
-                    padding: 20rpx;
-                    margin: 24rpx 0;
-                    display: flex;
-                    background-color: #ffffff;
-                    &.current {
-                        border-color: $color-system;
-                        .item-r {
-                            .icon-duigou {
-                                color: $color-system;
-                            }
-                        }
-                    }
-                    .item-l {
-                        flex: 8;
-                        .item-icon {
-                            width: 96rpx;
-                            height: 96rpx;
-                            float: left;
-                            text-align: center;
-                            line-height: 96rpx;
-                            margin-right: 20rpx;
-                            .iconfont {
-                                font-size: 88rpx;
-                            }
-                            .icon-weixinzhifu {
-                                color: #09bb07;
-                            }
-                            .icon-gerenwangyinzhifu {
-                                color: #034582;
-                            }
-                            .icon-daewangyinzhuanzhang {
-                                font-size: 68rpx;
-                                color: #034582;
-                            }
-                            .icon-qiyewangyinzhifu {
-                                color: #004889;
-                            }
-                        }
-                        .item-texts {
-                            line-height: 96rpx;
-                            font-size: $font-size-26;
-                            color: $text-color;
-                        }
-                        .item-text {
-                            line-height: 48rpx;
-                            font-size: $font-size-26;
-                            .txt-p {
-                                color: $text-color;
-                            }
-                            .txt-t {
-                                font-size: $font-size-24;
-                                color: #999999;
-                            }
-                        }
-                    }
-                    .item-r {
-                        flex: 2;
-                        text-align: center;
-                        line-height: 96rpx;
-                        .icon-duigou {
-                            font-size: 60rpx;
-                            color: #ffffff;
-                        }
-                    }
-                }
-            }
-        }
-    }
-    .pay-button {
-        width: 100%;
-        float: left;
-        margin-top: 30rpx;
-        .btn {
-            width: 662rpx;
-            height: 88rpx;
-            border-radius: 44rpx;
-            font-size: $font-size-28;
-            line-height: 88rpx;
-            color: #ffffff;
-            margin: 0 auto;
-            text-align: center;
-            background: $btn-confirm;
-        }
-    }
-    .pay-statustext {
-        width: 100%;
-        height: auto;
-        float: left;
-        margin-top: 40rpx;
-        .pay-statustext-inner {
-            width: 662rpx;
-            height: 100%;
-            margin: 0 auto;
-            .pay-icon {
-                width: 62rpx;
-                height: 100%;
-                float: left;
-                text-align: center;
-                .iconfont {
-                    color: #ff2a2a;
-                    font-size: $font-size-36;
-                    line-height: 20rpx;
-                }
-            }
-            .pay-text {
-                width: 560rpx;
-                height: 100%;
-                float: left;
-                line-height: 40rpx;
-                font-size: $font-size-24;
-                color: #ff2a2a;
-                text-align: justify;
-            }
-        }
-    }
-    .pay-bring {
-        width: 100%;
-        min-height: 190rpx;
-        padding: 24rpx 0;
-        background-color: #ffffff;
-        box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.16);
-        position: fixed;
-        bottom: 0;
-        left: 0;
-        border-radius: 30rpx 30rpx 0 0;
-        display: flex;
-        align-items: center;
-        flex-direction: column;
-        .pay-bring-line {
-            display: flex;
-            align-items: center;
-            .line {
-                display: inline-block;
-                width: 48rpx;
-                height: 2px;
-                background-color: #707070;
-            }
-        }
-        .pay-bring-content {
-            width: 654rpx;
-            height: auto;
-            padding: 0 24rpx;
-            .text {
-                font-size: $font-size-24;
-                color: #666;
-                line-height: 44rpx;
-                text-align: center;
-                &.bg-color {
-                    color: $color-system;
-                    line-height: 88rpx;
-                }
-            }
-            .text-title {
-            }
-            .text-v {
-                font-size: $font-size-28;
-                color: #4a4f58;
-                line-height: 70rpx;
-                text-align: left;
-                &.bg-color {
-                    line-height: 44rpx;
-                    color: $color-system;
-                }
-                .clipboard {
-                    width: 84rpx;
-                    height: 36rpx;
-                    background: linear-gradient(34deg, rgba(255, 41, 41, 1) 0%, rgba(255, 109, 27, 1) 100%);
-                    text-align: center;
-                    font-size: $font-size-24;
-                    color: #ffffff;
-                    border-radius: 18rpx;
-                    line-height: 36rpx;
-                    display: inline-block;
-                    margin-left: 10rpx;
-                }
-            }
-        }
-    }
-    .pay-bring-wrapper {
-        width: 100%;
-        padding: 24rpx 0;
-        background-color: #ffffff;
-        display: flex;
-        align-items: center;
-        flex-direction: column;
-        .pay-bring-content {
-            width: 654rpx;
-            height: auto;
-            padding: 0 24rpx;
-            margin-top: 48rpx;
-            .text-title {
-                width: 100%;
-                height: 320rpx;
-                margin-bottom: 20rpx;
-                image {
-                    width: 320rpx;
-                    height: 320rpx;
-                    display: block;
-                    margin: 0 auto;
-                }
-            }
-            .text {
-                font-size: $font-size-24;
-                color: #666;
-                line-height: 44rpx;
-                text-align: center;
-                &.bg-color {
-                    color: $color-system;
-                    line-height: 88rpx;
-                }
-            }
-            .text-v {
-                font-size: $font-size-28;
-                color: #4a4f58;
-                line-height: 48rpx;
-                text-align: justify;
-                margin-bottom: 20rpx;
-                .account {
-                    color: #333333;
-                }
-            }
-            .text-v-title {
-                font-size: $font-size-28;
-                color: #4a4f58;
-                line-height: 48rpx;
-                text-align: justify;
-                margin-bottom: 40rpx;
-                .account {
-                    color: #333333;
-                }
-                .label {
-                    color: #999999;
-                }
-                &.bg-color {
-                    line-height: 44rpx;
-                    color: $color-system;
-                }
-                .clipboard {
-                    height: 48rpx;
-                    background: #e2e2e2;
-                    text-align: center;
-                    font-size: $font-size-24;
-                    color: #999999;
-                    border-radius: 24rpx;
-                    line-height: 46rpx;
-                    display: inline-block;
-                    margin-left: 24rpx;
-                    border: 1px solid #f7f7f7;
-                    box-sizing: border-box;
-                    padding: 0 10px;
-                    margin-left: 60rpx;
-                }
-            }
-            .text-content {
-                width: 100%;
-                background-color: #f5f5f5;
-                box-sizing: border-box;
-                padding: 24rpx;
-                line-height: 44rpx;
-                font-size: $font-size-28;
-                color: #f94b4b;
-                text-align: justify;
-                margin-top: 60rpx;
-                border-radius: 8rpx;
-            }
-        }
-    }
+	width: 100%;
+	padding-bottom: 250rpx;
+	.pay-bring-title {
+		box-sizing: border-box;
+		width: 100%;
+		min-height: 96rpx;
+		padding: 20rpx 24rpx;
+		line-height: 48rpx;
+		text-align: left;
+		font-size: $font-size-24;
+		background: rgba(255, 234, 221, 1);
+		color: $color-system;
+	}
+	.container-wrapper {
+		width: 662rpx;
+		margin: 0 auto;
+		.pay-title {
+			font-size: $font-size-32;
+			line-height: 44rpx;
+			text-align: center;
+			color: #2a86ff;
+			margin: 40rpx 0 0 0;
+			width: 100%;
+			float: left;
+		}
+		.pay-content {
+			width: 574rpx;
+			height: 136rpx;
+			padding: 52rpx 44rpx;
+			background: url(https://static.caimei365.com/app/mini-mcare/icon/icon_payUnd@2x.png) no-repeat;
+			background-size: cover;
+			float: left;
+			margin-top: 40rpx;
+			.pay-p {
+				font-size: $font-size-26;
+				color: #ffffff;
+				line-height: 36rpx;
+			}
+			.pay-money {
+				color: #ffffff;
+				line-height: 84rpx;
+				font-weight: bold;
+				.pay-sm {
+					font-size: 40rpx;
+				}
+				.pay-bg {
+					font-size: 40rpx;
+				}
+			}
+		}
+		.pay-check {
+			width: 100%;
+			height: auto;
+			float: left;
+			.check-title {
+				width: 622rpx;
+				height: 40rpx;
+				line-height: 40rpx;
+				padding: 0 20rpx;
+				margin-top: 24rpx;
+				.text {
+					font-size: $font-size-28;
+					color: $text-color;
+					text-align: left;
+					float: left;
+				}
+				.icon {
+					width: 40rpx;
+					height: 40rpx;
+					border-radius: 50%;
+					line-height: 40rpx;
+					text-align: center;
+					color: #ffffff;
+					font-size: $font-size-24;
+					background: radial-gradient(
+						circle,
+						rgba(225, 86, 22, 1) 0%,
+						rgba(255, 170, 0, 1) 67%,
+						rgba(249, 185, 156, 1) 100%
+					);
+					float: right;
+				}
+			}
+			.pay-checked {
+				width: 100%;
+				height: auto;
+				.pay-item {
+					width: 618rpx;
+					height: 96rpx;
+					border: 2px solid #f5f5f5;
+					border-radius: 30rpx;
+					padding: 20rpx;
+					margin: 24rpx 0;
+					display: flex;
+					background-color: #ffffff;
+					&.current {
+						border-color: $color-system;
+						.item-r {
+							.icon-duigou {
+								color: $color-system;
+							}
+						}
+					}
+					.item-l {
+						flex: 8;
+						.item-icon {
+							width: 96rpx;
+							height: 96rpx;
+							float: left;
+							text-align: center;
+							line-height: 96rpx;
+							margin-right: 20rpx;
+							.iconfont {
+								font-size: 88rpx;
+							}
+							.icon-weixinzhifu {
+								color: #09bb07;
+							}
+							.icon-gerenwangyinzhifu {
+								color: #034582;
+							}
+							.icon-daewangyinzhuanzhang {
+								font-size: 68rpx;
+								color: #034582;
+							}
+							.icon-qiyewangyinzhifu {
+								color: #004889;
+							}
+						}
+						.item-texts {
+							line-height: 96rpx;
+							font-size: $font-size-26;
+							color: $text-color;
+						}
+						.item-text {
+							line-height: 48rpx;
+							font-size: $font-size-26;
+							.txt-p {
+								color: $text-color;
+							}
+							.txt-t {
+								font-size: $font-size-24;
+								color: #999999;
+							}
+						}
+					}
+					.item-r {
+						flex: 2;
+						text-align: center;
+						line-height: 96rpx;
+						.icon-duigou {
+							font-size: 60rpx;
+							color: #ffffff;
+						}
+					}
+				}
+			}
+		}
+	}
+	.pay-button {
+		width: 100%;
+		float: left;
+		margin-top: 30rpx;
+		.btn {
+			width: 662rpx;
+			height: 88rpx;
+			border-radius: 44rpx;
+			font-size: $font-size-28;
+			line-height: 88rpx;
+			color: #ffffff;
+			margin: 0 auto;
+			text-align: center;
+			background: $btn-confirm;
+		}
+	}
+	.pay-statustext {
+		width: 100%;
+		height: auto;
+		float: left;
+		margin-top: 40rpx;
+		.pay-statustext-inner {
+			width: 662rpx;
+			height: 100%;
+			margin: 0 auto;
+			.pay-icon {
+				width: 62rpx;
+				height: 100%;
+				float: left;
+				text-align: center;
+				.iconfont {
+					color: #ff2a2a;
+					font-size: $font-size-36;
+					line-height: 20rpx;
+				}
+			}
+			.pay-text {
+				width: 560rpx;
+				height: 100%;
+				float: left;
+				line-height: 40rpx;
+				font-size: $font-size-24;
+				color: #ff2a2a;
+				text-align: justify;
+			}
+		}
+	}
+	.pay-bring {
+		width: 100%;
+		min-height: 190rpx;
+		padding: 24rpx 0;
+		background-color: #ffffff;
+		box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.16);
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		border-radius: 30rpx 30rpx 0 0;
+		display: flex;
+		align-items: center;
+		flex-direction: column;
+		.pay-bring-line {
+			display: flex;
+			align-items: center;
+			.line {
+				display: inline-block;
+				width: 48rpx;
+				height: 2px;
+				background-color: #707070;
+			}
+		}
+		.pay-bring-content {
+			width: 654rpx;
+			height: auto;
+			padding: 0 24rpx;
+			.text {
+				font-size: $font-size-24;
+				color: #666;
+				line-height: 44rpx;
+				text-align: center;
+				&.bg-color {
+					color: $color-system;
+					line-height: 88rpx;
+				}
+			}
+			.text-title {
+			}
+			.text-v {
+				font-size: $font-size-28;
+				color: #4a4f58;
+				line-height: 70rpx;
+				text-align: left;
+				&.bg-color {
+					line-height: 44rpx;
+					color: $color-system;
+				}
+				.clipboard {
+					width: 84rpx;
+					height: 36rpx;
+					background: linear-gradient(34deg, rgba(255, 41, 41, 1) 0%, rgba(255, 109, 27, 1) 100%);
+					text-align: center;
+					font-size: $font-size-24;
+					color: #ffffff;
+					border-radius: 18rpx;
+					line-height: 36rpx;
+					display: inline-block;
+					margin-left: 10rpx;
+				}
+			}
+		}
+	}
+	.pay-bring-wrapper {
+		width: 100%;
+		padding: 24rpx 0;
+		background-color: #ffffff;
+		display: flex;
+		align-items: center;
+		flex-direction: column;
+		.pay-bring-content {
+			width: 654rpx;
+			height: auto;
+			padding: 0 24rpx;
+			margin-top: 48rpx;
+			.text-title {
+				width: 100%;
+				height: 320rpx;
+				margin-bottom: 20rpx;
+				image {
+					width: 320rpx;
+					height: 320rpx;
+					display: block;
+					margin: 0 auto;
+				}
+			}
+			.text {
+				font-size: $font-size-24;
+				color: #666;
+				line-height: 44rpx;
+				text-align: center;
+				&.bg-color {
+					color: $color-system;
+					line-height: 88rpx;
+				}
+			}
+			.text-v {
+				font-size: $font-size-28;
+				color: #4a4f58;
+				line-height: 48rpx;
+				text-align: justify;
+				margin-bottom: 20rpx;
+				.account {
+					color: #333333;
+				}
+			}
+			.text-v-title {
+				font-size: $font-size-28;
+				color: #4a4f58;
+				line-height: 48rpx;
+				text-align: justify;
+				margin-bottom: 40rpx;
+				.account {
+					color: #333333;
+				}
+				.label {
+					color: #999999;
+				}
+				&.bg-color {
+					line-height: 44rpx;
+					color: $color-system;
+				}
+				.clipboard {
+					height: 48rpx;
+					background: #e2e2e2;
+					text-align: center;
+					font-size: $font-size-24;
+					color: #999999;
+					border-radius: 24rpx;
+					line-height: 46rpx;
+					display: inline-block;
+					margin-left: 24rpx;
+					border: 1px solid #f7f7f7;
+					box-sizing: border-box;
+					padding: 0 10px;
+					margin-left: 60rpx;
+				}
+			}
+			.text-content {
+				width: 100%;
+				background-color: #f5f5f5;
+				box-sizing: border-box;
+				padding: 24rpx;
+				line-height: 44rpx;
+				font-size: $font-size-28;
+				color: #f94b4b;
+				text-align: justify;
+				margin-top: 60rpx;
+				border-radius: 8rpx;
+			}
+		}
+	}
 }
 .freight-alert {
-    width: 100%;
-    height: 100%;
-    background: rgba(0, 0, 0, 0.5);
-    position: fixed;
-    top: 0;
-    left: 0;
-    z-index: 8888;
-    transition: all 0.4s;
-    &.none {
-        display: none;
-    }
-    &.show {
-        display: block;
-    }
-    .content {
-        width: 422rpx;
-        height: 434rpx;
-        position: absolute;
-        background: $bg-color;
-        left: 0;
-        right: 0;
-        bottom: 0;
-        top: 0;
-        margin: auto;
-        padding: 20rpx 32rpx;
-        border-radius: 12rpx;
-        .title {
-            width: 100%;
-            height: 68rpx;
-            line-height: 68rpx;
-            font-size: $font-size-28;
-            color: $text-color;
-            text-align: center;
-            position: relative;
-            .icon-iconfontguanbi {
-                width: 68rpx;
-                height: 68rpx;
-                text-align: center;
-                line-height: 68rpx;
-                position: absolute;
-                right: 0;
-                top: 0;
-                font-size: $font-size-36;
-                color: #999999;
-            }
-        }
-        .text-content {
-            width: 100%;
-            height: auto;
-            .text {
-                padding: 20rpx 0;
-                line-height: 44rpx;
-                font-size: $font-size-26;
-                color: #666666;
-                text-align: justify;
-            }
-            .text-p {
-                line-height: 44rpx;
-                font-size: $font-size-26;
-                color: $color-system;
-                text-align: left;
-            }
-        }
-    }
+	width: 100%;
+	height: 100%;
+	background: rgba(0, 0, 0, 0.5);
+	position: fixed;
+	top: 0;
+	left: 0;
+	z-index: 8888;
+	transition: all 0.4s;
+	&.none {
+		display: none;
+	}
+	&.show {
+		display: block;
+	}
+	.content {
+		width: 422rpx;
+		height: 434rpx;
+		position: absolute;
+		background: $bg-color;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		top: 0;
+		margin: auto;
+		padding: 20rpx 32rpx;
+		border-radius: 12rpx;
+		.title {
+			width: 100%;
+			height: 68rpx;
+			line-height: 68rpx;
+			font-size: $font-size-28;
+			color: $text-color;
+			text-align: center;
+			position: relative;
+			.icon-iconfontguanbi {
+				width: 68rpx;
+				height: 68rpx;
+				text-align: center;
+				line-height: 68rpx;
+				position: absolute;
+				right: 0;
+				top: 0;
+				font-size: $font-size-36;
+				color: #999999;
+			}
+		}
+		.text-content {
+			width: 100%;
+			height: auto;
+			.text {
+				padding: 20rpx 0;
+				line-height: 44rpx;
+				font-size: $font-size-26;
+				color: #666666;
+				text-align: justify;
+			}
+			.text-p {
+				line-height: 44rpx;
+				font-size: $font-size-26;
+				color: $color-system;
+				text-align: left;
+			}
+		}
+	}
 }
 </style>

services/sellse.service.js

@@ -167,7 +167,7 @@ export default class SellerService {
 	 *@param pageNum：机构会所ID(同之前)
 	 *@param pageSize：协销ID(同之前)
 	 */
-    getSellerOrderList (data={}){
+    getSellerSearchOrderList (data={}){
         return this.AjaxService.get({ 
             url:'/order/seller/search', 
             data,