冲突

pageD/newBulitOrder/component/nextLogistics.vue

@@ -1,372 +1,355 @@
 <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">{{
+	<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')">{{
+							</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>
+					<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 {};
-      },
-    },
-    goodsValue: {
-      typeof: Number,
-      default: 0,
-    },
-    //商品规格价格
-    specificationsPrice: {
-      typeof: String,
-      default: "",
-    },
-    //多商品
-    goodsArr: {
-      typeof: Object,
-      default: () => {
-        return {};
-      },
-    },
-  },
-  computed: {
-    i18n() {
-      return this.$t("index");
-    },
-  },
-  data() {
-    return {
-      containerList: [], //货柜列表
-      unit_price: "",
-      recommend_weight: "",
-      containname: "",
-      sum: "", //运费
-      containid: "", //货柜id
-      datechan: "", //当前选中的货柜列表下标
-      max_weight: "", //推荐重量。当满足当前重量，减少价格
-      min_weight: "",
-      unit_fee: "", //满减价格
-      unchangedFreight: "", //基础运费，不会变
-      unchangedUnit_price: "",
-      goodsWeight: 0,
-    };
-  },
-  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),
-              length: Number(this.goodinfo.length), //		是	String	长
-              width: this.goodinfo.width, //		是	String	宽
-              height: this.goodinfo.height, //		是	String	高
-              cart_id: "",
-              goods_arr: JSON.stringify(this.goodsArr),
-            },
-          })
-          .then((res) => {
-            res.forEach((item) => {
-              if (item.sum != 0) {
-                this.containerList.push(item);
-              }
-            });
+	export default {
+		name: "nextLogistics",
+		props: {
+			nextLogisticsShow: {
+				typeof: Boolean,
+				default: false,
+			},
+			language: {
+				typeof: String,
+				default: "",
+			},
+			goodinfo: {
+				typeof: Object,
+				default: () => {
+					return {};
+				},
+			},
+			goodsValue: {
+				typeof: Number,
+				default: 0,
+			},
+			//商品规格价格
+			specificationsPrice: {
+				typeof: String,
+				default: "",
+			},
+			//多商品
+			goodsArr: {
+				typeof: Object,
+				default: () => {
+					return {};
+				},
+			},
+			addinfo: {
+				typeof: Object,
+				default: () => {
+					return {};
+				},
+			},
+		},
+		computed: {
+			i18n() {
+				return this.$t("index");
+			},
+		},
+		data() {
+			return {
+				containerList: [], //货柜列表
+				unit_price: "",
+				recommend_weight: "",
+				containname: "",
+				sum: "", //运费
+				containid: "", //货柜id
+				datechan: "", //当前选中的货柜列表下标
+				max_weight: "", //推荐重量。当满足当前重量，减少价格
+				min_weight: "",
+				unit_fee: "", //满减价格
+				unchangedFreight: "", //基础运费，不会变
+				unchangedUnit_price: "",
+				goodsWeight: 0,
+			};
+		},
+		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),
+								length: Number(this.goodinfo.length), //		是	String	长
+								width: this.goodinfo.width, //		是	String	宽
+								height: this.goodinfo.height, //		是	String	高
+								cart_id: "",
+								goods_arr: JSON.stringify(this.goodsArr),
+							},
+						})
+						.then((res) => {
+							res.forEach((item) => {
+								this.containerList = []
+								if (item.sum != 0) {
+									this.containerList.push(item);
+								}
+							});
 
-            if (this.goodinfo.is_shipping == 0) {
-              this.sum = 0;
-              this.unchangedFreight = 0;
-            } else {
-              this.sum = this.containerList[0].sum;
-              this.unchangedFreight = this.containerList[0].sum;
-            }
-            this.unit_price = this.containerList[0].unit_price;
-            this.unchangedUnit_price = this.containerList[0].unit_price;
-            this.recommend_weight = this.containerList[0].recommend_weight;
-            this.containid = this.containerList[0].id;
-            this.goodsWeight = this.containerList[0].weight_total;
-            console.log(this.language);
-            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: {
-    //运费满减
-    async config() {
-      var that = this;
-      await uni.$u.http
-        .get("/api/config", {
-          params: {
-            module: "free_shipping",
-          },
-        })
-        .then((res) => {
-          let goodsum = "";
-          goodsum = Number(that.specificationsPrice);
-          if (goodsum > res.free_shipping) {
-            that.sum = 0;
-            that.unit_price = 0;
-          } else {
-            this.sum = this.unchangedFreight;
-            this.unit_price = this.unchangedUnit_price;
-          }
-        })
-        .catch(() => {});
-    },
+							if (this.goodinfo.is_shipping == 0) {
+								this.sum = 0;
+								this.unchangedFreight = 0;
+							} else {
+								this.sum = this.containerList[0].sum;
+								this.unchangedFreight = this.containerList[0].sum;
+							}
+							this.unit_price = this.containerList[0].unit_price;
+							this.unchangedUnit_price = this.containerList[0].unit_price;
+							this.recommend_weight = this.containerList[0].recommend_weight;
+							this.containid = this.containerList[0].id;
+							this.goodsWeight = this.containerList[0].weight_total;
+							console.log(this.language);
+							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: {
+			//运费满减
+			async config() {
+				var that = this;
+				await uni.$u.http
+					.get("/api/config", {
+						params: {
+							module: "free_shipping",
+						},
+					})
+					.then((res) => {
+						let goodsum = "";
+						goodsum = Number(that.specificationsPrice);
+						if (goodsum > res.free_shipping) {
+							that.sum = 0;
+							that.unit_price = 0;
+						} else {
+							this.sum = this.unchangedFreight;
+							this.unit_price = this.unchangedUnit_price;
+						}
+					})
+					.catch(() => {});
+			},
 
-    //推荐重量
-    async recommendweight() {
-      await uni.$u.http
-        .get("/api/express-order/recommend-container", {
-          params: {
-            container_id: this.containid,
-            type: "normal",
-          },
-        })
-        .then((res) => {
-          this.max_weight = res.max_weight;
-          this.min_weight = res.min_weight;
-          this.unit_fee = res.unit_fee;
-        })
-        .catch(() => {});
-    },
-    //确定选择货柜
-    confirm() {
-      this.recommendweight();
-      this.config();
-      //异步跳转
-      const timer = setTimeout(() => {
-        let data = {
-          type: "second",
-          containname: this.containname,
-          containid: this.containid,
-          recommend_weight: this.recommend_weight,
-          unit_price: this.unit_price,
-          sum: this.sum,
-          max_weight: this.max_weight,
-          min_weight: this.min_weight,
-          unit_fee: this.unit_fee,
-          unchangedFreight: this.unchangedFreight,
-          unchangedUnit_price: this.unchangedUnit_price,
-          goodsWeight: this.goodsWeight,
-        };
-        console.log(data);
-        this.$emit("closeLogistics", data);
-        clearTimeout(timer);
-      }, 200);
-    },
+			//推荐重量
+			async recommendweight() {
+				await uni.$u.http
+					.get("/api/express-order/recommend-container", {
+						params: {
+							container_id: this.containid,
+							type: "normal",
+						},
+					})
+					.then((res) => {
+						this.max_weight = res.max_weight;
+						this.min_weight = res.min_weight;
+						this.unit_fee = res.unit_fee;
+					})
+					.catch(() => {});
+			},
+			//下单前计算数据
+			//确定选择货柜
+			confirm() {
+				this.recommendweight();
+				this.config();
+				//异步跳转
+				const timer = setTimeout(() => {
+					let data = {
+						type: "second",
+						containname: this.containname,
+						containid: this.containid,
+						recommend_weight: this.recommend_weight,
+						unit_price: this.unit_price,
+						sum: this.sum,
+						max_weight: this.max_weight,
+						min_weight: this.min_weight,
+						unit_fee: this.unit_fee,
+						unchangedFreight: this.unchangedFreight,
+						unchangedUnit_price: this.unchangedUnit_price,
+						goodsWeight: this.goodsWeight,
+					};
+					console.log(data);
+					this.$emit("closeLogistics", data);
+					this.$emit("calculate");
+					clearTimeout(timer);
+				}, 200);
+			},
 
-    activea(item, idx) {
-      this.datechan = idx;
-      this.sum = item.sum;
-      this.unchangedFreight = item.sum;
-      this.unit_price = item.unit_price;
-      this.recommend_weight = item.recommend_weight;
-      this.containid = item.id;
-      this.containname = item.name_cn; //等待后续更改language删除掉
-      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;
-      }
-    },
-  },
-};
+			activea(item, idx) {
+				this.datechan = idx;
+				this.sum = item.sum;
+				this.unchangedFreight = item.sum;
+				this.unit_price = item.unit_price;
+				this.recommend_weight = item.recommend_weight;
+				this.containid = item.id;
+				this.containname = item.name_cn; //等待后续更改language删除掉
+				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;
-}
+	.poptitle {
+		width: 142rpx;
+		height: 50rpx;
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 600;
+		font-size: 36rpx;
+		color: #333333;
+		text-align: center;
+		width: 100%;
+	}
 
-.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;
-}
+	.transport {
+		width: 702rpx;
+		height: 164rpx;
+		background: #ffffff;
+		border-radius: 12rpx;
+		padding: 24rpx 20rpx;
+		box-sizing: border-box;
+	}
 
