8.3

pageA/payorder.vue

@@ -1,394 +1,474 @@
 <template>
-	<view class="back">
-		<view class="topbox">
-			<view class="" style="position: absolute; top: -30rpx; right: 0">
-				<view class="state u-flex u-row-between" @click="stateshow = !stateshow">
-					<text>{{ state }}</text>
-					<image src="static/images/pull_down.png" style="width: 24rpx; height: 24rpx" mode=""></image>
-				</view>
-				<view class="state" v-if="stateshow">
-					<view @click="statechange(item, idx)" :class="state_id == idx ? 'stateac' : 'unstate'"
-						style="margin-bottom: 20rpx; font-size: 24rpx" v-for="(item, idx) in array">{{ item.name }}
-					</view>
-				</view>
-			</view>
-			<view class="u-row-center" style="
+  <view class="back">
+    <view class="topbox">
+      <view class="" style="position: absolute; top: -30rpx; right: 0">
+        <view
+          class="state u-flex u-row-between"
+          @click="stateshow = !stateshow"
+        >
+          <text>{{ state }}</text>
+          <image
+            src="static/images/pull_down.png"
+            style="width: 24rpx; height: 24rpx"
+            mode=""
+          ></image>
+        </view>
+        <view class="state" v-if="stateshow">
+          <view
+            @click="statechange(item, idx)"
+            :class="state_id == idx ? 'stateac' : 'unstate'"
+            style="margin-bottom: 20rpx; font-size: 24rpx"
+            v-for="(item, idx) in array"
+            >{{ item.name }}
+          </view>
+        </view>
+      </view>
+      <view
+        class="u-row-center"
+        style="
           display: flex;
           flex-direction: column;
           align-items: center;
           margin-top: 56rpx;
-        ">
-				<view class="paysum">{{ i18n.Actual }}</view>
-				<view class="numbe" style="margin-top: 40rpx">
-					<text>￥</text>
-					<text style="font-size: 60rpx; font-weight: 500">{{ sum }}</text>
-				</view>
-				<!-- 				<view class="">
+        "
+      >
+        <view class="paysum">{{ i18n.Actual }}</view>
+        <view class="numbe" style="margin-top: 40rpx">
+          <text>￥</text>
+          <text style="font-size: 60rpx; font-weight: 500">{{ sum }}</text>
+        </view>
+        <!-- 				<view class="">
 					<text>支付剩余时间 13:50</text>
 				</view> -->
