编写再来一单

pageA/order.vue

@@ -307,8 +307,6 @@
 				if (options.share_merchant_id) {
 					this.share_merchant_id = options.share_merchant_id
 				}
-				console.log(this.goodinfo);
-				console.log(this.sku_info);
 			}
 		},
 		onShow() {

pageA/payorder.vue

@@ -60,8 +60,51 @@
 					<text>支付剩余时间 13:50</text>
 				</view> -->
       </view>
+      <!-- 缴纳保证金 -->
+      <view
+        v-if="orderType == 'bond'"
+        class="payitem"
+        style="margin-top: 100rpx; display: flex"
+        @click="change(0)"
+      >
+        <image
+          src="static/images/yuer.png"
+          mode=""
+          style="width: 40rpx; height: 40rpx"
+        ></image>
+        <view class="u-flex u-row-between" style="margin-left: 20rpx; flex: 1">
+          <view class="">
+            <view class="">保证金支付</view>
+            <view
+              class=""
+              style="
+                margin-top: 10rpx;
+                color: rgba(248, 50, 36, 1);
+                font-size: 24rpx;
+              "
+            >
+              {{ i18n.Currentbalance }}:
+              {{ bondBalance }}
+            </view>
+          </view>
+          <image
+            v-if="mode == 0"
+            src="static/images/active.png"
+            mode=""
+            style="width: 36rpx; height: 36rpx"
+          >
+          </image>
+          <image
+            v-else
+            src="static/images/unactive.png"
+            mode=""
+            style="width: 36rpx; height: 36rpx"
+          ></image>
+        </view>
+      </view>
       <!-- 余额支付 -->
       <view
+        v-else
         class="payitem"
         style="margin-top: 100rpx; display: flex"
         @click="change(0)"
@@ -102,6 +145,7 @@
       </view>
       <!-- 微信支付 -->
       <view
+        v-if="orderType != 'bond'"
         class="payitem"
         style="margin-top: 20rpx; display: flex"
         @click="change(1)"
@@ -142,6 +186,7 @@
       </view>
       <!-- 客服支付 -->
       <view
+        v-if="orderType != 'bond'"
         class="payitem"
         style="margin-top: 20rpx; display: flex"
         @click="change(2)"
@@ -204,8 +249,7 @@ export default {
       stateshow: false,
       state: "人民币",
       state_id: 0,
-      array: [
-      ],
+      array: [],
       sum: "",
       pay_type: "balance",
       orderid: "",
@@ -216,6 +260,7 @@ export default {
       sum1: "",
       language: "zh-CN",
       orderType: "",
+      bondBalance: "",
     };
   },
   onLoad(options) {
@@ -247,6 +292,7 @@ export default {
         .then((res) => {
           this.balance = res.balance;
           this.balance1 = this.balance;
+          this.bondBalance = res.deposit;
           this.calculate1(this.balance1);
         })
         .catch(() => {});

pageC/applicationRefund/applicationRefund.vue

@@ -4,7 +4,7 @@
       <view class="commodity-1">
         <image
           class="commodity-img"
-          :src="goodsDetail.goods.goods_image"
+          :src="goodsDetail.goods.sku_item.image"
           mode=""
         ></image>
         <view class="commodity-right">
@@ -79,16 +79,14 @@
           @delete="deletePic"
           name="6"
           multiple
-          :maxCount="1"
-          width="250"
-          height="150"
+          :maxCount="10"
         >
           <view class="unload">
             <view class="text-content"> 上传凭证<br />(最多9张) </view>
           </view>
         </u-upload>
       </view>
-      <view class="img-list">
+      <!-- <view class="img-list">
         <image
           v-for="(item, index) in imgList"
           :src="item"
@@ -96,12 +94,14 @@
           mode="scaleToFill"
           class="upload-img"
         />
-      </view>
+      </view> -->
     </view>
     <reasonPopupVue :show="show" @close="close"></reasonPopupVue>
 
     <view class="footer">
-      <button class="btn" @click="submitApplication">提交申请</button>
+      <button class="btn" @click="submitApplication" v-if="btnShow">
+        提交申请
+      </button>
     </view>
   </view>
 </template>
@@ -120,6 +120,8 @@ export default {
       orderId: "",
       goodsDetail: {},
       imgList: [],
+      fileList6: [],
+      btnShow: true,
     };
   },
   onLoad(options) {
@@ -137,10 +139,57 @@ export default {
       this.show = false;
     },
 
-    //上传图片
-    afterRead(e) {
-      console.log(e);
-      this.imgList.push(e.file[0].url);
+    // 删除图片
+    deletePic(event) {
+      this[`fileList${event.name}`].splice(event.index, 1);
+    },
+    // 新增图片
+    async afterRead(event) {
+      console.log(event);
+      // 当设置 multiple 为 true 时, file 为数组格式，否则为对象格式
+      let lists = [].concat(event.file);
+      let fileListLen = this[`fileList${event.name}`].length;
+      lists.map((item) => {
+        this[`fileList${event.name}`].push({
+          ...item,
+          // status: "uploading",
+          // message: "上传中",
+        });
+      });
+      for (let i = 0; i < lists.length; i++) {
+        const result = await this.uploadFilePromise(lists[i].url);
+        let item = this[`fileList${event.name}`][fileListLen];
+        this[`fileList${event.name}`].splice(
+          fileListLen,
+          1,
+          Object.assign(item, {
+            status: "success",
+            message: "",
+            url: result,
+          })
+        );
+        fileListLen++;
+      }
+    },
+    uploadFilePromise(url) {
+      this.btnShow = false;
+      return new Promise((resolve, reject) => {
+        let a = uni.uploadFile({
+          url: `${uni.$u.http.config.baseURL}/api/upload/images`, // 接口地址
+          filePath: url,
+          name: "file",
+          formData: {
+            user: "test",
+          },
+          success: (res) => {
+            this.imgList.push(JSON.parse(res.data).data.filePath);
+            setTimeout(() => {
+              resolve(res.data.data);
+            }, 1000);
+            this.btnShow = true;
+          },
+        });
+      });
     },
 
     //获取订单商品信息

pageC/orderForm/component/refundCard.vue

@@ -77,7 +77,7 @@
               <button
                 class="status-2"
                 v-if="item.refund.status == 2"
-                @click="$emit('unreviewAfter', item)"
+                @click.stop="$emit('unreviewAfter', item)"
               >
                 继续申请
               </button>

pageC/orderFormDetail/component/commodityDetail.vue

@@ -76,54 +76,52 @@
           </button>
         </view>
       </view>
-      <view class="information">
-        <text class="_label">商品总价</text>
-        <view style="color: #222; font-weight: 600" v-if="orderDetail.freight">
-          <text style="font-size: 20rpx">￥</text>
-          <text>{{ orderDetail.goods_amount.split(".")[0] }}</text
-          >.
-          <text style="font-size: 20rpx">{{
-            orderDetail.goods_amount.split(".")[1]
-          }}</text>
-        </view>
-      </view>
-      <view class="information">
-        <text class="_label">商品总重量</text>
-        <view class="_title-right">
-          {{ orderDetail.weight_total || 0 }}Kg
-        </view>
+    </view>
+    <view class="information">
+      <text class="_label">商品总价</text>
+      <view style="color: #222; font-weight: 600" v-if="orderDetail.freight">
+        <text style="font-size: 20rpx">￥</text>
+        <text>{{ orderDetail.goods_amount.split(".")[0] }}</text
+        >.
+        <text style="font-size: 20rpx">{{
+          orderDetail.goods_amount.split(".")[1]
+        }}</text>
       </view>
-      <view class="information">
-        <text class="_label">跨境物流</text>
-        <view lass="_title-right">
-          {{ orderDetail.container.transport_type.name }} |
-          {{ orderDetail.container.base.name }}
-        </view>
+    </view>
+    <view class="information">
+      <text class="_label">商品总重量</text>
+      <view class="_title-right"> {{ orderDetail.weight_total || 0 }}Kg </view>
+    </view>
+    <view class="information">
+      <text class="_label">跨境物流</text>
+      <view lass="_title-right">
+        {{ orderDetail.container.transport_type.name }} |
+        {{ orderDetail.container.base.name }}
       </view>
-      <view class="information last">
-        <text class="_label">运费</text>
-        <view style="color: #222; font-weight: 600" v-if="orderDetail.freight">
-          <text style="font-size: 20rpx">￥</text>
-          <text>{{ orderDetail.freight.split(".")[0] }}</text
-          >.
-          <text style="font-size: 20rpx">{{
-            orderDetail.freight.split(".")[1]
-          }}</text>
-        </view>
+    </view>
+    <view class="information last">
+      <text class="_label">运费</text>
+      <view style="color: #222; font-weight: 600" v-if="orderDetail.freight">
+        <text style="font-size: 20rpx">￥</text>
+        <text>{{ orderDetail.freight.split(".")[0] }}</text
+        >.
+        <text style="font-size: 20rpx">{{
+          orderDetail.freight.split(".")[1]
+        }}</text>
       </view>
-      <view class="_bottom">
-        <text class="_label">应付款 </text>
-        <view
-          style="color: #f83224; margin-left: 10rpx; font-weight: 600"
-          v-if="orderDetail.amount"
-        >
-          <text style="font-size: 20rpx">￥</text>
-          <text>{{ orderDetail.amount.split(".")[0] }}</text
-          >.
-          <text style="font-size: 20rpx">{{
-            orderDetail.amount.split(".")[1]
-          }}</text>
-        </view>
+    </view>
+    <view class="_bottom">
+      <text class="_label">应付款 </text>
+      <view
+        style="color: #f83224; margin-left: 10rpx; font-weight: 600"
+        v-if="orderDetail.amount"
+      >
+        <text style="font-size: 20rpx">￥</text>
+        <text>{{ orderDetail.amount.split(".")[0] }}</text
+        >.
+        <text style="font-size: 20rpx">{{
+          orderDetail.amount.split(".")[1]
+        }}</text>
       </view>
     </view>
   </view>
@@ -199,6 +197,7 @@ export default {
   .title {
     display: flex;
     justify-content: space-between;
+    margin-top: 20rpx;
 
     .title-left {
       display: flex;

pageC/orderFormDetail/orderFormDetail.vue

@@ -5,7 +5,7 @@
       <view class="payment">{{ orderDetail.status_name }}</view>
 
       <text class="timer" v-if="orderDetail.simplify_status == 'unpaid'"
-        >剩22小时52分自动关闭</text
+        >剩{{ hours }}小时{{ minute }}分自动关闭</text
       >
       <text
         v-else-if="orderDetail.simplify_status == 'undifference'"
@@ -217,6 +217,8 @@ export default {
       show: false,
       orderDetail: {},
       agreeShow: false,
+      hours: "",
+      minute: "",
     };
   },
   methods: {
@@ -310,14 +312,18 @@ export default {
 
     //获取时间，倒计时
     getCountdown(timer) {
-      const nowTime = new Date().getTime();
-      const appointTime = new Date(timer).getTime();
-      console.log("nowTime", nowTime);
-      console.log("appointTime", appointTime);
-      console.log("nowTime-appointTime", nowTime - appointTime);
-      const count = nowTime - appointTime;
-
-      if (count > 86400000) {
+      const nowTime = new Date().getTime(); //当前时间的毫秒数
+      const appointTime = new Date(timer).getTime(); //创建订单时间的毫秒数
+      const count = nowTime - appointTime; //当前时间到创建订单时间的毫秒数
+
+      //86400000  24小时
+      if (count < 86400000) {
+        const currentTime = 86400000 - count;
+        this.hours = Math.floor(currentTime / (1000 * 60 * 60)); //获取小时
+        //获取分钟
+        this.minute = Math.floor(
+          (currentTime % (1000 * 60 * 60)) / (1000 * 60)
+        );
       }
     },
 

pageD/afterSalesDetail/afterSalesDetail.vue

@@ -42,6 +42,7 @@
     <ApplicationInformation
       :orderInformation="orderInformation"
       v-if="orderInformation.goods"
+      :refuseImg="refuseImg"
     />
     <RefusePopup :show="show" @refund="close" />
     <AgreePopup :agreeShow="agreeShow" @close="close" title="请确认是否退款" />
@@ -77,6 +78,7 @@ export default {
       agreeShow: false,
       orderInformation: {},
       orderId: "",
+      refuseImg: [], //申请退款图片
     };
   },
   onLoad(options) {
@@ -100,7 +102,6 @@ export default {
             reason: value,
           })
           .then((res) => {
-            console.log(res);
             uni.showToast({
               title: "已同意退款",
               icon: "none",
@@ -114,6 +115,9 @@ export default {
         .post(`/api/order/refund_read?order_refund_id=${id}`)
         .then((res) => {
           this.orderInformation = res;
+          this.refuseImg =
+            this.orderInformation.goods[0].refund.images.split(",");
+          console.log(this.refuseImg);
         });
     },
   },

pageD/afterSalesDetail/component/applicationInformation.vue

@@ -18,7 +18,9 @@
       <view class="photo-list">
         <image
           class="img-1"
-          :src="orderInformation.goods[0].refund.images"
+          v-for="(item, index) in refuseImg"
+          :key="index"
+          :src="item"
           mode="scaleToFill"
         />
       </view>
@@ -35,6 +37,12 @@ export default {
         return {};
       },
     },
+    refuseImg: {
+      typeof: Array,
+      default: () => {
+        return [];
+      },
+    },
   },
   data() {
     return {};

pageD/afterSalesDetail/component/commodityDetail.vue

@@ -17,7 +17,7 @@
     </view>
     <view class="commodity-information">
       <view class="commodity-1" v-for="item in orderInformation.goods">
-        <image class="commodity-img" :src="item.goods_image" mode=""></image>
+        <image class="commodity-img" :src="item.sku_item.image" mode=""></image>
         <view class="">
           <view class="commodity-2">
             <view class="commodity-title"> {{ item.goods_name }}</view>
@@ -186,7 +186,7 @@ export default {
         justify-content: space-between;
 
         .commodity-title {
-          width: 366rpx;
+          width: 326rpx;
           overflow: hidden;
           white-space: nowrap;
           text-overflow: ellipsis;

pageD/newBulitOrder/component/commodity.vue

@@ -6,28 +6,21 @@
     </view>
     <view v-for="item in goodsList.order_goods" :key="item.id" class="detail">
       <image :src="item.sku_item.image" class="detail-img" mode=""></image>
-      <view
-        class=""
-        style="
-          flex-direction: column;
-          justify-content: space-between;
-          height: 184rpx;
-          display: flex;
-          flex: 1;
-        "
-      >
+      <view class="detail-right">
         <view class="">
           <text class="toptitle">{{ item.goods.name_cn }}</text>
           <view class="weight">{{ item.sku_item.item }} </view>
         </view>
         <view class="u-flex u-row-between">
-          <view class="">
-            <text class="money">¥</text>
-            <text class="money" style="font-size: 34rpx">{{
-              item.sku_item.price
-            }}</text>
+          <view class="money">
+            <text>¥</text>
+            <text style="font-size: 34rpx">{{ item.sku_item.price }}</text>
+          </view>
+          <view class="stepping">
+            <u-icon name="minus" size="12"></u-icon>
+            <text>{{ goodsValue }}</text>
+            <u-icon name="plus" size="12"></u-icon>
           </view>
-          <view class=""> x {{ item.goods_num }}</view>
         </view>
       </view>
     </view>
@@ -43,6 +36,10 @@ export default {
         return [];
       },
     },
+    goodsValue: {
+      typeof: Number,
+      default: 0,
+    },
   },
 };
 </script>
@@ -73,6 +70,54 @@ export default {
       height: 184rpx;
       margin-right: 24rpx;
     }
+    .detail-right {
+      flex-direction: column;
+      justify-content: space-between;
+      height: 184rpx;
+      display: flex;
+      flex: 1;
+
+      .toptitle {
+        font-family: PingFangSC, PingFang SC;
+        font-size: 28rpx;
+        color: #222222;
+        width: 100%;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        -webkit-line-clamp: 1;
+        display: -webkit-box;
+        -webkit-box-orient: vertical;
+        word-break: break-all;
+        margin-bottom: 16rpx;
+      }
+      .weight {
+        font-family: PingFangSC, PingFang SC;
+        font-size: 24rpx;
+        color: rgba(34, 34, 34, 0.6);
+        line-height: 34rpx;
+      }
+
+      .money {
+        font-family: HarmonyOS_Sans_Medium;
+        font-size: 24rpx;
+        color: #f83224;
+        line-height: 38rpx;
+        text-align: left;
+        font-style: normal;
+        // font-weight: 500;
+        font-weight: bold;
+      }
+      .stepping {
+        display: flex;
+        width: 140rpx;
+        height: 40rpx;
+        justify-content: space-around;
+        align-items: center;
+        font-size: 20rpx;
+        border: 2rpx solid rgba(151, 151, 151, 0.4);
+        border-radius: 20rpx;
+      }
+    }
   }
 }
 </style>

pageD/newBulitOrder/component/goodsInformation.vue

@@ -0,0 +1,156 @@
+<template>
+  <view class="list">
+    <!-- 商品相关 -->
+    <view class="abount" style="margin-top: 20rpx">
+      <view class="u-flex u-row-between" style="margin-bottom: 40rpx">
+        <view class="name">{{ i18n.Commodityamount }}</view>
+        <view class="money">
+          ¥{{
+            goodinfo.is_discount == 1
+              ? (Number(sku_info.price * 100) * Number(value * 100)) / 10000
+              : (Number(sku_info.discount_price * 100) * Number(value * 100)) /
+                10000
+          }}
+        </view>
+      </view>
+      <view class="u-flex u-row-between">
+        <view class="name">{{ i18n.Grosscommodityweight }}</view>
+        <view class="money">{{ Number(sku_info.weight) * value }}kg</view>
+      </view>
+      <view class="back u-flex" v-if="containname1">
+        <image
+          src="static/images/warning.png"
+          style="width: 32rpx; height: 32rpx"
+          mode=""
+        ></image>
+        <text style="margin-left: 12rpx; font-size: 24rpx"
+          >{{ i18n.buy }}{{ max_weight }}kg{{ i18n.price }}¥{{ unit_fee }}，{{
+            i18n.morefavorable
+          }}</text
+        >
+      </view>
+      <view
+        class="u-flex u-row-between"
+        style="margin-bottom: 40rpx; margin-top: 20rpx"
+      >
+        <view class="name">{{ i18n.Costperkilogram }}</view>
+        <view class="money">{{
+          containname1 ? unit_price : i18n.shippingmethod
+        }}</view>
+      </view>
+      <view class="u-flex u-row-between">
+        <view class="name">{{ i18n.freight }}</view>
+        <view class="money">{{
+          containname1 ? sum : i18n.shippingmethod
+        }}</view>
+      </view>
+      <view class="zong u-flex u-row-right">
+        <view class="">
+          <text class="small">{{ i18n.subtotal }}</text>
+          <text class="mon">¥</text>
+          <text class="mon" style="font-size: 40rpx">{{
+            goodinfo.is_discount == 1
+              ? (Number(sku_info.price * 100) * Number(value * 100)) / 10000
+              : (Number(sku_info.discount_price * 100) * Number(value * 100)) /
+                10000
+          }}</text>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+<script>
+export default {
+  props: {
+    goodinfo: {
+      typeof: Object,
+      default: () => {
+        return {};
+      },
+    },
+    sku_info: {
+      typeof: Object,
+      default: () => {
+        return {};
+      },
+    },
+    value: {
+      typeof: Number,
+      default: 1,
+    },
+  },
+  computed: {
+    i18n() {
+      return this.$t("index");
+    },
+  },
+};
+</script>
+<style scoped lang="scss">
+.list {
+  //商品相关
+  .abount {
+    padding: 28rpx 24rpx;
+    box-sizing: border-box;
+    background: #ffffff;
+    border-radius: 16rpx;
+    width: 702rpx;
+
+    .zong {
+      width: 654rpx;
+      padding: 22rpx 0 0 0;
+      border-top: 2rpx solid rgba(151, 151, 151, 0.1);
+      margin-top: 32rpx;
+
+      .small {
+        font-family: PingFangTC, PingFangTC;
+        font-weight: 400;
+        font-size: 24rpx;
+        color: #444444;
+        line-height: 34rpx;
+        text-align: left;
+        font-style: normal;
+      }
+
+      .mon {
+        font-family: HarmonyOS_Sans_Medium;
+        font-size: 28rpx;
+        color: #f83224;
+        line-height: 38rpx;
+        text-align: left;
+        font-style: normal;
+        margin-left: 12rpx;
+        font-weight: bold;
+      }
+    }
+
+    .back {
+      background: rgba(244, 244, 244, 1);
+      padding: 22rpx 16rpx;
+      box-sizing: border-box;
+      margin-top: 10rpx;
+      // margin-bottom: 20rpx;
+    }
+
+    .name {
+      font-family: PingFangSC, PingFang SC;
+      font-weight: 400;
+      font-size: 28rpx;
+      color: #333333;
+      line-height: 40rpx;
+      text-align: left;
+      font-style: normal;
+    }
+
+    .money {
+      font-family: HarmonyOS_Sans_Medium;
+      font-size: 28rpx;
+      color: #222222;
+      line-height: 38rpx;
+      text-align: left;
+      font-style: normal;
+      font-weight: 600;
+    }
+  }
+}
+</style>

pageD/newBulitOrder/component/nextLogistics.vue

@@ -0,0 +1,321 @@
+<template>
+  <view class="list">
+    <u-popup
+      :safeAreaInsetTop="false"
+      :show="nextLogisticsShow"
+      @close="$emit('closeLogistics')"
+      mode="bottom"
+      closeIconPos="top-right"
+      round="28"
+      bgColor="#F4F4F4"
+    >
+      <view
+        style="padding: 40rpx 28rpx; box-sizing: border-box; position: relative"
+      >
+        <view class="u-flex u-row-between">
+          <view class="" style="width: 28px; height: 28px"></view>
+          <view class="poptitle">
+            {{ i18n.flow }}
+          </view>
+          <u-icon
+            name="close"
+            @click="$emit('closeLogistics')"
+            color="background: #333333;"
+            size="28"
+          ></u-icon>
+        </view>
+        <scroll-view :scroll-y="true" style="500rpx">
+          <view
+            class="transport"
+            style="margin-top: 32rpx"
+            @click="activea(item, idx)"
+            v-for="(item, idx) in containerList"
+            v-if="item.sum != 0"
+          >
+            <view class="u-flex u-row-between">
+              <text class="yundate"
+                >{{ i18n.Shipmentdate }} {{ item.end_date }}</text
+              >
+              <image
+                v-if="datechan == idx"
+                src="../../../static/mine/330.png"
+                style="width: 36rpx; height: 36rpx"
+                mode=""
+              ></image>
+              <image
+                v-else
+                src="../../../static/mine/327.png"
+                style="width: 36rpx; height: 36rpx"
+                mode=""
+              ></image>
+            </view>
+            <view class="u-flex u-row-between" style="margin-top: 28rpx">
+              <view class="chest">
+                <text>{{ item.name_cn }}</text>
+                <text v-if="language == 'en-US'">{{ item.name_en }}</text>
+                <text v-if="language == 'es-ES'">{{ item.name_es }}</text>
+                <text v-if="language == 'it-IT'">{{ item.name_ita }}</text>
+                <text style="margin: 0 16rpx">|</text>
+                <text
+                  >{{ i18n.Estimatedtimeofarrival }}{{ item.transport_days
+                  }}{{ i18n.Workingday }}</text
+                >
+              </view>
+              <view class="mone">
+                <text>¥</text>
+                <text style="font-size: 48rpx; font-weight: 600">{{
+                  item.sum
+                }}</text>
+              </view>
+            </view>
+          </view>
+        </scroll-view>
+        <view class="" style="height: 166rpx"></view>
+        <view class="enbottom u-flex u-row-between">
+          <view class="cancel" @click="$emit('closeLogistics')">{{
+            i18n.Cancel
+          }}</view>
+          <view class="confirm" @click="confirm">{{ i18n.enter }}</view>
+        </view>
+      </view>
+    </u-popup>
+  </view>
+</template>
+<script>
+export default {
+  name: "nextLogistics",
+  props: {
+    nextLogisticsShow: {
+      typeof: Boolean,
+      default: false,
+    },
+    language: {
+      typeof: String,
+      default: "",
+    },
+    goodinfo: {
+      typeof: Object,
+      default: () => {
+        return {};
+      },
+    },
+  },
+  computed: {
+    i18n() {
+      return this.$t("index");
+    },
+  },
+  data() {
+    return {
+      containerList: [], //货柜列表
+      unit_price: "",
+      recommend_weight: "",
+      containname: "",
+      sum: "",
+      containid: "",
+      datechan: "", //当前选中的货柜列表下标
+    };
+  },
+  watch: {
+    //打开窗口，获取货柜
+    nextLogisticsShow(newVal) {
+      if (newVal) {
+        uni.$u.http
+          .get("/api/container-base", {
+            params: {
+              is_page: 0,
+              province_id: this.goodinfo.province_id,
+              transport_type_id: this.goodinfo.transport_type_id,
+              weight: Number(this.goodinfo.weight),
+              type: "normal",
+              length: Number(this.goodinfo.length), //		是	String	长
+              width: this.goodinfo.width, //		是	String	宽
+              height: this.goodinfo.height, //		是	String	高
+              cart_id: "",
+            },
+          })
+          .then((res) => {
+            res.forEach((item) => {
+              if (item.sum != 0) {
+                this.containerList.push(item);
+              }
+            });
+            if (this.goodinfo.is_shipping == 0) {
+              this.sum = 0;
+            } else {
+              this.sum = this.containerList[0].sum;
+            }
+            if (this.goodinfo.is_shipping == 0) {
+              this.unit_price = 0;
+            } else {
+              this.unit_price = this.containerList[0].unit_price;
+            }
+            this.recommend_weight = this.containerList[0].recommend_weight;
+            this.containid = this.containerList[0].id;
+            if (this.language == "zh-CN") {
+              this.containname = this.containerList[0].name_cn;
+            }
+            if (this.language == "en-US") {
+              this.containname = this.containerList[0].name_en;
+            }
+            if (this.language == "es-ES") {
+              this.containname = this.containerList[0].name_es;
+            }
+            if (this.language == "it-IT") {
+              this.containname = this.containerList[0].name_ita;
+            }
+          })
+          .catch(() => {});
+      }
+    },
+  },
+  methods: {
+    //运费满减
+    config() {
+      var that = this;
+      uni.$u.http
+        .get("/api/config", {
+          params: {
+            module: "free_shipping",
+          },
+        })
+        .then((res) => {
+          let goodsum = "";
+          if (that.goodinfo.is_discount == 1) {
+            goodsum =
+              (Number(that.sku_info.price * 100) * Number(that.value * 100)) /
+              10000;
+            console.log("that.sum", that.sum);
+            console.log("that.goodsum", goodsum);
+            if (goodsum > res.free_shipping) {
+              that.sum = 0;
+              that.unit_price = 0;
+            }
+          } else {
+            goodsum =
+              (Number(that.sku_info.discount_price * 100) *
+                Number(that.value * 100)) /
+              10000;
+            if (goodsum > res.free_shipping) {
+              that.sum = 0;
+              that.unit_price = 0;
+            }
+          }
+        })
+        .catch(() => {});
+    },
+
+    //确定选择货柜
+    confirm() {
+      this.$emit("closeLogistics");
+    },
+
+    activea(item, idx) {
+      this.datechan = idx;
+      this.sum = item.sum;
+      this.unit_price = item.unit_price;
+      this.recommend_weight = item.recommend_weight;
+      this.containid = item.id;
+      if (this.language == "zh-CN") {
+        this.containname = item.name_cn;
+      }
+      if (this.language == "en-US") {
+        this.containname = item.name_en;
+      }
+      if (this.language == "es-ES") {
+        this.containname = item.name_es;
+      }
+      if (this.language == "it-IT") {
+        this.containname = item.name_ita;
+      }
+    },
+  },
+};
+</script>
+<style scoped lang="scss">
+.poptitle {
+  width: 142rpx;
+  height: 50rpx;
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 600;
+  font-size: 36rpx;
+  color: #333333;
+  text-align: center;
+  width: 100%;
+}
+.transport {
+  width: 702rpx;
+  height: 164rpx;
+  background: #ffffff;
+  border-radius: 12rpx;
+  padding: 24rpx 20rpx;
+  box-sizing: border-box;
+}
+.yundate {
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 550;
+  font-size: 32rpx;
+  color: #333333;
+  line-height: 44rpx;
+  text-align: left;
+  font-style: normal;
+}
+
+.chest {
+  font-family: SFPro, SFPro;
+  font-weight: 400;
+  font-size: 24rpx;
+  color: #555555;
+  line-height: 28rpx;
+  text-align: left;
+  font-style: normal;
+}
+.mone {
+  font-family: JDZhengHT, JDZhengHT;
+  font-weight: 400;
+  font-size: 26rpx;
+  color: #f83224;
+  line-height: 32rpx;
+  text-align: left;
+  font-style: normal;
+}
+
+.enbottom {
+  width: 750rpx;
+  height: 166rpx;
+  background: #ffffff;
+  position: absolute;
+  left: 0rpx;
+  bottom: 0;
+  padding: 0 24rpx;
+  box-sizing: border-box;
+  .confirm {
+    width: 398rpx;
+    height: 84rpx;
+    background: #f83224;
+    border-radius: 42rpx;
+    text-align: center;
+    font-family: PingFangSC, PingFang SC;
+    font-weight: 500;
+    font-size: 32rpx;
+    color: #ffffff;
+    line-height: 84rpx;
+    text-align: center;
+    font-style: normal;
+  }
+
+  .cancel {
+    width: 280rpx;
+    height: 84rpx;
+    border-radius: 42rpx;
+    border: 2rpx solid rgba(151, 151, 151, 0.3);
+    font-family: PingFangSC, PingFang SC;
+    font-weight: 400;
+    font-size: 32rpx;
+    color: #444444;
+    line-height: 84rpx;
+    text-align: center;
+    font-style: normal;
+  }
+}
+</style>

pageD/newBulitOrder/component/recommendGoods.vue

@@ -0,0 +1,140 @@
+<template>
+  <view class="list">
+    <view class="recommend">
+      <view class="top">
+        <image
+          src="../../../static/images/recommend.png"
+          style="width: 124rpx; height: 30rpx"
+          mode="scaleToFill"
+        />
+      </view>
+      <view class="bottom">
+        <scroll-view
+          scroll-x
+          class="u-flex"
+          style="column: gap 28rpx; display: flex"
+        >
+          <view class="u-flex" style="column-gap: 16rpx">
+            <view
+              class=""
+              v-for="(item, idx) in swiptlist"
+              :key="idx"
+              @click="todetail(item.id)"
+            >
+              <image
+                :src="item.image"
+                style="width: 156rpx; height: 156rpx"
+                mode=""
+              >
+              </image>
+              <view class="title">
+                {{ item.name_cn }}
+              </view>
+              <view class="title" v-if="language == 'en-US'">
+                {{ item.name_en }}
+              </view>
+              <view class="title" v-if="language == 'es-ES'">
+                {{ item.name_es }}
+              </view>
+              <view class="title" v-if="language == 'it-IT'">
+                {{ item.name_ita }}
+              </view>
+              <view class="money" style="color: #f83224; font-size: 20rpx">
+                <text>¥</text>
+                <text style="font-size: 28rpx">{{
+                  item.is_discount == 0
+                    ? item.discount_price.slice(0, -3)
+                    : item.price.slice(0, -3)
+                }}</text>
+                <text>{{
+                  item.is_discount == 0
+                    ? item.discount_price.slice(-3)
+                    : item.price.slice(-3)
+                }}</text>
+              </view>
+            </view>
+          </view>
+        </scroll-view>
+      </view>
+    </view>
+  </view>
+</template>
+<script>
+export default {
+  props: {
+    swiptlist: {
+      typeof: Array,
+      default: () => {
+        return [];
+      },
+    },
+  },
+  computed: {
+    i18n() {
+      return this.$t("index");
+    },
+  },
+  methods: {
+    //跳转商品详情
+    todetail(id) {
+      uni.reLaunch({
+        url: "/pageA/productdetails?id=" + id,
+      });
+    },
+  },
+};
+</script>
+<style scoped lang="scss">
+.list {
+  .recommend {
+    margin-top: 20rpx;
+
+    .title {
+      font-family: PingFangSC, PingFang SC;
+      font-weight: 400;
+      font-size: 22rpx;
+      color: #222222;
+      line-height: 32rpx;
+      text-align: left;
+      font-style: normal;
+      width: 148rpx;
+      height: 64rpx;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      -webkit-line-clamp: 2;
+      display: -webkit-box;
+      -webkit-box-orient: vertical;
+      word-break: break-all;
+    }
+
+    .top {
+      width: 702rpx;
+      height: 64rpx;
+      background: linear-gradient(
+        180deg,
+        #ffe7e3 0%,
+        rgba(255, 255, 255, 1) 100%
+      );
+      border-radius: 16rpx 16rpx 0 0;
+      padding: 24rpx 22rpx;
+      box-sizing: border-box;
+    }
+
+    .bottom {
+      padding: 0 20rpx 22rpx;
+      box-sizing: border-box;
+      background: #fff;
+    }
+    .money {
+      font-family: HarmonyOS_Sans_Medium;
+      font-size: 48rpx;
+      color: #f83224;
+      line-height: 38rpx;
+      text-align: left;
+      font-style: normal;
+      // font-weight: 500;
+      font-weight: bold;
+    }
+  }
+}
+</style>

pageD/newBulitOrder/component/selectLogistics.vue

@@ -0,0 +1,188 @@
+<template>
+  <view class="list">
+    <u-popup
+      :show="logisticsShow"
+      @close="$emit('closeLogistics')"
+      mode="bottom"
+      closeIconPos="top-right"
+      round="28"
+    >
+      <view style="padding: 40rpx 28rpx; box-sizing: border-box">
+        <view class="u-flex u-row-between">
+          <view class="" style="width: 28px; height: 28px"></view>
+          <view class="poptitle">
+            {{ i18n.flow }}
+          </view>
+          <u-icon
+            name="close"
+            @click="$emit('closeLogistics')"
+            color="background: #333333;"
+            size="28"
+          ></u-icon>
+        </view>
+        <view
+          class="u-flex"
+          style="margin-top: 60rpx; flex-wrap: wrap; column-gap: 16rpx"
+        >
+          <view
+            :class="selectedIndex == idx ? 'active' : 'unactive'"
+            v-for="(item, idx) in containerList"
+            :key="idx"
+            @click="change(item, idx)"
+            style="
+              display: flex;
+              flex-direction: column;
+              align-items: center;
+              justify-content: center;
+              margin-bottom: 28rpx;
+              position: relative;
+            "
+          >
+            <image
+              v-if="selectedIndex == idx"
+              src="static/images/change.png"
+              style="
+                width: 36rpx;
+                height: 32rpx;
+                position: absolute;
+                top: 0;
+                right: 0;
+              "
+              mode=""
+            ></image>
+            <!--  v-if="language == 'zh-CN'" -->
+            <view class="logname">{{ item.name_cn }}</view>
+            <view class="logname" v-if="language == 'en-US'">{{
+              item.name_en
+            }}</view>
+            <view class="logname" v-if="language == 'es-ES'">{{
+              item.name_es
+            }}</view>
+            <view class="logname" v-if="language == 'it-IT'">{{
+              item.name_ita
+            }}</view>
+            <!-- 						<view class="wei">¥{{goodinfo.cate==0?item.normal_delivery_fee:item.special_delivery_fee}}/kg</view> -->
+            <view class="wei" style="font-size: 32rpx; font-weight: 600"
+              >¥{{ item.unit_price }}/kg</view
+            >
+          </view>
+        </view>
+        <view class="nextto" @click="next">{{ i18n.next }}</view>
+      </view>
+    </u-popup>
+  </view>
+</template>
+<script>
+export default {
+  props: {
+    logisticsShow: {
+      typeof: Boolean,
+      default: false,
+    },
+    containerList: {
+      typeof: Array,
+      default: () => {
+        return [];
+      },
+    },
+    language: {
+      typeof: String,
+      default: "",
+    },
+  },
+  computed: {
+    i18n() {
+      return this.$t("index");
+    },
+  },
+  data() {
+    return {
+      selectedIndex: 0, //选中的价格下标
+      transport_type_id: "", //选中的物流id
+      transportTypeName: "", //运输方式名称
+    };
+  },
+  methods: {
+    next() {
+      console.log(this.transportTypeName);
+      return;
+      this.$emit("openContainer");
+    },
+    change(item, index) {
+      this.transport_type_id = item.id;
+      this.selectedIndex = index;
+      this.transportTypeName = item.name_cn; //等待后续更改language删除掉
+
+      if (this.language == "zh-CN") {
+        this.transportTypeName = item.name_cn;
+      }
+      if (this.language == "en-US") {
+        this.transportTypeName = item.name_en;
+      }
+      if (this.language == "es-ES") {
+        this.transportTypeName = item.name_es;
+      }
+      if (this.language == "it-IT") {
+        this.transportTypeName = item.name_ita;
+      }
+    },
+  },
+};
+</script>
+<style scoped lang="scss">
+.poptitle {
+  width: 142rpx;
+  height: 50rpx;
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 600;
+  font-size: 36rpx;
+  color: #333333;
+  text-align: center;
+  width: 100%;
+}
+.logname {
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 400;
+  font-size: 28rpx;
+  color: #333333;
+  line-height: 40rpx;
+  text-align: right;
+  font-style: normal;
+  overflow: hidden;
+  width: 220rpx;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  text-align: center;
+  word-break: break-all;
+}
+
+.active {
+  width: 218rpx;
+  height: 148rpx;
+  background: rgba(247, 50, 36, 0.05);
+  border-radius: 8rpx;
+  border: 1rpx solid #f83224;
+}
+
+.unactive {
+  width: 218rpx;
+  height: 148rpx;
+  border-radius: 12rpx;
+  border: 1rpx solid #c3c3c3;
+}
+
+.nextto {
+  width: 702rpx;
+  height: 84rpx;
+  background: #f83224;
+  border-radius: 44rpx;
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 500;
+  font-size: 32rpx;
+  color: #ffffff;
+  line-height: 84rpx;
+  text-align: center;
+  font-style: normal;
+  margin-top: 108rpx;
+}
+</style>

pageD/newBulitOrder/newBulitOrder.vue

@@ -19,16 +19,101 @@
     <!-- 地址 -->
 
     <!-- 需要下单的商品列表 -->
-    <Commodity :goodsList="goodsList" />
+    <Commodity :goodsList="goodsList" :goodsValue="goodsValue" />
     <!-- 需要下单的商品列表 -->
+
+    <!-- 选择物流 -->
+    <view class="logistics u-flex u-row-between">
+      <text style="font-weight: 600; width: 320rpx">{{ i18n.flow }}</text>
+      <view class="u-flex" @click="openLogistics">
+        <text class="change">{{
+          containname ? transportTypeName + " | " + containname : i18n.selection
+        }}</text>
+        <u-icon name="arrow-right" size="16"></u-icon>
+      </view>
+    </view>
+    <!-- 选择物流 -->
+
+    <!-- 选择物流弹窗 -->
+    <SelectLogistics
+      :logisticsShow="logisticsShow"
+      @closeLogistics="closeLogistics"
+      :containerList="containerList"
+      :language="language"
+      @openContainer="openContainer"
+    />
+    <!-- 选择物流弹窗 -->
+
+    <!-- 选择物流价格之后的下一步 -->
+    <NextLogistics
+      :nextLogisticsShow="nextLogisticsShow"
+      :language="language"
+      :goodinfo="goodinfo"
+      :goodsValue="goodsValue"
+      @closeLogistics="closeLogistics"
+    />
+    <!-- 选择物流价格之后的下一步 -->
+
+    <!-- 推荐商品 -->
+    <RecommendGoods :swiptlist="swiptlist" />
+    <!-- 推荐商品 -->
+
+    <!-- 商品信息 -->
+    <GoodsInformation :goodinfo="goodinfo" />
+    <!-- 商品信息 -->
+
+    <view class="btn u-flex u-row-right">
+      <view class="u-flex">
+        <text class="kg"
+          >{{ i18n.Atotalof }}{{ Number(sku_info.weight) * value }}kg,</text
+        >
+        <text>{{ i18n.total }}:</text>
+        <text class="money" style="font-size: 28rpx">¥</text>
+
+        <view class="">
+          <text
+            class="money"
+            v-if="goodinfo.is_discount == 1"
+            style="font-weight: bold"
+            >{{
+              Number(
+                sum * 10000 + Number(sku_info.price) * Number(value) * 10000
+              ) / 10000
+            }}</text
+          >
+          <text
+            class="money"
+            v-if="goodinfo.is_discount == 0"
+            style="font-weight: bold"
+            >{{
+              Number(
+                sum * 10000 +
+                  Number(sku_info.discount_price) * Number(value) * 10000
+              ) / 10000
+            }}</text
+          >
+        </view>
+      </view>
+      <view class="order" @click="topay">
+        {{ i18n.Submitorder }}
+      </view>
+    </view>
   </view>
 </template>
 
 <script>
 import Commodity from "./component/commodity.vue";
+import SelectLogistics from "./component/selectLogistics.vue";
+import NextLogistics from "./component/nextLogistics.vue";
+import RecommendGoods from "./component/recommendGoods.vue";
+import GoodsInformation from "./component/goodsInformation.vue";
 export default {
   components: {
     Commodity,
+    SelectLogistics,
+    NextLogistics,
+    RecommendGoods,
+    GoodsInformation,
   },
   data() {
     return {
@@ -39,6 +124,13 @@ export default {
       transportTypeName: "", //运输方式名称
       swiptlist: [], //推荐商品
       goodsList: [], //需要下单的商品
+      logisticsShow: false, //打开选择物流窗口
+      language: "", //语言
+      nextLogisticsShow: false, //打开选择货柜窗口
+      goodinfo: {}, //商品信息
+      goodsValue: 0, //商品数量
+      sku_info: {},
+      containname: "", //货柜名称
     };
   },
   computed: {
@@ -48,9 +140,56 @@ export default {
   },
   onLoad(options) {
     this.goodsList = JSON.parse(decodeURIComponent(options.goodsList));
-    console.log(this.goodsList);
+    this.goodsValue = this.goodsList.order_goods[0].goods_num;
+    this.recommend();
+  },
+  onShow() {
+    if (uni.getStorageSync("language") != "") {
+      this.language = uni.getStorageSync("language");
+    }
   },
   methods: {
+    //关闭选择物流窗口
+    closeLogistics(data) {
+      this.logisticsShow = false;
+      this.nextLogisticsShow = false;
+    },
+
+    //打开选择货柜弹窗
+    openContainer(data) {
+      this.goodinfo.province_id = this.province_id;
+      this.goodinfo.transport_type_id = this.transport_type_id;
+      let weight = 0;
+      let height = 0;
+      let length = 0;
+      let price = 0;
+      let width = 0;
+      console.log(this.goodsList);
+      this.goodsList.order_goods.map((item) => {
+        console.log(item);
+        weight += item.sku_item.weight;
+        height += item.sku_item.height;
+        length += item.sku_item.length;
+        width += item.sku_item.width;
+        price += Number(item.sku_item.price);
+        this.goodinfo.type = item.goods.status;
+      });
+
+      this.goodinfo.weight = weight;
+      this.goodinfo.height = height;
+      this.goodinfo.length = length;
+      this.goodinfo.width = width;
+      this.goodinfo.price = price;
+      console.log(this.goodinfo);
+      this.logisticsShow = false;
+      this.nextLogisticsShow = true;
+    },
+
+    //打开选择物流窗口
+    openLogistics() {
+      this.logisticsShow = true;
+      this.transport();
+    },
     //跳转到填写地址
     toadd() {
       var that = this;
@@ -58,6 +197,7 @@ export default {
         url: "/pageC/addressManagement/addressManagement?tabs=" + Number(0),
         events: {
           getadd(res) {
+            console.log(res);
             that.addinfo = res;
             that.province_id = res.province_id;
             that.transport();
@@ -77,18 +217,19 @@ export default {
         .then((res) => {
           this.containerList = res;
           this.transport_type_id = res[0].id;
+          this.transportTypeName = res[0].name_cn; //等待后续更改language删除掉
           //根据不同的语言选择不用的类型
           if (this.language == "zh-CN") {
-            this.type = res[0].name_cn;
+            this.transportTypeName = res[0].name_cn;
           }
           if (this.language == "en-US") {
-            this.type = res[0].name_en;
+            this.transportTypeName = res[0].name_en;
           }
           if (this.language == "es-ES") {
-            this.type = res[0].name_es;
+            this.transportTypeName = res[0].name_es;
           }
           if (this.language == "it-IT") {
-            this.type = res[0].name_ita;
+            this.transportTypeName = res[0].name_ita;
           }
         })
         .catch(() => {});
@@ -151,5 +292,73 @@ export default {
       margin-top: 20rpx;
     }
   }
+
+  //物流
+  .logistics {
+    width: 702rpx;
+    background: #ffffff;
+    border-radius: 16rpx;
+    padding: 28rpx 22rpx;
+    box-sizing: border-box;
+    margin-top: 20rpx;
+
+    .change {
+      font-family: PingFangSC, PingFang SC;
+      font-weight: 400;
+      font-size: 28rpx;
+      color: #f83224;
+      line-height: 40rpx;
+      text-align: left;
+      font-style: normal;
+      margin-right: 8rpx;
+    }
+  }
+  .btn {
+    width: 750rpx;
+    height: 166rpx;
+    background: #ffffff;
+    box-shadow: 0rpx -1rpx 0rpx 0rpx rgba(0, 0, 0, 0.05);
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    padding: 0 24rpx 5rpx 5rpx;
+    box-sizing: border-box;
+
+    .money {
+      font-family: HarmonyOS_Sans_Medium;
+      font-size: 48rpx;
+      color: #f83224;
+      line-height: 38rpx;
+      text-align: left;
+      font-style: normal;
+      // font-weight: 500;
+      font-weight: bold;
+    }
+
+    .kg {
+      font-family: PingFangSC, PingFang SC;
+      font-weight: 400;
+      font-size: 24rpx;
+      color: #333333;
+      line-height: 34rpx;
+      text-align: left;
+      font-style: normal;
+    }
+
+    .order {
+      width: 232rpx;
+      height: 80rpx;
+      background: #f83224;
+      border-radius: 40rpx;
+      font-family: PingFangTC, PingFangTC;
+      font-weight: 500;
+      font-size: 32rpx;
+      color: #ffffff;
+      line-height: 80rpx;
+      text-align: center;
+      font-style: normal;
+      margin-left: 20rpx;
+    }
+  }
 }
 </style>

pageD/orderDetail/orderDetail.vue

@@ -87,7 +87,13 @@
         <view> 210 </view>
       </view> -->
     </view>
-    <view class="footer" v-if="orderDetail.status != 'undelivered'">
+    <view
+      class="footer"
+      v-if="
+        orderDetail.status != 'undelivered' &&
+        orderDetail.status != 'undifference'
+      "
+    >
       <button
         class="status-2"
         @click="toPay"
@@ -115,13 +121,13 @@
       >
         查看物流
       </button>
-      <button
+      <!-- <button
         class="status-2"
         @click="toPayOrder"
         v-if="orderDetail.status == 'undifference'"
       >
         立即付款
-      </button>
+      </button> -->
     </view>
 
     <Remark :show="remarkShow" @close="remarkClose" />
@@ -158,10 +164,11 @@ export default {
     }
   },
   onShow() {
+    console.log(this.payStatus);
     if (this.payStatus == "unfill") {
-      this.getUnfillOrderDetail(option.orderStatus);
+      this.getUnfillOrderDetail(this.status);
     } else {
-      this.getDetail(option.orderStatus);
+      this.getDetail(this.status);
     }
   },
 
@@ -221,19 +228,18 @@ export default {
     toPay() {
       //所有需要缴纳保证金的金额相加
       let goodsMoney = 0;
-      this.orderDetail.order_goods.map((item) => {
-        item;
+      this.orderDetail.goods.map((item) => {
         goodsMoney += Number(item.earnest_money);
       });
       uni.navigateTo({
-        url: `/pageA/payorder?num=${goodsMoney}&orderid=${this.orderDetail.id}`,
+        url: `/pageA/payorder?sum=${goodsMoney}&orderid=${this.orderDetail.id}&orderType=bond`,
       });
     },
 
     //跳转支付
     toPayOrder() {
       uni.navigateTo({
-        url: `/pageA/payorder?num=${this.orderDetail.fill_price}&orderid=${this.orderDetail.id}&orderType=difference`,
+        url: `/pageA/payorder?sum=${this.orderDetail.fill_price}&orderid=${this.orderDetail.id}&orderType=difference`,
       });
     },
     //跳转发货页面

pageD/orderFormManage/component/detailCard.vue

@@ -132,7 +132,7 @@ export default {
       });
       //跳转支付
       uni.navigateTo({
-        url: `/pageA/payorder?num=${goodsMoney}&orderid=${this.itemInfo.id}&orderType=bond`,
+        url: `/pageA/payorder?sum=${goodsMoney}&orderid=${this.itemInfo.id}&orderType=bond`,
       });
     },
     toGoods() {

pageD/orderInformation/orderInformation.vue

@@ -160,18 +160,27 @@
         "
       >
         <text class="_label-1">发货时间</text>
-        <view class="num"> 2023-11-24 22:31 </view>
+        <view class="num"> {{ orderInformation.domestic_delivered_at }} </view>
       </view>
 
       <view class="order" v-if="orderInformation.status == 'finished'">
         <text class="_label-1">签收时间</text>
-        <view class="num"> 2023-11-24 22:31 </view>
+        <view class="num"> {{ orderInformation.overseas_received_at }} </view>
       </view>
     </view>
 
-    <view class="pay">
+    <view
+      class="pay"
+      v-if="
+        orderInformation.status != 'group_unpaid' &&
+        orderInformation.status != 'unpaid'
+      "
+    >
       <text>{{
-        orderInformation.status == "group_unpaid" ? "待付" : "已付"
+        orderInformation.status == "group_unpaid" ||
+        orderInformation.status == "unpaid"
+          ? "待付"
+          : "已付"
       }}</text>
       <text style="color: #f83224; font-weight: 600">{{
         orderInformation.estimated_price

pageD/platformProducts/platformProducts.vue

@@ -6,6 +6,8 @@
       shape="circle"
       prefixIcon="search"
       prefixIconStyle="font-size: 22px;color: #909399"
+      @change="search"
+      v-model="keyword"
     ></u--input>
     <view class="content-list" v-for="item in goodsList" :key="item.id">
       <GoodsInformation status="1" :itemInfo="item" @toDetail="toDetail" />
@@ -24,19 +26,33 @@ export default {
       goodsList: [],
       page: 1,
       total: 0,
+      keyword: "",
     };
   },
   methods: {
+    //搜索
+    search(e) {
+      this.page = 0;
+      this.getProductsList(0);
+    },
     //获取平台库商品
-    getProductsList() {
+    getProductsList(num) {
       uni.$u.http
-        .post(`/api/goods/platform_goods`, { page: this.page, limit: 10 })
+        .post(`/api/goods/platform_goods`, {
+          page: this.page,
+          limit: 10,
+          keyword: this.keyword,
+        })
         .then((res) => {
-          //判断是否为触底加载 不是直接赋值，是则连接两个数组
-          if (this.goodsList.length == 0) {
-            this.goodsList = res.data;
+          if (num) {
+            //判断是否为触底加载 不是直接赋值，是则连接两个数组
+            if (this.goodsList.length == 0) {
+              this.goodsList = res.data;
+            } else {
+              this.goodsList = this.goodsList.concat(res.data);
+            }
           } else {
-            this.goodsList = this.goodsList.concat(res.data);
+            this.goodsList = res.data;
           }
           this.total = res.total;
           //循环数组
@@ -63,11 +79,11 @@ export default {
     //商品总数量小于当前获取到的商品数量
     if (this.total > this.goodsList.length) {
       this.page++;
-      this.getProductsList();
+      this.getProductsList(1);
     }
   },
   mounted() {
-    this.getProductsList();
+    this.getProductsList(0);
     uni.setNavigationBarTitle({
       title: "平台商品库",
     });