-.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;
-  }
+	.yundate {
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 550;
+		font-size: 32rpx;
+		color: #333333;
+		line-height: 44rpx;
+		text-align: left;
+		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>
+	.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/newBulitOrder.vue

@@ -1,480 +1,481 @@
 <template>
-  <view class="page">
-    <!-- 地址 -->
-    <view class="address" @click="toadd">
-      <view class="u-flex u-row-between">
-        <view class="add" v-if="JSON.stringify(addinfo) != '{}'">{{
+	<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">{{
+				<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>
-    <!-- 地址 -->
+			</view>
+		</view>
+		<!-- 地址 -->
 
-    <!-- 需要下单的商品列表 -->
-    <Commodity
-      :goodsList="goodsList"
-      :goodsValue="goodsValue"
-      @changeGoodsNum="changeGoodsNum"
-    />
-    <!-- 需要下单的商品列表 -->
+		<!-- 需要下单的商品列表 -->
+		<Commodity :goodsList="goodsList" :goodsValue="goodsValue" @changeGoodsNum="changeGoodsNum" />
+		<!-- 需要下单的商品列表 -->
 
-    <!-- 选择物流 -->
-    <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">{{
+		<!-- 选择物流 -->
+		<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>
-    <!-- 选择物流 -->
+				<u-icon name="arrow-right" size="16"></u-icon>
+			</view>
+		</view>
+		<!-- 选择物流 -->
 
-    <!-- 选择物流弹窗 -->
-    <SelectLogistics
-      :logisticsShow="logisticsShow"
-      @closeLogistics="closeLogistics"
-      :containerList="containerList"
-      :language="language"
-      @openContainer="openContainer"
-    />
-    <!-- 选择物流弹窗 -->
+		<!-- 选择物流弹窗 -->
+		<SelectLogistics :logisticsShow="logisticsShow" @closeLogistics="closeLogistics" :containerList="containerList"
+			:language="language" @openContainer="openContainer" />
+		<!-- 选择物流弹窗 -->
 
-    <!-- 选择物流价格之后的下一步 -->
-    <NextLogistics
-      :nextLogisticsShow="nextLogisticsShow"
-      :language="language"
-      :goodinfo="goodinfo"
-      :goodsValue="goodsValue"
-      :specificationsPrice="specificationsPrice"
-      @closeLogistics="closeLogistics"
-      :goodsArr="goodsArr"
-    />
-    <!-- 选择物流价格之后的下一步 -->
+		<!-- 选择物流价格之后的下一步 -->
+		<NextLogistics :nextLogisticsShow="nextLogisticsShow" :language="language" :goodinfo="goodinfo"
+			:goodsValue="goodsValue" :specificationsPrice="specificationsPrice" @closeLogistics="closeLogistics"
+			:goodsArr="goodsArr" :addinfo='addinfo' @calculate='calculate'/>
+		<!-- 选择物流价格之后的下一步 -->
 
-    <!-- 推荐商品 -->
-    <RecommendGoods :swiptlist="swiptlist" />
-    <!-- 推荐商品 -->
+		<!-- 推荐商品 -->
+		<RecommendGoods :swiptlist="swiptlist" />
+		<!-- 推荐商品 -->
 
-    <!-- 商品信息 -->
-    <GoodsInformation
-      :goodinfo="goodinfo"
-      :containname="containname"
-      :goodsPrice="goodsList.order.goods_amount"
-      :countGoodsInformation="countGoodsInformation"
-      :goodsValue="goodsValue"
-      :specificationsPrice="specificationsPrice"
-      :goodsWeight="goodsWeight"
-    />
-    <!-- 商品信息 -->
+		<!-- 商品信息 -->
+		<GoodsInformation :goodinfo="goodinfo" :containname="containname" :goodsPrice="goodsList.order.goods_amount"
+			:countGoodsInformation="countGoodsInformation" :goodsValue="goodsValue"
+			:specificationsPrice="specificationsPrice" :goodsWeight="countGoodsInformation.goodsWeight" />
+		<!-- 商品信息 -->
 
-    <view class="btn u-flex u-row-right">
-      <view class="u-flex">
-        <text class="kg" v-show="containname"
-          >{{ i18n.Atotalof }}{{ countGoodsInformation.goodsWeight }}kg,</text
-        >
-        <text>{{ i18n.total }}:</text>
-        <text class="money" style="font-size: 28rpx">¥</text>
+		<view class="btn u-flex u-row-right">
+			<view class="u-flex">
+				<text class="kg"
+					v-show="containname">{{ i18n.Atotalof }}{{ countGoodsInformation.goodsWeight }}kg,</text>
+				<text>{{ i18n.total }}:</text>
+				<text class="money" style="font-size: 28rpx">¥</text>
 
-        <view class="">
-          <text class="money" v-if="countGoodsInformation.containname">{{
+				<view class="">
+					<!--          <text class="money" v-if="countGoodsInformation.containname">{{
+            Number(specificationsPrice) + Number(countGoodsInformation.sum)
+          }}</text> -->
+					<text class="money">{{
             Number(specificationsPrice) + Number(countGoodsInformation.sum)
           }}</text>
-        </view>
-      </view>
-      <view class="order" @click="topay">
-        {{ i18n.Submitorder }}
-      </view>
-    </view>
-  </view>
+				</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 {
-      addinfo: {}, //地址信息
-      province_id: "",
-      containerList: [],
-      transport_type_id: "", //运输方式ID
-      transportTypeName: "", //运输方式名称
-      swiptlist: [], //推荐商品
-      goodsList: [], //需要下单的商品
-      logisticsShow: false, //打开选择物流窗口
-      language: this._language, //语言
-      nextLogisticsShow: false, //打开选择货柜窗口
-      goodinfo: {}, //商品信息
-      goodsValue: 0, //商品数量
-      sku_info: {},
-      containname: "", //货柜名称
-      countGoodsInformation: {},
-      goodsWeight: 0, //商品重量
-      goodsId: "", //商品id
-      sku_item_id: "", //商品规格id
-      merchant_goods_id: "", //店铺商品id
-      goodsSource: "", //商品归属
-      isDiscount: "", //商品是否存在打折
-      specificationsPrice: 0, //订单商品总金额
-      goodsArr: [], //多商品用的商品规格
-    };
-  },
-  computed: {
-    i18n() {
-      return this.$t("index");
-    },
-  },
-  onLoad(options) {
-    this.getOrderGoods(options.orderId);
-    this.recommend();
-  },
-  onShow() {
-    console.log(this.language);
-    // if (uni.getStorageSync("language") != "") {
-    //   this.language = uni.getStorageSync("language");
-    // }
-  },
-  methods: {
-    //关闭选择物流窗口
-    closeLogistics(data) {
-      this.logisticsShow = false;
-      this.nextLogisticsShow = false;
-      //判断是哪一步关闭，接受数据
-      if (data.type == "second" && data.containname) {
-        this.containname = data.containname;
-        this.countGoodsInformation = data;
-      }
-    },
+	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 {
+				addinfo: {}, //地址信息
+				province_id: "",
+				containerList: [],
+				transport_type_id: "", //运输方式ID
+				transportTypeName: "", //运输方式名称
+				swiptlist: [], //推荐商品
+				goodsList: [], //需要下单的商品
+				logisticsShow: false, //打开选择物流窗口
+				language: this._language, //语言
+				nextLogisticsShow: false, //打开选择货柜窗口
+				goodinfo: {}, //商品信息
+				goodsValue: 0, //商品数量
+				sku_info: {},
+				containname: "", //货柜名称
+				countGoodsInformation: {},
+				goodsWeight: 0, //商品重量
+				goodsId: "", //商品id
+				sku_item_id: "", //商品规格id
+				merchant_goods_id: "", //店铺商品id
+				goodsSource: "", //商品归属
+				isDiscount: "", //商品是否存在打折
+				specificationsPrice: 0, //订单商品总金额
+				goodsArr: [], //多商品用的商品规格
+			};
+		},
+		computed: {
+			i18n() {
+				return this.$t("index");
+			},
+		},
+		onLoad(options) {
+			this.getOrderGoods(options.orderId);
+			this.recommend();
+		},
+		onShow() {
+			console.log(this.language);
+			// if (uni.getStorageSync("language") != "") {
+			//   this.language = uni.getStorageSync("language");
+			// }
+		},
+		methods: {
+			//关闭选择物流窗口
+			closeLogistics(data) {
+				this.logisticsShow = false;
+				this.nextLogisticsShow = false;
+				//判断是哪一步关闭，接受数据
+				if (data.type == "second" && data.containname) {
+					this.containname = data.containname;
+					this.countGoodsInformation = data;
+					this.calculate()
+				}
+			},
+			//			//下单前计算数据
+			calculate() {
+				uni.$u.http
+					.post("/api/order/calculate", {
+						address_id: this.addinfo.id, //3	是	String	地址ID
+						merchant_goods_id: this.merchant_goods_id || "", //39	是	String	团长商品id
+						container_id: this.countGoodsInformation.containid, //1	是	String	货柜id
+						share_member_id: "", //	是	String	分享团长id 分享商品的时候传
+						belong: this.goodsSource || "", //0	是	String	商品归属 0团长 1平台自营 2团长发布或者分享的平台自营商品、供应链商品
+						goods_arr: JSON.stringify(this.goodsArr),
+					})
+					.then((res) => {
+						console.log(res);
+						this.countGoodsInformation.sum = res.freight
+					})
+					.catch(() => {});
+			},
 
-    //打开选择货柜弹窗
-    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;
-      this.goodsList.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;
-      //等待后端解决多商品删除，采用上面几行
-      this.goodinfo.weight = 10;
-      this.goodinfo.height = 10;
-      this.goodinfo.length = 10;
-      this.goodinfo.width = 10;
-      this.goodinfo.price = 10;
-      this.logisticsShow = false;
-      this.nextLogisticsShow = true;
+			//打开选择货柜弹窗
+			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;
+				this.goodsList.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;
+				//等待后端解决多商品删除，采用上面几行
+				this.goodinfo.weight = 10;
+				this.goodinfo.height = 10;
+				this.goodinfo.length = 10;
+				this.goodinfo.width = 10;
+				this.goodinfo.price = 10;
+				this.logisticsShow = false;
+				this.nextLogisticsShow = true;
 
-      //判断打开的窗口是第几步，将选中的运输方式传回
-      if (data.type == "first" && data.transportTypeName) {
-        this.transportTypeName = data.transportTypeName;
-      }
-    },
+				//判断打开的窗口是第几步，将选中的运输方式传回
+				if (data.type == "first" && data.transportTypeName) {
+					this.transportTypeName = data.transportTypeName;
+				}
+			},
 
-    //运费满减
-    async config() {
-      var that = this;
-      await uni.$u.http
-        .get("/api/config", {
-          params: {
-            module: "free_shipping",
-          },
-        })
-        .then((res) => {
-          let goodsum = "";
-          goodsum = Number(that.specificationsPrice) * that.goodsValue;
-          if (goodsum > res.free_shipping) {
-            that.countGoodsInformation.sum = 0;
-            that.countGoodsInformation.unit_price = 0;
-          } else {
-            this.countGoodsInformation.sum =
-              this.countGoodsInformation.unchangedFreight;
-            this.countGoodsInformation.unit_price =
-              this.countGoodsInformation.unchangedUnit_price;
-          }
-        })
-        .catch(() => {});
-    },
+			//运费满减
+			async config() {
+				var that = this;
+				await uni.$u.http
+					.get("/api/config", {
+						params: {
+							module: "free_shipping",
+						},
+					})
+					.then((res) => {
+						let goodsum = "";
+						goodsum = Number(that.specificationsPrice) * that.goodsValue;
+						if (goodsum > res.free_shipping) {
+							that.countGoodsInformation.sum = 0;
+							that.countGoodsInformation.unit_price = 0;
+						} else {
+							this.countGoodsInformation.sum =
+								this.countGoodsInformation.unchangedFreight;
+							this.countGoodsInformation.unit_price =
+								this.countGoodsInformation.unchangedUnit_price;
+						}
+					})
+					.catch(() => {});
+			},
 
-    //提交订单
-    topay() {
-      uni.$u.http
-        .post("/api/order", {
-          address_id: this.addinfo.id, //3	是	String	地址ID
-          goods_id: this.goodsId, //65	是	String	商品id
-          goods_num: this.goodsValue, //2	是	String	商品数量
-          sku_item_id: this.sku_item_id, //60	是	String	规格id
-          cart_ids: "", //8,9	是	String	购物车id
-          remark: "", //备注	是	String	备注
-          merchant_goods_id: this.merchant_goods_id || "", //39	是	String	团长商品id
-          container_id: this.countGoodsInformation.containid, //1	是	String	货柜id
-          share_member_id: "", //	是	String	分享团长id 分享商品的时候传
-          belong: this.goodsSource || "", //0	是	String	商品归属 0团长 1平台自营 2团长发布或者分享的平台自营商品、供应链商品
-          goods_arr: JSON.stringify(this.goodsArr),
-        })
-        .then((res) => {
-          uni.navigateTo({
-            // url: '/pageA/payorder?sum=' + (Number(this.sum*10000+ Number(this.sku_info.discount_price)*Number(this.value)*10000))/10000 +'&orderid=' + res.id
-            url: "/pageA/payorder?orderid=" + res.id + "&sum=" + res.amount,
-          });
-        })
-        .catch(() => {});
-    },
+			//提交订单
+			topay() {
+				uni.$u.http
+					.post("/api/order", {
+						address_id: this.addinfo.id, //3	是	String	地址ID
+						goods_id: this.goodsId, //65	是	String	商品id
+						goods_num: this.goodsValue, //2	是	String	商品数量
+						sku_item_id: this.sku_item_id, //60	是	String	规格id
+						cart_ids: "", //8,9	是	String	购物车id
+						remark: "", //备注	是	String	备注
+						merchant_goods_id: this.merchant_goods_id || "", //39	是	String	团长商品id
+						container_id: this.countGoodsInformation.containid, //1	是	String	货柜id
+						share_member_id: "", //	是	String	分享团长id 分享商品的时候传
+						belong: this.goodsSource || "", //0	是	String	商品归属 0团长 1平台自营 2团长发布或者分享的平台自营商品、供应链商品
+						goods_arr: JSON.stringify(this.goodsArr),
+					})
+					.then((res) => {
+						uni.navigateTo({
+							// url: '/pageA/payorder?sum=' + (Number(this.sum*10000+ Number(this.sku_info.discount_price)*Number(this.value)*10000))/10000 +'&orderid=' + res.id
+							url: "/pageA/payorder?orderid=" + res.id + "&sum=" + res.amount,
+						});
+					})
+					.catch(() => {});
+			},
 
-    //打开选择物流窗口
-    openLogistics() {
-      this.logisticsShow = true;
-      this.transport();
-    },
+			//打开选择物流窗口
+			openLogistics() {
+				this.logisticsShow = true;
+				this.transport();
+			},
 
-    //获取订单商品
-    getOrderGoods(id) {
-      uni.$u.http.get(`/api/order/read?id=${id}`).then((res) => {
-        this.goodsList = res;
-        this.goodsValue = this.goodsList.goods[0].goods_num;
-        this.goodsList.goods.map((item) => {
-          this.goodsId = item.goods_id;
-          this.sku_item_id = item.sku_item_id;
-          this.merchant_goods_id = item.merchant_goods_id;
-          // this.goodsSource = item.goods.source;
-          //库存商品大于需要购买的数量
-          if (item.true_stock > item.goods_num) {
-            this.goodsWeight += item.sku_item.weight * item.goods_num; //商品重量
-            //多商品获取规格商品id
-            let obj = {
-              merchant_goods_id: item.merchant_goods_id,
-              goods_num: item.goods_num,
-              sku_item_id: item.sku_item_id,
-            };
-            this.goodsArr.push(obj);
-            //获取订单商品总金额
-            this.specificationsPrice +=
-              Number(item.discount_price) * item.goods_num;
-          }
-        });
-        if (this.goodsArr.length < this.goodsList.goods.length) {
-          uni.showToast({
-            title: "已自动去除库存不足的商品",
-            icon: "none",
-          });
-        }
-      });
-    },
+			//获取订单商品
+			getOrderGoods(id) {
+				uni.$u.http.get(`/api/order/read?id=${id}`).then((res) => {
+					this.goodsList = res;
+					this.goodsValue = this.goodsList.goods[0].goods_num;
+					this.goodsList.goods.map((item) => {
+						this.goodsId = item.goods_id;
+						this.sku_item_id = item.sku_item_id;
+						this.merchant_goods_id = item.merchant_goods_id;
+						// this.goodsSource = item.goods.source;
+						//库存商品大于需要购买的数量
+						if (item.true_stock > item.goods_num) {
+							this.goodsWeight += item.sku_item.weight * item.goods_num; //商品重量
+							//多商品获取规格商品id
+							let obj = {
+								merchant_goods_id: item.merchant_goods_id,
+								goods_num: item.goods_num,
+								sku_item_id: item.sku_item_id,
+							};
+							this.goodsArr.push(obj);
+							//获取订单商品总金额
+							this.specificationsPrice +=
+								Number(item.discount_price) * item.goods_num;
+						}
+					});
+					if (this.goodsArr.length < this.goodsList.goods.length) {
+						uni.showToast({
+							title: "已自动去除库存不足的商品",
+							icon: "none",
+						});
+					}
+				});
+			},
 
-    //跳转到填写地址
-    toadd() {
-      var that = this;
-      uni.navigateTo({
-        url: "/pageC/addressManagement/addressManagement?tabs=" + Number(0),
-        events: {
-          getadd(res) {
-            console.log(res);
-            that.addinfo = res;
-            that.province_id = res.province_id;
-            that.transport();
-          },
-        },
-      });
-    },
+			//跳转到填写地址
+			toadd() {
+				var that = this;
+				uni.navigateTo({
+					url: "/pageC/addressManagement/addressManagement?tabs=" + Number(0),
+					events: {
+						getadd(res) {
+							console.log(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;
-          this.transportTypeName = res[0].name_cn; //等待后续更改language删除掉
-          //根据不同的语言选择不用的类型
-          if (this.language == "zh-CN") {
-            this.transportTypeName = res[0].name_cn;
-          }
-          if (this.language == "en-US") {
-            this.transportTypeName = res[0].name_en;
-          }
-          if (this.language == "es-ES") {
-            this.transportTypeName = res[0].name_es;
-          }
-          if (this.language == "it-IT") {
-            this.transportTypeName = res[0].name_ita;
-          }
-        })
-        .catch(() => {});
-    },
+			//货运类型列表
+			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;
+						this.transportTypeName = res[0].name_cn; //等待后续更改language删除掉
+						//根据不同的语言选择不用的类型
+						if (this.language == "zh-CN") {
+							this.transportTypeName = res[0].name_cn;
+						}
+						if (this.language == "en-US") {
+							this.transportTypeName = res[0].name_en;
+						}
+						if (this.language == "es-ES") {
+							this.transportTypeName = res[0].name_es;
+						}
+						if (this.language == "it-IT") {
+							this.transportTypeName = res[0].name_ita;
+						}
+					})
+					.catch(() => {});
+			},
 
-    //正则匹配手机号
-    replacePhoneToStar: function (phone) {
-      if (phone) {
-        return phone.replace(/(\d{3})\d{4}(\d{4})/, "$1****$2");
-      }
-    },
+			//正则匹配手机号
+			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(() => {});
-    },
+			//商品推荐
+			recommend() {
+				uni.$u.http
+					.post("/api/goods/recommend", {
+						keyword: "",
+					})
+					.then((res) => {
+						this.swiptlist = res;
+					})
+					.catch(() => {});
+			},
 
-    //增加 or 减少 商品数量
-    changeGoodsNum(type) {
-      if (type == "increase") {
-        this.goodsValue++;
-        this.config();
-      } else if (this.goodsValue > 1) {
-        this.goodsValue--;
-        this.config();
-      }
-    },
-  },
-};
+			//增加 or 减少 商品数量
+			changeGoodsNum(type) {
+				if (type == "increase") {
+					this.goodsValue++;
+					this.config();
+				} else if (this.goodsValue > 1) {
+					this.goodsValue--;
+					this.config();
+				}
+			},
+		},
+	};
 </script>
 
 <style scoped lang="scss">