-			</view>
-			<!-- 余额支付 -->
-			<view class="payitem" style="margin-top: 100rpx; display: flex" @click="change(0)">
-				<image src="static/images/yuer.png" mode="" style="width: 40rpx; height: 40rpx"></image>
-				<view class="u-flex u-row-between" style="margin-left: 20rpx; flex: 1">
-					<view class="">
-						<view class="">{{ i18n.Balancepayment }}</view>
-						<view class="" style="margin-top: 10rpx; color: rgba(248, 50, 36, 1)">
-							{{ i18n.Currentbalance }}：{{ balance }}
-						</view>
-					</view>
-					<image v-if="mode == 0" src="static/images/active.png" mode="" style="width: 36rpx; height: 36rpx">
-					</image>
-					<image v-else src="static/images/unactive.png" mode="" style="width: 36rpx; height: 36rpx"></image>
-				</view>
-			</view>
-			<!-- 微信支付 -->
-			<view v-if="state_id == 0" class="payitem" style="margin-top: 20rpx; display: flex" @click="change(1)">
-				<image src="static/images/wx.png" mode="" style="width: 40rpx; height: 40rpx"></image>
-				<view class="u-flex u-row-between" style="margin-left: 20rpx; flex: 1">
-					<view class="">
-						<view class="">{{ i18n.WechatPay }}</view>
-						<view class="" style="margin-top: 10rpx; color: rgba(121, 121, 121, 1)">
-							{{ i18n.applicable }}
-						</view>
-					</view>
-					<image v-if="mode == 1" src="static/images/active.png" mode="" style="width: 36rpx; height: 36rpx">
-					</image>
-					<image v-else src="static/images/unactive.png" mode="" style="width: 36rpx; height: 36rpx"></image>
-				</view>
-			</view>
-			<!-- 客服支付 -->
-			<view class="payitem" style="margin-top: 20rpx; display: flex" @click="change(2)">
-				<image src="static/images/kefu2.png" mode="" style="width: 40rpx; height: 40rpx"></image>
-				<view class="u-flex u-row-between" style="margin-left: 20rpx; flex: 1">
-					<view class="">
-						<view class="">{{ i18n.Customerservicepayment }}</view>
-						<view class="" style="margin-top: 10rpx; color: rgba(121, 121, 121, 1)">
-							{{ i18n.Contactpayment }}
-						</view>
-					</view>
-					<image v-if="mode == 2" src="static/images/active.png" mode="" style="width: 36rpx; height: 36rpx">
-					</image>
-					<image v-else src="static/images/unactive.png" mode="" style="width: 36rpx; height: 36rpx"></image>
-				</view>
-			</view>
-		</view>
-		<!-- 付款须知 -->
-		<view class="">
-			<view class="payment" style="margin-top: 24rpx">{{
+      </view>
+      <!-- 余额支付 -->
+      <view
+        class="payitem"
+        style="margin-top: 100rpx; display: flex"
+        @click="change(0)"
+      >
+        <image
+          src="static/images/yuer.png"
+          mode=""
+          style="width: 40rpx; height: 40rpx"
+        ></image>
+        <view class="u-flex u-row-between" style="margin-left: 20rpx; flex: 1">
+          <view class="">
+            <view class="">{{ i18n.Balancepayment }}</view>
+            <view
+              class=""
+              style="margin-top: 10rpx; color: rgba(248, 50, 36, 1)"
+            >
+              {{ i18n.Currentbalance }}：{{ balance }}
+            </view>
+          </view>
+          <image
+            v-if="mode == 0"
+            src="static/images/active.png"
+            mode=""
+            style="width: 36rpx; height: 36rpx"
+          >
+          </image>
+          <image
+            v-else
+            src="static/images/unactive.png"
+            mode=""
+            style="width: 36rpx; height: 36rpx"
+          ></image>
+        </view>
+      </view>
+      <!-- 微信支付 -->
+      <view
+        v-if="state_id == 0"
+        class="payitem"
+        style="margin-top: 20rpx; display: flex"
+        @click="change(1)"
+      >
+        <image
+          src="static/images/wx.png"
+          mode=""
+          style="width: 40rpx; height: 40rpx"
+        ></image>
+        <view class="u-flex u-row-between" style="margin-left: 20rpx; flex: 1">
+          <view class="">
+            <view class="">{{ i18n.WechatPay }}</view>
+            <view
+              class=""
+              style="margin-top: 10rpx; color: rgba(121, 121, 121, 1)"
+            >
+              {{ i18n.applicable }}
+            </view>
+          </view>
+          <image
+            v-if="mode == 1"
+            src="static/images/active.png"
+            mode=""
+            style="width: 36rpx; height: 36rpx"
+          >
+          </image>
+          <image
+            v-else
+            src="static/images/unactive.png"
+            mode=""
+            style="width: 36rpx; height: 36rpx"
+          ></image>
+        </view>
+      </view>
+      <!-- 客服支付 -->
+      <view
+        class="payitem"
+        style="margin-top: 20rpx; display: flex"
+        @click="change(2)"
+      >
+        <image
+          src="static/images/kefu2.png"
+          mode=""
+          style="width: 40rpx; height: 40rpx"
+        ></image>
+        <view class="u-flex u-row-between" style="margin-left: 20rpx; flex: 1">
+          <view class="">
+            <view class="">{{ i18n.Customerservicepayment }}</view>
+            <view
+              class=""
+              style="margin-top: 10rpx; color: rgba(121, 121, 121, 1)"
+            >
+              {{ i18n.Contactpayment }}
+            </view>
+          </view>
+          <image
+            v-if="mode == 2"
+            src="static/images/active.png"
+            mode=""
+            style="width: 36rpx; height: 36rpx"
+          >
+          </image>
+          <image
+            v-else
+            src="static/images/unactive.png"
+            mode=""
+            style="width: 36rpx; height: 36rpx"
+          ></image>
+        </view>
+      </view>
+    </view>
+    <!-- 付款须知 -->
+    <view class="">
+      <view class="payment" style="margin-top: 24rpx">{{
         i18n.Paymentinstructions
       }}</view>
-			<view class="content" style="margin-top: 18rpx">1.联系客服付款需走线下支付通道，付款成</view>
-		</view>
-		<view class="confirm" @click="confirm">
-			{{ i18n.Confirmpayment }}
-		</view>
-	</view>
+      <view class="content" style="margin-top: 18rpx"
+        >1.联系客服付款需走线下支付通道，付款成</view
+      >
+    </view>
+    <view class="confirm" @click="confirm">
+      {{ i18n.Confirmpayment }}
+    </view>
+  </view>
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				mode: 0,
-				stateshow: false,
-				state: "人民币",
-				state_id: 0,
-				array: [{
-						name: "人民币",
-					},
-					{
-						name: "欧元",
-					},
-					{
-						name: "美元",
-					},
-				],
-				sum: "",
-				pay_type: "balance",
-				orderid: "",
-				balance: "",
-				type: "",
-				exchange_rate_id: "",
-				balance1: 0,
-				sum1: "",
-			};
-		},
-		onLoad(options) {
-			this.sum1 = options.sum;
-			this.sum = options.sum;
-			console.log(this.sum);
-			this.orderid = options.orderid;
-			if (options.type) {
-				this.type = options.type;
-			}
-		},
-		onShow() {
-			this.ratelist();
-			// this.userinfo()
-		},
-		computed: {
-			i18n() {
-				return this.$t("index");
-			},
-		},
-		methods: {
-			//用户信息
-			userinfo() {
-				uni.$u.http
-					.get("/api/member/info", {})
-					.then((res) => {
-						this.balance = res.balance;
-						this.balance1 = this.balance;
-						this.calculate1(this.balance1);
-					})
-					.catch(() => {});
-			},
-			//汇率列表
-			ratelist() {
-				uni.$u.http
-					.get("/api/exchange-rate", {})
-					.then((res) => {
-						this.array = res.reverse();
-						this.exchange_rate_id = this.array[0].id;
-						this.userinfo();
-						this.calculate();
-					})
-					.catch(() => {});
-			},
-			//汇率价格
-			calculate() {
-				uni.$u.http
-					.post("/api/exchange-rate/calculate/" + this.exchange_rate_id, {
-						price: this.sum1,
-					})
-					.then((res) => {
-						this.sum = res.amount;
-					})
-					.catch(() => {});
-			},
-			calculate1(balance) {
-				uni.$u.http
-					.post("/api/exchange-rate/calculate/" + this.exchange_rate_id, {
-						price: balance,
-					})
-					.then((res) => {
-						this.balance = res.amount;
-					})
-					.catch(() => {});
-			},
-			change(idx) {
-				this.mode = idx;
-				if (idx == 0) {
-					this.pay_type = "balance";
-				}
-				if (idx == 1) {
-					this.pay_type = "wechat";
-				}
-				if (idx == 2) {
-					this.pay_type = "customer";
-				}
-			},
-			statechange(item, idx) {
-				this.state = item.name;
-				this.state_id = idx;
-				this.exchange_rate_id = item.id;
-				this.stateshow = !this.stateshow;
-				this.calculate();
-				this.calculate1(this.balance1);
-			},
-			confirm() {
-				// console.log(new Date().getTime());
-				if (this.type == "") {
-					uni.$u.http
-						.post("/api/order/payment", {
-							order_id: this.orderid,
-							pay_type: this.pay_type,
-							customer_currency: "RMB",
-						})
-						.then((res) => {
-							console.log(res);
-							if (this.pay_type == "wechat") {
-								uni.requestPayment({
-									provider: 'wxpay',
-									timeStamp: String(res.timeStamp),
-									nonceStr: res.nonceStr,
-									package: res.package,
-									signType: res.signType,
-									paySign: res.paySign,
-									success: function(res) {
-										this.$u.toast('支付成功')
-										console.log('success:' + JSON.stringify(res));
-										setTimeout(() => {
-												// uni.navigateTo({
-												// 	url: "confirm",
-												// });
-										}, 800);
-									},
-									fail: function(err) {
-										console.log('fail:' + JSON.stringify(err));
-									}
-									// success: (result) => {
-									// 	
-									// 	// console.log(result);
+export default {
+  data() {
+    return {
+      mode: 0,
+      stateshow: false,
+      state: "人民币",
+      state_id: 0,
+      array: [
+        {
+          name: "人民币",
+        },
+        {
+          name: "欧元",
+        },
+        {
+          name: "美元",
+        },
+      ],
+      sum: "",
+      pay_type: "balance",
+      orderid: "",
+      balance: "",
+      type: "",
+      exchange_rate_id: "",
+      balance1: 0,
+      sum1: "",
+    };
+  },
+  onLoad(options) {
+    this.sum1 = options.sum;
+    this.sum = options.sum;
+    this.orderid = options.orderid;
+    if (options.type) {
+      this.type = options.type;
+    }
+  },
+  onShow() {
+    this.ratelist();
+    // this.userinfo()
+  },
+  computed: {
+    i18n() {
+      return this.$t("index");
+    },
+  },
+  methods: {
+    //用户信息
+    userinfo() {
+      uni.$u.http
+        .get("/api/member/info", {})
+        .then((res) => {
+          this.balance = res.balance;
+          this.balance1 = this.balance;
+          this.calculate1(this.balance1);
+        })
+        .catch(() => {});
+    },
+    //汇率列表
+    ratelist() {
+      uni.$u.http
+        .get("/api/exchange-rate", {})
+        .then((res) => {
+          this.array = res.reverse();
+          this.exchange_rate_id = this.array[0].id;
+          this.userinfo();
+          this.calculate();
+        })
+        .catch(() => {});
+    },
+    //汇率价格
+    calculate() {
+      uni.$u.http
+        .post("/api/exchange-rate/calculate/" + this.exchange_rate_id, {
+          price: this.sum1,
+        })
+        .then((res) => {
+          this.sum = res.amount;
+        })
+        .catch(() => {});
+    },
+    calculate1(balance) {
+      uni.$u.http
+        .post("/api/exchange-rate/calculate/" + this.exchange_rate_id, {
+          price: balance,
+        })
+        .then((res) => {
+          this.balance = res.amount;
+        })
+        .catch(() => {});
+    },
+    change(idx) {
+      this.mode = idx;
+      if (idx == 0) {
+        this.pay_type = "balance";
+      }
+      if (idx == 1) {
+        this.pay_type = "wechat";
+      }
+      if (idx == 2) {
+        this.pay_type = "customer";
+      }
+    },
+    statechange(item, idx) {
+      this.state = item.name;
+      this.state_id = idx;
+      this.exchange_rate_id = item.id;
+      this.stateshow = !this.stateshow;
+      this.calculate();
+      this.calculate1(this.balance1);
+    },
+    confirm() {
+      // console.log(new Date().getTime());
+      if (this.type == "") {
+        uni.$u.http
+          .post("/api/order/payment", {
+            order_id: this.orderid,
+            pay_type: this.pay_type,
+            customer_currency: "RMB",
+          })
+          .then((res) => {
+            console.log(res);
+            if (this.pay_type == "wechat") {
+              uni.requestPayment({
+                provider: "wxpay",
+                timeStamp: String(res.timeStamp),
+                nonceStr: res.nonceStr,
+                package: res.package,
+                signType: res.signType,
+                paySign: res.paySign,
+                success: function (res) {
+                  this.$u.toast("支付成功");
+                  console.log("success:" + JSON.stringify(res));
+                  setTimeout(() => {
+                    // uni.navigateTo({
+                    // 	url: "confirm",
+                    // });
+                  }, 800);
+                },
+                fail: function (err) {
+                  console.log("fail:" + JSON.stringify(err));
+                },
+                // success: (result) => {
+                //
+                // 	// console.log(result);
 
-									// },
-									// fail: (error) => {
-									// 	console.log(error);
-									// },
-								});
-							}
-						})
-						.catch(() => {});
-				} else {
-					uni.$u.http
-						.post("/api/pay", {
-							order_id: this.orderid,
-							pay_type: this.pay_type,
-							type: this.type,
-							exchange_rate_id: this.exchange_rate_id,
-						})
-						.then((res) => {
-							if (this.pay_type == "wechat") {
-								uni.requestPayment({
-									provider: 'wxpay',
-									timeStamp: String(res.timeStamp),
-									nonceStr: res.nonceStr,
-									package: res.package,
-									signType: res.signType,
-									paySign: res.paySign,
-									success: function(res) {
-										console.log('success:' + JSON.stringify(res));
-										setTimeout(() => {
-											uni.switchTab({
-												url: "/pages/express/express",
-											})
-										}, 800);
-									},
-									fail: function(err) {
-										console.log('fail:' + JSON.stringify(err));
-									}
-								});
-							} else {
-								this.$u.toast('支付成功')
-								setTimeout(() => {
-									uni.switchTab({
-										url: "/pages/express/express",
-									})
-								}, 800);
-							}
-							// uni.navigateTo({
-							// 	url: 'confirm'
-							// })
-						})
-						.catch(() => {});
-				}
-			},
-		},
-	};
+                // },
+                // fail: (error) => {
+                // 	console.log(error);
+                // },
+              });
+            }
+          })
+          .catch(() => {});
+      } else {
+        uni.$u.http
+          .post("/api/pay", {
+            order_id: this.orderid,
+            pay_type: this.pay_type,
+            type: this.type,
+            exchange_rate_id: this.exchange_rate_id,
+          })
+          .then((res) => {
+            if (this.pay_type == "wechat") {
+              uni.requestPayment({
+                provider: "wxpay",
+                timeStamp: String(res.timeStamp),
+                nonceStr: res.nonceStr,
+                package: res.package,
+                signType: res.signType,
+                paySign: res.paySign,
+                success: function (res) {
+                  console.log("success:" + JSON.stringify(res));
+                  setTimeout(() => {
+                    uni.switchTab({
+                      url: "/pages/express/express",
+                    });
+                  }, 800);
+                },
+                fail: function (err) {
+                  console.log("fail:" + JSON.stringify(err));
+                },
+              });
+            } else {
+              this.$u.toast("支付成功");
+              setTimeout(() => {
+                uni.switchTab({
+                  url: "/pages/express/express",
+                });
+              }, 800);
+            }
+            // uni.navigateTo({
+            // 	url: 'confirm'
+            // })
+          })
+          .catch(() => {});
+      }
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-	.payment {
-		font-family: PingFangSC, PingFang SC;
-		font-weight: 500;
-		font-size: 24rpx;
-		color: #222222;
-		line-height: 34rpx;
-		text-align: left;
-		font-style: normal;
-	}
+.payment {
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 500;
+  font-size: 24rpx;
+  color: #222222;
+  line-height: 34rpx;
+  text-align: left;
+  font-style: normal;
+}
 
-	.content {
-		font-family: PingFangSC, PingFang SC;
-		font-weight: 400;
-		font-size: 20rpx;
-		color: #777777;
-		line-height: 28rpx;
-		text-align: left;
-		font-style: normal;
-	}
+.content {
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 400;
+  font-size: 20rpx;
+  color: #777777;
+  line-height: 28rpx;
+  text-align: left;
+  font-style: normal;
+}
 
-	.stateac {
-		font-family: PingFangSC, PingFang SC;
-		font-weight: 400;
-		font-size: 24rpx;
-		color: #ff1515;
-		line-height: 34rpx;
-		text-align: left;
-		font-style: normal;
-	}
+.stateac {
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 400;
+  font-size: 24rpx;
+  color: #ff1515;
+  line-height: 34rpx;
+  text-align: left;
+  font-style: normal;
+}
 
-	.unstate {
-		font-family: PingFangSC, PingFang SC;
-		font-weight: 400;
-		font-size: 24rpx;
-		color: #222222;
-		line-height: 34rpx;
-		text-align: left;
-		font-style: normal;
-	}
+.unstate {
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 400;
+  font-size: 24rpx;
+  color: #222222;
+  line-height: 34rpx;
+  text-align: left;
+  font-style: normal;
+}
 
-	.confirm {
-		position: fixed;
-		bottom: 66rpx;
-		width: 702rpx;
-		height: 84rpx;
-		background: #f83224;
-		border-radius: 44rpx;
-		font-family: PingFangSC, PingFang SC;
-		font-weight: 500;
-		font-size: 32rpx;
-		color: #ffffff;
-		line-height: 84rpx;
-		text-align: center;
-		font-style: normal;
-	}
+.confirm {
+  position: fixed;
+  bottom: 66rpx;
+  width: 702rpx;
+  height: 84rpx;
+  background: #f83224;
+  border-radius: 44rpx;
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 500;
+  font-size: 32rpx;
+  color: #ffffff;
+  line-height: 84rpx;
+  text-align: center;
+  font-style: normal;
+}
 
-	.payitem {
-		width: 702rpx;
-		height: 140rpx;
-		background: #ffffff;
-		border-radius: 12rpx;
-		padding: 34rpx 24rpx;
-		box-sizing: border-box;
-	}
+.payitem {
+  width: 702rpx;
+  height: 140rpx;
+  background: #ffffff;
+  border-radius: 12rpx;
+  padding: 34rpx 24rpx;
+  box-sizing: border-box;
+}
 
-	.back {
-		padding: 20rpx 24rpx;
-		box-sizing: border-box;
+.back {
+  padding: 20rpx 24rpx;
+  box-sizing: border-box;
 
-		.topbox {
-			position: relative;
+  .topbox {
+    position: relative;
 
-			.state {
-				width: 128rpx;
-				// height: 56rpx;
-				background: #ffffff;
-				border-radius: 6rpx;
-				padding: 12rpx;
-				box-sizing: border-box;
-			}
+    .state {
+      width: 128rpx;
+      // height: 56rpx;
+      background: #ffffff;
+      border-radius: 6rpx;
+      padding: 12rpx;
+      box-sizing: border-box;
+    }
 
-			.paysum {
-				font-family: PingFangSC, PingFang SC;
-				font-weight: 400;
-				font-size: 28rpx;
-				color: #222222;
-				line-height: 40rpx;
-				text-align: left;
-				font-style: normal;
-			}
+    .paysum {
+      font-family: PingFangSC, PingFang SC;
+      font-weight: 400;
+      font-size: 28rpx;
+      color: #222222;
+      line-height: 40rpx;
+      text-align: left;
+      font-style: normal;
+    }
 
-			.numbe {
-				font-family: HarmonyOS_Sans_Medium;
-				font-size: 28rpx;
-				color: #000000;
-				line-height: 38rpx;
-				text-align: left;
-				font-style: normal;
-				margin-top: 20rpx;
-			}
-		}
-	}
-</style>
+    .numbe {
+      font-family: HarmonyOS_Sans_Medium;
+      font-size: 28rpx;
+      color: #000000;
+      line-height: 38rpx;
+      text-align: left;
+      font-style: normal;
+      margin-top: 20rpx;
+    }
+  }
+}
+</style>

pageC/myPackage/component/packageCard.vue

@@ -76,17 +76,14 @@
         <button
           class="btn-1"
           @click.stop="toSending"
-          v-show="itemInfo.status == 'domestic_undelivered'"
+          v-show="
+            (itemInfo.type == 'group_package' ||
+              itemInfo.type == 'express_order') &&
+            itemInfo.status == 'domestic_undelivered'
+          "
         >
           去寄件
         </button>
-        <button
-          class="btn-2"
-          @click.stop="toSending"
-          v-show="itemInfo.status == 'domestic_delivered'"
-        >
-          填写快递信息
-        </button>
       </view>
     </view>
   </view>

pageC/myPackage/myPackage.vue

@@ -65,7 +65,7 @@ export default {
   data() {
     return {
       follow: "to_transit",
-      weights: 300,
+      weights: 0,
       orderId: "",
       containerId: "",
       statusNum: {},
@@ -110,10 +110,15 @@ export default {
         )
         .then((res) => {
           if (value == 1) {
+            this.weights = 0; //所有包裹重量
             this.orderList = res.data;
           } else {
             this.orderList = this.orderList.concat(res.data);
           }
+          //将获取到的包裹重量相加
+          this.orderList.map((item) => {
+            this.weights += Number(item.actual_weight);
+          });
           this.total = res.total;
         });
     },

pageC/orderFormDetail/orderFormDetail.vue

@@ -37,6 +37,12 @@
       >
         订单已完成，交易成功
       </view>
+      <view
+        class="payment"
+        v-else-if="orderDetail.simplify_status == 'undifference'"
+      >
+        待补邮费
+      </view>
     </view>
     <!-- 订单状态 -->
 
@@ -53,6 +59,32 @@
         {{ orderDetail.full_address }}
       </view>
     </view>
+    <view class="photo" v-if="orderDetail.simplify_status == 'undifference'">
+      <view class="_weight">
+        <text>称重重量</text>
+        <text>{{ orderDetail.call_weight }}kg</text>
+      </view>
+      <view class="_weight">
+        <text>称重图片</text>
+        <!-- <view class="_image"> </view> -->
+        <image
+          :src="orderDetail.call_image"
+          mode="scaleToFill"
+          class="_image"
+        />
+      </view>
+      <view class="photo-bottom">
+        <text class="_text-1">需补邮费</text>
+        <view class="price">
+          <text style="font-size: 20rpx">￥</text>
+          <text>{{ orderDetail.fill_price.split(".")[0] }}</text
+          >.
+          <text style="font-size: 20rpx">{{
+            orderDetail.fill_price.split(".")[1]
+          }}</text>
+        </view>
+      </view>
+    </view>
 
     <commodityDetailVue :status="status" :orderDetail="orderDetail" />
 
@@ -171,6 +203,13 @@
       >
         评价
       </button>
+      <button
+        class="status-2"
+        v-if="orderDetail.simplify_status == 'undifference'"
+        @click.stop="toEvaluate"
+      >
+        立即付款
+      </button>
     </view>
 
     <u-transition :show="show">
@@ -320,6 +359,44 @@ export default {
     }
   }
 
+  .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;
+      }
+    }
+  }
   .order {
     background-color: #fff;
     border-radius: 16rpx;

pageD/components/selectExpress.vue

@@ -1,5 +1,5 @@
 <template>
-  <view v-if="show" class="select-list">
+  <view v-if="show" :class="className">
     <view
       @click="$emit('selected', item)"
       class="_label"
@@ -23,6 +23,10 @@ export default {
         return {};
       },
     },
