解决冲突

pageC/orderForm/orderForm.vue

@@ -227,6 +227,7 @@ export default {
     },
   },
   onShow() {
+    this.page = 0;
     this.getOrderList(1);
   },
   onReachBottom() {

pageC/orderFormDetail/component/commodityDetail.vue

@@ -94,7 +94,10 @@
     </view>
     <view class="information">
       <text class="_label">跨境物流</text>
-      <view lass="_title-right"> 海运散货 | 1号海运柜 </view>
+      <view lass="_title-right">
+        {{ orderDetail.container.transport_type.name }} |
+        {{ orderDetail.container.base.name }}
+      </view>
     </view>
     <view class="information last">
       <text class="_label">运费</text>

pageC/refundDetail/component/moneyDestination.vue

@@ -1,99 +1,122 @@
 <template>
-	<view class="">
-		<u-popup :show="show" @close="$emit('close')" round="16rpx" @open="open" closeable closeOnClickOverlay>
-			<view class="title">
-				钱款去向
-			</view>
-			<view class="radio-list">
-				<view class="refund">
-					<view class="money">
-						退款金额
-					</view>
-					<view class="commodity-price" style="color: #f83224;">
-						<text style="font-size: 20rpx;">￥</text>
-						<text>133</text>.
-						<text style="font-size: 20rpx;">22</text>
-					</view>
-				</view>
-				<view class="refund">
-					<view class="money">
-						退款账户
-					</view>
-					<view class="commodity-price" style="color: #222;">
-						微信余额
-					</view>
-				</view>
-				<u-steps direction="column" dot activeColor="#D8D8D8" inactiveColor="#D8D8D8">
-						<u-steps-item title="退款成功" desc="退款已原路退回到您的余额，到账时间以平台处理时间为准">
-						</u-steps-item>
-						<u-steps-item title="申请受理中" desc="您的退款申请团长已受理，请耐心等待">
-						</u-steps-item>
-						<u-steps-item title="买家发起退款" desc="系统将会在1-2天提交处理，请耐心等待"></u-steps-item>
-					</u-steps>
-			</view>
-			<button class="btn">我知道了</button>
-		</u-popup>
-	</view>
+  <view class="">
+    <u-popup
+      :show="show"
+      @close="$emit('close')"
+      round="16rpx"
+      @open="open"
+      closeable
+      closeOnClickOverlay
+    >
+      <view class="title"> 钱款去向 </view>
+      <view class="radio-list">
+        <view class="refund">
+          <view class="money"> 退款金额 </view>
+          <view class="commodity-price" style="color: #f83224">
+            <text style="font-size: 20rpx">￥</text>
+            <text>{{
+              refundDetail.goods[0].refund.refund_price.split(".")[0]
+            }}</text
+            >.
+            <text style="font-size: 20rpx">{{
+              refundDetail.goods[0].refund.refund_price.split(".")[1]
+            }}</text>
+          </view>
+        </view>
+        <view class="refund">
+          <view class="money"> 退款账户 </view>
+          <view class="commodity-price" style="color: #222"> 微信余额 </view>
+        </view>
+        <u-steps
+          direction="column"
+          dot
+          activeColor="#D8D8D8"
+          inactiveColor="#D8D8D8"
+        >
+          <u-steps-item
+            title="退款成功"
+            desc="退款已原路退回到您的余额，到账时间以平台处理时间为准"
+          >
+          </u-steps-item>
+          <u-steps-item
+            title="申请受理中"
+            desc="您的退款申请团长已受理，请耐心等待"
+          >
+          </u-steps-item>
+          <u-steps-item
+            title="买家发起退款"
+            desc="系统将会在1-2天提交处理，请耐心等待"
+          ></u-steps-item>
+        </u-steps>
+      </view>
+      <button class="btn">我知道了</button>
+    </u-popup>
+  </view>
 </template>
 
 <script>
-	export default {
-		props: {
-			show: {
-				typeof: Boolean,
-				default: false
-			}
-		},
-		data() {
-			return {
-				value: '',
-
-			}
-		},
-		methods: {
-			open() {},
-			handleChange(name) {
-				console.log(this.value)
-				this.$emit('close', name)
-			},
-		}
-	}
+export default {
+  props: {
+    show: {
+      typeof: Boolean,
+      default: false,
+    },
+    refundDetail: {
+      typeof: Object,
+      default: () => {
+        return {};
+      },
+    },
+  },
+  data() {
+    return {
+      value: "",
+    };
+  },
+  methods: {
+    open() {},
+    handleChange(name) {
+      console.log(this.value);
+      this.$emit("close", name);
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-	.title {
-		text-align: center;
-		font-size: 36rpx;
-		color: #222;
-		font-weight: 500;
-		margin-top: 20rpx;
-	}
+.title {
+  text-align: center;
+  font-size: 36rpx;
+  color: #222;
+  font-weight: 500;
+  margin-top: 20rpx;
+}
 
-	.radio-list {
-		padding: 0 28rpx;
-		margin-top: 40rpx;
-		.refund{
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			margin-bottom: 38rpx;
-			.money{
-				color: #555;
-				font-size: 30rpx;
-			}
-		}
-	}
+.radio-list {
+  padding: 0 28rpx;
+  margin-top: 40rpx;
+  .refund {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 38rpx;
+    .money {
+      color: #555;
+      font-size: 30rpx;
+    }
+  }
+}
 
-	.radio {
-		margin-bottom: 48rpx;
-	}
-	.btn{
-		width: 94%;
-		background-color: #fff;
-		border: 2rpx solid #979797;
-		border-radius: 44rpx;
-	}
-	::v-deep .u-steps-item__content{
-		margin-bottom: 70rpx;
-	}
-</style>
+.radio {
+  margin-bottom: 48rpx;
+}
+.btn {
+  width: 94%;
+  background-color: #fff;
+  border: 2rpx solid #979797;
+  border-radius: 44rpx;
+}
+::v-deep .u-steps-item__content {
+  margin-bottom: 70rpx;
+}
+</style>

pageC/refundDetail/component/refundInProgress.vue

@@ -2,12 +2,14 @@
   <view class="top-direction">
     <view class="direction-frist">
       <view class=""> 退款中 </view>
-      <view class="commodity-price">
+      <view class="commodity-price" v-if="refundDetail.goods.length > 0">
         <text style="font-size: 20rpx">￥</text>
-        <text>{{ refundDetail.amount.split(".")[0] }}</text
+        <text>{{
+          refundDetail.goods[0].refund.refund_price.split(".")[0]
+        }}</text
         >.
         <text style="font-size: 20rpx">{{
-          refundDetail.amount.split(".")[1]
+          refundDetail.goods[0].refund.refund_price.split(".")[1]
         }}</text>
       </view>
     </view>

pageC/refundDetail/component/refundSuccessful.vue

@@ -1,77 +1,81 @@
 <template>
-	<view class="top-direction">
-		<view class="direction-frist">
-			<view class="">
-				退款成功
-			</view>
-			<view class="commodity-price">
-				<text style="font-size: 20rpx;">￥</text>
-				<text>133</text>.
-				<text style="font-size: 20rpx;">22</text>
-			</view>
-		</view>
-		<view class="time">
-			2023年12月4号 18:23
-		</view>
-	
-		<view class="direction-last">
-			<view class="">
-				退款余额
-			</view>
-			<view class="commodity-price">
-				<text style="font-size: 20rpx;">￥</text>
-				<text>133</text>.
-				<text style="font-size: 20rpx;">22</text>
-			</view>
-		</view>
-		
-		<button class="check"  @click="$emit('checkMoney')">查看钱款去向</button>
-	</view>
+  <view class="top-direction">
+    <view class="direction-frist">
+      <view class=""> 退款成功 </view>
+      <view class="commodity-price">
+        <text style="font-size: 20rpx">￥</text>
+        <text>133</text>.
+        <text style="font-size: 20rpx">22</text>
+      </view>
+    </view>
+    <view class="time"> 2023年12月4号 18:23 </view>
+
+    <view class="direction-last">
+      <view class=""> 退款余额 </view>
+      <view class="commodity-price">
+        <text style="font-size: 20rpx">￥</text>
+        <text>133</text>.
+        <text style="font-size: 20rpx">22</text>
+      </view>
+    </view>
+
+    <button class="check" @click="$emit('checkMoney')">查看钱款去向</button>
+  </view>
 </template>
 
 <script>
+export default {
+  props: {
+    refundDetail: {
+      typeof: Object,
+      default: () => {
+        return {};
+      },
+    },
+  },
+};
 </script>
 
 <style scoped lang="scss">
-	.top-direction {
-		padding: 36rpx 24rpx;
-		border-radius: 16rpx;
-		background-color: #fff;
-	
-		.direction-frist {
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			font-size: 36rpx;
-			font-weight: 500;
-			.commodity-price{
-				color: #F83224;
-			}
-		}
-	
-		.time {
-			color: rgba(34, 34, 34, .6);
-			font-size: 24rpx;
-			margin-top: 20rpx;
-		}
-		
-		.direction-last{
-			margin-top: 32rpx;
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			font-size: 28rpx;
-			color: #333;
-		}
-		.check{
-			margin-top: 44rpx;
-			border-radius: 38rpx;
-			background-color: #fff;
-			padding: 0;
-			border: 2rpx solid rgba(151, 151, 151, .2);
-			color: #333;
-			font-size: 28rpx;
-			height: 76rpx;
-		}
-	}
-</style>
+.top-direction {
+  padding: 36rpx 24rpx;
+  border-radius: 16rpx;
+  background-color: #fff;
+
+  .direction-frist {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    font-size: 36rpx;
+    font-weight: 500;
+    .commodity-price {
+      color: #f83224;
+    }
+  }
+
+  .time {
+    color: rgba(34, 34, 34, 0.6);
+    font-size: 24rpx;
+    margin-top: 20rpx;
+  }
+
+  .direction-last {
+    margin-top: 32rpx;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    font-size: 28rpx;
+    color: #333;
+  }
+  .check {
+    margin-top: 44rpx;
+    border-radius: 38rpx;
+    background-color: #fff;
+    padding: 0;
+    border: 2rpx solid rgba(151, 151, 151, 0.2);
+    color: #333;
+    font-size: 28rpx;
+    height: 76rpx;
+  }
+}
+</style>

pageC/refundDetail/component/refusalToRefund.vue

@@ -1,90 +1,97 @@
-<template> 
-<view >
-		<view class="top-direction">
-			<view class="direction-frist">
-				<view class="">
-					卖家拒绝了您的退款申请
-				</view>
-			</view>
-			<view class="time">
-				拒绝理由拒绝理由拒绝理由拒绝理由拒绝理由
-			</view>
-			<view class="time">
-				2023-12-08 12:45
-			</view>
-		</view>
-		<view class="direction-frist1">
-			<view class="">
-				退款成功
-			</view>
-			<view class="commodity-price">
-				<text style="font-size: 20rpx;">￥</text>
-				<text>133</text>.
-				<text style="font-size: 20rpx;">22</text>
-			</view>
-		</view>
-</view>
+<template>
+  <view>
+    <view class="top-direction">
+      <view class="direction-frist">
+        <view class=""> 卖家拒绝了您的退款申请 </view>
+      </view>
+      <view class="time"> {{ refundDetail.goods[0].refund.reason }} </view>
+      <view class="time"> 2023-12-08 12:45 </view>
+    </view>
+    <!-- <view class="direction-frist1">
+      <view class=""> 退款成功 </view>
+      <view class="commodity-price">
+        <text style="font-size: 20rpx">￥</text>
+        <text>{{
+          refundDetail.goods[0].refund.refund_price.split(".")[0]
+        }}</text
+        >.
+        <text style="font-size: 20rpx">{{
+          refundDetail.goods[0].refund.refund_price.split(".")[1]
+        }}</text>
+      </view>
+    </view> -->
+  </view>
 </template>
 
 <script>
+export default {
+  props: {
+    refundDetail: {
+      typeof: Object,
+      default: () => {
+        return {};
+      },
+    },
+  },
+};
 </script>
 
 <style scoped lang="scss">
-	.top-direction {
-		padding: 36rpx 24rpx;
-		border-radius: 16rpx;
-		background-color: #fff;
-	
-		.direction-frist {
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			font-size: 36rpx;
-			font-weight: 500;
-			.commodity-price{
-				color: #F83224;
-			}
-		}
-	
-		.time {
-			color: rgba(34, 34, 34, .6);
-			font-size: 24rpx;
-			margin-top: 20rpx;
-		}
-		
-		.direction-last{
-			margin-top: 32rpx;
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			font-size: 28rpx;
-			color: #333;
-		}
-		.check{
-			margin-top: 44rpx;
-			border-radius: 38rpx;
-			background-color: #fff;
-			padding: 0;
-			border: 2rpx solid rgba(151, 151, 151, .2);
-			color: #333;
-			font-size: 28rpx;
-			height: 76rpx;
-		}
-	}
-	
-		.direction-frist1 {
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			font-size: 36rpx;
-			font-weight: 500;
-			margin-top: 20rpx;
-			background-color: #fff;
-			height: 100rpx;
-			border-radius: 16rpx;
-			padding: 0 24rpx;
-			.commodity-price{
-				color: #F83224;
-			}
-		}
-</style>
+.top-direction {
+  padding: 36rpx 24rpx;
+  border-radius: 16rpx;
+  background-color: #fff;
+
+  .direction-frist {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    font-size: 36rpx;
+    font-weight: 500;
+    .commodity-price {
+      color: #f83224;
+    }
+  }
+
+  .time {
+    color: rgba(34, 34, 34, 0.6);
+    font-size: 24rpx;
+    margin-top: 20rpx;
+  }
+
+  .direction-last {
+    margin-top: 32rpx;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    font-size: 28rpx;
+    color: #333;
+  }
+  .check {
+    margin-top: 44rpx;
+    border-radius: 38rpx;
+    background-color: #fff;
+    padding: 0;
+    border: 2rpx solid rgba(151, 151, 151, 0.2);
+    color: #333;
+    font-size: 28rpx;
+    height: 76rpx;
+  }
+}
+
+.direction-frist1 {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  font-size: 36rpx;
+  font-weight: 500;
+  margin-top: 20rpx;
+  background-color: #fff;
+  height: 100rpx;
+  border-radius: 16rpx;
+  padding: 0 24rpx;
+  .commodity-price {
+    color: #f83224;
+  }
+}
+</style>

pageC/refundDetail/refundDetail.vue

@@ -3,6 +3,7 @@
     <RefundSuccessful
       v-if="refundDetail.goods[0].refund.status == 1"
       @checkMoney="checkMoney"
+      :refundDetail="refundDetail"
     />
 
     <RefundInProgress
@@ -10,9 +11,15 @@
       :refundDetail="refundDetail"
     />
 
-    <RefusalToRefund v-if="refundDetail.goods[0].refund.status == 3" />
+    <RefusalToRefund
+      v-if="refundDetail.goods[0].refund.status == 3"
+      :refundDetail="refundDetail"
+    />
 
-    <RefundInformation :goodsDetail="refundDetail.goods[0]" />
+    <RefundInformation
+      :goodsDetail="refundDetail.goods[0]"
+      :refundDetail="refundDetail"
+    />
     <MoneyDestination :show="show" @close="close" />
     <view class="footer">
       <button class="btn" @click="platformIntervene">平台介入</button>

pageD/afterSalesDetail/afterSalesDetail.vue

@@ -43,7 +43,7 @@
       :orderInformation="orderInformation"
       v-if="orderInformation.goods"
     />
-    <RefusePopup :show="show" @close="close" />
+    <RefusePopup :show="show" @refund="close" />
     <AgreePopup :agreeShow="agreeShow" @close="close" title="请确认是否退款" />
 
     <view
@@ -76,18 +76,38 @@ export default {
       show: false,
       agreeShow: false,
       orderInformation: {},
+      orderId: "",
     };
   },
   onLoad(options) {
+    this.orderId = options.id;
     this.getOrderDetail(options.id);
   },
   methods: {
     refuseApplication() {
       this.show = true;
     },
-    close(value) {
+    //关闭弹窗，确认是否退款，status有值则退款
+    close(status, value) {
+      console.log(value);
       this.show = false;
       this.agreeShow = false;
+      if (status) {
+        uni.$u.http
+          .post(`/api/order_refund/examine`, {
+            status,
+            order_refund_id: this.orderInformation.goods[0].refund.id,
+            reason: value,
+          })
+          .then((res) => {
+            console.log(res);
+            uni.showToast({
+              title: "已同意退款",
+              icon: "none",
+            });
+            this.getOrderDetail(this.orderId);
+          });
+      }
     },
     getOrderDetail(id) {
       uni.$u.http

pageD/afterSalesDetail/component/applicationInformation.vue

@@ -16,9 +16,11 @@
     <view class="photo">
       <text>图片凭证</text>
       <view class="photo-list">
-        <view class="img-1"> </view>
-        <view class="img-1"> </view>
-        <view class="img-1"> </view>
+        <image
+          class="img-1"
+          :src="orderInformation.goods[0].refund.images"
+          mode="scaleToFill"
+        />
       </view>
     </view>
   </view>
@@ -74,7 +76,7 @@ export default {
         width: 156rpx;
         height: 156rpx;
         border-radius: 10rpx;
-        background-color: #d4d4d4;
+        // background-color: #d4d4d4;
         margin-left: 16rpx;
       }
     }

pageD/afterSalesDetail/component/commodityDetail.vue

@@ -54,7 +54,7 @@
     </view>
     <view class="information">
       <text class="_label">退款状态</text>
-      <view style="color: #f83224"> 待商家处理 </view>
+      <view style="color: #f83224"> {{ statusName }} </view>
     </view>
     <view class="information">
       <text class="_label">退款原因</text>
@@ -99,6 +99,19 @@ export default {
   data() {
     return {};
   },
+  computed: {
+    statusName() {
+      if (this.orderInformation.goods[0].refund.status == "0") {
+        return "待商家处理";
+      } else if (this.orderInformation.goods[0].refund.status == "1") {
+        return "已退款";
+      } else if (this.orderInformation.goods[0].refund.status == "2") {
+        return "拒绝退款";
+      } else if (this.orderInformation.goods[0].refund.status == "3") {
+        return "平台介入";
+      }
+    },
+  },
   methods: {
     cope(str) {
       uni.setClipboardData({

pageD/afterSalesDetail/component/refusePopup.vue

@@ -33,6 +33,13 @@ export default {
       default: false,
     },
   },
+  watch: {
+    show(newVal) {
+      if (!newVal) {
+        this.value2 = "";
+      }
+    },
+  },
   data() {
     return {
       value2: "",

pageD/components/agreePopup.vue

@@ -11,7 +11,7 @@
         <view class="title"> {{ title }} </view>
         <view class="btn-list">
           <button class="btn-2" @click="$emit('close')">取消</button>
-          <button class="btn-1" @click="$emit('close', true)">提交</button>
+          <button class="btn-1" @click="$emit('close', 1)">提交</button>
         </view>
       </view>
     </u-popup>

pageD/components/goodsInformation.vue

@@ -80,6 +80,7 @@
     <view class="btn-list" v-if="!batch && productAndCommodity == 'product'">
       <button
         class="btn-1"
+        @click.stop="$emit('goodsUpDown', 0, itemInfo)"
         v-if="itemInfo.review_status == 1 && itemInfo.status == 'normal'"
       >
         下架商品
@@ -89,6 +90,7 @@
       <!-- <button class="btn-1" v-if="itemInfo.status == 'down'">编辑</button> -->
       <button
         class="btn-1"
+        @click.stop="$emit('goodsUpDown', 1, itemInfo)"
         v-if="
           itemInfo.review_status != '0' &&
           itemInfo.review_status != '2' &&

pageD/orderDetail/orderDetail.vue

@@ -150,6 +150,9 @@ export default {
       this.getDetail(option.orderStatus);
     }
   },
+  onShow() {
+    this.getDetail(option.orderStatus);
+  },
 
   methods: {
     //复制
@@ -172,7 +175,7 @@ export default {
           this.orderDetail = res;
           //直接在dom中使用会报错，首先判断字段存不存在，重新复制后使用
           if (res.container) {
-            this.transportType = res.container.transport_type_name;
+            this.transportType = res.container.transport_type.name;
           }
           this.title = "待缴纳保证金";
         });
@@ -184,7 +187,7 @@ export default {
         this.orderDetail = res;
         //直接在dom中使用会报错，首先判断字段存不存在，重新复制后使用
         if (res.container) {
-          this.transportType = res.container.transport_type_name;
+          this.transportType = res.container.transport_type.name;
         }
         this.title = res.status_name;
         //根据订单状态，显示不同的字段
@@ -210,7 +213,7 @@ export default {
     //跳转支付
     toPayOrder() {
       uni.navigateTo({
-        url: `/pageA/payorder?num=${this.orderDetail.fill_price}&orderid=${this.orderDetail.id}`,
+        url: `/pageA/payorder?num=${this.orderDetail.fill_price}&orderid=${this.orderDetail.id}&orderType=difference`,
       });
     },
     //跳转发货页面

pageD/productDetails/productDetails.vue

@@ -1,5 +1,31 @@
 <template>
   <view class="page">
+    <u-navbar
+      v-if="pageStatus != 'platform'"
+      title="商品详情"
+      @rightClick="rightClick"
+      :autoBack="true"
+    >
+    </u-navbar>
+    <u-navbar
+      v-if="pageStatus == 'platform'"
+      title="true"
+      @rightClick="rightClick"
+      :autoBack="true"
+    >
+      <view slot="center" class="u-top">
+        <view
+          :class="{ 'goods-Detail': goodsOrDetail == 1 }"
+          @click="switchTab(1)"
+          >商品</view
+        >
+        <view
+          :class="{ 'goods-Detail': goodsOrDetail == 2 }"
+          @click="switchTab(2)"
+          >详情</view
+        >
+      </view>
+    </u-navbar>
     <!-- v-if="pageStatus != 'platform'" -->
     <view v-if="!downOrGrounding && pageStatus != 'platform'">
       <view class="top-fail" v-if="commodityDetail.final_status != 'unreview'">
@@ -50,21 +76,29 @@
       {{ commodityDetail.name_cn }}
     </view>
 
-    <view class="goods-detail"> 商品详情 </view>
+    <view class="goods-detail" id="product-detail"> 商品详情 </view>
     <view class="detail">
-      <!-- -->
-      <view v-html="commodityDetail.detail_cn"></view>
-      <!-- <image
-        class="detail-img"
-        v-for="item in commodityDetail.images.split(',')"
-        :src="item"
-        mode=""
-      ></image> -->
+      <view class="u-content">
+        <u-parse :content="commodityDetail.detail_cn"></u-parse>
+      </view>
     </view>
 
-    <view class="footer" v-if="!downOrGrounding || pageStatus == 'platform'">
+    <view
+      class="footer"
+      v-if="
+        (!downOrGrounding || pageStatus == 'platform') &&
+        commodityDetail.final_status != 'unreview'
+      "
+    >
       <!-- <button class="btn">编辑商品</button> -->
-      <button class="btn" @click="groundingCommodity">上架商品</button>
+      <button
+        class="btn"
+        v-if="pageStatus == 'platform'"
+        @click="groundingProduct"
+      >
+        上架商品
+      </button>
+      <button class="btn" v-else @click="groundingCommodity">上架商品</button>
     </view>
   </view>
 </template>
@@ -73,21 +107,25 @@
 export default {
   data() {
     return {
-      status: 2,
       goodsId: 0,
-      pageStatus: "",
-      commodityDetail: {},
+      pageStatus: "", //判断商品是什么商品，平台库或其他
+      commodityDetail: {}, //商品详情
+      goodsOrDetail: 1,
+      scrollTop: 0,
     };
   },
   onLoad(options) {
     this.goodsId = options.goodsId;
     this.pageStatus = options.pageStatus;
-    if (options.pageStatus == "platform") {
+    if (options.pageStatus == "platform" || options.pageStatus == "supply") {
       this.getGoodsDetail();
     } else {
       this.getGoodsManageDetail();
     }
   },
+  onPageScroll(e) {
+    this.scrollTop = e.scrollTop;
+  },
   computed: {
     downOrGrounding() {
       if (this.commodityDetail.status == "down") {
@@ -102,6 +140,7 @@ export default {
     },
   },
   methods: {
+    rightClick() {},
     //获取平台库商品详情
     getGoodsDetail() {
       uni.$u.http
@@ -110,12 +149,57 @@ export default {
           this.commodityDetail = res;
         });
     },
+    switchTab(num) {
+      this.goodsOrDetail = num;
+      if (num == 1) {
+        //返回顶部
+        uni.pageScrollTo({
+          scrollTop: 0, // 滚动到页面的目标位置  这个是滚动到顶部, 0
+          duration: 300, // 滚动动画的时长
+        });
+      } else {
+        uni
+          .createSelectorQuery()
+          .select("#product-detail")
+          .boundingClientRect((data) => {
+            //目标位置的节点：类class或者id
+            uni
+              .createSelectorQuery()
+              .select(".page")
+              .boundingClientRect((res) => {
+                //最外层盒子的节点：类class或者id
+                uni.pageScrollTo({
+                  duration: 100, //过渡时间
+                  scrollTop: data.top - res.top, //到达距离顶部的top值
+                  //scrollTop:data.top - res.top,//如果置顶
+                });
+              })
+              .exec();
+          })
+          .exec();
+      }
+    },
     //获取商品管理商品详情
     getGoodsManageDetail() {
       uni.$u.http.get(`/api/goods/detail/${this.goodsId}`).then((res) => {
         this.commodityDetail = res;
       });
     },
+
+    //上架平台库商品
+    groundingProduct() {
+      uni.$u.http
+        .post(`/api/goods/elencazione`, {
+          goods_id: this.commodityDetail.id,
+        })
+        .then((res) => {
+          this.getGoodsDetail();
+          uni.showToast({
+            title: "已上架",
+            icon: "none",
+          });
+        });
+    },
     //上架商品
     groundingCommodity() {
       if (this.commodityDetail.status == "down") {
@@ -143,9 +227,9 @@ export default {
     },
   },
   mounted() {
-    uni.setNavigationBarTitle({
-      title: "商品详情",
-    });
+    // uni.setNavigationBarTitle({
+    //   title: "商品详情",
+    // });
   },
 };
 </script>
@@ -154,6 +238,15 @@ export default {
 .page {
   background-color: #fff;
   padding-bottom: 150rpx;
+  margin-top: 174rpx;
+  .u-top {
+    display: flex;
+    width: 200rpx;
+    justify-content: space-between;
+    .goods-Detail {
+      color: #f83224;
+    }
+  }
   .top-fail {
     height: 60rpx;
     background-color: #fff1ee;

pageD/supplyChainGoods/supplyChainGoods.vue

@@ -55,6 +55,7 @@
           :status="status"
           @toDetail="toDetail"
           :itemInfo="item"
+          @goodsUpDown="goodsUpDown"
         />
       </view>
     </view>
@@ -102,7 +103,7 @@ export default {
     //跳转商品详情
     toDetail(value) {
       uni.navigateTo({
-        url: `/pageD/productDetails/productDetails?goodsId=${value.id}&pageStatus=platform`,
+        url: `/pageD/productDetails/productDetails?goodsId=${value.id}&pageStatus=supply`,
       });
     },
     //获取供应链商品列表
@@ -124,6 +125,10 @@ export default {
         this.goodsList = res.data;
       });
     },
+    //商品上架，下架
+    goodsUpDown(value, item) {
+      // uni.#u.http.post(``)
+    },
   },
   mounted() {
     this.getinfoList();

pages.json

@@ -532,7 +532,8 @@
 					"path" : "productDetails/productDetails",
 					"style" : 
 					{
-						"navigationBarTitleText" : ""
+						"navigationBarTitleText" : "",
+						"navigationStyle": "custom"
 					}
 				},
 				{

unpackage/dist/build/mp-weixin/pageA/payorder.wxss

@@ -1 +1,5 @@
-.payment.data-v-55906226{font-family:PingFangSC,PingFang SC;font-weight:500;font-size:24rpx;color:#222;line-height:34rpx;text-align:left;font-style:normal}.content.data-v-55906226{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:20rpx;color:#777;line-height:28rpx;text-align:left;font-style:normal}.stateac.data-v-55906226{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:24rpx;color:#ff1515;line-height:34rpx;text-align:left;font-style:normal}.unstate.data-v-55906226{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:24rpx;color:#222;line-height:34rpx;text-align:left;font-style:normal}.confirm.data-v-55906226{position:fixed;bottom:66rpx;width:702rpx;height:84rpx;background:#f83224;border-radius:44rpx;font-family:PingFangSC,PingFang SC;font-weight:500;font-size:32rpx;color:#fff;line-height:84rpx;text-align:center;font-style:normal}.payitem.data-v-55906226{width:702rpx;height:140rpx;background:#fff;border-radius:12rpx;padding:34rpx 24rpx;box-sizing:border-box}.back.data-v-55906226{padding:20rpx 24rpx;box-sizing:border-box}.back .topbox.data-v-55906226{position:relative}.back .topbox .state.data-v-55906226{background:#fff;border-radius:6rpx;padding:12rpx;box-sizing:border-box}.back .topbox .paysum.data-v-55906226{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:28rpx;color:#222;line-height:40rpx;text-align:left;font-style:normal}.back .topbox .numbe.data-v-55906226{font-family:HarmonyOS_Sans_Medium;font-size:28rpx;color:#000;line-height:38rpx;text-align:left;font-style:normal;margin-top:20rpx}
+<<<<<<< HEAD
+.payment.data-v-5dcbc573{font-family:PingFangSC,PingFang SC;font-weight:500;font-size:24rpx;color:#222;line-height:34rpx;text-align:left;font-style:normal}.content.data-v-5dcbc573{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:20rpx;color:#777;line-height:28rpx;text-align:left;font-style:normal}.stateac.data-v-5dcbc573{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:24rpx;color:#ff1515;line-height:34rpx;text-align:left;font-style:normal}.unstate.data-v-5dcbc573{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:24rpx;color:#222;line-height:34rpx;text-align:left;font-style:normal}.confirm.data-v-5dcbc573{position:fixed;bottom:66rpx;width:702rpx;height:84rpx;background:#f83224;border-radius:44rpx;font-family:PingFangSC,PingFang SC;font-weight:500;font-size:32rpx;color:#fff;line-height:84rpx;text-align:center;font-style:normal}.payitem.data-v-5dcbc573{width:702rpx;height:140rpx;background:#fff;border-radius:12rpx;padding:34rpx 24rpx;box-sizing:border-box}.back.data-v-5dcbc573{padding:20rpx 24rpx;box-sizing:border-box}.back .topbox.data-v-5dcbc573{position:relative}.back .topbox .state.data-v-5dcbc573{background:#fff;border-radius:6rpx;padding:12rpx;box-sizing:border-box}.back .topbox .paysum.data-v-5dcbc573{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:28rpx;color:#222;line-height:40rpx;text-align:left;font-style:normal}.back .topbox .numbe.data-v-5dcbc573{font-family:HarmonyOS_Sans_Medium;font-size:28rpx;color:#000;line-height:38rpx;text-align:left;font-style:normal;margin-top:20rpx}
+=======
+.payment.data-v-55906226{font-family:PingFangSC,PingFang SC;font-weight:500;font-size:24rpx;color:#222;line-height:34rpx;text-align:left;font-style:normal}.content.data-v-55906226{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:20rpx;color:#777;line-height:28rpx;text-align:left;font-style:normal}.stateac.data-v-55906226{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:24rpx;color:#ff1515;line-height:34rpx;text-align:left;font-style:normal}.unstate.data-v-55906226{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:24rpx;color:#222;line-height:34rpx;text-align:left;font-style:normal}.confirm.data-v-55906226{position:fixed;bottom:66rpx;width:702rpx;height:84rpx;background:#f83224;border-radius:44rpx;font-family:PingFangSC,PingFang SC;font-weight:500;font-size:32rpx;color:#fff;line-height:84rpx;text-align:center;font-style:normal}.payitem.data-v-55906226{width:702rpx;height:140rpx;background:#fff;border-radius:12rpx;padding:34rpx 24rpx;box-sizing:border-box}.back.data-v-55906226{padding:20rpx 24rpx;box-sizing:border-box}.back .topbox.data-v-55906226{position:relative}.back .topbox .state.data-v-55906226{background:#fff;border-radius:6rpx;padding:12rpx;box-sizing:border-box}.back .topbox .paysum.data-v-55906226{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:28rpx;color:#222;line-height:40rpx;text-align:left;font-style:normal}.back .topbox .numbe.data-v-55906226{font-family:HarmonyOS_Sans_Medium;font-size:28rpx;color:#000;line-height:38rpx;text-align:left;font-style:normal;margin-top:20rpx}
+>>>>>>> 3aae73a792e3fefab7103cbdce52cc9f366debc5

unpackage/dist/build/mp-weixin/pageB/parcel.js

@@ -1 +1,5 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageB/parcel"],{"42cf":function(t,n,e){"use strict";var i=e("55bd"),a=e.n(i);a.a},4539:function(t,n,e){"use strict";e.r(n);var i=e("46b3"),a=e("4b1a");for(var c in a)["default"].indexOf(c)<0&&function(t){e.d(n,t,(function(){return a[t]}))}(c);e("42cf");var o,u=e("f0c5"),r=Object(u["a"])(a["default"],i["b"],i["c"],!1,null,"40afa20d",null,!1,i["a"],o);n["default"]=r.exports},"46b3":function(t,n,e){"use strict";var i;e.d(n,"b",(function(){return a})),e.d(n,"c",(function(){return c})),e.d(n,"a",(function(){return i}));var a=function(){var t=this,n=t.$createElement;t._self._c},c=[]},"4b1a":function(t,n,e){"use strict";e.r(n);var i=e("c4b0"),a=e.n(i);for(var c in i)["default"].indexOf(c)<0&&function(t){e.d(n,t,(function(){return i[t]}))}(c);n["default"]=a.a},"55bd":function(t,n,e){},c4b0:function(t,n,e){"use strict";(function(t){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var e={data:function(){return{logistics_company_name:"",logistics_no:"",estimated_weight:""}},computed:{i18n:function(){return this.$t("index")}},onShow:function(){t.setNavigationBarTitle({title:this.i18n.Addparcel})},methods:{offline:function(){var n=this;t.$u.http.post("/api/express-order/offline-create",{logistics_company_code:this.logistics_company_name,logistics_no:this.logistics_no,estimated_weight:this.estimated_weight}).then((function(e){n.$u.toast("添加成功"),setTimeout((function(){t.navigateBack()}),800)})).catch((function(){}))}}};n.default=e}).call(this,e("543d")["default"])},f791:function(t,n,e){"use strict";(function(t,n){var i=e("4ea4");e("f93b");i(e("66fd"));var a=i(e("4539"));t.__webpack_require_UNI_MP_PLUGIN__=e,n(a.default)}).call(this,e("bc2e")["default"],e("543d")["createPage"])}},[["f791","common/runtime","common/vendor"]]]);
+<<<<<<< HEAD
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageB/parcel"],{"0946":function(t,n,e){"use strict";var i=e("22f4"),a=e.n(i);a.a},"0985":function(t,n,e){"use strict";(function(t){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var e={data:function(){return{logistics_company_name:"",logistics_no:"",estimated_weight:""}},computed:{i18n:function(){return this.$t("index")}},onShow:function(){t.setNavigationBarTitle({title:this.i18n.Addparcel})},methods:{offline:function(){var n=this;t.$u.http.post("/api/express-order/offline-create",{logistics_company_code:this.logistics_company_name,logistics_no:this.logistics_no,estimated_weight:this.estimated_weight}).then((function(e){n.$u.toast("添加成功"),setTimeout((function(){t.navigateBack()}),800)})).catch((function(){}))}}};n.default=e}).call(this,e("df3c")["default"])},1668:function(t,n,e){"use strict";e.r(n);var i=e("d77d"),a=e("f0b3");for(var o in a)["default"].indexOf(o)<0&&function(t){e.d(n,t,(function(){return a[t]}))}(o);e("0946");var c=e("828b"),u=Object(c["a"])(a["default"],i["b"],i["c"],!1,null,"40afa20d",null,!1,i["a"],void 0);n["default"]=u.exports},"22f4":function(t,n,e){},"51a4":function(t,n,e){"use strict";(function(t,n){var i=e("47a9");e("abeb");i(e("3240"));var a=i(e("1668"));t.__webpack_require_UNI_MP_PLUGIN__=e,n(a.default)}).call(this,e("3223")["default"],e("df3c")["createPage"])},d77d:function(t,n,e){"use strict";e.d(n,"b",(function(){return i})),e.d(n,"c",(function(){return a})),e.d(n,"a",(function(){}));var i=function(){var t=this.$createElement;this._self._c},a=[]},f0b3:function(t,n,e){"use strict";e.r(n);var i=e("0985"),a=e.n(i);for(var o in i)["default"].indexOf(o)<0&&function(t){e.d(n,t,(function(){return i[t]}))}(o);n["default"]=a.a}},[["51a4","common/runtime","common/vendor"]]]);
+=======
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageB/parcel"],{"42cf":function(t,n,e){"use strict";var i=e("55bd"),a=e.n(i);a.a},4539:function(t,n,e){"use strict";e.r(n);var i=e("46b3"),a=e("4b1a");for(var c in a)["default"].indexOf(c)<0&&function(t){e.d(n,t,(function(){return a[t]}))}(c);e("42cf");var o,u=e("f0c5"),r=Object(u["a"])(a["default"],i["b"],i["c"],!1,null,"40afa20d",null,!1,i["a"],o);n["default"]=r.exports},"46b3":function(t,n,e){"use strict";var i;e.d(n,"b",(function(){return a})),e.d(n,"c",(function(){return c})),e.d(n,"a",(function(){return i}));var a=function(){var t=this,n=t.$createElement;t._self._c},c=[]},"4b1a":function(t,n,e){"use strict";e.r(n);var i=e("c4b0"),a=e.n(i);for(var c in i)["default"].indexOf(c)<0&&function(t){e.d(n,t,(function(){return i[t]}))}(c);n["default"]=a.a},"55bd":function(t,n,e){},c4b0:function(t,n,e){"use strict";(function(t){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var e={data:function(){return{logistics_company_name:"",logistics_no:"",estimated_weight:""}},computed:{i18n:function(){return this.$t("index")}},onShow:function(){t.setNavigationBarTitle({title:this.i18n.Addparcel})},methods:{offline:function(){var n=this;t.$u.http.post("/api/express-order/offline-create",{logistics_company_code:this.logistics_company_name,logistics_no:this.logistics_no,estimated_weight:this.estimated_weight}).then((function(e){n.$u.toast("添加成功"),setTimeout((function(){t.navigateBack()}),800)})).catch((function(){}))}}};n.default=e}).call(this,e("543d")["default"])},f791:function(t,n,e){"use strict";(function(t,n){var i=e("4ea4");e("f93b");i(e("66fd"));var a=i(e("4539"));t.__webpack_require_UNI_MP_PLUGIN__=e,n(a.default)}).call(this,e("bc2e")["default"],e("543d")["createPage"])}},[["f791","common/runtime","common/vendor"]]]);
+>>>>>>> 3aae73a792e3fefab7103cbdce52cc9f366debc5

unpackage/dist/build/mp-weixin/pageD/productDetails/productDetails.wxss

@@ -1 +1 @@
-.page.data-v-1f6024b8{background-color:#fff;padding-bottom:150rpx}.page .top-fail.data-v-1f6024b8{height:60rpx;background-color:#fff1ee;padding-left:24rpx;display:flex;align-items:center;font-size:24rpx;color:#333}.page .top-fail .fail-icon.data-v-1f6024b8{width:32rpx;height:32rpx;margin-right:10rpx}.page .fail.data-v-1f6024b8{height:60rpx;background-color:#fff1d7;padding-left:24rpx;display:flex;align-items:center;font-size:24rpx;color:#333}.page .fail .fail-icon.data-v-1f6024b8{width:32rpx;height:32rpx;margin-right:10rpx}.page .goods-img.data-v-1f6024b8{width:100%;height:750rpx}.page .price.data-v-1f6024b8{color:#f83224;margin-top:36rpx;padding-left:40rpx;font-weight:600}.page .goods-title.data-v-1f6024b8{padding:0 40rpx;font-size:32rpx;margin-top:20rpx}.page .goods-detail.data-v-1f6024b8{font-size:28rpx;margin-top:84rpx;padding-left:40rpx}.page .detail.data-v-1f6024b8{padding:24rpx 20rpx}.page .detail .detail-img.data-v-1f6024b8{width:100%}.page .footer.data-v-1f6024b8{position:fixed;bottom:0;width:100%;padding-bottom:84rpx;padding-top:20rpx;background-color:#fff}.page .footer .btn.data-v-1f6024b8{border-radius:52rpx;background-color:#f83224;color:#fff;border:none;padding:0;margin:0;width:94%;font-size:30rpx;margin:0 auto}
+.page.data-v-af1f9638{background-color:#fff;padding-bottom:150rpx}.page .top-fail.data-v-af1f9638{height:60rpx;background-color:#fff1ee;padding-left:24rpx;display:flex;align-items:center;font-size:24rpx;color:#333}.page .top-fail .fail-icon.data-v-af1f9638{width:32rpx;height:32rpx;margin-right:10rpx}.page .fail.data-v-af1f9638{height:60rpx;background-color:#fff1d7;padding-left:24rpx;display:flex;align-items:center;font-size:24rpx;color:#333}.page .fail .fail-icon.data-v-af1f9638{width:32rpx;height:32rpx;margin-right:10rpx}.page .goods-img.data-v-af1f9638{width:100%;height:750rpx}.page .price.data-v-af1f9638{color:#f83224;margin-top:36rpx;padding-left:40rpx;font-weight:600}.page .goods-title.data-v-af1f9638{padding:0 40rpx;font-size:32rpx;margin-top:20rpx}.page .goods-detail.data-v-af1f9638{font-size:28rpx;margin-top:84rpx;padding-left:40rpx}.page .detail.data-v-af1f9638{padding:24rpx 20rpx}.page .detail .detail-img.data-v-af1f9638{width:100%}.page .footer.data-v-af1f9638{position:fixed;bottom:0;width:100%;padding-bottom:84rpx;padding-top:20rpx;background-color:#fff}.page .footer .btn.data-v-af1f9638{border-radius:52rpx;background-color:#f83224;color:#fff;border:none;padding:0;margin:0;width:94%;font-size:30rpx;margin:0 auto}