再来一单完成20%

pageA/order.vue

@@ -467,17 +467,6 @@
 				uni.$u.http.post('/api/goods/recommend', {
 					keyword: ''
 				}).then((res) => {
-					// this.swiptlist = res.reduce((a, b) => {
-					// 	let lastIndex = a.length - 1
-					// 	if (a[lastIndex].length < 3) {
-					// 		a[lastIndex].push(b)
-					// 	} else {
-					// 		a.push([b])
-					// 	}
-					// 	return a
-					// }, [
-					// 	[]
-					// ])
 					this.swiptlist = res
 				}).catch(() => {
 

pageC/orderForm/orderForm.vue

@@ -207,7 +207,12 @@ export default {
     //再来一单
     againOrder(item) {
       console.log(item);
-      return;
+
+      uni.navigateTo({
+        url: `/pageD/newBulitOrder/newBulitOrder?goodsList=${encodeURIComponent(
+          JSON.stringify(item)
+        )}`,
+      });
     },
     //关闭确认弹窗
     close(value) {

pageC/orderFormDetail/orderFormDetail.vue

@@ -13,49 +13,6 @@
         >商品已打包称重，等待用户补邮费</text
       >
     </view>
-    <!-- <view class="title">
-      <view v-if="orderDetail.simplify_status == 'unpaid'">
-        <view class="payment"> 等待付款 </view>
-        <text class="timer">剩22小时52分自动关闭</text>
-      </view>
-      <view class="payment" v-else-if="orderDetail.status == 'closed'">
-        超时未付款，订单已取消
-      </view>
-      <view class="payment" v-else-if="status == 3"> 未发货，退款成功 </view>
-      <view class="payment" v-else-if="status == 4"> 未发货，退款中 </view>
-      <view
-        class="payment"
-        v-else-if="orderDetail.simplify_status == 'unreview'"
-      >
-        拼团中
-      </view>
-      <view
-        class="payment"
-        v-else-if="
-          orderDetail.simplify_status == 'paid' ||
-          orderDetail.simplify_status == 'undelivered'
-        "
-      >
-        已付款，等待发货
-      </view>
-      <view
-        class="payment"
-        v-else-if="orderDetail.simplify_status == 'delivered'"
-      >
-        已发货，等待收货
-      </view>
-      <view
-        class="payment"
-        v-else-if="orderDetail.simplify_status == 'finished'"
-      >
-        订单已完成，交易成功
-      </view>
-      <view v-else-if="orderDetail.simplify_status == 'undifference'">
-        <view class="payment">待补邮费</view>
-        <text class="timer">商品已打包称重，等待用户补邮费</text>
-      </view>
-    </view> -->
-    <!-- 订单状态 -->
 
     <!-- 地址信息 -->
     <view class="address">
@@ -350,9 +307,25 @@ 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) {
+      }
+    },
+
+    //获取订单信息
     getDetail() {
       uni.$u.http.get(`/api/order/read?id=${this.status}`).then((res) => {
         this.orderDetail = res;
+        this.getCountdown(this.orderDetail.created_at);
       });
     },
   },

pageC/refundDetail/component/refundInformation.vue

@@ -35,7 +35,6 @@
             <view class="specifications">
               {{ goodsDetail.sku_item.item }}
             </view>
-            <view style="font-size: 24rpx"> x{{ goodsDetail.goods_num }} </view>
           </view>
         </view>
       </view>
@@ -180,12 +179,16 @@ export default {
         justify-content: space-between;
 
         .commodity-title {
-          width: 472rpx;
+          color: #222;
+          margin-right: 38rpx;
+          font-size: 28rpx;
+          width: 442rpx;
           max-height: 80rpx;
+          display: -webkit-box;
+          -webkit-box-orient: vertical;
+          -webkit-line-clamp: 2;
           overflow: hidden;
-          white-space: nowrap;
           text-overflow: ellipsis;
-          margin-right: 38rpx;
         }
       }
 

pageC/refundDetail/component/refusalToRefund.vue

@@ -4,8 +4,10 @@
       <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 class="time">
+        {{ refundDetail.goods[0].refund.reason || "" }}
+      </view>
+      <view class="time"> {{ refundDetail.goods[0].refund.updated_at }} </view>
     </view>
     <view class="top-direction" v-else>
       <view class="direction-frist">
@@ -14,7 +16,7 @@
       <view class="time">
         {{ refundDetail.goods[0].refund.reason || "" }}
       </view>
-      <view class="time"> 2023-12-08 12:45 </view>
+      <view class="time"> {{ refundDetail.goods[0].refund.updated_at }} </view>
     </view>
     <!-- <view class="direction-frist1">
       <view class=""> 退款成功 </view>

pageD/components/selectExpress.vue

@@ -1,7 +1,7 @@
 <template>
   <view v-if="show" :class="className">
     <view
-      @click="$emit('selected', item)"
+      @click.stop="$emit('selected', item)"
       class="_label"
       v-for="(item, index) in filterList"
       :key="index"
@@ -69,4 +69,23 @@ export default {
     text-align: center;
   }
 }