+    className: {
+      typeof: String,
+      default: "",
+    },
   },
 };
 </script>
@@ -46,4 +50,23 @@ export default {
     text-align: center;
   }
 }
+.sending-name {
+  background-color: #fff;
+  border-radius: 10rpx;
+  padding: 14rpx;
+  position: absolute;
+  top: 200rpx;
+  left: 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/orderDetail/orderDetail.vue

@@ -87,7 +87,11 @@
       </view> -->
     </view>
     <view class="footer" v-if="orderDetail.simplify_status != 'merdelivered'">
-      <button class="status-2" v-if="orderDetail.simplify_status == 'unfill'">
+      <button
+        class="status-2"
+        v-if="orderDetail.simplify_status == 'unfill'"
+        @click="toPay"
+      >
         缴纳保证金
       </button>
       <button
@@ -131,7 +135,11 @@ export default {
   onLoad(option) {
     //获取上个页面传输的值，通过该值获取接口数据
     this.status = option.orderStatus;
-    this.getDetail(option.orderStatus);
+    if (option.status == "unfill") {
+      this.getUnfillOrderDetail(option.orderStatus);
+    } else {
+      this.getDetail(option.orderStatus);
+    }
   },
 
   methods: {
@@ -147,6 +155,19 @@ export default {
         },
       });
     },