-.page {
-  background: rgba(244, 244, 244, 1);
-  padding: 20rpx 24rpx;
-  box-sizing: border-box;
-  padding-bottom: 200rpx;
-  // 地址
-  .address {
-    width: 702rpx;
-    // height: 182rpx;
-    background: #ffffff;
-    border-radius: 16rpx;
-    padding: 32rpx 24rpx;
-    box-sizing: border-box;
+	.page {
+		background: rgba(244, 244, 244, 1);
+		padding: 20rpx 24rpx;
+		box-sizing: border-box;
+		padding-bottom: 200rpx;
+
+		// 地址
+		.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;
+			}
 
-    .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;
+			}
+		}
 
-    .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;
-    }
-  }
+		//物流
+		.logistics {
+			width: 702rpx;
+			background: #ffffff;
+			border-radius: 16rpx;
+			padding: 28rpx 22rpx;
+			box-sizing: border-box;
+			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;
+			}
+		}
 
-    .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;
+		.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;
-    }
+			.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;
-    }
+			.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>
+			.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/orderInformation/orderInformation.vue

@@ -1,233 +1,197 @@
 <template>
-  <view class="page">
-    <view class="top" v-if="orderInformation.type != 'group_package'">
-      <view class="title">
-        {{ orderTitle }}
-      </view>
-      <view class="prompt">
-        {{ orderDetail }}
-      </view>
-    </view>
-    <view class="packaging" v-if="orderInformation.type == 'group_package'">
-      <view class="packaging-top">
-        <view class="">
-          {{
+	<view class="page">
+		<view class="top" v-if="orderInformation.type != 'group_package'">
+			<view class="title">
+				{{ orderTitle }}
+			</view>
+			<view class="prompt">
+				{{ orderDetail }}
+			</view>
+		</view>
+		<view class="packaging" v-if="orderInformation.type == 'group_package'">
+			<view class="packaging-top">
+				<view class="">
+					{{
             orderInformation.goods[0].type_text +
             "&nbsp;" +
             "|" +
             "&nbsp" +
             orderInformation.containerBase.transport_type_name
           }}
-        </view>
-        <view style="color: #f83224"> {{ orderInformation.status_text }} </view>
-      </view>
-      <view class="packaging-center">
-        <view class="packaging-left">
-          <view class="left-top"> 东莞仓库 </view>
-          <view class="left-bottom"> {{ i18n.origin }} </view>
-        </view>
-        <image class="jiantou" src="../../static/mine/339.png" mode=""></image>
-        <view class="packaging-left">
-          <view class="left-top">
-            {{ orderInformation.containerBase.country_name }}
-          </view>
-          <view class="left-bottom"> {{ i18n.destination }} </view>
-        </view>
-      </view>
-      <view class="packaging-time">
-        <view class="time">
-          <text>{{ i18n.start }}：</text>
-          <text>{{
+				</view>
+				<view style="color: #f83224"> {{ orderInformation.status_text }} </view>
+			</view>
+			<view class="packaging-center">
+				<view class="packaging-left">
+					<view class="left-top"> 东莞仓库 </view>
+					<view class="left-bottom"> {{ i18n.origin }} </view>
+				</view>
+				<image class="jiantou" src="../../static/mine/339.png" mode=""></image>
+				<view class="packaging-left">
+					<view class="left-top">
+						{{ orderInformation.containerBase.country_name }}
+					</view>
+					<view class="left-bottom"> {{ i18n.destination }} </view>
+				</view>
+			</view>
+			<view class="packaging-time">
+				<view class="time">
+					<text>{{ i18n.start }}：</text>
+					<text>{{
             orderInformation.containerBase.begin_date + "&emsp;"
           }}</text>
-        </view>
-        <view class="time">
-          <text>{{ i18n.cut }}：</text>
-          <text>{{ orderInformation.containerBase.end_date }}</text>
-        </view>
-      </view>
-    </view>
-    <view class="photo" v-if="orderInformation.status == 'unpaid'">
-      <view class="_weight">
-        <text>{{ i18n.weighingWeight }}</text>
-        <text>{{ orderInformation.actual_weight }}kg</text>
-      </view>
-      <view class="_weight">
-        <text>{{ i18n.weighingImage }}</text>
-        <!-- <view class="_image"> </view> -->
-        <image
-          :src="orderInformation.weight_images"
-          mode="scaleToFill"
-          class="_image"
-        />
-      </view>
-      <view class="photo-bottom">
-        <text class="_text-1">{{ i18n.paymentRequired }}</text>
-        <view class="price">
-          <text style="font-size: 20rpx">￥</text>
-          <text>{{ orderInformation.gap_price.split(".")[0] }}</text
-          >.
-          <text style="font-size: 20rpx">{{
+				</view>
+				<view class="time">
+					<text>{{ i18n.cut }}：</text>
+					<text>{{ orderInformation.containerBase.end_date }}</text>
+				</view>
+			</view>
+		</view>
+		<view class="photo" v-if="orderInformation.status == 'unpaid'">
+			<view class="_weight">
+				<text>{{ i18n.weighingWeight }}</text>
+				<text>{{ orderInformation.actual_weight }}kg</text>
+			</view>
+			<view class="_weight">
+				<text>{{ i18n.weighingImage }}</text>
+				<!-- <view class="_image"> </view> -->
+				<image :src="orderInformation.weight_images" mode="scaleToFill" class="_image" />
+			</view>
+			<view class="photo-bottom">
+				<text class="_text-1">{{ i18n.paymentRequired }}</text>
+				<view class="price">
+					<text style="font-size: 20rpx">￥</text>
+					<text>{{ orderInformation.gap_price.split(".")[0] }}</text>.
+					<text style="font-size: 20rpx">{{
             orderInformation.gap_price.split(".")[1]
           }}</text>
-        </view>
-      </view>
-    </view>
-    <view class="address">
-      <view class="name-phone">
-        <view class="send"> {{ i18n.send }} </view>
-        <view class="name"> {{ orderInformation.from_name }} </view>
-        <view class="phone"> {{ orderInformation.from_mobile }} </view>
-      </view>
-      <view class="address-detail">
-        {{ orderInformation.from_full_address }}
-      </view>
-      <view class="name-phone">
-        <view class="send" style="background-color: #f83224; color: #fff">
-          {{ i18n.putAway }}
-        </view>
-        <view class="name"> {{ orderInformation.to_name }} </view>
-        <view class="phone"> {{ orderInformation.to_mobile }} </view>
-      </view>
-      <view class="address-detail _bottom">
-        {{ orderInformation.to_full_address }}
-      </view>
-      <image
-        style="height: 4rpx; margin-bottom: 40rpx"
-        src="../../static/mine/338.png"
-        mode=""
-      ></image>
-
-      <view class="_label-list" v-for="item in orderInformation.goods">
-        <view class="information">
-          <text class="_label">{{ i18n.item }}：</text>
-          <text class="_value">{{ item.name }}</text>
-        </view>
-        <view class="information">
-          <text class="_label">{{ i18n.goodsNum }}：</text>
-          <text class="_value">{{ item.number }}</text>
-        </view>
-        <view class="information">
-          <text class="_label">{{ i18n.weight }}：</text>
-          <text class="_value">{{ item.actual_weight }}kg</text>
-        </view>
-        <view class="information">
-          <text class="_label">{{ i18n.typeof }}：</text>
-          <text class="_value">{{ item.type_text }}</text>
-        </view>
-        <view style="display: flex">
-          <text class="_label">{{ i18n.flow }}：</text>
-          <view class="_value">
-            <text
-              >{{ orderInformation.transportType.name_cn + "&nbsp;" }}
-            </text>
-            <text> | {{ orderInformation.containerBase.name_cn }}</text>
-          </view>
-        </view>
-      </view>
-    </view>
-    <view class="num-information">
-      <view class="order" style="">
-        <text class="_label-1">{{ i18n.OrderNumber }}</text>
-        <view class="num">
-          <text>{{ orderInformation.order_no }}</text
-          >{{ "&nbsp;" + "|" + "&nbsp;"
+				</view>
+			</view>
+		</view>
+		<view class="address">
+			<view class="name-phone">
+				<view class="send"> {{ i18n.send }} </view>
+				<view class="name"> {{ orderInformation.from_name }} </view>
+				<view class="phone"> {{ orderInformation.from_mobile }} </view>
+			</view>
+			<view class="address-detail">
+				{{ orderInformation.from_full_address }}
+			</view>
+			<view class="name-phone">
+				<view class="send" style="background-color: #f83224; color: #fff">
+					{{ i18n.putAway }}
+				</view>
+				<view class="name"> {{ orderInformation.to_name }} </view>
+				<view class="phone"> {{ orderInformation.to_mobile }} </view>
+			</view>
+			<view class="address-detail _bottom">
+				{{ orderInformation.to_full_address }}
+			</view>
+			<image style="height: 4rpx; margin-bottom: 40rpx" src="../../static/mine/338.png" mode=""></image>
+
+			<view class="_label-list" v-for="item in orderInformation.goods">
+				<view class="information">
+					<text class="_label">{{ i18n.item }}：</text>
+					<text class="_value">{{ item.name }}</text>
+				</view>
+				<view class="information">
+					<text class="_label">{{ i18n.goodsNum }}：</text>
+					<text class="_value">{{ item.number }}</text>
+				</view>
+				<view class="information">
+					<text class="_label">{{ i18n.weight }}：</text>
+					<text class="_value">{{ item.actual_weight }}kg</text>
+				</view>
+				<view class="information">
+					<text class="_label">{{ i18n.typeof }}：</text>
+					<text class="_value">{{ item.type_text }}</text>
+				</view>
+				<view style="display: flex">
+					<text class="_label">{{ i18n.flow }}：</text>
+					<view class="_value">
+						<text>{{ orderInformation.transportType.name_cn + "&nbsp;" }}
+						</text>
+						<text> | {{ orderInformation.containerBase.name_cn }}</text>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="num-information">
+			<view class="order" style="">
+				<text class="_label-1">{{ i18n.OrderNumber }}</text>
+				<view class="num">
+					<text>{{ orderInformation.order_no }}</text>{{ "&nbsp;" + "|" + "&nbsp;"
           }}<text @click="cope(orderInformation.order_no)">{{
             i18n.cope
           }}</text>
-        </view>
-      </view>
-      <view class="order">
-        <text class="_label-1">{{ i18n.Ordertime }}</text>
-        <view class="num">{{ orderInformation.created_at }} </view>
-      </view>
-      <view class="order" v-if="isShowPayTime">
-        <text class="_label-1">{{ i18n.payTime }}</text>
-        <view class="num"> {{ orderInformation.paid_at }} </view>
-      </view>
-
-      <view
-        class="order"
-        v-if="
+				</view>
+			</view>
+			<view class="order">
+				<text class="_label-1">{{ i18n.Ordertime }}</text>
+				<view class="num">{{ orderInformation.created_at }} </view>
+			</view>
+			<view class="order" v-if="isShowPayTime">
+				<text class="_label-1">{{ i18n.payTime }}</text>
+				<view class="num"> {{ orderInformation.paid_at }} </view>
+			</view>
+
+			<view class="order" v-if="
           (orderInformation.status == 'overseas_delivered' &&
             orderInformation.status != 'domestic_delivered') ||
           orderInformation.status == 'finished'
-        "
-      >
-        <text class="_label-1">{{ i18n.sendTime }}</text>
-        <view class="num"> {{ orderInformation.overseas_delivered_at }} </view>
-      </view>
-
-      <view class="order" v-if="orderInformation.status == 'finished'">
-        <text class="_label-1">{{ i18n.signForTime }}</text>
-        <view class="num"> {{ orderInformation.overseas_received_at }} </view>
-      </view>
-    </view>
-
-    <view
-      class="pay"
-      v-if="
+        ">
+				<text class="_label-1">{{ i18n.sendTime }}</text>
+				<view class="num"> {{ orderInformation.overseas_delivered_at }} </view>
+			</view>
+
+			<view class="order" v-if="orderInformation.status == 'finished'">
+				<text class="_label-1">{{ i18n.signForTime }}</text>
+				<view class="num"> {{ orderInformation.overseas_received_at }} </view>
+			</view>
+		</view>
+
+		<view class="pay" v-if="
         orderInformation.status != 'group_unpaid' &&
         orderInformation.status != 'unpaid'
-      "
-    >
-      <text>{{
+      ">
+			<text>{{
         orderInformation.status == "group_unpaid" ||
         orderInformation.status == "unpaid"
           ? i18n.pengingPay
           : i18n.paid
       }}</text>
-      <text style="color: #f83224; font-weight: 600">{{
+			<text style="color: #f83224; font-weight: 600">{{
         orderInformation.paid_amount
       }}</text>
-    </view>
-    <view
-      class="footer"
-      v-if="
+		</view>
+		<view class="footer" v-if="
         orderInformation.status == 'domestic_delivered' ||
         orderInformation.status == 'overseas_delivered' ||
         orderInformation.status == 'finished'
-      "
-    >
-      <button
-        class="btn-1"
-        @click="toLogistics"
-        v-if="orderInformation.status == 'finished'"
-      >
-        {{ i18n.delete }}
-      </button>
-      <button class="btn-1" @click="toLogistics">
-        {{ i18n.checkLogistics }}
-      </button>
-      <button
-        class="btn-1"
-        @click="fillInformation"
-        v-if="orderInformation.status == 'domestic_undelivered'"
-      >
-        {{ i18n.logisticsInformation }}
-      </button>
-      <button
-        class="btn-2"
-        @click="toPay"
-        v-if="orderInformation.status == 'unpaid'"
-      >
-        {{ i18n.payment }}
-      </button>
-    </view>
-    <view class="footer" v-else-if="isShowFooter">
-      <button
-        class="btn-1"
-        @click="fillInformation"
-        v-if="
+      ">
+			<button class="btn-1" @click="toLogistics" v-if="orderInformation.status == 'finished'">
+				{{ i18n.delete }}
+			</button>
+			<button class="btn-1" @click="toLogistics">
+				{{ i18n.checkLogistics }}
+			</button>
+			<button class="btn-1" @click="fillInformation" v-if="orderInformation.status == 'domestic_undelivered'">
+				{{ i18n.logisticsInformation }}
+			</button>
+			<button class="btn-2" @click="toPay" v-if="orderInformation.status == 'unpaid'">
+				{{ i18n.payment }}
+			</button>
+		</view>
+		<view class="footer" v-else-if="isShowFooter">
+			<button class="btn-1" @click="fillInformation" v-if="
           (orderInformation.type == 'group_package' ||
             orderInformation.type == 'express_order') &&
           orderInformation.status == 'domestic_undelivered'
-        "
-      >
-        {{ i18n.logisticsInformation }}
-      </button>
+        ">
+				{{ i18n.logisticsInformation }}
+			</button>
 
-      <!-- <button
+			<!-- <button
         class="btn-2"
         @click="toSending"
         v-if="
@@ -237,498 +201,503 @@
       >
         {{ i18n.mail }}
       </button> -->
-      <button
-        class="btn-2"
-        @click="toPay"
-        v-if="
+			<button class="btn-2" @click="toPay" v-if="
           orderInformation.status == 'unpaid' ||
           orderInformation.status == 'group_unpaid'
-        "
-      >
-        {{ i18n.payment }}
-      </button></view
-    >
-    <Fill :show="show" @close="close" />
-  </view>
+        ">
+				{{ i18n.payment }}
+			</button>
+		</view>
+		<Fill :show="show" @close="close" />
+	</view>
 </template>
 
 <script>
-import Fill from "./component/fill.vue";
-export default {
-  components: {
-    Fill,
-  },
-  data() {
-    return {
-      orderStauts: 0,
-      orderTitle: "",
-      orderDetail: "",
-      packageId: "",
-      orderInformation: {},
-      show: false,
-    };
-  },
-  computed: {
-    //判断是否显示付款时间
-    isShowPayTime() {
-      if (
-        this.orderInformation.type == "group_package" ||
-        this.orderInformation.type == "mall_order"
-      ) {
-        if (
-          this.orderInformation.status == "packaging" ||
-          this.orderInformation.status == "group_unpaid" ||
-          this.orderInformation.status == "unpaid"
-        ) {
-          return false;
-        } else {
-          return true;
-        }
-      } else if (
-        this.orderInformation.status == "domestic_undelivered" ||
-        this.orderInformation.status == "domestic_delivered" ||
-        this.orderInformation.status == "domestic_received"
-      ) {
-        return false;
-      }
-    },
-    //是否显示底部按钮
-    isShowFooter() {
-      if (
-        this.orderInformation.type == "mall_order" &&
-        this.orderInformation.status == "domestic_undelivered"
-      ) {
-        return false;
-      } else if (
-        this.orderInformation.type != "mall_order" &&
-        this.orderInformation.status == "domestic_undelivered"
-      ) {
-        return true;
-      } else if (
-        this.orderInformation.status == "unpaid" ||
-        this.orderInformation.status == "group_unpaid"
-      ) {
-        return true;
-      }
-    },
-    i18n() {
-      return this.$t("index");
-    },
-  },
-  onLoad(options) {
-    this.orderStauts = options.orderStatus;
-    this.getDetail();
-  },
-  onShow() {
-    this.getDetail();
-  },
-  created() {},
-  methods: {
-    cope(str) {
-      uni.setClipboardData({
-        data: str,
-        success() {
-          uni.showToast({
-            title: "复制成功",
-            icon: "none",
-          });
-        },
-      });
-    },
-
-    //去寄件
-    toSending() {
-      uni.navigateTo({
-        url: "/pageD/sending/sending?orderId=" + this.orderInformation.id,
-      });
-    },
-
-    setStatus(num) {
-      this.orderStauts = num;
-    },
-    //查看物流进度
-    toLogistics() {
-      uni.navigateTo({
-        url: `/pageD/logisticsProgress/logisticsProgress?source_type=express_order&source_id=${this.orderInformation.id}`,
-      });
-    },
-
-    //填写物流信息
-    fillInformation() {
-      this.show = true;
-    },
-
-    //关闭弹窗
-    close(value) {
-      this.show = false;
-      if (value.expressCode) {
-        uni.$u.http
-          .post(`/api/express-order/delivery/${this.orderInformation.id}`, {
-            domestic_logistics_company_code: value.expressCode,
-            domestic_logistics_no: value.expressNum,
-          })
-          .then((res) => {
-            this.getDetail();
-            uni.showToast({
-              title: this.i18n.saved,
-            });
-          });
-      }
-    },
-    //去支付
-    toPay() {
-      let payMoney = "";
-      // 根据不同的商城订单传不同的金额字段
-
-      if (this.orderInformation.type == "mall_order") {
-        payMoney = this.orderInformation.gap_price;
-      } else {
-        payMoney = this.orderInformation.pay_amount;
-      }
-      uni.navigateTo({
-        url: `/pageD/paymentOrder/paymentOrder?money=${payMoney}&weight=${this.orderInformation.goods[0].actual_weight}&packageType=${this.orderInformation.goods[0].type_text}&num=${this.orderInformation.goods[0].number}&orderid=${this.orderInformation.id}&type=${this.orderInformation.type}`,
-      });
-    },
-    getDetail() {
-      uni.$u.http.get(`/api/express-order/${this.orderStauts}`).then((res) => {
-        this.orderInformation = res;
-        if (this.orderInformation.status == "domestic_delivered") {
-          //设置顶部标题栏颜色
-          uni.setNavigationBarColor({
-            frontColor: "#000000",
-            backgroundColor: "#f4f4f4",
-          });
-          this.orderDetail = this.i18n.toPiattaforma;
-          this.orderTitle = this.orderInformation.status_text;
-        } else if (this.orderInformation.status == "unpaid") {
-          //设置顶部标题栏颜色
-          uni.setNavigationBarColor({
-            frontColor: "#000000",
-            backgroundColor: "#f4f4f4",
-          });
-          this.orderDetail = this.i18n.peso;
-          this.orderTitle = this.orderInformation.status_text;
-        } else if (this.orderInformation.status == "overseas_undelivered") {
-          //设置顶部标题栏颜色
-          uni.setNavigationBarColor({
-            frontColor: "#000000",
-            backgroundColor: "#f4f4f4",
-          });
-          this.orderDetail = this.i18n.waitPiattaforma;
-          this.orderTitle = this.orderInformation.status_text;
-        } else if (this.orderInformation.status == "overseas_delivered") {
-          //设置顶部标题栏颜色
-          uni.setNavigationBarColor({
-            frontColor: "#000000",
-            backgroundColor: "#f4f4f4",
-          });
-          this.orderDetail = this.i18n.prodottoInviato;
-          this.orderTitle = this.orderInformation.status_text;
-        } else if (this.orderStauts == 4) {
-          //设置顶部标题栏颜色
-          uni.setNavigationBarColor({
-            frontColor: "#000000",
-            backgroundColor: "#ffffff",
-          });
-          uni.setNavigationBarTitle({
-            title: this.i18n.insiemeDetail,
-          });
-        } else if (
-          this.orderInformation.status == "finished" ||
-          this.orderInformation.status == "overseas_received"
-        ) {
-          //设置顶部标题栏颜色
-          uni.setNavigationBarColor({
-            frontColor: "#000000",
-            backgroundColor: "#f4f4f4",
-          });
-          this.orderDetail = this.i18n.orderCompleto;
-          this.orderTitle = this.orderInformation.status_text;
-        } else if (this.orderInformation.status == "domestic_received") {
-          //设置顶部标题栏颜色
-          uni.setNavigationBarColor({
-            frontColor: "#000000",
-            backgroundColor: "#f4f4f4",
-          });
-          this.orderDetail = this.i18n.pesoEmissione;
-          this.orderTitle = this.orderInformation.status_text;
-        } else if (this.orderInformation.status == "closed") {
-          //设置顶部标题栏颜色
-          uni.setNavigationBarColor({
-            frontColor: "#000000",
-            backgroundColor: "#f4f4f4",
-          });
-          this.orderDetail = this.i18n.orderClose;
-          this.orderTitle = this.orderInformation.status_text;
-        } else if (this.orderInformation.status == "refunded") {
-          //设置顶部标题栏颜色
-          uni.setNavigationBarColor({
-            frontColor: "#000000",
-            backgroundColor: "#f4f4f4",
-          });
-          this.orderDetail = this.i18n.orderRefund;
-          this.orderTitle = this.orderInformation.status_text;
-        } else if (this.orderInformation.status == "refunding") {
-          //设置顶部标题栏颜色
-          uni.setNavigationBarColor({
-            frontColor: "#000000",
-            backgroundColor: "#f4f4f4",
-          });
-          this.orderDetail = this.i18n.refunding;
-          this.orderTitle = this.orderInformation.status_text;
-        } else if (this.orderInformation.status == "domestic_undelivered") {
-          //设置顶部标题栏颜色
-          uni.setNavigationBarColor({
-            frontColor: "#000000",
-            backgroundColor: "#f4f4f4",
-          });
-          this.orderDetail = this.i18n.waitCommity;
-          this.orderTitle = this.orderInformation.status_text;
-        }
-      });
-    },
-  },
-};
+	import Fill from "./component/fill.vue";
+	export default {
+		components: {
+			Fill,
+		},
+		data() {
+			return {
+				orderStauts: 0,
+				orderTitle: "",
+				orderDetail: "",
+				packageId: "",
+				orderInformation: {},
+				show: false,
+			};
+		},
+		computed: {
+			//判断是否显示付款时间
+			isShowPayTime() {
+				if (
+					this.orderInformation.type == "group_package" ||
+					this.orderInformation.type == "mall_order" || this.orderInformation.type == 'express_order'
+				) {
+					if (
+						this.orderInformation.status == "packaging" ||
+						this.orderInformation.status == "group_unpaid" ||
+						this.orderInformation.status == "unpaid"
+					) {
+						return false;
+					} else {
+						return true;
+					}
+				} else if (
+					this.orderInformation.status == "domestic_undelivered" ||
+					this.orderInformation.status == "domestic_delivered" ||
+					this.orderInformation.status == "domestic_received"
+				) {
+					return false;
+				}
+			},
+			//是否显示底部按钮
+			isShowFooter() {
+				if (
+					this.orderInformation.type == "mall_order" &&
+					this.orderInformation.status == "domestic_undelivered"
+				) {
+					return false;
+				} else if (
+					this.orderInformation.type != "mall_order" &&
+					this.orderInformation.status == "domestic_undelivered"
+				) {
+					return true;
+				} else if (
+					this.orderInformation.status == "unpaid" ||
+					this.orderInformation.status == "group_unpaid"
+				) {
+					return true;
+				}
+			},
+			i18n() {
+				return this.$t("index");
+			},
+		},
+		onLoad(options) {
+			this.orderStauts = options.orderStatus;
+			this.getDetail();
+		},
+		onShow() {
+			this.getDetail();
+		},
+		created() {},
+		methods: {
+			cope(str) {
+				uni.setClipboardData({
+					data: str,
+					success() {
+						uni.showToast({
+							title: "复制成功",
+							icon: "none",
+						});
+					},
+				});
+			},
+
+			//去寄件
+			toSending() {
+				uni.navigateTo({
+					url: "/pageD/sending/sending?orderId=" + this.orderInformation.id,
+				});
+			},
+
+			setStatus(num) {
+				this.orderStauts = num;
+			},
+			//查看物流进度
+			toLogistics() {
+				uni.navigateTo({
+					url: `/pageD/logisticsProgress/logisticsProgress?source_type=express_order&source_id=${this.orderInformation.id}`,
+				});
+			},
+
+			//填写物流信息
+			fillInformation() {
+				this.show = true;
+			},
+
+			//关闭弹窗
+			close(value) {
+				this.show = false;
+				if (value.expressCode) {
+					uni.$u.http
+						.post(`/api/express-order/delivery/${this.orderInformation.id}`, {
+							domestic_logistics_company_code: value.expressCode,
+							domestic_logistics_no: value.expressNum,
+						})
+						.then((res) => {
+							this.getDetail();
+							uni.showToast({
+								title: this.i18n.saved,
+							});
+						});
+				}
+			},
+			//去支付
+			toPay() {
+				let payMoney = "";
+				// 根据不同的商城订单传不同的金额字段
+
+				if (this.orderInformation.type == "mall_order") {
+					payMoney = this.orderInformation.gap_price;
+				} else {
+					payMoney = this.orderInformation.pay_amount;
+				}
+				uni.navigateTo({
+					url: `/pageD/paymentOrder/paymentOrder?money=${payMoney}&weight=${this.orderInformation.goods[0].actual_weight}&packageType=${this.orderInformation.goods[0].type_text}&num=${this.orderInformation.goods[0].number}&orderid=${this.orderInformation.id}&type=${this.orderInformation.type}`,
+				});
+			},
+			getDetail() {
+				uni.$u.http.get(`/api/express-order/${this.orderStauts}`).then((res) => {
+					this.orderInformation = res;
+					if (this.orderInformation.status == "domestic_delivered") {
+						//设置顶部标题栏颜色
+						uni.setNavigationBarColor({
+							frontColor: "#000000",
+							backgroundColor: "#f4f4f4",
+						});
+						this.orderDetail = this.i18n.toPiattaforma;
+						this.orderTitle = this.orderInformation.status_text;
+					} else if (this.orderInformation.status == "unpaid") {
+						//设置顶部标题栏颜色
+						uni.setNavigationBarColor({
+							frontColor: "#000000",
+							backgroundColor: "#f4f4f4",
+						});
+						this.orderDetail = this.i18n.peso;
+						this.orderTitle = this.orderInformation.status_text;
+					} else if (this.orderInformation.status == "overseas_undelivered") {
+						//设置顶部标题栏颜色
+						uni.setNavigationBarColor({
+							frontColor: "#000000",
+							backgroundColor: "#f4f4f4",
+						});
+						this.orderDetail = this.i18n.waitPiattaforma;
+						this.orderTitle = this.orderInformation.status_text;
+					} else if (this.orderInformation.status == "overseas_delivered") {
+						//设置顶部标题栏颜色
+						uni.setNavigationBarColor({
+							frontColor: "#000000",
+							backgroundColor: "#f4f4f4",
+						});
+						this.orderDetail = this.i18n.prodottoInviato;
+						this.orderTitle = this.orderInformation.status_text;
+					} else if (this.orderStauts == 4) {
+						//设置顶部标题栏颜色
+						uni.setNavigationBarColor({
+							frontColor: "#000000",
+							backgroundColor: "#ffffff",
+						});
+						uni.setNavigationBarTitle({
+							title: this.i18n.insiemeDetail,
+						});
+					} else if (
+						this.orderInformation.status == "finished" ||
+						this.orderInformation.status == "overseas_received"
+					) {
+						//设置顶部标题栏颜色
+						uni.setNavigationBarColor({
+							frontColor: "#000000",
+							backgroundColor: "#f4f4f4",
+						});
+						this.orderDetail = this.i18n.orderCompleto;
+						this.orderTitle = this.orderInformation.status_text;
+					} else if (this.orderInformation.status == "domestic_received") {
+						//设置顶部标题栏颜色
+						uni.setNavigationBarColor({
+							frontColor: "#000000",
+							backgroundColor: "#f4f4f4",
+						});
+						this.orderDetail = this.i18n.pesoEmissione;
+						this.orderTitle = this.orderInformation.status_text;
+					} else if (this.orderInformation.status == "closed") {
+						//设置顶部标题栏颜色
+						uni.setNavigationBarColor({
+							frontColor: "#000000",
+							backgroundColor: "#f4f4f4",
+						});
+						this.orderDetail = this.i18n.orderClose;
+						this.orderTitle = this.orderInformation.status_text;
+					} else if (this.orderInformation.status == "refunded") {
+						//设置顶部标题栏颜色
+						uni.setNavigationBarColor({
+							frontColor: "#000000",
+							backgroundColor: "#f4f4f4",
+						});
+						this.orderDetail = this.i18n.orderRefund;
+						this.orderTitle = this.orderInformation.status_text;
+					} else if (this.orderInformation.status == "refunding") {
+						//设置顶部标题栏颜色
+						uni.setNavigationBarColor({
+							frontColor: "#000000",
+							backgroundColor: "#f4f4f4",
+						});
+						this.orderDetail = this.i18n.refunding;
+						this.orderTitle = this.orderInformation.status_text;
+					} else if (this.orderInformation.status == "domestic_undelivered") {
+						//设置顶部标题栏颜色
+						uni.setNavigationBarColor({
+							frontColor: "#000000",
+							backgroundColor: "#f4f4f4",
+						});
+						this.orderDetail = this.i18n.waitCommity;
+						this.orderTitle = this.orderInformation.status_text;
+					}
+				});
+			},
+		},
+	};
 </script>
 
 <style lang="scss" scoped>
-.page {
-  padding: 20rpx 24rpx;
-  position: relative;
-  padding-bottom: 186rpx;
-
-  .title {
-    font-size: 44rpx;
-    color: #222;
-    font-weight: 600;
-  }
-
-  .prompt {
-    font-size: 24rpx;
-    color: rgba(34, 34, 34, 0.5);
-    margin-top: 12rpx;
-  }
-  .packaging {
-    border-radius: 16rpx;
-    background-color: #fff;
-    padding: 30rpx 20rpx;
-    .packaging-top {
-      display: flex;
-      justify-content: space-between;
-      font-size: 28rpx;
-      color: #222;
-    }
-    .packaging-center {
-      display: flex;
-      justify-content: space-around;
-      align-items: center;
-      margin-top: 26rpx;
-      background-color: #f5f5f5;
-      border-radius: 10rpx;
-      padding: 20rpx 0;
-      .jiantou {
-        width: 130rpx;
-        height: 10rpx;
-      }
-      .packaging-left {
-        text-align: center;
-        .left-top {
-          font-size: 32rpx;
-          color: #222;
-          font-weight: 600;
-        }
-        .left-bottom {
-          margin-top: 10rpx;
-          font-size: 24rpx;
-          color: rgba(34, 34, 34, 0.5);
-        }
-      }
-    }
-    .packaging-time {
-      font-size: 28rpx;
-      display: flex;
-      align-items: center;
-      margin-top: 28rpx;
-    }
-  }
-  .photo {
-    background-color: #fff;
-    border-radius: 16rpx;
-    padding: 20rpx 20rpx;
-    margin-top: 20rpx;
-
-    ._weight {
-      display: flex;
-      justify-content: space-between;
-      font-size: 26rpx;
-      color: rgba(34, 34, 34, 0.8);
-      margin-bottom: 32rpx;
-
-      ._image {
-        width: 160rpx;
-        height: 90rpx;
-        // background-color: #d8d8d8;
-        border-radius: 4rpx;
-      }
-    }
-
-    .photo-bottom {
-      display: flex;
-      justify-content: flex-end;
-      align-items: center;
-      border-top: 2rpx solid rgba(151, 151, 151, 0.1);
-      padding-top: 24rpx;
-
-      .price {
-        color: #f83224;
-        font-weight: 600;
-      }
-
-      ._text-1 {
-        font-size: 26rpx;
-      }
-    }
-  }
-
-  .address {
-    padding: 36rpx 34rpx;
-    background-color: #fff;
-    border-radius: 10rpx;
-    margin-top: 32rpx;
-
-    .name-phone {
-      display: flex;
-      align-items: flex-end;
-
-      .send {
-        width: 40rpx;
-        height: 40rpx;
-        background-color: #000;
-        color: #fff;
-        border-radius: 50%;
-        font-size: 22rpx;
-        text-align: center;
-        line-height: 40rpx;
-      }
-
-      .name {
-        font-weight: 600;
-        font-size: 30rpx;
-        color: #222;
-        margin-right: 28rpx;
-        margin-left: 28rpx;
-      }
-
-      .phone {
-        font-size: 24rpx;
-        color: #777;
-      }
-    }
-
-    .address-detail {
-      font-size: 26rpx;
-      color: #555;
-      margin-top: 16rpx;
-      margin-left: 60rpx;
-      padding-bottom: 36rpx;
-      border-bottom: 2rpx solid rgba(151, 151, 151, 0.1);
-      margin-bottom: 34rpx;
-    }
-
-    ._bottom {
-      border: none;
-      margin-bottom: 0;
-    }
-
-    ._label-list {
-      display: flex;
-      flex-wrap: wrap;
-      justify-content: space-between;
-
-      .information {
-        width: 49%;
-        margin-bottom: 28rpx;
-        font-size: 28rpx;
-      }
-
-      ._label {
-        color: #666;
-        font-size: 28rpx;
-      }
-
-      ._value {
-        font-size: 28rpx;
-        color: #333;
-      }
-    }
-  }
-
-  .num-information {
-    background-color: #fff;
-    border-radius: 16rpx;
-    margin-top: 20rpx;
-    padding: 28rpx 20rpx 2rpx 28rpx;
-
-    .order {
-      display: flex;
-      justify-content: space-between;
-      font-size: 28rpx;
-      margin-bottom: 28rpx;
-
-      ._label-1 {
-        color: #666;
-      }
-
-      .num {
-        color: #333;
-      }
-    }
-  }
-
-  .pay {
-    display: flex;
-    padding: 22rpx 28rpx;
-    justify-content: space-between;
-    margin-top: 20rpx;
-    background-color: #fff;
-    border-radius: 16rpx;
-  }
-
-  .footer {
-    display: flex;
-    justify-content: flex-end;
-    background-color: #fff;
-    position: fixed;
-    bottom: 0;
-    left: 0;
-    width: 100%;
-    height: 146rpx;
-    padding-top: 20rpx;
-
-    .btn-1 {
-      height: 76rpx;
-      padding: 0;
-      margin: 0;
-      font-size: 28rpx;
-      color: #222;
-      min-width: 188rpx;
-      background-color: #fff;
-      border-radius: 38rpx;
-      border: 2rpx solid #979797;
-      margin-right: 20rpx;
-    }
-
-    .btn-2 {
-      height: 76rpx;
-      padding: 0;
-      margin: 0;
-      font-size: 28rpx;
-      color: #fff;
-      min-width: 188rpx;
-      background-color: #f83224;
-      border-radius: 38rpx;
-      margin-right: 20rpx;
-    }
-  }
-}
-</style>
+	.page {
+		padding: 20rpx 24rpx;
+		position: relative;
+		padding-bottom: 186rpx;
+
+		.title {
+			font-size: 44rpx;
+			color: #222;
+			font-weight: 600;
+		}
+
+		.prompt {
+			font-size: 24rpx;
+			color: rgba(34, 34, 34, 0.5);
+			margin-top: 12rpx;
+		}
+
+		.packaging {
+			border-radius: 16rpx;
+			background-color: #fff;
+			padding: 30rpx 20rpx;
+
+			.packaging-top {
+				display: flex;
+				justify-content: space-between;
+				font-size: 28rpx;
+				color: #222;
+			}
+
+			.packaging-center {
+				display: flex;
+				justify-content: space-around;
+				align-items: center;
+				margin-top: 26rpx;
+				background-color: #f5f5f5;
+				border-radius: 10rpx;
+				padding: 20rpx 0;
+
+				.jiantou {
+					width: 130rpx;
+					height: 10rpx;
+				}
+
+				.packaging-left {
+					text-align: center;
+
+					.left-top {
+						font-size: 32rpx;
+						color: #222;
+						font-weight: 600;
+					}
+
+					.left-bottom {
+						margin-top: 10rpx;
+						font-size: 24rpx;
+						color: rgba(34, 34, 34, 0.5);
+					}
+				}
+			}
+
+			.packaging-time {
+				font-size: 28rpx;
+				display: flex;
+				align-items: center;
+				margin-top: 28rpx;
+			}
+		}
+
+		.photo {
+			background-color: #fff;
+			border-radius: 16rpx;
+			padding: 20rpx 20rpx;
+			margin-top: 20rpx;
+
+			._weight {
+				display: flex;
+				justify-content: space-between;
+				font-size: 26rpx;
+				color: rgba(34, 34, 34, 0.8);
+				margin-bottom: 32rpx;
+
+				._image {
+					width: 160rpx;
+					height: 90rpx;
+					// background-color: #d8d8d8;
+					border-radius: 4rpx;
+				}
+			}
+
+			.photo-bottom {
+				display: flex;
+				justify-content: flex-end;
+				align-items: center;
+				border-top: 2rpx solid rgba(151, 151, 151, 0.1);
+				padding-top: 24rpx;
+
+				.price {
+					color: #f83224;
+					font-weight: 600;
+				}
+
+				._text-1 {
+					font-size: 26rpx;
+				}
+			}
+		}
+
+		.address {
+			padding: 36rpx 34rpx;
+			background-color: #fff;
+			border-radius: 10rpx;
+			margin-top: 32rpx;
+
+			.name-phone {
+				display: flex;
+				align-items: flex-end;
+
+				.send {
+					width: 40rpx;
+					height: 40rpx;
+					background-color: #000;
+					color: #fff;
+					border-radius: 50%;
+					font-size: 22rpx;
+					text-align: center;
+					line-height: 40rpx;
+				}
+
+				.name {
+					font-weight: 600;
+					font-size: 30rpx;
+					color: #222;
+					margin-right: 28rpx;
+					margin-left: 28rpx;
+				}
+
+				.phone {
+					font-size: 24rpx;
+					color: #777;
+				}
+			}
+
+			.address-detail {
+				font-size: 26rpx;
+				color: #555;
+				margin-top: 16rpx;
+				margin-left: 60rpx;
+				padding-bottom: 36rpx;
+				border-bottom: 2rpx solid rgba(151, 151, 151, 0.1);
+				margin-bottom: 34rpx;
+			}
+
+			._bottom {
+				border: none;
+				margin-bottom: 0;
+			}
+
+			._label-list {
+				display: flex;
+				flex-wrap: wrap;
+				justify-content: space-between;
+
+				.information {
+					width: 49%;
+					margin-bottom: 28rpx;
+					font-size: 28rpx;
+				}
+
+				._label {
+					color: #666;
+					font-size: 28rpx;
+				}
+
+				._value {
+					font-size: 28rpx;
+					color: #333;
+				}
+			}
+		}
+
+		.num-information {
+			background-color: #fff;
+			border-radius: 16rpx;
+			margin-top: 20rpx;
+			padding: 28rpx 20rpx 2rpx 28rpx;
+
+			.order {
+				display: flex;
+				justify-content: space-between;
+				font-size: 28rpx;
+				margin-bottom: 28rpx;
+
+				._label-1 {
+					color: #666;
+				}
+
+				.num {
+					color: #333;
+				}
+			}
+		}
+
+		.pay {
+			display: flex;
+			padding: 22rpx 28rpx;
+			justify-content: space-between;
+			margin-top: 20rpx;
+			background-color: #fff;
+			border-radius: 16rpx;
+		}
+
+		.footer {
+			display: flex;
+			justify-content: flex-end;
+			background-color: #fff;
+			position: fixed;
+			bottom: 0;
+			left: 0;
+			width: 100%;
+			height: 146rpx;
+			padding-top: 20rpx;
+
+			.btn-1 {
+				height: 76rpx;
+				padding: 0;
+				margin: 0;
+				font-size: 28rpx;
+				color: #222;
+				min-width: 188rpx;
+				background-color: #fff;
+				border-radius: 38rpx;
+				border: 2rpx solid #979797;
+				margin-right: 20rpx;
+			}
+
+			.btn-2 {
+				height: 76rpx;
+				padding: 0;
+				margin: 0;
+				font-size: 28rpx;
+				color: #fff;
+				min-width: 188rpx;
+				background-color: #f83224;
+				border-radius: 38rpx;
+				margin-right: 20rpx;
+			}
+		}
+	}
+</style>

unpackage/dist/dev/mp-weixin/project.private.config.json

@@ -51,6 +51,20 @@
           "query": "",
           "launchMode": "default",
           "scene": null
+        },
+        {
+          "name": "",
+          "pathName": "pageD/newBulitOrder/newBulitOrder",
+          "query": "orderId=509",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "",
+          "pathName": "pageD/orderInformation/orderInformation",
+          "query": "orderStatus=491",
+          "launchMode": "default",
+          "scene": null
         }
       ]
     }

unpackage/dist/dev/mp-weixin/uview-ui/components/u-swipe-action-item/u-swipe-action-item.json

@@ -1,6 +1,6 @@
 {
-  "component": true,
   "usingComponents": {
     "u-icon": "/uview-ui/components/u-icon/u-icon"
-  }
+  },
+  "component": true
 }

unpackage/dist/dev/mp-weixin/uview-ui/components/u-swipe-action/u-swipe-action.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }