1

mer_uniapp/pages/goods/components/orderGoods/index.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="orderGoods borRadius14">
 		<navigator v-if="orderInfo.merName" :url="`/pages/merchant/home/index?merId=`+ orderInfo.merId" hover-class="none">
-			<view class='total'>
+			<view class='total' v-if="!isHeader">
 				<text class="mr10 iconfont icon-shangjiadingdan"></text>
 				<text class="mr10">{{orderInfo.merName}}</text>
 				<text class="iconfont icon-xiangyou" style="font-size: 20rpx;"></text>
@@ -138,6 +138,10 @@
 				default: function() {
 					return 0;
 				}
+			},
+			isHeader: {
+				type: Boolean,
+				default: false
 			}
 		},
 		components: {

mer_uniapp/pages/goods/goods_details/index.vue

@@ -151,7 +151,7 @@
 												<view>{{dataItem.title}}</view>
 												<view>{{dataItem.content}}</view>
 											</view>
-											<view v-if="dataItem.saleStatus !== 0 && dataItem.authorId == uid">
+											<view v-if="dataItem.saleStatus !== 0 && dataItem.authorId == uid" style="font-size: 28rpx;font-weight: 400;color: #333333;">
 												<navigator :url="`/pages/goods/order_details/index?orderNo=${dataItem.orderNo}&orderType=secondHand`">
 													<button class="bg-color order-btn">
 														订单详情
@@ -457,13 +457,13 @@
 									加入购物车
 								</button> -->
 							</form>
-							<form @submit="goBuy" report-submit="true" v-if="isManage == 0 && !dataItem">
+							<form @submit="goBuy" report-submit="true" v-if="!dataItem">
 								<button style="border-radius: 0;" :class="productInfo.systemFormId == 0 ? 'bnts' : 'longBnts'" class="buy"
 								 form-type="submit">
 									立即购买
 								</button>
 							</form>
-							<form @submit="goSecondHand" report-submit="true" v-if="dataItem.authorId !== uid">
+							<form @submit="goSecondHand" report-submit="true" v-if="dataItem && dataItem.authorId !== uid">
 								<button style="border-radius: 0;" :class="productInfo.systemFormId == 0 ? 'bnts' : 'longBnts'" class="buy"
 								 form-type="submit">
 									立即购买

mer_uniapp/pages/goods/order_details/index.vue

@@ -130,14 +130,14 @@
 					</view>
 					<view class="borRadius14 orderGoodsBox">
 						<orderGoods :orderInfo="item" :orderNo="orderNo" :cartInfo="item.orderInfoList" :jump="true" :orderData="orderInfo"
-						 :secondType="orderInfo.secondType"></orderGoods>
+						 :secondType="orderInfo.secondType" :isHeader="true"></orderGoods>
 						<!-- v-if="orderInfo.status < 2" -->
 						<view class="p-24">
 							<view class='item acea-row row-between'>
 								<view>配送方式：</view>
 								<view v-if="Number(orderInfo.secondType) > 4" class='conter'>自动发货</view>
 								<view v-else-if="Number(orderInfo.secondType) === 2" class='conter'>虚拟发货</view>
-								<view v-else class='conter'>{{item.shippingType ==1 ? '商家配送': '到店自提'}}</view>
+								<view v-else class='conter'>{{item.shippingType ==1 ? '配送': '自提'}}</view>
 							</view>
 						</view>
 						<view class='flex justify-between userRemarkBox'>