+.order-manage {
+  background-color: #fff;
+  border-radius: 10rpx;
+  padding: 14rpx;
+  position: absolute;
+  bottom: 100rpx;
+  right: 70rpx;
+  z-index: 1000;
+  width: 300rpx;
+  height: 220rpx;
+  overflow-y: auto;
+  box-shadow: 0 0 4rpx #b6b5b5;
+  ._label {
+    font-size: 28rpx;
+    color: #000;
+    margin: 20rpx;
+    text-align: center;
+  }
+}
 </style>

pageD/deliverGoods/deliverGoods.vue

@@ -7,7 +7,7 @@
       </view>
 
       <view class="detail" v-for="item in orderDetail.goods">
-        <image class="order-img" :src="item.goods_image" mode=""></image>
+        <image class="order-img" :src="item.sku_item.image" mode=""></image>
         <view class="detail-right">
           <view class="title-price">
             <view class="title"> {{ item.goods_name }} </view>
@@ -70,14 +70,22 @@
           mode=""
         ></image>
       </view>
-      <view class="_input-1">
+      <view class="_input-1" @click="openSelect">
         <view class="_label">物流公司</view>
         <u--input
           placeholder="请输入物流公司"
           border="none"
           v-model="name"
+          @change="searchExpress"
           clearable
         ></u--input>
+
+        <SelectExpress
+          :show="nameShow"
+          :filterList="filterList"
+          @selected="selected"
+          className="order-manage"
+        />
       </view>
     </view>
     <view class="footer">
@@ -87,18 +95,31 @@
 </template>
 
 <script>
