commit 修复机构订单搜索

pages/seller/order/order-list.vue

@@ -585,37 +585,6 @@ export default {
 			}
 			return false
 		},
-		//订单状态文字和颜色
-		StateExpFormat(state) {
-			let stateText = '',
-				stateTextObject = {
-					0: '待确认',
-					2: '交易完成',
-					4: '已关闭',
-					5: '交易全退',
-					6: '交易全退',
-					11: '待付款待发货',
-					12: '待付款部分发货',
-					13: '待付款已发货',
-					21: '部分付款待发货',
-					22: '部分付款部分发货',
-					23: '部分付款已发货',
-					31: '已付款待发货',
-					32: '已付款部分发货',
-					33: '已付款已发货'
-				}
-			Object.keys(stateTextObject).forEach(key => {
-				if (key == state) {
-					stateText = stateTextObject[key]
-				}
-			})
-			return stateText
-		},
-		orderPriceToFixed(n) {
-			let price = ''
-			price = n.toFixed(2)
-			return price
-		},
 		getHeaderTopHeight() {
 			// 状态栏高度
 			let self = this

pages/seller/order/search-order.vue

@@ -290,6 +290,7 @@ export default {
 			isCenceModal: false, //控制取消订单弹窗
 			isShowDelModal: false, //控制删除订单弹窗
 			isModalLayer: false,
+			isShareType: 2,
 			loadding: false,
 			pullUpOn: true,
 			hasNextPage: false,

pages/user/order/search-order.vue

@@ -57,7 +57,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">
@@ -86,25 +86,19 @@
 									></image>
 								</view>
 							</view>
-							<view class="goods-title">
-								<view v-if="order.shopPromotion" class="floor-item-act">
-									<view class="floor-tags">{{ order.shopPromotion.name }}</view>
-								</view>
-								<view class="title-text" v-if="order.secondHandOrderFlag == 1"
-									>{{ order.shopName }}
-									<label class="paymenttext" v-if="order.affirmPaymentFlag == 1"
-										>已确认打款供应商</label
-									>
-								</view>
-								<view class="title-text tui-skeleton-fillet" v-else @click="goShophome(order)"
-									>{{ order.shopName }}<label class="iconfont icon-jinrudianpu"></label
-								></view>
-							</view>
 							<view
 								class="goods-item"
 								v-for="(pros, prosIndex) in order.orderProductList"
 								:key="prosIndex"
 							>
+								<view class="goods-title">
+									<view v-if="pros.shopPromotion" class="floor-item-act">
+										<view class="floor-tags">{{ pros.shopPromotion.name }}</view>
+									</view>
+									<view class="title-text tui-skeleton-fillet">
+										{{ pros.shopName }}
+									</view>
+								</view>
 								<view class="goods-pros-t">
 									<view class="pros-img tui-skeleton-fillet">
 										<image :src="pros.image" alt="" />
@@ -201,8 +195,8 @@
 							/>
 						</view>
 						<!--加载loadding-->
-						<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-						<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text="nomoreText"></tui-nomore>
+						<tui-loadmore :visible="loadding" :index="3" type="black" />
+						<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text="nomoreText" />
 						<!--加载loadding-->
 					</view>
 				</view>
@@ -217,7 +211,7 @@
 			@paymentConfirm="hanldPaymentConfirm"
 		/>
 		<!-- 分享弹窗 -->
-		<cm-share-popup :orderId="btnoRderID" v-if="isShareModal" @shareConfirm="onShareAppMessage" />
+		<cm-share-popup :shopOrderId="handleShopOrderId" v-if="isShareModal" @shareConfirm="onShareAppMessage" />
 		<!-- 采美豆提示弹窗 -->
 		<activityBean
 			v-if="isActivityBean"
@@ -328,8 +322,8 @@ export default {
 			//处理金额
 			return Number(value).toFixed(2)
 		},
-		StateExpFormat(state) {
-			//订单状态文字和颜色
+		statusFilters(value) {
+			//处理订单状态显示
 			const map = {
 				0: '待确认',
 				2: '交易完成',
@@ -346,8 +340,8 @@ export default {
 				32: '已付款部分发货',
 				33: '已付款已发货'
 			}
-			return map[state]
-		},
+			return map[value]
+		}
 	},
 	methods: {
 		subMitSearch() {