+    getUnfillOrderDetail(id) {
+      uni.$u.http
+        .post(`/api/order/merchant_order_detail`, { id })
+        .then((res) => {
+          this.orderDetail = res;
+          //直接在dom中使用会报错，首先判断字段存不存在，重新复制后使用
+          if (res.container) {
+            this.transportType = res.container.transport_type_name;
+          }
+          this.title = "待缴纳保证金";
+        });
+    },
+    //获取订单详情
     getDetail(id) {
       uni.$u.http.get(`/api/order/read?id=${id}`).then((res) => {
         this.orderDetail = res;
@@ -166,6 +187,13 @@ export default {
         }
       });
     },
+
+    //跳转支付
+    toPay() {
+      uni.navigateTo({
+        url: `/pageA/payorder?num=${this.orderDetail.earnest_money}&orderid=${this.orderDetail.id}`,
+      });
+    },
     //跳转发货页面
     toSendOutGoods() {
       uni.navigateTo({

pageD/orderFormManage/orderFormManage.vue

@@ -80,9 +80,9 @@ export default {
       this.getGoodsList();
     },
     toInformation(item) {
-      if (item.delivery_status == "unreview") return;
+      if (item.status == "unreview") return;
       uni.navigateTo({
-        url: `/pageD/orderDetail/orderDetail?orderStatus=${item.id}`,
+        url: `/pageD/orderDetail/orderDetail?orderStatus=${item.id}&status=${item.status}`,
       });
     },
     //获取订单列表

pageD/orderInformation/component/fill.vue

@@ -16,7 +16,7 @@
         <view class="_label">
           <view class="name">快递单号</view>
           <u--input
-            placeholder="请输入内容"
+            placeholder="请填写快递单号"
             border="none"
             v-model="expressNum"
             inputAlign="right"
@@ -27,9 +27,20 @@
           :show="nameShow"
           :filterList="filterList"
           @selected="selected"
+          className="select-list"
         />
       </view>
-      <button class="btn" @click="$emit('close')">立即保存</button>
+      <button
+        class="btn"
+        @click="
+          $emit('close', {
+            expressCode,
+            expressNum,
+          })
+        "
+      >
+        立即保存
+      </button>
     </u-popup>
   </view>
 </template>
@@ -48,6 +59,7 @@ export default {
     return {
       expressName: "",
       expressNum: "",
+      expressCode: "",
       expressNameList: [], //快递公司
       nameShow: false,
       filterList: [],
@@ -65,8 +77,10 @@ export default {
     //获取选中的快递公司
     selected(value) {
       this.expressName = value.name;
+      this.expressCode = value.code;
       this.nameShow = false;
     },
+
     //打开下拉
     openSelect() {
       this.nameShow = true;

pageD/orderInformation/orderInformation.vue

@@ -1,6 +1,6 @@
 <template>
   <view class="page">
-    <view class="top">
+    <view class="top" v-if="orderInformation.type != 'group_package'">
       <view class="title">
         {{ orderTitle }}
       </view>
@@ -8,12 +8,18 @@
         {{ orderDetail }}
       </view>
     </view>
-    <view class="packaging" v-if="orderStauts == 4">
+    <view class="packaging" v-if="orderInformation.type == 'group_package'">
       <view class="packaging-top">
         <view class="">
-          {{ "普通包裹" + "&nbsp;" + "|" + "&nbsp" + "海运散货" }}
+          {{
+            orderInformation.goods[0].type_text +
+            "&nbsp;" +
+            "|" +
+            "&nbsp" +
+            orderInformation.containerBase.transport_type_name
+          }}
         </view>
-        <view style="color: #f83224"> 拼包中 </view>
+        <view style="color: #f83224"> {{ orderInformation.status_text }} </view>
       </view>
       <view class="packaging-center">
         <view class="packaging-left">
@@ -22,18 +28,22 @@
         </view>
         <image class="jiantou" src="../../static/mine/339.png" mode=""></image>
         <view class="packaging-left">
-          <view class="left-top"> 澳大利亚 </view>
+          <view class="left-top">
+            {{ orderInformation.containerBase.country_name }}
+          </view>
           <view class="left-bottom"> 目的地 </view>
         </view>
       </view>
       <view class="packaging-time">
         <view class="time">
           <text>开始时间：</text>
-          <text>{{ "2024-5-25" + "&emsp;" }}</text>
+          <text>{{
+            orderInformation.containerBase.begin_date + "&emsp;"
+          }}</text>
         </view>
         <view class="time">
-          <text>开始时间：</text>
-          <text>2024-5-25</text>
+          <text>截止时间：</text>
+          <text>{{ orderInformation.containerBase.end_date }}</text>
         </view>
       </view>
     </view>
@@ -159,7 +169,9 @@
     </view>
     <view class="pay" v-if="orderInformation.status != 'domestic_delivered'">
       <text>已付</text>
-      <text style="color: #f83224; font-weight: 600">123.1</text>
+      <text style="color: #f83224; font-weight: 600">{{
+        orderInformation.estimated_price
+      }}</text>
     </view>
     <view
       class="footer"
@@ -196,10 +208,25 @@
       <button
         class="btn-1"
         @click="fillInformation"
-        v-if="orderInformation.status == 'domestic_undelivered'"
+        v-if="
+          orderInformation.type == 'mall_order' &&
+          orderInformation.status == 'domestic_undelivered'
+        "
       >
         填写物流信息
       </button>
+
+      <button
+        class="btn-2"
+        @click="toSending"
+        v-if="
+          (orderInformation.type == 'group_package' ||
+            orderInformation.type == 'express_order') &&
+          orderInformation.status == 'domestic_undelivered'
+        "
+      >
+        去寄件
+      </button>
       <button
         class="btn-2"
         @click="toPay"
@@ -246,6 +273,14 @@ export default {
         },
       });
     },
+
+    //去寄件
+    toSending() {
+      uni.navigateTo({
+        url: "/pageD/sending/sending?orderId=" + this.orderInformation.id,
+      });
+    },
+
     setStatus(num) {
       this.orderStauts = num;
     },
@@ -262,8 +297,21 @@ export default {
     },
 
     //关闭弹窗
-    close() {
+    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: "已保存",
+            });
+          });
+      }
     },
     //去支付
     toPay() {

pageD/sending/sending.vue

@@ -1,157 +1,244 @@
 <template>
-	<view class="page">
-		<view class="address">
-			<view class="address-top">
-				<text space="emsp" class="top_left_text">跨境中转仓库地址 {{"&emsp;"}}</text>
-				<text class="top_right_text">请先将包裹寄往这个地址～</text>
-			</view>
-			<view class="address-content">
-				<image class="address-icon" src="../../static/mine/346.png" mode=""></image>
-				<view class="">
-					<view class="warehouse-phone">
-						<text class="warehouse-name">贝德福德郡FBA仓库</text>
-						<text class="phone" space="emsp">{{"&emsp;"}} 18292882813</text>
-					</view>
-					<view class="detail">
-						上海市上海市宝山区杨行镇联谊路190号
-					</view>
-				</view>
-			</view>
-
-		</view>
-
-		<view class="express">
-			<view class="_input-1 _input-2">
-				<view class="_label">快递单号</view>
-				<u--input placeholder="请输入快递单号" border="none" clearable></u--input>
-			</view>
-			<view class="_input-1">
-				<view class="_label">快递公司</view>
-				<u--input placeholder="请输入快递公司名称" border="none" clearable></u--input>
-			</view>
-		</view>
-		<view class="footer">
-			<button class="btn-2">保存</button>
-		</view>
-	</view>
+  <view class="page" @click="closeName">
+    <view class="address">
+      <view class="address-top">
+        <text space="emsp" class="top_left_text"
+          >跨境中转仓库地址 {{ "&emsp;" }}</text
+        >
+        <text class="top_right_text">请先将包裹寄往这个地址～</text>
+      </view>
+      <view class="address-content">
+        <image
+          class="address-icon"
+          src="../../static/mine/346.png"
+          mode=""
+        ></image>
+        <view class="">
+          <view class="warehouse-phone">
+            <text class="warehouse-name">{{ addressDetail.name }}</text>
+            <text class="phone" space="emsp"
+              >{{ "&emsp;" }} {{ addressDetail.mobile }}</text
+            >
+          </view>
+          <view class="detail"> {{ addressDetail.address }} </view>
+        </view>
+      </view>
+    </view>
+
+    <view class="express">
+      <view class="_input-1 _input-2">
+        <view class="_label">快递单号</view>
+        <u--input
+          placeholder="请输入快递单号"
+          border="none"
+          v-model="expressNum"
+          clearable
+        ></u--input>
+      </view>
+      <view class="_input-1" @click.stop="openName">
+        <view class="_label">快递公司</view>
+        <u--input
+          placeholder="请输入快递公司名称"
+          border="none"
+          @change="searchExpress"
+          v-model="expressName"
+          clearable
+        ></u--input>
+      </view>
+      <SelectExpress
+        :show="nameShow"
+        :filterList="filterList"
+        @selected="selected"
+        className="sending-name"
+      />
+    </view>
+    <view class="footer">
+      <button class="btn-2" @click="submit">保存</button>
+    </view>
+  </view>
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-
-			};
-		},
-		mounted() {
-			uni.setNavigationBarTitle({
-				title: "寄快递"
-			})
-		}
-	}
+import SelectExpress from "../components/selectExpress.vue";
+export default {
+  components: { SelectExpress },
+  data() {
+    return {
+      nameShow: false,
+      filterList: [], //过滤之后的快递公司
+      expressName: "",
+      expressNum: "",
+      expressCode: "", //选中的快递公司编号
+      expressNameList: [], //快递公司
+      orderId: "", //订单id
+      addressDetail: {}, //中转地址信息
+    };
+  },
+  onLoad(options) {
+    this.orderId = options.orderId;
+  },
+  methods: {
+    //过滤搜索结果
+    searchExpress(e) {
+      this.nameShow = true;
+      this.filterList = this.expressNameList
+        .filter((item) => item.name.includes(e))
+        .map((item) => item);
+    },
+    openName() {
+      this.nameShow = true;
+    },
+
+    //关闭
+    closeName() {
+      this.nameShow = false;
+    },
+
+    //获取选中的快递公司
+    selected(value) {
+      this.expressName = value.name;
+      this.expressCode = value.code;
+      this.nameShow = false;
+    },
+
+    //保存
+    submit() {
+      uni.$u.http
+        .post(`/api/express-order/delivery/${this.orderId}`, {
+          domestic_logistics_company_code: this.expressCode,
+          domestic_logistics_no: this.expressNum,
+        })
+        .then((res) => {
+          uni.navigateBack({
+            delta: 1,
+          });
+          uni.showToast({
+            title: "已保存",
+            icon: "none",
+          });
+        });
+    },
+    getExpressNameList() {
+      uni.$u.http.get(`/api/express-company`).then((res) => {
+        this.expressNameList = res;
+        this.filterList = res;
+      });
+      uni.$u.http.get(`/api/transit`).then((res) => {
+        this.addressDetail = res;
+      });
+    },
+  },
+  mounted() {
+    this.getExpressNameList();
+    uni.setNavigationBarTitle({
+      title: "寄快递",
+    });
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-	.page {
-		padding: 20rpx 24rpx;
-		position: relative;
-
-		.address {
-			padding: 0 20rpx;
-			background-color: #fff;
-			border-radius: 16rpx;
-
-			.address-top {
-				height: 96rpx;
-				line-height: 96rpx;
-				border-bottom: 2rpx solid rgba(151, 151, 151, .1);
-
-				.top_left_text {
-					font-size: 28rpx;
-					color: #222;
-					font-weight: 600;
-				}
-
-				.top_right_text {
-					font-size: 24rpx;
-					color: #F83224;
-				}
-			}
-
-			.address-content {
-				display: flex;
-				align-items: center;
-				padding: 22rpx 0 32rpx;
-
-				.address-icon {
-					width: 28rpx;
-					height: 28rpx;
-					margin-right: 24rpx;
-				}
-
-				.warehouse-phone {
-					display: flex;
-					align-items: center;
-					margin-bottom: 14rpx;
-
-					.warehouse-name {
-						font-size: 30rpx;
-						font-weight: 600;
-						color: #222222;
-					}
-
-					.phone {
-						color: #555555;
-						font-size: 24rpx;
-					}
-				}
-
-				.detail {
-					font-size: 26rpx;
-					color: #777777;
-				}
-			}
-		}
-
-		.express {
-			border-radius: 16rpx;
-			background-color: #fff;
-			padding: 0 20rpx;
-				margin-top: 20rpx;
-			._input-1 {
-				display: flex;
-				align-items: center;
-				height: 100rpx;
-				._label{
-					font-size: 28rpx;
-					color: #222;
-					margin-right: 32rpx;
-				}
-			}
-			._input-2{
-				border-bottom: 2rpx solid rgba(151, 151, 151, .1);
-			}
-		}
-		.footer {
-			position: fixed;
-			bottom: 0;
-			left: 0;
-			width: 95%;
-			background-color: #fff;
-			height: 126rpx;
-			justify-content: center;
-			padding: 20rpx;
-			.btn-2 {
-				height: 76rpx;
-				padding: 0;
-				margin: 0;
-				font-size: 28rpx;
-				color: #fff;
-				min-width: 188rpx;
-				background-color: #f83224;
-				border-radius: 38rpx;
-				box-shadow: 0rpx 16rpx 40rpx -12rpx rgba(255,21,21,0.5);
-			}
-		}
-	}
-</style>
+.page {
+  padding: 20rpx 24rpx;
+  position: relative;
+
+  .address {
+    padding: 0 20rpx;
+    background-color: #fff;
+    border-radius: 16rpx;
+
+    .address-top {
+      height: 96rpx;
+      line-height: 96rpx;
+      border-bottom: 2rpx solid rgba(151, 151, 151, 0.1);
+
+      .top_left_text {
+        font-size: 28rpx;
+        color: #222;
+        font-weight: 600;
+      }
+
+      .top_right_text {
+        font-size: 24rpx;
+        color: #f83224;
+      }
+    }
+
+    .address-content {
+      display: flex;
+      align-items: center;
+      padding: 22rpx 0 32rpx;
+
+      .address-icon {
+        width: 28rpx;
+        height: 28rpx;
+        margin-right: 24rpx;
+      }
+
+      .warehouse-phone {
+        display: flex;
+        align-items: center;
+        margin-bottom: 14rpx;
+
+        .warehouse-name {
+          font-size: 30rpx;
+          font-weight: 600;
+          color: #222222;
+        }
+
+        .phone {
+          color: #555555;
+          font-size: 24rpx;
+        }
+      }
+
+      .detail {
+        font-size: 26rpx;
+        color: #777777;
+      }
+    }
+  }
+
+  .express {
+    border-radius: 16rpx;
+    background-color: #fff;
+    padding: 0 20rpx;
+    margin-top: 20rpx;
+    position: relative;
+    ._input-1 {
+      display: flex;
+      align-items: center;
+      height: 100rpx;
+      ._label {
+        font-size: 28rpx;
+        color: #222;
+        margin-right: 32rpx;
+      }
+    }
+    ._input-2 {
+      border-bottom: 2rpx solid rgba(151, 151, 151, 0.1);
+    }
+  }
+  .footer {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    width: 95%;
+    background-color: #fff;
+    height: 126rpx;
+    justify-content: center;
+    padding: 20rpx;
+    .btn-2 {
+      height: 76rpx;
+      padding: 0;
+      margin: 0;
+      font-size: 28rpx;
+      color: #fff;
+      min-width: 188rpx;
+      background-color: #f83224;
+      border-radius: 38rpx;
+      box-shadow: 0rpx 16rpx 40rpx -12rpx rgba(255, 21, 21, 0.5);
+    }
+  }
+}
+</style>