+import SelectExpress from "../components/selectExpress.vue";
 export default {
+  components: {
+    SelectExpress,
+  },
   data() {
     return {
       orderDetail: {},
       isShow: false,
       code: "", //物流单号
       name: "", //物流公司名称
+      nameShow: false, //选择物流公司弹窗
+      expressCode: "", //选中的快递公司编号
+      filterList: [],
+      expressNameList: [], //快递公司
     };
   },
   onLoad(options) {
     this.getDetail(options.id);
   },
+  watch: {
+    nameShow(newVal) {
+      console.log(newVal);
+    },
+  },
   methods: {
     //扫描二维码
     scanningNumber() {
@@ -119,22 +140,53 @@ export default {
       });
     },
 
+    //打开下拉
+    openSelect() {
+      this.nameShow = true;
+    },
+
+    //过滤搜索结果
+    searchExpress(e) {
+      // this.nameShow = true;
+      this.filterList = this.expressNameList
+        .filter((item) => item.name.includes(e))
+        .map((item) => item);
+    },
+
+    //获取所有的快递公司
+    getExpressNameList() {
+      uni.$u.http.get(`/api/express-company`).then((res) => {
+        this.expressNameList = res;
+        this.filterList = res;
+      });
+    },
+
+    //获取选中的快递公司
+    selected(value) {
+      this.name = value.name;
+      this.expressCode = value.code;
+      this.nameShow = false;
+      console.log(this.nameShow);
+    },
+
     //团长发货
     immediateDelivery() {
       uni.$u.http
         .post(`/api/order/merchant_delivery`, {
-          order_goods_id: this.orderDetail.id,
-          delivery_company: this.name,
+          order_id: this.orderDetail.id,
           delivery_no: this.code,
+          company_code: this.expressCode,
         })
         .then((res) => {
           uni.showToast({
             title: "已发货",
             icon: "none",
           });
-          uni.navigateBack({
-            delta: 1,
-          });
+          let timer = setTimeout(() => {
+            uni.navigateBack({
+              delta: 1,
+            });
+          }, 1000);
         });
     },
     //扫描条形码
@@ -171,6 +223,7 @@ export default {
     },
   },
   mounted() {
+    this.getExpressNameList();
     uni.setNavigationBarTitle({
       title: "立即发货",
     });
@@ -266,6 +319,7 @@ export default {
       display: flex;
       align-items: center;
       height: 100rpx;
+      position: relative;
       ._label {
         font-size: 28rpx;
         color: #222;

pageD/newBulitOrder/component/commodity.vue

@@ -0,0 +1,78 @@
+<template>
+  <view class="list">
+    <view class="merchant"
+      ><image class="merchant-img" :src="goodsList.image" mode="scaleToFill" />
+      <view class="merchant-name">{{ goodsList.merchant_name }}</view>
+    </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="">
+          <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>
+          <view class=""> x {{ item.goods_num }}</view>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+<script>
+export default {
+  props: {
+    //商品列表
+    goodsList: {
+      typeof: Array,
+      default: () => {
+        return [];
+      },
+    },
+  },
+};
+</script>
+<style scoped lang="scss">
+.list {
+  margin-top: 20rpx;
+  background-color: #fff;
+  border-radius: 16rpx;
+  padding: 28rpx 26rpx 36rpx 24rpx;
+  .merchant {
+    display: flex;
+    justify-content: flex-start;
+    .merchant-img {
+      width: 38rpx;
+      height: 38rpx;
+      margin-right: 16rpx;
+    }
+    .merchant-name {
+      font-size: 30rpx;
+      color: #222;
+    }
+  }
+  .detail {
+    margin-top: 32rpx;
+    display: flex;
+    .detail-img {
+      width: 184rpx;
+      height: 184rpx;
+      margin-right: 24rpx;
+    }
+  }
+}
+</style>

pageD/newBulitOrder/newBulitOrder.vue

@@ -0,0 +1,155 @@
+<template>
+  <view class="page">
+    <!-- 地址 -->
+    <view class="address" @click="toadd">
+      <view class="u-flex u-row-between">
+        <view class="add" v-if="JSON.stringify(addinfo) != '{}'">{{
+          addinfo.full_address
+        }}</view>
+        <view class="" v-else>{{ i18n.shippingaddress }}</view>
+        <u-icon name="arrow-right" size="16"></u-icon>
+      </view>
+      <view class="info" v-if="JSON.stringify(addinfo) != '{}'">
+        <text>{{ addinfo.name }}</text>
+        <text style="margin-left: 20rpx">{{
+          replacePhoneToStar(addinfo.mobile)
+        }}</text>
+      </view>
+    </view>
+    <!-- 地址 -->
+
+    <!-- 需要下单的商品列表 -->
+    <Commodity :goodsList="goodsList" />
+    <!-- 需要下单的商品列表 -->
+  </view>
+</template>
+
+<script>
+import Commodity from "./component/commodity.vue";
+export default {
+  components: {
+    Commodity,
+  },
+  data() {
+    return {
+      addinfo: {}, //地址信息
+      province_id: "",
+      containerList: [],
+      transport_type_id: "", //运输方式ID
+      transportTypeName: "", //运输方式名称
+      swiptlist: [], //推荐商品
+      goodsList: [], //需要下单的商品
+    };
+  },
+  computed: {
+    i18n() {
+      return this.$t("index");
+    },
+  },
+  onLoad(options) {
+    this.goodsList = JSON.parse(decodeURIComponent(options.goodsList));
+    console.log(this.goodsList);
+  },
+  methods: {
+    //跳转到填写地址
+    toadd() {
+      var that = this;
+      uni.navigateTo({
+        url: "/pageC/addressManagement/addressManagement?tabs=" + Number(0),
+        events: {
+          getadd(res) {
+            that.addinfo = res;
+            that.province_id = res.province_id;
+            that.transport();
+          },
+        },
+      });
+    },
+
+    //货运类型列表
+    transport() {
+      uni.$u.http
+        .get("/api/transport-type", {
+          params: {
+            province_id: this.province_id,
+          },
+        })
+        .then((res) => {
+          this.containerList = res;
+          this.transport_type_id = res[0].id;
+          //根据不同的语言选择不用的类型
+          if (this.language == "zh-CN") {
+            this.type = res[0].name_cn;
+          }
+          if (this.language == "en-US") {
+            this.type = res[0].name_en;
+          }
+          if (this.language == "es-ES") {
+            this.type = res[0].name_es;
+          }
+          if (this.language == "it-IT") {
+            this.type = res[0].name_ita;
+          }
+        })
+        .catch(() => {});
+    },
+
+    //正则匹配手机号
+    replacePhoneToStar: function (phone) {
+      if (phone) {
+        return phone.replace(/(\d{3})\d{4}(\d{4})/, "$1****$2");
+      }
+    },
+
+    //商品推荐
+    recommend() {
+      uni.$u.http
+        .post("/api/goods/recommend", {
+          keyword: "",
+        })
+        .then((res) => {
+          this.swiptlist = res;
+        })
+        .catch(() => {});
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.page {
+  background: rgba(244, 244, 244, 1);
+  padding: 20rpx 24rpx;
+  box-sizing: border-box;
+  // 地址
+  .address {
+    width: 702rpx;
+    // height: 182rpx;
+    background: #ffffff;
+    border-radius: 16rpx;
+    padding: 32rpx 24rpx;
+    box-sizing: border-box;
+
+    .add {
+      font-family: SFPro, SFPro;
+      font-weight: 500;
+      font-size: 32rpx;
+      color: #222222;
+      line-height: 36rpx;
+      text-align: left;
+      font-style: normal;
+    }
+
+    .info {
+      font-family: SFPro, SFPro;
+      font-weight: 400;
+      font-size: 24rpx;
+      color: #555555;
+      line-height: 28rpx;
+      text-align: left;
+      font-style: normal;
+      margin-top: 20rpx;
+    }
+  }
+}
+</style>

pageD/orderDetail/component/commodityDetail.vue

@@ -13,7 +13,7 @@
     </view>
     <view class="commodity-information">
       <view class="commodity-1" v-for="item in commodityInformation.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>

pageD/orderDetail/orderDetail.vue

@@ -31,10 +31,10 @@
         "
       >
         <text class="_label">物流单号</text>
-        <view class="num">
-          <text>{{ orderDetail.delivery_company || "暂无填写物流公司" }}</text>
+        <view class="num" v-if="orderDetail.logistics.length">
+          <text>{{ orderDetail.logistics[0].delivery_company }}</text>
           <text>{{ "&nbsp;" + "|" + "&nbsp;" }}</text>
-          <text>{{ orderDetail.delivery_no || "暂无填写物流单号" }}</text>
+          <text>{{ orderDetail.logistics[0].delivery_no }}</text>
           <image
             class="cope-icon"
             src="../../static/mine/349.png"
@@ -144,11 +144,13 @@ export default {
       orderDetail: {},
       transportType: "",
       remarkShow: false,
+      payStatus: "",
     };
   },
   onLoad(option) {
     //获取上个页面传输的值，通过该值获取接口数据
     this.status = option.orderStatus;
+    this.payStatus = option.status;
     if (option.status == "unfill") {
       this.getUnfillOrderDetail(option.orderStatus);
     } else {
@@ -156,7 +158,11 @@ export default {
     }
   },
   onShow() {
-    this.getDetail(option.orderStatus);
+    if (this.payStatus == "unfill") {
+      this.getUnfillOrderDetail(option.orderStatus);
+    } else {
+      this.getDetail(option.orderStatus);
+    }
   },
 
   methods: {
@@ -208,16 +214,6 @@ export default {
           this.transportType = res.container.transport_type.name;
         }
         this.title = res.status_name;
-        //根据订单状态，显示不同的字段
-        // if (res.simplify_status == "unfill") {
-        //   this.title = "待缴纳保证金";
-        // } else if (res.simplify_status == "undelivered") {
-        //   this.title = "待团长发货";
-        // } else if (res.simplify_status == "merdelivered") {
-        //   this.title = "待总部发货";
-        // } else if (res.simplify_status == "delivered") {
-        //   this.title = "总部已发货";
-        // }
       });
     },
 

pageD/orderFormManage/component/detailCard.vue

@@ -128,7 +128,6 @@ export default {
       //所有需要缴纳保证金的金额相加
       let goodsMoney = 0;
       this.itemInfo.order_goods.map((item) => {
-        item;
         goodsMoney += Number(item.earnest_money);
       });
       //跳转支付

pageD/orderFormManage/orderFormManage.vue

@@ -74,6 +74,9 @@ export default {
       page: 1,
     };
   },
+  onShow() {
+    this.getGoodsList();
+  },
   methods: {
     tabSwitch(num) {
       this.follow = num;
@@ -104,7 +107,6 @@ export default {
     },
   },
   mounted() {
-    this.getGoodsList();
     uni.setNavigationBarTitle({
       title: "订单管理",
     });

pages.json

@@ -669,6 +669,13 @@
 					{
 						"navigationBarTitleText" : ""
 					}
+				},
+				{
+					"path" : "newBulitOrder/newBulitOrder",
+					"style" : 
+					{
+						"navigationBarTitleText" : ""
+					}
 				}
 
 			]